From 7625e8f17a7d4f1759b9fe5acfe13360c089811f Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Sat, 4 Sep 2010 18:31:44 +0000 Subject: Fix premature return from sub-conditional roff statements. This fix fully accomodates for the pod2man standard preamble! --- roff.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/roff.c b/roff.c index 5cfacbb5..4a323478 100644 --- a/roff.c +++ b/roff.c @@ -248,6 +248,7 @@ roffnode_pop(struct roff *r) if (r->rstackpos > -1) r->rstackpos--; + ROFF_DEBUG("roff: popping scope\n"); r->last = r->last->parent; if (p->end) free(p->end); @@ -426,8 +427,8 @@ roff_parseln(struct roff *r, int ln, char **bufp, if (r->last) { t = r->last->tok; assert(roffs[t].sub); - ROFF_DEBUG("roff: intercept scoped context: %s\n", - roffs[t].name); + ROFF_DEBUG("roff: intercept scoped context: %s, [%s]\n", + roffs[t].name, &(*bufp)[pos]); return((*roffs[t].sub) (r, t, bufp, szp, ln, pos, pos, offs)); @@ -761,9 +762,6 @@ roff_cond_sub(ROFF_ARGS) l = r->last; roffnode_cleanscope(r); - if (l != r->last) - return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); - if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) { if ('\\' == (*bufp)[pos] && '}' == (*bufp)[pos + 1]) return(roff_ccond -- cgit