fix -Tascii .Fd line breaking

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 4de6d29ae4e389156d169f821b16ad36b43f7e6d..d4a0b8d329a7048e4a53360d57fd21eda4623ac6 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_validate.c,v 1.174 2011/08/16 12:23:51 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.184 2012/05/27 17:48:57 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -545,12 +545,11 @@ check_text(struct mdoc *m, int ln, int pos, char *p)
 {
        char            *cp;
 
-       cp = p;
-       for (cp = p; NULL != (p = strchr(p, '\t')); p++) {
-               if (MDOC_LITERAL & m->flags)
-                       continue;
-               mdoc_pmsg(m, ln, (int)(p - cp), MANDOCERR_BADTAB);
-       }
+       if (MDOC_LITERAL & m->flags)
+               return;
+
+       for (cp = p; NULL != (p = strchr(p, '\t')); p++)
+               mdoc_pmsg(m, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);
 }
 
 static int
@@ -662,8 +661,13 @@ pre_bl(PRE_ARGS)
                        comp = 1;
                        break;
                case (MDOC_Width):
-                       dup = (NULL != n->norm->Bl.width);
-                       width = n->args->argv[i].value[0];
+                       /* NB: this can be empty! */
+                       if (n->args->argv[i].sz) {
+                               width = n->args->argv[i].value[0];
+                               dup = (NULL != n->norm->Bl.width);
+                               break;
+                       }
+                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                        break;
                case (MDOC_Offset):
                        /* NB: this can be empty! */
@@ -703,7 +707,7 @@ pre_bl(PRE_ARGS)
                        if (LIST_column == lt) {
                                n->norm->Bl.ncols = 
                                        n->args->argv[i].sz;
-                               n->norm->Bl.cols = (const char **)
+                               n->norm->Bl.cols = (void *)
                                        n->args->argv[i].value;
                        }
                }
@@ -1521,7 +1525,7 @@ post_bl_head(POST_ARGS)
                ((size_t)mdoc->last->nchild * sizeof(char *));
 
        mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;
-       mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value;
+       mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value;
 
        for (i = 0, nn = mdoc->last->child; nn; i++) {
                np->args->argv[j].value[i] = nn->string;
@@ -1694,6 +1698,14 @@ post_rs(POST_ARGS)
                mdoc_node_delete(mdoc, nn);
        }
 
+       /*
+        * Nothing to sort if only invalid nodes were found
+        * inside the `Rs' body.
+        */
+
+       if (NULL == mdoc->last->child)
+               return(1);
+
        /*
         * The full `Rs' block needs special handling to order the
         * sub-elements according to `rsord'.  Pick through each element
@@ -1819,6 +1831,7 @@ static int
 post_sh_head(POST_ARGS)
 {
        char             buf[BUFSIZ];
+       struct mdoc_node *n;
        enum mdoc_sec    sec;
        int              c;
 
@@ -1853,6 +1866,20 @@ post_sh_head(POST_ARGS)
 
        mdoc->lastsec = sec;
 
+       /*
+        * Set the section attribute for the current HEAD, for its
+        * parent BLOCK, and for the HEAD children; the latter can
+        * only be TEXT nodes, so no recursion is needed.
+        * For other blocks and elements, including .Sh BODY, this is
+        * done when allocating the node data structures, but for .Sh
+        * BLOCK and HEAD, the section is still unknown at that time.
+        */
+
+       mdoc->last->parent->sec = sec;
+       mdoc->last->sec = sec;
+       for (n = mdoc->last->child; n; n = n->next)
+               n->sec = sec;
+
        /* We don't care about custom sections after this. */
 
        if (SEC_CUSTOM == sec)
@@ -2077,7 +2104,7 @@ post_dt(POST_ARGS)
         *       arch = NULL
         */
 
-       cp = mdoc_a2msec(nn->string);
+       cp = mandoc_a2msec(nn->string);
        if (cp) {
                mdoc->meta.vol = mandoc_strdup(cp);
                mdoc->meta.msec = mandoc_strdup(nn->string);
@@ -2165,14 +2192,15 @@ post_os(POST_ARGS)
        n = mdoc->last;
 
        /*
-        * Set the operating system by way of the `Os' macro.  Note that
-        * if an argument isn't provided and -DOSNAME="\"foo\"" is
-        * provided during compilation, this value will be used instead
-        * of filling in "sysname release" from uname().
+        * Set the operating system by way of the `Os' macro.
+        * The order of precedence is:
+        * 1. the argument of the `Os' macro, unless empty
+        * 2. the -Ios=foo command line argument, if provided
+        * 3. -DOSNAME="\"foo\"", if provided during compilation
+        * 4. "sysname release" from uname(3)
         */
 
-       if (mdoc->meta.os)
-               free(mdoc->meta.os);
+       free(mdoc->meta.os);
 
        buf[0] = '\0';
        if (-1 == (c = concat(buf, n->child, BUFSIZ))) {
@@ -2182,11 +2210,11 @@ post_os(POST_ARGS)
 
        assert(c);
 
-       /* XXX: yes, these can all be dynamically-adjusted buffers, but
-        * it's really not worth the extra hackery.
-        */
-
        if ('\0' == buf[0]) {
+               if (mdoc->defos) {
+                       mdoc->meta.os = mandoc_strdup(mdoc->defos);
+                       return(1);
+               }
 #ifdef OSNAME
                if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
                        mdoc_nmsg(mdoc, n, MANDOCERR_MEM);