===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pod2mdoc/pod2mdoc.c	2014/04/01 19:50:34	1.14
+++ pod2mdoc/pod2mdoc.c	2014/04/02 14:50:09	1.15
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.14 2014/04/01 19:50:34 kristaps Exp $ */
+/*	$Id: pod2mdoc.c,v 1.15 2014/04/02 14:50:09 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.
@@ -315,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;
@@ -430,6 +432,8 @@ formatcode(struct state *st, const char *buf, 
 			if (SECT_SYNOPSIS == st->sect) { 
 				if (1 == dsz && '-' == buf[*start])
 					dosynopsisfl(buf, start, end);
+				else if (0 == pos)
+					printf("Nm ");
 				else
 					printf("Ar ");
 				break;
@@ -482,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;
 		}
 
@@ -544,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;
 		}
 		/*
@@ -873,6 +877,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;
@@ -884,8 +889,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;
@@ -893,11 +898,11 @@ ordinary(struct state *st, const char *buf, size_t sta
 			for ( ; i > start; i--)
 				if ('-' != buf[i])
 					break;
-			printf(".Nm ");
+			fputs(".Nm ", stdout);
 			formatcodeln(st, buf, &start, i + 1, 1);
 			putchar('\n');
 			start = j + 1;
-			printf(".Nd ");
+			fputs(".Nd ", stdout);
 			formatcodeln(st, buf, &start, end, 1);
 			putchar('\n');
 			return;
@@ -911,7 +916,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.
@@ -951,7 +956,7 @@ ordinary(struct state *st, const char *buf, size_t sta
 			 * Consume all whitespace so we don't
 			 * accidentally start an implicit literal line.
 			 */
-			if (formatcode(st, buf, &start, end, 0, 0)) {
+			if (formatcode(st, buf, &start, end, 0, 0, seq)) {
 				putchar(last = '\n');
 				while (start < end && ' ' == buf[start])
 					start++;