Correct handling of arbitrary column lengths, which groff handles differently dependi...

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index f465a559b5de4d54884448564302312387bdf5dd..1eea180d522bc37eb8b352e155f7843a9462fcf7 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.103 2010/01/01 13:17:59 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.106 2010/01/01 14:32:52 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -471,7 +471,11 @@ a2width(const struct mdoc_argv *arg, int pos)
        if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
                SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 
        if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
                SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 

-       /* XXX: pachemu? */
+       /*
+        * This is a bit if a magic number on groff's part.  Be careful
+        * in changing it, as the MDOC_Column handler will subtract one
+        * from this for >5 columns (don't go below zero!).
+        */

        return(term_hspan(&su) + 2);
 }
 
        return(term_hspan(&su) + 2);
 }
 


@@ -651,7 +655,8 @@ termp_it_pre(DECL_ARGS)
        const struct mdoc_node *bl, *nn;
        char                    buf[7];
        int                     i, type, keys[3], vals[3];
        const struct mdoc_node *bl, *nn;
        char                    buf[7];
        int                     i, type, keys[3], vals[3];

-       size_t                  width, offset;
+       size_t                  width, offset, ncols;
+       int                     dcol;

 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n->parent->parent, n);
 
        if (MDOC_BLOCK == n->type) {
                print_bvspace(p, n->parent->parent, n);


@@ -679,41 +684,48 @@ termp_it_pre(DECL_ARGS)
        type = arg_listtype(bl);
        assert(-1 != type);
 
        type = arg_listtype(bl);
        assert(-1 != type);
 

+       if (vals[1] >= 0) 
+               offset = a2offs(&bl->args->argv[vals[1]]);
+

        /* Calculate real width and offset. */
 
        switch (type) {
        case (MDOC_Column):
                if (MDOC_BODY == n->type)
                        break;
        /* Calculate real width and offset. */
 
        switch (type) {
        case (MDOC_Column):
                if (MDOC_BODY == n->type)
                        break;

-               /* 
-                * 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).
+
+               /*
+                * Imitate groff's column handling.
+                * For each earlier column, add its width.
+                * For less than 5 columns, add two more blanks per column.
+                * For exactly 5 columns, add only one more blank per column.
+                * For more than 5 columns, SUBTRACT one column.  We can
+                * do this because a2width() pads exactly 2 spaces.

                 */
                 */

-               for (i = 0, nn = n->prev; nn && 
-                               i < (int)bl->args->argv[vals[2]].sz; 
-                               nn = nn->prev, i++)
-                       offset += a2width 
-                               (&bl->args->argv[vals[2]], i);
-
-               /* Whether exceeds maximum column. */
-               if (i < (int)bl->args->argv[vals[2]].sz)
-                       width = a2width(&bl->args->argv[vals[2]], i);
-               else
-                       width = 0;
+               ncols = bl->args->argv[vals[2]].sz;
+               dcol = ncols < 5 ? 2 : ncols == 5 ? 1 : -1;
+               for (i=0, nn=n->prev; nn && i < (int)ncols; nn=nn->prev, i++)
+                       offset += a2width(&bl->args->argv[vals[2]], i) + 
+                               (size_t)dcol;
+
+               /*
+                * Use the declared column widths,
+                * extended as explained in the preceding paragraph.
+                */
+               if (i < (int)ncols)
+                       width = a2width(&bl->args->argv[vals[2]], i) + 
+                               (size_t)dcol;

 
 

-               if (vals[1] >= 0) 
-                       offset += a2offs(&bl->args->argv[vals[1]]);
+               /*
+                * When exceeding the declared number of columns,
+                * leave the remaining widths at 0.
+                * This will later be adjusted to the default width of 10,
+                * or, for the last column, stretched to the right margin.
+                */

                break;
        default:
                if (vals[0] >= 0) 
                        width = a2width(&bl->args->argv[vals[0]], 0);
                break;
        default:
                if (vals[0] >= 0) 
                        width = a2width(&bl->args->argv[vals[0]], 0);

-               if (vals[1] >= 0) 
-                       offset += a2offs(&bl->args->argv[vals[1]]);

                break;
        }
 
                break;
        }
 


@@ -898,7 +910,8 @@ termp_it_pre(DECL_ARGS)
                 * right-most column is filled to the right margin.
                 */
                if (MDOC_HEAD == n->type &&
                 * right-most column is filled to the right margin.
                 */
                if (MDOC_HEAD == n->type &&

-                               MDOC_BODY == n->next->type)
+                               MDOC_BODY == n->next->type &&
+                               p->rmargin < p->maxrmargin)

                        p->rmargin = p->maxrmargin;
                break;
        default:
                        p->rmargin = p->maxrmargin;
                break;
        default:


@@ -1019,16 +1032,6 @@ termp_fl_pre(DECL_ARGS)
 {
 
        term_fontpush(p, TERMFONT_BOLD);
 {
 
        term_fontpush(p, TERMFONT_BOLD);

-
-       /* A zero-length child shouldn't get a dash. */
-
-       if (n->child) {
-               assert(MDOC_TEXT == n->child->type);
-               assert(n->child->string);
-               if ('\0' == *n->child->string)
-                       return(0);
-       }
-

        term_word(p, "\\-");
 
        /* A blank `Fl' should incur a subsequent space. */
        term_word(p, "\\-");
 
        /* A blank `Fl' should incur a subsequent space. */