version 1.126, 2018/08/16 23:43:37 |
version 1.132, 2018/08/18 20:41:54 |
Line 40 static int man_args(struct roff_man *, int, |
|
Line 40 static int man_args(struct roff_man *, int, |
|
int *, char *, char **); |
int *, char *, char **); |
static void rew_scope(struct roff_man *, enum roff_tok); |
static void rew_scope(struct roff_man *, enum roff_tok); |
|
|
const struct man_macro __man_macros[MAN_MAX - MAN_TH] = { |
static const struct man_macro man_macros[MAN_MAX - MAN_TH] = { |
{ 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 */ |
Line 71 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
Line 71 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
{ 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, MAN_NSCOPED }, /* in */ |
{ in_line_eoln, MAN_NSCOPED }, /* in */ |
|
{ blk_imp, MAN_BSCOPE }, /* SY */ |
|
{ blk_close, MAN_BSCOPE }, /* YS */ |
{ 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 */ |
Line 79 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
Line 81 const struct man_macro __man_macros[MAN_MAX - MAN_TH] |
|
{ blk_exp, MAN_BSCOPE }, /* MT */ |
{ blk_exp, MAN_BSCOPE }, /* MT */ |
{ blk_close, MAN_BSCOPE }, /* ME */ |
{ blk_close, MAN_BSCOPE }, /* ME */ |
}; |
}; |
const struct man_macro *const man_macros = __man_macros - MAN_TH; |
|
|
|
|
|
|
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 103 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
if (to == NULL && ! (n->flags & NODE_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", roff_name[n->tok]); |
"EOF breaks %s", roff_name[n->tok]); |
Line 112 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 120 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, |
roff_name[n->tok]); |
roff_name[n->tok]); |
Line 176 rew_scope(struct roff_man *man, enum roff_tok tok) |
|
Line 184 rew_scope(struct roff_man *man, enum roff_tok 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 217 blk_close(MACRO_PROT_ARGS) |
|
Line 225 blk_close(MACRO_PROT_ARGS) |
|
return; |
return; |
} |
} |
break; |
break; |
|
case MAN_YS: |
|
ntok = MAN_SY; |
|
break; |
case MAN_UE: |
case MAN_UE: |
ntok = MAN_UR; |
ntok = MAN_UR; |
break; |
break; |
Line 235 blk_close(MACRO_PROT_ARGS) |
|
Line 246 blk_close(MACRO_PROT_ARGS) |
|
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse, |
line, ppos, roff_name[tok]); |
line, ppos, roff_name[tok]); |
rew_scope(man, MAN_PP); |
rew_scope(man, MAN_PP); |
|
if (tok == MAN_RE) { |
|
roff_elem_alloc(man, line, ppos, ROFF_br); |
|
man->last->flags |= NODE_LINE | |
|
NODE_VALID | NODE_ENDED; |
|
man->next = ROFF_NEXT_SIBLING; |
|
} |
return; |
return; |
} |
} |
|
|
Line 251 blk_close(MACRO_PROT_ARGS) |
|
Line 268 blk_close(MACRO_PROT_ARGS) |
|
if (buf[*pos] != '\0') { |
if (buf[*pos] != '\0') { |
roff_word_alloc(man, line, ppos, buf + *pos); |
roff_word_alloc(man, line, ppos, buf + *pos); |
man->last->flags |= NODE_DELIMC; |
man->last->flags |= NODE_DELIMC; |
|
if (mandoc_eos(man->last->string, strlen(man->last->string))) |
|
man->last->flags |= NODE_EOS; |
} |
} |
|
|
/* Move a trailing paragraph behind the block. */ |
/* Move a trailing paragraph behind the block. */ |
Line 259 blk_close(MACRO_PROT_ARGS) |
|
Line 278 blk_close(MACRO_PROT_ARGS) |
|
*pos = strlen(buf); |
*pos = strlen(buf); |
blk_imp(man, ctok, cline, cpos, pos, buf); |
blk_imp(man, ctok, cline, cpos, pos, buf); |
} |
} |
|
|
|
/* Synopsis blocks need an explicit end marker for spacing. */ |
|
|
|
if (tok == MAN_YS && man->last == nn) { |
|
roff_elem_alloc(man, line, ppos, tok); |
|
man_unscope(man, man->last); |
|
} |
} |
} |
|
|
void |
void |
Line 268 blk_exp(MACRO_PROT_ARGS) |
|
Line 294 blk_exp(MACRO_PROT_ARGS) |
|
char *p; |
char *p; |
int la; |
int la; |
|
|
rew_scope(man, tok); |
if (tok == MAN_RS) |
|
rew_scope(man, tok); |
roff_block_alloc(man, line, ppos, tok); |
roff_block_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
|
|
Line 327 blk_imp(MACRO_PROT_ARGS) |
|
Line 354 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 || tok == MAN_TQ || n == man->last)) { |
(tok == MAN_TP || tok == MAN_TQ || n == man->last)) { |
man->flags |= MAN_BLINE; |
man->flags |= MAN_BLINE; |
return; |
return; |
Line 365 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 392 in_line_eoln(MACRO_PROT_ARGS) |
|
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 387 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 414 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; |
} |
} |