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.137 and 1.152

version 1.137, 2014/07/07 21:36:20

version 1.152, 2014/11/28 23:21:32

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 15

* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#include <sys/types.h>

#include <assert.h>

#include <ctype.h>

#include <stdlib.h>

Line 40 enum rew { /* see rew_dohalt() */

REWIND_ERROR

};

static int blk_full(MACRO_PROT_ARGS);

static void blk_full(MACRO_PROT_ARGS);

static int blk_exp_close(MACRO_PROT_ARGS);

static void blk_exp_close(MACRO_PROT_ARGS);

static int blk_part_exp(MACRO_PROT_ARGS);

static void blk_part_exp(MACRO_PROT_ARGS);

static int blk_part_imp(MACRO_PROT_ARGS);

static void blk_part_imp(MACRO_PROT_ARGS);

static int ctx_synopsis(MACRO_PROT_ARGS);

static void ctx_synopsis(MACRO_PROT_ARGS);

static int in_line_eoln(MACRO_PROT_ARGS);

static void in_line_eoln(MACRO_PROT_ARGS);

static int in_line_argn(MACRO_PROT_ARGS);

static void in_line_argn(MACRO_PROT_ARGS);

static int in_line(MACRO_PROT_ARGS);

static void in_line(MACRO_PROT_ARGS);

static int phrase_ta(MACRO_PROT_ARGS);

static void phrase_ta(MACRO_PROT_ARGS);

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

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

enum mdelim, int);

static int append_delims(struct mdoc *,

static void append_delims(struct mdoc *, int, int *, char *);

int, int *, char *);

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

static enum mdoct lookup_raw(const char *);

static int make_pending(struct mdoc_node *, enum mdoct,

struct mdoc *, int, int);

static int phrase(struct mdoc *, int, int, char *);

static void phrase(struct mdoc *, int, int, char *);

static enum mdoct rew_alt(enum mdoct);

static enum rew rew_dohalt(enum mdoct, enum mdoc_type,

const struct mdoc_node *);

static int rew_elem(struct mdoc *, enum mdoct);

static void rew_elem(struct mdoc *, enum mdoct);

static int rew_last(struct mdoc *,

static void rew_last(struct mdoc *, const struct mdoc_node *);

const struct mdoc_node *);

static void rew_sub(enum mdoc_type, struct mdoc *,

static int rew_sub(enum mdoc_type, struct mdoc *,

enum mdoct, int, int);

const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

Line 147 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

Line 145 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

{ 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, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* No */

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED |

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 */

Line 172 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

Line 169 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

{ 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_argn, 0 }, /* Sm */

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

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

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

Line 210 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

Line 207 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

{ in_line_eoln, 0 }, /* sp */

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

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

{ in_line_eoln, 0 }, /* ll */

{ in_line_eoln, MDOC_PROLOGUE }, /* ll */

};

const struct mdoc_macro * const mdoc_macros = __mdoc_macros;

Line 221 const struct mdoc_macro * const mdoc_macros = __mdoc_m

Line 218 const struct mdoc_macro * const mdoc_macros = __mdoc_m

* closing out open [implicit] scopes. Obviously, open explicit scopes

* are errors.

int

void

mdoc_macroend(struct mdoc *mdoc)

{

struct mdoc_node *n;

/* Scan for open explicit scopes. */

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

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

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

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

if (MDOC_BLOCK == n->type &&

if (n->type == MDOC_BLOCK &&

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

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

mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,

n->line, n->pos, mdoc_macronames[n->tok]);

/* Rewind to the first. */

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

rew_last(mdoc, mdoc->first);

}

Line 269 lookup_raw(const char *p)

Line 266 lookup_raw(const char *p)

return(MDOC_MAX);

}

static int

static void

rew_last(struct mdoc *mdoc, const struct mdoc_node *to)

{

struct mdoc_node *n, *np;

assert(to);

mdoc->next = MDOC_NEXT_SIBLING;

while (mdoc->last != to) {

* Save the parent here, because we may delete the

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

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

* out to be lost.

np = mdoc->last->parent;

if ( ! mdoc_valid_post(mdoc))

mdoc_valid_post(mdoc);

return(0);

n = mdoc->last;

mdoc->last = np;

assert(mdoc->last);

mdoc->last->last = n;

}

mdoc_valid_post(mdoc);

return(mdoc_valid_post(mdoc));

}

Line 424 rew_dohalt(enum mdoct tok, enum mdoc_type type,

Line 417 rew_dohalt(enum mdoct tok, enum mdoc_type type,

return(REWIND_NONE);

/* FALLTHROUGH */

case MDOC_Sh:

if (MDOC_ROOT == p->parent->type)

return(REWIND_THIS);

if (MDOC_Nd == p->tok || MDOC_Ss == p->tok ||

MDOC_Sh == p->tok)

return(REWIND_MORE);

Line 436 rew_dohalt(enum mdoct tok, enum mdoc_type type,

Line 431 rew_dohalt(enum mdoct tok, enum mdoc_type type,

* Default block rewinding rules.

* In particular, always skip block end markers,

* and let all blocks rewind Nm children.

* Do not warn again when closing a block,

* since closing the body already warned.

if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok ||

(MDOC_BLOCK == p->type &&

MDOC_BLOCK == type || (MDOC_BLOCK == p->type &&

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

return(REWIND_MORE);

Line 452 rew_dohalt(enum mdoct tok, enum mdoc_type type,

Line 449 rew_dohalt(enum mdoct tok, enum mdoc_type type,

REWIND_FORCE : REWIND_LATER);

}

static int

static void

rew_elem(struct mdoc *mdoc, enum mdoct tok)

{

struct mdoc_node *n;

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

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

n = n->parent;

assert(MDOC_ELEM == n->type);

assert(tok == n->tok);

rew_last(mdoc, n);

return(rew_last(mdoc, n));

}

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

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

return(0);

}

static int

static void

rew_sub(enum mdoc_type t, struct mdoc *mdoc,

enum mdoct tok, int line, int ppos)

{

Line 552 rew_sub(enum mdoc_type t, struct mdoc *mdoc,

Line 548 rew_sub(enum mdoc_type t, struct mdoc *mdoc,

while (n) {

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

case REWIND_NONE:

return(1);

return;

case REWIND_THIS:

n->lastline = line -

(MDOC_NEWLINE & mdoc->flags &&

(mdoc->flags & MDOC_NEWLINE &&

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

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

break;

case REWIND_FORCE:

mandoc_vmsg(MANDOCERR_BLK_BROKEN, mdoc->parse,

Line 566 rew_sub(enum mdoc_type t, struct mdoc *mdoc,

Line 562 rew_sub(enum mdoc_type t, struct mdoc *mdoc,

/* FALLTHROUGH */

case REWIND_MORE:

n->lastline = line -

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

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

n = n->parent;

continue;

case REWIND_LATER:

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

MDOC_BLOCK != t)

t != MDOC_BLOCK)

return(1);

return;

/* FALLTHROUGH */

case REWIND_ERROR:

mandoc_msg(MANDOCERR_BLK_NOTOPEN,

mdoc->parse, line, ppos,

mdoc_macronames[tok]);

return(1);

return;

}

break;

}

assert(n);

if ( ! rew_last(mdoc, n))

rew_last(mdoc, n);

return(0);

* The current block extends an enclosing block.

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

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

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

if ( ! rew_last(mdoc, n))

rew_last(mdoc, n);

return(0);

if (n->type == MDOC_HEAD)

if (MDOC_HEAD == n->type &&

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

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

return(0);

}

return(1);

}

* Allocate a word and check whether it's punctuation or not.

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

static int

static void

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

enum mdelim d, int may_append)

{

if (DELIM_MAX == d)

if (d == DELIM_MAX)

d = mdoc_isdelim(p);

if (may_append &&

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

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

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

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

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

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

mdoc_word_append(mdoc, p);

return(1);

return;

}

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

mdoc_word_alloc(mdoc, line, col, p);

return(0);

if (DELIM_OPEN == d)

mdoc->last->flags |= MDOC_DELIMO;

* Closing delimiters only suppress the preceding space

* If the word consists of a bare delimiter,

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

* flag the new node accordingly,

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

* unless doing so was vetoed by the invoking macro.

* Always clear the veto, it is only valid for one word.

* 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 &&

if (d == DELIM_OPEN)

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

mdoc->last->flags |= MDOC_DELIMO;

else if (d == DELIM_CLOSE &&

! (mdoc->flags & MDOC_NODELIMC) &&

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

mdoc->last->flags |= MDOC_DELIMC;

mdoc->flags &= ~MDOC_NODELIMC;

return(1);

}

static int

static void

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

{

int la;

enum margserr ac;

char *p;

if ('\0' == buf[*pos])

if (buf[*pos] == '\0')

return(1);

return;

for (;;) {

la = *pos;

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

if (ac == ARGS_EOLN)

if (ARGS_ERROR == ac)

return(0);

else if (ARGS_EOLN == ac)

break;

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

Line 678 append_delims(struct mdoc *mdoc, int line, int *pos, c

Line 658 append_delims(struct mdoc *mdoc, int line, int *pos, c

* knowing which symbols break this behaviour, for

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

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

mdoc->last->flags |= MDOC_EOS;

}

return(1);

}

* Close out block partial/full explicit.

static int

static void

blk_exp_close(MACRO_PROT_ARGS)

{

struct mdoc_node *body; /* Our own body. */

struct mdoc_node *endbody; /* Our own end marker. */

struct mdoc_node *later; /* A sub-block starting later. */

struct mdoc_node *n; /* For searching backwards. */

Line 708 blk_exp_close(MACRO_PROT_ARGS)

Line 688 blk_exp_close(MACRO_PROT_ARGS)

break;

case MDOC_Ek:

mdoc->flags &= ~MDOC_KEEP;

/* FALLTHROUGH */

default:

maxargs = 0;

break;

Line 717 blk_exp_close(MACRO_PROT_ARGS)

Line 698 blk_exp_close(MACRO_PROT_ARGS)

* Search backwards for beginnings of blocks,

* both of our own and of pending sub-blocks.

atok = rew_alt(tok);

body = later = NULL;

body = endbody = later = NULL;

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

if (MDOC_VALID & n->flags)

if (n->flags & MDOC_VALID)

continue;

/* Remember the start of our own body. */

if (MDOC_BODY == n->type && atok == n->tok) {

if (ENDBODY_NOT == n->end)

if (n->type == MDOC_BODY && atok == n->tok) {

if (n->end == ENDBODY_NOT)

body = n;

continue;

}

if (MDOC_BLOCK != n->type || MDOC_Nm == n->tok)

if (n->type != MDOC_BLOCK || n->tok == MDOC_Nm)

continue;

if (atok == n->tok) {

assert(body);

Line 740 blk_exp_close(MACRO_PROT_ARGS)

Line 723 blk_exp_close(MACRO_PROT_ARGS)

* When there is no pending sub block,

* just proceed to closing out.

if (NULL == later)

if (later == NULL)

break;

Line 748 blk_exp_close(MACRO_PROT_ARGS)

Line 732 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, mdoc, line, ppos);

* Mark the place where the formatting - but not

* the scope - of the current block ends.

if ( ! mdoc_endbody_alloc(mdoc, line, ppos,

atok, body, ENDBODY_SPACE))

mdoc_endbody_alloc(mdoc, line, ppos,

return(0);

atok, body, ENDBODY_SPACE);

* If a block closing macro taking arguments

* breaks another block, put the arguments

* into the end marker and remeber the

* end marker in order to close it out.

if (maxargs) {

endbody = mdoc->last;

mdoc->next = MDOC_NEXT_CHILD;

}

break;

}

Line 765 blk_exp_close(MACRO_PROT_ARGS)

Line 762 blk_exp_close(MACRO_PROT_ARGS)

* open explicit block, or, in case there are only

* implicit ones, the first open implicit block.

if (later &&

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

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

continue;

if (MDOC_It != n->tok)

if (n->tok != MDOC_It)

later = n;

}

rew_sub(MDOC_BODY, mdoc, tok, line, ppos);

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

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

if ('\0' != buf[*pos])

if (buf[*pos] != '\0')

mandoc_vmsg(MANDOCERR_ARG_SKIP,

mdoc->parse, line, ppos,

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

buf + *pos);

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

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

return(0);

return;

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

}

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

if (maxargs && endbody == NULL) {

return(0);

if (n == NULL) {

* Stray .Ec without previous .Eo:

* Break the output line, ignore any arguments.

mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);

rew_elem(mdoc, MDOC_br);

} else

mdoc_tail_alloc(mdoc, line, ppos, atok);

}

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

flushed = n == NULL;

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

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

return(0);

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

lastarg = *pos;

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

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

if (endbody == NULL)

return(0);

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

else

rew_last(mdoc, endbody);

flushed = 1;

}

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

if (ac == ARGS_PUNCT || ac == ARGS_EOLN)

if (ARGS_ERROR == ac)

return(0);

if (ARGS_PUNCT == ac)

break;

if (ARGS_EOLN == ac)

break;

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

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

if (MDOC_MAX == ntok) {

if (ntok == MDOC_MAX) {

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

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

MDOC_JOIN & mdoc_macros[tok].flags))

MDOC_JOIN & mdoc_macros[tok].flags);

return(0);

continue;

}

if ( ! flushed) {

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

if (endbody == NULL)

return(0);

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

else

rew_last(mdoc, endbody);

flushed = 1;

}

mdoc->flags &= ~MDOC_NEWLINE;

mdoc_macro(mdoc, ntok, line, lastarg, pos, buf);

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

return(0);

break;

}

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

if ( ! flushed) {

return(0);

if (endbody == NULL)

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

if ( ! nl)

else

return(1);

rew_last(mdoc, endbody);

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

}

if (nl)

append_delims(mdoc, line, pos, buf);

}

static int

static void

in_line(MACRO_PROT_ARGS)

{

int la, scope, cnt, nc, nl;

int la, scope, cnt, firstarg, mayopen, nc, nl;

enum margverr av;

enum mdoct ntok;

enum margserr ac;

enum mdelim d;

Line 875 in_line(MACRO_PROT_ARGS)

break;

}

for (arg = NULL;; ) {

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

d = DELIM_NONE;

firstarg = 1;

mayopen = 1;

for (cnt = scope = 0;; ) {

la = *pos;

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

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

if (ARGV_WORD == av) {

*pos = la;

* At the end of a macro line,

* opening delimiters do not suppress spacing.

if (ac == ARGS_EOLN) {

if (d == DELIM_OPEN)

mdoc->last->flags &= ~MDOC_DELIMO;

break;

}

if (ARGV_EOLN == av)

break;

if (ARGV_ARG == av)

continue;

mdoc_argv_free(arg);

return(0);

* The rest of the macro line is only punctuation,

}

* to be handled by append_delims().

* If there were no other arguments,

* do not allow the first one to suppress spacing,

* even if it turns out to be a closing one.

for (cnt = scope = 0;; ) {

if (ac == ARGS_PUNCT) {

la = *pos;

if (cnt == 0 && nc == 0)

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

mdoc->flags |= MDOC_NODELIMC;

if (ARGS_ERROR == ac)

return(0);

if (ARGS_EOLN == ac)

break;

if (ARGS_PUNCT == ac)

}

break;

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

ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?

MDOC_MAX : lookup(tok, p);

* In this case, we've located a submacro and must

Line 912 in_line(MACRO_PROT_ARGS)

Line 919 in_line(MACRO_PROT_ARGS)

* or raise a warning.

if (MDOC_MAX != ntok) {

if (ntok != MDOC_MAX) {

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

if (scope)

return(0);

rew_elem(mdoc, tok);

if (nc && 0 == cnt) {

if (nc && ! cnt) {

if ( ! mdoc_elem_alloc(mdoc,

mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

line, ppos, tok, arg))

rew_last(mdoc, mdoc->last);

return(0);

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

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

return(0);

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

mdoc_argv_free(arg);

mandoc_msg(MANDOCERR_MACRO_EMPTY,

mdoc->parse, line, ppos,

mdoc_macronames[tok]);

}

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

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

if (nl)

return(0);

append_delims(mdoc, line, pos, buf);

if ( ! nl)

return;

return(1);

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

}

Line 941 in_line(MACRO_PROT_ARGS)

Line 943 in_line(MACRO_PROT_ARGS)

* the word.

d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p);

d = ac == ARGS_QWORD ? DELIM_NONE : mdoc_isdelim(p);

if (DELIM_NONE != d) {

* If we encounter closing punctuation, no word

* has been omitted, no scope is open, and we're

* has been emitted, no scope is open, and we're

* allowed to have an empty element, then start

* a new scope. `Ar', `Fl', and `Li', only do

* a new scope.

* this once per invocation. There may be more

* of these (all of them?).

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

if ((d == DELIM_CLOSE ||

DELIM_CLOSE == d && ! scope) {

(d == DELIM_MIDDLE && tok == MDOC_Fl)) &&

if ( ! mdoc_elem_alloc(mdoc,

!cnt && !scope && nc && mayopen) {

line, ppos, tok, arg))

mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

return(0);

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

MDOC_Fl == tok)

cnt++;

scope = 1;

cnt++;

if (tok == MDOC_Nm)

mayopen = 0;

}

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

* any punctuation.

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

if (scope)

return(0);

rew_elem(mdoc, tok);

scope = 0;

} else if ( ! scope) {

if (tok == MDOC_Fn)

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

mayopen = 0;

return(0);

} else if (mayopen && !scope) {

mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

scope = 1;

cnt++;

}

if (DELIM_NONE == d)

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

cnt++;

MDOC_JOIN & mdoc_macros[tok].flags);

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

MDOC_JOIN & mdoc_macros[tok].flags))

* If the first argument is a closing delimiter,

return(0);

* do not suppress spacing before it.

if (firstarg && d == DELIM_CLOSE && !nc)

mdoc->last->flags &= ~MDOC_DELIMC;

firstarg = 0;

* `Fl' macros have their scope re-opened with each new

* word so that the `-' can be added to each one without

* having to parse out spaces.

if (scope && MDOC_Fl == tok) {

if (scope && tok == MDOC_Fl) {

if ( ! rew_elem(mdoc, tok))

rew_elem(mdoc, tok);

return(0);

scope = 0;

}

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

if (scope)

return(0);

rew_elem(mdoc, tok);

* If no elements have been collected and we're allowed to have

Line 1003 in_line(MACRO_PROT_ARGS)

Line 1008 in_line(MACRO_PROT_ARGS)

* raise a warning.

if (nc && 0 == cnt) {

if ( ! cnt) {

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

if (nc) {

return(0);

mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

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

rew_last(mdoc, mdoc->last);

return(0);

} else {

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

mdoc_argv_free(arg);

mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,

line, ppos, mdoc_macronames[tok]);

}

if (nl)

if ( ! nl)

append_delims(mdoc, line, pos, buf);

return(1);

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

}

static int

static void

blk_full(MACRO_PROT_ARGS)

{

int la, nl, nparsed;

Line 1027 blk_full(MACRO_PROT_ARGS)

Line 1030 blk_full(MACRO_PROT_ARGS)

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

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

struct mdoc_node *n;

enum mdoc_type mtt;

enum mdoct ntok;

enum margserr ac, lac;

enum margverr av;

char *p;

nl = MDOC_NEWLINE & mdoc->flags;

/* Skip items outside lists. */

if (tok == MDOC_It) {

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

if (n->tok == MDOC_Bl &&

! (n->flags & MDOC_VALID))

break;

if (n == NULL) {

mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,

line, ppos, "It %s", buf + *pos);

mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);

rew_elem(mdoc, MDOC_br);

return;

}

/* Close out prior implicit scope. */

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

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

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

rew_sub(MDOC_BODY, mdoc, tok, line, ppos);

return(0);

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

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

return(0);

}

Line 1053 blk_full(MACRO_PROT_ARGS)

Line 1068 blk_full(MACRO_PROT_ARGS)

* regular child nodes.

for (arg = NULL;; ) {

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

la = *pos;

mdoc_block_alloc(mdoc, line, ppos, tok, arg);

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

if (ARGV_WORD == av) {

*pos = la;

break;

}

if (ARGV_EOLN == av)

break;

if (ARGV_ARG == av)

continue;

mdoc_argv_free(arg);

return(0);

}

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;

nparsed = tok == MDOC_It &&

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

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

* 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 (tok == MDOC_Nd) {

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

head = mdoc_head_alloc(mdoc, line, ppos, tok);

return(0);

rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);

head = mdoc->last;

body = mdoc_body_alloc(mdoc, line, ppos, tok);

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

return(0);

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

return(0);

body = mdoc->last;

}

if (MDOC_Bk == tok)

if (tok == MDOC_Bk)

mdoc->flags |= MDOC_KEEP;

ac = ARGS_ERROR;

ac = ARGS_PEND;

for (;;) {

for ( ; ; ) {

la = *pos;

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

lac = ac;

lac = ARGS_ERROR == ac ? ARGS_PEND : ac;

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

if (ac == ARGS_PUNCT)

if (ARGS_PUNCT == ac)

break;

if (ac == ARGS_EOLN) {

if (ARGS_ERROR == ac)

if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE)

return(0);

if (ARGS_EOLN == ac) {

if (ARGS_PPHRASE != lac && ARGS_PHRASE != lac)

break;

* This is necessary: if the last token on a

Line 1127 blk_full(MACRO_PROT_ARGS)

Line 1112 blk_full(MACRO_PROT_ARGS)

* reopen our scope if the last parse was a

* phrase or partial phrase.

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

rew_sub(MDOC_BODY, mdoc, tok, line, ppos);

return(0);

body = mdoc_body_alloc(mdoc, line, ppos, tok);

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

return(0);

body = mdoc->last;

break;

}

Line 1140 blk_full(MACRO_PROT_ARGS)

Line 1122 blk_full(MACRO_PROT_ARGS)

* the MDOC_HEAD) for non-phrase types.

if (NULL == head &&

if (head == NULL &&

ARGS_PEND != ac &&

ac != ARGS_PEND &&

ARGS_PHRASE != ac &&

ac != ARGS_PHRASE &&

ARGS_PPHRASE != ac &&

ac != ARGS_PPHRASE &&

ARGS_QWORD != ac &&

ac != ARGS_QWORD &&

DELIM_OPEN == mdoc_isdelim(p)) {

mdoc_isdelim(p) == DELIM_OPEN) {

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

dword(mdoc, line, la, p, DELIM_OPEN, 0);

return(0);

continue;

}

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

if (NULL == head) {

if (head == NULL)

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

head = mdoc_head_alloc(mdoc, line, ppos, tok);

return(0);

head = mdoc->last;

}

if (ARGS_PHRASE == ac ||

if (ac == ARGS_PHRASE ||

ARGS_PEND == ac ||

ac == ARGS_PEND ||

ARGS_PPHRASE == ac) {

ac == ARGS_PPHRASE) {

* If we haven't opened a body yet, rewind the

* head; if we have, rewind that instead.

mtt = body ? MDOC_BODY : MDOC_HEAD;

rew_sub(body ? MDOC_BODY : MDOC_HEAD,

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

mdoc, tok, line, ppos);

return(0);

body = mdoc_body_alloc(mdoc, line, ppos, tok);

/* Then allocate our body context. */

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

return(0);

body = mdoc->last;

* Process phrases: set whether we're in a

* partial-phrase (this effects line handling)

* then call down into the phrase parser.

if (ARGS_PPHRASE == ac)

if (ac == ARGS_PPHRASE)

mdoc->flags |= MDOC_PPHRASE;

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

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

mdoc->flags |= MDOC_PPHRASE;

phrase(mdoc, line, la, buf);

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

return(0);

mdoc->flags &= ~MDOC_PPHRASE;

continue;

}

ntok = nparsed || ARGS_QWORD == ac ?

ntok = nparsed || ac == ARGS_QWORD ?

MDOC_MAX : lookup(tok, p);

if (MDOC_MAX == ntok) {

if (ntok != MDOC_MAX) {

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

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

MDOC_JOIN & mdoc_macros[tok].flags))

break;

return(0);

continue;

}

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

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

MDOC_JOIN & mdoc_macros[tok].flags);

return(0);

break;

}

if (NULL == head) {

if (head == NULL)

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

head = mdoc_head_alloc(mdoc, line, ppos, tok);

return(0);

if (nl)

head = mdoc->last;

append_delims(mdoc, line, pos, buf);

}

if (body != NULL)

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

return(0);

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

if (NULL != body)

goto out;

Line 1231 blk_full(MACRO_PROT_ARGS)

Line 1190 blk_full(MACRO_PROT_ARGS)

* sub-block.

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

if (MDOC_BLOCK == n->type &&

if (n->type == MDOC_BLOCK &&

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

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

! (MDOC_VALID & n->flags)) {

! (n->flags & MDOC_VALID)) {

n->pending = head;

return(1);

return;

}

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

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

rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);

return(0);

mdoc_body_alloc(mdoc, line, ppos, tok);

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

return(0);

out:

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

if (mdoc->flags & MDOC_FREECOL) {

return(1);

rew_sub(MDOC_BODY, mdoc, tok, line, ppos);

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

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

mdoc->flags &= ~MDOC_FREECOL;

return(0);

}

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

return(0);

mdoc->flags &= ~MDOC_FREECOL;

return(1);

}

static int

static void

blk_part_imp(MACRO_PROT_ARGS)

{

int la, nl;

Line 1281 blk_part_imp(MACRO_PROT_ARGS)

Line 1232 blk_part_imp(MACRO_PROT_ARGS)

* or more closing punctuation nodes.

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

blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL);

return(0);

mdoc_head_alloc(mdoc, line, ppos, tok);

rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);

blk = mdoc->last;

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

return(0);

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

return(0);

* Open the body scope "on-demand", that is, after we've

* processed all our the leading delimiters (open parenthesis,

Line 1300 blk_part_imp(MACRO_PROT_ARGS)

Line 1245 blk_part_imp(MACRO_PROT_ARGS)

for (body = NULL; ; ) {

la = *pos;

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

if (ac == ARGS_EOLN || ac == ARGS_PUNCT)

if (ARGS_ERROR == ac)

return(0);

if (ARGS_EOLN == ac)

break;

if (ARGS_PUNCT == ac)

break;

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

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

DELIM_OPEN == mdoc_isdelim(p)) {

mdoc_isdelim(p) == DELIM_OPEN) {

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

dword(mdoc, line, la, p, DELIM_OPEN, 0);

return(0);

continue;

}

if (NULL == body) {

if (body == NULL)

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

body = mdoc_body_alloc(mdoc, line, ppos, tok);

return(0);

body = mdoc->last;

}

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

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

if (MDOC_MAX == ntok) {

if (ntok != MDOC_MAX) {

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

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

MDOC_JOIN & mdoc_macros[tok].flags))

break;

return(0);

continue;

}

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

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

MDOC_JOIN & mdoc_macros[tok].flags);

return(0);

break;

}

if (body == NULL)

body = mdoc_body_alloc(mdoc, line, ppos, tok);

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

if (NULL == body) {

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

return(0);

body = mdoc->last;

}

* 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 = mdoc->last; n && n != body && n != blk->parent;

n = n->parent) {

if (MDOC_BLOCK == n->type &&

if (n->type == MDOC_BLOCK &&

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

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

! (MDOC_VALID & n->flags)) {

! (n->flags & MDOC_VALID)) {

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

if ( ! mdoc_endbody_alloc(mdoc, line, ppos,

mdoc_endbody_alloc(mdoc, line, ppos,

tok, body, ENDBODY_NOSPACE))

tok, body, ENDBODY_NOSPACE);

return(0);

return;

return(1);

}

assert(n == body);

rew_sub(MDOC_BODY, mdoc, tok, line, ppos);

if (nl)

append_delims(mdoc, line, pos, buf);

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

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

return(0);

/* Standard appending of delimiters. */

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

return(0);

/* Rewind scope, if applicable. */

if ( ! 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)

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

mdoc_node_relink(mdoc, n);

return(1);

}

static int

static void

blk_part_exp(MACRO_PROT_ARGS)

{

int la, nl;

Line 1403 blk_part_exp(MACRO_PROT_ARGS)

Line 1318 blk_part_exp(MACRO_PROT_ARGS)

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

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

mdoc_block_alloc(mdoc, line, ppos, tok, NULL);

return(0);

for (head = body = NULL; ; ) {

la = *pos;

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

if (ac == ARGS_PUNCT || ac == ARGS_EOLN)

if (ARGS_ERROR == ac)

return(0);

if (ARGS_PUNCT == ac)

break;

if (ARGS_EOLN == ac)

break;

/* Flush out leading punctuation. */

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

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

DELIM_OPEN == mdoc_isdelim(p)) {

mdoc_isdelim(p) == DELIM_OPEN) {

assert(NULL == body);

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

dword(mdoc, line, la, p, DELIM_OPEN, 0);

return(0);

continue;

}

if (NULL == head) {

if (head == NULL) {

assert(NULL == body);

assert(body == NULL);

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

head = mdoc_head_alloc(mdoc, line, ppos, tok);

return(0);

head = mdoc->last;

}

Line 1439 blk_part_exp(MACRO_PROT_ARGS)

Line 1344 blk_part_exp(MACRO_PROT_ARGS)

* macros just immediately close out and begin the body.

if (NULL == body) {

if (body == NULL) {

assert(head);

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

if (MDOC_Eo == tok)

if (tok == MDOC_Eo)

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

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

return(0);

rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);

body = mdoc_body_alloc(mdoc, line, ppos, tok);

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

if (tok == MDOC_Eo)

return(0);

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

return(0);

body = mdoc->last;

if (MDOC_Eo == tok)

continue;

}

assert(head != NULL && body != NULL);

assert(NULL != head && NULL != body);

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

if (ntok != MDOC_MAX) {

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

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

break;

if (MDOC_MAX == ntok) {

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

MDOC_JOIN & mdoc_macros[tok].flags))

return(0);

continue;

}

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

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

MDOC_JOIN & mdoc_macros[tok].flags);

return(0);

break;

}

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

if (NULL == head)

if (head == NULL)

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

mdoc_head_alloc(mdoc, line, ppos, tok);

return(0);

if (NULL == body) {

if (body == NULL) {

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

rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);

return(0);

mdoc_body_alloc(mdoc, line, ppos, tok);

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

return(0);

}

if (nl)

/* Standard appending of delimiters. */

append_delims(mdoc, line, pos, buf);

if ( ! nl)

return(1);

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

}

static int

static void

in_line_argn(MACRO_PROT_ARGS)

{

int la, flushed, j, maxargs, nl;

enum margserr ac;

enum margverr av;

struct mdoc_arg *arg;

char *p;

enum mdoct ntok;

Line 1515 in_line_argn(MACRO_PROT_ARGS)

Line 1400 in_line_argn(MACRO_PROT_ARGS)

switch (tok) {

case MDOC_Ap:

/* FALLTHROUGH */

case MDOC_No:

/* FALLTHROUGH */

case MDOC_Ns:

/* FALLTHROUGH */

case MDOC_Ux:

Line 1534 in_line_argn(MACRO_PROT_ARGS)

Line 1417 in_line_argn(MACRO_PROT_ARGS)

break;

}

for (arg = NULL; ; ) {

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

la = *pos;

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

if (ARGV_WORD == av) {

*pos = la;

break;

}

if (ARGV_EOLN == av)

break;

if (ARGV_ARG == av)

continue;

mdoc_argv_free(arg);

return(0);

}

for (flushed = j = 0; ; ) {

la = *pos;

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

if (ac == ARGS_PUNCT || ac == ARGS_EOLN)

if (ARGS_ERROR == ac)

return(0);

if (ARGS_PUNCT == ac)

break;

if (ARGS_EOLN == ac)

break;

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

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

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

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

DELIM_OPEN == mdoc_isdelim(p)) {

mdoc_isdelim(p) == DELIM_OPEN) {

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

dword(mdoc, line, la, p, DELIM_OPEN, 0);

return(0);

continue;

} else if (0 == j)

} else if (j == 0)

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

mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

return(0);

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

if ( ! rew_elem(mdoc, tok))

rew_elem(mdoc, tok);

return(0);

flushed = 1;

}

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

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

if (MDOC_MAX != ntok) {

if (ntok != MDOC_MAX) {

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

if ( ! flushed)

return(0);

rew_elem(mdoc, tok);

flushed = 1;

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

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

return(0);

j++;

break;

}

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

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

ARGS_QWORD != ac &&

ac != ARGS_QWORD && ! flushed &&

! flushed &&

mdoc_isdelim(p) != DELIM_NONE) {

DELIM_NONE != mdoc_isdelim(p)) {

rew_elem(mdoc, tok);

if ( ! rew_elem(mdoc, tok))

return(0);

flushed = 1;

}

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

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

MDOC_JOIN & mdoc_macros[tok].flags))

MDOC_JOIN & mdoc_macros[tok].flags);

return(0);

j++;

}

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

if (j == 0)

return(0);

mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

if ( ! flushed)

/* Close out in a consistent state. */

rew_elem(mdoc, tok);

if (nl)

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

append_delims(mdoc, line, pos, buf);

return(0);

if ( ! nl)

return(1);

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

}

static int

static void

in_line_eoln(MACRO_PROT_ARGS)

{

int la;

enum margserr ac;

enum margverr av;

struct mdoc_arg *arg;

char *p;

enum mdoct ntok;

Line 1633 in_line_eoln(MACRO_PROT_ARGS)

Line 1483 in_line_eoln(MACRO_PROT_ARGS)

if (tok == MDOC_Pp)

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

/* Parse macro arguments. */

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

mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

for (arg = NULL; ; ) {

la = *pos;

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

if (ARGV_WORD == av) {

*pos = la;

break;

}

if (ARGV_EOLN == av)

break;

if (ARGV_ARG == av)

continue;

mdoc_argv_free(arg);

return(0);

}

/* Open element scope. */

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

return(0);

/* Parse argument terms. */

for (;;) {

la = *pos;

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

if (ac == ARGS_EOLN)

if (ARGS_ERROR == ac)

return(0);

if (ARGS_EOLN == ac)

break;

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

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

if (MDOC_MAX == ntok) {

if (ntok != MDOC_MAX) {

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

rew_elem(mdoc, tok);

MDOC_JOIN & mdoc_macros[tok].flags))

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

return(0);

return;

continue;

}

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

if ( ! rew_elem(mdoc, tok))

MDOC_JOIN & mdoc_macros[tok].flags);

return(0);

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

}

/* Close out (no delimiters). */

return(rew_elem(mdoc, tok));

rew_elem(mdoc, tok);

}

static int

static void

ctx_synopsis(MACRO_PROT_ARGS)

{

int nl;

nl = MDOC_NEWLINE & mdoc->flags;

if (~mdoc->flags & (MDOC_SYNOPSIS | MDOC_NEWLINE))

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

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

else if (tok == MDOC_Nm)

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

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

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

else {

assert(tok == MDOC_Vt);

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

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

if ( ! nl)

}

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

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

* up formatting the block scope, then child nodes will inherit

* the formatting. Be careful.

if (MDOC_Nm == tok)

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

assert(MDOC_Vt == tok);

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

}

Line 1718 ctx_synopsis(MACRO_PROT_ARGS)

Line 1529 ctx_synopsis(MACRO_PROT_ARGS)

* They're unusual because they're basically free-form text until a

* macro is encountered.

static int

static void

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

{

int la, pos;

Line 1730 phrase(struct mdoc *mdoc, int line, int ppos, char *bu

Line 1541 phrase(struct mdoc *mdoc, int line, int ppos, char *bu

la = pos;

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

if (ac == ARGS_EOLN)

if (ARGS_ERROR == ac)

return(0);

if (ARGS_EOLN == ac)

break;

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

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

if (MDOC_MAX == ntok) {

if (ntok != MDOC_MAX) {

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

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

return(0);

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

continue;

return;

}

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

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

return(0);

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

}

return(1);

}

static int

static void

phrase_ta(MACRO_PROT_ARGS)

{

struct mdoc_node *n;

Line 1762 phrase_ta(MACRO_PROT_ARGS)

Line 1565 phrase_ta(MACRO_PROT_ARGS)

char *p;

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

n = mdoc->last;

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

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

n = n->parent;

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

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

mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,

line, ppos, NULL);

line, ppos, "Ta");

return(1);

return;

}

/* Advance to the next column. */

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

return(0);

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

return(0);

rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos);

mdoc_body_alloc(mdoc, line, ppos, MDOC_It);

for (;;) {

la = *pos;

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

if (ac == ARGS_EOLN)

if (ARGS_ERROR == ac)

return(0);

if (ARGS_EOLN == ac)

break;

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

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

if (MDOC_MAX == ntok) {

if (ntok != MDOC_MAX) {

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

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

MDOC_JOIN & mdoc_macros[tok].flags))

append_delims(mdoc, line, pos, buf);

return(0);

return;

continue;

}

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

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

MDOC_JOIN & mdoc_macros[tok].flags);

return(0);

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

}

return(1);

}

CVSweb