Major rewrite of the horizontal spacing of tables

to work both with and without frames and rulers.
ok kristaps@

diff --git a/out.c b/out.c
index 6ae41fd12a7c56684328f616a9276a34a899fa16..8dbd68ac11ad7c4d3c14dd72befaf7ab73e353bb 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.42 2011/07/24 18:15:14 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>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -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;
        const struct tbl_dat    *dp;
        const struct tbl_head   *hp;
        struct roffcol          *col;

+       int                      spans;

 
        /*
         * Allocate the master column specifiers.  These will hold the
 
        /*
         * 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;
        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];
                        tblcalc_data(tbl, col, sp->tbl, dp);
                        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)
 {
 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;
 }
        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
 
        /*
         * 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.


@@ -307,11 +288,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 +300,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;

 }
 }

-
-

diff --git a/tbl_term.c b/tbl_term.c
index 04bd0e390a18cad8a6963dbfc302139bdccd7bd9..f1928f02cb20d74e286eda3e1cd93a180dbbb94a 100644 (file)
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_term.c,v 1.20 2011/07/17 15:43:00 kristaps Exp $ */
+/*     $Id: tbl_term.c,v 1.21 2011/09/20 23:05:49 schwarze Exp $ */

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


@@ -34,14 +34,14 @@ static      void    tbl_char(struct termp *, char, size_t);
 static void    tbl_data(struct termp *, const struct tbl *,
                        const struct tbl_dat *, 
                        const struct roffcol *);
 static void    tbl_data(struct termp *, const struct tbl *,
                        const struct tbl_dat *, 
                        const struct roffcol *);

-static void    tbl_hframe(struct termp *, const struct tbl_span *);
+static size_t  tbl_rulewidth(struct termp *, const struct tbl_head *);
+static void    tbl_hframe(struct termp *, const struct tbl_span *, int);

 static void    tbl_literal(struct termp *, const struct tbl_dat *, 
                        const struct roffcol *);
 static void    tbl_number(struct termp *, const struct tbl *, 
                        const struct tbl_dat *, 
                        const struct roffcol *);
 static void    tbl_hrule(struct termp *, const struct tbl_span *);
 static void    tbl_literal(struct termp *, const struct tbl_dat *, 
                        const struct roffcol *);
 static void    tbl_number(struct termp *, const struct tbl *, 
                        const struct tbl_dat *, 
                        const struct roffcol *);
 static void    tbl_hrule(struct termp *, const struct tbl_span *);

-static void    tbl_vframe(struct termp *, const struct tbl *);

 static void    tbl_vrule(struct termp *, const struct tbl_head *);
 
 
 static void    tbl_vrule(struct termp *, const struct tbl_head *);
 
 


@@ -95,12 +95,19 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
        /* Horizontal frame at the start of boxed tables. */
 
 
        /* Horizontal frame at the start of boxed tables. */
 

-       if (TBL_SPAN_FIRST & sp->flags)
-               tbl_hframe(tp, sp);
+       if (TBL_SPAN_FIRST & sp->flags) {
+               if (TBL_OPT_DBOX & sp->tbl->opts)
+                       tbl_hframe(tp, sp, 1);
+               if (TBL_OPT_DBOX & sp->tbl->opts ||
+                   TBL_OPT_BOX  & sp->tbl->opts)
+                       tbl_hframe(tp, sp, 0);
+       }

 
        /* Vertical frame at the start of each row. */
 
 
        /* Vertical frame at the start of each row. */
 

-       tbl_vframe(tp, sp->tbl);
+       if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts)
+               term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
+                       TBL_SPAN_DHORIZ == sp->pos ? "+" : "|");

 
        /*
         * Now print the actual data itself depending on the span type.
 
        /*
         * Now print the actual data itself depending on the span type.


@@ -138,9 +145,31 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                        if (--spans >= 0)
                                continue;
 
                        if (--spans >= 0)
                                continue;
 

+                       /*
+                        * All cells get a leading blank, except the
+                        * first one and those after double rulers.
+                        */
+
+                       if (hp->prev && TBL_HEAD_DVERT != hp->prev->pos)
+                               tbl_char(tp, ASCII_NBRSP, 1);
+

                        col = &tp->tbl.cols[hp->ident];
                        tbl_data(tp, sp->tbl, dp, col);
 
                        col = &tp->tbl.cols[hp->ident];
                        tbl_data(tp, sp->tbl, dp, col);
 

+                       /* No trailing blanks. */
+
+                       if (NULL == hp->next)
+                               break;
+
+                       /*
+                        * Add another blank between cells,
+                        * or two when there is no vertical ruler.
+                        */
+
+                       tbl_char(tp, ASCII_NBRSP,
+                           TBL_HEAD_VERT  == hp->next->pos ||
+                           TBL_HEAD_DVERT == hp->next->pos ? 1 : 2);
+

                        /* 
                         * Go to the next data cell and assign the
                         * number of subsequent spans, if applicable.
                        /* 
                         * Go to the next data cell and assign the
                         * number of subsequent spans, if applicable.


@@ -154,7 +183,11 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                break;
        }
 
                break;
        }
 

-       tbl_vframe(tp, sp->tbl);
+       /* Vertical frame at the end of each row. */
+
+       if (TBL_OPT_BOX & sp->tbl->opts || TBL_OPT_DBOX & sp->tbl->opts)
+               term_word(tp, TBL_SPAN_HORIZ == sp->pos ||
+                       TBL_SPAN_DHORIZ == sp->pos ? "+" : " |");

        term_flushln(tp);
 
        /*
        term_flushln(tp);
 
        /*


@@ -163,7 +196,11 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
         */
 
        if (TBL_SPAN_LAST & sp->flags) {
         */
 
        if (TBL_SPAN_LAST & sp->flags) {

-               tbl_hframe(tp, sp);
+               if (TBL_OPT_DBOX & sp->tbl->opts ||
+                   TBL_OPT_BOX  & sp->tbl->opts)
+                       tbl_hframe(tp, sp, 0);
+               if (TBL_OPT_DBOX & sp->tbl->opts)
+                       tbl_hframe(tp, sp, 1);

                assert(tp->tbl.cols);
                free(tp->tbl.cols);
                tp->tbl.cols = NULL;
                assert(tp->tbl.cols);
                free(tp->tbl.cols);
                tp->tbl.cols = NULL;


@@ -175,86 +212,66 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
 }
 
 
 }
 

+/*
+ * Horizontal rules extend across the entire table.
+ * Calculate the width by iterating over columns.
+ */
+static size_t
+tbl_rulewidth(struct termp *tp, const struct tbl_head *hp)
+{
+       size_t           width;
+
+       width = tp->tbl.cols[hp->ident].width;
+       if (TBL_HEAD_DATA == hp->pos) {
+               /* Account for leading blanks. */
+               if (hp->prev && TBL_HEAD_DVERT != hp->prev->pos)
+                       width++;
+               /* Account for trailing blanks. */
+               width++;
+               if (hp->next &&
+                   TBL_HEAD_VERT  != hp->next->pos &&
+                   TBL_HEAD_DVERT != hp->next->pos)
+                       width++;
+       }
+       return(width);
+}
+
+/*
+ * Rules inside the table can be single or double
+ * and have crossings with vertical rules marked with pluses.
+ */

 static void
 tbl_hrule(struct termp *tp, const struct tbl_span *sp)
 {
        const struct tbl_head *hp;
        char             c;
 static void
 tbl_hrule(struct termp *tp, const struct tbl_span *sp)
 {
        const struct tbl_head *hp;
        char             c;

-       size_t           width;
-
-       /*
-        * An hrule extends across the entire table and is demarked by a
-        * standalone `_' or whatnot in lieu of a table row.  Spanning
-        * headers are marked by a `+', as are table boundaries.
-        */

 
        c = '-';
        if (TBL_SPAN_DHORIZ == sp->pos)
                c = '=';
 
 
        c = '-';
        if (TBL_SPAN_DHORIZ == sp->pos)
                c = '=';
 

-       /* FIXME: don't use `+' between data and a spanner! */
-
-       for (hp = sp->head; hp; hp = hp->next) {
-               width = tp->tbl.cols[hp->ident].width;
-               switch (hp->pos) {
-               case (TBL_HEAD_DATA):
-                       if (hp->next)
-                               width += 2;
-                       tbl_char(tp, c, width);
-                       break;
-               case (TBL_HEAD_DVERT):
-                       tbl_char(tp, '+', width);
-                       /* FALLTHROUGH */
-               case (TBL_HEAD_VERT):
-                       tbl_char(tp, '+', width);
-                       break;
-               default:
-                       abort();
-                       /* NOTREACHED */
-               }
-       }
+       for (hp = sp->head; hp; hp = hp->next)
+               tbl_char(tp,
+                   TBL_HEAD_DATA == hp->pos ? c : '+',
+                   tbl_rulewidth(tp, hp));

 }
 
 }
 

+/*
+ * Rules above and below the table are always single
+ * and have an additional plus at the beginning and end.
+ * For double frames, this function is called twice,
+ * and the outer one does not have crossings.
+ */

 static void
 static void

-tbl_hframe(struct termp *tp, const struct tbl_span *sp)
+tbl_hframe(struct termp *tp, const struct tbl_span *sp, int outer)

 {
        const struct tbl_head *hp;
 {
        const struct tbl_head *hp;

-       size_t           width;
-
-       if ( ! (TBL_OPT_BOX & sp->tbl->opts || 
-                       TBL_OPT_DBOX & sp->tbl->opts))
-               return;
-
-       /* 
-        * Print out the horizontal part of a frame or double frame.  A
-        * double frame has an unbroken `-' outer line the width of the
-        * table, bordered by `+'.  The frame (or inner frame, in the
-        * case of the double frame) is a `-' bordered by `+' and broken
-        * by `+' whenever a span is encountered.
-        */
-
-       if (TBL_OPT_DBOX & sp->tbl->opts) {
-               term_word(tp, "+");
-               for (hp = sp->head; hp; hp = hp->next) {
-                       width = tp->tbl.cols[hp->ident].width;
-                       tbl_char(tp, '-', width);
-               }
-               term_word(tp, "+");
-               term_flushln(tp);
-       }

 
        term_word(tp, "+");
 
        term_word(tp, "+");

-       for (hp = sp->head; hp; hp = hp->next) {
-               width = tp->tbl.cols[hp->ident].width;
-               switch (hp->pos) {
-               case (TBL_HEAD_DATA):
-                       tbl_char(tp, '-', width);
-                       break;
-               default:
-                       tbl_char(tp, '+', width);
-                       break;
-               }
-       }
+       for (hp = sp->head; hp; hp = hp->next)
+               tbl_char(tp,
+                   outer || TBL_HEAD_DATA == hp->pos ? '-' : '+',
+                   tbl_rulewidth(tp, hp));

        term_word(tp, "+");
        term_flushln(tp);
 }
        term_word(tp, "+");
        term_flushln(tp);
 }


@@ -333,14 +350,6 @@ tbl_vrule(struct termp *tp, const struct tbl_head *hp)
        }
 }
 
        }
 }
 

-static void
-tbl_vframe(struct termp *tp, const struct tbl *tbl)
-{
-
-       if (TBL_OPT_BOX & tbl->opts || TBL_OPT_DBOX & tbl->opts)
-               term_word(tp, "|");
-}
-

 static void
 tbl_char(struct termp *tp, char c, size_t len)
 {
 static void
 tbl_char(struct termp *tp, char c, size_t len)
 {


@@ -360,37 +369,35 @@ static void
 tbl_literal(struct termp *tp, const struct tbl_dat *dp, 
                const struct roffcol *col)
 {
 tbl_literal(struct termp *tp, const struct tbl_dat *dp, 
                const struct roffcol *col)
 {

-       size_t           padl, padr, ssz;
-
-       padl = padr = 0;
+       size_t           len, padl, padr;

 
        assert(dp->string);
 
        assert(dp->string);

-
-       ssz = term_len(tp, 1);
+       len = term_strlen(tp, dp->string);
+       padr = col->width > len ? col->width - len : 0;
+       padl = 0;

 
        switch (dp->layout->pos) {
        case (TBL_CELL_LONG):
 
        switch (dp->layout->pos) {
        case (TBL_CELL_LONG):

-               padl = ssz;
-               padr = col->width - term_strlen(tp, dp->string) - ssz;
+               padl = term_len(tp, 1);
+               padr = padr > padl ? padr - padl : 0;

                break;
        case (TBL_CELL_CENTRE):
                break;
        case (TBL_CELL_CENTRE):

-               padr = col->width - term_strlen(tp, dp->string);
-               if (3 > padr)
+               if (2 > padr)

                        break;
                        break;

-               padl = (padr - 1) / 2;
+               padl = padr / 2;

                padr -= padl;
                break;
        case (TBL_CELL_RIGHT):
                padr -= padl;
                break;
        case (TBL_CELL_RIGHT):

-               padl = col->width - term_strlen(tp, dp->string);
+               padl = padr;
+               padr = 0;

                break;
        default:
                break;
        default:

-               padr = col->width - term_strlen(tp, dp->string);

                break;
        }
 
        tbl_char(tp, ASCII_NBRSP, padl);
        term_word(tp, dp->string);
                break;
        }
 
        tbl_char(tp, ASCII_NBRSP, padl);
        term_word(tp, dp->string);

-       tbl_char(tp, ASCII_NBRSP, padr + 2);
+       tbl_char(tp, ASCII_NBRSP, padr);

 }
 
 static void
 }
 
 static void


@@ -427,13 +434,11 @@ tbl_number(struct termp *tp, const struct tbl *tbl,
        } else
                d = sz + psz;
 
        } else
                d = sz + psz;
 

-       sz += term_len(tp, 2);
-       d += term_len(tp, 1);
-

        padl = col->decimal - d;
 
        tbl_char(tp, ASCII_NBRSP, padl);
        term_word(tp, dp->string);
        padl = col->decimal - d;
 
        tbl_char(tp, ASCII_NBRSP, padl);
        term_word(tp, dp->string);

-       tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);
+       if (col->width > sz + padl)
+               tbl_char(tp, ASCII_NBRSP, col->width - sz - padl);

 }
 
 }