version 1.91, 2014/11/28 05:51:32 |
version 1.96, 2015/02/06 08:28:35 |
|
|
/* $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 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012, 2013, 2014, 2015 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 72 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 72 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 }, /* na */ |
|
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_NSCOPED }, /* sp */ |
{ in_line_eoln, MAN_BSCOPE }, /* nf */ |
{ in_line_eoln, MAN_BSCOPE }, /* nf */ |
{ in_line_eoln, MAN_BSCOPE }, /* fi */ |
{ in_line_eoln, MAN_BSCOPE }, /* fi */ |
{ blk_close, 0 }, /* RE */ |
{ blk_close, MAN_BSCOPE }, /* RE */ |
{ blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* RS */ |
{ blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* RS */ |
{ in_line_eoln, 0 }, /* DT */ |
{ in_line_eoln, 0 }, /* DT */ |
{ in_line_eoln, 0 }, /* UC */ |
{ in_line_eoln, 0 }, /* UC */ |
Line 88 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 87 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ 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 | MAN_EXPLICIT }, /* UR */ |
{ blk_exp, MAN_BSCOPE | MAN_EXPLICIT }, /* UR */ |
{ blk_close, 0 }, /* UE */ |
{ blk_close, MAN_BSCOPE }, /* UE */ |
{ in_line_eoln, 0 }, /* ll */ |
{ in_line_eoln, 0 }, /* ll */ |
}; |
}; |
|
|
Line 279 blk_close(MACRO_PROT_ARGS) |
|
Line 278 blk_close(MACRO_PROT_ARGS) |
|
{ |
{ |
enum mant ntok; |
enum mant ntok; |
const struct man_node *nn; |
const struct man_node *nn; |
|
char *p; |
|
int nrew, target; |
|
|
|
nrew = 1; |
switch (tok) { |
switch (tok) { |
case MAN_RE: |
case MAN_RE: |
ntok = MAN_RS; |
ntok = MAN_RS; |
|
if ( ! man_args(man, line, pos, buf, &p)) |
|
break; |
|
for (nn = man->last->parent; nn; nn = nn->parent) |
|
if (nn->tok == ntok && nn->type == MAN_BLOCK) |
|
nrew++; |
|
target = strtol(p, &p, 10); |
|
if (*p != '\0') |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, |
|
line, p - buf, "RE ... %s", p); |
|
if (target == 0) |
|
target = 1; |
|
nrew -= target; |
|
if (nrew < 1) { |
|
mandoc_vmsg(MANDOCERR_RE_NOTOPEN, man->parse, |
|
line, ppos, "RE %d", target); |
|
return; |
|
} |
break; |
break; |
case MAN_UE: |
case MAN_UE: |
ntok = MAN_UR; |
ntok = MAN_UR; |
Line 293 blk_close(MACRO_PROT_ARGS) |
|
Line 312 blk_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
for (nn = man->last->parent; nn; nn = nn->parent) |
for (nn = man->last->parent; nn; nn = nn->parent) |
if (nn->tok == ntok && nn->type == MAN_BLOCK) |
if (nn->tok == ntok && nn->type == MAN_BLOCK && ! --nrew) |
break; |
break; |
|
|
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, man_macronames[tok]); |
rew_scope(MAN_BLOCK, man, MAN_PP); |
rew_scope(MAN_BLOCK, man, MAN_PP); |
} else |
} else { |
|
line = man->last->line; |
|
ppos = man->last->pos; |
|
ntok = man->last->tok; |
man_unscope(man, nn); |
man_unscope(man, nn); |
|
|
|
/* Move a trailing paragraph behind the block. */ |
|
|
|
if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) { |
|
*pos = strlen(buf); |
|
blk_imp(man, ntok, line, ppos, pos, buf); |
|
} |
|
} |
} |
} |
|
|
void |
void |
Line 390 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 420 in_line_eoln(MACRO_PROT_ARGS) |
|
n = man->last; |
n = man->last; |
|
|
for (;;) { |
for (;;) { |
|
if (buf[*pos] != '\0' && (tok == MAN_br || |
|
tok == MAN_fi || tok == MAN_nf)) { |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
man->parse, line, *pos, "%s %s", |
|
man_macronames[tok], buf + *pos); |
|
break; |
|
} |
la = *pos; |
la = *pos; |
if ( ! man_args(man, line, pos, buf, &p)) |
if ( ! man_args(man, line, pos, buf, &p)) |
break; |
break; |