From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id o84IViEH004831
	for <source@mdocml.bsd.lv>; Sat, 4 Sep 2010 14:31:45 -0400 (EDT)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id o84IVi9M004782;
	Sat, 4 Sep 2010 14:31:44 -0400 (EDT)
Date: Sat, 4 Sep 2010 14:31:44 -0400 (EDT)
Message-Id: <201009041831.o84IVi9M004782@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Fix premature return from sub-conditional roff statements.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Fix premature return from sub-conditional roff statements.  This fix
fully accomodates for the pod2man standard preamble!

Modified Files:
--------------
    mdocml:
        roff.c

Revision Data
-------------
Index: roff.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/roff.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -Lroff.c -Lroff.c -u -p -r1.100 -r1.101
--- roff.c
+++ 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, cha
 	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));
@@ -760,9 +761,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])
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv