Various improvements related to .Ex and .Rv:

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index 5eed472736fd316f3a7271acd473887bf1e42fc6..dd2227299931125b571597d81abe627fa6510c9c 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.79 2014/04/20 16:46:04 schwarze Exp $ */
+/*     $Id: mandoc.c,v 1.83 2014/07/06 19:09:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -200,8 +200,10 @@ mandoc_escape(const char **end, const char **start, int *sz)
        case 'v':
                /* FALLTHROUGH */
        case 'x':
-               if (strchr("\0 %&()*+-./0123456789:<=>", **start))
+               if (strchr(" %&()*+-./0123456789:<=>", **start)) {
+                       ++*end;
                        return(ESCAPE_ERROR);
+               }
                gly = ESCAPE_IGNORE;
                term = **start;
                *start = ++*end;
@@ -427,7 +429,7 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
 
        /* Quoted argument without a closing quote. */
        if (1 == quoted)
-               mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL);
+               mandoc_msg(MANDOCERR_ARG_QUOTE, parse, ln, *pos, NULL);
 
        /* NUL-terminate this argument and move to the next one. */
        if (pairs)
@@ -441,7 +443,7 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
        *cpp = cp;
 
        if ('\0' == *cp && (white || ' ' == cp[-1]))
-               mandoc_msg(MANDOCERR_EOLNSPACE, parse, ln, *pos, NULL);
+               mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL);
 
        return(start);
 }
@@ -509,14 +511,14 @@ mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 
        if (NULL == in || '\0' == *in ||
            0 == strcmp(in, "$" "Mdocdate$")) {
-               mandoc_msg(MANDOCERR_NODATE, parse, ln, pos, NULL);
+               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_BADDATE, parse, ln, pos, NULL);
+               mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
                t = 0;
        }
        out = t ? time2a(t) : NULL;