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

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 4174eb89957d14b9e27d3bf9af31f608b784fe55..d8696141a7d5bd92f212658a4dcf2a8d6d2d2373 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,7 +1,7 @@
-/*     $Id: out.c,v 1.67 2017/06/12 22:05:57 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 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,2014,2015,2017,2018 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
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -85,10 +86,8 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        case 'v':
                dst->unit = SCALE_VS;
                break;
-       case '\0':
-               endptr--;
-               /* FALLTHROUGH */
        default:
+               endptr--;
                if (SCALE_MAX == def)
                        return NULL;
                dst->unit = def;
@@ -142,8 +141,8 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
                        if (1 < spans)
                                continue;
                        icol = dp->layout->col;
-                       if (maxcol < icol)
-                               maxcol = icol;
+                       while (maxcol < icol)
+                               tbl->cols[++maxcol].spacing = SIZE_MAX;
                        col = tbl->cols + icol;
                        col->flags |= dp->layout->flags;
                        if (dp->layout->flags & TBL_CELL_WIGN)
@@ -156,14 +155,20 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
                                    (*tbl->sulen)(&su, tbl->arg);
                        if (col->width < dp->layout->width)
                                col->width = dp->layout->width;
+                       if (dp->layout->spacing != SIZE_MAX &&
+                           (col->spacing == SIZE_MAX ||
+                            col->spacing < dp->layout->spacing))
+                               col->spacing = dp->layout->spacing;
                        tblcalc_data(tbl, col, opts, dp,
                            dp->block == 0 ? 0 :
                            dp->layout->width ? dp->layout->width :
-                           rmargin ? rmargin / (sp->opts->cols + 1) : 0);
+                           rmargin ? (rmargin + sp->opts->cols / 2)
+                           / (sp->opts->cols + 1) : 0);
                }
        }
 
        /*
+        * 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.
@@ -173,6 +178,12 @@ 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) {
                        necol++;
                        if (ewidth < col->width)
@@ -314,7 +325,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                const struct tbl_opts *opts, const struct tbl_dat *dp)
 {
        int              i;
-       size_t           sz, psz, ssz, d;
+       size_t           sz, ssz, d;
        const char      *str;
        char            *cp;
        char             buf[2];
@@ -336,17 +347,15 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
        buf[0] = opts->decimal;
        buf[1] = '\0';
 
-       psz = (*tbl->slen)(buf, tbl->arg);
-
        if (NULL != (cp = strrchr(str, opts->decimal))) {
                buf[1] = '\0';
                for (ssz = 0, i = 0; cp != &str[i]; i++) {
                        buf[0] = str[i];
                        ssz += (*tbl->slen)(buf, tbl->arg);
                }
-               d = ssz + psz;
+               d = ssz;
        } else
-               d = sz + psz;
+               d = sz;
 
        /* Adjust the settings for this column. */
 
@@ -354,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;
 }