===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.45
retrieving revision 1.48
diff -u -p -r1.45 -r1.48
--- pod2mdoc/pod2mdoc.c	2015/02/14 13:11:10	1.45
+++ pod2mdoc/pod2mdoc.c	2015/02/19 10:53:21	1.48
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.45 2015/02/14 13:11:10 schwarze Exp $	*/
+/*	$Id: pod2mdoc.c,v 1.48 2015/02/19 10:53:21 schwarze Exp $	*/
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1287,7 +1287,7 @@ donamenm(struct state *st, const char *buf, size_t *st
 	assert(OUST_NL == st->oust);
 	assert(st->wantws);
 
-	while (*start < end && ' ' == buf[*start])
+	while (*start < end && isspace((unsigned char)buf[*start]))
 		(*start)++;
 
 	if (end == *start) {
@@ -1308,7 +1308,7 @@ donamenm(struct state *st, const char *buf, size_t *st
 		printf(" ,");
 		mdoc_newln(st);
 		(*start)++;
-		while (*start < end && ' ' == buf[*start])
+		while (*start < end && isspace((unsigned char)buf[*start]))
 			(*start)++;
 	}
 }
@@ -1345,7 +1345,8 @@ ordinary(struct state *st, const char *buf, size_t sta
 	 */
 	if (SECT_NAME == st->sect) {
 		for (i = end - 2; i > start; i--)
-			if ('-' == buf[i] && ' ' == buf[i + 1])
+			if ('-' == buf[i] &&
+			    isspace((unsigned char)buf[i + 1]))
 				break;
 		if ('-' == buf[i]) {
 			j = i;
@@ -1355,7 +1356,8 @@ ordinary(struct state *st, const char *buf, size_t sta
 					break;
 			donamenm(st, buf, &start, i + 1);
 			start = j + 1;
-			while (start < end && ' ' == buf[start])
+			while (start < end &&
+			     isspace((unsigned char)buf[start]))
 				start++;
 			formatcodeln(st, "Nd", buf, &start, end, 1);
 			mdoc_newln(st);
@@ -1585,7 +1587,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;
 
@@ -1630,8 +1632,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: %B %d %Y $";
+
+	if (NULL != format) {
+		strftime(datebuf, sizeof(datebuf), format, tm);
 		date = datebuf;
 	}