=================================================================== RCS file: /cvs/mandoc/Attic/mdocterm.c,v retrieving revision 1.9 retrieving revision 1.11 diff -u -p -r1.9 -r1.11 --- mandoc/Attic/mdocterm.c 2009/02/25 12:09:20 1.9 +++ mandoc/Attic/mdocterm.c 2009/02/25 13:30:53 1.11 @@ -1,4 +1,4 @@ - /* $Id: mdocterm.c,v 1.9 2009/02/25 12:09:20 kristaps Exp $ */ +/* $Id: mdocterm.c,v 1.11 2009/02/25 13:30:53 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -200,7 +200,7 @@ flushln(struct termp *p) */ if (p->flags & TERMP_NOBREAK) { - for ( ; vis <= maxvis; vis++) + for ( ; vis < maxvis; vis++) putchar(' '); } else putchar('\n'); @@ -221,6 +221,7 @@ newln(struct termp *p) if (0 == p->col) return; flushln(p); + p->flags &= ~TERMP_NOLPAD; } @@ -416,6 +417,8 @@ body(struct termp *p, const struct mdoc_meta *meta, dochild = 1; pair.type = 0; + pair.offset = pair.rmargin = 0; + pair.flag = 0; if (MDOC_TEXT != node->type) { if (termacts[node->tok].pre) @@ -426,24 +429,14 @@ body(struct termp *p, const struct mdoc_meta *meta, /* Children. */ - switch (pair.type) { - case (TERMPAIR_FLAG): - p->flags |= pair.data.flag; - break; - default: - break; - } + if (TERMPAIR_FLAG & pair.type) + p->flags |= pair.flag; if (dochild && node->child) body(p, meta, node->child); - switch (pair.type) { - case (TERMPAIR_FLAG): - p->flags &= ~pair.data.flag; - break; - default: - break; - } + if (TERMPAIR_FLAG & pair.type) + p->flags &= ~pair.flag; /* Post-processing. */