version 1.357, 2018/12/31 04:55:47 |
version 1.360, 2019/01/05 00:36:50 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 181 static int roff_als(ROFF_ARGS); |
|
Line 181 static int roff_als(ROFF_ARGS); |
|
static int roff_block(ROFF_ARGS); |
static int roff_block(ROFF_ARGS); |
static int roff_block_text(ROFF_ARGS); |
static int roff_block_text(ROFF_ARGS); |
static int roff_block_sub(ROFF_ARGS); |
static int roff_block_sub(ROFF_ARGS); |
static int roff_br(ROFF_ARGS); |
|
static int roff_cblock(ROFF_ARGS); |
static int roff_cblock(ROFF_ARGS); |
static int roff_cc(ROFF_ARGS); |
static int roff_cc(ROFF_ARGS); |
static int roff_ccond(struct roff *, int, int); |
static int roff_ccond(struct roff *, int, int); |
Line 221 static int roff_line_ignore(ROFF_ARGS); |
|
Line 220 static int roff_line_ignore(ROFF_ARGS); |
|
static void roff_man_alloc1(struct roff_man *); |
static void roff_man_alloc1(struct roff_man *); |
static void roff_man_free1(struct roff_man *); |
static void roff_man_free1(struct roff_man *); |
static int roff_manyarg(ROFF_ARGS); |
static int roff_manyarg(ROFF_ARGS); |
|
static int roff_noarg(ROFF_ARGS); |
static int roff_nop(ROFF_ARGS); |
static int roff_nop(ROFF_ARGS); |
static int roff_nr(ROFF_ARGS); |
static int roff_nr(ROFF_ARGS); |
static int roff_onearg(ROFF_ARGS); |
static int roff_onearg(ROFF_ARGS); |
Line 257 static int roff_userdef(ROFF_ARGS); |
|
Line 257 static int 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", "ce", "ft", "ll", |
"br", "ce", "fi", "ft", |
"mc", "po", "rj", "sp", |
"ll", "mc", "nf", |
|
"po", "rj", "sp", |
"ta", "ti", NULL, |
"ta", "ti", NULL, |
"ab", "ad", "af", "aln", |
"ab", "ad", "af", "aln", |
"als", "am", "am1", "ami", |
"als", "am", "am1", "ami", |
Line 357 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 358 const char *__roff_name[MAN_MAX + 1] = { |
|
"HP", "SM", "SB", "BI", |
"HP", "SM", "SB", "BI", |
"IB", "BR", "RB", "R", |
"IB", "BR", "RB", "R", |
"B", "I", "IR", "RI", |
"B", "I", "IR", "RI", |
"nf", "fi", |
|
"RE", "RS", "DT", "UC", |
"RE", "RS", "DT", "UC", |
"PD", "AT", "in", |
"PD", "AT", "in", |
"SY", "YS", "OP", |
"SY", "YS", "OP", |
Line 367 const char *__roff_name[MAN_MAX + 1] = { |
|
Line 367 const char *__roff_name[MAN_MAX + 1] = { |
|
const char *const *roff_name = __roff_name; |
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_noarg, NULL, NULL, 0 }, /* br */ |
{ roff_onearg, NULL, NULL, 0 }, /* ce */ |
{ roff_onearg, NULL, NULL, 0 }, /* ce */ |
|
{ roff_noarg, NULL, NULL, 0 }, /* fi */ |
{ 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_noarg, NULL, NULL, 0 }, /* nf */ |
{ roff_onearg, NULL, NULL, 0 }, /* po */ |
{ 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 */ |
Line 401 static struct roffmac roffs[TOKEN_NONE] = { |
|
Line 403 static struct roffmac roffs[TOKEN_NONE] = { |
|
{ roff_unsupp, NULL, NULL, 0 }, /* break */ |
{ roff_unsupp, NULL, NULL, 0 }, /* break */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* breakchar */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* breakchar */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* brnl */ |
{ roff_line_ignore, NULL, NULL, 0 }, /* brnl */ |
{ roff_br, NULL, NULL, 0 }, /* brp */ |
{ roff_noarg, NULL, NULL, 0 }, /* brp */ |
{ 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 */ |
Line 887 roff_node_alloc(struct roff_man *man, int line, int po |
|
Line 889 roff_node_alloc(struct roff_man *man, int line, int po |
|
n->flags |= NODE_SYNPRETTY; |
n->flags |= NODE_SYNPRETTY; |
else |
else |
n->flags &= ~NODE_SYNPRETTY; |
n->flags &= ~NODE_SYNPRETTY; |
|
if ((man->flags & (ROFF_NOFILL | ROFF_NONOFILL)) == ROFF_NOFILL) |
|
n->flags |= NODE_NOFILL; |
|
else |
|
n->flags &= ~NODE_NOFILL; |
if (man->flags & MDOC_NEWLINE) |
if (man->flags & MDOC_NEWLINE) |
n->flags |= NODE_LINE; |
n->flags |= NODE_LINE; |
man->flags &= ~MDOC_NEWLINE; |
man->flags &= ~MDOC_NEWLINE; |
Line 3338 roff_TS(ROFF_ARGS) |
|
Line 3344 roff_TS(ROFF_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
roff_noarg(ROFF_ARGS) |
|
{ |
|
if (r->man->flags & (MAN_BLINE | MAN_ELINE)) |
|
man_breakscope(r->man, tok); |
|
if (tok == ROFF_brp) |
|
tok = ROFF_br; |
|
roff_elem_alloc(r->man, ln, ppos, tok); |
|
if (buf->buf[pos] != '\0') |
|
mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos, |
|
"%s %s", roff_name[tok], buf->buf + pos); |
|
if (tok == ROFF_nf) |
|
r->man->flags |= ROFF_NOFILL; |
|
else if (tok == ROFF_fi) |
|
r->man->flags &= ~ROFF_NOFILL; |
|
r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED; |
|
r->man->next = ROFF_NEXT_SIBLING; |
|
return ROFF_IGN; |
|
} |
|
|
|
static int |
roff_onearg(ROFF_ARGS) |
roff_onearg(ROFF_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
Line 3444 roff_als(ROFF_ARGS) |
|
Line 3470 roff_als(ROFF_ARGS) |
|
roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0); |
roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0); |
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0); |
free(value); |
free(value); |
return ROFF_IGN; |
|
} |
|
|
|
static int |
|
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); |
|
if (buf->buf[pos] != '\0') |
|
mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos, |
|
"%s %s", roff_name[tok], buf->buf + pos); |
|
r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED; |
|
r->man->next = ROFF_NEXT_SIBLING; |
|
return ROFF_IGN; |
return ROFF_IGN; |
} |
} |
|
|