version 1.300, 2017/05/07 17:31:45 |
version 1.306, 2017/06/07 00:50:34 |
|
|
struct ohash *reqtab; /* request lookup table */ |
struct ohash *reqtab; /* request lookup table */ |
struct roffreg *regtab; /* number registers */ |
struct roffreg *regtab; /* number registers */ |
struct roffkv *strtab; /* user-defined strings & macros */ |
struct roffkv *strtab; /* user-defined strings & macros */ |
|
struct roffkv *rentab; /* renamed strings & macros */ |
struct roffkv *xmbtab; /* multi-byte trans table (`tr') */ |
struct roffkv *xmbtab; /* multi-byte trans table (`tr') */ |
struct roffstr *xtab; /* single-byte trans table (`tr') */ |
struct roffstr *xtab; /* single-byte trans table (`tr') */ |
const char *current_string; /* value of last called user macro */ |
const char *current_string; /* value of last called user macro */ |
|
|
int format; /* current file in mdoc or man format */ |
int format; /* current file in mdoc or man format */ |
int argc; /* number of args of the last macro */ |
int argc; /* number of args of the last macro */ |
char control; /* control character */ |
char control; /* control character */ |
|
char escape; /* escape character */ |
}; |
}; |
|
|
struct roffnode { |
struct roffnode { |
Line 155 static enum rofferr roff_cond(ROFF_ARGS); |
|
Line 157 static enum rofferr roff_cond(ROFF_ARGS); |
|
static enum rofferr roff_cond_text(ROFF_ARGS); |
static enum rofferr roff_cond_text(ROFF_ARGS); |
static enum rofferr roff_cond_sub(ROFF_ARGS); |
static enum rofferr roff_cond_sub(ROFF_ARGS); |
static enum rofferr roff_ds(ROFF_ARGS); |
static enum rofferr roff_ds(ROFF_ARGS); |
|
static enum rofferr roff_ec(ROFF_ARGS); |
|
static enum rofferr roff_eo(ROFF_ARGS); |
static enum rofferr roff_eqndelim(struct roff *, struct buf *, int); |
static enum rofferr roff_eqndelim(struct roff *, struct buf *, int); |
static int roff_evalcond(struct roff *r, int, char *, int *); |
static int roff_evalcond(struct roff *r, int, char *, int *); |
static int roff_evalnum(struct roff *, int, |
static int roff_evalnum(struct roff *, int, |
Line 172 static int roff_getregn(const struct roff *, |
|
Line 176 static int roff_getregn(const struct roff *, |
|
const char *, size_t); |
const char *, size_t); |
static int roff_getregro(const struct roff *, |
static int roff_getregro(const struct roff *, |
const char *name); |
const char *name); |
|
static const char *roff_getrenn(const struct roff *, |
|
const char *, size_t); |
static const char *roff_getstrn(const struct roff *, |
static const char *roff_getstrn(const struct roff *, |
const char *, size_t); |
const char *, size_t); |
static int roff_hasregn(const struct roff *, |
static int roff_hasregn(const struct roff *, |
Line 186 static enum rofferr roff_nr(ROFF_ARGS); |
|
Line 192 static enum rofferr roff_nr(ROFF_ARGS); |
|
static enum rofferr roff_onearg(ROFF_ARGS); |
static enum rofferr roff_onearg(ROFF_ARGS); |
static enum roff_tok roff_parse(struct roff *, char *, int *, |
static enum roff_tok roff_parse(struct roff *, char *, int *, |
int, int); |
int, int); |
static enum rofferr roff_parsetext(struct buf *, int, int *); |
static enum rofferr roff_parsetext(struct roff *, struct buf *, |
|
int, int *); |
|
static enum rofferr roff_renamed(ROFF_ARGS); |
static enum rofferr roff_res(struct roff *, struct buf *, int, int); |
static enum rofferr roff_res(struct roff *, struct buf *, int, int); |
static enum rofferr roff_rm(ROFF_ARGS); |
static enum rofferr roff_rm(ROFF_ARGS); |
|
static enum rofferr roff_rn(ROFF_ARGS); |
static enum rofferr roff_rr(ROFF_ARGS); |
static enum rofferr roff_rr(ROFF_ARGS); |
static void roff_setstr(struct roff *, |
static void roff_setstr(struct roff *, |
const char *, const char *, int); |
const char *, const char *, int); |
Line 212 static enum rofferr roff_userdef(ROFF_ARGS); |
|
Line 221 static enum rofferr roff_userdef(ROFF_ARGS); |
|
#define ROFFNUM_WHITE (1 << 1) /* Skip whitespace in roff_evalnum(). */ |
#define ROFFNUM_WHITE (1 << 1) /* Skip whitespace in roff_evalnum(). */ |
|
|
const char *__roff_name[MAN_MAX + 1] = { |
const char *__roff_name[MAN_MAX + 1] = { |
"br", "ft", "ll", "sp", |
"br", "ce", "ft", "ll", |
"ta", NULL, |
"mc", "sp", "ta", "ti", |
|
NULL, |
"ab", "ad", "af", "aln", |
"ab", "ad", "af", "aln", |
"als", "am", "am1", "ami", |
"als", "am", "am1", "ami", |
"ami1", "as", "as1", "asciify", |
"ami1", "as", "as1", "asciify", |
"backtrace", "bd", "bleedat", "blm", |
"backtrace", "bd", "bleedat", "blm", |
"box", "boxa", "bp", "BP", |
"box", "boxa", "bp", "BP", |
"break", "breakchar", "brnl", "brp", |
"break", "breakchar", "brnl", "brp", |
"brpnl", "c2", "cc", "ce", |
"brpnl", "c2", "cc", |
"cf", "cflags", "ch", "char", |
"cf", "cflags", "ch", "char", |
"chop", "class", "close", "CL", |
"chop", "class", "close", "CL", |
"color", "composite", "continue", "cp", |
"color", "composite", "continue", "cp", |
Line 246 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 256 const char *__roff_name[MAN_MAX + 1] = { |
|
"lc", "lc_ctype", "lds", "length", |
"lc", "lc_ctype", "lds", "length", |
"letadj", "lf", "lg", "lhang", |
"letadj", "lf", "lg", "lhang", |
"linetabs", "lnr", "lnrf", "lpfx", |
"linetabs", "lnr", "lnrf", "lpfx", |
"ls", "lsm", "lt", "mc", |
"ls", "lsm", "lt", |
"mediasize", "minss", "mk", "mso", |
"mediasize", "minss", "mk", "mso", |
"na", "ne", "nh", "nhychar", |
"na", "ne", "nh", "nhychar", |
"nm", "nn", "nop", "nr", |
"nm", "nn", "nop", "nr", |
Line 264 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 274 const char *__roff_name[MAN_MAX + 1] = { |
|
"spacewidth", "special", "spreadwarn", "ss", |
"spacewidth", "special", "spreadwarn", "ss", |
"sty", "substring", "sv", "sy", |
"sty", "substring", "sv", "sy", |
"T&", "tc", "TE", |
"T&", "tc", "TE", |
"TH", "ti", "tkf", "tl", |
"TH", "tkf", "tl", |
"tm", "tm1", "tmc", "tr", |
"tm", "tm1", "tmc", "tr", |
"track", "transchar", "trf", "trimat", |
"track", "transchar", "trf", "trimat", |
"trin", "trnt", "troff", "TS", |
"trin", "trnt", "troff", "TS", |
Line 273 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 283 const char *__roff_name[MAN_MAX + 1] = { |
|
"warnscale", "watch", "watchlength", "watchn", |
"warnscale", "watch", "watchlength", "watchn", |
"wh", "while", "write", "writec", |
"wh", "while", "write", "writec", |
"writem", "xflag", ".", NULL, |
"writem", "xflag", ".", NULL, |
"text", |
NULL, "text", |
"Dd", "Dt", "Os", "Sh", |
"Dd", "Dt", "Os", "Sh", |
"Ss", "Pp", "D1", "Dl", |
"Ss", "Pp", "D1", "Dl", |
"Bd", "Ed", "Bl", "El", |
"Bd", "Ed", "Bl", "El", |
Line 320 const char *const *roff_name = __roff_name; |
|
Line 330 const char *const *roff_name = __roff_name; |
|
|
|
static struct roffmac roffs[TOKEN_NONE] = { |
static struct roffmac roffs[TOKEN_NONE] = { |
{ roff_br, NULL, NULL, 0 }, /* br */ |
{ roff_br, NULL, NULL, 0 }, /* br */ |
|
{ roff_onearg, NULL, NULL, 0 }, /* ce */ |
{ roff_onearg, NULL, NULL, 0 }, /* ft */ |
{ roff_onearg, NULL, NULL, 0 }, /* ft */ |
{ roff_onearg, NULL, NULL, 0 }, /* ll */ |
{ roff_onearg, NULL, NULL, 0 }, /* ll */ |
|
{ roff_onearg, NULL, NULL, 0 }, /* mc */ |
{ roff_onearg, NULL, NULL, 0 }, /* sp */ |
{ roff_onearg, NULL, NULL, 0 }, /* sp */ |
{ roff_manyarg, NULL, NULL, 0 }, /* ta */ |
{ roff_manyarg, NULL, NULL, 0 }, /* ta */ |
|
{ roff_onearg, NULL, NULL, 0 }, /* ti */ |
{ NULL, NULL, NULL, 0 }, /* ROFF_MAX */ |
{ NULL, NULL, NULL, 0 }, /* ROFF_MAX */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ab */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ab */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ad */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ad */ |
Line 352 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 365 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* brpnl */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* brpnl */ |
{ roff_unsupp, NULL, NULL, 0 }, /* c2 */ |
{ roff_unsupp, NULL, NULL, 0 }, /* c2 */ |
{ roff_cc, NULL, NULL, 0 }, /* cc */ |
{ roff_cc, NULL, NULL, 0 }, /* cc */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ce */ |
|
{ roff_insec, NULL, NULL, 0 }, /* cf */ |
{ roff_insec, NULL, NULL, 0 }, /* cf */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* cflags */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* cflags */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ch */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ch */ |
Line 384 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 396 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_ds, NULL, NULL, 0 }, /* ds1 */ |
{ roff_ds, NULL, NULL, 0 }, /* ds1 */ |
{ roff_unsupp, NULL, NULL, 0 }, /* dwh */ |
{ roff_unsupp, NULL, NULL, 0 }, /* dwh */ |
{ roff_unsupp, NULL, NULL, 0 }, /* dt */ |
{ roff_unsupp, NULL, NULL, 0 }, /* dt */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ec */ |
{ roff_ec, NULL, NULL, 0 }, /* ec */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ecr */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ecr */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ecs */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ecs */ |
{ roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT }, /* el */ |
{ roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT }, /* el */ |
{ roff_unsupp, NULL, NULL, 0 }, /* em */ |
{ roff_unsupp, NULL, NULL, 0 }, /* em */ |
{ roff_EN, NULL, NULL, 0 }, /* EN */ |
{ roff_EN, NULL, NULL, 0 }, /* EN */ |
{ roff_unsupp, NULL, NULL, 0 }, /* eo */ |
{ roff_eo, NULL, NULL, 0 }, /* eo */ |
{ roff_unsupp, NULL, NULL, 0 }, /* EP */ |
{ roff_unsupp, NULL, NULL, 0 }, /* EP */ |
{ roff_EQ, NULL, NULL, 0 }, /* EQ */ |
{ roff_EQ, NULL, NULL, 0 }, /* EQ */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* errprint */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* errprint */ |
Line 456 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 468 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* ls */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ls */ |
{ roff_unsupp, NULL, NULL, 0 }, /* lsm */ |
{ roff_unsupp, NULL, NULL, 0 }, /* lsm */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* lt */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* lt */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* mc */ |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* mediasize */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* mediasize */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* minss */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* minss */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* mk */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* mk */ |
Line 502 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 513 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* rhang */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* rhang */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* rj */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* rj */ |
{ roff_rm, NULL, NULL, 0 }, /* rm */ |
{ roff_rm, NULL, NULL, 0 }, /* rm */ |
{ roff_unsupp, NULL, NULL, 0 }, /* rn */ |
{ roff_rn, NULL, NULL, 0 }, /* rn */ |
{ roff_unsupp, NULL, NULL, 0 }, /* rnn */ |
{ roff_unsupp, NULL, NULL, 0 }, /* rnn */ |
{ roff_rr, NULL, NULL, 0 }, /* rr */ |
{ roff_rr, NULL, NULL, 0 }, /* rr */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* rs */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* rs */ |
Line 525 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 536 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_unsupp, NULL, NULL, 0 }, /* tc */ |
{ roff_unsupp, NULL, NULL, 0 }, /* tc */ |
{ roff_TE, NULL, NULL, 0 }, /* TE */ |
{ roff_TE, NULL, NULL, 0 }, /* TE */ |
{ roff_TH, NULL, NULL, 0 }, /* TH */ |
{ roff_TH, NULL, NULL, 0 }, /* TH */ |
{ roff_unsupp, NULL, NULL, 0 }, /* ti */ |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* tkf */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* tkf */ |
{ roff_unsupp, NULL, NULL, 0 }, /* tl */ |
{ roff_unsupp, NULL, NULL, 0 }, /* tl */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* tm */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* tm */ |
Line 559 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 569 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_insec, NULL, NULL, 0 }, /* writem */ |
{ roff_insec, NULL, NULL, 0 }, /* writem */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* xflag */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* xflag */ |
{ roff_cblock, NULL, NULL, 0 }, /* . */ |
{ roff_cblock, NULL, NULL, 0 }, /* . */ |
|
{ roff_renamed, NULL, NULL, 0 }, |
{ roff_userdef, NULL, NULL, 0 } |
{ roff_userdef, NULL, NULL, 0 } |
}; |
}; |
|
|
Line 601 static const struct predef predefs[PREDEFS_MAX] = { |
|
Line 612 static const struct predef predefs[PREDEFS_MAX] = { |
|
#include "predefs.in" |
#include "predefs.in" |
}; |
}; |
|
|
|
static int roffce_lines; /* number of input lines to center */ |
|
static struct roff_node *roffce_node; /* active request */ |
static int roffit_lines; /* number of lines to delay */ |
static int roffit_lines; /* number of lines to delay */ |
static char *roffit_macro; /* nil-terminated macro line */ |
static char *roffit_macro; /* nil-terminated macro line */ |
|
|
Line 736 roff_free1(struct roff *r) |
|
Line 749 roff_free1(struct roff *r) |
|
r->regtab = NULL; |
r->regtab = NULL; |
|
|
roff_freestr(r->strtab); |
roff_freestr(r->strtab); |
|
roff_freestr(r->rentab); |
roff_freestr(r->xmbtab); |
roff_freestr(r->xmbtab); |
r->strtab = r->xmbtab = NULL; |
r->strtab = r->rentab = r->xmbtab = NULL; |
|
|
if (r->xtab) |
if (r->xtab) |
for (i = 0; i < 128; i++) |
for (i = 0; i < 128; i++) |
Line 751 roff_reset(struct roff *r) |
|
Line 765 roff_reset(struct roff *r) |
|
{ |
{ |
roff_free1(r); |
roff_free1(r); |
r->format = r->options & (MPARSE_MDOC | MPARSE_MAN); |
r->format = r->options & (MPARSE_MDOC | MPARSE_MAN); |
r->control = 0; |
r->control = '\0'; |
|
r->escape = '\\'; |
} |
} |
|
|
void |
void |
Line 773 roff_alloc(struct mparse *parse, int options) |
|
Line 788 roff_alloc(struct mparse *parse, int options) |
|
r->options = options; |
r->options = options; |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->format = options & (MPARSE_MDOC | MPARSE_MAN); |
r->rstackpos = -1; |
r->rstackpos = -1; |
|
r->escape = '\\'; |
return r; |
return r; |
} |
} |
|
|
Line 1009 roff_addtbl(struct roff_man *man, const struct tbl_spa |
|
Line 1025 roff_addtbl(struct roff_man *man, const struct tbl_spa |
|
struct roff_node *n; |
struct roff_node *n; |
|
|
if (man->macroset == MACROSET_MAN) |
if (man->macroset == MACROSET_MAN) |
man_breakscope(man, TOKEN_NONE); |
man_breakscope(man, ROFF_TS); |
n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); |
n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); |
n->span = tbl; |
n->span = tbl; |
roff_node_append(man, n); |
roff_node_append(man, n); |
Line 1149 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1165 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
int expand_count; /* to avoid infinite loops */ |
int expand_count; /* to avoid infinite loops */ |
int npos; /* position in numeric expression */ |
int npos; /* position in numeric expression */ |
int arg_complete; /* argument not interrupted by eol */ |
int arg_complete; /* argument not interrupted by eol */ |
|
int done; /* no more input available */ |
char term; /* character terminating the escape */ |
char term; /* character terminating the escape */ |
|
|
expand_count = 0; |
/* Search forward for comments. */ |
|
|
|
done = 0; |
start = buf->buf + pos; |
start = buf->buf + pos; |
stesc = strchr(start, '\0') - 1; |
for (stesc = buf->buf + pos; *stesc != '\0'; stesc++) { |
while (stesc-- > start) { |
if (stesc[0] != r->escape || stesc[1] == '\0') |
|
continue; |
|
stesc++; |
|
if (*stesc != '"' && *stesc != '#') |
|
continue; |
|
cp = strchr(stesc--, '\0') - 1; |
|
if (*cp == '\n') { |
|
done = 1; |
|
cp--; |
|
} |
|
if (*cp == ' ' || *cp == '\t') |
|
mandoc_msg(MANDOCERR_SPACE_EOL, r->parse, |
|
ln, cp - buf->buf, NULL); |
|
while (stesc > start && stesc[-1] == ' ') |
|
stesc--; |
|
*stesc = '\0'; |
|
break; |
|
} |
|
if (stesc == start) |
|
return ROFF_CONT; |
|
stesc--; |
|
|
|
/* Notice the end of the input. */ |
|
|
|
if (*stesc == '\n') { |
|
*stesc-- = '\0'; |
|
done = 1; |
|
} |
|
|
|
expand_count = 0; |
|
while (stesc >= start) { |
|
|
/* Search backwards for the next backslash. */ |
/* Search backwards for the next backslash. */ |
|
|
if (*stesc != '\\') |
if (*stesc != r->escape) { |
|
if (*stesc == '\\') { |
|
*stesc = '\0'; |
|
buf->sz = mandoc_asprintf(&nbuf, "%s\\e%s", |
|
buf->buf, stesc + 1) + 1; |
|
start = nbuf + pos; |
|
stesc = nbuf + (stesc - buf->buf); |
|
free(buf->buf); |
|
buf->buf = nbuf; |
|
} |
|
stesc--; |
continue; |
continue; |
|
} |
|
|
/* If it is escaped, skip it. */ |
/* If it is escaped, skip it. */ |
|
|
for (cp = stesc - 1; cp >= start; cp--) |
for (cp = stesc - 1; cp >= start; cp--) |
if (*cp != '\\') |
if (*cp != r->escape) |
break; |
break; |
|
|
if ((stesc - cp) % 2 == 0) { |
if ((stesc - cp) % 2 == 0) { |
stesc = (char *)cp; |
while (stesc > cp) |
|
*stesc-- = '\\'; |
continue; |
continue; |
|
} else if (stesc[1] != '\0') { |
|
*stesc = '\\'; |
|
} else { |
|
*stesc-- = '\0'; |
|
if (done) |
|
continue; |
|
else |
|
return ROFF_APPEND; |
} |
} |
|
|
/* Decide whether to expand or to check only. */ |
/* Decide whether to expand or to check only. */ |
Line 1195 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1264 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
mandoc_vmsg(MANDOCERR_ESC_BAD, |
mandoc_vmsg(MANDOCERR_ESC_BAD, |
r->parse, ln, (int)(stesc - buf->buf), |
r->parse, ln, (int)(stesc - buf->buf), |
"%.*s", (int)(cp - stesc), stesc); |
"%.*s", (int)(cp - stesc), stesc); |
|
stesc--; |
continue; |
continue; |
} |
} |
|
|
Line 1328 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1398 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
* Process text streams. |
* Process text streams. |
*/ |
*/ |
static enum rofferr |
static enum rofferr |
roff_parsetext(struct buf *buf, int pos, int *offs) |
roff_parsetext(struct roff *r, struct buf *buf, int pos, int *offs) |
{ |
{ |
size_t sz; |
size_t sz; |
const char *start; |
const char *start; |
Line 1350 roff_parsetext(struct buf *buf, int pos, int *offs) |
|
Line 1420 roff_parsetext(struct buf *buf, int pos, int *offs) |
|
} else if (roffit_lines > 1) |
} else if (roffit_lines > 1) |
--roffit_lines; |
--roffit_lines; |
|
|
|
if (roffce_node != NULL && buf->buf[pos] != '\0') { |
|
if (roffce_lines < 1) { |
|
r->man->last = roffce_node; |
|
r->man->next = ROFF_NEXT_SIBLING; |
|
roffce_lines = 0; |
|
roffce_node = NULL; |
|
} else |
|
roffce_lines--; |
|
} |
|
|
/* Convert all breakable hyphens into ASCII_HYPH. */ |
/* Convert all breakable hyphens into ASCII_HYPH. */ |
|
|
start = p = buf->buf + pos; |
start = p = buf->buf + pos; |
Line 1409 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1489 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
/* Expand some escape sequences. */ |
/* Expand some escape sequences. */ |
|
|
e = roff_res(r, buf, ln, pos); |
e = roff_res(r, buf, ln, pos); |
if (e == ROFF_IGN) |
if (e == ROFF_IGN || e == ROFF_APPEND) |
return e; |
return e; |
assert(e == ROFF_CONT); |
assert(e == ROFF_CONT); |
|
|
Line 1435 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1515 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0')) |
if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0')) |
return tbl_read(r->tbl, ln, buf->buf, ppos); |
return tbl_read(r->tbl, ln, buf->buf, ppos); |
if ( ! ctl) |
if ( ! ctl) |
return roff_parsetext(buf, pos, offs); |
return roff_parsetext(r, buf, pos, offs); |
|
|
/* Skip empty request lines. */ |
/* Skip empty request lines. */ |
|
|
Line 1476 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1556 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
return tbl_read(r->tbl, ln, buf->buf, pos); |
return tbl_read(r->tbl, ln, buf->buf, pos); |
} |
} |
|
|
|
/* For now, let high level macros abort .ce mode. */ |
|
|
|
if (ctl && roffce_node != NULL && |
|
(t == TOKEN_NONE || t == ROFF_EQ || t == ROFF_TS)) { |
|
r->man->last = roffce_node; |
|
r->man->next = ROFF_NEXT_SIBLING; |
|
roffce_lines = 0; |
|
roffce_node = NULL; |
|
} |
|
|
/* |
/* |
* This is neither a roff request nor a user-defined macro. |
* This is neither a roff request nor a user-defined macro. |
* Let the standard macro set parsers handle it. |
* Let the standard macro set parsers handle it. |
Line 1531 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
Line 1621 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
mac = cp; |
mac = cp; |
maclen = roff_getname(r, &cp, ln, ppos); |
maclen = roff_getname(r, &cp, ln, ppos); |
|
|
t = (r->current_string = roff_getstrn(r, mac, maclen)) |
t = (r->current_string = roff_getstrn(r, mac, maclen)) ? |
? ROFF_USERDEF : roffhash_find(r->reqtab, mac, maclen); |
ROFF_USERDEF : |
|
(r->current_string = roff_getrenn(r, mac, maclen)) ? |
|
ROFF_RENAMED : roffhash_find(r->reqtab, mac, maclen); |
|
|
if (t != TOKEN_NONE) |
if (t != TOKEN_NONE) |
*pos = cp - buf; |
*pos = cp - buf; |
Line 2777 roff_onearg(ROFF_ARGS) |
|
Line 2869 roff_onearg(ROFF_ARGS) |
|
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
char *cp; |
char *cp; |
|
int npos; |
|
|
|
if (r->man->flags & (MAN_BLINE | MAN_ELINE) && |
|
(tok == ROFF_sp || tok == ROFF_ti)) |
|
man_breakscope(r->man, tok); |
|
|
|
if (tok == ROFF_ce && roffce_node != NULL) { |
|
r->man->last = roffce_node; |
|
r->man->next = ROFF_NEXT_SIBLING; |
|
} |
|
|
roff_elem_alloc(r->man, ln, ppos, tok); |
roff_elem_alloc(r->man, ln, ppos, tok); |
n = r->man->last; |
n = r->man->last; |
|
|
Line 2794 roff_onearg(ROFF_ARGS) |
|
Line 2896 roff_onearg(ROFF_ARGS) |
|
roff_word_alloc(r->man, ln, pos, buf->buf + pos); |
roff_word_alloc(r->man, ln, pos, buf->buf + pos); |
} |
} |
|
|
n->flags |= NODE_LINE | NODE_VALID | NODE_ENDED; |
if (tok == ROFF_ce) { |
r->man->last = n; |
if (r->man->last->tok == ROFF_ce) { |
|
roff_word_alloc(r->man, ln, pos, "1"); |
|
r->man->last->flags |= NODE_NOSRC; |
|
} |
|
npos = 0; |
|
if (roff_evalnum(r, ln, r->man->last->string, &npos, |
|
&roffce_lines, 0) == 0) { |
|
mandoc_vmsg(MANDOCERR_CE_NONUM, |
|
r->parse, ln, pos, "ce %s", buf->buf + pos); |
|
roffce_lines = 1; |
|
} |
|
if (roffce_lines < 1) { |
|
r->man->last = r->man->last->parent; |
|
roffce_node = NULL; |
|
roffce_lines = 0; |
|
} else |
|
roffce_node = r->man->last->parent; |
|
} else { |
|
n->flags |= NODE_VALID | NODE_ENDED; |
|
r->man->last = n; |
|
} |
|
n->flags |= NODE_LINE; |
r->man->next = ROFF_NEXT_SIBLING; |
r->man->next = ROFF_NEXT_SIBLING; |
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
Line 2826 roff_manyarg(ROFF_ARGS) |
|
Line 2949 roff_manyarg(ROFF_ARGS) |
|
static enum rofferr |
static enum rofferr |
roff_br(ROFF_ARGS) |
roff_br(ROFF_ARGS) |
{ |
{ |
|
if (r->man->flags & (MAN_BLINE | MAN_ELINE)) |
|
man_breakscope(r->man, ROFF_br); |
roff_elem_alloc(r->man, ln, ppos, ROFF_br); |
roff_elem_alloc(r->man, ln, ppos, ROFF_br); |
if (buf->buf[pos] != '\0') |
if (buf->buf[pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |
Line 2843 roff_cc(ROFF_ARGS) |
|
Line 2968 roff_cc(ROFF_ARGS) |
|
p = buf->buf + pos; |
p = buf->buf + pos; |
|
|
if (*p == '\0' || (r->control = *p++) == '.') |
if (*p == '\0' || (r->control = *p++) == '.') |
r->control = 0; |
r->control = '\0'; |
|
|
if (*p != '\0') |
if (*p != '\0') |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse, |
Line 2853 roff_cc(ROFF_ARGS) |
|
Line 2978 roff_cc(ROFF_ARGS) |
|
} |
} |
|
|
static enum rofferr |
static enum rofferr |
|
roff_ec(ROFF_ARGS) |
|
{ |
|
const char *p; |
|
|
|
p = buf->buf + pos; |
|
if (*p == '\0') |
|
r->escape = '\\'; |
|
else { |
|
r->escape = *p; |
|
if (*++p != '\0') |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse, |
|
ln, p - buf->buf, "ec ... %s", p); |
|
} |
|
return ROFF_IGN; |
|
} |
|
|
|
static enum rofferr |
|
roff_eo(ROFF_ARGS) |
|
{ |
|
r->escape = '\0'; |
|
if (buf->buf[pos] != '\0') |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, |
|
ln, pos, "eo %s", buf->buf + pos); |
|
return ROFF_IGN; |
|
} |
|
|
|
static enum rofferr |
roff_tr(ROFF_ARGS) |
roff_tr(ROFF_ARGS) |
{ |
{ |
const char *p, *first, *second; |
const char *p, *first, *second; |
Line 2915 roff_tr(ROFF_ARGS) |
|
Line 3067 roff_tr(ROFF_ARGS) |
|
} |
} |
|
|
static enum rofferr |
static enum rofferr |
|
roff_rn(ROFF_ARGS) |
|
{ |
|
const char *value; |
|
char *oldn, *newn, *end; |
|
size_t oldsz, newsz; |
|
|
|
oldn = newn = buf->buf + pos; |
|
if (*oldn == '\0') |
|
return ROFF_IGN; |
|
|
|
oldsz = roff_getname(r, &newn, ln, pos); |
|
if (oldn[oldsz] == '\\' || *newn == '\0') |
|
return ROFF_IGN; |
|
|
|
end = newn; |
|
newsz = roff_getname(r, &end, ln, newn - buf->buf); |
|
if (newsz == 0) |
|
return ROFF_IGN; |
|
|
|
/* |
|
* Rename a user-defined macro bearing the old name, |
|
* overriding an existing renamed high-level macro |
|
* bearing the new name, if that exists. |
|
*/ |
|
|
|
if ((value = roff_getstrn(r, oldn, oldsz)) != NULL) { |
|
roff_setstrn(&r->strtab, newn, newsz, value, strlen(value), 0); |
|
roff_setstrn(&r->strtab, oldn, oldsz, NULL, 0, 0); |
|
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
|
return ROFF_IGN; |
|
} |
|
|
|
/* |
|
* Rename a high-level macro bearing the old name, |
|
* either renaming it a second time if it was already |
|
* renamed before, or renaming it for the first time. |
|
* In both cases, override an existing user-defined |
|
* macro bearing the new name, if that exists. |
|
*/ |
|
|
|
if ((value = roff_getrenn(r, oldn, oldsz)) != NULL) { |
|
roff_setstrn(&r->rentab, newn, newsz, value, strlen(value), 0); |
|
roff_setstrn(&r->rentab, oldn, oldsz, NULL, 0, 0); |
|
} else |
|
roff_setstrn(&r->rentab, newn, newsz, oldn, oldsz, 0); |
|
roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0); |
|
return ROFF_IGN; |
|
} |
|
|
|
static enum rofferr |
roff_so(ROFF_ARGS) |
roff_so(ROFF_ARGS) |
{ |
{ |
char *name, *cp; |
char *name, *cp; |
Line 3088 roff_userdef(ROFF_ARGS) |
|
Line 3290 roff_userdef(ROFF_ARGS) |
|
ROFF_REPARSE : ROFF_APPEND; |
ROFF_REPARSE : ROFF_APPEND; |
} |
} |
|
|
|
/* |
|
* Calling a high-level macro that was renamed with .rn. |
|
* r->current_string has already been set up by roff_parse(). |
|
*/ |
|
static enum rofferr |
|
roff_renamed(ROFF_ARGS) |
|
{ |
|
char *nbuf; |
|
|
|
buf->sz = mandoc_asprintf(&nbuf, ".%s %s", r->current_string, |
|
buf->buf + pos) + 1; |
|
free(buf->buf); |
|
buf->buf = nbuf; |
|
return ROFF_CONT; |
|
} |
|
|
static size_t |
static size_t |
roff_getname(struct roff *r, char **cpp, int ln, int pos) |
roff_getname(struct roff *r, char **cpp, int ln, int pos) |
{ |
{ |
Line 3233 roff_getstrn(const struct roff *r, const char *name, s |
|
Line 3451 roff_getstrn(const struct roff *r, const char *name, s |
|
return NULL; |
return NULL; |
} |
} |
|
|
|
/* |
|
* Check whether *name is the renamed name of a high-level macro. |
|
* Return the standard name, or NULL if it is not. |
|
*/ |
|
static const char * |
|
roff_getrenn(const struct roff *r, const char *name, size_t len) |
|
{ |
|
const struct roffkv *n; |
|
|
|
for (n = r->rentab; n; n = n->next) |
|
if (0 == strncmp(name, n->key.p, len) && |
|
'\0' == n->key.p[(int)len]) |
|
return n->val.p; |
|
|
|
return NULL; |
|
} |
|
|
static void |
static void |
roff_freestr(struct roffkv *r) |
roff_freestr(struct roffkv *r) |
{ |
{ |
Line 3379 roff_getcontrol(const struct roff *r, const char *cp, |
|
Line 3614 roff_getcontrol(const struct roff *r, const char *cp, |
|
|
|
pos = *ppos; |
pos = *ppos; |
|
|
if (0 != r->control && cp[pos] == r->control) |
if (r->control != '\0' && cp[pos] == r->control) |
pos++; |
pos++; |
else if (0 != r->control) |
else if (r->control != '\0') |
return 0; |
return 0; |
else if ('\\' == cp[pos] && '.' == cp[pos + 1]) |
else if ('\\' == cp[pos] && '.' == cp[pos + 1]) |
pos += 2; |
pos += 2; |