From fa547cebe06d42ee136cd3db4c7459b4d8d5d733 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Thu, 13 Jan 2011 14:30:13 +0000 Subject: Change how -Thtml behaves with tables: use multiple rows, with widths set by COL, until an external macro is encountered. At this point in time, close out the table and process the macro. When the first table row is again re-encountered, re-start the table. This requires a bit of tracking added to "struct html", but the change is very small and follows the logic of meta-fonts. This all follows a bug-report by joerg@. --- tbl_html.c | 107 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 45 deletions(-) (limited to 'tbl_html.c') diff --git a/tbl_html.c b/tbl_html.c index ebad7c77..68d3f9c5 100644 --- a/tbl_html.c +++ b/tbl_html.c @@ -1,4 +1,4 @@ -/* $Id: tbl_html.c,v 1.6 2011/01/11 14:12:01 kristaps Exp $ */ +/* $Id: tbl_html.c,v 1.7 2011/01/13 14:30:13 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -27,6 +27,7 @@ #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 *); @@ -46,89 +47,105 @@ 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 roffsu su; - struct roffcol *col; + 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; - /* 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); - } + tt = print_otag(h, TAG_TR, 0, NULL); switch (sp->pos) { case (TBL_SPAN_HORIZ): /* FALLTHROUGH */ case (TBL_SPAN_DHORIZ): + PAIR_INIT(&tag, ATTR_COLSPAN, "0"); + print_otag(h, TAG_TD, 1, &tag); break; default: - PAIR_CLASS_INIT(&tag, "tbl"); - print_otag(h, TAG_TABLE, 1, &tag); - print_otag(h, TAG_TR, 0, NULL); - - /* Iterate over template headers. */ - 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): - break; - } - - /* - * For the time being, use the simplest possible - * table styling: setting the widths of data - * columns. - */ - - 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); - - if (dp) { - switch (dp->layout->pos) { - case (TBL_CELL_DOWN): - break; - default: - if (NULL == dp->string) - break; - print_text(h, dp->string); + if (NULL == dp) break; - } + if (TBL_CELL_DOWN != dp->layout->pos) + if (dp->string) + print_text(h, dp->string); dp = dp->next; + break; } - - print_tagq(h, tt); } break; } - h->flags &= ~HTML_NONOSPACE; + print_tagq(h, tt); - /* Close out column specifiers on the last span. */ + h->flags &= ~HTML_NONOSPACE; if (TBL_SPAN_LAST & sp->flags) { assert(h->tbl.cols); free(h->tbl.cols); h->tbl.cols = NULL; + print_tblclose(h); } + } -- cgit v1.2.3