version 1.71, 2012/01/03 15:16:24 |
version 1.73, 2012/06/03 09:52:07 |
|
|
/* $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 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 85 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 86 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* in */ |
{ in_line_eoln, 0 }, /* in */ |
{ in_line_eoln, 0 }, /* ft */ |
{ 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 }, /* EE */ |
}; |
}; |
|
|
const struct man_macro * const man_macros = __man_macros; |
const struct man_macro * const man_macros = __man_macros; |
Line 183 rew_dohalt(enum mant tok, enum man_type type, const st |
|
Line 186 rew_dohalt(enum mant tok, enum man_type type, const st |
|
return(REW_NOHALT); |
return(REW_NOHALT); |
|
|
/* First: rewind to ourselves. */ |
/* First: rewind to ourselves. */ |
if (type == n->type && tok == n->tok) |
if (type == n->type && tok == n->tok) { |
return(REW_REWIND); |
if (MAN_EXPLICIT & man_macros[n->tok].flags) |
|
return(REW_HALT); |
|
else |
|
return(REW_REWIND); |
|
} |
|
|
/* |
/* |
* Next follow the implicit scope-smashings as defined by man.7: |
* Next follow the implicit scope-smashings as defined by man.7: |
Line 200 rew_dohalt(enum mant tok, enum man_type type, const st |
|
Line 207 rew_dohalt(enum mant tok, enum man_type type, const st |
|
return(c); |
return(c); |
break; |
break; |
case (MAN_RS): |
case (MAN_RS): |
|
/* Preserve empty paragraphs before RS. */ |
|
if (0 == n->nchild && (MAN_P == n->tok || |
|
MAN_PP == n->tok || MAN_LP == n->tok)) |
|
return(REW_HALT); |
/* Rewind to a subsection, if a block. */ |
/* Rewind to a subsection, if a block. */ |
if (REW_NOHALT != (c = rew_block(MAN_SS, type, n))) |
if (REW_NOHALT != (c = rew_block(MAN_SS, type, n))) |
return(c); |
return(c); |
Line 279 blk_close(MACRO_PROT_ARGS) |
|
Line 290 blk_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
for (nn = m->last->parent; nn; nn = nn->parent) |
for (nn = m->last->parent; nn; nn = nn->parent) |
if (ntok == nn->tok) |
if (ntok == nn->tok && MAN_BLOCK == nn->type) |
break; |
break; |
|
|
if (NULL == nn) |
if (NULL != nn) |
|
man_unscope(m, nn, MANDOCERR_MAX); |
|
else |
man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); |
man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE); |
|
|
if ( ! rew_scope(MAN_BODY, m, ntok)) |
|
return(0); |
|
if ( ! rew_scope(MAN_BLOCK, m, ntok)) |
|
return(0); |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 298 blk_close(MACRO_PROT_ARGS) |
|
Line 306 blk_close(MACRO_PROT_ARGS) |
|
int |
int |
blk_exp(MACRO_PROT_ARGS) |
blk_exp(MACRO_PROT_ARGS) |
{ |
{ |
|
struct man_node *n; |
int la; |
int la; |
char *p; |
char *p; |
|
|
/* |
/* Close out prior implicit scopes. */ |
* Close out prior scopes. "Regular" explicit macros cannot be |
|
* nested, but we allow roff macros to be placed just about |
|
* anywhere. |
|
*/ |
|
|
|
|
if ( ! rew_scope(MAN_BLOCK, m, tok)) |
|
return(0); |
|
|
if ( ! man_block_alloc(m, line, ppos, tok)) |
if ( ! man_block_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
if ( ! man_head_alloc(m, line, ppos, tok)) |
if ( ! man_head_alloc(m, line, ppos, tok)) |
Line 323 blk_exp(MACRO_PROT_ARGS) |
|
Line 331 blk_exp(MACRO_PROT_ARGS) |
|
assert(m); |
assert(m); |
assert(tok != MAN_MAX); |
assert(tok != MAN_MAX); |
|
|
if ( ! rew_scope(MAN_HEAD, m, tok)) |
for (n = m->last; n; n = n->parent) { |
return(0); |
if (n->tok != tok) |
|
continue; |
|
assert(MAN_HEAD == n->type); |
|
man_unscope(m, n, MANDOCERR_MAX); |
|
break; |
|
} |
|
|
return(man_body_alloc(m, line, ppos, tok)); |
return(man_body_alloc(m, line, ppos, tok)); |
} |
} |
|
|