Always print <table> column widths in -T[x]html;

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index bf176391be15819ccc7bd23aa52131c5812befb7..09314270ff75ad1195f8cd6ed1c307f564cc6fd3 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.179 2011/10/05 21:35:17 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.180 2011/10/09 22:10:53 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -497,14 +497,11 @@ mdoc_root_post(MDOC_ARGS)
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
        PAIR_CLASS_INIT(&tag[1], "foot");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-               t = print_otag(h, TAG_TABLE, 3, tag);
-               PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
-               print_otag(h, TAG_COL, 1, tag);
-               print_otag(h, TAG_COL, 1, tag);
-       } else
-               t = print_otag(h, TAG_TABLE, 2, tag);
+       PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+       t = print_otag(h, TAG_TABLE, 3, tag);
+       PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);
 
        t = print_otag(h, TAG_TBODY, 0, NULL);
 
@@ -512,17 +509,12 @@ mdoc_root_post(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag[0], "foot-date");
        print_otag(h, TAG_TD, 1, tag);
-
        print_text(h, m->date);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "foot-os");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
-
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+       print_otag(h, TAG_TD, 2, tag);
        print_text(h, m->os);
        print_tagq(h, t);
 }
@@ -548,15 +540,12 @@ mdoc_root_pre(MDOC_ARGS)
 
        PAIR_SUMMARY_INIT(&tag[0], "Document Header");
        PAIR_CLASS_INIT(&tag[1], "head");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-               t = print_otag(h, TAG_TABLE, 3, tag);
-               PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
-               print_otag(h, TAG_COL, 1, tag);
-               print_otag(h, TAG_COL, 1, tag);
-               print_otag(h, TAG_COL, 1, tag);
-       } else
-               t = print_otag(h, TAG_TABLE, 2, tag);
+       PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+       t = print_otag(h, TAG_TABLE, 3, tag);
+       PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);
+       print_otag(h, TAG_COL, 1, tag);
 
        print_otag(h, TAG_TBODY, 0, NULL);
 
@@ -564,27 +553,18 @@ mdoc_root_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag[0], "head-ltitle");
        print_otag(h, TAG_TD, 1, tag);
-
        print_text(h, title);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-vol");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
-
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
+       print_otag(h, TAG_TD, 2, tag);
        print_text(h, b);
        print_stagq(h, tt);
 
        PAIR_CLASS_INIT(&tag[0], "head-rtitle");
-       if (NULL == h->style) {
-               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
-               print_otag(h, TAG_TD, 2, tag);
-       } else 
-               print_otag(h, TAG_TD, 1, tag);
-
+       PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+       print_otag(h, TAG_TD, 2, tag);
        print_text(h, title);
        print_tagq(h, t);
        return(1);