mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.351 and 1.365

version 1.351, 2018/12/14 06:33:14

version 1.365, 2019/04/21 23:51:21

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 38

#include "tbl_parse.h"

#include "eqn_parse.h"

* ASCII_ESC is used to signal from roff_getarg() to roff_expand()

* that an escape sequence resulted from copy-in processing and

* needs to be checked or interpolated. As it is used nowhere

* else, it is defined here rather than in a header file.

#define ASCII_ESC 27

/* Maximum number of string expansions per line, to break infinite loops. */

#define EXPAND_LIMIT 1000

Line 125 struct roff {

Line 133 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 173 static int roff_als(ROFF_ARGS);

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

Line 191 static int roff_evalnum(struct roff *, int,

Line 202 static int roff_evalnum(struct roff *, int,

static int roff_evalpar(struct roff *, int,

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

static int roff_evalstrcond(const char *, int *);

static int roff_expand(struct roff *, struct buf *,

int, int, char);

static void roff_free1(struct roff *);

static void roff_freereg(struct roffreg *);

static void roff_freestr(struct roffkv *);

Line 211 static int roff_line_ignore(ROFF_ARGS);

Line 224 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 219 static enum roff_tok roff_parse(struct roff *, char *

Line 233 static enum roff_tok roff_parse(struct roff *, char *

static int roff_parsetext(struct roff *, struct buf *,

int, int *);

static int roff_renamed(ROFF_ARGS);

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

static int roff_return(ROFF_ARGS);

static int roff_rm(ROFF_ARGS);

static int roff_rn(ROFF_ARGS);

Line 248 static int roff_userdef(ROFF_ARGS);

Line 261 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 348 const char *__roff_name[MAN_MAX + 1] = {

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

"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 358 const char *__roff_name[MAN_MAX + 1] = {

Line 371 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 389 static struct roffmac roffs[TOKEN_NONE] = {

Line 404 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 674 roffhash_find(struct ohash *htab, const char *name, si

Line 689 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 798 roff_alloc(int options)

Line 813 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 808 roff_man_free1(struct roff_man *man)

Line 822 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 836 roff_man_reset(struct roff_man *man)

Line 856 roff_man_reset(struct roff_man *man)

void

roff_man_free(struct roff_man *man)

{

roff_man_free1(man);

free(man);

}

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

Line 893 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 1011 roff_addtbl(struct roff_man *man, int line, struct tbl

Line 1034 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 1055 roff_node_unlink(struct roff_man *man, struct roff_nod

Line 1078 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 1142 deroff(char **dest, const struct roff_node *n)

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

/* --- main functions of the roff parser ---------------------------------- */

* In the current line, expand escape sequences that tend to get

* In the current line, expand escape sequences that produce parsable

* used in numerical expressions and conditional requests.

* input text. Also check the syntax of the remaining escape sequences,

* Also check the syntax of the remaining escape sequences.

* which typically produce output glyphs or change formatter state.

static int

roff_res(struct roff *r, struct buf *buf, int ln, int pos)

roff_expand(struct roff *r, struct buf *buf, int ln, int pos, char newesc)

{

struct mctx *ctx; /* current macro call context */

char ubuf[24]; /* buffer to print the number */

struct roff_node *n; /* used for header comments */

const char *start; /* start of the string to process */

char *stesc; /* start of an escape sequence ('\\') */

const char *esct; /* type of esccape sequence */

char *ep; /* end of comment string */

const char *stnam; /* start of the name, after "[(*" */

const char *cp; /* end of the name, e.g. before ']' */

Line 1163 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1187 roff_res(struct roff *r, struct buf *buf, int ln, int

size_t naml; /* actual length of the escape name */

size_t asz; /* length of the replacement */

size_t rsz; /* length of the rest of the string */

enum mandoc_esc esc; /* type of the escape sequence */

int inaml; /* length returned from mandoc_escape() */

int expand_count; /* to avoid infinite loops */

int npos; /* position in numeric expression */

Line 1172 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1195 roff_res(struct roff *r, struct buf *buf, int ln, int

int done; /* no more input available */

int deftype; /* type of definition to paste */

int rcsid; /* kind of RCS id seen */

enum mandocerr err; /* for escape sequence problems */

char sign; /* increment number register */

char term; /* character terminating the escape */

Line 1180 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1204 roff_res(struct roff *r, struct buf *buf, int ln, int

done = 0;

start = buf->buf + pos;

for (stesc = buf->buf + pos; *stesc != '\0'; stesc++) {

if (stesc[0] != r->escape || stesc[1] == '\0')

if (stesc[0] != newesc || stesc[1] == '\0')

continue;

stesc++;

if (*stesc != '"' && *stesc != '#')

Line 1222 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1246 roff_res(struct roff *r, struct buf *buf, int ln, int

* in the syntax tree.

if (r->format == 0) {

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

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

ep--;

ep[1] = '\0';

Line 1263 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1287 roff_res(struct roff *r, struct buf *buf, int ln, int

expand_count = 0;

while (stesc >= start) {

if (*stesc != newesc) {

/* Search backwards for the next backslash. */

* If we have a non-standard escape character,

* escape literal backslashes because all

* processing in subsequent functions uses

* the standard escaping rules.

if (*stesc != r->escape) {

if (newesc != ASCII_ESC && *stesc == '\\') {

if (*stesc == '\\') {

*stesc = '\0';

buf->sz = mandoc_asprintf(&nbuf, "%s\\e%s",

buf->buf, stesc + 1) + 1;

Line 1276 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1305 roff_res(struct roff *r, struct buf *buf, int ln, int

free(buf->buf);

buf->buf = nbuf;

}

/* Search backwards for the next escape. */

stesc--;

continue;

}

Line 1304 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1336 roff_res(struct roff *r, struct buf *buf, int ln, int

term = '\0';

cp = stesc + 1;

switch (*cp) {

if (*cp == 'E')

cp++;

esct = cp;

switch (*esct) {

case '*':

case '$':

res = NULL;

Line 1320 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1355 roff_res(struct roff *r, struct buf *buf, int ln, int

res = ubuf;

break;

default:

esc = mandoc_escape(&cp, &stnam, &inaml);

err = MANDOCERR_OK;

if (esc == ESCAPE_ERROR ||

switch(mandoc_escape(&cp, &stnam, &inaml)) {

(esc == ESCAPE_SPECIAL &&

case ESCAPE_SPECIAL:

mchars_spec2cp(stnam, inaml) < 0))

if (mchars_spec2cp(stnam, inaml) >= 0)

mandoc_msg(MANDOCERR_ESC_BAD,

break;

ln, (int)(stesc - buf->buf),

/* FALLTHROUGH */

case ESCAPE_ERROR:

err = MANDOCERR_ESC_BAD;

break;

case ESCAPE_UNDEF:

err = MANDOCERR_ESC_UNDEF;

break;

case ESCAPE_UNSUPP:

err = MANDOCERR_ESC_UNSUPP;

break;

default:

break;

}

if (err != MANDOCERR_OK)

mandoc_msg(err, ln, (int)(stesc - buf->buf),

"%.*s", (int)(cp - stesc), stesc);

stesc--;

continue;

Line 1382 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1431 roff_res(struct roff *r, struct buf *buf, int ln, int

cp++;

break;

}

if (*cp++ != '\\' || stesc[1] != 'w') {

if (*cp++ != '\\' || *esct != 'w') {

naml++;

continue;

}

Line 1390 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1439 roff_res(struct roff *r, struct buf *buf, int ln, int

case ESCAPE_SPECIAL:

case ESCAPE_UNICODE:

case ESCAPE_NUMBERED:

case ESCAPE_UNDEF:

case ESCAPE_OVERSTRIKE:

naml++;

break;

Line 1403 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1453 roff_res(struct roff *r, struct buf *buf, int ln, int

* undefined, resume searching for escapes.

switch (stesc[1]) {

switch (*esct) {

case '*':

if (arg_complete) {

deftype = ROFFDEF_USER | ROFFDEF_PRE;

Line 1430 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1480 roff_res(struct roff *r, struct buf *buf, int ln, int

break;

}

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

npos = stesc[2] - '1';

npos = esct[1] - '1';

if (npos >= 0 && npos <= 8) {

res = npos < ctx->argc ?

ctx->argv[npos] : "";

break;

}

if (stesc[2] == '*')

if (esct[1] == '*')

quote_args = 0;

else if (stesc[2] == '@')

else if (esct[1] == '@')

quote_args = 1;

else {

mandoc_msg(MANDOCERR_ARG_NONUM, ln,

Line 1500 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1550 roff_res(struct roff *r, struct buf *buf, int ln, int

}

if (res == NULL) {

if (stesc[1] == '*')

if (*esct == '*')

mandoc_msg(MANDOCERR_STR_UNDEF,

ln, (int)(stesc - buf->buf),

"%.*s", (int)naml, stnam);

Line 1528 roff_res(struct roff *r, struct buf *buf, int ln, int

Line 1578 roff_res(struct roff *r, struct buf *buf, int ln, int

}

* Parse a quoted or unquoted roff-style request or macro argument.

* Return a pointer to the parsed argument, which is either the original

* pointer or advanced by one byte in case the argument is quoted.

* NUL-terminate the argument in place.

* Collapse pairs of quotes inside quoted arguments.

* Advance the argument pointer to the next argument,

* or to the NUL byte terminating the argument line.

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

start = *cpp;

quoted = 0;

if ('"' == *start) {

quoted = 1;

start++;

}

newesc = pairs = white = 0;

for (cp = start; '\0' != *cp; cp++) {

* Move the following text left

* after quoted quotes and after "\\" and "\t".

if (pairs)

cp[-pairs] = cp[0];

if ('\\' == cp[0]) {

* In copy mode, translate double to single

* backslashes and backslash-t to literal tabs.

switch (cp[1]) {

case 'a':

case 't':

cp[-pairs] = '\t';

pairs++;

cp++;

break;

case '\\':

newesc = 1;

cp[-pairs] = ASCII_ESC;

pairs++;

cp++;

break;

case ' ':

/* Skip escaped blanks. */

if (0 == quoted)

cp++;

break;

default:

break;

}

} else if (0 == quoted) {

if (' ' == cp[0]) {

/* Unescaped blanks end unquoted args. */

white = 1;

break;

}

} else if ('"' == cp[0]) {

if ('"' == cp[1]) {

/* Quoted quotes collapse. */

pairs++;

cp++;

} else {

/* Unquoted quotes end quoted args. */

quoted = 2;

break;

}

/* Quoted argument without a closing quote. */

if (1 == quoted)

mandoc_msg(MANDOCERR_ARG_QUOTE, ln, *pos, NULL);

/* NUL-terminate this argument and move to the next one. */

if (pairs)

cp[-pairs] = '\0';

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

*cp++ = '\0';

while (' ' == *cp)

cp++;

}

*pos += (int)(cp - start) + (quoted ? 1 : 0);

*cpp = cp;

if ('\0' == *cp && (white || ' ' == cp[-1]))

mandoc_msg(MANDOCERR_SPACE_EOL, ln, *pos, NULL);

start = mandoc_strdup(start);

if (newesc == 0)

return start;

buf.buf = start;

buf.sz = strlen(start) + 1;

buf.next = NULL;

if (roff_expand(r, &buf, ln, 0, ASCII_ESC) & ROFF_IGN) {

free(buf.buf);

buf.buf = mandoc_strdup("");

}

return buf.buf;

}

* Process text streams.

static int

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

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

/* Expand some escape sequences. */

e = roff_res(r, buf, ln, pos);

e = roff_expand(r, buf, ln, pos, r->escape);

if ((e & ROFF_MASK) == ROFF_IGN)

return e;

assert(e == ROFF_CONT);

Line 1844 roff_cblock(ROFF_ARGS)

Line 2006 roff_cblock(ROFF_ARGS)

}

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

{

Line 1858 roffnode_cleanscope(struct roff *r)

Line 2024 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 2077 roff_block_text(ROFF_ARGS)

Line 2248 roff_block_text(ROFF_ARGS)

static int

roff_cond_sub(ROFF_ARGS)

{

struct roffnode *bl;

char *ep;

int endloop, irc, rr;

enum roff_tok t;

Line 2124 roff_cond_sub(ROFF_ARGS)

Line 2296 roff_cond_sub(ROFF_ARGS)

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

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

if (t == ROFF_break) {

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

if (irc & ROFF_LOOPMASK)

rr ? ROFF_CONT : ROFF_IGN;

irc = ROFF_IGN | ROFF_LOOPEXIT;

else if (rr) {

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

bl->rule = 0;

if (bl->tok == ROFF_while)

break;

}

} else if (t != TOKEN_NONE &&

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

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

else

irc |= rr ? ROFF_CONT : ROFF_IGN;

return irc;

}

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

Line 2563 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 2525 roff_ds(ROFF_ARGS)

Line 2709 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 2902 roff_nr(ROFF_ARGS)

Line 3093 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 2966 roff_rm(ROFF_ARGS)

Line 3157 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 3034 roff_Dd(ROFF_ARGS)

Line 3225 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 3133 roff_EQ(ROFF_ARGS)

Line 3325 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 3178 roff_TS(ROFF_ARGS)

Line 3370 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 3186 roff_TS(ROFF_ARGS)

Line 3379 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 3279 roff_als(ROFF_ARGS)

Line 3492 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 3295 roff_als(ROFF_ARGS)

Line 3508 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 3523 roff_rn(ROFF_ARGS)

Line 3733 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 3631 roff_userdef(ROFF_ARGS)

Line 3841 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 3655 roff_userdef(ROFF_ARGS)

Line 3870 roff_userdef(ROFF_ARGS)

ctx->argv = mandoc_reallocarray(ctx->argv,

ctx->argsz, sizeof(*ctx->argv));

}

arg = mandoc_getarg(&src, ln, &pos);

arg = roff_getarg(r, &src, ln, &pos);

sz = 1; /* For the terminating NUL. */

for (ap = arg; *ap != '\0'; ap++)

sz += *ap == '"' ? 4 : 1;

Line 3668 roff_userdef(ROFF_ARGS)

Line 3883 roff_userdef(ROFF_ARGS)

*dst++ = *ap;

}

*dst = '\0';

free(arg);

}

/* Replace the macro invocation by the macro definition. */

Line 3677 roff_userdef(ROFF_ARGS)

Line 3893 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 3698 roff_renamed(ROFF_ARGS)

Line 3914 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 3705 roff_getname(struct roff *r, char **cpp, int ln, int p

Line 3925 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 3729 roff_getname(struct roff *r, char **cpp, int ln, int p

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

}

/* Read past spaces. */

while (' ' == *cp)

while (*cp == ' ')

cp++;

*cpp = cp;

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

Line 4095 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 3886 roff_getstrn(struct roff *r, const char *name, size_t

Line 4109 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')

Line 4017 roff_strdup(const struct roff *r, const char *p)

Line 4240 roff_strdup(const struct roff *r, const char *p)

* We bail out on bad escapes.

* No need to warn: we already did so when

* roff_res() was called.

* roff_expand() was called.

sz = (int)(p - pp);

res = mandoc_realloc(res, ssz + sz + 1);

CVSweb