version 1.133, 2014/07/07 21:36:20 |
version 1.137, 2014/08/01 21:24:17 |
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 194 man_node_append(struct man *man, struct man_node *p) |
|
Line 186 man_node_append(struct man *man, struct man_node *p) |
|
assert(p->parent); |
assert(p->parent); |
p->parent->nchild++; |
p->parent->nchild++; |
|
|
if ( ! man_valid_pre(man, p)) |
|
return(0); |
|
|
|
switch (p->type) { |
switch (p->type) { |
|
case MAN_BLOCK: |
|
if (p->tok == MAN_SH || p->tok == MAN_SS) |
|
man->flags &= ~MAN_LITERAL; |
|
break; |
case MAN_HEAD: |
case MAN_HEAD: |
assert(MAN_BLOCK == p->parent->type); |
assert(MAN_BLOCK == p->parent->type); |
p->parent->head = p; |
p->parent->head = p; |
Line 352 man_addeqn(struct man *man, const struct eqn *ep) |
|
Line 345 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 360 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 478 man_ptext(struct man *man, int line, char *buf, int of |
|
Line 467 man_ptext(struct man *man, int line, char *buf, int of |
|
static int |
static int |
man_pmacro(struct man *man, int ln, char *buf, int offs) |
man_pmacro(struct man *man, int ln, char *buf, int offs) |
{ |
{ |
int i, ppos; |
|
enum mant tok; |
|
char mac[5]; |
char mac[5]; |
struct man_node *n; |
struct man_node *n; |
|
enum mant tok; |
|
int i, ppos; |
|
int bline; |
|
|
if ('"' == buf[offs]) { |
if ('"' == buf[offs]) { |
mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse, |
mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse, |
Line 507 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 497 man_pmacro(struct man *man, int ln, char *buf, int off |
|
tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX; |
tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX; |
|
|
if (MAN_MAX == tok) { |
if (MAN_MAX == tok) { |
mandoc_vmsg(MANDOCERR_MACRO, man->parse, ln, ppos, |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
"%s", buf + ppos - 1); |
ln, ppos, buf + ppos - 1); |
return(1); |
return(1); |
} |
} |
|
|
Line 581 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 571 man_pmacro(struct man *man, int ln, char *buf, int off |
|
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
} |
} |
|
|
/* |
/* Remember whether we are in next-line scope for a block head. */ |
* Save the fact that we're in the next-line for a block. In |
|
* this way, embedded roff instructions can "remember" state |
|
* when they exit. |
|
*/ |
|
|
|
if (MAN_BLINE & man->flags) |
bline = man->flags & MAN_BLINE; |
man->flags |= MAN_BPLINE; |
|
|
|
/* Call to handler... */ |
/* Call to handler... */ |
|
|
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 606 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 591 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 ( ! (MAN_BPLINE & man->flags)) { |
if ( ! bline || man->flags & MAN_ELINE || |
man->flags &= ~MAN_ILINE; |
man_macros[tok].flags & MAN_NSCOPED) |
return(1); |
return(1); |
} |
|
man->flags &= ~MAN_BPLINE; |
|
|
|
/* |
|
* 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); |
|
} |
} |
|
|
/* |
/* |