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 61c89d10
	for <source@mandoc.bsd.lv>;
	Sun, 14 Apr 2019 13:29:11 -0500 (EST)
Date: Sun, 14 Apr 2019 13:29:11 -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: avoid overquoting when <literal> is nested inside <quote>
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8
Message-ID: <e3fdd37dc168acc5@fantadrom.bsd.lv>

Log Message:
-----------
avoid overquoting when <literal> is nested inside <quote>

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

Revision Data
-------------
Index: docbook2mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -Ldocbook2mdoc.c -Ldocbook2mdoc.c -u -p -r1.121 -r1.122
--- docbook2mdoc.c
+++ docbook2mdoc.c
@@ -1122,8 +1122,10 @@ pnode_print(struct format *f, struct pno
 		pnode_printlink(f, n);
 		break;
 	case NODE_LITERAL:
-		if (was_impl)
-			macro_open(f, "So");
+		if (n->parent != NULL && n->parent->node == NODE_QUOTE)
+			macro_open(f, "Li");
+		else if (was_impl)
+			macro_open(f, "So Li");
 		else {
 			macro_open(f, "Ql");
 			f->flags |= FMT_IMPL;
@@ -1268,7 +1270,9 @@ pnode_print(struct format *f, struct pno
 		macro_line(f, "EN");
 		break;
 	case NODE_LITERAL:
-		if (was_impl) {
+		if (n->parent != NULL && n->parent->node == NODE_QUOTE)
+			/* nothing */;
+		else if (was_impl) {
 			f->flags &= ~FMT_NOSPC;
 			macro_open(f, "Sc");
 		} else
Index: statistics.c
===================================================================
RCS file: /home/cvs/mdocml/docbook2mdoc/statistics.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lstatistics.c -Lstatistics.c -u -p -r1.27 -r1.28
--- statistics.c
+++ statistics.c
@@ -483,6 +483,7 @@ main(int argc, char *argv[])
 		table_add("programlisting", NULL);
 		table_add("property", "TEXT");
 		table_add("pubdate", "TEXT");
+		table_add("quote", "literal");
 		table_add("quote", "TEXT");
 		table_add("refentry", "refentryinfo");
 		table_add("refentry", "refmeta");
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv