version 1.305, 2017/06/06 15:01:04 |
version 1.310, 2017/06/14 14:02:39 |
|
|
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 191 static enum roff_tok roff_parse(struct roff *, char * |
|
Line 194 static enum roff_tok roff_parse(struct roff *, char * |
|
int, int); |
int, int); |
static enum rofferr roff_parsetext(struct roff *, struct buf *, |
static enum rofferr roff_parsetext(struct roff *, struct buf *, |
int, int *); |
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 217 static enum rofferr roff_userdef(ROFF_ARGS); |
|
Line 222 static enum rofferr roff_userdef(ROFF_ARGS); |
|
|
|
const char *__roff_name[MAN_MAX + 1] = { |
const char *__roff_name[MAN_MAX + 1] = { |
"br", "ce", "ft", "ll", |
"br", "ce", "ft", "ll", |
"mc", "sp", "ta", "ti", |
"mc", "rj", "sp", "ta", |
NULL, |
"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", |
Line 262 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 278 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 329 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 334 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ 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 506 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 564 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 743 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 760 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 1537 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 1614 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 2051 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
Line 2065 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
{ |
{ |
char *cp, *name; |
char *cp, *name; |
size_t sz; |
size_t sz; |
int number, savepos, wanttrue; |
int number, savepos, istrue, wanttrue; |
|
|
if ('!' == v[*pos]) { |
if ('!' == v[*pos]) { |
wanttrue = 0; |
wanttrue = 0; |
Line 2067 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
Line 2081 roff_evalcond(struct roff *r, int ln, char *v, int *po |
|
(*pos)++; |
(*pos)++; |
return wanttrue; |
return wanttrue; |
case 'c': |
case 'c': |
case 'd': |
|
case 'e': |
case 'e': |
case 't': |
case 't': |
case 'v': |
case 'v': |
(*pos)++; |
(*pos)++; |
return !wanttrue; |
return !wanttrue; |
|
case 'd': |
case 'r': |
case 'r': |
cp = name = v + ++*pos; |
cp = v + *pos + 1; |
sz = roff_getname(r, &cp, ln, *pos); |
while (*cp == ' ') |
|
cp++; |
|
name = cp; |
|
sz = roff_getname(r, &cp, ln, cp - v); |
|
istrue = sz && (v[*pos] == 'r' ? roff_hasregn(r, name, sz) : |
|
(roff_getstrn(r, name, sz) != NULL || |
|
roff_getrenn(r, name, sz) != NULL)); |
*pos = cp - v; |
*pos = cp - v; |
return (sz && roff_hasregn(r, name, sz)) == wanttrue; |
return istrue == wanttrue; |
default: |
default: |
break; |
break; |
} |
} |
Line 2866 roff_onearg(ROFF_ARGS) |
|
Line 2886 roff_onearg(ROFF_ARGS) |
|
(tok == ROFF_sp || tok == ROFF_ti)) |
(tok == ROFF_sp || tok == ROFF_ti)) |
man_breakscope(r->man, tok); |
man_breakscope(r->man, tok); |
|
|
if (tok == ROFF_ce && roffce_node != NULL) { |
if (roffce_node != NULL && (tok == ROFF_ce || tok == ROFF_rj)) { |
r->man->last = roffce_node; |
r->man->last = roffce_node; |
r->man->next = ROFF_NEXT_SIBLING; |
r->man->next = ROFF_NEXT_SIBLING; |
} |
} |
Line 2887 roff_onearg(ROFF_ARGS) |
|
Line 2907 roff_onearg(ROFF_ARGS) |
|
roff_word_alloc(r->man, ln, pos, buf->buf + pos); |
roff_word_alloc(r->man, ln, pos, buf->buf + pos); |
} |
} |
|
|
if (tok == ROFF_ce) { |
if (tok == ROFF_ce || tok == ROFF_rj) { |
if (r->man->last->tok == ROFF_ce) { |
if (r->man->last->type == ROFFT_ELEM) { |
roff_word_alloc(r->man, ln, pos, "1"); |
roff_word_alloc(r->man, ln, pos, "1"); |
r->man->last->flags |= NODE_NOSRC; |
r->man->last->flags |= NODE_NOSRC; |
} |
} |
Line 3058 roff_tr(ROFF_ARGS) |
|
Line 3078 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 3231 roff_userdef(ROFF_ARGS) |
|
Line 3301 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 3372 roff_getstrn(const struct roff *r, const char *name, s |
|
Line 3458 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; |
} |
} |