===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.98
retrieving revision 1.102
diff -u -p -r1.98 -r1.102
--- mandoc/mandoc.c	2015/11/12 22:44:27	1.98
+++ mandoc/mandoc.c	2017/06/14 01:31:26	1.102
@@ -1,7 +1,7 @@
-/*	$Id: mandoc.c,v 1.98 2015/11/12 22:44:27 schwarze Exp $ */
+/*	$Id: mandoc.c,v 1.102 2017/06/14 01:31:26 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -28,8 +28,9 @@
 #include <string.h>
 #include <time.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
 #include "libmandoc.h"
 
 static	int	 a2time(time_t *, const char *, const char *);
@@ -95,6 +96,8 @@ mandoc_escape(const char **end, const char **start, in
 	case ',':
 	case '/':
 		return ESCAPE_IGNORE;
+	case 'p':
+		return ESCAPE_BREAK;
 
 	/*
 	 * The \z escape is supposed to output the following
@@ -175,7 +178,17 @@ mandoc_escape(const char **end, const char **start, in
 				++*end;
 			return ESCAPE_ERROR;
 		}
-		gly = ESCAPE_IGNORE;
+		switch ((*start)[-1]) {
+		case 'h':
+			gly = ESCAPE_HORIZ;
+			break;
+		case 'l':
+			gly = ESCAPE_HLINE;
+			break;
+		default:
+			gly = ESCAPE_IGNORE;
+			break;
+		}
 		term = **start;
 		*start = ++*end;
 		break;
@@ -508,14 +521,14 @@ fail:
 }
 
 char *
-mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
+mandoc_normdate(struct roff_man *man, char *in, int ln, int pos)
 {
 	time_t		 t;
 
 	/* No date specified: use today's date. */
 
 	if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) {
-		mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL);
+		mandoc_msg(MANDOCERR_DATE_MISSING, man->parse, ln, pos, NULL);
 		return time2a(time(NULL));
 	}
 
@@ -525,10 +538,13 @@ mandoc_normdate(struct mparse *parse, char *in, int ln
 	    a2time(&t, "%b %d, %Y", in))
 		return time2a(t);
 
-	/* Do not warn about the legacy man(7) format. */
+	/* In man(7), do not warn about the legacy format. */
 
-	if ( ! a2time(&t, "%Y-%m-%d", in))
-		mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
+	if (a2time(&t, "%Y-%m-%d", in) == 0)
+		mandoc_msg(MANDOCERR_DATE_BAD, man->parse, ln, pos, in);
+	else if (man->macroset == MACROSET_MDOC)
+		mandoc_vmsg(MANDOCERR_DATE_LEGACY, man->parse,
+		    ln, pos, "Dd %s", in);
 
 	/* Use any non-mdoc(7) date verbatim. */