From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s32Gf3nL016491
	for <source@mdocml.bsd.lv>; Wed, 2 Apr 2014 12:41:03 -0400 (EDT)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s32Gf2ml004504;
	Wed, 2 Apr 2014 12:41:02 -0400 (EDT)
Date: Wed, 2 Apr 2014 12:41:02 -0400 (EDT)
Message-Id: <201404021641.s32Gf2ml004504@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: pod2mdoc: Swallow trailing comma or period after a macro line instead of 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Swallow trailing comma or period after a macro line instead of printing
it on the next line.
No functional change in output, but generated mdoc(7) is a bit nicer.

Modified Files:
--------------
    pod2mdoc:
        pod2mdoc.c

Revision Data
-------------
Index: pod2mdoc.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lpod2mdoc.c -Lpod2mdoc.c -u -p -r1.15 -r1.16
--- pod2mdoc.c
+++ pod2mdoc.c
@@ -955,8 +955,19 @@ ordinary(struct state *st, const char *b
 			 * 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, 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++;
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv