Various improvements related to .Ex and .Rv:

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 8dbd68ac11ad7c4d3c14dd72befaf7ab73e353bb..9c4e4c94e0cf3030576438a7242b53349cd1fac5 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.43 2011/09/20 23:05:49 schwarze Exp $ */
+/*     $Id: out.c,v 1.48 2014/04/20 16:46:05 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,17 +28,19 @@
 #include <string.h>
 #include <time.h>
 
+#include "mandoc_aux.h"
 #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.
  */
@@ -55,10 +57,10 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        i = hasd = 0;
 
        switch (*src) {
-       case ('+'):
+       case '+':
                src++;
                break;
-       case ('-'):
+       case '-':
                buf[i++] = *src++;
                break;
        default:
@@ -86,39 +88,39 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
        buf[i] = '\0';
 
        switch (*src) {
-       case ('c'):
+       case 'c':
                unit = SCALE_CM;
                break;
-       case ('i'):
+       case 'i':
                unit = SCALE_IN;
                break;
-       case ('P'):
+       case 'P':
                unit = SCALE_PC;
                break;
-       case ('p'):
+       case 'p':
                unit = SCALE_PT;
                break;
-       case ('f'):
+       case 'f':
                unit = SCALE_FS;
                break;
-       case ('v'):
+       case 'v':
                unit = SCALE_VS;
                break;
-       case ('m'):
+       case 'm':
                unit = SCALE_EM;
                break;
-       case ('\0'):
+       case '\0':
                if (SCALE_MAX == def)
                        return(0);
                unit = SCALE_BU;
                break;
-       case ('u'):
+       case 'u':
                unit = SCALE_BU;
                break;
-       case ('M'):
+       case 'M':
                unit = SCALE_MM;
                break;
-       case ('n'):
+       case 'n':
                unit = SCALE_EN;
                break;
        default:
@@ -142,7 +144,6 @@ 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;
 
@@ -153,10 +154,8 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
         */
 
        assert(NULL == tbl->cols);
-       tbl->cols = mandoc_calloc
-               ((size_t)sp->tbl->cols, sizeof(struct roffcol));
-
-       hp = sp->head;
+       tbl->cols = mandoc_calloc((size_t)sp->opts->cols,
+           sizeof(struct roffcol));
 
        for ( ; sp; sp = sp->next) {
                if (TBL_SPAN_DATA != sp->pos)
@@ -175,59 +174,40 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
                                continue;
                        assert(dp->layout);
                        col = &tbl->cols[dp->layout->head->ident];
-                       tblcalc_data(tbl, col, sp->tbl, 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;
+                       tblcalc_data(tbl, col, sp->opts, dp);
                }
        }
 }
 
 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. */
 
        switch (dp->layout->pos) {
-       case (TBL_CELL_HORIZ):
+       case TBL_CELL_HORIZ:
                /* FALLTHROUGH */
-       case (TBL_CELL_DHORIZ):
+       case TBL_CELL_DHORIZ:
                sz = (*tbl->len)(1, tbl->arg);
                if (col->width < sz)
                        col->width = sz;
                break;
-       case (TBL_CELL_LONG):
+       case TBL_CELL_LONG:
                /* FALLTHROUGH */
-       case (TBL_CELL_CENTRE):
+       case TBL_CELL_CENTRE:
                /* FALLTHROUGH */
-       case (TBL_CELL_LEFT):
+       case TBL_CELL_LEFT:
                /* FALLTHROUGH */
-       case (TBL_CELL_RIGHT):
+       case TBL_CELL_RIGHT:
                tblcalc_literal(tbl, col, dp);
                break;
-       case (TBL_CELL_NUMBER):
-               tblcalc_number(tbl, col, tp, dp);
+       case TBL_CELL_NUMBER:
+               tblcalc_number(tbl, col, opts, dp);
                break;
-       case (TBL_CELL_DOWN):
+       case TBL_CELL_DOWN:
                break;
        default:
                abort();
@@ -251,9 +231,9 @@ tblcalc_literal(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;
+       int              i;
        size_t           sz, psz, ssz, d;
        const char      *str;
        char            *cp;
@@ -273,12 +253,12 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 
        /* 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];