test inter-column spacing

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index 1179c09b3636f056c439f28b8ca3b3a2858f6d1e..5b541fa464d33f24621952187997ab28964afadb 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.c,v 1.97 2015/10/15 23:35:55 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, int *sz)
        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, int *sz)
                                ++*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;
@@ -478,17 +491,27 @@ time2a(time_t t)
         * up to 2 characters for the day + comma + blank
         * 4 characters for the year and a terminating '\0'
         */
+
        p = buf = mandoc_malloc(10 + 4 + 4 + 1);
 
-       if (0 == (ssz = strftime(p, 10 + 1, "%B ", tm)))
+       if ((ssz = strftime(p, 10 + 1, "%B ", tm)) == 0)
                goto fail;
        p += (int)ssz;
 
-       if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)))
+       /*
+        * The output format is just "%d" here, not "%2d" or "%02d".
+        * That's also the reason why we can't just format the
+        * date as a whole with "%B %e, %Y" or "%B %d, %Y".
+        * Besides, the present approach is less prone to buffer
+        * overflows, in case anybody should ever introduce the bug
+        * of looking at LC_TIME.
+        */
+
+       if ((isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)) == -1)
                goto fail;
        p += isz;
 
-       if (0 == strftime(p, 4 + 1, "%Y", tm))
+       if (strftime(p, 4 + 1, "%Y", tm) == 0)
                goto fail;
        return buf;
 
@@ -498,25 +521,34 @@ 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)
 {
-       char            *out;
        time_t           t;
 
-       if (NULL == in || '\0' == *in ||
-           0 == strcmp(in, "$" "Mdocdate$")) {
-               mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL);
-               time(&t);
-       }
-       else if (a2time(&t, "%Y-%m-%d", in))
-               t = 0;
-       else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
-           !a2time(&t, "%b %d, %Y", in)) {
-               mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
-               t = 0;
+       /* No date specified: use today's date. */
+
+       if (in == NULL || *in == '\0' || strcmp(in, "$" "Mdocdate$") == 0) {
+               mandoc_msg(MANDOCERR_DATE_MISSING, man->parse, ln, pos, NULL);
+               return time2a(time(NULL));
        }
-       out = t ? time2a(t) : NULL;
-       return out ? out : mandoc_strdup(in);
+
+       /* Valid mdoc(7) date format. */
+
+       if (a2time(&t, "$" "Mdocdate: %b %d %Y $", in) ||
+           a2time(&t, "%b %d, %Y", in))
+               return time2a(t);
+
+       /* In man(7), do not warn about the legacy format. */
+
+       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. */
+
+       return mandoc_strdup(in);
 }
 
 int