===================================================================
RCS file: /cvs/docbook2mdoc/macro.c,v
retrieving revision 1.5
retrieving revision 1.10
diff -u -p -r1.5 -r1.10
--- docbook2mdoc/macro.c	2019/04/03 15:04:03	1.5
+++ docbook2mdoc/macro.c	2019/04/12 08:48:16	1.10
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.5 2019/04/03 15:04:03 schwarze Exp $ */
+/* $Id: macro.c,v 1.10 2019/04/12 08:48:16 schwarze Exp $ */
 /*
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -17,6 +17,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "node.h"
 #include "macro.h"
@@ -30,56 +31,48 @@ void
 macro_open(struct format *f, const char *name)
 {
 	switch (f->linestate) {
+	case LINE_MACRO:
+		if (f->flags & FMT_NOSPC) {
+			fputs(" Ns ", stdout);
+			break;
+		}
+		if (f->flags & (FMT_CHILD | FMT_IMPL)) {
+			putchar(' ');
+			break;
+		}
+		/* FALLTHROUGH */
 	case LINE_TEXT:
 		putchar('\n');
 		/* FALLTHROUGH */
 	case LINE_NEW:
 		putchar('.');
 		f->linestate = LINE_MACRO;
+		f->flags = 0;
 		break;
-	case LINE_MACRO:
-		putchar(' ');
-		break;
 	}
 	fputs(name, stdout);
+	f->flags &= FMT_IMPL;
+	f->flags |= FMT_ARG;
 }
 
 void
 macro_close(struct format *f)
 {
-	if (f->linestate == LINE_NEW)
-		return;
-	putchar('\n');
+	if (f->linestate != LINE_NEW)
+		putchar('\n');
 	f->linestate = LINE_NEW;
+	f->flags = 0;
 }
 
 void
 macro_line(struct format *f, const char *name)
 {
+	macro_close(f);
 	macro_open(f, name);
 	macro_close(f);
 }
 
 /*
- * If the next node is a text node starting with closing punctuation,
- * emit the closing punctuation as a trailing macro argument.
- */
-void
-macro_closepunct(struct format *f, struct pnode *pn)
-{
-	if ((pn = TAILQ_NEXT(pn, child)) != NULL &&
-	    pn->node == NODE_TEXT && pn->bsz > 0 &&
-	    (pn->b[0] == ',' || pn->b[0] == '.') &&
-	    (pn->bsz == 1 || isspace((unsigned char)pn->b[1]))) {
-		putchar(' ');
-		putchar(pn->b[0]);
-		pn->b++;
-		pn->bsz--;
-	}
-	macro_close(f);
-}
-
-/*
  * Print an argument string on a macro line, collapsing whitespace.
  */
 void
@@ -151,7 +144,7 @@ macro_argline(struct format *f, const char *name, cons
  * Recursively append text from the children of a node to a macro line.
  */
 void
-macro_addnode(struct format *f, struct pnode *pn, int flags)
+macro_addnode(struct format *f, struct pnode *n, int flags)
 {
 	struct pnode	*nc;
 	int		 quote_now;
@@ -163,12 +156,12 @@ macro_addnode(struct format *f, struct pnode *pn, int 
 	 * that text, letting macro_addarg() decide about quoting.
 	 */
 
-	while ((nc = TAILQ_FIRST(&pn->childq)) != NULL &&
+	while ((nc = TAILQ_FIRST(&n->childq)) != NULL &&
 	    TAILQ_NEXT(nc, child) == NULL)
-		pn = nc;
+		n = nc;
 
-	if (pn->node == NODE_TEXT || pn->node == NODE_ESCAPE) {
-		macro_addarg(f, pn->b, flags);
+	if (n->node == NODE_TEXT || n->node == NODE_ESCAPE) {
+		macro_addarg(f, n->b, flags);
 		return;
 	}
 
@@ -206,10 +199,10 @@ macro_addnode(struct format *f, struct pnode *pn, int 
 }
 
 void
-macro_nodeline(struct format *f, const char *name, struct pnode *pn, int flags)
+macro_nodeline(struct format *f, const char *name, struct pnode *n, int flags)
 {
 	macro_open(f, name);
-	macro_addnode(f, pn, ARG_SPACE | flags);
+	macro_addnode(f, n, ARG_SPACE | flags);
 	macro_close(f);
 }
 
@@ -219,9 +212,12 @@ macro_nodeline(struct format *f, const char *name, str
  * line otherwise.  The flag ARG_SPACE inserts spaces between words.
  */
 void
-print_text(struct format *f, const char *word, int flags) {
+print_text(struct format *f, const char *word, int flags)
+{
 	switch (f->linestate) {
 	case LINE_NEW:
+		if (*word == '.' || *word == '\'')
+			fputs("\\&", stdout);
 		break;
 	case LINE_TEXT:
 		if (flags & ARG_SPACE)
@@ -231,8 +227,13 @@ print_text(struct format *f, const char *word, int fla
 		macro_close(f);
 		break;
 	}
-	fputs(word, stdout);
+	while (*word != '\0') {
+		putchar(*word);
+		if (*word++ == '\\')
+			putchar('e');
+	}
 	f->linestate = LINE_TEXT;
+	f->flags = 0;
 }
 
 /*