Added more character-escape regressions.

[mandoc.git] / validate.c

diff --git a/validate.c b/validate.c
index 7b109965e04da5039ae874eb2a15738dd90126b6..46629654741d59df8718f4a0d3c4f5d105d133c3 100644 (file)
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.59 2009/02/25 11:37:05 kristaps Exp $ */
+/* $Id: validate.c,v 1.62 2009/02/27 09:14:02 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -480,8 +480,10 @@ check_text(struct mdoc *mdoc, size_t line, size_t pos, const char *p)
 {
        size_t           c;
 
+       /* XXX - indicate deprecated escapes \*(xx and \*x. */
+
        for ( ; *p; p++) {
-               if ( ! isprint(*p) && '\t' != *p)
+               if ( ! isprint((int)*p) && '\t' != *p)
                        return(mdoc_perr(mdoc, line, pos,
                                        "invalid characters"));
                if ('\\' != *p)
@@ -540,7 +542,7 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-       int              type, err, i;
+       int              type, i, width, offset;
        struct mdoc_arg *argv;
        size_t           argc;
 
@@ -551,8 +553,10 @@ pre_bl(PRE_ARGS)
 
        /* Make sure that only one type of list is specified.  */
 
+       type = offset = width = -1;
+
        /* LINTED */
-       for (i = 0, type = err = 0; i < (int)argc; i++) {
+       for (i = 0; i < (int)argc; i++) {
                argv = &n->data.block.argv[i];
 
                switch (argv->arg) {
@@ -577,18 +581,60 @@ pre_bl(PRE_ARGS)
                case (MDOC_Inset):
                        /* FALLTHROUGH */
                case (MDOC_Column):
-                       if (0 == type++)
+                       if (-1 == type) {
+                               type = argv->arg;
                                break;
+                       }
                        return(mdoc_perr(mdoc, argv->line, argv->pos, 
                                        "multiple types specified"));
+               case (MDOC_Width):
+                       if (-1 == width) {
+                               width = argv->arg;
+                               break;
+                       }
+                       return(mdoc_perr(mdoc, argv->line, argv->pos, 
+                                       "multiple -%s arguments",
+                                       mdoc_argnames[MDOC_Width]));
+               case (MDOC_Offset):
+                       if (-1 == offset) {
+                               offset = argv->arg;
+                               break;
+                       }
+                       return(mdoc_perr(mdoc, argv->line, argv->pos, 
+                                       "multiple -%s arguments",
+                                       mdoc_argnames[MDOC_Offset]));
                default:
                        break;
                }
        }
 
-       if (type)
-               return(1);
-       return(mdoc_err(mdoc, "no type specified"));
+       if (-1 == type)
+               return(mdoc_err(mdoc, "no type specified"));
+
+       switch (type) {
+       case (MDOC_Column):
+               /* FALLTHROUGH */
+       case (MDOC_Diag):
+               /* FALLTHROUGH */
+       case (MDOC_Inset):
+               /* FALLTHROUGH */
+       case (MDOC_Item):
+               if (-1 == width)
+                       break;
+               return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
+                               "superfluous -%s argument",
+                               mdoc_argnames[MDOC_Width]));
+       case (MDOC_Tag):
+               if (-1 != width)
+                       break;
+               return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
+                               "suggest -%s argument",
+                               mdoc_argnames[MDOC_Width]));
+       default:
+               break;
+       }
+
+       return(1);
 }
 
 
@@ -659,7 +705,6 @@ static int
 pre_it(PRE_ARGS)
 {
 
-       /* TODO: -width attribute must be specified for -tag. */
        /* TODO: children too big for -width? */
 
        if (MDOC_BLOCK != n->type)