5051 import mdocml-1.12.3
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: TBD

@@ -1,6 +1,6 @@
-/*      $Id: out.c,v 1.43 2011/09/20 23:05:49 schwarze Exp $ */
+/*      $Id: out.c,v 1.46 2013/10/05 20:30:05 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any

@@ -30,15 +30,15 @@
 
 #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 *);
 static  void    tblcalc_literal(struct rofftbl *, struct roffcol *,
                         const struct tbl_dat *);
 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.
  */

@@ -140,11 +140,10 @@
  */
 void
 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

@@ -152,14 +151,12 @@
          * must be freed and nullified by the caller.
          */
 
         assert(NULL == tbl->cols);
         tbl->cols = mandoc_calloc
-                ((size_t)sp->tbl->cols, sizeof(struct roffcol));
+                ((size_t)sp->opts->cols, sizeof(struct roffcol));
 
-        hp = sp->head;
-
         for ( ; sp; sp = sp->next) {
                 if (TBL_SPAN_DATA != sp->pos)
                         continue;
                 spans = 1;
                 /*

@@ -173,37 +170,18 @@
                         spans = dp->spans;
                         if (1 < spans)
                                 continue;
                         assert(dp->layout);
                         col = &tbl->cols[dp->layout->head->ident];
-                        tblcalc_data(tbl, col, sp->tbl, dp);
+                        tblcalc_data(tbl, col, sp->opts, dp);
                 }
         }
-
-        /* 
-         * Calculate width of the spanners.  These get one space for a
-         * vertical line, two for a double-vertical line. 
-         */
-
-        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;
-                }
-        }
 }
 
 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           sz;
 
         /* Branch down into data sub-types. */
 

@@ -223,11 +201,11 @@
                 /* FALLTHROUGH */
         case (TBL_CELL_RIGHT):
                 tblcalc_literal(tbl, col, dp);
                 break;
         case (TBL_CELL_NUMBER):
-                tblcalc_number(tbl, col, tp, dp);
+                tblcalc_number(tbl, col, opts, dp);
                 break;
         case (TBL_CELL_DOWN):
                 break;
         default:
                 abort();

@@ -249,11 +227,11 @@
                 col->width = sz;
 }
 
 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;
         const char      *str;
         char            *cp;

@@ -271,16 +249,16 @@
         str = dp->string ? dp->string : "";
         sz = (*tbl->slen)(str, tbl->arg);
 
         /* FIXME: TBL_DATA_HORIZ et al.? */
 
-        buf[0] = tp->decimal;
+        buf[0] = opts->decimal;
         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);
                 }