Ugly fix for `Bl' or `Bd' causing badness when nested in `Bl -hang' lists.

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 954525890a367ded303e6bd7444538090bce2f69..28701ae9ea8219e55a9f5b98dca3d813bb33a509 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: man_validate.c,v 1.10 2009/06/16 19:55:28 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.15 2009/07/04 09:01:55 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -22,8 +22,7 @@
 #include <stdlib.h>
 
 #include "libman.h"
-
-/* FIXME: validate text. */
+#include "libmandoc.h"
 
 #define        POSTARGS  struct man *m, const struct man_node *n
 
@@ -33,13 +32,14 @@ struct      man_valid {
        v_post   *posts;
 };
 
-static int       count(const struct man_node *);
 static int       check_eq0(POSTARGS);
 static int       check_ge1(POSTARGS);
 static int       check_ge2(POSTARGS);
 static int       check_le1(POSTARGS);
 static int       check_le2(POSTARGS);
 static int       check_le5(POSTARGS);
+static int       check_text(POSTARGS);
+static int       check_root(POSTARGS);
 
 static v_post    posts_le1[] = { check_le1, NULL };
 static v_post    posts_le2[] = { check_le2, NULL };
@@ -85,9 +85,9 @@ man_valid_post(struct man *m)
 
        switch (m->last->type) {
        case (MAN_TEXT): 
-               /* FALLTHROUGH */
+               return(check_text(m, m->last));
        case (MAN_ROOT):
-               return(1);
+               return(check_root(m, m->last));
        default:
                break;
        }
@@ -102,14 +102,51 @@ man_valid_post(struct man *m)
 }
 
 
-static inline int
-count(const struct man_node *n)
-{ 
-       int              i;
+static int
+check_root(POSTARGS) 
+{
+       
+       if (NULL == m->first->child)
+               return(man_nerr(m, n, WNODATA));
+       if (NULL == m->meta.title)
+               return(man_nerr(m, n, WNOTITLE));
+
+       return(1);
+}
 
-       for (i = 0; n; n = n->next, i++) 
-               /* Loop. */ ;
-       return(i);
+
+static int
+check_text(POSTARGS) 
+{
+       const char      *p;
+       int              pos, c;
+
+       assert(n->string);
+
+       for (p = n->string, pos = n->pos + 1; *p; p++, pos++) {
+               if ('\\' == *p) {
+                       c = mandoc_special(p);
+                       if (c) {
+                               p += c - 1;
+                               pos += c - 1;
+                               continue;
+                       }
+                       if ( ! (MAN_IGN_ESCAPE & m->pflags))
+                               return(man_perr(m, n->line, pos, WESCAPE));
+                       if ( ! man_pwarn(m, n->line, pos, WESCAPE))
+                               return(0);
+                       continue;
+               }
+
+               if ('\t' == *p || isprint((u_char)*p)) 
+                       continue;
+
+               if (MAN_IGN_CHARS & m->pflags)
+                       return(man_pwarn(m, n->line, pos, WNPRINT));
+               return(man_perr(m, n->line, pos, WNPRINT));
+       }
+
+       return(1);
 }
 
 
@@ -117,12 +154,11 @@ count(const struct man_node *n)
 static int \
 check_##name(POSTARGS) \
 { \
-       int              c; \
-       if ((c = count(n->child)) ineq (x)) \
+       if (n->nchild ineq (x)) \
                return(1); \
        return(man_verr(m, n->line, n->pos, \
                        "expected line arguments %s %d, have %d", \
-                       #ineq, (x), c)); \
+                       #ineq, (x), n->nchild)); \
 }
 
 INEQ_DEFINE(0, ==, eq0)