version 1.304, 2017/06/04 22:44:15 |
version 1.309, 2017/06/14 13:00:31 |
|
|
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 */ |
Line 175 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 189 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 215 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", "mc", |
"br", "ce", "ft", "ll", |
"sp", "ta", "ti", NULL, |
"mc", "rj", "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 260 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 267 const char *__roff_name[MAN_MAX + 1] = { |
|
"pn", "pnr", "po", "ps", |
"pn", "pnr", "po", "ps", |
"psbb", "pshape", "pso", "ptr", |
"psbb", "pshape", "pso", "ptr", |
"pvs", "rchar", "rd", "recursionlimit", |
"pvs", "rchar", "rd", "recursionlimit", |
"return", "rfschar", "rhang", "rj", |
"return", "rfschar", "rhang", |
"rm", "rn", "rnn", "rr", |
"rm", "rn", "rnn", "rr", |
"rs", "rt", "schar", "sentchar", |
"rs", "rt", "schar", "sentchar", |
"shc", "shift", "sizes", "so", |
"shc", "shift", "sizes", "so", |
Line 276 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 323 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 }, /* mc */ |
|
{ roff_onearg, NULL, NULL, 0 }, /* rj */ |
{ 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 */ |
{ roff_onearg, NULL, NULL, 0 }, /* ti */ |
Line 357 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 366 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 504 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 512 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_unsupp, NULL, NULL, 0 }, /* return */ |
{ roff_unsupp, NULL, NULL, 0 }, /* return */ |
{ roff_unsupp, NULL, NULL, 0 }, /* rfschar */ |
{ roff_unsupp, NULL, NULL, 0 }, /* rfschar */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* rhang */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* rhang */ |
{ 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 562 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 604 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 739 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 756 roff_reset(struct roff *r) |
|
Line 767 roff_reset(struct roff *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 = '\\'; |
r->escape = '\\'; |
|
roffce_lines = 0; |
|
roffce_node = NULL; |
|
roffit_lines = 0; |
|
roffit_macro = NULL; |
} |
} |
|
|
void |
void |
Line 1387 roff_res(struct roff *r, struct buf *buf, int ln, int |
|
Line 1402 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 1409 roff_parsetext(struct buf *buf, int pos, int *offs) |
|
Line 1424 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 1494 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1519 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 1523 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1548 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
|
|
/* Tables ignore most macros. */ |
/* Tables ignore most macros. */ |
|
|
if (r->tbl != NULL && (t == TOKEN_NONE || t == ROFF_TS)) { |
if (r->tbl != NULL && (t == TOKEN_NONE || t == ROFF_TS || |
|
t == ROFF_br || t == ROFF_ce || t == ROFF_rj || t == ROFF_sp)) { |
mandoc_msg(MANDOCERR_TBLMACRO, r->parse, |
mandoc_msg(MANDOCERR_TBLMACRO, r->parse, |
ln, pos, buf->buf + spos); |
ln, pos, buf->buf + spos); |
if (t == ROFF_TS) |
if (t != TOKEN_NONE) |
return ROFF_IGN; |
return ROFF_IGN; |
while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ') |
while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ') |
pos++; |
pos++; |
Line 1535 roff_parseln(struct roff *r, int ln, struct buf *buf, |
|
Line 1561 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 1590 roff_parse(struct roff *r, char *buf, int *pos, int ln |
|
Line 1626 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 2836 roff_onearg(ROFF_ARGS) |
|
Line 2874 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) && |
if (r->man->flags & (MAN_BLINE | MAN_ELINE) && |
(tok == ROFF_sp || tok == ROFF_ti)) |
(tok == ROFF_sp || tok == ROFF_ti)) |
man_breakscope(r->man, tok); |
man_breakscope(r->man, tok); |
|
|
|
if (roffce_node != NULL && (tok == ROFF_ce || tok == ROFF_rj)) { |
|
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 2857 roff_onearg(ROFF_ARGS) |
|
Line 2901 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 || tok == ROFF_rj) { |
r->man->last = n; |
if (r->man->last->type == ROFFT_ELEM) { |
|
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 3007 roff_tr(ROFF_ARGS) |
|
Line 3072 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 3180 roff_userdef(ROFF_ARGS) |
|
Line 3295 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 3321 roff_getstrn(const struct roff *r, const char *name, s |
|
Line 3452 roff_getstrn(const struct roff *r, const char *name, s |
|
if (0 == strncmp(name, predefs[i].name, len) && |
if (0 == strncmp(name, predefs[i].name, len) && |
'\0' == predefs[i].name[(int)len]) |
'\0' == predefs[i].name[(int)len]) |
return predefs[i].str; |
return predefs[i].str; |
|
|
|
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; |
return NULL; |
} |
} |