===================================================================
RCS file: /cvs/docbook2mdoc/macro.c,v
retrieving revision 1.11
retrieving revision 1.14
diff -u -p -r1.11 -r1.14
--- docbook2mdoc/macro.c	2019/04/12 09:01:48	1.11
+++ docbook2mdoc/macro.c	2019/04/16 14:26:27	1.14
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.11 2019/04/12 09:01:48 schwarze Exp $ */
+/* $Id: macro.c,v 1.14 2019/04/16 14:26:27 schwarze Exp $ */
 /*
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -30,6 +30,13 @@
 void
 macro_open(struct format *f, const char *name)
 {
+	if (f->parastate == PARA_WANT) {
+		if (f->linestate != LINE_NEW) {
+			putchar('\n');
+			f->linestate = LINE_NEW;
+		}
+		puts(".Pp");
+	}
 	switch (f->linestate) {
 	case LINE_MACRO:
 		if (f->flags & FMT_NOSPC) {
@@ -53,6 +60,7 @@ macro_open(struct format *f, const char *name)
 	fputs(name, stdout);
 	f->flags &= FMT_IMPL;
 	f->flags |= FMT_ARG;
+	f->parastate = PARA_MID;
 }
 
 void
@@ -79,11 +87,13 @@ void
 macro_addarg(struct format *f, const char *arg, int flags)
 {
 	const char	*cp;
+	int		 quote_now;
 
 	assert(f->linestate == LINE_MACRO);
 
 	/* Quote if requested and necessary. */
 
+	quote_now = 0;
 	if ((flags & (ARG_SINGLE | ARG_QUOTED)) == ARG_SINGLE) {
 		for (cp = arg; *cp != '\0'; cp++)
 			if (isspace((unsigned char)*cp))
@@ -95,6 +105,7 @@ macro_addarg(struct format *f, const char *arg, int fl
 			}
 			putchar('"');
 			flags = ARG_QUOTED;
+			quote_now = 1;
 		}
 	}
 
@@ -112,13 +123,16 @@ macro_addarg(struct format *f, const char *arg, int fl
 
 		/* Escape us if we look like a macro. */
 
-		if ((flags & ARG_QUOTED) == 0 &&
+		if ((flags & (ARG_QUOTED | ARG_UPPER)) == 0 &&
 		    (cp == arg || isspace((unsigned char)cp[-1])) &&
 		    isupper((unsigned char)cp[0]) &&
 		    islower((unsigned char)cp[1]) &&
 		    (cp[2] == '\0' || cp[2] == ' ' ||
-		     (islower((unsigned char)cp[2]) &&
-		      (cp[3] == '\0' || cp[3] == ' '))))
+		     ((cp[3] == '\0' || cp[3] == ' ') &&
+		      (strncmp(cp, "Brq", 3) == 0 ||
+		       strncmp(cp, "Bro", 3) == 0 ||
+		       strncmp(cp, "Brc", 3) == 0 ||
+		       strncmp(cp, "Bsx", 3) == 0))))
 			fputs("\\&", stdout);
 
 		if (*cp == '"')
@@ -130,6 +144,9 @@ macro_addarg(struct format *f, const char *arg, int fl
 		if (*cp == '\\')
 			putchar('e');
 	}
+	if (quote_now)
+		putchar('"');
+	f->parastate = PARA_MID;
 }
 
 void
@@ -162,6 +179,7 @@ macro_addnode(struct format *f, struct pnode *n, int f
 
 	if (n->node == NODE_TEXT || n->node == NODE_ESCAPE) {
 		macro_addarg(f, n->b, flags);
+		f->parastate = PARA_MID;
 		return;
 	}
 
@@ -196,6 +214,7 @@ macro_addnode(struct format *f, struct pnode *n, int f
 	}
 	if (quote_now)
 		putchar('"');
+	f->parastate = PARA_MID;
 }
 
 void
@@ -214,6 +233,13 @@ macro_nodeline(struct format *f, const char *name, str
 void
 print_text(struct format *f, const char *word, int flags)
 {
+	if (f->parastate == PARA_WANT) {
+		if (f->linestate != LINE_NEW) {
+			putchar('\n');
+			f->linestate = LINE_NEW;
+		}
+		puts(".Pp");
+	}
 	switch (f->linestate) {
 	case LINE_NEW:
 		break;
@@ -233,6 +259,7 @@ print_text(struct format *f, const char *word, int fla
 			putchar('e');
 	}
 	f->linestate = LINE_TEXT;
+	f->parastate = PARA_MID;
 	f->flags = 0;
 }