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

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index c2ce03e38564cc854a00d3ce214fd88c11b99067..797642aaf7aec3194435aa39c171baf7c04b3ce7 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.33 2009/07/17 10:56:57 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.39 2009/07/23 08:36:32 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -18,6 +18,8 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <errno.h>
+#include <limits.h>

 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>


@@ -72,7 +74,6 @@ static        int      eerr_eq0(POST_ARGS);
 static int      eerr_eq1(POST_ARGS);
 static int      eerr_ge1(POST_ARGS);
 static int      eerr_le2(POST_ARGS);
 static int      eerr_eq1(POST_ARGS);
 static int      eerr_ge1(POST_ARGS);
 static int      eerr_le2(POST_ARGS);

-static int      ewarn_eq0(POST_ARGS);

 static int      ewarn_ge1(POST_ARGS);
 static int      herr_eq0(POST_ARGS);
 static int      herr_ge1(POST_ARGS);
 static int      ewarn_ge1(POST_ARGS);
 static int      herr_eq0(POST_ARGS);
 static int      herr_ge1(POST_ARGS);


@@ -92,6 +93,7 @@ static        int      post_root(POST_ARGS);
 static int      post_sh(POST_ARGS);
 static int      post_sh_body(POST_ARGS);
 static int      post_sh_head(POST_ARGS);
 static int      post_sh(POST_ARGS);
 static int      post_sh_body(POST_ARGS);
 static int      post_sh_head(POST_ARGS);

+static int      post_sp(POST_ARGS);

 static int      post_st(POST_ARGS);
 static int      pre_an(PRE_ARGS);
 static int      pre_bd(PRE_ARGS);
 static int      post_st(POST_ARGS);
 static int      pre_an(PRE_ARGS);
 static int      pre_bd(PRE_ARGS);


@@ -125,9 +127,9 @@ static      v_post   posts_nd[] = { berr_ge1, NULL };
 static v_post   posts_nm[] = { post_nm, NULL };
 static v_post   posts_notext[] = { eerr_eq0, NULL };
 static v_post   posts_pf[] = { eerr_eq1, NULL };
 static v_post   posts_nm[] = { post_nm, NULL };
 static v_post   posts_notext[] = { eerr_eq0, NULL };
 static v_post   posts_pf[] = { eerr_eq1, NULL };

-static v_post   posts_pp[] = { ewarn_eq0, NULL };

 static v_post   posts_rv[] = { eerr_eq0, post_args, NULL };
 static v_post   posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
 static v_post   posts_rv[] = { eerr_eq0, post_args, NULL };
 static v_post   posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };

+static v_post   posts_sp[] = { post_sp, NULL };

 static v_post   posts_ss[] = { herr_ge1, NULL };
 static v_post   posts_st[] = { eerr_eq1, post_st, NULL };
 static v_post   posts_text[] = { eerr_ge1, NULL };
 static v_post   posts_ss[] = { herr_ge1, NULL };
 static v_post   posts_st[] = { eerr_eq1, post_st, NULL };
 static v_post   posts_text[] = { eerr_ge1, NULL };


@@ -158,7 +160,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { pres_os, NULL },                      /* Os */
        { pres_sh, posts_sh },                  /* Sh */ 
        { pres_ss, posts_ss },                  /* Ss */ 
        { pres_os, NULL },                      /* Os */
        { pres_sh, posts_sh },                  /* Sh */ 
        { pres_ss, posts_ss },                  /* Ss */ 

-       { NULL, posts_pp },                     /* Pp */ 
+       { NULL, posts_notext },                 /* Pp */ 

        { pres_d1, posts_wline },               /* D1 */
        { pres_d1, posts_wline },               /* Dl */
        { pres_bd, posts_bd },                  /* Bd */
        { pres_d1, posts_wline },               /* D1 */
        { pres_d1, posts_wline },               /* Dl */
        { pres_bd, posts_bd },                  /* Bd */


@@ -259,7 +261,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Fr */
        { NULL, posts_notext },                 /* Ud */
        { pres_lb, posts_lb },                  /* Lb */
        { NULL, NULL },                         /* Fr */
        { NULL, posts_notext },                 /* Ud */
        { pres_lb, posts_lb },                  /* Lb */

-       { NULL, posts_pp },                     /* Lp */ 
+       { NULL, posts_notext },                 /* Lp */ 

        { NULL, NULL },                         /* Lk */ 
        { NULL, posts_text },                   /* Mt */ 
        { NULL, posts_wline },                  /* Brq */ 
        { NULL, NULL },                         /* Lk */ 
        { NULL, posts_text },                   /* Mt */ 
        { NULL, posts_wline },                  /* Brq */ 


@@ -271,7 +273,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Dx */
        { NULL, posts_text },                   /* %Q */
        { NULL, posts_notext },                 /* br */
        { NULL, NULL },                         /* Dx */
        { NULL, posts_text },                   /* %Q */
        { NULL, posts_notext },                 /* br */

-       { NULL, NULL },                         /* sp */
+       { NULL, posts_sp },                     /* sp */

 };
 
 
 };
 
 


@@ -404,7 +406,6 @@ CHECK_CHILD_DEFN(err, lt, <)                        /* err_child_lt() */
 CHECK_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */
 CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)     /* berr_ge1() */
 CHECK_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */
 CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)     /* berr_ge1() */

-CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)   /* ewarn_eq0() */

 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
 CHECK_ELEM_DEFN(le2, err, err_child_lt, 3)     /* eerr_le2() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
 CHECK_ELEM_DEFN(le2, err, err_child_lt, 3)     /* eerr_le2() */


@@ -861,7 +862,7 @@ post_bf(POST_ARGS)
                return(1);
        else if (0 == strcmp(p, "Li"))
                return(1);
                return(1);
        else if (0 == strcmp(p, "Li"))
                return(1);

-       else if (0 == strcmp(p, "Sm"))
+       else if (0 == strcmp(p, "Sy"))

                return(1);
 
        return(mdoc_nerr(mdoc, head, EFONT));
                return(1);
 
        return(mdoc_nerr(mdoc, head, EFONT));


@@ -1027,11 +1028,20 @@ post_it(POST_ARGS)
                c = mdoc->last->child;
                for (i = 0; c && MDOC_HEAD == c->type; c = c->next)
                        i++;
                c = mdoc->last->child;
                for (i = 0; c && MDOC_HEAD == c->type; c = c->next)
                        i++;

-               if (i == cols)
+
+               if (i < cols || i == (cols + 1)) {
+                       if ( ! mdoc_vwarn(mdoc, mdoc->last->line, 
+                                       mdoc->last->pos, "column "
+                                       "mismatch: have %d, want %d", 
+                                       i, cols))
+                               return(0);
+                       break;
+               } else if (i == cols)

                        break;
                        break;

-               return(mdoc_verr(mdoc, mdoc->last->line, mdoc->last->pos,
-                               "column mismatch (have %d, want %d)", 
-                               i, cols));
+
+               return(mdoc_verr(mdoc, mdoc->last->line, 
+                               mdoc->last->pos, "column mismatch: "
+                               "have %d, want %d", i, cols));

        default:
                break;
        }
        default:
                break;
        }


@@ -1129,6 +1139,37 @@ post_root(POST_ARGS)
 }
 
 
 }
 
 

+static int
+post_sp(POST_ARGS)
+{
+       long             lval;
+       char            *ep, *buf;
+
+       if (NULL == mdoc->last->child)
+               return(1);
+       else if ( ! eerr_eq1(mdoc))
+               return(0);
+
+       assert(MDOC_TEXT == mdoc->last->child->type);
+       buf = mdoc->last->child->string;
+       assert(buf);
+       
+       /* From OpenBSD's strtol(3). */
+       errno = 0;
+       lval = strtol(buf, &ep, 10);
+       if (buf[0] == '\0' || *ep != '\0')
+               return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
+
+       if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+                       (lval > INT_MAX || lval < 0))
+               return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
+
+       return(1);
+}
+
+
+
+

 static int
 post_st(POST_ARGS)
 {
 static int
 post_st(POST_ARGS)
 {