Tag an internal release, 1.10.7, that marks being in sync with OpenBSD's

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index d039af4c146ddce785ee708fc960ac2f4405cb2b..bdc16100fac228d598ac538ceab68186f26ed2e2 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.192 2010/10/01 21:51:13 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.196 2010/12/05 15:37:30 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -1584,12 +1584,18 @@ termp_bd_pre(DECL_ARGS)
                 * anyway, so don't sweat it.
                 */
                switch (nn->tok) {
+               case (MDOC_Sm):
+                       /* FALLTHROUGH */
                case (MDOC_br):
                        /* FALLTHROUGH */
                case (MDOC_sp):
                        /* FALLTHROUGH */
                case (MDOC_Bl):
                        /* FALLTHROUGH */
+               case (MDOC_D1):
+                       /* FALLTHROUGH */
+               case (MDOC_Dl):
+                       /* FALLTHROUGH */
                case (MDOC_Lp):
                        /* FALLTHROUGH */
                case (MDOC_Pp):
@@ -1655,7 +1661,7 @@ termp_xx_pre(DECL_ARGS)
        pp = NULL;
        switch (n->tok) {
        case (MDOC_Bsx):
-               pp = "BSDI BSD/OS";
+               pp = "BSD/OS";
                break;
        case (MDOC_Dx):
                pp = "DragonFly";
@@ -2074,7 +2080,7 @@ termp_lk_pre(DECL_ARGS)
 
        nn = sv = n->child;
 
-       if (NULL == nn->next)
+       if (NULL == nn || NULL == nn->next)
                return(1);
 
        for (nn = nn->next; nn; nn = nn->next)