FreeBSD, NetBSD and DragonFly use the same names as Linux.

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index eb679e6431fe78e58cbef217a06b06f4a6e4dfea..8dbd68ac11ad7c4d3c14dd72befaf7ab73e353bb 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.41 2011/07/17 15:24:25 kristaps Exp $ */
+/*     $Id: out.c,v 1.43 2011/09/20 23:05:49 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -69,7 +69,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
                return(0);
 
        while (i < BUFSIZ) {
-               if ( ! isdigit((u_char)*src)) {
+               if ( ! isdigit((unsigned char)*src)) {
                        if ('.' != *src)
                                break;
                        else if (hasd)
@@ -144,6 +144,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
        const struct tbl_dat    *dp;
        const struct tbl_head   *hp;
        struct roffcol          *col;
+       int                      spans;
 
        /*
         * Allocate the master column specifiers.  These will hold the
@@ -160,11 +161,18 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
        for ( ; sp; sp = sp->next) {
                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) {
+                       /* Do not used spanned cells in the calculation. */
+                       if (0 < --spans)
+                               continue;
+                       spans = dp->spans;
+                       if (1 < spans)
+                               continue;
                        assert(dp->layout);
                        col = &tbl->cols[dp->layout->head->ident];
                        tblcalc_data(tbl, col, sp->tbl, dp);
@@ -231,39 +239,12 @@ static void
 tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
                const struct tbl_dat *dp)
 {
-       size_t           sz, bufsz, spsz;
+       size_t           sz;
        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)(1, tbl->arg);
-               break;
-       default:
-               bufsz = (*tbl->len)(1, tbl->arg);
-               break;
-       }
-
-       if (dp->layout->spacing) {
-               spsz = (*tbl->len)(dp->layout->spacing, tbl->arg);
-               bufsz = bufsz > spsz ? bufsz : spsz;
-       }
-
-       sz += bufsz;
        if (col->width < sz)
                col->width = sz;
 }
@@ -280,7 +261,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 
        /*
         * 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.
@@ -307,11 +288,6 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
        } else
                d = sz + psz;
 
-       /* Padding. */
-
-       sz += (*tbl->len)(2, tbl->arg);
-       d += (*tbl->len)(1, tbl->arg);
-
        /* Adjust the settings for this column. */
 
        if (col->decimal > d) {
@@ -324,11 +300,4 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                col->width = sz;
        if (d > col->decimal)
                col->decimal = d;
-
-       /* Adjust for stipulated width. */
-
-       if (col->width < dp->layout->spacing)
-               col->width = dp->layout->spacing;
 }
-
-