=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.149 retrieving revision 1.152 diff -u -p -r1.149 -r1.152 --- mandoc/mdoc.c 2010/06/27 15:52:41 1.149 +++ mandoc/mdoc.c 2010/06/29 19:20:38 1.152 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.149 2010/06/27 15:52:41 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.152 2010/06/29 19:20:38 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -192,8 +192,8 @@ mdoc_free(struct mdoc *mdoc) * Allocate volatile and non-volatile parse resources. */ struct mdoc * -mdoc_alloc(const struct regset *regs, - void *data, int pflags, mandocmsg msg) +mdoc_alloc(struct regset *regs, void *data, + int pflags, mandocmsg msg) { struct mdoc *p; @@ -332,6 +332,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) p->parent->tail = p; break; case (MDOC_BODY): + if (p->end) + break; assert(MDOC_BLOCK == p->parent->type); p->parent->body = p; break; @@ -368,9 +370,27 @@ node_alloc(struct mdoc *m, int line, int pos, p->pos = pos; p->tok = tok; p->type = type; + + /* Flag analysis. */ + if (MDOC_NEWLINE & m->flags) p->flags |= MDOC_LINE; m->flags &= ~MDOC_NEWLINE; + + /* Section analysis. */ + + if (SEC_SYNOPSIS == p->sec) + p->flags |= MDOC_SYNPRETTY; + + /* Register analysis. */ + + if (m->regs->regs[(int)REG_nS].set) { + if (m->regs->regs[(int)REG_nS].v.u) + p->flags |= MDOC_SYNPRETTY; + else + p->flags &= ~MDOC_SYNPRETTY; + } + return(p); } @@ -413,6 +433,22 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, enu if ( ! node_append(m, p)) return(0); m->next = MDOC_NEXT_CHILD; + return(1); +} + + +int +mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, + struct mdoc_node *body, enum mdoc_endbody end) +{ + struct mdoc_node *p; + + p = node_alloc(m, line, pos, tok, MDOC_BODY); + p->pending = body; + p->end = end; + if ( ! node_append(m, p)) + return(0); + m->next = MDOC_NEXT_SIBLING; return(1); }