Replace the structs mdoc and man by a unified struct roff_man.

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index f833677e6edaf2c52e94f3f88460fa23526e5458..53b93fbe00cc30a31485319065ddfd985d8d09b1 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,7 +1,7 @@
-/*     $Id: out.c,v 1.56 2014/12/23 09:31:46 schwarze Exp $ */
+/*     $Id: out.c,v 1.59 2015/01/30 04:11:50 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -94,9 +94,6 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
                break;
        }
 
-       /* FIXME: do this in the caller. */
-       if (dst->scale < 0.0)
-               dst->scale = 0.0;
        return(*endptr == '\0' ? 2 : 1);
 }
 
@@ -110,11 +107,12 @@ void
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
        size_t totalwidth)
 {
+       const struct tbl_opts   *opts;
        const struct tbl_dat    *dp;
        struct roffcol          *col;
        size_t                   ewidth, xwidth;
        int                      spans;
-       int                      icol, maxcol, necol, nxcol;
+       int                      icol, maxcol, necol, nxcol, quirkcol;
 
        /*
         * Allocate the master column specifiers.  These will hold the
@@ -125,6 +123,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
        assert(NULL == tbl->cols);
        tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
            sizeof(struct roffcol));
+       opts = sp->opts;
 
        for (maxcol = -1; sp; sp = sp->next) {
                if (TBL_SPAN_DATA != sp->pos)
@@ -141,14 +140,14 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
                        spans = dp->spans;
                        if (1 < spans)
                                continue;
-                       icol = dp->layout->head->ident;
+                       icol = dp->layout->col;
                        if (maxcol < icol)
                                maxcol = icol;
                        col = tbl->cols + icol;
                        col->flags |= dp->layout->flags;
                        if (dp->layout->flags & TBL_CELL_WIGN)
                                continue;
-                       tblcalc_data(tbl, col, sp->opts, dp);
+                       tblcalc_data(tbl, col, opts, dp);
                }
        }
 
@@ -198,13 +197,35 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
         */
 
        if (nxcol && totalwidth) {
-               xwidth = totalwidth - 3*maxcol - xwidth;
+               xwidth = totalwidth - xwidth - 3*maxcol -
+                   (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
+                    2 : !!opts->lvert + !!opts->rvert);
+
+               /*
+                * Emulate a bug in GNU tbl width calculation that
+                * manifests itself for large numbers of x-columns.
+                * Emulating it for 5 x-columns gives identical
+                * behaviour for up to 6 x-columns.
+                */
+
+               if (nxcol == 5) {
+                       quirkcol = xwidth % nxcol + 2;
+                       if (quirkcol != 3 && quirkcol != 4)
+                               quirkcol = -1;
+               } else
+                       quirkcol = -1;
+
+               necol = 0;
+               ewidth = 0;
                for (icol = 0; icol <= maxcol; icol++) {
                        col = tbl->cols + icol;
                        if ( ! (col->flags & TBL_CELL_WMAX))
                                continue;
-                       col->width = xwidth / nxcol--;
-                       xwidth -= col->width;
+                       col->width = (double)xwidth * ++necol / nxcol
+                           - ewidth + 0.4995;
+                       if (necol == quirkcol)
+                               col->width--;
+                       ewidth += col->width;
                }
        }
 }