Ugly fix for `Bl' or `Bd' causing badness when nested in `Bl -hang' lists.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 8c868fc39ecb7e89fbf8bdf3b8c5095d3ba4fed0..417ff2468d36e994ebf25fc1c095f05e64c73fae 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.57 2009/07/21 15:54:18 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.59 2009/07/23 09:40:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -670,7 +670,7 @@ fmt_block_vspace(struct termp *p,
 
        term_newln(p);
 
-       if (arg_hasattr(MDOC_Compact, bl))
+       if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Compact, bl))
                return;
 
        /*
@@ -695,7 +695,7 @@ fmt_block_vspace(struct termp *p,
         * within the list.
         */
 
-       if (arg_hasattr(MDOC_Column, bl))
+       if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Column, bl))
                if (node->prev && MDOC_It == node->prev->tok)
                        return;
 
@@ -703,7 +703,7 @@ fmt_block_vspace(struct termp *p,
         * XXX - not documented: a `-diag' without a body does not
         * assert a vspace prior to the next element. 
         */
-       if (arg_hasattr(MDOC_Diag, bl)) 
+       if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) 
                if (node->prev && MDOC_It == node->prev->tok) {
                        assert(node->prev->body);
                        if (NULL == node->prev->body->child)
@@ -782,11 +782,27 @@ termp_it_pre(DECL_ARGS)
        case (MDOC_Column):
                if (MDOC_BODY == node->type)
                        break;
-               for (i = 0, n = node->prev; n; n = n->prev, i++)
+               /* 
+                * Work around groff's column handling.  The offset is
+                * equal to the sum of all widths leading to the current
+                * column (plus the -offset value).  If this column
+                * exceeds the stated number of columns, the width is
+                * set as 0, else it's the stated column width (later
+                * the 0 will be adjusted to default 10 or, if in the
+                * last column case, set to stretch to the margin).
+                */
+               for (i = 0, n = node->prev; n && n && 
+                               i < (int)bl->args[vals[2]].argv->sz; 
+                               n = n->prev, i++)
                        offset += arg_width 
                                (&bl->args->argv[vals[2]], i);
-               assert(i < (int)bl->args->argv[vals[2]].sz);
-               width = arg_width(&bl->args->argv[vals[2]], i);
+
+               /* Whether exceeds maximum column. */
+               if (i < (int)bl->args[vals[2]].argv->sz)
+                       width = arg_width(&bl->args->argv[vals[2]], i);
+               else
+                       width = 0;
+
                if (vals[1] >= 0) 
                        offset += arg_offset(&bl->args->argv[vals[1]]);
                break;
@@ -892,7 +908,21 @@ termp_it_pre(DECL_ARGS)
                else
                        p->flags |= TERMP_NOLPAD;
 
-               if (MDOC_HEAD == node->type)
+               if (MDOC_HEAD != node->type)
+                       break;
+
+               /*
+                * This is ugly.  If `-hang' is specified and the body
+                * is a `Bl' or `Bd', then we want basically to nullify
+                * the "overstep" effect in term_flushln() and treat
+                * this as a `-ohang' list instead.
+                */
+               if (node->next->child && 
+                               (MDOC_Bl == node->next->child->tok ||
+                                MDOC_Bd == node->next->child->tok)) {
+                       p->flags &= ~TERMP_NOBREAK;
+                       p->flags &= ~TERMP_NOLPAD;
+               } else
                        p->flags |= TERMP_HANG;
                break;
        case (MDOC_Tag):
@@ -934,6 +964,17 @@ termp_it_pre(DECL_ARGS)
        p->offset += offset;
 
        switch (type) {
+       case (MDOC_Hang):
+               /*
+                * Same stipulation as above, regarding `-hang'.  We
+                * don't want to recalculate rmargin and offsets when
+                * using `Bd' or `Bl' within `-hang' overstep lists.
+                */
+               if (MDOC_HEAD == node->type && node->next->child &&
+                               (MDOC_Bl == node->next->child->tok || 
+                                MDOC_Bd == node->next->child->tok))
+                       break;
+               /* FALLTHROUGH */
        case (MDOC_Bullet):
                /* FALLTHROUGH */
        case (MDOC_Dash):
@@ -942,8 +983,6 @@ termp_it_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Hyphen):
                /* FALLTHROUGH */
-       case (MDOC_Hang):
-               /* FALLTHROUGH */
        case (MDOC_Tag):
                assert(width);
                if (MDOC_HEAD == node->type)