version 1.134, 2014/07/30 20:06:36 |
version 1.135, 2014/07/30 21:18:24 |
Line 68 const struct man_node * |
|
Line 68 const struct man_node * |
|
man_node(const struct man *man) |
man_node(const struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
return(man->first); |
return(man->first); |
} |
} |
|
|
Line 76 const struct man_meta * |
|
Line 75 const struct man_meta * |
|
man_meta(const struct man *man) |
man_meta(const struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
return(&man->meta); |
return(&man->meta); |
} |
} |
|
|
|
|
man_endparse(struct man *man) |
man_endparse(struct man *man) |
{ |
{ |
|
|
assert( ! (MAN_HALT & man->flags)); |
return(man_macroend(man)); |
if (man_macroend(man)) |
|
return(1); |
|
man->flags |= MAN_HALT; |
|
return(0); |
|
} |
} |
|
|
int |
int |
Line 129 man_parseln(struct man *man, int ln, char *buf, int of |
|
Line 123 man_parseln(struct man *man, int ln, char *buf, int of |
|
|
|
man->flags |= MAN_NEWLINE; |
man->flags |= MAN_NEWLINE; |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
|
|
return (roff_getcontrol(man->roff, buf, &offs) ? |
return (roff_getcontrol(man->roff, buf, &offs) ? |
man_pmacro(man, ln, buf, offs) : |
man_pmacro(man, ln, buf, offs) : |
man_ptext(man, ln, buf, offs)); |
man_ptext(man, ln, buf, offs)); |
Line 352 man_addeqn(struct man *man, const struct eqn *ep) |
|
Line 344 man_addeqn(struct man *man, const struct eqn *ep) |
|
{ |
{ |
struct man_node *n; |
struct man_node *n; |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
|
|
n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX); |
n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX); |
n->eqn = ep; |
n->eqn = ep; |
|
|
Line 369 man_addspan(struct man *man, const struct tbl_span *sp |
|
Line 359 man_addspan(struct man *man, const struct tbl_span *sp |
|
{ |
{ |
struct man_node *n; |
struct man_node *n; |
|
|
assert( ! (MAN_HALT & man->flags)); |
|
|
|
n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX); |
n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX); |
n->span = sp; |
n->span = sp; |
|
|
Line 590 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 578 man_pmacro(struct man *man, int ln, char *buf, int off |
|
|
|
assert(man_macros[tok].fp); |
assert(man_macros[tok].fp); |
if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf)) |
if ( ! (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf)) |
goto err; |
return(0); |
|
|
/* In quick mode (for mandocdb), abort after the NAME section. */ |
/* In quick mode (for mandocdb), abort after the NAME section. */ |
|
|
Line 602 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 590 man_pmacro(struct man *man, int ln, char *buf, int off |
|
} |
} |
|
|
/* |
/* |
* We weren't in a block-line scope when entering the |
* If we are in a next-line scope for a block head, |
* above-parsed macro, so return. |
* close it out now and switch to the body, |
|
* unless the next-line scope is allowed to continue. |
*/ |
*/ |
|
|
if ( ! bline) { |
if ( ! bline || man->flags & MAN_ELINE || |
man->flags &= ~MAN_ILINE; |
man_macros[tok].flags & MAN_NSCOPED) |
return(1); |
return(1); |
} |
|
|
|
/* |
|
* If we're in a block scope, then allow this macro to slip by |
|
* without closing scope around it. |
|
*/ |
|
|
|
if (MAN_ILINE & man->flags) { |
|
man->flags &= ~MAN_ILINE; |
|
return(1); |
|
} |
|
|
|
/* |
|
* If we've opened a new next-line element scope, then return |
|
* now, as the next line will close out the block scope. |
|
*/ |
|
|
|
if (MAN_ELINE & man->flags) |
|
return(1); |
|
|
|
/* Close out the block scope opened in the prior line. */ |
|
|
|
assert(MAN_BLINE & man->flags); |
assert(MAN_BLINE & man->flags); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
if ( ! man_unscope(man, man->last->parent)) |
if ( ! man_unscope(man, man->last->parent)) |
return(0); |
return(0); |
return(man_body_alloc(man, ln, ppos, man->last->tok)); |
return(man_body_alloc(man, ln, ppos, man->last->tok)); |
|
|
err: /* Error out. */ |
|
|
|
man->flags |= MAN_HALT; |
|
return(0); |
|
} |
} |
|
|
/* |
/* |