mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.355 and 1.383

version 1.355, 2018/12/21 17:15:19

version 1.383, 2022/04/24 17:40:22

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 14

* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

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

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

* Implementation of the roff(7) parser for mandoc(1).

#include "config.h"

Line 133 struct roff {

Line 135 struct roff {

char escape; /* escape character */

};

* A macro definition, condition, or ignored block.

struct roffnode {

enum roff_tok tok; /* type of node */

struct roffnode *parent; /* up one in stack */

int line; /* parse line */

int col; /* parse col */

char *name; /* node name, e.g. macro name */

char *end; /* end-rules: custom token */

char *end; /* custom end macro of the block */

int endspan; /* end-rules: next-line or infty */

int endspan; /* scope to: 1=eol 2=next line -1=\} */

int rule; /* current evaluation rule */

int rule; /* content is: 1=evaluated 0=skipped */

};

#define ROFF_ARGS struct roff *r, /* parse ctx */ \

Line 181 static int roff_als(ROFF_ARGS);

Line 186 static int roff_als(ROFF_ARGS);

static int roff_block(ROFF_ARGS);

static int roff_block_text(ROFF_ARGS);

static int roff_block_sub(ROFF_ARGS);

static int roff_br(ROFF_ARGS);

static int roff_break(ROFF_ARGS);

static int roff_cblock(ROFF_ARGS);

static int roff_cc(ROFF_ARGS);

static int roff_ccond(struct roff *, int, int);

static int roff_char(ROFF_ARGS);

static int roff_cond(ROFF_ARGS);

static int roff_cond_checkend(ROFF_ARGS);

static int roff_cond_text(ROFF_ARGS);

static int roff_cond_sub(ROFF_ARGS);

static int roff_ds(ROFF_ARGS);

static int roff_ec(ROFF_ARGS);

static int roff_eo(ROFF_ARGS);

static int roff_eqndelim(struct roff *, struct buf *, int);

static int roff_evalcond(struct roff *r, int, char *, int *);

static int roff_evalcond(struct roff *, int, char *, int *);

static int roff_evalnum(struct roff *, int,

const char *, int *, int *, int);

static int roff_evalpar(struct roff *, int,

Line 221 static int roff_line_ignore(ROFF_ARGS);

Line 227 static int roff_line_ignore(ROFF_ARGS);

static void roff_man_alloc1(struct roff_man *);

static void roff_man_free1(struct roff_man *);

static int roff_manyarg(ROFF_ARGS);

static int roff_noarg(ROFF_ARGS);

static int roff_nop(ROFF_ARGS);

static int roff_nr(ROFF_ARGS);

static int roff_onearg(ROFF_ARGS);

Line 257 static int roff_userdef(ROFF_ARGS);

Line 264 static int roff_userdef(ROFF_ARGS);

#define ROFFNUM_WHITE (1 << 1) /* Skip whitespace in roff_evalnum(). */

const char *__roff_name[MAN_MAX + 1] = {

"br", "ce", "ft", "ll",

"br", "ce", "fi", "ft",

"mc", "po", "rj", "sp",

"ll", "mc", "nf",

"po", "rj", "sp",

"ta", "ti", NULL,

"ab", "ad", "af", "aln",

"als", "am", "am1", "ami",

Line 350 const char *__roff_name[MAN_MAX + 1] = {

Line 358 const char *__roff_name[MAN_MAX + 1] = {

"Lk", "Mt", "Brq", "Bro",

"Brc", "%C", "Es", "En",

"Dx", "%Q", "%U", "Ta",

NULL,

"Tg", NULL,

"TH", "SH", "SS", "TP",

"TQ",

"LP", "PP", "P", "IP",

"HP", "SM", "SB", "BI",

"IB", "BR", "RB", "R",

"B", "I", "IR", "RI",

"nf", "fi",

"RE", "RS", "DT", "UC",

"PD", "AT", "in",

"SY", "YS", "OP",

Line 367 const char *__roff_name[MAN_MAX + 1] = {

Line 374 const char *__roff_name[MAN_MAX + 1] = {

const char *const *roff_name = __roff_name;

static struct roffmac roffs[TOKEN_NONE] = {

{ roff_br, NULL, NULL, 0 }, /* br */

{ roff_noarg, NULL, NULL, 0 }, /* br */

{ roff_onearg, NULL, NULL, 0 }, /* ce */

{ roff_noarg, NULL, NULL, 0 }, /* fi */

{ roff_onearg, NULL, NULL, 0 }, /* ft */

{ roff_onearg, NULL, NULL, 0 }, /* ll */

{ roff_onearg, NULL, NULL, 0 }, /* mc */

{ roff_noarg, NULL, NULL, 0 }, /* nf */

{ roff_onearg, NULL, NULL, 0 }, /* po */

{ roff_onearg, NULL, NULL, 0 }, /* rj */

{ roff_onearg, NULL, NULL, 0 }, /* sp */

Line 398 static struct roffmac roffs[TOKEN_NONE] = {

Line 407 static struct roffmac roffs[TOKEN_NONE] = {

{ roff_unsupp, NULL, NULL, 0 }, /* boxa */

{ roff_line_ignore, NULL, NULL, 0 }, /* bp */

{ roff_unsupp, NULL, NULL, 0 }, /* BP */

{ roff_unsupp, NULL, NULL, 0 }, /* break */

{ roff_break, NULL, NULL, 0 }, /* break */

{ roff_line_ignore, NULL, NULL, 0 }, /* breakchar */

{ roff_line_ignore, NULL, NULL, 0 }, /* brnl */

{ roff_br, NULL, NULL, 0 }, /* brp */

{ roff_noarg, NULL, NULL, 0 }, /* brp */

{ roff_line_ignore, NULL, NULL, 0 }, /* brpnl */

{ roff_unsupp, NULL, NULL, 0 }, /* c2 */

{ roff_cc, NULL, NULL, 0 }, /* cc */

Line 683 roffhash_find(struct ohash *htab, const char *name, si

Line 692 roffhash_find(struct ohash *htab, const char *name, si

* Pop the current node off of the stack of roff instructions currently

* pending.

* pending. Return 1 if it is a loop or 0 otherwise.

static int

roffnode_pop(struct roff *r)

Line 765 void

Line 774 void

roff_reset(struct roff *r)

{

roff_free1(r);

r->options |= MPARSE_COMMENT;

r->format = r->options & (MPARSE_MDOC | MPARSE_MAN);

r->control = '\0';

r->escape = '\\';

Line 777 roff_reset(struct roff *r)

Line 787 roff_reset(struct roff *r)

void

roff_free(struct roff *r)

{

int i;

roff_free1(r);

for (i = 0; i < r->mstacksz; i++)

Line 794 roff_alloc(int options)

Line 804 roff_alloc(int options)

r = mandoc_calloc(1, sizeof(struct roff));

r->reqtab = roffhash_alloc(0, ROFF_RENAMED);

r->options = options;

r->options = options | MPARSE_COMMENT;

r->format = options & (MPARSE_MDOC | MPARSE_MAN);

r->mstackpos = -1;

r->rstackpos = -1;

Line 807 roff_alloc(int options)

Line 817 roff_alloc(int options)

static void

roff_man_free1(struct roff_man *man)

{

if (man->meta.first != NULL)

if (man->first != NULL)

roff_node_delete(man, man->meta.first);

roff_node_delete(man, man->first);

free(man->meta.msec);

free(man->meta.vol);

free(man->meta.os);

Line 817 roff_man_free1(struct roff_man *man)

Line 826 roff_man_free1(struct roff_man *man)

free(man->meta.title);

free(man->meta.name);

free(man->meta.date);

free(man->meta.sodest);

}

static void

void

roff_man_alloc1(struct roff_man *man)

roff_state_reset(struct roff_man *man)

{

man->last = man->meta.first;

memset(&man->meta, 0, sizeof(man->meta));

man->first = mandoc_calloc(1, sizeof(*man->first));

man->first->type = ROFFT_ROOT;

man->last = man->first;

man->last_es = NULL;

man->flags = 0;

man->macroset = MACROSET_NONE;

man->lastsec = man->lastnamed = SEC_NONE;

man->next = ROFF_NEXT_CHILD;

roff_setreg(man->roff, "nS", 0, '=');

}

static void

roff_man_alloc1(struct roff_man *man)

{

memset(&man->meta, 0, sizeof(man->meta));

man->meta.first = mandoc_calloc(1, sizeof(*man->meta.first));

man->meta.first->type = ROFFT_ROOT;

man->meta.macroset = MACROSET_NONE;

roff_state_reset(man);

}

void

roff_man_reset(struct roff_man *man)

{

roff_man_free1(man);

roff_man_alloc1(man);

}

Line 845 roff_man_reset(struct roff_man *man)

Line 860 roff_man_reset(struct roff_man *man)

void

roff_man_free(struct roff_man *man)

{

roff_man_free1(man);

free(man->os_r);

free(man);

}

Line 883 roff_node_alloc(struct roff_man *man, int line, int po

Line 898 roff_node_alloc(struct roff_man *man, int line, int po

n->flags |= NODE_SYNPRETTY;

else

n->flags &= ~NODE_SYNPRETTY;

if ((man->flags & (ROFF_NOFILL | ROFF_NONOFILL)) == ROFF_NOFILL)

n->flags |= NODE_NOFILL;

else

n->flags &= ~NODE_NOFILL;

if (man->flags & MDOC_NEWLINE)

n->flags |= NODE_LINE;

man->flags &= ~MDOC_NEWLINE;

Line 1020 roff_addtbl(struct roff_man *man, int line, struct tbl

Line 1039 roff_addtbl(struct roff_man *man, int line, struct tbl

struct roff_node *n;

struct tbl_span *span;

if (man->macroset == MACROSET_MAN)

if (man->meta.macroset == MACROSET_MAN)

man_breakscope(man, ROFF_TS);

while ((span = tbl_span(tbl)) != NULL) {

n = roff_node_alloc(man, line, 0, ROFFT_TBL, TOKEN_NONE);

Line 1064 roff_node_unlink(struct roff_man *man, struct roff_nod

Line 1083 roff_node_unlink(struct roff_man *man, struct roff_nod

man->next = ROFF_NEXT_SIBLING;

}

if (man->first == n)

if (man->meta.first == n)

man->first = NULL;

man->meta.first = NULL;

}

void

Line 1086 roff_node_free(struct roff_node *n)

Line 1105 roff_node_free(struct roff_node *n)

free(n->norm);

eqn_box_free(n->eqn);

free(n->string);

free(n->tag);

free(n);

}

Line 1099 roff_node_delete(struct roff_man *man, struct roff_nod

Line 1119 roff_node_delete(struct roff_man *man, struct roff_nod

roff_node_free(n);

}

int

roff_node_transparent(struct roff_node *n)

{

if (n == NULL)

return 0;

if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)

return 1;

return roff_tok_transparent(n->tok);

}

int

roff_tok_transparent(enum roff_tok tok)

{

switch (tok) {

case ROFF_ft:

case ROFF_ll:

case ROFF_mc:

case ROFF_po:

case ROFF_ta:

case MDOC_Db:

case MDOC_Es:

case MDOC_Sm:

case MDOC_Tg:

case MAN_DT:

case MAN_UC:

case MAN_PD:

case MAN_AT:

return 1;

default:

return 0;

}

struct roff_node *

roff_node_child(struct roff_node *n)

{

for (n = n->child; roff_node_transparent(n); n = n->next)

continue;

return n;

}

struct roff_node *

roff_node_prev(struct roff_node *n)

{

do {

n = n->prev;

} while (roff_node_transparent(n));

return n;

}

struct roff_node *

roff_node_next(struct roff_node *n)

{

do {

n = n->next;

} while (roff_node_transparent(n));

return n;

}

void

deroff(char **dest, const struct roff_node *n)

{

char *cp;

size_t sz;

if (n->type != ROFFT_TEXT) {

if (n->string == NULL) {

for (n = n->child; n != NULL; n = n->next)

deroff(dest, n);

return;

Line 1232 roff_expand(struct roff *r, struct buf *buf, int ln, i

Line 1311 roff_expand(struct roff *r, struct buf *buf, int ln, i

* in the syntax tree.

if (newesc != ASCII_ESC && r->format == 0) {

if (newesc != ASCII_ESC && r->options & MPARSE_COMMENT) {

while (*ep == ' ' || *ep == '\t')

ep--;

ep[1] = '\0';

Line 1322 roff_expand(struct roff *r, struct buf *buf, int ln, i

Line 1401 roff_expand(struct roff *r, struct buf *buf, int ln, i

term = '\0';

cp = stesc + 1;

if (*cp == 'E')

while (*cp == 'E')

cp++;

esct = cp;

switch (*esct) {

Line 1576 char *

Line 1655 char *

roff_getarg(struct roff *r, char **cpp, int ln, int *pos)

{

struct buf buf;

char *cp, *start;

int newesc, pairs, quoted, white;

/* Quoting can only start with a new word. */

Line 1745 roff_parsetext(struct roff *r, struct buf *buf, int po

Line 1824 roff_parsetext(struct roff *r, struct buf *buf, int po

}

int

roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)

roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs, size_t len)

{

enum roff_tok t;

int e;

Line 1756 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1835 roff_parseln(struct roff *r, int ln, struct buf *buf,

ppos = pos = *offs;

if (len > 80 && r->tbl == NULL && r->eqn == NULL &&

(r->man->flags & ROFF_NOFILL) == 0 &&

strchr(" .\\", buf->buf[pos]) == NULL &&

buf->buf[pos] != r->control &&

strcspn(buf->buf, " ") < 80)

mandoc_msg(MANDOCERR_TEXT_LONG, ln, (int)len - 1,

"%.20s...", buf->buf + pos);

/* Handle in-line equation delimiters. */

if (r->tbl == NULL &&

Line 1801 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1888 roff_parseln(struct roff *r, int ln, struct buf *buf,

roff_addtbl(r->man, ln, r->tbl);

return e;

}

if ( ! ctl)

if ( ! ctl) {

r->options &= ~MPARSE_COMMENT;

return roff_parsetext(r, buf, pos, offs) | e;

}

/* Skip empty request lines. */

Line 1825 roff_parseln(struct roff *r, int ln, struct buf *buf,

Line 1914 roff_parseln(struct roff *r, int ln, struct buf *buf,

/* No scope is open. This is a new request or macro. */

r->options &= ~MPARSE_COMMENT;

spos = pos;

t = roff_parse(r, buf->buf, &pos, ln, ppos);

Line 1954 roff_parse(struct roff *r, char *buf, int *pos, int ln

Line 2044 roff_parse(struct roff *r, char *buf, int *pos, int ln

/* --- handling of request blocks ----------------------------------------- */

* Close a macro definition block or an "ignore" block.

static int

roff_cblock(ROFF_ARGS)

{

int rr;

* A block-close `..' should only be invoked as a child of an

* ignore macro, otherwise raise a warning and just ignore it.

if (r->last == NULL) {

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "..");

return ROFF_IGN;

Line 1970 roff_cblock(ROFF_ARGS)

Line 2059 roff_cblock(ROFF_ARGS)

switch (r->last->tok) {

case ROFF_am:

/* ROFF_am1 is remapped to ROFF_am in roff_block(). */

case ROFF_ami:

case ROFF_de:

/* ROFF_de1 is remapped to ROFF_de in roff_block(). */

case ROFF_dei:

case ROFF_ig:

break;

case ROFF_am1:

case ROFF_de1:

/* Remapped in roff_block(). */

abort();

default:

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "..");

return ROFF_IGN;

}

roffnode_pop(r);

roffnode_cleanscope(r);

* If a conditional block with braces is still open,

* check for "\}" block end markers.

if (r->last != NULL && r->last->endspan < 0) {

rr = 1; /* If arguments follow "\}", warn about them. */

roff_cond_checkend(r, tok, buf, ln, ppos, pos, &rr);

}

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

mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

".. %s", buf->buf + pos);

roffnode_pop(r);

roffnode_cleanscope(r);

return ROFF_IGN;

}

* Pop all nodes ending at the end of the current input line.

* Return the number of loops ended.

static int

roffnode_cleanscope(struct roff *r)

{

int inloop;

inloop = 0;

while (r->last != NULL) {

while (r->last != NULL && r->last->endspan > 0) {

if (--r->last->endspan != 0)

break;

inloop += roffnode_pop(r);

Line 2006 roffnode_cleanscope(struct roff *r)

Line 2111 roffnode_cleanscope(struct roff *r)

return inloop;

}

* Handle the closing "\}" of a conditional block.

* Apart from generating warnings, this only pops nodes.

* Return the number of loops ended.

static int

roff_ccond(struct roff *r, int ln, int ppos)

{

Line 2222 roff_block_text(ROFF_ARGS)

Line 2332 roff_block_text(ROFF_ARGS)

return ROFF_IGN;

}

* Check for a closing "\}" and handle it.

* In this function, the final "int *offs" argument is used for

* different purposes than elsewhere:

* Input: *offs == 0: caller wants to discard arguments following \}

* *offs == 1: caller wants to preserve text following \}

* Output: *offs = 0: tell caller to discard input line

* *offs = 1: tell caller to use input line

static int

roff_cond_sub(ROFF_ARGS)

roff_cond_checkend(ROFF_ARGS)

{

char *ep;

int endloop, irc, rr;

enum roff_tok t;

irc = ROFF_IGN;

rr = r->last->rule;

Line 2237 roff_cond_sub(ROFF_ARGS)

Line 2355 roff_cond_sub(ROFF_ARGS)

irc |= endloop;

* If `\}' occurs on a macro line without a preceding macro,

* If "\}" occurs on a macro line without a preceding macro or

* drop the line completely.

* a text line contains nothing else, drop the line completely.

ep = buf->buf + pos;

if (ep[0] == '\\' && ep[1] == '}')

if (ep[0] == '\\' && ep[1] == '}' && (ep[2] == '\0' || *offs == 0))

rr = 0;

* The closing delimiter `\}' rewinds the conditional scope

* The closing delimiter "\}" rewinds the conditional scope

* but is otherwise ignored when interpreting the line.

while ((ep = strchr(ep, '\\')) != NULL) {

switch (ep[1]) {

case '}':

memmove(ep, ep + 2, strlen(ep + 2) + 1);

if (ep[2] == '\0')

ep[0] = '\0';

else if (rr)

ep[1] = '&';

else

memmove(ep, ep + 2, strlen(ep + 2) + 1);

if (roff_ccond(r, ln, ep - buf->buf))

irc |= endloop;

break;

Line 2265 roff_cond_sub(ROFF_ARGS)

Line 2388 roff_cond_sub(ROFF_ARGS)

break;

}

*offs = rr;

* Fully handle known macros when they are structurally

* required or when the conditional evaluated to true.

t = roff_parse(r, buf->buf, &pos, ln, ppos);

irc |= t != TOKEN_NONE && (rr || roffs[t].flags & ROFFMAC_STRUCT) ?

(*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs) :

rr ? ROFF_CONT : ROFF_IGN;

return irc;

}

* Parse and process a request or macro line in conditional scope.

static int

roff_cond_text(ROFF_ARGS)

roff_cond_sub(ROFF_ARGS)

{

char *ep;

struct roffnode *bl;

int endloop, irc, rr;

int irc, rr;

enum roff_tok t;

irc = ROFF_IGN;

rr = 0; /* If arguments follow "\}", skip them. */

rr = r->last->rule;

irc = roff_cond_checkend(r, tok, buf, ln, ppos, pos, &rr);

endloop = tok != ROFF_while ? ROFF_IGN :

t = roff_parse(r, buf->buf, &pos, ln, ppos);

rr ? ROFF_LOOPCONT : ROFF_LOOPEXIT;

if (roffnode_cleanscope(r))

irc |= endloop;

/* For now, let high level macros abort .ce mode. */

* If `\}' occurs on a text line with neither preceding

* nor following characters, drop the line completely.

ep = buf->buf + pos;

if (roffce_node != NULL &&

if (strcmp(ep, "\\}") == 0)

(t == TOKEN_NONE || t == ROFF_Dd || t == ROFF_EQ ||

rr = 0;

t == ROFF_TH || t == ROFF_TS)) {

r->man->last = roffce_node;

r->man->next = ROFF_NEXT_SIBLING;

roffce_lines = 0;

roffce_node = NULL;

}

* The closing delimiter `\}' rewinds the conditional scope

* Fully handle known macros when they are structurally

* but is otherwise ignored when interpreting the line.

* required or when the conditional evaluated to true.

while ((ep = strchr(ep, '\\')) != NULL) {

if (t == ROFF_break) {

switch (ep[1]) {

if (irc & ROFF_LOOPMASK)

case '}':

irc = ROFF_IGN | ROFF_LOOPEXIT;

memmove(ep, ep + 2, strlen(ep + 2) + 1);

else if (rr) {

if (roff_ccond(r, ln, ep - buf->buf))

for (bl = r->last; bl != NULL; bl = bl->parent) {

irc |= endloop;

bl->rule = 0;

break;

if (bl->tok == ROFF_while)

case '\0':

break;

++ep;

}

break;

default:

ep += 2;

break;

}

} else if (t != TOKEN_NONE &&

(rr || roffs[t].flags & ROFFMAC_STRUCT)) {

irc |= (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);

if (irc & ROFF_WHILE)

irc &= ~(ROFF_LOOPCONT | ROFF_LOOPEXIT);

} else

irc |= rr ? ROFF_CONT : ROFF_IGN;

return irc;

}

* Parse and process a text line in conditional scope.

static int

roff_cond_text(ROFF_ARGS)

{

int irc, rr;

rr = 1; /* If arguments follow "\}", preserve them. */

irc = roff_cond_checkend(r, tok, buf, ln, ppos, pos, &rr);

if (rr)

irc |= ROFF_CONT;

return irc;

Line 2527 roff_evalcond(struct roff *r, int ln, char *v, int *po

Line 2659 roff_evalcond(struct roff *r, int ln, char *v, int *po

roff_getstrn(r, name, sz, &deftype);

istrue = !!deftype;

}

*pos = cp - v;

*pos = (name + sz) - v;

return istrue == wanttrue;

default:

break;

Line 2673 roff_ds(ROFF_ARGS)

Line 2805 roff_ds(ROFF_ARGS)

return ROFF_IGN;

namesz = roff_getname(r, &string, ln, pos);

if (name[namesz] == '\\')

switch (name[namesz]) {

case '\\':

return ROFF_IGN;

case '\t':

string = buf->buf + pos + namesz;

break;

default:

break;

}

/* Read past the initial double-quote, if any. */

if (*string == '"')

Line 3050 roff_nr(ROFF_ARGS)

Line 3189 roff_nr(ROFF_ARGS)

return ROFF_IGN;

keysz = roff_getname(r, &val, ln, pos);

if (key[keysz] == '\\')

if (key[keysz] == '\\' || key[keysz] == '\t')

return ROFF_IGN;

sign = *val;

Line 3114 roff_rm(ROFF_ARGS)

Line 3253 roff_rm(ROFF_ARGS)

namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));

roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);

roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);

if (name[namesz] == '\\')

if (name[namesz] == '\\' || name[namesz] == '\t')

break;

}

return ROFF_IGN;

Line 3182 roff_Dd(ROFF_ARGS)

Line 3321 roff_Dd(ROFF_ARGS)

static int

roff_TE(ROFF_ARGS)

{

r->man->flags &= ~ROFF_NONOFILL;

if (r->tbl == NULL) {

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "TE");

return ROFF_IGN;

Line 3281 roff_EQ(ROFF_ARGS)

Line 3421 roff_EQ(ROFF_ARGS)

{

struct roff_node *n;

if (r->man->macroset == MACROSET_MAN)

if (r->man->meta.macroset == MACROSET_MAN)

man_breakscope(r->man, ROFF_EQ);

n = roff_node_alloc(r->man, ln, ppos, ROFFT_EQN, TOKEN_NONE);

if (ln > r->man->last->line)

Line 3326 roff_TS(ROFF_ARGS)

Line 3466 roff_TS(ROFF_ARGS)

mandoc_msg(MANDOCERR_BLK_BROKEN, ln, ppos, "TS breaks TS");

tbl_end(r->tbl, 0);

}

r->man->flags |= ROFF_NONOFILL;

r->tbl = tbl_alloc(ppos, ln, r->last_tbl);

if (r->last_tbl == NULL)

r->first_tbl = r->tbl;

Line 3334 roff_TS(ROFF_ARGS)

Line 3475 roff_TS(ROFF_ARGS)

}

static int

roff_noarg(ROFF_ARGS)

{

if (r->man->flags & (MAN_BLINE | MAN_ELINE))

man_breakscope(r->man, tok);

if (tok == ROFF_brp)

tok = ROFF_br;

roff_elem_alloc(r->man, ln, ppos, tok);

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

mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

"%s %s", roff_name[tok], buf->buf + pos);

if (tok == ROFF_nf)

r->man->flags |= ROFF_NOFILL;

else if (tok == ROFF_fi)

r->man->flags &= ~ROFF_NOFILL;

r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED;

r->man->next = ROFF_NEXT_SIBLING;

return ROFF_IGN;

}

static int

roff_onearg(ROFF_ARGS)

{

struct roff_node *n;

Line 3427 roff_als(ROFF_ARGS)

Line 3588 roff_als(ROFF_ARGS)

return ROFF_IGN;

newsz = roff_getname(r, &oldn, ln, pos);

if (newn[newsz] == '\\' || *oldn == '\0')

if (newn[newsz] == '\\' || newn[newsz] == '\t' || *oldn == '\0')

return ROFF_IGN;

end = oldn;

Line 3443 roff_als(ROFF_ARGS)

Line 3604 roff_als(ROFF_ARGS)

return ROFF_IGN;

}

* The .break request only makes sense inside conditionals,

* and that case is already handled in roff_cond_sub().

static int

roff_br(ROFF_ARGS)

roff_break(ROFF_ARGS)

{

if (r->man->flags & (MAN_BLINE | MAN_ELINE))

mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, pos, "break");

man_breakscope(r->man, ROFF_br);

roff_elem_alloc(r->man, ln, ppos, ROFF_br);

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

mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

"%s %s", roff_name[tok], buf->buf + pos);

r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED;

r->man->next = ROFF_NEXT_SIBLING;

return ROFF_IGN;

}

Line 3512 roff_char(ROFF_ARGS)

Line 3670 roff_char(ROFF_ARGS)

case ESCAPE_FONTITALIC:

case ESCAPE_FONTBOLD:

case ESCAPE_FONTBI:

case ESCAPE_FONTCW:

case ESCAPE_FONTCR:

case ESCAPE_FONTCB:

case ESCAPE_FONTCI:

case ESCAPE_FONTPREV:

font++;

break;

Line 3671 roff_rn(ROFF_ARGS)

Line 3831 roff_rn(ROFF_ARGS)

return ROFF_IGN;

oldsz = roff_getname(r, &newn, ln, pos);

if (oldn[oldsz] == '\\' || *newn == '\0')

if (oldn[oldsz] == '\\' || oldn[oldsz] == '\t' || *newn == '\0')

return ROFF_IGN;

end = newn;

Line 3712 static int

Line 3872 static int

roff_shift(ROFF_ARGS)

{

struct mctx *ctx;

int levels, i;

int argpos, levels, i;

argpos = pos;

levels = 1;

if (buf->buf[pos] != '\0' &&

roff_evalnum(r, ln, buf->buf, &pos, &levels, 0) == 0) {

Line 3728 roff_shift(ROFF_ARGS)

Line 3889 roff_shift(ROFF_ARGS)

ctx = r->mstack + r->mstackpos;

if (levels > ctx->argc) {

mandoc_msg(MANDOCERR_SHIFT,

ln, pos, "%d, but max is %d", levels, ctx->argc);

ln, argpos, "%d, but max is %d", levels, ctx->argc);

levels = ctx->argc;

}

if (levels < 0) {

mandoc_msg(MANDOCERR_ARG_NEG, ln, argpos, "shift %d", levels);

levels = 0;

}

if (levels == 0)

return ROFF_IGN;

for (i = 0; i < levels; i++)

Line 3779 roff_userdef(ROFF_ARGS)

Line 3944 roff_userdef(ROFF_ARGS)

char *arg, *ap, *dst, *src;

size_t sz;

/* If the macro is empty, ignore it altogether. */

if (*r->current_string == '\0')

return ROFF_IGN;

/* Initialize a new macro stack context. */

if (++r->mstackpos == r->mstacksz) {

Line 3787 roff_userdef(ROFF_ARGS)

Line 3957 roff_userdef(ROFF_ARGS)

r->mstacksz += 8;

}

ctx = r->mstack + r->mstackpos;

ctx->argsz = 0;

ctx->argc = 0;

ctx->argv = NULL;

* Collect pointers to macro argument strings,

Line 3826 roff_userdef(ROFF_ARGS)

Line 3994 roff_userdef(ROFF_ARGS)

buf->sz = strlen(buf->buf) + 1;

*offs = 0;

return buf->sz > 1 && buf->buf[buf->sz - 2] == '\n' ?

return buf->buf[buf->sz - 2] == '\n' ?

ROFF_REPARSE | ROFF_USERCALL : ROFF_IGN | ROFF_APPEND;

}

Line 3847 roff_renamed(ROFF_ARGS)

Line 4015 roff_renamed(ROFF_ARGS)

return ROFF_CONT;

}

* Measure the length in bytes of the roff identifier at *cpp

* and advance the pointer to the next word.

static size_t

roff_getname(struct roff *r, char **cpp, int ln, int pos)

{

Line 3854 roff_getname(struct roff *r, char **cpp, int ln, int p

Line 4026 roff_getname(struct roff *r, char **cpp, int ln, int p

size_t namesz;

name = *cpp;

if ('\0' == *name)

if (*name == '\0')

return 0;

/* Read until end of name and terminate it with NUL. */

/* Advance cp to the byte after the end of the name. */

for (cp = name; 1; cp++) {

if ('\0' == *cp || ' ' == *cp) {

namesz = cp - name;

if (*cp == '\0')

break;

if (*cp == ' ' || *cp == '\t') {

cp++;

break;

}

if ('\\' != *cp)

if (*cp != '\\')

continue;

namesz = cp - name;

if (cp[1] == '{' || cp[1] == '}')

if ('{' == cp[1] || '}' == cp[1])

break;

cp++;

if (*++cp == '\\')

if ('\\' == *cp)

continue;

mandoc_msg(MANDOCERR_NAMESC, ln, pos,

"%.*s", (int)(cp - name + 1), name);

Line 3878 roff_getname(struct roff *r, char **cpp, int ln, int p

Line 4052 roff_getname(struct roff *r, char **cpp, int ln, int p

}

/* Read past spaces. */

while (' ' == *cp)

while (*cp == ' ')

cp++;

*cpp = cp;

Line 4021 roff_getstrn(struct roff *r, const char *name, size_t

Line 4196 roff_getstrn(struct roff *r, const char *name, size_t

break;

}

if (r->man->macroset != MACROSET_MAN) {

if (r->man->meta.macroset != MACROSET_MAN) {

for (tok = MDOC_Dd; tok < MDOC_MAX; tok++) {

if (strncmp(name, roff_name[tok], len) != 0 ||

roff_name[tok][len] != '\0')

Line 4035 roff_getstrn(struct roff *r, const char *name, size_t

Line 4210 roff_getstrn(struct roff *r, const char *name, size_t

}

if (r->man->macroset != MACROSET_MDOC) {

if (r->man->meta.macroset != MACROSET_MDOC) {

for (tok = MAN_TH; tok < MAN_MAX; tok++) {

if (strncmp(name, roff_name[tok], len) != 0 ||

roff_name[tok][len] != '\0')

CVSweb