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

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 155957eae19b2d5e95a3410a0f3d2f35168bc4ed..d8696141a7d5bd92f212658a4dcf2a8d6d2d2373 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,6 +1,7 @@
-/*     $Id: out.c,v 1.35 2011/01/11 14:12:01 kristaps Exp $ */
+/*     $Id: out.c,v 1.72 2018/08/18 20:18:14 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,357 +15,85 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 #include <assert.h>
 
 #include <sys/types.h>
 
 #include <assert.h>

-#include <ctype.h>
-#include <stdio.h>
+#include <stdint.h>

 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 

+#include "mandoc_aux.h"

 #include "mandoc.h"
 #include "out.h"
 
 static void    tblcalc_data(struct rofftbl *, struct roffcol *,
 #include "mandoc.h"
 #include "out.h"
 
 static void    tblcalc_data(struct rofftbl *, struct roffcol *,

-                       const struct tbl *, const struct tbl_dat *);
+                       const struct tbl_opts *, const struct tbl_dat *,
+                       size_t);

 static void    tblcalc_literal(struct rofftbl *, struct roffcol *,
 static void    tblcalc_literal(struct rofftbl *, struct roffcol *,

-                       const struct tbl_dat *);
+                       const struct tbl_dat *, size_t);

 static void    tblcalc_number(struct rofftbl *, struct roffcol *,
 static void    tblcalc_number(struct rofftbl *, struct roffcol *,

-                       const struct tbl *, const struct tbl_dat *);
+                       const struct tbl_opts *, const struct tbl_dat *);

 
 

-/* 
- * Convert a `scaling unit' to a consistent form, or fail.  Scaling
- * units are documented in groff.7, mdoc.7, man.7.
+
+/*
+ * Parse the *src string and store a scaling unit into *dst.
+ * If the string doesn't specify the unit, use the default.
+ * If no default is specified, fail.
+ * Return a pointer to the byte after the last byte used,
+ * or NULL on total failure.

  */
  */

-int
+const char *

 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {
 a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
 {

-       char             buf[BUFSIZ], hasd;
-       int              i;
-       enum roffscale   unit;
-
-       if ('\0' == *src)
-               return(0);
+       char            *endptr;

 
 

-       i = hasd = 0;
+       dst->unit = def == SCALE_MAX ? SCALE_BU : def;
+       dst->scale = strtod(src, &endptr);
+       if (endptr == src)
+               return NULL;

 
 

-       switch (*src) {
-       case ('+'):
-               src++;
+       switch (*endptr++) {
+       case 'c':
+               dst->unit = SCALE_CM;

                break;
                break;

-       case ('-'):
-               buf[i++] = *src++;
+       case 'i':
+               dst->unit = SCALE_IN;

                break;
                break;

-       default:
+       case 'f':
+               dst->unit = SCALE_FS;

                break;
                break;

-       }
-
-       if ('\0' == *src)
-               return(0);
-
-       while (i < BUFSIZ) {
-               if ( ! isdigit((u_char)*src)) {
-                       if ('.' != *src)
-                               break;
-                       else if (hasd)
-                               break;
-                       else
-                               hasd = 1;
-               }
-               buf[i++] = *src++;
-       }
-
-       if (BUFSIZ == i || (*src && *(src + 1)))
-               return(0);
-
-       buf[i] = '\0';
-
-       switch (*src) {
-       case ('c'):
-               unit = SCALE_CM;
+       case 'M':
+               dst->unit = SCALE_MM;

                break;
                break;

-       case ('i'):
-               unit = SCALE_IN;
+       case 'm':
+               dst->unit = SCALE_EM;

                break;
                break;

-       case ('P'):
-               unit = SCALE_PC;
+       case 'n':
+               dst->unit = SCALE_EN;

                break;
                break;

-       case ('p'):
-               unit = SCALE_PT;
+       case 'P':
+               dst->unit = SCALE_PC;

                break;
                break;

-       case ('f'):
-               unit = SCALE_FS;
+       case 'p':
+               dst->unit = SCALE_PT;

                break;
                break;

-       case ('v'):
-               unit = SCALE_VS;
-               break;
-       case ('m'):
-               unit = SCALE_EM;
-               break;
-       case ('\0'):
-               if (SCALE_MAX == def)
-                       return(0);
-               unit = SCALE_BU;
+       case 'u':
+               dst->unit = SCALE_BU;

                break;
                break;

-       case ('u'):
-               unit = SCALE_BU;
-               break;
-       case ('M'):
-               unit = SCALE_MM;
-               break;
-       case ('n'):
-               unit = SCALE_EN;
+       case 'v':
+               dst->unit = SCALE_VS;

                break;
        default:
                break;
        default:

-               return(0);
-       }
-
-       /* FIXME: do this in the caller. */
-       if ((dst->scale = atof(buf)) < 0)
-               dst->scale = 0;
-       dst->unit = unit;
-       return(1);
-}
-
-
-/*
- * Correctly writes the time in nroff form, which differs from standard
- * form in that a space isn't printed in lieu of the extra %e field for
- * single-digit dates.
- */
-void
-time2a(time_t t, char *dst, size_t sz)
-{
-       struct tm        tm;
-       char             buf[5];
-       char            *p;
-       size_t           nsz;
-
-       assert(sz > 1);
-       localtime_r(&t, &tm);
-
-       p = dst;
-       nsz = 0;
-
-       dst[0] = '\0';
-
-       if (0 == (nsz = strftime(p, sz, "%B ", &tm)))
-               return;
-
-       p += (int)nsz;
-       sz -= nsz;
-
-       if (0 == strftime(buf, sizeof(buf), "%e, ", &tm))
-               return;
-
-       nsz = strlcat(p, buf + (' ' == buf[0] ? 1 : 0), sz);
-
-       if (nsz >= sz)
-               return;
-
-       p += (int)nsz;
-       sz -= nsz;
-
-       (void)strftime(p, sz, "%Y", &tm);
-}
-
-
-int
-a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
-{
-       int              i, j, lim;
-       char             term, c;
-       const char      *wp;
-       enum roffdeco    dd;
-
-       *d = DECO_NONE;
-       lim = i = 0;
-       term = '\0';
-       wp = *word;
-
-       switch ((c = wp[i++])) {
-       case ('('):
-               *d = DECO_SPECIAL;
-               lim = 2;
-               break;
-       case ('F'):
-               /* FALLTHROUGH */
-       case ('f'):
-               *d = 'F' == c ? DECO_FFONT : DECO_FONT;
-
-               switch (wp[i++]) {
-               case ('('):
-                       lim = 2;
-                       break;
-               case ('['):
-                       term = ']';
-                       break;
-               case ('3'):
-                       /* FALLTHROUGH */
-               case ('B'):
-                       *d = DECO_BOLD;
-                       return(i);
-               case ('2'):
-                       /* FALLTHROUGH */
-               case ('I'):
-                       *d = DECO_ITALIC;
-                       return(i);
-               case ('P'):
-                       *d = DECO_PREVIOUS;
-                       return(i);
-               case ('1'):
-                       /* FALLTHROUGH */
-               case ('R'):
-                       *d = DECO_ROMAN;
-                       return(i);
-               default:
-                       i--;
-                       lim = 1;
-                       break;
-               }
-               break;
-       case ('k'):
-               /* FALLTHROUGH */
-       case ('M'):
-               /* FALLTHROUGH */
-       case ('m'):
-               /* FALLTHROUGH */
-       case ('*'):
-               if ('*' == c)
-                       *d = DECO_RESERVED;
-
-               switch (wp[i++]) {
-               case ('('):
-                       lim = 2;
-                       break;
-               case ('['):
-                       term = ']';
-                       break;
-               default:
-                       i--;
-                       lim = 1;
-                       break;
-               }
-               break;
-       case ('h'):
-               /* FALLTHROUGH */
-       case ('v'):
-               /* FALLTHROUGH */
-       case ('s'):
-               j = 0;
-               if ('+' == wp[i] || '-' == wp[i]) {
-                       i++;
-                       j = 1;
-               }
-
-               switch (wp[i++]) {
-               case ('('):
-                       lim = 2;
-                       break;
-               case ('['):
-                       term = ']';
-                       break;
-               case ('\''):
-                       term = '\'';
-                       break;
-               case ('0'):
-                       j = 1;
-                       /* FALLTHROUGH */
-               default:
-                       i--;
-                       lim = 1;
-                       break;
-               }
-
-               if ('+' == wp[i] || '-' == wp[i]) {
-                       if (j)
-                               return(i);
-                       i++;
-               } 
-
-               /* Handle embedded numerical subexp or escape. */
-
-               if ('(' == wp[i]) {
-                       while (wp[i] && ')' != wp[i])
-                               if ('\\' == wp[i++]) {
-                                       /* Handle embedded escape. */
-                                       *word = &wp[i];
-                                       i += a2roffdeco(&dd, word, sz);
-                               }
-
-                       if (')' == wp[i++])
-                               break;
-
-                       *d = DECO_NONE;
-                       return(i - 1);
-               } else if ('\\' == wp[i]) {
-                       *word = &wp[++i];
-                       i += a2roffdeco(&dd, word, sz);
-               }
-
-               break;
-       case ('['):
-               *d = DECO_SPECIAL;
-               term = ']';
-               break;
-       case ('c'):
-               *d = DECO_NOSPACE;
-               return(i);
-       case ('z'):
-               *d = DECO_NONE;
-               if ('\\' == wp[i]) {
-                       *word = &wp[++i];
-                       return(i + a2roffdeco(&dd, word, sz));
-               } else
-                       lim = 1;
-               break;
-       case ('o'):
-               /* FALLTHROUGH */
-       case ('w'):
-               if ('\'' == wp[i++]) {
-                       term = '\'';
-                       break;
-               } 
-               /* FALLTHROUGH */
-       default:
-               *d = DECO_SSPECIAL;
-               i--;
-               lim = 1;
+               endptr--;
+               if (SCALE_MAX == def)
+                       return NULL;
+               dst->unit = def;

                break;
        }
                break;
        }

-
-       assert(term || lim);
-       *word = &wp[i];
-
-       if (term) {
-               j = i;
-               while (wp[i] && wp[i] != term)
-                       i++;
-               if ('\0' == wp[i]) {
-                       *d = DECO_NONE;
-                       return(i);
-               }
-
-               assert(i >= j);
-               *sz = (size_t)(i - j);
-
-               return(i + 1);
-       }
-
-       assert(lim > 0);
-       *sz = (size_t)lim;
-
-       for (j = 0; wp[i] && j < lim; j++)
-               i++;
-       if (j < lim)
-               *d = DECO_NONE;
-
-       return(i);
+       return endptr;

 }
 
 /*
 }
 
 /*


@@ -374,11 +103,16 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
  * used for the actual width calculations.
  */
 void
  * used for the actual width calculations.
  */
 void

-tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
+tblcalc(struct rofftbl *tbl, const struct tbl_span *sp,
+    size_t offset, size_t rmargin)

 {
 {

+       struct roffsu            su;
+       const struct tbl_opts   *opts;

        const struct tbl_dat    *dp;
        const struct tbl_dat    *dp;

-       const struct tbl_head   *hp;

        struct roffcol          *col;
        struct roffcol          *col;

+       size_t                   ewidth, xwidth;
+       int                      spans;
+       int                      icol, maxcol, necol, nxcol, quirkcol;

 
        /*
         * Allocate the master column specifiers.  These will hold the
 
        /*
         * Allocate the master column specifiers.  These will hold the


@@ -387,134 +121,218 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
         */
 
        assert(NULL == tbl->cols);
         */
 
        assert(NULL == tbl->cols);

-       tbl->cols = calloc(sp->tbl->cols, sizeof(struct roffcol));
-
-       hp = sp->head;
+       tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
+           sizeof(struct roffcol));
+       opts = sp->opts;

 
 

-       for ( ; sp; sp = sp->next) {
+       for (maxcol = -1; sp; sp = sp->next) {

                if (TBL_SPAN_DATA != sp->pos)
                        continue;
                if (TBL_SPAN_DATA != sp->pos)
                        continue;

+               spans = 1;

                /*
                 * Account for the data cells in the layout, matching it
                 * to data cells in the data section.
                 */
                for (dp = sp->first; dp; dp = dp->next) {
                /*
                 * Account for the data cells in the layout, matching it
                 * to data cells in the data section.
                 */
                for (dp = sp->first; dp; dp = dp->next) {

-                       assert(dp->layout);
-                       col = &tbl->cols[dp->layout->head->ident];
-                       tblcalc_data(tbl, col, sp->tbl, dp);
+                       /* Do not used spanned cells in the calculation. */
+                       if (0 < --spans)
+                               continue;
+                       spans = dp->spans;
+                       if (1 < spans)
+                               continue;
+                       icol = dp->layout->col;
+                       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)
+                               continue;
+                       if (dp->layout->wstr != NULL &&
+                           dp->layout->width == 0 &&
+                           a2roffsu(dp->layout->wstr, &su, SCALE_EN)
+                           != NULL)
+                               dp->layout->width =
+                                   (*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 / 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.
+        */
+
+       necol = nxcol = 0;
+       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)
+                               ewidth = col->width;
+               }
+               if (col->flags & TBL_CELL_WMAX)
+                       nxcol++;
+               else
+                       xwidth += col->width;
+       }
+
+       /*
+        * Equalize columns, if requested for any of them.
+        * Update total width of the columns not to maximize.
+        */
+
+       if (necol) {
+               for (icol = 0; icol <= maxcol; icol++) {
+                       col = tbl->cols + icol;
+                       if ( ! (col->flags & TBL_CELL_EQUAL))
+                               continue;
+                       if (col->width == ewidth)
+                               continue;
+                       if (nxcol && rmargin)
+                               xwidth += ewidth - col->width;
+                       col->width = ewidth;

                }
        }
 
                }
        }
 

-       /* 
-        * Calculate width of the spanners.  These get one space for a
-        * vertical line, two for a double-vertical line. 
+       /*
+        * If there are any columns to maximize, find the total
+        * available width, deducting 3n margins between columns.
+        * Distribute the available width evenly.

         */
 
         */
 

-       for ( ; hp; hp = hp->next) {
-               col = &tbl->cols[hp->ident];
-               switch (hp->pos) {
-               case (TBL_HEAD_VERT):
-                       col->width = (*tbl->len)(1, tbl->arg);
-                       break;
-               case (TBL_HEAD_DVERT):
-                       col->width = (*tbl->len)(2, tbl->arg);
-                       break;
-               default:
-                       break;
+       if (nxcol && rmargin) {
+               xwidth += 3*maxcol +
+                   (opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ?
+                    2 : !!opts->lvert + !!opts->rvert);
+               if (rmargin <= offset + xwidth)
+                       return;
+               xwidth = rmargin - offset - xwidth;
+
+               /*
+                * 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 = (double)xwidth * ++necol / nxcol
+                           - ewidth + 0.4995;
+                       if (necol == quirkcol)
+                               col->width--;
+                       ewidth += col->width;

                }
        }
 }
 
 static void
 tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
                }
        }
 }
 
 static void
 tblcalc_data(struct rofftbl *tbl, struct roffcol *col,

-               const struct tbl *tp, const struct tbl_dat *dp)
+    const struct tbl_opts *opts, const struct tbl_dat *dp, size_t mw)

 {
        size_t           sz;
 
        /* Branch down into data sub-types. */
 
        switch (dp->layout->pos) {
 {
        size_t           sz;
 
        /* Branch down into data sub-types. */
 
        switch (dp->layout->pos) {

-       case (TBL_CELL_HORIZ):
-               /* FALLTHROUGH */
-       case (TBL_CELL_DHORIZ):
+       case TBL_CELL_HORIZ:
+       case TBL_CELL_DHORIZ:

                sz = (*tbl->len)(1, tbl->arg);
                if (col->width < sz)
                        col->width = sz;
                break;
                sz = (*tbl->len)(1, tbl->arg);
                if (col->width < sz)
                        col->width = sz;
                break;

-       case (TBL_CELL_LONG):
-               /* FALLTHROUGH */
-       case (TBL_CELL_CENTRE):
-               /* FALLTHROUGH */
-       case (TBL_CELL_LEFT):
-               /* FALLTHROUGH */
-       case (TBL_CELL_RIGHT):
-               tblcalc_literal(tbl, col, dp);
+       case TBL_CELL_LONG:
+       case TBL_CELL_CENTRE:
+       case TBL_CELL_LEFT:
+       case TBL_CELL_RIGHT:
+               tblcalc_literal(tbl, col, dp, mw);

                break;
                break;

-       case (TBL_CELL_NUMBER):
-               tblcalc_number(tbl, col, tp, dp);
+       case TBL_CELL_NUMBER:
+               tblcalc_number(tbl, col, opts, dp);

                break;
                break;

-       case (TBL_CELL_DOWN):
+       case TBL_CELL_DOWN:

                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */

        }
 }
 
 static void
 tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
        }
 }
 
 static void
 tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,

-               const struct tbl_dat *dp)
+    const struct tbl_dat *dp, size_t mw)

 {
 {

-       size_t           sz, bufsz, spsz;
-       const char      *str;
-
-       /* 
-        * Calculate our width and use the spacing, with a minimum
-        * spacing dictated by position (centre, e.g,. gets a space on
-        * either side, while right/left get a single adjacent space).
-        */
-
-       bufsz = spsz = 0;
-       str = dp->string ? dp->string : "";
-       sz = (*tbl->slen)(str, tbl->arg);
-
-       /* FIXME: TBL_DATA_HORIZ et al.? */
-
-       assert(dp->layout);
-       switch (dp->layout->pos) {
-       case (TBL_CELL_LONG):
-               /* FALLTHROUGH */
-       case (TBL_CELL_CENTRE):
-               bufsz = (*tbl->len)(2, tbl->arg);
-               break;
-       default:
-               bufsz = (*tbl->len)(1, tbl->arg);
-               break;
-       }
+       const char      *str;   /* Beginning of the first line. */
+       const char      *beg;   /* Beginning of the current line. */
+       char            *end;   /* End of the current line. */
+       size_t           lsz;   /* Length of the current line. */
+       size_t           wsz;   /* Length of the current word. */

 
 

-       if (dp->layout->spacing) {
-               spsz = (*tbl->len)(dp->layout->spacing, tbl->arg);
-               bufsz = bufsz > spsz ? bufsz : spsz;
+       if (dp->string == NULL || *dp->string == '\0')
+               return;
+       str = mw ? mandoc_strdup(dp->string) : dp->string;
+       lsz = 0;
+       for (beg = str; beg != NULL && *beg != '\0'; beg = end) {
+               end = mw ? strchr(beg, ' ') : NULL;
+               if (end != NULL) {
+                       *end++ = '\0';
+                       while (*end == ' ')
+                               end++;
+               }
+               wsz = (*tbl->slen)(beg, tbl->arg);
+               if (mw && lsz && lsz + 1 + wsz <= mw)
+                       lsz += 1 + wsz;
+               else
+                       lsz = wsz;
+               if (col->width < lsz)
+                       col->width = lsz;

        }
        }

-
-       sz += bufsz;
-       if (col->width < sz)
-               col->width = sz;
+       if (mw)
+               free((void *)str);

 }
 
 static void
 tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 }
 
 static void
 tblcalc_number(struct rofftbl *tbl, struct roffcol *col,

-               const struct tbl *tp, const struct tbl_dat *dp)
+               const struct tbl_opts *opts, const struct tbl_dat *dp)

 {
 {

-       int              i;
-       size_t           sz, psz, ssz, d;
+       int              i;
+       size_t           sz, ssz, d;

        const char      *str;
        char            *cp;
        char             buf[2];
 
        /*
         * First calculate number width and decimal place (last + 1 for
        const char      *str;
        char            *cp;
        char             buf[2];
 
        /*
         * First calculate number width and decimal place (last + 1 for

-        * no-decimal numbers).  If the stored decimal is subsequent
+        * 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.
         * 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.


@@ -526,25 +344,18 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 
        /* FIXME: TBL_DATA_HORIZ et al.? */
 
 
        /* FIXME: TBL_DATA_HORIZ et al.? */
 

-       buf[0] = tp->decimal;
+       buf[0] = opts->decimal;

        buf[1] = '\0';
 
        buf[1] = '\0';
 

-       psz = (*tbl->slen)(buf, tbl->arg);
-
-       if (NULL != (cp = strrchr(str, tp->decimal))) {
+       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);
                }
                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
        } else

-               d = sz + psz;
-
-       /* Padding. */
-
-       sz += (*tbl->len)(2, tbl->arg);
-       d += (*tbl->len)(1, tbl->arg);
+               d = sz;

 
        /* Adjust the settings for this column. */
 
 
        /* Adjust the settings for this column. */
 


@@ -552,17 +363,10 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                sz += col->decimal - d;
                d = col->decimal;
        } else
                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;
        if (d > col->decimal)
                col->decimal = d;

-
-       /* Adjust for stipulated width. */
-
-       if (col->width < dp->layout->spacing)
-               col->width = dp->layout->spacing;

 }
 }

-
-