Check for and throw away `gfont' eqn macros.

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 7dd43f28746154c085d6583828871561fcbe805a..e95b1d18ae5744433319253fa9bc7d4fd5c8899e 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.162 2011/03/17 11:30:23 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.170 2011/07/18 07:46:41 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
@@ -154,9 +155,9 @@ static      v_post   posts_notext[] = { ewarn_eq0, NULL };
 static v_post   posts_ns[] = { post_ns, NULL };
 static v_post   posts_os[] = { post_os, post_prol, NULL };
 static v_post   posts_rs[] = { post_rs, NULL };
-static v_post   posts_sh[] = { post_ignpar, hwarn_ge1, bwarn_ge1, post_sh, NULL };
+static v_post   posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL };
 static v_post   posts_sp[] = { ewarn_le1, NULL };
-static v_post   posts_ss[] = { post_ignpar, hwarn_ge1, bwarn_ge1, NULL };
+static v_post   posts_ss[] = { post_ignpar, hwarn_ge1, NULL };
 static v_post   posts_st[] = { post_st, NULL };
 static v_post   posts_std[] = { post_std, NULL };
 static v_post   posts_text[] = { ewarn_ge1, NULL };
@@ -179,7 +180,7 @@ static      v_pre    pres_sh[] = { pre_sh, NULL };
 static v_pre    pres_ss[] = { pre_ss, NULL };
 static v_pre    pres_std[] = { pre_std, NULL };
 
-const  struct valids mdoc_valids[MDOC_MAX] = {
+static const struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Ap */
        { pres_dd, posts_dd },                  /* Dd */
        { pres_dt, posts_dt },                  /* Dt */
@@ -446,7 +447,7 @@ check_count(struct mdoc *m, enum mdoc_type type,
        }
 
        t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;
-       mdoc_vmsg(m, t, m->last->line, m->last->pos,
+       mandoc_vmsg(t, m->parse, m->last->line, m->last->pos,
                        "want %s%d children (have %d)",
                        p, val, m->last->nchild);
        return(1);
@@ -544,31 +545,39 @@ check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
 static void
 check_text(struct mdoc *m, int ln, int pos, char *p)
 {
-       int              c;
+       char            *cpp, *pp;
        size_t           sz;
 
-       for ( ; *p; p++, pos++) {
+       while ('\0' != *p) {
                sz = strcspn(p, "\t\\");
-               p += (int)sz;
-
-               if ('\0' == *p)
-                       break;
 
+               p += (int)sz;
                pos += (int)sz;
 
                if ('\t' == *p) {
                        if ( ! (MDOC_LITERAL & m->flags))
                                mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB);
+                       p++;
+                       pos++;
                        continue;
-               }
+               } else if ('\0' == *p)
+                       break;
+
+               pos++;
+               pp = ++p;
 
-               if (0 == (c = mandoc_special(p))) {
+               if (ESCAPE_ERROR == mandoc_escape
+                               ((const char **)&pp, NULL, NULL)) {
                        mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);
-                       continue;
+                       break;
                }
 
-               p += c - 1;
-               pos += c - 1;
+               cpp = p;
+               while (NULL != (cpp = memchr(cpp, ASCII_HYPH, pp - cpp)))
+                       *cpp = '-';
+
+               pos += pp - p;
+               p = pp;
        }
 }
 
@@ -581,10 +590,9 @@ check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
                        (t == n->parent->type))
                return(1);
 
-       mdoc_vmsg(mdoc, MANDOCERR_SYNTCHILD,
-                               n->line, n->pos, "want parent %s",
-                               MDOC_ROOT == t ? "<root>" : 
-                                       mdoc_macronames[tok]);
+       mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse, n->line, 
+                       n->pos, "want parent %s", MDOC_ROOT == t ? 
+                       "<root>" : mdoc_macronames[tok]);
        return(0);
 }
 
@@ -891,7 +899,7 @@ pre_sh(PRE_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
 
-       mdoc->regs->regs[(int)REG_nS].set = 0;
+       roff_regunset(mdoc->roff, REG_nS);
        return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
 }
 
@@ -1332,7 +1340,8 @@ post_it(POST_ARGS)
                else
                        er = MANDOCERR_SYNTARGCOUNT;
 
-               mdoc_vmsg(mdoc, er, mdoc->last->line, mdoc->last->pos, 
+               mandoc_vmsg(er, mdoc->parse, mdoc->last->line, 
+                               mdoc->last->pos, 
                                "columns == %d (have %d)", cols, i);
                return(MANDOCERR_ARGCOUNT == er);
        default:
@@ -1526,7 +1535,7 @@ post_bl_head(POST_ARGS)
        assert(0 == np->args->argv[j].sz);
 
        /*
-        * Accomodate for new-style groff column syntax.  Shuffle the
+        * Accommodate for new-style groff column syntax.  Shuffle the
         * child nodes, all of which must be TEXT, as arguments for the
         * column field.  Then, delete the head children.
         */
@@ -2001,16 +2010,16 @@ post_dd(POST_ARGS)
 
        n = mdoc->last;
        if (NULL == n->child || '\0' == n->child->string[0]) {
-               mdoc->meta.date = mandoc_normdate(NULL,
-                   mdoc->msg, mdoc->data, n->line, n->pos);
+               mdoc->meta.date = mandoc_normdate
+                       (mdoc->parse, NULL, n->line, n->pos);
                return(1);
        }
 
        if ( ! concat(mdoc, buf, n->child, DATESIZE))
                return(0);
 
-       mdoc->meta.date = mandoc_normdate(buf,
-           mdoc->msg, mdoc->data, n->line, n->pos);
+       mdoc->meta.date = mandoc_normdate
+               (mdoc->parse, buf, n->line, n->pos);
 
        return(1);
 }
@@ -2193,7 +2202,7 @@ post_os(POST_ARGS)
                        return(0);
                }
 #else /*!OSNAME */
-               if (uname(&utsname)) {
+               if (-1 == uname(&utsname)) {
                        mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);
                         mdoc->meta.os = mandoc_strdup("UNKNOWN");
                         return(post_prol(mdoc));