Implement the first steps of equation parsing from within libmdoc.

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 34f50fe41b4ecf386d085a689d141057d62d718e..1aeb703dce8f597493a2f5fa32f6d3d7555e170e 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.65 2011/03/20 16:02:05 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.71 2011/07/24 18:15:14 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "man.h"
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
@@ -53,30 +54,31 @@ static      int       check_par(CHKARGS);
 static int       check_part(CHKARGS);
 static int       check_root(CHKARGS);
 static int       check_sec(CHKARGS);
-static int       check_text(CHKARGS);
+static void      check_text(CHKARGS);
 
 static int       post_AT(CHKARGS);
+static int       post_vs(CHKARGS);
 static int       post_fi(CHKARGS);
 static int       post_nf(CHKARGS);
 static int       post_TH(CHKARGS);
 static int       post_UC(CHKARGS);
 
 static v_check   posts_at[] = { post_AT, NULL };
+static v_check   posts_br[] = { post_vs, check_eq0, NULL };
 static v_check   posts_eq0[] = { check_eq0, NULL };
 static v_check   posts_fi[] = { check_eq0, post_fi, NULL };
-static v_check   posts_le1[] = { check_le1, NULL };
 static v_check   posts_ft[] = { check_ft, NULL };
 static v_check   posts_nf[] = { check_eq0, post_nf, NULL };
 static v_check   posts_par[] = { check_par, NULL };
 static v_check   posts_part[] = { check_part, NULL };
 static v_check   posts_sec[] = { check_sec, NULL };
+static v_check   posts_sp[] = { post_vs, check_le1, NULL };
 static v_check   posts_th[] = { check_ge2, check_le5, post_TH, NULL };
 static v_check   posts_uc[] = { post_UC, NULL };
 static v_check   pres_bline[] = { check_bline, NULL };
 
-
 static const struct man_valid man_valids[MAN_MAX] = {
-       { NULL, posts_eq0 }, /* br */
+       { NULL, posts_br }, /* br */
        { pres_bline, posts_th }, /* TH */
        { pres_bline, posts_sec }, /* SH */
        { pres_bline, posts_sec }, /* SS */
@@ -98,7 +100,7 @@ static       const struct man_valid man_valids[MAN_MAX] = {
        { NULL, NULL }, /* IR */
        { NULL, NULL }, /* RI */
        { NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */
-       { NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */
+       { NULL, posts_sp }, /* sp */ /* FIXME: should warn only. */
        { pres_bline, posts_nf }, /* nf */
        { pres_bline, posts_fi }, /* fi */
        { NULL, NULL }, /* RE */
@@ -150,7 +152,8 @@ man_valid_post(struct man *m)
 
        switch (m->last->type) {
        case (MAN_TEXT): 
-               return(check_text(m, m->last));
+               check_text(m, m->last);
+               return(1);
        case (MAN_ROOT):
                return(check_root(m, m->last));
        case (MAN_EQN):
@@ -203,43 +206,48 @@ check_root(CHKARGS)
        return(1);
 }
 
-
-static int
+static void
 check_text(CHKARGS) 
 {
-       char            *p;
-       int              pos, c;
+       char            *p, *pp, *cpp;
+       int              pos;
        size_t           sz;
 
-       for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {
-               sz = strcspn(p, "\t\\");
-               p += (int)sz;
+       p = n->string;
+       pos = n->pos + 1;
 
-               if ('\0' == *p)
-                       break;
+       while ('\0' != *p) {
+               sz = strcspn(p, "\t\\");
 
+               p += (int)sz;
                pos += (int)sz;
 
                if ('\t' == *p) {
-                       if (MAN_LITERAL & m->flags)
-                               continue;
-                       man_pmsg(m, n->line, pos, MANDOCERR_BADTAB);
+                       if ( ! (MAN_LITERAL & m->flags))
+                               man_pmsg(m, n->line, pos, MANDOCERR_BADTAB);
+                       p++;
+                       pos++;
                        continue;
-               }
+               } else if ('\0' == *p)
+                       break;
 
-               /* Check the special character. */
+               pos++;
+               pp = ++p;
 
-               c = mandoc_special(p);
-               if (c) {
-                       p += c - 1;
-                       pos += c - 1;
-               } else
+               if (ESCAPE_ERROR == mandoc_escape
+                               ((const char **)&pp, NULL, NULL)) {
                        man_pmsg(m, n->line, pos, MANDOCERR_BADESCAPE);
-       }
+                       break;
+               }
 
-       return(1);
-}
+               cpp = p;
+               while (NULL != (cpp = memchr(cpp, ASCII_HYPH, pp - cpp)))
+                       *cpp = '-';
 
+               pos += pp - p;
+               p = pp;
+       }
+}
 
 #define        INEQ_DEFINE(x, ineq, name) \
 static int \
@@ -318,13 +326,11 @@ static int
 check_sec(CHKARGS)
 {
 
-       if (MAN_HEAD == n->type && 0 == n->nchild) {
-               man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
-               return(0);
-       } else if (MAN_BODY == n->type && 0 == n->nchild)
-               man_nmsg(m, n, MANDOCERR_NOBODY);
+       if ( ! (MAN_HEAD == n->type && 0 == n->nchild)) 
+               return(1);
 
-       return(1);
+       man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
+       return(0);
 }
 
 
@@ -333,7 +339,8 @@ check_part(CHKARGS)
 {
 
        if (MAN_BODY == n->type && 0 == n->nchild)
-               man_nmsg(m, n, MANDOCERR_NOBODY);
+               mandoc_msg(MANDOCERR_ARGCWARN, m->parse, n->line, 
+                               n->pos, "want children (have none)");
 
        return(1);
 }
@@ -405,7 +412,8 @@ post_TH(CHKARGS)
        if (n && n->string) {
                for (p = n->string; '\0' != *p; p++) {
                        /* Only warn about this once... */
-                       if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {
+                       if (isalpha((unsigned char)*p) && 
+                                       ! isupper((unsigned char)*p)) {
                                man_nmsg(m, n, MANDOCERR_UPPERCASE);
                                break;
                        }
@@ -552,3 +560,17 @@ post_AT(CHKARGS)
        m->meta.source = mandoc_strdup(p);
        return(1);
 }
+
+static int
+post_vs(CHKARGS)
+{
+
+       /* 
+        * Don't warn about this because it occurs in pod2man and would
+        * cause considerable (unfixable) warnage.
+        */
+       if (NULL == n->prev && MAN_ROOT == n->parent->type)
+               man_node_delete(m, n);
+
+       return(1);
+}