needs mandoc_aux, too

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index eb679e6431fe78e58cbef217a06b06f4a6e4dfea..96d1d771d3ef552a41a9d2272acc2329e87708e0 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.47 2014/03/23 11:25:26 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -28,15 +28,16 @@
 #include <string.h>
 #include <time.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 *);

 static void    tblcalc_literal(struct rofftbl *, struct roffcol *,
                        const struct tbl_dat *);
 static void    tblcalc_number(struct rofftbl *, struct roffcol *,
 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
 
 /* 
  * Convert a `scaling unit' to a consistent form, or fail.  Scaling


@@ -69,7 +70,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum roffscale def)
                return(0);
 
        while (i < BUFSIZ) {
                return(0);
 
        while (i < BUFSIZ) {

-               if ( ! isdigit((u_char)*src)) {
+               if ( ! isdigit((unsigned char)*src)) {

                        if ('.' != *src)
                                break;
                        else if (hasd)
                        if ('.' != *src)
                                break;
                        else if (hasd)


@@ -142,8 +143,8 @@ void
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
 {
        const struct tbl_dat    *dp;
 tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
 {
        const struct tbl_dat    *dp;

-       const struct tbl_head   *hp;

        struct roffcol          *col;
        struct roffcol          *col;

+       int                      spans;

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


@@ -153,47 +154,33 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp)
 
        assert(NULL == tbl->cols);
        tbl->cols = mandoc_calloc
 
        assert(NULL == tbl->cols);
        tbl->cols = mandoc_calloc

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

 
        for ( ; sp; sp = sp->next) {
                if (TBL_SPAN_DATA != sp->pos)
                        continue;
 
        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) {
                /*
                 * 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];
                        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,
                }
        }
 }
 
 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;
 
 {
        size_t           sz;
 


@@ -217,7 +204,7 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
                tblcalc_literal(tbl, col, dp);
                break;
        case (TBL_CELL_NUMBER):
                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;
                break;
        case (TBL_CELL_DOWN):
                break;


@@ -231,46 +218,19 @@ static void
 tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
                const struct tbl_dat *dp)
 {
 tblcalc_literal(struct rofftbl *tbl, struct roffcol *col,
                const struct tbl_dat *dp)
 {

-       size_t           sz, bufsz, spsz;
+       size_t           sz;

        const char      *str;
 
        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);
 
        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;
 }
 
 static void
 tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
        if (col->width < sz)
                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;
 {
        int              i;
        size_t           sz, psz, ssz, d;


@@ -280,7 +240,7 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
 
        /*
         * First calculate number width and decimal place (last + 1 for
 
        /*
         * 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.


@@ -292,12 +252,12 @@ 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';
 
        psz = (*tbl->slen)(buf, tbl->arg);
 
        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];
                buf[1] = '\0';
                for (ssz = 0, i = 0; cp != &str[i]; i++) {
                        buf[0] = str[i];


@@ -307,11 +267,6 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
        } else
                d = sz + psz;
 
        } 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) {
        /* Adjust the settings for this column. */
 
        if (col->decimal > d) {


@@ -324,11 +279,4 @@ tblcalc_number(struct rofftbl *tbl, struct roffcol *col,
                col->width = sz;
        if (d > col->decimal)
                col->decimal = d;
                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;

 }
 }

-
-