forgot to commit one request bu espie@

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index a901c82c6417620fa69d87613a8ad2d5a5a89f95..ece4868f356f73d81514fa368d02db4caae049de 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.113 2011/11/07 01:24:40 schwarze Exp $ */
+/*     $Id: man.c,v 1.116 2012/06/02 20:16:23 schwarze 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",           "EX",           "EE"
        };
 
 const  char * const *man_macronames = __man_macronames;
@@ -556,10 +556,15 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
        if ((m->flags & MAN_BLINE) &&
            (MAN_BSCOPE & man_macros[tok].flags)) {
                n = m->last;
-               assert(MAN_TEXT != n->type);
 
-               /* Remove element that didn't end BLINE, if any. */
+               /* 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;