Back out lorder, which doesn't seem necessary (?). I think this means all

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index e3c710dc5705946daf0fcde4674a8cd1a1730715..8e7dc05de0db4613fcb28ca093f9813d0df64698 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,6 +1,6 @@
-/*     $Id: tbl_html.c,v 1.1 2011/01/04 10:29:41 kristaps Exp $ */
+/*     $Id: tbl_html.c,v 1.9 2011/09/18 14:14:15 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -27,46 +27,125 @@
 #include "out.h"
 #include "html.h"
 
+static void     html_tblopen(struct html *, const struct tbl_span *);
+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));
+}
+
+static void
+html_tblopen(struct html *h, const struct tbl_span *sp)
+{
+       const struct tbl_head *hp;
+       struct htmlpair  tag;
+       struct roffsu    su;
+       struct roffcol  *col;
+
+       if (TBL_SPAN_FIRST & sp->flags) {
+               h->tbl.len = html_tbl_len;
+               h->tbl.slen = html_tbl_strlen;
+               tblcalc(&h->tbl, sp);
+       }
+
+       assert(NULL == h->tblt);
+       PAIR_CLASS_INIT(&tag, "tbl");
+       h->tblt = print_otag(h, TAG_TABLE, 1, &tag);
+
+       for (hp = sp->head; hp; hp = hp->next) {
+               bufinit(h);
+               col = &h->tbl.cols[hp->ident];
+               SCALE_HS_INIT(&su, col->width);
+               bufcat_su(h, "width", &su);
+               PAIR_STYLE_INIT(&tag, h);
+               print_otag(h, TAG_COL, 1, &tag);
+       }
+
+       print_otag(h, TAG_TBODY, 0, NULL);
+}
+
+void
+print_tblclose(struct html *h)
+{
+
+       assert(h->tblt);
+       print_tagq(h, h->tblt);
+       h->tblt = NULL;
+}
+
 void
 print_tbl(struct html *h, const struct tbl_span *sp)
 {
        const struct tbl_head *hp;
        const struct tbl_dat *dp;
-       struct tag       *tt;
+       struct htmlpair  tag;
+       struct tag      *tt;
+
+       /* Inhibit printing of spaces: we do padding ourselves. */
+
+       if (NULL == h->tblt)
+               html_tblopen(h, sp);
+
+       assert(h->tblt);
+
+       h->flags |= HTML_NONOSPACE;
+       h->flags |= HTML_NOSPACE;
+
+       tt = print_otag(h, TAG_TR, 0, NULL);
 
        switch (sp->pos) {
        case (TBL_SPAN_HORIZ):
                /* FALLTHROUGH */
        case (TBL_SPAN_DHORIZ):
-               return;
+               PAIR_INIT(&tag, ATTR_COLSPAN, "0");
+               print_otag(h, TAG_TD, 1, &tag);
+               break;
        default:
+               dp = sp->first;
+               for (hp = sp->head; hp; hp = hp->next) {
+                       print_stagq(h, tt);
+                       print_otag(h, TAG_TD, 0, NULL);
+
+                       switch (hp->pos) {
+                       case (TBL_HEAD_VERT):
+                               /* FALLTHROUGH */
+                       case (TBL_HEAD_DVERT):
+                               continue;
+                       case (TBL_HEAD_DATA):
+                               if (NULL == dp)
+                                       break;
+                               if (TBL_CELL_DOWN != dp->layout->pos)
+                                       if (dp->string)
+                                               print_text(h, dp->string);
+                               dp = dp->next;
+                               break;
+                       }
+               }
                break;
        }
 
-       /* Inhibit printing of spaces: we do padding ourselves. */
-
-       h->flags |= HTML_NONOSPACE;
-       h->flags |= HTML_NOSPACE;
+       print_tagq(h, tt);
 
-       print_otag(h, TAG_TABLE, 0, NULL);
-       print_otag(h, TAG_TR, 0, NULL);
+       h->flags &= ~HTML_NONOSPACE;
 
-       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) {
-                       print_text(h, dp->string);
-                       dp = dp->next;
-               }
-               print_tagq(h, tt);
+       if (TBL_SPAN_LAST & sp->flags) {
+               assert(h->tbl.cols);
+               free(h->tbl.cols);
+               h->tbl.cols = NULL;
+               print_tblclose(h);
        }
-       h->flags &= ~HTML_NONOSPACE;
+
 }