source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mdocml: Fix premature return from sub-conditional roff statements.
@ 2010-09-04 18:31 kristaps
  0 siblings, 0 replies; only message in thread
From: kristaps @ 2010-09-04 18:31 UTC (permalink / raw)
  To: source

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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-09-04 18:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-04 18:31 mdocml: Fix premature return from sub-conditional roff statements kristaps

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).