===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- docbook2mdoc/docbook2mdoc.c	2019/04/06 22:37:57	1.92
+++ docbook2mdoc/docbook2mdoc.c	2019/04/07 13:16:21	1.93
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.92 2019/04/06 22:37:57 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.93 2019/04/07 13:16:21 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,6 +32,59 @@ static void	 pnode_print(struct format *, struct pnode
 
 
 static void
+pnode_printtext(struct format *f, struct pnode *n)
+{
+	char		*cp;
+	char		 last;
+
+	if (n->bsz == 0) {
+		assert(n->real < n->b);
+		return;
+	}
+
+	if (f->linestate == LINE_NEW) {
+		last = '\n';
+		f->linestate = LINE_TEXT;
+	} else {
+		last = ' ';
+		if (n->spc || f->linestate == LINE_MACRO)
+			putchar(' ');
+	}
+
+	if (n->node == NODE_ESCAPE) {
+		fputs(n->b, stdout);
+		return;
+	}
+
+	/*
+	 * Remove the prefix '-' from <option> elements
+	 * because the arguments of .Fl macros do not need it.
+	 */
+
+	cp = n->b;
+	if (n->parent != NULL && n->parent->node == NODE_OPTION && *cp == '-')
+		cp++;
+
+	/*
+	 * Print the text, skipping whitespace on new lines,
+	 * escaping control characters on new lines,
+	 * and escaping backslashes.
+	 */
+
+	for (; *cp != '\0'; cp++) {
+		if (last == '\n') {
+			if (isspace((unsigned char)*cp))
+				continue;
+			if (*cp == '\'' || *cp == '.')
+				fputs("\\&", stdout);
+		}
+		putchar(last = *cp);
+		if (last == '\\')
+			putchar('e');
+	}
+}
+
+static void
 pnode_printpara(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
@@ -635,8 +688,6 @@ pnode_print(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 	const char	*ccp;
-	char		*cp;
-	int		 last;
 	enum linestate	 sv;
 
 	if (pn == NULL)
@@ -691,13 +742,6 @@ pnode_print(struct format *p, struct pnode *pn)
 	case NODE_ERRORNAME:
 		macro_open(p, "Er");
 		break;
-	case NODE_ESCAPE:
-		if (p->linestate == LINE_NEW)
-			p->linestate = LINE_TEXT;
-		else if (pn->spc || p->linestate == LINE_MACRO)
-			putchar(' ');
-		fputs(pn->b, stdout);
-		break;
 	case NODE_FILENAME:
 		macro_open(p, "Pa");
 		break;
@@ -818,47 +862,8 @@ pnode_print(struct format *p, struct pnode *pn)
 		macro_open(p, "Ic");
 		break;
 	case NODE_TEXT:
-		if (pn->bsz == 0) {
-			assert(pn->real != pn->b);
-			break;
-		}
-		if (p->linestate == LINE_NEW)
-			p->linestate = LINE_TEXT;
-		else if (pn->spc || p->linestate == LINE_MACRO)
-			putchar(' ');
-
-		/*
-		 * Output all characters, squeezing out whitespace
-		 * between newlines.
-		 * XXX: all whitespace, including tabs (?).
-		 * Remember to escape control characters and escapes.
-		 */
-		cp = pn->b;
-
-		/*
-		 * There's often a superfluous "-" in its <option> tags
-		 * before the actual flags themselves.
-		 * "Fl" does this for us, so remove it.
-		 */
-		if (pn->parent != NULL &&
-		    pn->parent->node == NODE_OPTION &&
-		    *cp == '-')
-			cp++;
-		for (last = '\n'; *cp != '\0'; ) {
-			if (last == '\n') {
-				/* Consume all whitespace. */
-				if (isspace((unsigned char)*cp)) {
-					while (isspace((unsigned char)*cp))
-						cp++;
-					continue;
-				} else if (*cp == '\'' || *cp == '.')
-					fputs("\\&", stdout);
-			}
-			putchar(last = *cp++);
-			/* If we're a character escape, escape us. */
-			if (last == '\\')
-				putchar('e');
-		}
+	case NODE_ESCAPE:
+		pnode_printtext(p, pn);
 		break;
 	case NODE_TGROUP:
 		pnode_printtgroup(p, pn);