version 1.21, 2009/08/19 09:14:50 |
version 1.28, 2009/08/22 09:10:38 |
Line 38 static int rew_block(int, enum man_type, |
|
Line 38 static int rew_block(int, enum man_type, |
|
const struct man_macro __man_macros[MAN_MAX] = { |
const struct man_macro __man_macros[MAN_MAX] = { |
{ in_line_eoln, 0 }, /* br */ |
{ in_line_eoln, 0 }, /* br */ |
{ in_line_eoln, 0 }, /* TH */ |
{ in_line_eoln, 0 }, /* TH */ |
{ blk_imp, 0 }, /* SH */ |
{ blk_imp, MAN_SCOPED }, /* SH */ |
{ blk_imp, 0 }, /* SS */ |
{ blk_imp, MAN_SCOPED }, /* SS */ |
{ blk_imp, MAN_SCOPED }, /* TP */ |
{ blk_imp, MAN_SCOPED | MAN_FSCOPED }, /* TP */ |
{ blk_imp, 0 }, /* LP */ |
{ blk_imp, 0 }, /* LP */ |
{ blk_imp, 0 }, /* PP */ |
{ blk_imp, 0 }, /* PP */ |
{ blk_imp, 0 }, /* P */ |
{ blk_imp, 0 }, /* P */ |
Line 64 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 64 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* fi */ |
{ in_line_eoln, 0 }, /* fi */ |
{ in_line_eoln, 0 }, /* r */ |
{ in_line_eoln, 0 }, /* r */ |
{ blk_close, 0 }, /* RE */ |
{ blk_close, 0 }, /* RE */ |
{ blk_imp, 0 }, /* RS */ |
{ blk_imp, MAN_EXPLICIT }, /* RS */ |
|
{ in_line_eoln, 0 }, /* DT */ |
|
{ in_line_eoln, 0 }, /* UC */ |
}; |
}; |
|
|
const struct man_macro * const man_macros = __man_macros; |
const struct man_macro * const man_macros = __man_macros; |
Line 235 blk_imp(MACRO_PROT_ARGS) |
|
Line 237 blk_imp(MACRO_PROT_ARGS) |
|
{ |
{ |
int w, la; |
int w, la; |
char *p; |
char *p; |
|
struct man_node *n; |
|
|
/* Close out prior scopes. */ |
/* Close out prior scopes. */ |
|
|
Line 250 blk_imp(MACRO_PROT_ARGS) |
|
Line 253 blk_imp(MACRO_PROT_ARGS) |
|
if ( ! man_head_alloc(m, line, ppos, tok)) |
if ( ! man_head_alloc(m, line, ppos, tok)) |
return(0); |
return(0); |
|
|
|
n = m->last; |
|
|
/* Add line arguments. */ |
/* Add line arguments. */ |
|
|
for (;;) { |
for (;;) { |
Line 268 blk_imp(MACRO_PROT_ARGS) |
|
Line 273 blk_imp(MACRO_PROT_ARGS) |
|
/* Close out head and open body (unless MAN_SCOPE). */ |
/* Close out head and open body (unless MAN_SCOPE). */ |
|
|
if (MAN_SCOPED & man_macros[tok].flags) { |
if (MAN_SCOPED & man_macros[tok].flags) { |
m->flags |= MAN_BLINE; |
/* If we're forcing scope (`TP'), keep it open. */ |
return(1); |
if (MAN_FSCOPED & man_macros[tok].flags) { |
} else if ( ! rew_scope(MAN_HEAD, m, tok)) |
m->flags |= MAN_BLINE; |
|
return(1); |
|
} else if (n == m->last) { |
|
m->flags |= MAN_BLINE; |
|
return(1); |
|
} |
|
} |
|
|
|
if ( ! rew_scope(MAN_HEAD, m, tok)) |
return(0); |
return(0); |
|
|
return(man_body_alloc(m, line, ppos, tok)); |
return(man_body_alloc(m, line, ppos, tok)); |
Line 302 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 315 in_line_eoln(MACRO_PROT_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
if (n == m->last && (MAN_SCOPED & man_macros[tok].flags)) { |
if (n == m->last && MAN_SCOPED & man_macros[tok].flags) { |
m->flags |= MAN_ELINE; |
m->flags |= MAN_ELINE; |
return(1); |
return(1); |
} |
} |
Line 312 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 325 in_line_eoln(MACRO_PROT_ARGS) |
|
* make sure that we don't clobber as its sibling. |
* make sure that we don't clobber as its sibling. |
*/ |
*/ |
|
|
/* FIXME: clean this to use man_unscope(). */ |
|
|
|
for ( ; m->last; m->last = m->last->parent) { |
for ( ; m->last; m->last = m->last->parent) { |
if (m->last == n) |
if (m->last == n) |
break; |
break; |
Line 345 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 356 in_line_eoln(MACRO_PROT_ARGS) |
|
int |
int |
man_macroend(struct man *m) |
man_macroend(struct man *m) |
{ |
{ |
|
struct man_node *n; |
|
|
|
n = MAN_VALID & m->last->flags ? |
|
m->last->parent : m->last; |
|
|
|
for ( ; n; n = n->parent) { |
|
if (MAN_BLOCK != n->type) |
|
continue; |
|
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
|
continue; |
|
if ( ! man_nwarn(m, n, WEXITSCOPE)) |
|
return(0); |
|
} |
|
|
return(man_unscope(m, m->first)); |
return(man_unscope(m, m->first)); |
} |
} |