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.5/8.14.5) with ESMTP id s3U9bQ4I009353
	for <source@mdocml.bsd.lv>; Wed, 30 Apr 2014 05:37:26 -0400 (EDT)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s3U9bQYO004861;
	Wed, 30 Apr 2014 05:37:26 -0400 (EDT)
Date: Wed, 30 Apr 2014 05:37:26 -0400 (EDT)
Message-Id: <201404300937.s3U9bQYO004861@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: docbook2mdoc: citerefentry shouldn't expect a newline--it can occur 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
citerefentry shouldn't expect a newline--it can occur inline.

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

Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.33 -r1.34
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -693,16 +693,12 @@ pnode_printciterefentry(struct parse *p,
 	struct pnode	*pp, *title, *manvol;
 
 	title = manvol = NULL;
-	assert(p->newln);
 	TAILQ_FOREACH(pp, &pn->childq, child)
 		if (NODE_MANVOLNUM == pp->node)
 			manvol = pp;
 		else if (NODE_REFENTRYTITLE == pp->node)
 			title = pp;
 
-	fputs(".Xr", stdout);
-	p->newln = 0;
-
 	if (NULL != title) {
 		pnode_printmacrolinepart(p, title);
 	} else
@@ -712,7 +708,7 @@ pnode_printciterefentry(struct parse *p,
 		puts(" 1");
 		p->newln = 1;
 	} else
-		pnode_printmacroline(p, manvol);
+		pnode_printmacrolinepart(p, manvol);
 }
 
 static void
@@ -1087,7 +1083,8 @@ pnode_print(struct parse *p, struct pnod
 		pnode_unlinksub(pn);
 		break;
 	case (NODE_CITEREFENTRY):
-		assert(p->newln);
+		pnode_printmopen(p);
+		fputs("Xr", stdout);
 		pnode_printciterefentry(p, pn);
 		pnode_unlinksub(pn);
 		break;
@@ -1309,6 +1306,7 @@ pnode_print(struct parse *p, struct pnod
 	switch (pn->node) {
 	case (NODE_APPLICATION):
 	case (NODE_ARG):
+	case (NODE_CITEREFENTRY):
 	case (NODE_CODE):
 	case (NODE_COMMAND):
 	case (NODE_CONSTANT):
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv