version 1.310, 2017/06/14 14:02:39 |
version 1.312, 2017/06/14 22:51:25 |
Line 146 static void roffnode_cleanscope(struct roff *); |
|
Line 146 static void roffnode_cleanscope(struct roff *); |
|
static void roffnode_pop(struct roff *); |
static void roffnode_pop(struct roff *); |
static void roffnode_push(struct roff *, enum roff_tok, |
static void roffnode_push(struct roff *, enum roff_tok, |
const char *, int, int); |
const char *, int, int); |
|
static enum rofferr roff_als(ROFF_ARGS); |
static enum rofferr roff_block(ROFF_ARGS); |
static enum rofferr roff_block(ROFF_ARGS); |
static enum rofferr roff_block_text(ROFF_ARGS); |
static enum rofferr roff_block_text(ROFF_ARGS); |
static enum rofferr roff_block_sub(ROFF_ARGS); |
static enum rofferr roff_block_sub(ROFF_ARGS); |
Line 222 static enum rofferr roff_userdef(ROFF_ARGS); |
|
Line 223 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", "rj", "sp", "ta", |
"mc", "po", "rj", "sp", |
"ti", NULL, |
"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", |
Line 264 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 265 const char *__roff_name[MAN_MAX + 1] = { |
|
"open", "opena", "os", "output", |
"open", "opena", "os", "output", |
"padj", "papersize", "pc", "pev", |
"padj", "papersize", "pc", "pev", |
"pi", "PI", "pl", "pm", |
"pi", "PI", "pl", "pm", |
"pn", "pnr", "po", "ps", |
"pn", "pnr", "ps", |
"psbb", "pshape", "pso", "ptr", |
"psbb", "pshape", "pso", "ptr", |
"pvs", "rchar", "rd", "recursionlimit", |
"pvs", "rchar", "rd", "recursionlimit", |
"return", "rfschar", "rhang", |
"return", "rfschar", "rhang", |
Line 334 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 335 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 }, /* po */ |
{ roff_onearg, NULL, NULL, 0 }, /* rj */ |
{ 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 */ |
Line 343 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 345 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* ad */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ad */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* af */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* af */ |
{ roff_unsupp, NULL, NULL, 0 }, /* aln */ |
{ roff_unsupp, NULL, NULL, 0 }, /* aln */ |
{ roff_unsupp, NULL, NULL, 0 }, /* als */ |
{ roff_als, NULL, NULL, 0 }, /* als */ |
{ roff_block, roff_block_text, roff_block_sub, 0 }, /* am */ |
{ roff_block, roff_block_text, roff_block_sub, 0 }, /* am */ |
{ roff_block, roff_block_text, roff_block_sub, 0 }, /* am1 */ |
{ roff_block, roff_block_text, roff_block_sub, 0 }, /* am1 */ |
{ roff_block, roff_block_text, roff_block_sub, 0 }, /* ami */ |
{ roff_block, roff_block_text, roff_block_sub, 0 }, /* ami */ |
Line 499 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 501 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* pm */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* pm */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* pn */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* pn */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* pnr */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* pnr */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* po */ |
|
{ roff_line_ignore, NULL, NULL, 0 }, /* ps */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* ps */ |
{ roff_unsupp, NULL, NULL, 0 }, /* psbb */ |
{ roff_unsupp, NULL, NULL, 0 }, /* psbb */ |
{ roff_unsupp, NULL, NULL, 0 }, /* pshape */ |
{ roff_unsupp, NULL, NULL, 0 }, /* pshape */ |
Line 1779 roff_block(ROFF_ARGS) |
|
Line 1780 roff_block(ROFF_ARGS) |
|
* appended from roff_block_text() in multiline mode. |
* appended from roff_block_text() in multiline mode. |
*/ |
*/ |
|
|
if (tok == ROFF_de || tok == ROFF_dei) |
if (tok == ROFF_de || tok == ROFF_dei) { |
roff_setstrn(&r->strtab, name, namesz, "", 0, 0); |
roff_setstrn(&r->strtab, name, namesz, "", 0, 0); |
|
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0); |
|
} |
|
|
if (*cp == '\0') |
if (*cp == '\0') |
return ROFF_IGN; |
return ROFF_IGN; |
Line 2249 roff_ds(ROFF_ARGS) |
|
Line 2252 roff_ds(ROFF_ARGS) |
|
/* The rest is the value. */ |
/* The rest is the value. */ |
roff_setstrn(&r->strtab, name, namesz, string, strlen(string), |
roff_setstrn(&r->strtab, name, namesz, string, strlen(string), |
ROFF_as == tok); |
ROFF_as == tok); |
|
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0); |
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|
Line 2660 roff_rm(ROFF_ARGS) |
|
Line 2664 roff_rm(ROFF_ARGS) |
|
name = cp; |
name = cp; |
namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf)); |
namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf)); |
roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0); |
roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0); |
|
roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0); |
if (name[namesz] == '\\') |
if (name[namesz] == '\\') |
break; |
break; |
} |
} |
Line 2958 roff_manyarg(ROFF_ARGS) |
|
Line 2963 roff_manyarg(ROFF_ARGS) |
|
} |
} |
|
|
static enum rofferr |
static enum rofferr |
|
roff_als(ROFF_ARGS) |
|
{ |
|
char *oldn, *newn, *end, *value; |
|
size_t oldsz, newsz, valsz; |
|
|
|
newn = oldn = buf->buf + pos; |
|
if (*newn == '\0') |
|
return ROFF_IGN; |
|
|
|
newsz = roff_getname(r, &oldn, ln, pos); |
|
if (newn[newsz] == '\\' || *oldn == '\0') |
|
return ROFF_IGN; |
|
|
|
end = oldn; |
|
oldsz = roff_getname(r, &end, ln, oldn - buf->buf); |
|
if (oldsz == 0) |
|
return ROFF_IGN; |
|
|
|
valsz = mandoc_asprintf(&value, ".%.*s \\$*\n", (int)oldsz, oldn); |
|
roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0); |
|
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
|
free(value); |
|
return ROFF_IGN; |
|
} |
|
|
|
static enum rofferr |
roff_br(ROFF_ARGS) |
roff_br(ROFF_ARGS) |
{ |
{ |
if (r->man->flags & (MAN_BLINE | MAN_ELINE)) |
if (r->man->flags & (MAN_BLINE | MAN_ELINE)) |
Line 3162 roff_so(ROFF_ARGS) |
|
Line 3193 roff_so(ROFF_ARGS) |
|
static enum rofferr |
static enum rofferr |
roff_userdef(ROFF_ARGS) |
roff_userdef(ROFF_ARGS) |
{ |
{ |
const char *arg[9], *ap; |
const char *arg[16], *ap; |
char *cp, *n1, *n2; |
char *cp, *n1, *n2; |
int expand_count, i, ib, ie; |
int expand_count, i, ib, ie; |
size_t asz, rsz; |
size_t asz, rsz; |
Line 3174 roff_userdef(ROFF_ARGS) |
|
Line 3205 roff_userdef(ROFF_ARGS) |
|
|
|
r->argc = 0; |
r->argc = 0; |
cp = buf->buf + pos; |
cp = buf->buf + pos; |
for (i = 0; i < 9; i++) { |
for (i = 0; i < 16; i++) { |
if (*cp == '\0') |
if (*cp == '\0') |
arg[i] = ""; |
arg[i] = ""; |
else { |
else { |