===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.13
retrieving revision 1.17
diff -u -p -r1.13 -r1.17
--- pod2mdoc/pod2mdoc.c	2014/04/01 13:05:50	1.13
+++ pod2mdoc/pod2mdoc.c	2014/04/02 20:32:41	1.17
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.13 2014/04/01 13:05:50 kristaps Exp $ */
+/*	$Id: pod2mdoc.c,v 1.17 2014/04/02 20:32:41 kristaps Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -239,7 +239,6 @@ trylink(const char *buf, size_t *start, size_t end, si
 	return(1);
 }
 
-
 /*
  * Doclifting: if we're a bold "-xx" and we're in the SYNOPSIS section,
  * then it's likely that we're a flag.
@@ -252,10 +251,23 @@ dosynopsisfl(const char *buf, size_t *start, size_t en
 {
 	size_t	 i;
 again:
+	assert(*start + 1 < end);
+	assert('-' == buf[*start]);
+
+	if ( ! isalnum((int)buf[*start + 1]) &&
+		'?' != buf[*start + 1] &&
+		'-' != buf[*start + 1]) {
+		(*start)--;
+		fputs("Ar ", stdout);
+		return;
+	}
+
 	(*start)++;
 	for (i = *start; i < end; i++)
 		if (isalnum((int)buf[i]))
 			continue;
+		else if ('?' == buf[i])
+			continue;
 		else if ('-' == buf[i])
 			continue;
 		else if ('_' == buf[i])
@@ -302,13 +314,16 @@ again:
  * been printed to the current line.
  * If "nomacro", then we don't print any macros, just contained data
  * (e.g., following "Sh" or "Nm").
+ * "pos" is only significant in SYNOPSIS, and should be 0 when invoked
+ * as the first format code on a line (for decoration as an "Nm"),
+ * non-zero otherwise.
  * Return whether we've printed a macro or not--in other words, whether
  * this should trigger a subsequent newline (this should be ignored when
  * reentrant).
  */
 static int
-formatcode(struct state *st, const char *buf, 
-	size_t *start, size_t end, int reentrant, int nomacro)
+formatcode(struct state *st, const char *buf, size_t *start, 
+	size_t end, int reentrant, int nomacro, int pos)
 {
 	enum fmt	 fmt;
 	size_t		 i, j, dsz;
@@ -414,12 +429,16 @@ formatcode(struct state *st, const char *buf, 
 			printf("Em ");
 			break;
 		case (FMT_BOLD):
-			if (SECT_SYNOPSIS == st->sect && 
-				1 == dsz &&
-				'-' == buf[*start])
-				dosynopsisfl(buf, start, end);
-			else
-				printf("Sy ");
+			if (SECT_SYNOPSIS == st->sect) { 
+				if (1 == dsz && '-' == buf[*start])
+					dosynopsisfl(buf, start, end);
+				else if (0 == pos)
+					printf("Nm ");
+				else
+					printf("Ar ");
+				break;
+			} 
+			printf("Sy ");
 			break;
 		case (FMT_CODE):
 			printf("Qo Li ");
@@ -467,7 +486,7 @@ formatcode(struct state *st, const char *buf, 
 			}
 		}
 		if (*start + 1 < end && '<' == buf[*start + 1]) {
-			formatcode(st, buf, start, end, 1, nomacro);
+			formatcode(st, buf, start, end, 1, nomacro, 1);
 			continue;
 		}
 
@@ -529,7 +548,7 @@ formatcodeln(struct state *st, const char *buf, 
 	last = ' ';
 	while (*start < end)  {
 		if (*start + 1 < end && '<' == buf[*start + 1]) {
-			formatcode(st, buf, start, end, 1, nomacro);
+			formatcode(st, buf, start, end, 1, nomacro, 1);
 			continue;
 		}
 		/*
@@ -847,6 +866,40 @@ dosynopsisop(const char *buf, int *last,
 }
 
 /*
+ * Format multiple "Nm" manpage names in the NAME section.
+ */
+static void
+donamenm(struct state *st, const char *buf, size_t *start, size_t end)
+{
+	size_t	 word;
+
+	while (*start < end && ' ' == buf[*start])
+		(*start)++;
+
+	if (end == *start) {
+		puts(".Nm unknown");
+		return;
+	}
+
+	while (*start < end) {
+		fputs(".Nm ", stdout);
+		for (word = *start; word < end; word++)
+			if (',' == buf[word])
+				break;
+		formatcodeln(st, buf, start, word, 1);
+		if (*start == end) {
+			putchar('\n');
+			continue;
+		}
+		assert(',' == buf[*start]);
+		puts(" ,");
+		(*start)++;
+		while (*start < end && ' ' == buf[*start])
+			(*start)++;
+	}
+}
+
+/*
  * Ordinary paragraph.
  * Well, this is really the hardest--POD seems to assume that, for
  * example, a leading space implies a newline, and so on.
@@ -858,6 +911,7 @@ static void
 ordinary(struct state *st, const char *buf, size_t start, size_t end)
 {
 	size_t		i, j, opstack;
+	int		seq;
 
 	if ( ! st->parsing || st->paused)
 		return;
@@ -869,8 +923,8 @@ ordinary(struct state *st, const char *buf, size_t sta
 	 * To wit, print out a "Nm" and "Nd" in that format.
 	 */
 	if (SECT_NAME == st->sect) {
-		for (i = end - 1; i > start; i--)
-			if ('-' == buf[i])
+		for (i = end - 2; i > start; i--)
+			if ('-' == buf[i] && ' ' == buf[i + 1])
 				break;
 		if ('-' == buf[i]) {
 			j = i;
@@ -878,11 +932,11 @@ ordinary(struct state *st, const char *buf, size_t sta
 			for ( ; i > start; i--)
 				if ('-' != buf[i])
 					break;
-			printf(".Nm ");
-			formatcodeln(st, buf, &start, i + 1, 1);
-			putchar('\n');
+			donamenm(st, buf, &start, i + 1);
 			start = j + 1;
-			printf(".Nd ");
+			while (start < end && ' ' == buf[start])
+				start++;
+			fputs(".Nd ", stdout);
 			formatcodeln(st, buf, &start, end, 1);
 			putchar('\n');
 			return;
@@ -896,7 +950,7 @@ ordinary(struct state *st, const char *buf, size_t sta
 	last = '\n';
 	opstack = 0;
 
-	while (start < end) {
+	for (seq = 0; start < end; seq++) {
 		/* 
 		 * Loop til we get either to a newline or escape. 
 		 * Escape initial control characters.
@@ -935,8 +989,19 @@ ordinary(struct state *st, const char *buf, size_t sta
 			 * following that, a newline.
 			 * Consume all whitespace so we don't
 			 * accidentally start an implicit literal line.
+			 * If the macro ends with a flush comma or
+			 * period, let mdoc(7) handle it for us.
 			 */
-			if (formatcode(st, buf, &start, end, 0, 0)) {
+			if (formatcode(st, buf, &start, end, 0, 0, seq)) {
+				if ((start == end - 1 || 
+					(start < end - 1 && 
+					 (' ' == buf[start + 1] ||
+					  '\n' == buf[start + 1]))) &&
+					('.' == buf[start] ||
+					 ',' == buf[start])) {
+					putchar(' ');
+					putchar(buf[start++]);
+				}
 				putchar(last = '\n');
 				while (start < end && ' ' == buf[start])
 					start++;