summaryrefslogtreecommitdiffstats
path: root/man_html.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-01-13 14:30:13 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-01-13 14:30:13 +0000
commit85474e8c235db9ab473084a381b03aeb8422a12d (patch)
tree0302ed33798c6aa009545379a6a14cddbc71c4b2 /man_html.c
parentb9b8f8cdfe53fa8d9f13f22beb2ec50f83a231d8 (diff)
downloadmandoc-85474e8c235db9ab473084a381b03aeb8422a12d.tar.gz
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@.
Diffstat (limited to 'man_html.c')
-rw-r--r--man_html.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/man_html.c b/man_html.c
index 8e489484..cad9fec7 100644
--- a/man_html.c
+++ b/man_html.c
@@ -216,18 +216,32 @@ print_man_node(MAN_ARGS)
print_otag(h, TAG_BR, 0, NULL);
return;
case (MAN_TBL):
+ /*
+ * This will take care of initialising all of the table
+ * state data for the first table, then tearing it down
+ * for the last one.
+ */
print_tbl(h, n->span);
return;
default:
/*
* Close out scope of font prior to opening a macro
- * scope. Assert that the metafont is on the top of the
- * stack (it's never nested).
+ * scope.
*/
if (HTMLFONT_NONE != h->metac) {
h->metal = h->metac;
h->metac = HTMLFONT_NONE;
}
+
+ /*
+ * Close out the current table, if it's open, and unset
+ * the "meta" table state. This will be reopened on the
+ * next table element.
+ */
+ if (h->tblt) {
+ print_tblclose(h);
+ t = h->tags.head;
+ }
if (mans[n->tok].pre)
child = (*mans[n->tok].pre)(m, n, mh, h);
break;