more renaming from mdocml to mandoc

[mandoc.git] / tbl_term.c

diff --git a/tbl_term.c b/tbl_term.c
index 797cfbe78e3115b0c4f4b73cc2251fa077e5b205..fd03b81303f90d237abc0e3acc1db292271c56f8 100644 (file)
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_term.c,v 1.49 2017/06/12 20:45:18 schwarze Exp $ */
+/*     $Id: tbl_term.c,v 1.56 2017/07/08 13:43:15 schwarze Exp $ */

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


@@ -28,11 +28,15 @@
 #include "out.h"
 #include "term.h"
 
 #include "out.h"
 #include "term.h"
 

+#define        IS_HORIZ(cp)    ((cp)->pos == TBL_CELL_HORIZ || \
+                        (cp)->pos == TBL_CELL_DHORIZ)
+

 static size_t  term_tbl_len(size_t, void *);
 static size_t  term_tbl_strlen(const char *, void *);
 static size_t  term_tbl_sulen(const struct roffsu *, void *);
 static void    tbl_char(struct termp *, char, size_t);
 static void    tbl_data(struct termp *, const struct tbl_opts *,
 static size_t  term_tbl_len(size_t, void *);
 static size_t  term_tbl_strlen(const char *, void *);
 static size_t  term_tbl_sulen(const struct roffsu *, void *);
 static void    tbl_char(struct termp *, char, size_t);
 static void    tbl_data(struct termp *, const struct tbl_opts *,

+                       const struct tbl_cell *,

                        const struct tbl_dat *,
                        const struct roffcol *);
 static void    tbl_literal(struct termp *, const struct tbl_dat *,
                        const struct tbl_dat *,
                        const struct roffcol *);
 static void    tbl_literal(struct termp *, const struct tbl_dat *,


@@ -47,7 +51,7 @@ static        void    tbl_word(struct termp *, const struct tbl_dat *);
 static size_t
 term_tbl_sulen(const struct roffsu *su, void *arg)
 {
 static size_t
 term_tbl_sulen(const struct roffsu *su, void *arg)
 {

-       return term_hspan((const struct termp *)arg, su) / 24;
+       return term_hen((const struct termp *)arg, su);

 }
 
 static size_t
 }
 
 static size_t


@@ -65,7 +69,7 @@ term_tbl_len(size_t sz, void *arg)
 void
 term_tbl(struct termp *tp, const struct tbl_span *sp)
 {
 void
 term_tbl(struct termp *tp, const struct tbl_span *sp)
 {

-       const struct tbl_cell   *cp;
+       const struct tbl_cell   *cp, *cpn, *cpp;

        const struct tbl_dat    *dp;
        static size_t            offset;
        size_t                   coloff, tsz;
        const struct tbl_dat    *dp;
        static size_t            offset;
        size_t                   coloff, tsz;


@@ -89,15 +93,28 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 
                tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin);
 
 
                tblcalc(&tp->tbl, sp, tp->tcol->offset, tp->tcol->rmargin);
 

+               /* Tables leak .ta settings to subsequent text. */
+
+               term_tab_set(tp, NULL);
+               coloff = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ||
+                   sp->opts->lvert;
+               for (ic = 0; ic < sp->opts->cols; ic++) {
+                       coloff += tp->tbl.cols[ic].width;
+                       term_tab_iset(coloff);
+                       coloff += tp->tbl.cols[ic].spacing;
+               }
+

                /* Center the table as a whole. */
 
                offset = tp->tcol->offset;
                if (sp->opts->opts & TBL_OPT_CENTRE) {
                        tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)
                            ? 2 : !!sp->opts->lvert + !!sp->opts->rvert;
                /* Center the table as a whole. */
 
                offset = tp->tcol->offset;
                if (sp->opts->opts & TBL_OPT_CENTRE) {
                        tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)
                            ? 2 : !!sp->opts->lvert + !!sp->opts->rvert;

-                       for (ic = 0; ic < sp->opts->cols; ic++)
-                               tsz += tp->tbl.cols[ic].width + 3;
-                       tsz -= 3;
+                       for (ic = 0; ic + 1 < sp->opts->cols; ic++)
+                               tsz += tp->tbl.cols[ic].width +
+                                   tp->tbl.cols[ic].spacing;
+                       if (sp->opts->cols)
+                               tsz += tp->tbl.cols[sp->opts->cols - 1].width;

                        if (offset + tsz > tp->tcol->rmargin)
                                tsz -= 1;
                        tp->tcol->offset = offset + tp->tcol->rmargin > tsz ?
                        if (offset + tsz > tp->tcol->rmargin)
                                tsz -= 1;
                        tp->tcol->offset = offset + tp->tcol->rmargin > tsz ?


@@ -107,9 +124,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                /* Horizontal frame at the start of boxed tables. */
 
                if (sp->opts->opts & TBL_OPT_DBOX)
                /* Horizontal frame at the start of boxed tables. */
 
                if (sp->opts->opts & TBL_OPT_DBOX)

-                       tbl_hrule(tp, sp, 2);
+                       tbl_hrule(tp, sp, 3);

                if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))
                if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))

-                       tbl_hrule(tp, sp, 1);
+                       tbl_hrule(tp, sp, 2);

        }
 
        /* Set up the columns. */
        }
 
        /* Set up the columns. */


@@ -144,9 +161,8 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                        }
                        coloff += tp->tbl.cols[ic].width;
                        tp->tcol->rmargin = coloff;
                        }
                        coloff += tp->tbl.cols[ic].width;
                        tp->tcol->rmargin = coloff;

-                       coloff++;

                        if (ic + 1 < sp->opts->cols)
                        if (ic + 1 < sp->opts->cols)

-                               coloff += 2;
+                               coloff += tp->tbl.cols[ic].spacing;

                        if (spans) {
                                spans--;
                                continue;
                        if (spans) {
                                spans--;
                                continue;


@@ -154,17 +170,15 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                        if (dp == NULL)
                                continue;
                        spans = dp->spans;
                        if (dp == NULL)
                                continue;
                        spans = dp->spans;

-                       dp = dp->next;
+                       if (ic || sp->layout->first->pos != TBL_CELL_SPAN)
+                               dp = dp->next;

                }
 
                /* Set up a column for a right vertical frame. */
 
                tp->tcol++;
                }
 
                /* Set up a column for a right vertical frame. */
 
                tp->tcol++;

-               tp->tcol->offset = coloff;
-               if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ||
-                   sp->opts->rvert)
-                       coloff++;
-               tp->tcol->rmargin = coloff;
+               tp->tcol->offset = coloff + 1;
+               tp->tcol->rmargin = tp->maxrmargin;

 
                /* Spans may have reduced the number of columns. */
 
 
                /* Spans may have reduced the number of columns. */
 


@@ -173,20 +187,26 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                /* Fill the buffers for all data columns. */
 
                tp->tcol = tp->tcols;
                /* Fill the buffers for all data columns. */
 
                tp->tcol = tp->tcols;

+               cp = cpn = sp->layout->first;

                dp = sp->first;
                spans = 0;
                for (ic = 0; ic < sp->opts->cols; ic++) {
                dp = sp->first;
                spans = 0;
                for (ic = 0; ic < sp->opts->cols; ic++) {

+                       if (cpn != NULL) {
+                               cp = cpn;
+                               cpn = cpn->next;
+                       }

                        if (spans) {
                                spans--;
                                continue;
                        }
                        tp->tcol++;
                        tp->col = 0;
                        if (spans) {
                                spans--;
                                continue;
                        }
                        tp->tcol++;
                        tp->col = 0;

-                       tbl_data(tp, sp->opts, dp, tp->tbl.cols + ic);
+                       tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic);

                        if (dp == NULL)
                                continue;
                        spans = dp->spans;
                        if (dp == NULL)
                                continue;
                        spans = dp->spans;

-                       dp = dp->next;
+                       if (cp->pos != TBL_CELL_SPAN)
+                               dp = dp->next;

                }
                break;
        }
                }
                break;
        }


@@ -197,9 +217,13 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                tp->tcol = tp->tcols;
                fc = '\0';
                if (sp->layout->vert ||
                tp->tcol = tp->tcols;
                fc = '\0';
                if (sp->layout->vert ||

-                   (sp->prev != NULL && sp->prev->layout->vert) ||
+                   (sp->next != NULL && sp->next->layout->vert &&
+                    sp->next->pos == TBL_SPAN_DATA) ||
+                   (sp->prev != NULL && sp->prev->layout->vert &&
+                    (horiz || (IS_HORIZ(sp->layout->first) &&
+                      !IS_HORIZ(sp->prev->layout->first)))) ||

                    sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))
                    sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))

-                       fc = horiz ? '+' : '|';
+                       fc = horiz || IS_HORIZ(sp->layout->first) ? '+' : '|';

                else if (horiz && sp->opts->lvert)
                        fc = '-';
                if (fc != '\0') {
                else if (horiz && sp->opts->lvert)
                        fc = '-';
                if (fc != '\0') {


@@ -216,44 +240,144 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                        term_flushln(tp);
                } else {
                        cp = sp->layout->first;
                        term_flushln(tp);
                } else {
                        cp = sp->layout->first;

+                       cpn = sp->next == NULL ? NULL :
+                           sp->next->layout->first;
+                       cpp = sp->prev == NULL ? NULL :
+                           sp->prev->layout->first;

                        dp = sp->first;
                        spans = 0;
                        for (ic = 0; ic < sp->opts->cols; ic++) {
                        dp = sp->first;
                        spans = 0;
                        for (ic = 0; ic < sp->opts->cols; ic++) {

-                               if (spans == 0) {
-                                       tp->tcol++;
-                                       if (dp != NULL) {
-                                               spans = dp->spans;
-                                               dp = dp->next;
-                                       }
-                                       if (tp->tcol->col < tp->tcol->lastcol)
-                                               term_flushln(tp);
-                                       if (tp->tcol->col < tp->tcol->lastcol)
-                                               more = 1;
-                                       if (tp->tcol + 1 ==
-                                           tp->tcols + tp->lasttcol)
-                                               continue;
-                               } else
-                                       spans--;

 
 

-                               /* Vertical frames between data cells. */
+                               /*
+                                * Figure out whether to print a
+                                * vertical line after this cell
+                                * and advance to next layout cell.
+                                */

 
                                if (cp != NULL) {
                                        vert = cp->vert;
 
                                if (cp != NULL) {
                                        vert = cp->vert;

-                                       cp = cp->next;
-                               } else
+                                       switch (cp->pos) {
+                                       case TBL_CELL_HORIZ:
+                                               fc = '-';
+                                               break;
+                                       case TBL_CELL_DHORIZ:
+                                               fc = '=';
+                                               break;
+                                       default:
+                                               fc = ' ';
+                                               break;
+                                       }
+                               } else {

                                        vert = 0;
                                        vert = 0;

-                               if (sp->opts->opts & TBL_OPT_ALLBOX)
+                                       fc = ' ';
+                               }
+                               if (cpp != NULL) {
+                                       if (vert == 0 &&
+                                           cp != NULL &&
+                                           ((IS_HORIZ(cp) &&
+                                             !IS_HORIZ(cpp)) ||
+                                            (cp->next != NULL &&
+                                             cpp->next != NULL &&
+                                             IS_HORIZ(cp->next) &&
+                                             !IS_HORIZ(cpp->next))))
+                                               vert = cpp->vert;
+                                       cpp = cpp->next;
+                               }
+                               if (vert == 0 &&
+                                   sp->opts->opts & TBL_OPT_ALLBOX)

                                        vert = 1;
                                        vert = 1;

-                               if (vert == 0)
+                               if (cpn != NULL) {
+                                       if (vert == 0)
+                                               vert = cpn->vert;
+                                       cpn = cpn->next;
+                               }
+                               if (cp != NULL)
+                                       cp = cp->next;
+
+                               /*
+                                * Skip later cells in a span,
+                                * figure out whether to start a span,
+                                * and advance to next data cell.
+                                */
+
+                               if (spans) {
+                                       spans--;
+                                       continue;
+                               }
+                               if (dp != NULL) {
+                                       spans = dp->spans;
+                                       if (ic || sp->layout->first->pos
+                                           != TBL_CELL_SPAN)
+                                               dp = dp->next;
+                               }
+
+                               /*
+                                * Print one line of text in the cell
+                                * and remember whether there is more.
+                                */
+
+                               tp->tcol++;
+                               if (tp->tcol->col < tp->tcol->lastcol)
+                                       term_flushln(tp);
+                               if (tp->tcol->col < tp->tcol->lastcol)
+                                       more = 1;
+
+                               /*
+                                * Vertical frames between data cells,
+                                * but not after the last column.
+                                */
+
+                               if (fc == ' ' && ((vert == 0 &&
+                                    (cp == NULL || !IS_HORIZ(cp))) ||
+                                   tp->tcol + 1 == tp->tcols + tp->lasttcol))

                                        continue;
 
                                        continue;
 

-                               if (tp->tcol->rmargin + 1 > tp->viscol) {
+                               if (tp->viscol < tp->tcol->rmargin) {

                                        (*tp->advance)(tp, tp->tcol->rmargin
                                        (*tp->advance)(tp, tp->tcol->rmargin

-                                          + 1 - tp->viscol);
-                                       tp->viscol = tp->tcol->rmargin + 1;
+                                          - tp->viscol);
+                                       tp->viscol = tp->tcol->rmargin;

                                }
                                }

-                               while (vert--) {
-                                       (*tp->letter)(tp, '|');
+                               while (tp->viscol < tp->tcol->rmargin +
+                                   tp->tbl.cols[ic].spacing / 2) {
+                                       (*tp->letter)(tp, fc);
+                                       tp->viscol++;
+                               }
+
+                               if (tp->tcol + 1 == tp->tcols + tp->lasttcol)
+                                       continue;
+
+                               if (fc == ' ' && cp != NULL) {
+                                       switch (cp->pos) {
+                                       case TBL_CELL_HORIZ:
+                                               fc = '-';
+                                               break;
+                                       case TBL_CELL_DHORIZ:
+                                               fc = '=';
+                                               break;
+                                       default:
+                                               break;
+                                       }
+                               }
+                               if (tp->tbl.cols[ic].spacing) {
+                                       (*tp->letter)(tp, fc == ' ' ? '|' :
+                                           vert ? '+' : fc);
+                                       tp->viscol++;
+                               }
+
+                               if (fc != ' ') {
+                                       if (cp != NULL &&
+                                           cp->pos == TBL_CELL_HORIZ)
+                                               fc = '-';
+                                       else if (cp != NULL &&
+                                           cp->pos == TBL_CELL_DHORIZ)
+                                               fc = '=';
+                                       else
+                                               fc = ' ';
+                               }
+                               if (tp->tbl.cols[ic].spacing > 2 &&
+                                   (vert > 1 || fc != ' ')) {
+                                       (*tp->letter)(tp, fc == ' ' ? '|' :
+                                           vert > 1 ? '+' : fc);

                                        tp->viscol++;
                                }
                        }
                                        tp->viscol++;
                                }
                        }


@@ -262,14 +386,23 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                /* Print the vertical frame at the end of each row. */
 
                fc = '\0';
                /* Print the vertical frame at the end of each row. */
 
                fc = '\0';

-               if (sp->layout->last->vert ||
-                   (sp->prev != NULL && sp->prev->layout->last->vert) ||
+               if ((sp->layout->last->vert &&
+                    sp->layout->last->col + 1 == sp->opts->cols) ||
+                   (sp->next != NULL &&
+                    sp->next->layout->last->vert &&
+                    sp->next->layout->last->col + 1 == sp->opts->cols) ||
+                   (sp->prev != NULL &&
+                    sp->prev->layout->last->vert &&
+                    sp->prev->layout->last->col + 1 == sp->opts->cols &&
+                    (horiz || (IS_HORIZ(sp->layout->last) &&
+                     !IS_HORIZ(sp->prev->layout->last)))) ||

                    (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)))
                    (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)))

-                       fc = horiz ? '+' : '|';
+                       fc = horiz || IS_HORIZ(sp->layout->last) ? '+' : '|';

                else if (horiz && sp->opts->rvert)
                        fc = '-';
                if (fc != '\0') {
                else if (horiz && sp->opts->rvert)
                        fc = '-';
                if (fc != '\0') {

-                       if (horiz == 0) {
+                       if (horiz == 0 && (IS_HORIZ(sp->layout->last) == 0 ||
+                           sp->layout->last->col + 1 < sp->opts->cols)) {

                                tp->tcol++;
                                (*tp->advance)(tp,
                                    tp->tcol->offset > tp->viscol ?
                                tp->tcol++;
                                (*tp->advance)(tp,
                                    tp->tcol->offset > tp->viscol ?


@@ -282,8 +415,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
        } while (more);
 
        /*
        } while (more);
 
        /*

-        * If we're the last row, clean up after ourselves: clear the
-        * existing table configuration and set it to NULL.
+        * Clean up after this row.  If it is the last line
+        * of the table, print the box line and clean up
+        * column data; otherwise, print the allbox line.

         */
 
        term_setcol(tp, 1);
         */
 
        term_setcol(tp, 1);


@@ -291,18 +425,20 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
        tp->tcol->rmargin = tp->maxrmargin;
        if (sp->next == NULL) {
                if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
        tp->tcol->rmargin = tp->maxrmargin;
        if (sp->next == NULL) {
                if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {

-                       tbl_hrule(tp, sp, 1);
+                       tbl_hrule(tp, sp, 2);

                        tp->skipvsp = 1;
                }
                if (sp->opts->opts & TBL_OPT_DBOX) {
                        tp->skipvsp = 1;
                }
                if (sp->opts->opts & TBL_OPT_DBOX) {

-                       tbl_hrule(tp, sp, 2);
+                       tbl_hrule(tp, sp, 3);

                        tp->skipvsp = 2;
                }
                assert(tp->tbl.cols);
                free(tp->tbl.cols);
                tp->tbl.cols = NULL;
                tp->tcol->offset = offset;
                        tp->skipvsp = 2;
                }
                assert(tp->tbl.cols);
                free(tp->tbl.cols);
                tp->tbl.cols = NULL;
                tp->tcol->offset = offset;

-       } else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX)
+       } else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX &&
+           (sp->next == NULL || sp->next->pos == TBL_SPAN_DATA ||
+            sp->next->next != NULL))

                tbl_hrule(tp, sp, 1);
 
        tp->flags &= ~TERMP_NONOSPACE;
                tbl_hrule(tp, sp, 1);
 
        tp->flags &= ~TERMP_NONOSPACE;


@@ -311,41 +447,54 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 /*
  * Kinds of horizontal rulers:
  * 0: inside the table (single or double line with crossings)
 /*
  * Kinds of horizontal rulers:
  * 0: inside the table (single or double line with crossings)

- * 1: inner frame (single line with crossings and ends)
- * 2: outer frame (single line without crossings with ends)
+ * 1: inside the table (single or double line with crossings and ends)
+ * 2: inner frame (single line with crossings and ends)
+ * 3: outer frame (single line without crossings with ends)

  */
 static void
 tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind)
 {
  */
 static void
 tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind)
 {

-       const struct tbl_cell *c1, *c2;
+       const struct tbl_cell *cp, *cpn, *cpp;
+       const struct roffcol *col;

        int      vert;
        char     line, cross;
 
        int      vert;
        char     line, cross;
 

-       line = (kind == 0 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-';
-       cross = (kind < 2) ? '+' : '-';
+       line = (kind < 2 && TBL_SPAN_DHORIZ == sp->pos) ? '=' : '-';
+       cross = (kind < 3) ? '+' : '-';

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

-       c1 = sp->layout->first;
-       c2 = sp->prev == NULL ? NULL : sp->prev->layout->first;
-       if (c2 == c1)
-               c2 = NULL;
+       cp = sp->layout->first;
+       cpp = kind || sp->prev == NULL ? NULL : sp->prev->layout->first;
+       if (cpp == cp)
+               cpp = NULL;
+       cpn = kind > 1 || sp->next == NULL ? NULL : sp->next->layout->first;
+       if (cpn == cp)
+               cpn = NULL;

        for (;;) {
        for (;;) {

-               tbl_char(tp, line, tp->tbl.cols[c1->col].width + 1);
-               vert = c1->vert;
-               if ((c1 = c1->next) == NULL)
+               col = tp->tbl.cols + cp->col;
+               tbl_char(tp, line, col->width + col->spacing / 2);
+               vert = cp->vert;
+               if ((cp = cp->next) == NULL)

                         break;
                         break;

-               if (c2 != NULL) {
-                       if (vert < c2->vert)
-                               vert = c2->vert;
-                       c2 = c2->next;
+               if (cpp != NULL) {
+                       if (vert < cpp->vert)
+                               vert = cpp->vert;
+                       cpp = cpp->next;
+               }
+               if (cpn != NULL) {
+                       if (vert < cpn->vert)
+                               vert = cpn->vert;
+                       cpn = cpn->next;

                }
                if (sp->opts->opts & TBL_OPT_ALLBOX && !vert)
                        vert = 1;
                }
                if (sp->opts->opts & TBL_OPT_ALLBOX && !vert)
                        vert = 1;

-               if (vert)
-                       tbl_char(tp, cross, vert);
-               if (vert < 2)
-                       tbl_char(tp, line, 2 - vert);
+               if (col->spacing)
+                       tbl_char(tp, vert ? cross : line, 1);
+               if (col->spacing > 2)
+                       tbl_char(tp, vert > 1 ? cross : line, 1);
+               if (col->spacing > 4)
+                       tbl_char(tp, line, (col->spacing - 3) / 2);

        }
        if (kind) {
                term_word(tp, "+");
        }
        if (kind) {
                term_word(tp, "+");


@@ -355,18 +504,25 @@ tbl_hrule(struct termp *tp, const struct tbl_span *sp, int kind)
 
 static void
 tbl_data(struct termp *tp, const struct tbl_opts *opts,
 
 static void
 tbl_data(struct termp *tp, const struct tbl_opts *opts,

-       const struct tbl_dat *dp,
-       const struct roffcol *col)
+    const struct tbl_cell *cp, const struct tbl_dat *dp,
+    const struct roffcol *col)

 {
 {

-
-       if (dp == NULL) {
-               tbl_char(tp, ASCII_NBRSP, col->width);
+       switch (cp->pos) {
+       case TBL_CELL_HORIZ:
+               tbl_char(tp, '-', col->width);
+               return;
+       case TBL_CELL_DHORIZ:
+               tbl_char(tp, '=', col->width);

                return;
                return;

+       default:
+               break;

        }
 
        }
 

+       if (dp == NULL)
+               return;
+

        switch (dp->pos) {
        case TBL_DATA_NONE:
        switch (dp->pos) {
        case TBL_DATA_NONE:

-               tbl_char(tp, ASCII_NBRSP, col->width);

                return;
        case TBL_DATA_HORIZ:
        case TBL_DATA_NHORIZ:
                return;
        case TBL_DATA_HORIZ:
        case TBL_DATA_NHORIZ:


@@ -380,13 +536,7 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts,
                break;
        }
 
                break;
        }
 

-       switch (dp->layout->pos) {
-       case TBL_CELL_HORIZ:
-               tbl_char(tp, '-', col->width);
-               break;
-       case TBL_CELL_DHORIZ:
-               tbl_char(tp, '=', col->width);
-               break;
+       switch (cp->pos) {

        case TBL_CELL_LONG:
        case TBL_CELL_CENTRE:
        case TBL_CELL_LEFT:
        case TBL_CELL_LONG:
        case TBL_CELL_CENTRE:
        case TBL_CELL_LEFT:


@@ -397,7 +547,7 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts,
                tbl_number(tp, opts, dp, col);
                break;
        case TBL_CELL_DOWN:
                tbl_number(tp, opts, dp, col);
                break;
        case TBL_CELL_DOWN:

-               tbl_char(tp, ASCII_NBRSP, col->width);
+       case TBL_CELL_SPAN:

                break;
        default:
                abort();
                break;
        default:
                abort();