Switch on the `TS' documentation in roff.7. As per off-line discussion,

[mandoc.git] / tbl_term.c

diff --git a/tbl_term.c b/tbl_term.c
index 5899758536686c580a54cbc277f7cf73cbbfaeee..74f00ad95410737e0d2282e72a0b2d91a53f4266 100644 (file)
--- a/tbl_term.c
+++ b/tbl_term.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_term.c,v 1.3 2011/01/03 14:45:59 kristaps Exp $ */
+/*     $Id: tbl_term.c,v 1.6 2011/01/03 16:04:41 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -72,6 +72,18 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
        const struct tbl_head *hp;
        const struct tbl_dat *dp;
 
+       /* Inhibit printing of spaces: we do padding ourselves. */
+
+       tp->flags |= TERMP_NONOSPACE;
+       tp->flags |= TERMP_NOSPACE;
+
+       /*
+        * The first time we're invoked for a given table block, create
+        * the termp_tbl structure.  This contains the column
+        * configuration for the entire table, e.g., table-wide column
+        * width, decimal point, etc.
+        */
+
        if (TBL_SPAN_FIRST & sp->flags) {
                assert(NULL == tp->tbl);
                tp->tbl = calloc
@@ -81,52 +93,63 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
                        exit(EXIT_FAILURE);
                }
                tbl_calc(tp, sp);
+
+               /* Flush out any preceding data. */
                term_flushln(tp);
        }
 
+       /* Horizontal frame at the start of boxed tables. */
+
        if (TBL_SPAN_FIRST & sp->flags)
                tbl_hframe(tp, sp);
 
-       tp->flags |= TERMP_NONOSPACE;
-       tp->flags |= TERMP_NOSPACE;
+       /* Vertical frame at the start of each row. */
 
        tbl_vframe(tp, sp->tbl);
 
+       /*
+        * Now print the actual data itself depending on the span type.
+        * Spanner spans get a horizontal rule; data spanners have their
+        * data printed by matching data to header.
+        */
+
        switch (sp->pos) {
        case (TBL_SPAN_HORIZ):
                /* FALLTHROUGH */
        case (TBL_SPAN_DHORIZ):
                tbl_hrule(tp, sp);
-               tbl_vframe(tp, sp->tbl);
-               term_newln(tp);
-               goto end;
-       default:
                break;
-       }
+       case (TBL_SPAN_DATA):
+               /* Iterate over template headers. */
+               dp = sp->first;
+               for (hp = sp->head; hp; hp = hp->next) {
+                       switch (hp->pos) {
+                       case (TBL_HEAD_VERT):
+                               /* FALLTHROUGH */
+                       case (TBL_HEAD_DVERT):
+                               tbl_spanner(tp, hp);
+                               continue;
+                       case (TBL_HEAD_DATA):
+                               break;
+                       }
+                       tbl_data(tp, sp->tbl, dp, 
+                               &tp->tbl[hp->ident]);
 
-       dp = sp->first;
-       for (hp = sp->head; hp; hp = hp->next) {
-               switch (hp->pos) {
-               case (TBL_HEAD_VERT):
-                       /* FALLTHROUGH */
-               case (TBL_HEAD_DVERT):
-                       tbl_spanner(tp, hp);
-                       break;
-               case (TBL_HEAD_DATA):
-                       tbl_data(tp, sp->tbl, dp, &tp->tbl[hp->ident]);
+                       /* Go to the next data cell. */
                        if (dp)
                                dp = dp->next;
-                       break;
-               default:
-                       abort();
-                       /* NOTREACHED */
                }
+               break;
        }
 
        tbl_vframe(tp, sp->tbl);
        term_flushln(tp);
 
-end:
+       /*
+        * If we're the last row, clean up after ourselves: clear the
+        * existing table configuration and set it to NULL.
+        */
+
        if (TBL_SPAN_LAST & sp->flags) {
                tbl_hframe(tp, sp);
                assert(tp->tbl);
@@ -251,6 +274,7 @@ tbl_data(struct termp *tp, const struct tbl *tbl,
        case (TBL_CELL_HORIZ):
                /* FALLTHROUGH */
        case (TBL_CELL_DHORIZ):
+               /* FIXME: THIS IS WRONG. */
                tbl_data_spanner(tp, dp, tbp);
                break;
        case (TBL_CELL_LONG):
@@ -374,26 +398,31 @@ tbl_data_number(struct termp *tp, const struct tbl *tbl,
                const struct tbl_dat *dp,
                const struct termp_tbl *tblp)
 {
-       char            *decp;
-       int              d, padl, sz;
+       char            *decp, buf[2];
+       int              d, padl, sz, psz, ssz, i;
 
        /*
         * See calc_data_number().  Left-pad by taking the offset of our
         * and the maximum decimal; right-pad by the remaining amount.
         */
 
-       sz = (int)strlen(dp->string);
+       sz = term_strlen(tp, dp->string);
+       psz = term_strlen(tp, ".");
 
-       if (NULL == (decp = strchr(dp->string, tbl->decimal))) {
-               d = sz + 1;
-       } else {
-               d = (int)(decp - dp->string) + 1;
-       }
+       if (NULL != (decp = strchr(dp->string, tbl->decimal))) {
+               buf[1] = '\0';
+               for (ssz = i = 0; decp != &dp->string[i]; i++) {
+                       buf[0] = dp->string[i];
+                       ssz += term_strlen(tp, buf);
+               }
+               d = ssz + psz;
+       } else
+               d = sz + psz;
 
        assert(d <= tblp->decimal);
        assert(sz - d <= tblp->width - tblp->decimal);
 
-       padl = tblp->decimal - d + 1;
+       padl = tblp->decimal - d + term_len(tp, 1);
        assert(tblp->width - sz - padl);
 
        tbl_char(tp, ASCII_NBRSP, padl);
@@ -479,8 +508,8 @@ static void
 tbl_calc_data_number(struct termp *tp, const struct tbl *tbl, 
                const struct tbl_dat *dp, struct termp_tbl *tblp)
 {
-       int              sz, d;
-       char            *cp;
+       int              sz, d, psz, i, ssz;
+       char            *cp, buf[2];
 
        /*
         * First calculate number width and decimal place (last + 1 for
@@ -494,14 +523,20 @@ tbl_calc_data_number(struct termp *tp, const struct tbl *tbl,
        /* TODO: use spacing modifier. */
 
        assert(dp->string);
-       sz = (int)strlen(dp->string);
+       sz = term_strlen(tp, dp->string);
+       psz = term_strlen(tp, ".");
 
-       if (NULL == (cp = strchr(dp->string, tbl->decimal)))
-               d = sz + 1;
-       else
-               d = (int)(cp - dp->string) + 1;
+       if (NULL != (cp = strchr(dp->string, tbl->decimal))) {
+               buf[1] = '\0';
+               for (ssz = i = 0; cp != &dp->string[i]; i++) {
+                       buf[0] = dp->string[i];
+                       ssz += term_strlen(tp, buf);
+               }
+               d = ssz + psz;
+       } else
+               d = sz + psz;
 
-       sz += 2;
+       sz += term_len(tp, 2);
 
        if (tblp->decimal > d) {
                sz += tblp->decimal - d;