mdocml: First, add space for default styling for HTML5 (non-fragment)

[kristaps@mdocml.bsd.lv]

Log Message:
-----------
First, add space for default styling for HTML5 (non-fragment) output.
This uses a <style /> block right before the <link /> for the stylesheet.
Use this to kick out hardcoded header and footer table widths.

Modified Files:
--------------
    mdocml:
        html.c
        html.h
        man_html.c
        mdoc_html.c

Revision Data
-------------
Index: html.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/html.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lhtml.h -Lhtml.h -u -p -r1.55 -r1.56
--- html.h
+++ html.h
@@ -50,6 +50,7 @@ enum	htmltag {
 	TAG_I,
 	TAG_CODE,
 	TAG_SMALL,
+	TAG_STYLE,
 	TAG_MAX
 };
 
Index: man_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man_html.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -Lman_html.c -Lman_html.c -u -p -r1.97 -r1.98
--- man_html.c
+++ man_html.c
@@ -299,7 +299,7 @@ a2width(const struct man_node *n, struct
 static void
 man_root_pre(MAN_ARGS)
 {
-	struct htmlpair	 tag[3];
+	struct htmlpair	 tag[2];
 	struct tag	*t, *tt;
 	char		*title;
 
@@ -309,8 +309,7 @@ man_root_pre(MAN_ARGS)
 
 	PAIR_SUMMARY_INIT(&tag[0], "Document Header");
 	PAIR_CLASS_INIT(&tag[1], "head");
-	PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-	t = print_otag(h, TAG_TABLE, 3, tag);
+	t = print_otag(h, TAG_TABLE, 2, tag);
 	PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
 	print_otag(h, TAG_COL, 1, tag);
 	print_otag(h, TAG_COL, 1, tag);
@@ -343,13 +342,12 @@ man_root_pre(MAN_ARGS)
 static void
 man_root_post(MAN_ARGS)
 {
-	struct htmlpair	 tag[3];
+	struct htmlpair	 tag[2];
 	struct tag	*t, *tt;
 
 	PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
 	PAIR_CLASS_INIT(&tag[1], "foot");
-	PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-	t = print_otag(h, TAG_TABLE, 3, tag);
+	t = print_otag(h, TAG_TABLE, 2, tag);
 	PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
 	print_otag(h, TAG_COL, 1, tag);
 	print_otag(h, TAG_COL, 1, tag);
Index: html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/html.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -Lhtml.c -Lhtml.c -u -p -r1.164 -r1.165
--- html.c
+++ html.c
@@ -74,6 +74,7 @@ static	const struct htmldata htmltags[TA
 	{"i",		0 }, /* TAG_I */
 	{"code",	0 }, /* TAG_CODE */
 	{"small",	0 }, /* TAG_SMALL */
+	{"style",	HTML_CLRLINE}, /* TAG_STYLE */
 };
 
 static	const char	*const htmlattrs[ATTR_MAX] = {
@@ -193,10 +194,15 @@ void
 print_gen_head(struct html *h)
 {
 	struct htmlpair	 tag[4];
+	struct tag	*t;
 
 	tag[0].key = ATTR_CHARSET;
 	tag[0].val = "utf-8";
 	print_otag(h, TAG_META, 1, tag);
+
+	t = print_otag(h, TAG_STYLE, 0, NULL);
+	print_text(h, "table.head, table.foot { width: 100%; }\n");
+	print_tagq(h, t);
 
 	if (h->style) {
 		tag[0].key = ATTR_REL;
Index: mdoc_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_html.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.200 -r1.201
--- mdoc_html.c
+++ mdoc_html.c
@@ -484,13 +484,12 @@ print_mdoc_node(MDOC_ARGS)
 static void
 mdoc_root_post(MDOC_ARGS)
 {
-	struct htmlpair	 tag[3];
+	struct htmlpair	 tag[2];
 	struct tag	*t, *tt;
 
 	PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
 	PAIR_CLASS_INIT(&tag[1], "foot");
-	PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-	t = print_otag(h, TAG_TABLE, 3, tag);
+	t = print_otag(h, TAG_TABLE, 2, tag);
 	PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
 	print_otag(h, TAG_COL, 1, tag);
 	print_otag(h, TAG_COL, 1, tag);
@@ -514,7 +513,7 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag[3];
+	struct htmlpair	 tag[2];
 	struct tag	*t, *tt;
 	char		*volume, *title;
 
@@ -532,8 +531,7 @@ mdoc_root_pre(MDOC_ARGS)
 
 	PAIR_SUMMARY_INIT(&tag[0], "Document Header");
 	PAIR_CLASS_INIT(&tag[1], "head");
-	PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
-	t = print_otag(h, TAG_TABLE, 3, tag);
+	t = print_otag(h, TAG_TABLE, 2, tag);
 	PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
 	print_otag(h, TAG_COL, 1, tag);
 	print_otag(h, TAG_COL, 1, tag);
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv