catch up with the changed interface of mparse_alloc(), see mandoc.h rev 1.100

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 52592d4a6ed4f469bf6c242fdfbc53a0faccabcd..1bea5610e3d7e67c3c956051cad9e7da54c58e35 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.111 2011/07/28 14:17:11 kristaps Exp $ */
+/*     $Id: man.c,v 1.115 2012/01/03 15:16:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -40,7 +40,7 @@ const char *const __man_macronames[MAN_MAX] = {
        "RI",           "na",           "sp",           "nf",
        "fi",           "RE",           "RS",           "DT",
        "UC",           "PD",           "AT",           "in",
-       "ft"
+       "ft",           "OP"
        };
 
 const  char * const *man_macronames = __man_macronames;
@@ -543,12 +543,44 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
                        n = n->parent;
 
                mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, 
-                               n->pos, "%s", man_macronames[n->tok]);
+                   n->pos, "%s breaks %s", man_macronames[tok],
+                   man_macronames[n->tok]);
 
                man_node_delete(m, n);
                m->flags &= ~MAN_ELINE;
        }
 
+       /*
+        * Remove prior BLINE macro that is being clobbered.
+        */
+       if ((m->flags & MAN_BLINE) &&
+           (MAN_BSCOPE & man_macros[tok].flags)) {
+               n = m->last;
+
+               /* Might be a text node like 8 in
+                * .TP 8
+                * .SH foo
+                */
+               if (MAN_TEXT == n->type)
+                       n = n->parent;
+
+               /* Remove element that didn't end BLINE, if any. */
+               if ( ! (MAN_BSCOPE & man_macros[n->tok].flags))
+                       n = n->parent;
+
+               assert(MAN_HEAD == n->type);
+               n = n->parent;
+               assert(MAN_BLOCK == n->type);
+               assert(MAN_SCOPED & man_macros[n->tok].flags);
+
+               mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, 
+                   n->pos, "%s breaks %s", man_macronames[tok],
+                   man_macronames[n->tok]);
+
+               man_node_delete(m, n);
+               m->flags &= ~MAN_BLINE;
+       }
+
        /*
         * Save the fact that we're in the next-line for a block.  In
         * this way, embedded roff instructions can "remember" state
@@ -648,3 +680,11 @@ man_node_unlink(struct man *m, struct man_node *n)
        if (m && m->first == n)
                m->first = NULL;
 }
+
+const struct mparse *
+man_mparse(const struct man *m)
+{
+
+       assert(m && m->parse);
+       return(m->parse);
+}