version 1.110, 2015/09/04 21:25:00 |
version 1.127, 2018/08/17 20:33:37 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 38 static void blk_imp(MACRO_PROT_ARGS); |
|
Line 38 static void blk_imp(MACRO_PROT_ARGS); |
|
static void in_line_eoln(MACRO_PROT_ARGS); |
static void in_line_eoln(MACRO_PROT_ARGS); |
static int man_args(struct roff_man *, int, |
static int man_args(struct roff_man *, int, |
int *, char *, char **); |
int *, char *, char **); |
static void rew_scope(struct roff_man *, int); |
static void rew_scope(struct roff_man *, enum roff_tok); |
|
|
const struct man_macro __man_macros[MAN_MAX] = { |
static const struct man_macro man_macros[MAN_MAX - MAN_TH] = { |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
|
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ in_line_eoln, MAN_BSCOPE }, /* TH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SH */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* TP */ |
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* TP */ |
|
{ blk_imp, MAN_BSCOPE | MAN_SCOPED }, /* TQ */ |
{ blk_imp, MAN_BSCOPE }, /* LP */ |
{ blk_imp, MAN_BSCOPE }, /* LP */ |
{ blk_imp, MAN_BSCOPE }, /* PP */ |
{ blk_imp, MAN_BSCOPE }, /* PP */ |
{ blk_imp, MAN_BSCOPE }, /* P */ |
{ blk_imp, MAN_BSCOPE }, /* P */ |
Line 62 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 62 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */ |
{ in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */ |
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* IR */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, 0 }, /* RI */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
|
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* nf */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ in_line_eoln, MAN_NSCOPED }, /* fi */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
Line 71 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 70 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* UC */ |
{ in_line_eoln, 0 }, /* UC */ |
{ in_line_eoln, MAN_NSCOPED }, /* PD */ |
{ in_line_eoln, MAN_NSCOPED }, /* PD */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* in */ |
{ in_line_eoln, MAN_NSCOPED }, /* in */ |
{ in_line_eoln, 0 }, /* ft */ |
|
{ in_line_eoln, 0 }, /* OP */ |
{ in_line_eoln, 0 }, /* OP */ |
{ in_line_eoln, MAN_BSCOPE }, /* EX */ |
{ in_line_eoln, MAN_BSCOPE }, /* EX */ |
{ in_line_eoln, MAN_BSCOPE }, /* EE */ |
{ in_line_eoln, MAN_BSCOPE }, /* EE */ |
{ blk_exp, MAN_BSCOPE }, /* UR */ |
{ blk_exp, MAN_BSCOPE }, /* UR */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ in_line_eoln, 0 }, /* ll */ |
{ blk_exp, MAN_BSCOPE }, /* MT */ |
|
{ blk_close, MAN_BSCOPE }, /* ME */ |
}; |
}; |
|
|
const struct man_macro * const man_macros = __man_macros; |
|
|
|
|
const struct man_macro * |
|
man_macro(enum roff_tok tok) |
|
{ |
|
assert(tok >= MAN_TH && tok <= MAN_MAX); |
|
return man_macros + (tok - MAN_TH); |
|
} |
|
|
void |
void |
man_unscope(struct roff_man *man, const struct roff_node *to) |
man_unscope(struct roff_man *man, const struct roff_node *to) |
Line 95 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 99 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
/* Reached the end of the document? */ |
/* Reached the end of the document? */ |
|
|
if (to == NULL && ! (n->flags & MAN_VALID)) { |
if (to == NULL && ! (n->flags & NODE_VALID)) { |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
man_macros[n->tok].flags & MAN_SCOPED) { |
man_macro(n->tok)->flags & MAN_SCOPED) { |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
man->parse, n->line, n->pos, |
man->parse, n->line, n->pos, |
"EOF breaks %s", |
"EOF breaks %s", roff_name[n->tok]); |
man_macronames[n->tok]); |
|
if (man->flags & MAN_ELINE) |
if (man->flags & MAN_ELINE) |
man->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
else { |
else { |
Line 115 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 118 man_unscope(struct roff_man *man, const struct roff_no |
|
continue; |
continue; |
} |
} |
if (n->type == ROFFT_BLOCK && |
if (n->type == ROFFT_BLOCK && |
man_macros[n->tok].fp == blk_exp) |
man_macro(n->tok)->fp == blk_exp) |
mandoc_msg(MANDOCERR_BLK_NOEND, |
mandoc_msg(MANDOCERR_BLK_NOEND, |
man->parse, n->line, n->pos, |
man->parse, n->line, n->pos, |
man_macronames[n->tok]); |
roff_name[n->tok]); |
} |
} |
|
|
/* |
/* |
Line 130 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 133 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
man->last = n; |
man->last = n; |
n = n->parent; |
n = n->parent; |
man_valid_post(man); |
man->last->flags |= NODE_VALID; |
} |
} |
|
|
/* |
/* |
Line 150 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 153 man_unscope(struct roff_man *man, const struct roff_no |
|
* scopes. When a scope is closed, it must be validated and actioned. |
* scopes. When a scope is closed, it must be validated and actioned. |
*/ |
*/ |
static void |
static void |
rew_scope(struct roff_man *man, int tok) |
rew_scope(struct roff_man *man, enum roff_tok tok) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
/* Preserve empty paragraphs before RS. */ |
/* Preserve empty paragraphs before RS. */ |
|
|
n = man->last; |
n = man->last; |
if (tok == MAN_RS && n->nchild == 0 && |
if (tok == MAN_RS && n->child == NULL && |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
return; |
return; |
|
|
for (;;) { |
for (;;) { |
if (n->type == ROFFT_ROOT) |
if (n->type == ROFFT_ROOT) |
return; |
return; |
if (n->flags & MAN_VALID) { |
if (n->flags & NODE_VALID) { |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
} |
} |
Line 179 rew_scope(struct roff_man *man, int tok) |
|
Line 182 rew_scope(struct roff_man *man, int tok) |
|
} |
} |
if (tok != MAN_SH && (n->tok == MAN_SH || |
if (tok != MAN_SH && (n->tok == MAN_SH || |
(tok != MAN_SS && (n->tok == MAN_SS || |
(tok != MAN_SS && (n->tok == MAN_SS || |
man_macros[n->tok].fp == blk_exp)))) |
man_macro(n->tok)->fp == blk_exp)))) |
return; |
return; |
man_unscope(man, n); |
man_unscope(man, n); |
n = man->last; |
n = man->last; |
Line 193 rew_scope(struct roff_man *man, int tok) |
|
Line 196 rew_scope(struct roff_man *man, int tok) |
|
void |
void |
blk_close(MACRO_PROT_ARGS) |
blk_close(MACRO_PROT_ARGS) |
{ |
{ |
int ntok; |
enum roff_tok ctok, ntok; |
const struct roff_node *nn; |
const struct roff_node *nn; |
char *p; |
char *p; |
int nrew, target; |
int cline, cpos, nrew, target; |
|
|
nrew = 1; |
nrew = 1; |
switch (tok) { |
switch (tok) { |
Line 223 blk_close(MACRO_PROT_ARGS) |
|
Line 226 blk_close(MACRO_PROT_ARGS) |
|
case MAN_UE: |
case MAN_UE: |
ntok = MAN_UR; |
ntok = MAN_UR; |
break; |
break; |
|
case MAN_ME: |
|
ntok = MAN_MT; |
|
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
|
|
for (nn = man->last->parent; nn; nn = nn->parent) |
for (nn = man->last->parent; nn; nn = nn->parent) |
Line 234 blk_close(MACRO_PROT_ARGS) |
|
Line 239 blk_close(MACRO_PROT_ARGS) |
|
|
|
if (nn == NULL) { |
if (nn == NULL) { |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
line, ppos, man_macronames[tok]); |
line, ppos, roff_name[tok]); |
rew_scope(man, MAN_PP); |
rew_scope(man, MAN_PP); |
} else { |
return; |
line = man->last->line; |
} |
ppos = man->last->pos; |
|
ntok = man->last->tok; |
|
man_unscope(man, nn); |
|
|
|
/* Move a trailing paragraph behind the block. */ |
cline = man->last->line; |
|
cpos = man->last->pos; |
|
ctok = man->last->tok; |
|
man_unscope(man, nn); |
|
|
if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) { |
if (tok == MAN_RE && nn->head->aux > 0) |
*pos = strlen(buf); |
roff_setreg(man->roff, "an-margin", nn->head->aux, '-'); |
blk_imp(man, ntok, line, ppos, pos, buf); |
|
} |
/* Trailing text. */ |
|
|
|
if (buf[*pos] != '\0') { |
|
roff_word_alloc(man, line, ppos, buf + *pos); |
|
man->last->flags |= NODE_DELIMC; |
} |
} |
|
|
|
/* Move a trailing paragraph behind the block. */ |
|
|
|
if (ctok == MAN_LP || ctok == MAN_PP || ctok == MAN_P) { |
|
*pos = strlen(buf); |
|
blk_imp(man, ctok, cline, cpos, pos, buf); |
|
} |
} |
} |
|
|
void |
void |
Line 263 blk_exp(MACRO_PROT_ARGS) |
|
Line 279 blk_exp(MACRO_PROT_ARGS) |
|
head = roff_head_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
|
|
la = *pos; |
la = *pos; |
if (man_args(man, line, pos, buf, &p)) |
if (man_args(man, line, pos, buf, &p)) { |
roff_word_alloc(man, line, la, p); |
roff_word_alloc(man, line, la, p); |
|
if (tok == MAN_RS) { |
|
if (roff_getreg(man->roff, "an-margin") == 0) |
|
roff_setreg(man->roff, "an-margin", |
|
7 * 24, '='); |
|
if ((head->aux = strtod(p, NULL) * 24.0) > 0) |
|
roff_setreg(man->roff, "an-margin", |
|
head->aux, '+'); |
|
} |
|
} |
|
|
if (buf[*pos] != '\0') |
if (buf[*pos] != '\0') |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, line, |
man->parse, line, *pos, "%s ... %s", |
*pos, "%s ... %s", roff_name[tok], buf + *pos); |
man_macronames[tok], buf + *pos); |
|
|
|
man_unscope(man, head); |
man_unscope(man, head); |
roff_body_alloc(man, line, ppos, tok); |
roff_body_alloc(man, line, ppos, tok); |
Line 309 blk_imp(MACRO_PROT_ARGS) |
|
Line 333 blk_imp(MACRO_PROT_ARGS) |
|
* For `TP', always keep the head open. |
* For `TP', always keep the head open. |
*/ |
*/ |
|
|
if (man_macros[tok].flags & MAN_SCOPED && |
if (man_macro(tok)->flags & MAN_SCOPED && |
(tok == MAN_TP || n == man->last)) { |
(tok == MAN_TP || tok == MAN_TQ || n == man->last)) { |
man->flags |= MAN_BLINE; |
man->flags |= MAN_BLINE; |
return; |
return; |
} |
} |
Line 332 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 356 in_line_eoln(MACRO_PROT_ARGS) |
|
n = man->last; |
n = man->last; |
|
|
for (;;) { |
for (;;) { |
if (buf[*pos] != '\0' && (tok == MAN_br || |
if (buf[*pos] != '\0' && (tok == MAN_fi || tok == MAN_nf)) { |
tok == MAN_fi || tok == MAN_nf)) { |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
man->parse, line, *pos, "%s %s", |
man->parse, line, *pos, "%s %s", |
man_macronames[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
break; |
break; |
} |
} |
if (buf[*pos] != '\0' && man->last != n && |
if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) { |
(tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) { |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, |
man->parse, line, *pos, "%s ... %s", |
man->parse, line, *pos, "%s ... %s", |
man_macronames[tok], buf + *pos); |
roff_name[tok], buf + *pos); |
break; |
break; |
} |
} |
la = *pos; |
la = *pos; |
if ( ! man_args(man, line, pos, buf, &p)) |
if ( ! man_args(man, line, pos, buf, &p)) |
break; |
break; |
if (man_macros[tok].flags & MAN_JOIN && |
if (man_macro(tok)->flags & MAN_JOIN && |
man->last->type == ROFFT_TEXT) |
man->last->type == ROFFT_TEXT) |
roff_word_append(man, p); |
roff_word_append(man, p); |
else |
else |
Line 357 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 379 in_line_eoln(MACRO_PROT_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Append MAN_EOS in case the last snipped argument |
* Append NODE_EOS in case the last snipped argument |
* ends with a dot, e.g. `.IR syslog (3).' |
* ends with a dot, e.g. `.IR syslog (3).' |
*/ |
*/ |
|
|
if (n != man->last && |
if (n != man->last && |
mandoc_eos(man->last->string, strlen(man->last->string))) |
mandoc_eos(man->last->string, strlen(man->last->string))) |
man->last->flags |= MAN_EOS; |
man->last->flags |= NODE_EOS; |
|
|
/* |
/* |
* If no arguments are specified and this is MAN_SCOPED (i.e., |
* If no arguments are specified and this is MAN_SCOPED (i.e., |
Line 371 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 393 in_line_eoln(MACRO_PROT_ARGS) |
|
* waiting for terms to load into our context. |
* waiting for terms to load into our context. |
*/ |
*/ |
|
|
if (n == man->last && man_macros[tok].flags & MAN_SCOPED) { |
if (n == man->last && man_macro(tok)->flags & MAN_SCOPED) { |
assert( ! (man_macros[tok].flags & MAN_NSCOPED)); |
assert((man_macro(tok)->flags & MAN_NSCOPED) == 0); |
man->flags |= MAN_ELINE; |
man->flags |= MAN_ELINE; |
return; |
return; |
} |
} |
Line 380 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 402 in_line_eoln(MACRO_PROT_ARGS) |
|
assert(man->last->type != ROFFT_ROOT); |
assert(man->last->type != ROFFT_ROOT); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
|
|
/* |
/* Rewind our element scope. */ |
* Rewind our element scope. Note that when TH is pruned, we'll |
|
* be back at the root, so make sure that we don't clobber as |
|
* its sibling. |
|
*/ |
|
|
|
for ( ; man->last; man->last = man->last->parent) { |
for ( ; man->last; man->last = man->last->parent) { |
|
man_state(man, man->last); |
if (man->last == n) |
if (man->last == n) |
break; |
break; |
if (man->last->type == ROFFT_ROOT) |
|
break; |
|
man_valid_post(man); |
|
} |
} |
|
|
assert(man->last); |
|
|
|
/* |
|
* Same here regarding whether we're back at the root. |
|
*/ |
|
|
|
if (man->last->type != ROFFT_ROOT) |
|
man_valid_post(man); |
|
} |
} |
|
|
void |
void |
Line 409 man_endparse(struct roff_man *man) |
|
Line 416 man_endparse(struct roff_man *man) |
|
{ |
{ |
|
|
man_unscope(man, man->first); |
man_unscope(man, man->first); |
|
man->flags &= ~MAN_LITERAL; |
} |
} |
|
|
static int |
static int |
Line 421 man_args(struct roff_man *man, int line, int *pos, cha |
|
Line 429 man_args(struct roff_man *man, int line, int *pos, cha |
|
assert(' ' != *start); |
assert(' ' != *start); |
|
|
if ('\0' == *start) |
if ('\0' == *start) |
return(0); |
return 0; |
|
|
*v = mandoc_getarg(man->parse, v, line, pos); |
*v = mandoc_getarg(man->parse, v, line, pos); |
return(1); |
return 1; |
} |
} |