Mostly complete implementation of the 'c' (character available)

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index eacfcb4ff67af6ed57f950f36495e92036463517..d8696141a7d5bd92f212658a4dcf2a8d6d2d2373 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.71 2018/08/18 16:44:55 schwarze Exp $ */
+/*     $Id: out.c,v 1.72 2018/08/18 20:18:14 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -168,6 +168,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
        }
 
        /*
+        * Align numbers with text.
         * Count columns to equalize and columns to maximize.
         * Find maximum width of the columns to equalize.
         * Find total width of the columns *not* to maximize.
@@ -177,6 +178,10 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
        ewidth = xwidth = 0;
        for (icol = 0; icol <= maxcol; icol++) {
                col = tbl->cols + icol;
+               if (col->width > col->nwidth)
+                       col->decimal += (col->width - col->nwidth) / 2;
+               else
+                       col->width = col->nwidth;
                if (col->spacing == SIZE_MAX || icol == maxcol)
                        col->spacing = 3;
                if (col->flags & TBL_CELL_EQUAL) {
@@ -358,10 +363,10 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                sz += col->decimal - d;
                d = col->decimal;
        } else
-               col->width += d - col->decimal;
+               col->nwidth += d - col->decimal;
 
-       if (sz > col->width)
-               col->width = sz;
+       if (sz > col->nwidth)
+               col->nwidth = sz;
        if (d > col->decimal)
                col->decimal = d;
 }