Restructured tbl_html() function so that we always clean up our columns.

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index cda22b0cba4477b8516c54ef830cd795bda6149a..7594dfc961e276d0b217f7dbfdb7728254f94c88 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_html.c,v 1.3 2011/01/05 13:00:11 kristaps Exp $ */
+/*     $Id: tbl_html.c,v 1.5 2011/01/06 12:31:39 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,6 +27,25 @@
 #include "out.h"
 #include "html.h"
 
+static size_t   html_tbl_len(size_t, void *);
+static size_t   html_tbl_strlen(const char *, void *);
+
+/* ARGSUSED */
+static size_t
+html_tbl_len(size_t sz, void *arg)
+{
+       
+       return(sz);
+}
+
+/* ARGSUSED */
+static size_t
+html_tbl_strlen(const char *p, void *arg)
+{
+
+       return(strlen(p));
+}
+
 void
 print_tbl(struct html *h, const struct tbl_span *sp)
 {
@@ -34,43 +53,74 @@ print_tbl(struct html *h, const struct tbl_span *sp)
        const struct tbl_dat *dp;
        struct tag      *tt;
        struct htmlpair  tag;
+       struct roffsu    su;
+       struct roffcol  *col;
+
+       /* Inhibit printing of spaces: we do padding ourselves. */
+
+       h->flags |= HTML_NONOSPACE;
+       h->flags |= HTML_NOSPACE;
+
+       /* First pass: calculate widths. */
+
+       if (TBL_SPAN_FIRST & sp->flags) {
+               h->tbl.len = html_tbl_len;
+               h->tbl.slen = html_tbl_strlen;
+               tblcalc(&h->tbl, sp);
+       }
 
        switch (sp->pos) {
        case (TBL_SPAN_HORIZ):
                /* FALLTHROUGH */
        case (TBL_SPAN_DHORIZ):
-               return;
-       default:
                break;
-       }
+       default:
+               PAIR_CLASS_INIT(&tag, "tbl");
+               print_otag(h, TAG_TABLE, 1, &tag);
+               print_otag(h, TAG_TR, 0, NULL);
 
-       /* Inhibit printing of spaces: we do padding ourselves. */
+               /* Iterate over template headers. */
 
-       h->flags |= HTML_NONOSPACE;
-       h->flags |= HTML_NOSPACE;
+               dp = sp->first;
+               for (hp = sp->head; hp; hp = hp->next) {
+                       switch (hp->pos) {
+                       case (TBL_HEAD_VERT):
+                               /* FALLTHROUGH */
+                       case (TBL_HEAD_DVERT):
+                               continue;
+                       case (TBL_HEAD_DATA):
+                               break;
+                       }
 
-       PAIR_CLASS_INIT(&tag, "tbl");
+                       /*
+                        * For the time being, use the simplest possible
+                        * table styling: setting the widths of data
+                        * columns.
+                        */
 
-       print_otag(h, TAG_TABLE, 1, &tag);
-       print_otag(h, TAG_TR, 0, NULL);
+                       col = &h->tbl.cols[hp->ident];
+                       SCALE_HS_INIT(&su, col->width);
+                       bufcat_su(h, "width", &su);
+                       PAIR_STYLE_INIT(&tag, h);
+                       tt = print_otag(h, TAG_TD, 1, &tag);
 
-       dp = sp->first;
-       for (hp = sp->head; hp; hp = hp->next) {
-               switch (hp->pos) {
-               case (TBL_HEAD_VERT):
-                       /* FALLTHROUGH */
-               case (TBL_HEAD_DVERT):
-                       continue;
-               case (TBL_HEAD_DATA):
-                       break;
-               }
-               tt = print_otag(h, TAG_TD, 0, NULL);
-               if (dp) {
-                       if (dp->string)
+                       if (dp && dp->string) 
                                print_text(h, dp->string);
-                       dp = dp->next;
+                       if (dp)
+                               dp = dp->next;
+
+                       print_tagq(h, tt);
                }
-               print_tagq(h, tt);
+               break;
        }
+
        h->flags &= ~HTML_NONOSPACE;
+
+       /* Close out column specifiers on the last span. */
+
+       if (TBL_SPAN_LAST & sp->flags) {
+               assert(h->tbl.cols);
+               free(h->tbl.cols);
+               h->tbl.cols = NULL;
+       }
 }