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.88 and 1.121

version 1.88, 2010/07/01 15:38:56

version 1.121, 2012/11/19 22:30:58

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 25

Line 26

#include <string.h>

#include <time.h>

#include "mdoc.h"

#include "mandoc.h"

#include "libmdoc.h"

#include "libmandoc.h"

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

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

REWIND_NONE,

REWIND_THIS,

REWIND_MORE,

REWIND_FORCE,

REWIND_LATER,

REWIND_ERROR,

REWIND_ERROR

};

static int blk_full(MACRO_PROT_ARGS);

Line 48 static int in_line(MACRO_PROT_ARGS);

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,

const char *, enum mdelim);

static int append_delims(struct mdoc *,

int, int *, char *);

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

Line 69 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

Line 74 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

{ 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 }, /* Sh */

{ blk_full, 0 }, /* Ss */

{ blk_full, MDOC_PARSED }, /* Ss */

{ in_line_eoln, 0 }, /* Pp */

{ blk_part_imp, MDOC_PARSED }, /* D1 */

{ blk_part_imp, MDOC_PARSED }, /* Dl */

Line 137 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {

Line 142 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_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */

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

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

{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* 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 */

Line 198 const struct mdoc_macro * const mdoc_macros = __mdoc_m

Line 203 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) {

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

if (MDOC_BLOCK != n->type)

if (MDOC_BLOCK == n->type &&

continue;

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

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

mdoc_nmsg(mdoc, n, MANDOCERR_SCOPEEXIT);

continue;

mdoc_nmsg(m, n, MANDOCERR_SYNTSCOPE);

return(0);

}

/* Rewind to the first. */

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

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

}

Line 227 mdoc_macroend(struct mdoc *m)

Line 229 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 254 lookup_raw(const char *p)

Line 255 lookup_raw(const char *p)

static int

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

{

struct mdoc_node *n, *np;

assert(to);

mdoc->next = MDOC_NEXT_SIBLING;

/* LINTED */

while (mdoc->last != to) {

* Save the parent here, because we may delete the

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

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

* out to be lost.

np = mdoc->last->parent;

if ( ! mdoc_valid_post(mdoc))

return(0);

if ( ! mdoc_action_post(mdoc))

n = mdoc->last;

return(0);

mdoc->last = np;

mdoc->last = mdoc->last->parent;

assert(mdoc->last);

mdoc->last->last = n;

}

if ( ! mdoc_valid_post(mdoc))

return(mdoc_valid_post(mdoc));

return(0);

return(mdoc_action_post(mdoc));

}

Line 327 rew_alt(enum mdoct tok)

Line 334 rew_alt(enum mdoct tok)

* inside *p, so there is no need to rewind anything at all.

* REWIND_THIS: *p matches tok, so rewind *p and nothing else.

* REWIND_MORE: *p is implicit, rewind it and keep searching for tok.

* REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p.

* REWIND_LATER: *p is explicit and still open, postpone rewinding.

* REWIND_ERROR: No tok block is open at all.

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

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

return(REWIND_MORE);

* Partial blocks allow delayed rewinding by default.

* By default, closing out full blocks

* forces closing of broken explicit blocks,

* while closing out partial blocks

* allows delayed rewinding by default.

if (&blk_full != mdoc_macros[tok].fp)

return (&blk_full == mdoc_macros[tok].fp ?

return (REWIND_LATER);

REWIND_FORCE : REWIND_LATER);

* Full blocks can only be rewound when matching

* or when there is an explicit rule.

return(REWIND_ERROR);

}

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

Line 461 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 511 make_pending(struct mdoc_node *broken, enum mdoct tok,

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

taker->pending = broken->pending;

}

broken->pending = breaker;

mdoc_vmsg(m, MANDOCERR_SCOPENEST, line, ppos,

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

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

mdoc_macronames[broken->tok]);

return(1);

}

* Found no matching block for tok.

* Are you trying to close a block that is not open?

* XXX Make this non-fatal.

mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE);

return(0);

}

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):

break;

case (REWIND_FORCE):

mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse,

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

mdoc_macronames[tok],

mdoc_macronames[n->tok]);

/* FALLTHROUGH */

case (REWIND_MORE):

n = n->parent;

continue;

case (REWIND_LATER):

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

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

MDOC_BLOCK != t)

return(1);

/* FALLTHROUGH */

case (REWIND_ERROR):

/* XXX Make this non-fatal. */

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_NOSCOPE);

mdoc_vmsg(m, MANDOCERR_SCOPEFATAL, line, ppos,

return(1);

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

mdoc_macronames[n->tok]);

return 0;

}

break;

}

assert(n);

if ( ! rew_last(m, n))

if ( ! rew_last(mdoc, n))

return(0);

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

Line 573 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);

}

return(1);

}

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

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

static int

dword(struct mdoc *mdoc, int line,

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

{

if (DELIM_MAX == d)

d = mdoc_isdelim(p);

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

* 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 587 append_delims(struct mdoc *m, int line, int *pos, char

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

for (;;) {

la = *pos;

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

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

if (ARGS_ERROR == ac)

return(0);

else if (ARGS_EOLN == ac)

break;

assert(DELIM_NONE != mdoc_isdelim(p));

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

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

return(0);

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

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

m->last->flags |= MDOC_EOS;

mdoc->last->flags |= MDOC_EOS;

}

return(1);

Line 632 blk_exp_close(MACRO_PROT_ARGS)

Line 674 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):

Line 649 blk_exp_close(MACRO_PROT_ARGS)

Line 691 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 678 blk_exp_close(MACRO_PROT_ARGS)

Line 720 blk_exp_close(MACRO_PROT_ARGS)

* postpone closing out the current block

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

if ( ! make_pending(later, tok, m, line, ppos))

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

return(0);

* 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 699 blk_exp_close(MACRO_PROT_ARGS)

Line 740 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)

assert( ! (MDOC_ACTED & n->flags));

later = n;

}

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

/* FIXME: do this in validate */

if (buf[*pos])

if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST))

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST);

return(0);

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 744 blk_exp_close(MACRO_PROT_ARGS)

Line 782 blk_exp_close(MACRO_PROT_ARGS)

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

if (MDOC_MAX == ntok) {

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

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

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))

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 779 in_line(MACRO_PROT_ARGS)

Line 817 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 793 in_line(MACRO_PROT_ARGS)

Line 831 in_line(MACRO_PROT_ARGS)

/* FALLTHROUGH */

case (MDOC_Fl):

/* FALLTHROUGH */

case (MDOC_Lk):

case (MDOC_Mt):

/* FALLTHROUGH */

case (MDOC_Nm):

/* FALLTHROUGH */

Line 807 in_line(MACRO_PROT_ARGS)

Line 845 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 824 in_line(MACRO_PROT_ARGS)

Line 862 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 843 in_line(MACRO_PROT_ARGS)

Line 881 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);

if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY))

mdoc_pmsg(mdoc, line, ppos,

return(0);

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 881 in_line(MACRO_PROT_ARGS)

Line 921 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 892 in_line(MACRO_PROT_ARGS)

Line 933 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;

}

if (DELIM_NONE == d)

cnt++;

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

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

return(0);

Line 912 in_line(MACRO_PROT_ARGS)

Line 954 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 928 in_line(MACRO_PROT_ARGS)

Line 970 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);

if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY))

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY);

return(0);

}

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 958 blk_full(MACRO_PROT_ARGS)

Line 999 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 980 blk_full(MACRO_PROT_ARGS)

Line 1021 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 996 blk_full(MACRO_PROT_ARGS)

Line 1037 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;

}

ac = ARGS_ERROR;

Line 1023 blk_full(MACRO_PROT_ARGS)

Line 1072 blk_full(MACRO_PROT_ARGS)

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;

if (ARGS_ERROR == ac)

return(0);

Line 1038 blk_full(MACRO_PROT_ARGS)

Line 1090 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 1057 blk_full(MACRO_PROT_ARGS)

Line 1109 blk_full(MACRO_PROT_ARGS)

ARGS_PPHRASE != ac &&

ARGS_QWORD != ac &&

DELIM_OPEN == mdoc_isdelim(p)) {

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

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

return(0);

continue;

}

Line 1065 blk_full(MACRO_PROT_ARGS)

Line 1117 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 1079 blk_full(MACRO_PROT_ARGS)

Line 1131 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 1095 blk_full(MACRO_PROT_ARGS)

Line 1147 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 ( ! mdoc_word_alloc(m, line, la, p))

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

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 1139 blk_full(MACRO_PROT_ARGS)

Line 1192 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)) {

assert( ! (MDOC_ACTED & n->flags));

n->pending = head;

return(1);

}

Line 1151 blk_full(MACRO_PROT_ARGS)

Line 1203 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 1181 blk_part_imp(MACRO_PROT_ARGS)

Line 1233 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 1192 blk_part_imp(MACRO_PROT_ARGS)

Line 1244 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 1210 blk_part_imp(MACRO_PROT_ARGS)

Line 1262 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 1220 blk_part_imp(MACRO_PROT_ARGS)

Line 1272 blk_part_imp(MACRO_PROT_ARGS)

break;

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

DELIM_OPEN == mdoc_isdelim(p)) {

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

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

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 ( ! mdoc_word_alloc(m, line, la, p))

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

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 1248 blk_part_imp(MACRO_PROT_ARGS)

Line 1300 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)

Line 1262 blk_part_imp(MACRO_PROT_ARGS)

Line 1314 blk_part_imp(MACRO_PROT_ARGS)

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

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

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

n->flags |= MDOC_EOS;

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

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

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

body->flags |= MDOC_EOS;

Line 1277 blk_part_imp(MACRO_PROT_ARGS)

Line 1329 blk_part_imp(MACRO_PROT_ARGS)

* 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)) {

assert( ! (MDOC_ACTED & n->flags));

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

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

if ( ! mdoc_endbody_alloc(mdoc, line, ppos,

return(0);

if ( ! mdoc_endbody_alloc(m, line, ppos,

tok, body, ENDBODY_NOSPACE))

return(0);

return(1);

Line 1297 blk_part_imp(MACRO_PROT_ARGS)

Line 1348 blk_part_imp(MACRO_PROT_ARGS)

* is ugly behaviour nodding its head to OpenBSD's overwhelming

* crufty use of `Op' breakage.

if (n != body && ! mdoc_vmsg(m, MANDOCERR_SCOPENEST,

if (n != body)

line, ppos, "%s broken", mdoc_macronames[tok]))

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

return(0);

"%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 1328 blk_part_exp(MACRO_PROT_ARGS)

Line 1386 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 1336 blk_part_exp(MACRO_PROT_ARGS)

Line 1394 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 1353 blk_part_exp(MACRO_PROT_ARGS)

Line 1411 blk_part_exp(MACRO_PROT_ARGS)

/* Flush out leading punctuation. */

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

DELIM_OPEN == mdoc_isdelim(p)) {

assert(NULL == body);

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

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

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 1376 blk_part_exp(MACRO_PROT_ARGS)

Line 1434 blk_part_exp(MACRO_PROT_ARGS)

assert(head);

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

if (MDOC_Eo == tok)

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

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

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 1394 blk_part_exp(MACRO_PROT_ARGS)

Line 1452 blk_part_exp(MACRO_PROT_ARGS)

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

if (MDOC_MAX == ntok) {

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

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

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 1439 in_line_argn(MACRO_PROT_ARGS)

Line 1494 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 1459 in_line_argn(MACRO_PROT_ARGS)

Line 1514 in_line_argn(MACRO_PROT_ARGS)

case (MDOC_Ux):

maxargs = 0;

break;

case (MDOC_Bx):

/* FALLTHROUGH */

case (MDOC_Xr):

maxargs = 2;

break;

Line 1469 in_line_argn(MACRO_PROT_ARGS)

Line 1526 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 1487 in_line_argn(MACRO_PROT_ARGS)

Line 1544 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 1497 in_line_argn(MACRO_PROT_ARGS)

Line 1554 in_line_argn(MACRO_PROT_ARGS)

break;

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

ARGS_QWORD != ac &&

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

0 == j && DELIM_OPEN == mdoc_isdelim(p)) {

DELIM_OPEN == mdoc_isdelim(p)) {

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

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

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 1515 in_line_argn(MACRO_PROT_ARGS)

Line 1572 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 1528 in_line_argn(MACRO_PROT_ARGS)

Line 1585 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

* 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 ( ! mdoc_word_alloc(m, line, la, p))

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 1579 in_line_eoln(MACRO_PROT_ARGS)

Line 1620 in_line_eoln(MACRO_PROT_ARGS)

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

if (tok == MDOC_Pp)

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 1600 in_line_eoln(MACRO_PROT_ARGS)

Line 1644 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 1617 in_line_eoln(MACRO_PROT_ARGS)

Line 1661 in_line_eoln(MACRO_PROT_ARGS)

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

if (MDOC_MAX == ntok) {

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

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

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 1639 ctx_synopsis(MACRO_PROT_ARGS)

Line 1683 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 (SEC_SYNOPSIS != m->lastsec)

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 1655 ctx_synopsis(MACRO_PROT_ARGS)

Line 1699 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 1666 static int

Line 1710 static int

obsolete(MACRO_PROT_ARGS)

{

return(mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS));

mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS);

return(1);

}

Line 1676 obsolete(MACRO_PROT_ARGS)

Line 1721 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 1686 phrase(struct mdoc *m, int line, int ppos, char *buf)

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

for (pos = ppos; ; ) {

la = pos;

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

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

if (ARGS_ERROR == ac)

return(0);

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

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

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

if (MDOC_MAX == ntok) {

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

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

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 1714 phrase(struct mdoc *m, int line, int ppos, char *buf)

Line 1759 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, 0, &p);

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

if (ARGS_ERROR == ac)

return(0);

Line 1741 phrase_ta(MACRO_PROT_ARGS)

Line 1792 phrase_ta(MACRO_PROT_ARGS)

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

if (MDOC_MAX == ntok) {

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

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

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