First, properly escape periods with \&. Then consistently refer to

[mandoc.git] / mandoc.c

diff --git a/mandoc.c b/mandoc.c
index 608e48bfd3548694da9cbdbe5befbc833ac7e959..da4a16067c57d2919c422a0df0419d534726efbd 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.41 2011/03/17 09:18:12 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.44 2011/03/28 23:52:13 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -296,7 +296,7 @@ mandoc_strdup(const char *ptr)
  * or to the null byte terminating the argument line.
  */
 char *
-mandoc_getarg(char **cpp, mandocmsg msg, void *data, int ln, int *pos)
+mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
 {
        char     *start, *cp;
        int       quoted, pairs, white;
@@ -343,8 +343,8 @@ mandoc_getarg(char **cpp, mandocmsg msg, void *data, int ln, int *pos)
        }
 
        /* Quoted argument without a closing quote. */
-       if (1 == quoted && msg)
-               (*msg)(MANDOCERR_BADQUOTE, data, ln, *pos, NULL);
+       if (1 == quoted)
+               mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL);
 
        /* Null-terminate this argument and move to the next one. */
        if (pairs)
@@ -357,8 +357,8 @@ mandoc_getarg(char **cpp, mandocmsg msg, void *data, int ln, int *pos)
        *pos += (int)(cp - start) + (quoted ? 1 : 0);
        *cpp = cp;
 
-       if ('\0' == *cp && msg && (white || ' ' == cp[-1]))
-               (*msg)(MANDOCERR_EOLNSPACE, data, ln, *pos, NULL);
+       if ('\0' == *cp && (white || ' ' == cp[-1]))
+               mandoc_msg(MANDOCERR_EOLNSPACE, parse, ln, *pos, NULL);
 
        return(start);
 }
@@ -416,20 +416,20 @@ fail:
 }
 
 char *
-mandoc_normdate(char *in, mandocmsg msg, void *data, int ln, int pos)
+mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
 {
        char            *out;
        time_t           t;
 
        if (NULL == in || '\0' == *in ||
            0 == strcmp(in, "$" "Mdocdate$")) {
-               (*msg)(MANDOCERR_NODATE, data, ln, pos, NULL);
+               mandoc_msg(MANDOCERR_NODATE, parse, ln, pos, NULL);
                time(&t);
        }
        else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
            !a2time(&t, "%b %d, %Y", in) &&
            !a2time(&t, "%Y-%m-%d", in)) {
-               (*msg)(MANDOCERR_BADDATE, data, ln, pos, NULL);
+               mandoc_msg(MANDOCERR_BADDATE, parse, ln, pos, NULL);
                t = 0;
        }
        out = t ? time2a(t) : NULL;
@@ -507,52 +507,27 @@ mandoc_hyph(const char *start, const char *c)
 }
 
 /*
- * Check if a string is a punctuation delimiter.  This only applies to
- * mdoc(7) documents, but as it's used in both front-ends and back-ends,
- * it needs to go here (instead of, say, in libmdoc.h).
+ * Find out whether a line is a macro line or not.  If it is, adjust the
+ * current position and return one; if it isn't, return zero and don't
+ * change the current position.
  */
-enum mdelim
-mandoc_isdelim(const char *p)
+int
+mandoc_getcontrol(const char *cp, int *ppos)
 {
+       int             pos;
 
-       if ('\0' == p[0])
-               return(DELIM_NONE);
-
-       if ('\0' == p[1])
-               switch (p[0]) {
-               case('('):
-                       /* FALLTHROUGH */
-               case('['):
-                       return(DELIM_OPEN);
-               case('|'):
-                       return(DELIM_MIDDLE);
-               case('.'):
-                       /* FALLTHROUGH */
-               case(','):
-                       /* FALLTHROUGH */
-               case(';'):
-                       /* FALLTHROUGH */
-               case(':'):
-                       /* FALLTHROUGH */
-               case('?'):
-                       /* FALLTHROUGH */
-               case('!'):
-                       /* FALLTHROUGH */
-               case(')'):
-                       /* FALLTHROUGH */
-               case(']'):
-                       return(DELIM_CLOSE);
-               default:
-                       return(DELIM_NONE);
-               }
+       pos = *ppos;
 
-       if ('\\' != p[0])
-               return(DELIM_NONE);
+       if ('\\' == cp[pos] && '.' == cp[pos + 1])
+               pos += 2;
+       else if ('.' == cp[pos] || '\'' == cp[pos])
+               pos++;
+       else
+               return(0);
 
-       if (0 == strcmp(p + 1, "."))
-               return(DELIM_CLOSE);
-       if (0 == strcmp(p + 1, "*(Ba"))
-               return(DELIM_MIDDLE);
+       while (' ' == cp[pos] || '\t' == cp[pos])
+               pos++;
 
-       return(DELIM_NONE);
+       *ppos = pos;
+       return(1);
 }