mandoc/mdoc_macro.c - diff

Return to mdoc_macro.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mdoc_macro.c between version 1.107 and 1.129

version 1.107, 2011/04/19 16:38:48

version 1.129, 2014/01/21 10:26:53

Line 1

/* $Id$ */

* Permission to use, copy, modify, and distribute this software for any

* purpose with or without fee is hereby granted, provided that the above

Line 51 static int in_line(MACRO_PROT_ARGS);

static int obsolete(MACRO_PROT_ARGS);

static int phrase_ta(MACRO_PROT_ARGS);

static int dword(struct mdoc *, int, int,

static int dword(struct mdoc *, int, int, const char *,

const char *, enum mdelim);

enum mdelim, int);

static int append_delims(struct mdoc *,

int, int *, char *);

static enum mdoct lookup(enum mdoct, const char *);

Line 70 static int rew_sub(enum mdoc_type, struct mdoc *,

enum mdoct, int, int);

const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */

{ in_line_eoln, MDOC_PROLOGUE }, /* Dd */

{ in_line_eoln, MDOC_PROLOGUE }, /* Dt */

{ in_line_eoln, MDOC_PROLOGUE }, /* Os */

{ blk_full, 0 }, /* Sh */

{ blk_full, MDOC_PARSED | MDOC_JOIN }, /* Sh */

{ blk_full, 0 }, /* Ss */

{ blk_full, MDOC_PARSED | MDOC_JOIN }, /* Ss */

{ in_line_eoln, 0 }, /* Pp */

{ blk_part_imp, MDOC_PARSED }, /* D1 */

{ blk_part_imp, MDOC_PARSED | MDOC_JOIN }, /* D1 */

{ blk_part_imp, MDOC_PARSED }, /* Dl */

{ blk_part_imp, MDOC_PARSED | MDOC_JOIN }, /* Dl */

{ blk_full, MDOC_EXPLICIT }, /* Bd */

{ blk_exp_close, MDOC_EXPLICIT }, /* Ed */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ed */

{ blk_full, MDOC_EXPLICIT }, /* Bl */

{ blk_exp_close, MDOC_EXPLICIT }, /* El */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* El */

{ blk_full, MDOC_PARSED }, /* It */

{ blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */

{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cd */

{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */

{ in_line_eoln, 0 }, /* Ex */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fa */

{ in_line_eoln, 0 }, /* Fd */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */

{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ic */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */

{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Li */

{ blk_full, 0 }, /* Nd */

{ blk_full, MDOC_JOIN }, /* Nd */

{ ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */

{ obsolete, 0 }, /* Ot */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */

{ in_line_eoln, 0 }, /* Rv */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Va */

{ ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */

{ in_line_eoln, 0 }, /* %A */

{ in_line_eoln, MDOC_JOIN }, /* %A */

{ in_line_eoln, 0 }, /* %B */

{ in_line_eoln, MDOC_JOIN }, /* %B */

{ in_line_eoln, 0 }, /* %D */

{ in_line_eoln, MDOC_JOIN }, /* %D */

{ in_line_eoln, 0 }, /* %I */

{ in_line_eoln, MDOC_JOIN }, /* %I */

{ in_line_eoln, 0 }, /* %J */

{ in_line_eoln, MDOC_JOIN }, /* %J */

{ in_line_eoln, 0 }, /* %N */

{ in_line_eoln, 0 }, /* %O */

{ in_line_eoln, MDOC_JOIN }, /* %O */

{ in_line_eoln, 0 }, /* %P */

{ in_line_eoln, 0 }, /* %R */

{ in_line_eoln, MDOC_JOIN }, /* %R */

{ in_line_eoln, 0 }, /* %T */

{ in_line_eoln, MDOC_JOIN }, /* %T */

{ in_line_eoln, 0 }, /* %V */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */

MDOC_EXPLICIT | MDOC_JOIN }, /* Ac */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* Ao */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Aq */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* At */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

{ blk_full, MDOC_EXPLICIT }, /* Bf */

MDOC_EXPLICIT | MDOC_JOIN }, /* Bc */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */

{ blk_full, MDOC_EXPLICIT }, /* Bf */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* Bo */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Bq */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bsx */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bx */

{ in_line_eoln, 0 }, /* Db */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */

MDOC_EXPLICIT | MDOC_JOIN }, /* Dc */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ec */

MDOC_EXPLICIT | MDOC_JOIN }, /* Do */

{ blk_exp_close, MDOC_EXPLICIT }, /* Ef */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Dq */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ec */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ef */

{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Em */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* No */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED |

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Ns */

MDOC_IGNDELIM | MDOC_JOIN }, /* No */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED |

MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* Pc */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Pf */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */

MDOC_EXPLICIT | MDOC_JOIN }, /* Po */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Pq */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Qo */

MDOC_EXPLICIT | MDOC_JOIN }, /* Qc */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ql */

{ blk_exp_close, MDOC_EXPLICIT }, /* Re */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* Qo */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Qq */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Re */

{ blk_full, MDOC_EXPLICIT }, /* Rs */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Sc */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* So */

MDOC_EXPLICIT | MDOC_JOIN }, /* Sc */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* So */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */

{ in_line_eoln, 0 }, /* Sm */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */

{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */

{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ux */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ux */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */

{ blk_full, MDOC_EXPLICIT | MDOC_CALLABLE }, /* Fo */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Fc */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Oo */

MDOC_EXPLICIT | MDOC_JOIN }, /* Fc */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Oc */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* Oo */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* Oc */

{ blk_full, MDOC_EXPLICIT }, /* Bk */

{ blk_exp_close, MDOC_EXPLICIT }, /* Ek */

{ blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */

{ in_line_eoln, 0 }, /* Bt */

{ in_line_eoln, 0 }, /* Hf */

{ obsolete, 0 }, /* Fr */

{ in_line_eoln, 0 }, /* Ud */

{ in_line, 0 }, /* Lb */

{ in_line_eoln, 0 }, /* Lp */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */

{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */

{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Brq */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */

{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |

{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */

MDOC_EXPLICIT | MDOC_JOIN }, /* Bro */

{ in_line_eoln, 0 }, /* %C */

{ blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |

MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */

{ in_line_eoln, MDOC_JOIN }, /* %C */

{ obsolete, 0 }, /* Es */

{ obsolete, 0 }, /* En */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */

{ in_line_eoln, 0 }, /* %Q */

{ in_line_eoln, MDOC_JOIN }, /* %Q */

{ in_line_eoln, 0 }, /* br */

{ in_line_eoln, 0 }, /* sp */

{ in_line_eoln, 0 }, /* %U */

{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED }, /* Ta */

{ phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */

};

const struct mdoc_macro * const mdoc_macros = __mdoc_macros;

Line 203 const struct mdoc_macro * const mdoc_macros = __mdoc_m

Line 222 const struct mdoc_macro * const mdoc_macros = __mdoc_m

* are errors.

int

mdoc_macroend(struct mdoc *m)

mdoc_macroend(struct mdoc *mdoc)

{

struct mdoc_node *n;

/* Scan for open explicit scopes. */

n = MDOC_VALID & m->last->flags ? m->last->parent : m->last;

n = MDOC_VALID & mdoc->last->flags ?

mdoc->last->parent : mdoc->last;

for ( ; n; n = n->parent)

if (MDOC_BLOCK == n->type &&

MDOC_EXPLICIT & mdoc_macros[n->tok].flags)

mdoc_nmsg(m, n, MANDOCERR_SCOPEEXIT);

mdoc_nmsg(mdoc, n, MANDOCERR_SCOPEEXIT);

/* Rewind to the first. */

return(rew_last(m, m->first));

return(rew_last(mdoc, mdoc->first));

}

Line 228 mdoc_macroend(struct mdoc *m)

Line 248 mdoc_macroend(struct mdoc *m)

static enum mdoct

lookup(enum mdoct from, const char *p)

{

/* FIXME: make -diag lists be un-PARSED. */

if ( ! (MDOC_PARSED & mdoc_macros[from].flags))

return(MDOC_MAX);

Line 264 rew_last(struct mdoc *mdoc, const struct mdoc_node *to

Line 283 rew_last(struct mdoc *mdoc, const struct mdoc_node *to

while (mdoc->last != to) {

* Save the parent here, because we may delete the

* m->last node in the post-validation phase and reset

* mdoc->last node in the post-validation phase and reset

* it to m->last->parent, causing a step in the closing

* it to mdoc->last->parent, causing a step in the closing

* out to be lost.

np = mdoc->last->parent;

Line 461 rew_elem(struct mdoc *mdoc, enum mdoct tok)

Line 480 rew_elem(struct mdoc *mdoc, enum mdoct tok)

static int

make_pending(struct mdoc_node *broken, enum mdoct tok,

struct mdoc *m, int line, int ppos)

struct mdoc *mdoc, int line, int ppos)

{

struct mdoc_node *breaker;

Line 516 make_pending(struct mdoc_node *broken, enum mdoct tok,

Line 535 make_pending(struct mdoc_node *broken, enum mdoct tok,

taker->pending = broken->pending;

}

broken->pending = breaker;

mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos,

mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos,

"%s breaks %s", mdoc_macronames[tok],

mdoc_macronames[broken->tok]);

return(1);

Line 531 make_pending(struct mdoc_node *broken, enum mdoct tok,

Line 550 make_pending(struct mdoc_node *broken, enum mdoct tok,

static int

rew_sub(enum mdoc_type t, struct mdoc *m,

rew_sub(enum mdoc_type t, struct mdoc *mdoc,

enum mdoct tok, int line, int ppos)

{

struct mdoc_node *n;

n = m->last;

n = mdoc->last;

while (n) {

switch (rew_dohalt(tok, t, n)) {

case (REWIND_NONE):

return(1);

case (REWIND_THIS):

n->lastline = line -

(MDOC_NEWLINE & mdoc->flags &&

! (MDOC_EXPLICIT & mdoc_macros[tok].flags));

break;

case (REWIND_FORCE):

mandoc_vmsg(MANDOCERR_SCOPEBROKEN, m->parse,

mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse,

line, ppos, "%s breaks %s",

mdoc_macronames[tok],

mdoc_macronames[n->tok]);

/* FALLTHROUGH */

case (REWIND_MORE):

n->lastline = line -

(MDOC_NEWLINE & mdoc->flags ? 1 : 0);

n = n->parent;

continue;

case (REWIND_LATER):

if (make_pending(n, tok, m, line, ppos) ||

if (make_pending(n, tok, mdoc, line, ppos) ||

MDOC_BLOCK != t)

return(1);

/* FALLTHROUGH */

case (REWIND_ERROR):

mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_NOSCOPE);

return(1);

}

break;

}

assert(n);

if ( ! rew_last(m, n))

if ( ! rew_last(mdoc, n))

return(0);

Line 573 rew_sub(enum mdoc_type t, struct mdoc *m,

Line 597 rew_sub(enum mdoc_type t, struct mdoc *m,

* Now that the current block ends, close the enclosing block, too.

while (NULL != (n = n->pending)) {

if ( ! rew_last(m, n))

if ( ! rew_last(mdoc, n))

return(0);

if (MDOC_HEAD == n->type &&

! mdoc_body_alloc(m, n->line, n->pos, n->tok))

! mdoc_body_alloc(mdoc, n->line, n->pos, n->tok))

return(0);

}

Line 588 rew_sub(enum mdoc_type t, struct mdoc *m,

Line 612 rew_sub(enum mdoc_type t, struct mdoc *m,

* Punctuation consists of those tokens found in mdoc_isdelim().

static int

dword(struct mdoc *m, int line,

dword(struct mdoc *mdoc, int line, int col, const char *p,

int col, const char *p, enum mdelim d)

enum mdelim d, int may_append)

{

if (DELIM_MAX == d)

d = mdoc_isdelim(p);

if ( ! mdoc_word_alloc(m, line, col, p))

if (may_append &&

! ((MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF) & mdoc->flags) &&

DELIM_NONE == d && MDOC_TEXT == mdoc->last->type &&

DELIM_NONE == mdoc_isdelim(mdoc->last->string)) {

mdoc_word_append(mdoc, p);

return(1);

}

if ( ! mdoc_word_alloc(mdoc, line, col, p))

return(0);

if (DELIM_OPEN == d)

m->last->flags |= MDOC_DELIMO;

mdoc->last->flags |= MDOC_DELIMO;

else if (DELIM_CLOSE == d)

m->last->flags |= MDOC_DELIMC;

* Closing delimiters only suppress the preceding space

* when they follow something, not when they start a new

* block or element, and not when they follow `No'.

* XXX Explicitly special-casing MDOC_No here feels

* like a layering violation. Find a better way

* and solve this in the code related to `No'!

else if (DELIM_CLOSE == d && mdoc->last->prev &&

mdoc->last->prev->tok != MDOC_No &&

mdoc->last->parent->tok != MDOC_Fd)

mdoc->last->flags |= MDOC_DELIMC;

return(1);

}

static int

append_delims(struct mdoc *m, int line, int *pos, char *buf)

append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)

{

int la;

enum margserr ac;

Line 618 append_delims(struct mdoc *m, int line, int *pos, char

Line 663 append_delims(struct mdoc *m, int line, int *pos, char

for (;;) {

la = *pos;

ac = mdoc_zargs(m, line, pos, buf, &p);

ac = mdoc_zargs(mdoc, line, pos, buf, &p);

if (ARGS_ERROR == ac)

return(0);

else if (ARGS_EOLN == ac)

break;

dword(m, line, la, p, DELIM_MAX);

dword(mdoc, line, la, p, DELIM_MAX, 1);

* If we encounter end-of-sentence symbols, then trigger

* the double-space.

* XXX: it's easy to allow this to propogate outward to

* XXX: it's easy to allow this to propagate outward to

* the last symbol, such that `. )' will cause the

* correct double-spacing. However, (1) groff isn't

* smart enough to do this and (2) it would require

* knowing which symbols break this behaviour, for

* example, `. ;' shouldn't propogate the double-space.

* example, `. ;' shouldn't propagate the double-space.

if (mandoc_eos(p, strlen(p), 0))

if (mandoc_eos(p, strlen(p)))

m->last->flags |= MDOC_EOS;

mdoc->last->flags |= MDOC_EOS;

}

return(1);

Line 661 blk_exp_close(MACRO_PROT_ARGS)

Line 706 blk_exp_close(MACRO_PROT_ARGS)

enum mdoct atok, ntok;

char *p;

nl = MDOC_NEWLINE & m->flags;

nl = MDOC_NEWLINE & mdoc->flags;

switch (tok) {

case (MDOC_Ec):

maxargs = 1;

break;

case (MDOC_Ek):

mdoc->flags &= ~MDOC_KEEP;

default:

maxargs = 0;

break;

Line 678 blk_exp_close(MACRO_PROT_ARGS)

Line 725 blk_exp_close(MACRO_PROT_ARGS)

atok = rew_alt(tok);

body = later = NULL;

for (n = m->last; n; n = n->parent) {

for (n = mdoc->last; n; n = n->parent) {

if (MDOC_VALID & n->flags)

continue;

Line 707 blk_exp_close(MACRO_PROT_ARGS)

Line 754 blk_exp_close(MACRO_PROT_ARGS)

* postpone closing out the current block

* until the rew_sub() closing out the sub-block.

make_pending(later, tok, m, line, ppos);

make_pending(later, tok, mdoc, line, ppos);

* Mark the place where the formatting - but not

* the scope - of the current block ends.

if ( ! mdoc_endbody_alloc(m, line, ppos,

if ( ! mdoc_endbody_alloc(mdoc, line, ppos,

atok, body, ENDBODY_SPACE))

return(0);

break;

Line 727 blk_exp_close(MACRO_PROT_ARGS)

Line 774 blk_exp_close(MACRO_PROT_ARGS)

if (later &&

MDOC_EXPLICIT & mdoc_macros[later->tok].flags)

continue;

if (MDOC_CALLABLE & mdoc_macros[n->tok].flags)

if (MDOC_It != n->tok)

later = n;

}

if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {

/* FIXME: do this in validate */

if (buf[*pos])

mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST);

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST);

if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))

return(0);

return(rew_sub(MDOC_BLOCK, m, tok, line, ppos));

return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos));

}

if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))

return(0);

if (NULL == later && maxargs > 0)

if ( ! mdoc_tail_alloc(m, line, ppos, rew_alt(tok)))

if ( ! mdoc_tail_alloc(mdoc, line, ppos, rew_alt(tok)))

return(0);

for (flushed = j = 0; ; j++) {

lastarg = *pos;

if (j == maxargs && ! flushed) {

if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))

return(0);

flushed = 1;

}

ac = mdoc_args(m, line, pos, buf, tok, &p);

ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

if (ARGS_ERROR == ac)

return(0);

Line 769 blk_exp_close(MACRO_PROT_ARGS)

Line 816 blk_exp_close(MACRO_PROT_ARGS)

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);

if (MDOC_MAX == ntok) {

if ( ! dword(m, line, lastarg, p, DELIM_MAX))

if ( ! dword(mdoc, line, lastarg, p, DELIM_MAX,

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

continue;

}

if ( ! flushed) {

if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))

return(0);

flushed = 1;

}

if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf))

mdoc->flags &= ~MDOC_NEWLINE;

if ( ! mdoc_macro(mdoc, ntok, line, lastarg, pos, buf))

return(0);

break;

}

if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))

if ( ! flushed && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))

return(0);

if ( ! nl)

return(1);

return(append_delims(m, line, pos, buf));

return(append_delims(mdoc, line, pos, buf));

}

Line 804 in_line(MACRO_PROT_ARGS)

Line 855 in_line(MACRO_PROT_ARGS)

struct mdoc_arg *arg;

char *p;

nl = MDOC_NEWLINE & m->flags;

nl = MDOC_NEWLINE & mdoc->flags;

* Whether we allow ignored elements (those without content,

Line 832 in_line(MACRO_PROT_ARGS)

Line 883 in_line(MACRO_PROT_ARGS)

for (arg = NULL;; ) {

la = *pos;

av = mdoc_argv(m, line, tok, &arg, pos, buf);

av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);

if (ARGV_WORD == av) {

*pos = la;

Line 849 in_line(MACRO_PROT_ARGS)

Line 900 in_line(MACRO_PROT_ARGS)

for (cnt = scope = 0;; ) {

la = *pos;

ac = mdoc_args(m, line, pos, buf, tok, &p);

ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

if (ARGS_ERROR == ac)

return(0);

Line 868 in_line(MACRO_PROT_ARGS)

Line 919 in_line(MACRO_PROT_ARGS)

if (MDOC_MAX != ntok) {

if (scope && ! rew_elem(m, tok))

if (scope && ! rew_elem(mdoc, tok))

return(0);

if (nc && 0 == cnt) {

if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))

if ( ! mdoc_elem_alloc(mdoc, line,

ppos, tok, arg))

return(0);

if ( ! rew_last(m, m->last))

if ( ! rew_last(mdoc, mdoc->last))

return(0);

} else if ( ! nc && 0 == cnt) {

mdoc_argv_free(arg);

mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY);

mdoc_pmsg(mdoc, line, ppos,

MANDOCERR_MACROEMPTY);

}

if ( ! mdoc_macro(m, ntok, line, la, pos, buf))

if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))

return(0);

if ( ! nl)

return(1);

return(append_delims(m, line, pos, buf));

return(append_delims(mdoc, line, pos, buf));

}

Line 906 in_line(MACRO_PROT_ARGS)

Line 959 in_line(MACRO_PROT_ARGS)

if (0 == cnt && (nc || MDOC_Li == tok) &&

DELIM_CLOSE == d && ! scope) {

if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))

if ( ! mdoc_elem_alloc(mdoc, line,

ppos, tok, arg))

return(0);

if (MDOC_Ar == tok || MDOC_Li == tok ||

MDOC_Fl == tok)

Line 917 in_line(MACRO_PROT_ARGS)

Line 971 in_line(MACRO_PROT_ARGS)

* Close out our scope, if one is open, before

* any punctuation.

if (scope && ! rew_elem(m, tok))

if (scope && ! rew_elem(mdoc, tok))

return(0);

scope = 0;

} else if ( ! scope) {

if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))

if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))

return(0);

scope = 1;

}

Line 929 in_line(MACRO_PROT_ARGS)

Line 983 in_line(MACRO_PROT_ARGS)

if (DELIM_NONE == d)

cnt++;

if ( ! dword(m, line, la, p, d))

if ( ! dword(mdoc, line, la, p, d,

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

Line 938 in_line(MACRO_PROT_ARGS)

Line 993 in_line(MACRO_PROT_ARGS)

* having to parse out spaces.

if (scope && MDOC_Fl == tok) {

if ( ! rew_elem(m, tok))

if ( ! rew_elem(mdoc, tok))

return(0);

scope = 0;

}

if (scope && ! rew_elem(m, tok))

if (scope && ! rew_elem(mdoc, tok))

return(0);

Line 954 in_line(MACRO_PROT_ARGS)

Line 1009 in_line(MACRO_PROT_ARGS)

if (nc && 0 == cnt) {

if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))

if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))

return(0);

if ( ! rew_last(m, m->last))

if ( ! rew_last(mdoc, mdoc->last))

return(0);

} else if ( ! nc && 0 == cnt) {

mdoc_argv_free(arg);

mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY);

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY);

}

if ( ! nl)

return(1);

return(append_delims(m, line, pos, buf));

return(append_delims(mdoc, line, pos, buf));

}

static int

blk_full(MACRO_PROT_ARGS)

{

int la, nl;

int la, nl, nparsed;

struct mdoc_arg *arg;

struct mdoc_node *head; /* save of head macro */

struct mdoc_node *body; /* save of body macro */

Line 983 blk_full(MACRO_PROT_ARGS)

Line 1038 blk_full(MACRO_PROT_ARGS)

enum margverr av;

char *p;

nl = MDOC_NEWLINE & m->flags;

nl = MDOC_NEWLINE & mdoc->flags;

/* Close out prior implicit scope. */

if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {

if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))

return(0);

if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))

return(0);

}

* This routine accomodates implicitly- and explicitly-scoped

* This routine accommodates implicitly- and explicitly-scoped

* macro openings. Implicit ones first close out prior scope

* (seen above). Delay opening the head until necessary to

* allow leading punctuation to print. Special consideration

Line 1005 blk_full(MACRO_PROT_ARGS)

Line 1060 blk_full(MACRO_PROT_ARGS)

for (arg = NULL;; ) {

la = *pos;

av = mdoc_argv(m, line, tok, &arg, pos, buf);

av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);

if (ARGV_WORD == av) {

*pos = la;

Line 1021 blk_full(MACRO_PROT_ARGS)

Line 1076 blk_full(MACRO_PROT_ARGS)

return(0);

}

if ( ! mdoc_block_alloc(m, line, ppos, tok, arg))

if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg))

return(0);

head = body = NULL;

* Exception: Heads of `It' macros in `-diag' lists are not

* parsed, even though `It' macros in general are parsed.

nparsed = MDOC_It == tok &&

MDOC_Bl == mdoc->last->parent->tok &&

LIST_diag == mdoc->last->parent->norm->Bl.type;

* The `Nd' macro has all arguments in its body: it's a hybrid

* of block partial-explicit and full-implicit. Stupid.

if (MDOC_Nd == tok) {

if ( ! mdoc_head_alloc(m, line, ppos, tok))

if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

return(0);

head = m->last;

head = mdoc->last;

if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))

if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))

return(0);

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

body = m->last;

body = mdoc->last;

}

if (MDOC_Bk == tok)

mdoc->flags |= MDOC_KEEP;

ac = ARGS_ERROR;

for ( ; ; ) {

la = *pos;

/* Initialise last-phrase-type with ARGS_PEND. */

lac = ARGS_ERROR == ac ? ARGS_PEND : ac;

ac = mdoc_args(m, line, pos, buf, tok, &p);

ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

if (ARGS_PUNCT == ac)

break;

Line 1066 blk_full(MACRO_PROT_ARGS)

Line 1132 blk_full(MACRO_PROT_ARGS)

* reopen our scope if the last parse was a

* phrase or partial phrase.

if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))

return(0);

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

body = m->last;

body = mdoc->last;

break;

}

Line 1085 blk_full(MACRO_PROT_ARGS)

Line 1151 blk_full(MACRO_PROT_ARGS)

ARGS_PPHRASE != ac &&

ARGS_QWORD != ac &&

DELIM_OPEN == mdoc_isdelim(p)) {

if ( ! dword(m, line, la, p, DELIM_OPEN))

if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))

return(0);

continue;

}

Line 1093 blk_full(MACRO_PROT_ARGS)

Line 1159 blk_full(MACRO_PROT_ARGS)

/* Open a head if one hasn't been opened. */

if (NULL == head) {

if ( ! mdoc_head_alloc(m, line, ppos, tok))

if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

return(0);

head = m->last;

head = mdoc->last;

}

if (ARGS_PHRASE == ac ||

Line 1107 blk_full(MACRO_PROT_ARGS)

Line 1173 blk_full(MACRO_PROT_ARGS)

mtt = body ? MDOC_BODY : MDOC_HEAD;

if ( ! rew_sub(mtt, m, tok, line, ppos))

if ( ! rew_sub(mtt, mdoc, tok, line, ppos))

return(0);

/* Then allocate our body context. */

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

body = m->last;

body = mdoc->last;

* Process phrases: set whether we're in a

Line 1123 blk_full(MACRO_PROT_ARGS)

Line 1189 blk_full(MACRO_PROT_ARGS)

if (ARGS_PPHRASE == ac)

m->flags |= MDOC_PPHRASE;

mdoc->flags |= MDOC_PPHRASE;

if (ARGS_PEND == ac && ARGS_PPHRASE == lac)

m->flags |= MDOC_PPHRASE;

mdoc->flags |= MDOC_PPHRASE;

if ( ! phrase(m, line, la, buf))

if ( ! phrase(mdoc, line, la, buf))

return(0);

m->flags &= ~MDOC_PPHRASE;

mdoc->flags &= ~MDOC_PPHRASE;

continue;

}

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);

ntok = nparsed || ARGS_QWORD == ac ?

MDOC_MAX : lookup(tok, p);

if (MDOC_MAX == ntok) {

if ( ! dword(m, line, la, p, DELIM_MAX))

if ( ! dword(mdoc, line, la, p, DELIM_MAX,

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

continue;

}

if ( ! mdoc_macro(m, ntok, line, la, pos, buf))

if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))

return(0);

break;

}

if (NULL == head) {

if ( ! mdoc_head_alloc(m, line, ppos, tok))

if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

return(0);

head = m->last;

head = mdoc->last;

}

if (nl && ! append_delims(m, line, pos, buf))

if (nl && ! append_delims(mdoc, line, pos, buf))

return(0);

/* If we've already opened our body, exit now. */

Line 1167 blk_full(MACRO_PROT_ARGS)

Line 1235 blk_full(MACRO_PROT_ARGS)

* head to body until the rew_sub() call closing out that

* sub-block.

for (n = m->last; n && n != head; n = n->parent) {

for (n = mdoc->last; n && n != head; n = n->parent) {

if (MDOC_BLOCK == n->type &&

MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&

! (MDOC_VALID & n->flags)) {

Line 1178 blk_full(MACRO_PROT_ARGS)

Line 1246 blk_full(MACRO_PROT_ARGS)

/* Close out scopes to remain in a consistent state. */

if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))

if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))

return(0);

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

out:

if ( ! (MDOC_FREECOL & m->flags))

if ( ! (MDOC_FREECOL & mdoc->flags))

return(1);

if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))

return(0);

if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))

if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))

return(0);

m->flags &= ~MDOC_FREECOL;

mdoc->flags &= ~MDOC_FREECOL;

return(1);

}

Line 1208 blk_part_imp(MACRO_PROT_ARGS)

Line 1276 blk_part_imp(MACRO_PROT_ARGS)

struct mdoc_node *body; /* saved body context */

struct mdoc_node *n;

nl = MDOC_NEWLINE & m->flags;

nl = MDOC_NEWLINE & mdoc->flags;

* A macro that spans to the end of the line. This is generally

Line 1219 blk_part_imp(MACRO_PROT_ARGS)

Line 1287 blk_part_imp(MACRO_PROT_ARGS)

* or more closing punctuation nodes.

if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL))

if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))

return(0);

blk = m->last;

blk = mdoc->last;

if ( ! mdoc_head_alloc(m, line, ppos, tok))

if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

return(0);

if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))

if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))

return(0);

Line 1237 blk_part_imp(MACRO_PROT_ARGS)

Line 1305 blk_part_imp(MACRO_PROT_ARGS)

for (body = NULL; ; ) {

la = *pos;

ac = mdoc_args(m, line, pos, buf, tok, &p);

ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

if (ARGS_ERROR == ac)

return(0);

Line 1248 blk_part_imp(MACRO_PROT_ARGS)

Line 1316 blk_part_imp(MACRO_PROT_ARGS)

if (NULL == body && ARGS_QWORD != ac &&

DELIM_OPEN == mdoc_isdelim(p)) {

if ( ! dword(m, line, la, p, DELIM_OPEN))

if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))

return(0);

continue;

}

if (NULL == body) {

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

body = m->last;

body = mdoc->last;

}

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);

if (MDOC_MAX == ntok) {

if ( ! dword(m, line, la, p, DELIM_MAX))

if ( ! dword(mdoc, line, la, p, DELIM_MAX,

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

continue;

}

if ( ! mdoc_macro(m, ntok, line, la, pos, buf))

if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))

return(0);

break;

}

Line 1275 blk_part_imp(MACRO_PROT_ARGS)

Line 1344 blk_part_imp(MACRO_PROT_ARGS)

/* Clean-ups to leave in a consistent state. */

if (NULL == body) {

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

body = m->last;

body = mdoc->last;

}

for (n = body->child; n && n->next; n = n->next)

/* Do nothing. */ ;

* End of sentence spacing: if the last node is a text node and

* has a trailing period, then mark it as being end-of-sentence.

if (n && MDOC_TEXT == n->type && n->string)

if (mandoc_eos(n->string, strlen(n->string), 1))

n->flags |= MDOC_EOS;

/* Up-propogate the end-of-space flag. */

if (n && (MDOC_EOS & n->flags)) {

body->flags |= MDOC_EOS;

body->parent->flags |= MDOC_EOS;

}

* If there is an open sub-block requiring explicit close-out,

* postpone closing out the current block

* until the rew_sub() call closing out the sub-block.

for (n = m->last; n && n != body && n != blk->parent; n = n->parent) {

for (n = mdoc->last; n && n != body && n != blk->parent;

n = n->parent) {

if (MDOC_BLOCK == n->type &&

MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&

! (MDOC_VALID & n->flags)) {

make_pending(n, tok, m, line, ppos);

make_pending(n, tok, mdoc, line, ppos);

if ( ! mdoc_endbody_alloc(m, line, ppos,

if ( ! mdoc_endbody_alloc(mdoc, line, ppos,

tok, body, ENDBODY_NOSPACE))

return(0);

return(1);

Line 1323 blk_part_imp(MACRO_PROT_ARGS)

Line 1374 blk_part_imp(MACRO_PROT_ARGS)

* crufty use of `Op' breakage.

if (n != body)

mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos,

mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos,

"%s broken", mdoc_macronames[tok]);

if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos))

if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))

return(0);

/* Standard appending of delimiters. */

if (nl && ! append_delims(m, line, pos, buf))

if (nl && ! append_delims(mdoc, line, pos, buf))

return(0);

/* Rewind scope, if applicable. */

if (n && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))

if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))

return(0);

/* Move trailing .Ns out of scope. */

for (n = body->child; n && n->next; n = n->next)

/* Do nothing. */ ;

if (n && MDOC_Ns == n->tok)

mdoc_node_relink(mdoc, n);

return(1);

}

Line 1353 blk_part_exp(MACRO_PROT_ARGS)

Line 1411 blk_part_exp(MACRO_PROT_ARGS)

char *p;

enum mdoct ntok;

nl = MDOC_NEWLINE & m->flags;

nl = MDOC_NEWLINE & mdoc->flags;

* The opening of an explicit macro having zero or more leading

Line 1361 blk_part_exp(MACRO_PROT_ARGS)

Line 1419 blk_part_exp(MACRO_PROT_ARGS)

* case of `Eo'); and a body that may be empty.

if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL))

if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))

return(0);

for (head = body = NULL; ; ) {

la = *pos;

ac = mdoc_args(m, line, pos, buf, tok, &p);

ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

if (ARGS_ERROR == ac)

return(0);

Line 1380 blk_part_exp(MACRO_PROT_ARGS)

Line 1438 blk_part_exp(MACRO_PROT_ARGS)

if (NULL == head && ARGS_QWORD != ac &&

DELIM_OPEN == mdoc_isdelim(p)) {

assert(NULL == body);

if ( ! dword(m, line, la, p, DELIM_OPEN))

if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))

return(0);

continue;

}

if (NULL == head) {

assert(NULL == body);

if ( ! mdoc_head_alloc(m, line, ppos, tok))

if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

return(0);

head = m->last;

head = mdoc->last;

}

Line 1401 blk_part_exp(MACRO_PROT_ARGS)

Line 1459 blk_part_exp(MACRO_PROT_ARGS)

assert(head);

/* No check whether it's a macro! */

if (MDOC_Eo == tok)

if ( ! dword(m, line, la, p, DELIM_MAX))

if ( ! dword(mdoc, line, la, p, DELIM_MAX, 0))

return(0);

if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))

if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))

return(0);

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

body = m->last;

body = mdoc->last;

if (MDOC_Eo == tok)

continue;

Line 1419 blk_part_exp(MACRO_PROT_ARGS)

Line 1477 blk_part_exp(MACRO_PROT_ARGS)

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);

if (MDOC_MAX == ntok) {

if ( ! dword(m, line, la, p, DELIM_MAX))

if ( ! dword(mdoc, line, la, p, DELIM_MAX,

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

continue;

}

if ( ! mdoc_macro(m, ntok, line, la, pos, buf))

if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))

return(0);

break;

}

/* Clean-up to leave in a consistent state. */

if (NULL == head) {

if (NULL == head)

if ( ! mdoc_head_alloc(m, line, ppos, tok))

if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

return(0);

head = m->last;

}

if (NULL == body) {

if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))

if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))

return(0);

if ( ! mdoc_body_alloc(m, line, ppos, tok))

if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))

return(0);

body = m->last;

}

/* Standard appending of delimiters. */

if ( ! nl)

return(1);

return(append_delims(m, line, pos, buf));

return(append_delims(mdoc, line, pos, buf));

}

Line 1464 in_line_argn(MACRO_PROT_ARGS)

Line 1520 in_line_argn(MACRO_PROT_ARGS)

char *p;

enum mdoct ntok;

nl = MDOC_NEWLINE & m->flags;

nl = MDOC_NEWLINE & mdoc->flags;

* A line macro that has a fixed number of arguments (maxargs).

Line 1496 in_line_argn(MACRO_PROT_ARGS)

Line 1552 in_line_argn(MACRO_PROT_ARGS)

for (arg = NULL; ; ) {

la = *pos;

av = mdoc_argv(m, line, tok, &arg, pos, buf);

av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);

if (ARGV_WORD == av) {

*pos = la;

Line 1514 in_line_argn(MACRO_PROT_ARGS)

Line 1570 in_line_argn(MACRO_PROT_ARGS)

for (flushed = j = 0; ; ) {

la = *pos;

ac = mdoc_args(m, line, pos, buf, tok, &p);

ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

if (ARGS_ERROR == ac)

return(0);

Line 1526 in_line_argn(MACRO_PROT_ARGS)

Line 1582 in_line_argn(MACRO_PROT_ARGS)

if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&

ARGS_QWORD != ac && 0 == j &&

DELIM_OPEN == mdoc_isdelim(p)) {

if ( ! dword(m, line, la, p, DELIM_OPEN))

if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))

return(0);

continue;

} else if (0 == j)

if ( ! mdoc_elem_alloc(m, line, la, tok, arg))

if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg))

return(0);

if (j == maxargs && ! flushed) {

if ( ! rew_elem(m, tok))

if ( ! rew_elem(mdoc, tok))

return(0);

flushed = 1;

}

Line 1542 in_line_argn(MACRO_PROT_ARGS)

Line 1598 in_line_argn(MACRO_PROT_ARGS)

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);

if (MDOC_MAX != ntok) {

if ( ! flushed && ! rew_elem(m, tok))

if ( ! flushed && ! rew_elem(mdoc, tok))

return(0);

flushed = 1;

if ( ! mdoc_macro(m, ntok, line, la, pos, buf))

if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))

return(0);

j++;

break;

Line 1555 in_line_argn(MACRO_PROT_ARGS)

Line 1611 in_line_argn(MACRO_PROT_ARGS)

ARGS_QWORD != ac &&

! flushed &&

DELIM_NONE != mdoc_isdelim(p)) {

if ( ! rew_elem(m, tok))

if ( ! rew_elem(mdoc, tok))

return(0);

flushed = 1;

}

if ( ! dword(mdoc, line, la, p, DELIM_MAX,

* XXX: this is a hack to work around groff's ugliness

MDOC_JOIN & mdoc_macros[tok].flags))

* as regards `Xr' and extraneous arguments. It should

* ideally be deprecated behaviour, but because this is

* code is no here, it's unlikely to be removed.

#ifdef __OpenBSD__

if (MDOC_Xr == tok && j == maxargs) {

if ( ! mdoc_elem_alloc(m, line, la, MDOC_Ns, NULL))

return(0);

if ( ! rew_elem(m, MDOC_Ns))

return(0);

}

#endif

if ( ! dword(m, line, la, p, DELIM_MAX))

return(0);

j++;

}

if (0 == j && ! mdoc_elem_alloc(m, line, la, tok, arg))

if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg))

return(0);

/* Close out in a consistent state. */

if ( ! flushed && ! rew_elem(m, tok))

if ( ! flushed && ! rew_elem(mdoc, tok))

return(0);

if ( ! nl)

return(1);

return(append_delims(m, line, pos, buf));

return(append_delims(mdoc, line, pos, buf));

}

Line 1607 in_line_eoln(MACRO_PROT_ARGS)

Line 1648 in_line_eoln(MACRO_PROT_ARGS)

assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));

if (tok == MDOC_Pp)

rew_sub(MDOC_BLOCK, m, MDOC_Nm, line, ppos);

rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos);

/* Parse macro arguments. */

for (arg = NULL; ; ) {

la = *pos;

av = mdoc_argv(m, line, tok, &arg, pos, buf);

av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);

if (ARGV_WORD == av) {

*pos = la;

Line 1630 in_line_eoln(MACRO_PROT_ARGS)

Line 1671 in_line_eoln(MACRO_PROT_ARGS)

/* Open element scope. */

if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))

if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))

return(0);

/* Parse argument terms. */

for (;;) {

la = *pos;

ac = mdoc_args(m, line, pos, buf, tok, &p);

ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

if (ARGS_ERROR == ac)

return(0);

Line 1647 in_line_eoln(MACRO_PROT_ARGS)

Line 1688 in_line_eoln(MACRO_PROT_ARGS)

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);

if (MDOC_MAX == ntok) {

if ( ! dword(m, line, la, p, DELIM_MAX))

if ( ! dword(mdoc, line, la, p, DELIM_MAX,

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

continue;

}

if ( ! rew_elem(m, tok))

if ( ! rew_elem(mdoc, tok))

return(0);

return(mdoc_macro(m, ntok, line, la, pos, buf));

return(mdoc_macro(mdoc, ntok, line, la, pos, buf));

}

/* Close out (no delimiters). */

return(rew_elem(m, tok));

return(rew_elem(mdoc, tok));

}

Line 1669 ctx_synopsis(MACRO_PROT_ARGS)

Line 1711 ctx_synopsis(MACRO_PROT_ARGS)

{

int nl;

nl = MDOC_NEWLINE & m->flags;

nl = MDOC_NEWLINE & mdoc->flags;

/* If we're not in the SYNOPSIS, go straight to in-line. */

if ( ! (MDOC_SYNOPSIS & m->flags))

if ( ! (MDOC_SYNOPSIS & mdoc->flags))

return(in_line(m, tok, line, ppos, pos, buf));

return(in_line(mdoc, tok, line, ppos, pos, buf));

/* If we're a nested call, same place. */

if ( ! nl)

return(in_line(m, tok, line, ppos, pos, buf));

return(in_line(mdoc, tok, line, ppos, pos, buf));

* XXX: this will open a block scope; however, if later we end

Line 1685 ctx_synopsis(MACRO_PROT_ARGS)

Line 1727 ctx_synopsis(MACRO_PROT_ARGS)

* the formatting. Be careful.

if (MDOC_Nm == tok)

return(blk_full(m, tok, line, ppos, pos, buf));

return(blk_full(mdoc, tok, line, ppos, pos, buf));

assert(MDOC_Vt == tok);

return(blk_part_imp(m, tok, line, ppos, pos, buf));

return(blk_part_imp(mdoc, tok, line, ppos, pos, buf));

}

Line 1696 static int

Line 1738 static int

obsolete(MACRO_PROT_ARGS)

{

mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS);

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS);

return(1);

}

Line 1707 obsolete(MACRO_PROT_ARGS)

Line 1749 obsolete(MACRO_PROT_ARGS)

* macro is encountered.

static int

phrase(struct mdoc *m, int line, int ppos, char *buf)

phrase(struct mdoc *mdoc, int line, int ppos, char *buf)

{

int la, pos;

enum margserr ac;

Line 1717 phrase(struct mdoc *m, int line, int ppos, char *buf)

Line 1759 phrase(struct mdoc *m, int line, int ppos, char *buf)

for (pos = ppos; ; ) {

la = pos;

ac = mdoc_zargs(m, line, &pos, buf, &p);

ac = mdoc_zargs(mdoc, line, &pos, buf, &p);

if (ARGS_ERROR == ac)

return(0);

Line 1727 phrase(struct mdoc *m, int line, int ppos, char *buf)

Line 1769 phrase(struct mdoc *m, int line, int ppos, char *buf)

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);

if (MDOC_MAX == ntok) {

if ( ! dword(m, line, la, p, DELIM_MAX))

if ( ! dword(mdoc, line, la, p, DELIM_MAX, 1))

return(0);

continue;

}

if ( ! mdoc_macro(m, ntok, line, la, &pos, buf))

if ( ! mdoc_macro(mdoc, ntok, line, la, &pos, buf))

return(0);

return(append_delims(m, line, &pos, buf));

return(append_delims(mdoc, line, &pos, buf));

}

return(1);

Line 1745 phrase(struct mdoc *m, int line, int ppos, char *buf)

Line 1787 phrase(struct mdoc *m, int line, int ppos, char *buf)

static int

phrase_ta(MACRO_PROT_ARGS)

{

struct mdoc_node *n;

int la;

enum mdoct ntok;

enum margserr ac;

char *p;

/* Make sure we are in a column list or ignore this macro. */

* FIXME: this is overly restrictive: if the `Ta' is unexpected,

n = mdoc->last;

* it should simply error out with ARGSLOST.

while (NULL != n && MDOC_Bl != n->tok)

n = n->parent;

if (NULL == n || LIST_column != n->norm->Bl.type) {

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_STRAYTA);

return(1);

}

if ( ! rew_sub(MDOC_BODY, m, MDOC_It, line, ppos))

/* Advance to the next column. */

if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos))

return(0);

if ( ! mdoc_body_alloc(m, line, ppos, MDOC_It))

if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It))

return(0);

for (;;) {

la = *pos;

ac = mdoc_zargs(m, line, pos, buf, &p);

ac = mdoc_zargs(mdoc, line, pos, buf, &p);

if (ARGS_ERROR == ac)

return(0);

Line 1772 phrase_ta(MACRO_PROT_ARGS)

Line 1820 phrase_ta(MACRO_PROT_ARGS)

ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);

if (MDOC_MAX == ntok) {

if ( ! dword(m, line, la, p, DELIM_MAX))

if ( ! dword(mdoc, line, la, p, DELIM_MAX,

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

continue;

}

if ( ! mdoc_macro(m, ntok, line, la, pos, buf))

if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))

return(0);

return(append_delims(m, line, pos, buf));

return(append_delims(mdoc, line, pos, buf));

}

return(1);

CVSweb