Made `Cd' parseable (too many SYNOPSIS sections do this).

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 54536a5fed5ec83e95405eab39b9b6df40bc70b7..28701ae9ea8219e55a9f5b98dca3d813bb33a509 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,20 +1,18 @@
-/* $Id: man_validate.c,v 1.4 2009/03/26 14:38:11 kristaps Exp $ */
+/*     $Id: man_validate.c,v 1.15 2009/07/04 09:01:55 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 #include <sys/types.h>
 
  */
 #include <sys/types.h>
 


@@ -24,8 +22,7 @@
 #include <stdlib.h>
 
 #include "libman.h"
 #include <stdlib.h>
 
 #include "libman.h"

-
-/* FIXME: validate text. */
+#include "libmandoc.h"

 
 #define        POSTARGS  struct man *m, const struct man_node *n
 
 
 #define        POSTARGS  struct man *m, const struct man_node *n
 


@@ -35,13 +32,14 @@ struct      man_valid {
        v_post   *posts;
 };
 
        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_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 };
 
 static v_post    posts_le1[] = { check_le1, NULL };
 static v_post    posts_le2[] = { check_le2, NULL };


@@ -50,7 +48,7 @@ static        v_post    posts_eq0[] = { check_eq0, NULL };
 static v_post    posts_ge2_le5[] = { check_ge2, check_le5, NULL };
 
 static const struct man_valid man_valids[MAN_MAX] = {
 static v_post    posts_ge2_le5[] = { check_ge2, check_le5, NULL };
 
 static const struct man_valid man_valids[MAN_MAX] = {

-       { NULL }, /* __ */
+       { posts_eq0 }, /* br */

        { posts_ge2_le5 }, /* TH */
        { posts_ge1 }, /* SH */
        { posts_ge1 }, /* SS */
        { posts_ge2_le5 }, /* TH */
        { posts_ge1 }, /* SH */
        { posts_ge1 }, /* SS */


@@ -71,6 +69,8 @@ static        const struct man_valid man_valids[MAN_MAX] = {
        { NULL }, /* I */
        { NULL }, /* IR */
        { NULL }, /* RI */
        { NULL }, /* I */
        { NULL }, /* IR */
        { NULL }, /* RI */

+       { posts_eq0 }, /* na */
+       { NULL }, /* i */

 };
 
 
 };
 
 


@@ -85,9 +85,9 @@ man_valid_post(struct man *m)
 
        switch (m->last->type) {
        case (MAN_TEXT): 
 
        switch (m->last->type) {
        case (MAN_TEXT): 

-               /* FALLTHROUGH */
+               return(check_text(m, m->last));

        case (MAN_ROOT):
        case (MAN_ROOT):

-               return(1);
+               return(check_root(m, m->last));

        default:
                break;
        }
        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) \
 { \
 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", \
                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)
 }
 
 INEQ_DEFINE(0, ==, eq0)