In mdoc(7) and man(7), if a width is given as a bare number without

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index f16572d4dbf2b5cb6fcc8b684a354b022242eb93..7c804888ba68a7b4a61949a1c179b3f9dd3e0c3d 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.132 2014/07/02 03:48:07 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.140 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -234,7 +234,8 @@ mdoc_macroend(struct mdoc *mdoc)
        for ( ; n; n = n->parent)
                if (MDOC_BLOCK == n->type &&
                    MDOC_EXPLICIT & mdoc_macros[n->tok].flags)
-                       mdoc_nmsg(mdoc, n, MANDOCERR_SCOPEEXIT);
+                       mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,
+                           n->line, n->pos, mdoc_macronames[n->tok]);
 
        /* Rewind to the first. */
 
@@ -423,6 +424,8 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type,
                        return(REWIND_NONE);
                /* FALLTHROUGH */
        case MDOC_Sh:
+               if (MDOC_ROOT == p->parent->type)
+                       return(REWIND_THIS);
                if (MDOC_Nd == p->tok || MDOC_Ss == p->tok ||
                    MDOC_Sh == p->tok)
                        return(REWIND_MORE);
@@ -528,7 +531,7 @@ make_pending(struct mdoc_node *broken, enum mdoct tok,
                        taker->pending = broken->pending;
                }
                broken->pending = breaker;
-               mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos,
+               mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos,
                    "%s breaks %s", mdoc_macronames[tok],
                    mdoc_macronames[broken->tok]);
                return(1);
@@ -558,7 +561,7 @@ rew_sub(enum mdoc_type t, struct mdoc *mdoc,
                             ! (MDOC_EXPLICIT & mdoc_macros[tok].flags));
                        break;
                case REWIND_FORCE:
-                       mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse,
+                       mandoc_vmsg(MANDOCERR_BLK_BROKEN, mdoc->parse,
                            line, ppos, "%s breaks %s",
                            mdoc_macronames[tok],
                            mdoc_macronames[n->tok]);
@@ -574,7 +577,9 @@ rew_sub(enum mdoc_type t, struct mdoc *mdoc,
                                return(1);
                        /* FALLTHROUGH */
                case REWIND_ERROR:
-                       mdoc_pmsg(mdoc, line, ppos, MANDOCERR_NOSCOPE);
+                       mandoc_msg(MANDOCERR_BLK_NOTOPEN,
+                           mdoc->parse, line, ppos,
+                           mdoc_macronames[tok]);
                        return(1);
                }
                break;
@@ -769,11 +774,12 @@ blk_exp_close(MACRO_PROT_ARGS)
                        later = n;
        }
 
-       if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-               /* FIXME: do this in validate */
-               if (buf[*pos])
-                       mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST);
-
+       if ( ! (MDOC_PARSED & mdoc_macros[tok].flags)) {
+               if ('\0' != buf[*pos])
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                           mdoc->parse, line, ppos,
+                           "%s %s", mdoc_macronames[tok],
+                           buf + *pos);
                if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
                        return(0);
                return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos));
@@ -919,8 +925,9 @@ in_line(MACRO_PROT_ARGS)
                                        return(0);
                        } else if ( ! nc && 0 == cnt) {
                                mdoc_argv_free(arg);
-                               mdoc_pmsg(mdoc, line, ppos,
-                                   MANDOCERR_MACROEMPTY);
+                               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                                   mdoc->parse, line, ppos,
+                                   mdoc_macronames[tok]);
                        }
 
                        if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
@@ -1005,7 +1012,8 @@ in_line(MACRO_PROT_ARGS)
                        return(0);
        } else if ( ! nc && 0 == cnt) {
                mdoc_argv_free(arg);
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY);
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, mdoc_macronames[tok]);
        }
 
        if ( ! nl)
@@ -1029,6 +1037,22 @@ blk_full(MACRO_PROT_ARGS)
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
+       /* Skip items outside lists. */
+
+       if (tok == MDOC_It) {
+               for (n = mdoc->last; n; n = n->parent)
+                       if (n->tok == MDOC_Bl)
+                               break;
+               if (n == NULL) {
+                       mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
+                           line, ppos, "It %s", buf + *pos);
+                       if ( ! mdoc_elem_alloc(mdoc, line, ppos,
+                           MDOC_br, NULL))
+                               return(0);
+                       return(rew_elem(mdoc, MDOC_br));
+               }
+       }
+
        /* Close out prior implicit scope. */
 
        if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
@@ -1354,18 +1378,9 @@ blk_part_imp(MACRO_PROT_ARGS)
                        return(1);
                }
        }
+       assert(n == body);
 
-       /*
-        * If we can't rewind to our body, then our scope has already
-        * been closed by another macro (like `Oc' closing `Op').  This
-        * is ugly behaviour nodding its head to OpenBSD's overwhelming
-        * crufty use of `Op' breakage.
-        */
-       if (n != body)
-               mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line,
-                   ppos, "%s broken", mdoc_macronames[tok]);
-
-       if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
+       if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
                return(0);
 
        /* Standard appending of delimiters. */
@@ -1375,7 +1390,7 @@ blk_part_imp(MACRO_PROT_ARGS)
 
        /* Rewind scope, if applicable. */
 
-       if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
+       if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
                return(0);
 
        /* Move trailing .Ns out of scope. */
@@ -1573,7 +1588,7 @@ in_line_argn(MACRO_PROT_ARGS)
                                return(0);
                        continue;
                } else if (0 == j)
-                      if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg))
+                      if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
                               return(0);
 
                if (j == maxargs && ! flushed) {
@@ -1609,7 +1624,7 @@ in_line_argn(MACRO_PROT_ARGS)
                j++;
        }
 
-       if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg))
+       if (0 == j && ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
               return(0);
 
        /* Close out in a consistent state. */
@@ -1769,7 +1784,8 @@ phrase_ta(MACRO_PROT_ARGS)
        while (NULL != n && MDOC_Bl != n->tok)
                n = n->parent;
        if (NULL == n || LIST_column != n->norm->Bl.type) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_STRAYTA);
+               mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,
+                   line, ppos, "Ta");
                return(1);
        }