The upcoming .while request will have to re-execute roff(7) lines

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 4174eb89957d14b9e27d3bf9af31f608b784fe55..9b22fe5493f05c604d0b35eb1032e4c30ca264b2 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.73 2018/08/19 23:10:28 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,8 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <ctype.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -85,10 +87,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 +142,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 +156,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 +179,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)
@@ -313,51 +325,66 @@ static void
 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;
-       const char      *str;
-       char            *cp;
+       const char      *cp, *lastdigit, *lastpoint;
+       size_t           intsz, totsz;
        char             buf[2];
 
+       if (dp->string == NULL || *dp->string == '\0')
+               return;
+
        /*
-        * First calculate number width and decimal place (last + 1 for
-        * non-decimal numbers).  If the stored decimal is subsequent to
-        * ours, make our size longer by that difference
-        * (right-"shifting"); similarly, if ours is subsequent the
-        * stored, then extend the stored size by the difference.
-        * Finally, re-assign the stored values.
+        * Find the last digit and
+        * the last decimal point that is adjacent to a digit.
+        * The alignment indicator "\&" overrides everything.
         */
 
-       str = dp->string ? dp->string : "";
-       sz = (*tbl->slen)(str, tbl->arg);
+       lastdigit = lastpoint = NULL;
+       for (cp = dp->string; cp[0] != '\0'; cp++) {
+               if (cp[0] == '\\' && cp[1] == '&') {
+                       lastdigit = lastpoint = cp;
+                       break;
+               } else if (cp[0] == opts->decimal &&
+                   (isdigit((unsigned char)cp[1]) ||
+                    (cp > dp->string && isdigit((unsigned char)cp[-1]))))
+                       lastpoint = cp;
+               else if (isdigit((unsigned char)cp[0]))
+                       lastdigit = cp;
+       }
 
-       /* FIXME: TBL_DATA_HORIZ et al.? */
+       /* Not a number, treat as a literal string. */
 
-       buf[0] = opts->decimal;
-       buf[1] = '\0';
+       totsz = (*tbl->slen)(dp->string, tbl->arg);
+       if (lastdigit == NULL) {
+               if (col->width < totsz)
+                       col->width = totsz;
+               return;
+       }
 
-       psz = (*tbl->slen)(buf, tbl->arg);
+       /* Measure the width of the integer part. */
 
-       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;
-       } else
-               d = sz + psz;
+       if (lastpoint == NULL)
+               lastpoint = lastdigit + 1;
+       intsz = 0;
+       buf[1] = '\0';
+       for (cp = dp->string; cp < lastpoint; cp++) {
+               buf[0] = cp[0];
+               intsz += (*tbl->slen)(buf, tbl->arg);
+       }
 
-       /* Adjust the settings for this column. */
+       /*
+         * If this number has more integer digits than all numbers
+         * seen on earlier lines, shift them all to the right.
+        * If it has fewer, shift this number to the right.
+        */
 
-       if (col->decimal > d) {
-               sz += col->decimal - d;
-               d = col->decimal;
+       if (intsz > col->decimal) {
+               col->nwidth += intsz - col->decimal;
+               col->decimal = intsz;
        } else
-               col->width += d - col->decimal;
+               totsz += col->decimal - intsz;
+
+       /* Update the maximum total width seen so far. */
 
-       if (sz > col->width)
-               col->width = sz;
-       if (d > col->decimal)
-               col->decimal = d;
+       if (totsz > col->nwidth)
+               col->nwidth = totsz;
 }