version 1.307, 2017/06/08 19:35:51 |
version 1.310, 2017/06/14 14:02:39 |
Line 222 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 267 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 334 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 511 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_rn, NULL, NULL, 0 }, /* rn */ |
{ roff_rn, NULL, NULL, 0 }, /* rn */ |
{ roff_unsupp, NULL, NULL, 0 }, /* rnn */ |
{ roff_unsupp, NULL, NULL, 0 }, /* rnn */ |
Line 1548 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 2064 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 2080 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 2879 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 2900 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; |
} |
} |