"sys/param.h is for kernel interface programs.

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 89801d520d2d652aa32011389b09e9663415c4f6..6d1fea501fd8fc2deda67c43b44814efe513c1de 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_validate.c,v 1.107 2010/07/02 15:03:14 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.115 2010/08/20 01:02:07 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -32,7 +32,6 @@
 #include "libmandoc.h"
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
-/* TODO: ignoring Pp (it's superfluous in some invocations). */
 
 #define        PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
 #define        POST_ARGS struct mdoc *mdoc
@@ -146,7 +145,7 @@ static      v_pre    pres_ss[] = { pre_ss, NULL };
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Ap */
-       { pres_dd, posts_text },                /* Dd */
+       { pres_dd, posts_wtext },               /* Dd */
        { pres_dt, posts_dt },                  /* Dt */
        { pres_os, NULL },                      /* Os */
        { pres_sh, posts_sh },                  /* Sh */ 
@@ -454,45 +453,42 @@ check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
 
 
 static int
-check_text(struct mdoc *mdoc, int line, int pos, char *p)
+check_text(struct mdoc *m, int ln, int pos, char *p)
 {
        int              c;
-
-       /* 
-        * FIXME: we absolutely cannot let \b get through or it will
-        * destroy some assumptions in terms of format.
-        */
+       size_t           sz;
 
        for ( ; *p; p++, pos++) {
+               sz = strcspn(p, "\t\\");
+               p += (int)sz;
+
+               if ('\0' == *p)
+                       break;
+
+               pos += (int)sz;
+
                if ('\t' == *p) {
-                       if ( ! (MDOC_LITERAL & mdoc->flags))
-                               if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))
-                                       return(0);
-               } else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p)
-                       if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR))
-                               return(0);
+                       if (MDOC_LITERAL & m->flags)
+                               continue;
+                       if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB))
+                               continue;
+                       return(0);
+               }
 
-               if ('\\' != *p)
-                       continue;
+               /* Check the special character. */
 
                c = mandoc_special(p);
                if (c) {
                        p += c - 1;
                        pos += c - 1;
-                       continue;
-               }
-
-               c = mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADESCAPE);
-               if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags) && ! c)
-                       return(c);
+               } else
+                       mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);
        }
 
        return(1);
 }
 
 
-
-
 static int
 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 {
@@ -510,7 +506,6 @@ check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 }
 
 
-
 static int
 pre_display(PRE_ARGS)
 {
@@ -625,6 +620,8 @@ pre_bl(PRE_ARGS)
                        if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
                                return(0);
                        break;
+               default:
+                       continue;
                }
 
                /* Check: duplicate auxiliary arguments. */
@@ -647,8 +644,16 @@ pre_bl(PRE_ARGS)
 
                /* Assign list type. */
 
-               if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE)
+               if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {
                        n->data.Bl->type = lt;
+                       /* Set column information, too. */
+                       if (LIST_column == lt) {
+                               n->data.Bl->ncols = 
+                                       n->args->argv[i].sz;
+                               n->data.Bl->cols = (const char **)
+                                       n->args->argv[i].value;
+                       }
+               }
 
                /* The list type should come first. */
 
@@ -939,7 +944,7 @@ static int
 post_bf(POST_ARGS)
 {
        struct mdoc_node *np;
-       int               arg;
+       enum mdocargt     arg;
 
        /*
         * Unlike other data pointers, these are "housed" by the HEAD
@@ -1132,9 +1137,6 @@ post_it(POST_ARGS)
                if (NULL == mdoc->last->head->child)
                        if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))
                                return(0);
-               if (NULL == mdoc->last->body->child)
-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-                               return(0);
                break;
        case (LIST_bullet):
                /* FALLTHROUGH */
@@ -1143,24 +1145,18 @@ post_it(POST_ARGS)
        case (LIST_enum):
                /* FALLTHROUGH */
        case (LIST_hyphen):
+               if (NULL == mdoc->last->body->child)
+                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
+                               return(0);
                /* FALLTHROUGH */
        case (LIST_item):
                if (mdoc->last->head->child)
                        if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST))
                                return(0);
-               if (NULL == mdoc->last->body->child)
-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-                               return(0);
                break;
        case (LIST_column):
-               cols = -1;
-               for (i = 0; i < (int)n->args->argc; i++)
-                       if (MDOC_Column == n->args->argv[i].arg) {
-                               cols = (int)n->args->argv[i].sz;
-                               break;
-                       }
+               cols = (int)n->data.Bl->ncols;
 
-               assert(-1 != cols);
                assert(NULL == mdoc->last->head->child);
 
                if (NULL == mdoc->last->body->child)
@@ -1200,12 +1196,7 @@ post_bl_head(POST_ARGS)
        n = mdoc->last->parent;
 
        if (LIST_column == n->data.Bl->type) {
-               for (i = 0; i < (int)n->args->argc; i++)
-                       if (MDOC_Column == n->args->argv[i].arg)
-                               break;
-               assert(i < (int)n->args->argc);
-
-               if (n->args->argv[i].sz && mdoc->last->nchild) {
+               if (n->data.Bl->ncols && mdoc->last->nchild) {
                        mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);
                        return(0);
                }