Do not confuse .Bl -column lists that just broken another block

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 6e9801a80bb271dab46f01bb43a009e935b268a9..4e7a398d9bbe11f8c9ce7d89a7f2d3bb60ca3d8d 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,7 +1,7 @@
-/*     $Id: man.c,v 1.148 2015/01/24 02:41:49 schwarze Exp $ */
+/*     $Id: man.c,v 1.149 2015/01/30 21:28:46 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -48,6 +48,10 @@ const        char *const __man_macronames[MAN_MAX] = {
 
 const  char * const *man_macronames = __man_macronames;
 
+static void             man_alloc1(struct man *);
+static void             man_breakscope(struct man *, enum mant);
+static void             man_descope(struct man *, int, int);
+static void             man_free1(struct man *);
 static struct man_node *man_node_alloc(struct man *, int, int,
                                enum man_type, enum mant);
 static void             man_node_append(struct man *, struct man_node *);
@@ -56,9 +60,6 @@ static        void             man_node_unlink(struct man *,
                                struct man_node *);
 static int              man_ptext(struct man *, int, char *, int);
 static int              man_pmacro(struct man *, int, char *, int);
-static void             man_free1(struct man *);
-static void             man_alloc1(struct man *);
-static void             man_descope(struct man *, int, int);
 
 
 const struct man_node *
@@ -337,6 +338,7 @@ man_addspan(struct man *man, const struct tbl_span *sp)
 {
        struct man_node *n;
 
+       man_breakscope(man, MAN_MAX);
        n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
        n->span = sp;
        man_node_append(man, n);
@@ -493,62 +495,11 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
                    ln, offs - 1, NULL);
 
        /*
-        * Remove prior ELINE macro, as it's being clobbered by a new
-        * macro.  Note that NSCOPED macros do not close out ELINE
-        * macros---they don't print text---so we let those slip by.
+        * Some macros break next-line scopes; otherwise, remember
+        * whether we are in next-line scope for a block head.
         */
 
-       if ( ! (man_macros[tok].flags & MAN_NSCOPED) &&
-                       man->flags & MAN_ELINE) {
-               n = man->last;
-               assert(MAN_TEXT != n->type);
-
-               /* Remove repeated NSCOPED macros causing ELINE. */
-
-               if (man_macros[n->tok].flags & MAN_NSCOPED)
-                       n = n->parent;
-
-               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
-                   n->pos, "%s breaks %s", man_macronames[tok],
-                   man_macronames[n->tok]);
-
-               man_node_delete(man, n);
-               man->flags &= ~MAN_ELINE;
-       }
-
-       /*
-        * Remove prior BLINE macro that is being clobbered.
-        */
-       if ((man->flags & MAN_BLINE) &&
-           (man_macros[tok].flags & MAN_BSCOPE)) {
-               n = man->last;
-
-               /* Might be a text node like 8 in
-                * .TP 8
-                * .SH foo
-                */
-               if (n->type == MAN_TEXT)
-                       n = n->parent;
-
-               /* Remove element that didn't end BLINE, if any. */
-               if ( ! (man_macros[n->tok].flags & MAN_BSCOPE))
-                       n = n->parent;
-
-               assert(n->type == MAN_HEAD);
-               n = n->parent;
-               assert(n->type == MAN_BLOCK);
-               assert(man_macros[n->tok].flags & MAN_SCOPED);
-
-               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
-                   n->pos, "%s breaks %s", man_macronames[tok],
-                   man_macronames[n->tok]);
-
-               man_node_delete(man, n);
-               man->flags &= ~MAN_BLINE;
-       }
-
-       /* Remember whether we are in next-line scope for a block head. */
-
+       man_breakscope(man, tok);
        bline = man->flags & MAN_BLINE;
 
        /* Call to handler... */
@@ -583,6 +534,62 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
        return(1);
 }
 
+void
+man_breakscope(struct man *man, enum mant tok)
+{
+       struct man_node *n;
+
+       /*
+        * An element next line scope is open,
+        * and the new macro is not allowed inside elements.
+        * Delete the element that is being broken.
+        */
+
+       if (man->flags & MAN_ELINE && (tok == MAN_MAX ||
+           ! (man_macros[tok].flags & MAN_NSCOPED))) {
+               n = man->last;
+               assert(n->type != MAN_TEXT);
+               if (man_macros[n->tok].flags & MAN_NSCOPED)
+                       n = n->parent;
+
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
+                   n->line, n->pos, "%s breaks %s",
+                   tok == MAN_MAX ? "TS" : man_macronames[tok],
+                   man_macronames[n->tok]);
+
+               man_node_delete(man, n);
+               man->flags &= ~MAN_ELINE;
+       }
+
+       /*
+        * A block header next line scope is open,
+        * and the new macro is not allowed inside block headers.
+        * Delete the block that is being broken.
+        */
+
+       if (man->flags & MAN_BLINE && (tok == MAN_MAX ||
+           man_macros[tok].flags & MAN_BSCOPE)) {
+               n = man->last;
+               if (n->type == MAN_TEXT)
+                       n = n->parent;
+               if ( ! (man_macros[n->tok].flags & MAN_BSCOPE))
+                       n = n->parent;
+
+               assert(n->type == MAN_HEAD);
+               n = n->parent;
+               assert(n->type == MAN_BLOCK);
+               assert(man_macros[n->tok].flags & MAN_SCOPED);
+
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
+                   n->line, n->pos, "%s breaks %s",
+                   tok == MAN_MAX ? "TS" : man_macronames[tok],
+                   man_macronames[n->tok]);
+
+               man_node_delete(man, n);
+               man->flags &= ~MAN_BLINE;
+       }
+}
+
 /*
  * Unlink a node from its context.  If "man" is provided, the last parse
  * point will also be adjusted accordingly.