===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.42
retrieving revision 1.46
diff -u -p -r1.42 -r1.46
--- pod2mdoc/pod2mdoc.c	2015/02/14 10:35:02	1.42
+++ pod2mdoc/pod2mdoc.c	2015/02/14 15:34:39	1.46
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.42 2015/02/14 10:35:02 schwarze Exp $	*/
+/*	$Id: pod2mdoc.c,v 1.46 2015/02/14 15:34:39 schwarze Exp $	*/
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1120,6 +1120,8 @@ again:
 				break;
 			}
 			switch (buf[i]) {
+			case '\t':
+				/* FALLTHROUGH */
 			case ' ':
 				if ( ! ifa)
 					ifo = i;
@@ -1183,7 +1185,7 @@ again:
 				printf(".Fa \"%s\"\n", buf + ifa);
 				if (cp == NULL)
 					break;
-				while (*cp == ' ')
+				while (*cp == ' ' || *cp == '\t')
 					cp++;
 				ifa = cp - buf;
 			}
@@ -1328,8 +1330,9 @@ donamenm(struct state *st, const char *buf, size_t *st
 static void
 ordinary(struct state *st, const char *buf, size_t start, size_t end)
 {
-	size_t		i, j, opstack;
-	int		seq;
+	size_t		i, j, opstack, wend;
+	enum mdoc_type	mtype;
+	int		eos, noeos, seq;
 
 	if ( ! st->parsing || st->paused)
 		return;
@@ -1398,23 +1401,53 @@ ordinary(struct state *st, const char *buf, size_t sta
 			/* Merely buffer non-whitespace. */
 
 			last = buf[start++];
-			if ( ! isspace(last)) {
+			if ( ! isspace(last))
 				outbuf_addchar(st);
+			if (start < end &&
+			    ! isspace((unsigned char)buf[start]))
 				continue;
-			}
 
-			/* Detect function names. */
+			/*
+			 * Found the end of a word.
+			 * Rewind trailing delimiters.
+			 */
 
-			if (st->outbuflen > 2 &&
-			    ')' == st->outbuf[st->outbuflen - 1] &&
-			    '(' == st->outbuf[st->outbuflen - 2] &&
-			    dict_get(st->outbuf, st->outbuflen - 2) ==
-			    MDOC_Fo) {
-				st->outbuflen -= 2;
-				st->outbuf[st->outbuflen] = '\0';
-				mdoc_newln(st);
-				fputs(".Fn ", stdout);
-				st->oust = OUST_MAC;
+			eos = noeos = 0;
+			for (wend = st->outbuflen; wend; wend--)
+				if ('.' == st->outbuf[wend - 1] ||
+				    '!' == st->outbuf[wend - 1] ||
+				    '?' == st->outbuf[wend - 1])
+					eos = 1;
+				else if ('|' == st->outbuf[wend - 1] ||
+				    ',' == st->outbuf[wend - 1] ||
+				    ';' == st->outbuf[wend - 1] ||
+				    ':' == st->outbuf[wend - 1])
+					noeos = 1;
+				else if ('\'' != st->outbuf[wend - 1] &&
+				    '"' != st->outbuf[wend - 1] &&
+				    ')' != st->outbuf[wend - 1] &&
+				    ']' != st->outbuf[wend - 1])
+					break;
+			eos &= ! noeos;
+
+			/*
+			 * Detect function names.
+			 */
+
+			mtype = MDOC_Fa;
+			if (wend && ')' == st->outbuf[wend] &&
+			    '(' == st->outbuf[wend - 1]) {
+				mtype = dict_get(st->outbuf, --wend);
+				if (MDOC_Fo == mtype || MDOC_MAX == mtype) {
+					st->outbuflen = wend;
+					st->outbuf[wend] = '\0';
+					mdoc_newln(st);
+					if (MDOC_Fo == mtype)
+						fputs(".Fn ", stdout);
+					else
+						fputs(".Xr ", stdout);
+					st->oust = OUST_MAC;
+				}
 			}
 
 			/*
@@ -1429,17 +1462,23 @@ ordinary(struct state *st, const char *buf, size_t sta
 			 * end text lines at the end of sentences.
 			 */
 
-			if (OUST_MAC == st->oust || (start > 3 &&
-			    ('.' == buf[start - 2] ||
-			     '!' == buf[start - 2] ||
-			     '?' == buf[start - 2]) &&
-			    islower((unsigned char)buf[start - 3]) &&
-			    islower((unsigned char)buf[start - 4])))
+			if (OUST_MAC == st->oust || (eos && wend > 1 &&
+			    islower((unsigned char)st->outbuf[wend - 1]))) {
+				if (MDOC_MAX == mtype)
+					fputs(" 3", stdout);
+				if (MDOC_Fa != mtype)
+					for (wend += 2;
+					     '\0' != st->outbuf[wend];
+					     wend++)
+						printf(" %c",
+						    st->outbuf[wend]);
 				mdoc_newln(st);
+			}
 
 			/* Advance to the next word. */
 
-			while (isspace((unsigned char)buf[start]))
+			while ('\n' != buf[start] &&
+			       isspace((unsigned char)buf[start]))
 				start++;
 			st->wantws = 1;
 		}
@@ -1546,7 +1585,7 @@ dofile(const struct args *args, const char *fname, 
 {
 	char		 datebuf[64];
 	struct state	 st;
-	const char	*fbase, *fext, *section, *date;
+	const char	*fbase, *fext, *section, *date, *format;
 	char		*title, *cp;
 	size_t		 sup, end, i, cur = 0;
 
@@ -1591,8 +1630,12 @@ dofile(const struct args *args, const char *fname, 
 
 	/* Date.  Or the given "tm" if not supplied. */
 
-	if (NULL == (date = args->date)) {
-		strftime(datebuf, sizeof(datebuf), "%B %d, %Y", tm);
+	date = args->date;
+	format = (NULL == date) ? "%B %d, %Y" :
+	    strcmp(date, "Mdocdate") ? NULL : "$Mdocdate: February 14 2015 $";
+
+	if (NULL != format) {
+		strftime(datebuf, sizeof(datebuf), format, tm);
 		date = datebuf;
 	}