From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 757330bf
	for <source@mandoc.bsd.lv>;
	Fri, 22 Mar 2019 12:29:29 -0500 (EST)
Date: Fri, 22 Mar 2019 12:29:29 -0500 (EST)
X-Mailinglist: mandoc-source
Reply-To: source@mandoc.bsd.lv
MIME-Version: 1.0
From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: docbook2mdoc: no output for PARA right inside ENTRY, and fix the same in 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <e3fc93afa034ebac@fantadrom.bsd.lv>

Log Message:
-----------
no output for PARA right inside ENTRY, and fix the same in LISTITEM

Modified Files:
--------------
    docbook2mdoc:
        docbook2mdoc.c

Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.60 -r1.61
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -720,15 +720,23 @@ pnode_printpara(struct parse *p, struct 
 	struct pnode	*pp;
 
 	assert(p->newln);
-	if (NULL == pn->parent || NODE_LISTITEM == pn->parent->node)
+	if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL &&
+	    (pp = pn->parent) == NULL)
 		return;
 
-	pp = TAILQ_PREV(pn, pnodeq, child);
-	if (NULL == pp)
-		pp = pn->parent;
-	if ((NODE_SECTION != pp->node && NODE_PREFACE != pp->node) ||
-	    2 < p->level)
-		puts(".Pp");
+	switch (pp->node) {
+	case NODE_ENTRY:
+	case NODE_LISTITEM:
+		return;
+	case NODE_PREFACE:
+	case NODE_SECTION:
+		if (p->level < 3)
+			return;
+		break;
+	default:
+		break;
+	}
+	puts(".Pp");
 }
 
 /*
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv