===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.39
retrieving revision 1.43
diff -u -p -r1.39 -r1.43
--- mandoc/mdoc_html.c	2009/10/26 08:18:16	1.39
+++ mandoc/mdoc_html.c	2009/10/30 18:53:08	1.43
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.39 2009/10/26 08:18:16 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.43 2009/10/30 18:53:08 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,7 +19,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -456,7 +455,7 @@ print_mdoc_node(MDOC_ARGS)
 static void
 mdoc_root_post(MDOC_ARGS)
 {
-	struct htmlpair	 tag[2];
+	struct htmlpair	 tag[3];
 	struct tag	*t, *tt;
 	char		 b[DATESIZ];
 
@@ -471,7 +470,9 @@ mdoc_root_post(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag[0], "footer");
 	bufcat_style(h, "width", "100%");
 	PAIR_STYLE_INIT(&tag[1], h);
-	t = print_otag(h, TAG_TABLE, 2, tag);
+	PAIR_SUMMARY_INIT(&tag[2], "footer");
+
+	t = print_otag(h, TAG_TABLE, 3, tag);
 	tt = print_otag(h, TAG_TR, 0, NULL);
 
 	bufinit(h);
@@ -495,7 +496,7 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
-	struct htmlpair	 tag[2];
+	struct htmlpair	 tag[3];
 	struct tag	*t, *tt;
 	char		 b[BUFSIZ], title[BUFSIZ];
 
@@ -515,7 +516,10 @@ mdoc_root_pre(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag[0], "header");
 	bufcat_style(h, "width", "100%");
 	PAIR_STYLE_INIT(&tag[1], h);
-	t = print_otag(h, TAG_TABLE, 2, tag);
+	PAIR_SUMMARY_INIT(&tag[2], "header");
+
+	t = print_otag(h, TAG_TABLE, 3, tag);
+
 	tt = print_otag(h, TAG_TR, 0, NULL);
 
 	bufinit(h);
@@ -551,7 +555,7 @@ mdoc_sh_pre(MDOC_ARGS)
 {
 	struct htmlpair		 tag[2];
 	const struct mdoc_node	*nn;
-	char			 lbuf[BUFSIZ];
+	char			 buf[BUFSIZ];
 	struct roffsu		 su;
 
 	if (MDOC_BODY == n->type) {
@@ -578,11 +582,11 @@ mdoc_sh_pre(MDOC_ARGS)
 		return(1);
 	}
 
-	lbuf[0] = 0;
+	buf[0] = '\0';
 	for (nn = n->child; nn; nn = nn->next) {
-		(void)strlcat(lbuf, nn->string, BUFSIZ);
+		html_idcat(buf, nn->string, BUFSIZ);
 		if (nn->next)
-			(void)strlcat(lbuf, "_", BUFSIZ);
+			html_idcat(buf, " ", BUFSIZ);
 	}
 
 	/* 
@@ -592,7 +596,7 @@ mdoc_sh_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag[0], "sec-head");
 	tag[1].key = ATTR_ID;
-	tag[1].val = lbuf;
+	tag[1].val = buf;
 	print_otag(h, TAG_DIV, 2, tag);
 	return(1);
 }
@@ -604,7 +608,7 @@ mdoc_ss_pre(MDOC_ARGS)
 {
 	struct htmlpair	 	 tag[3];
 	const struct mdoc_node	*nn;
-	char			 lbuf[BUFSIZ];
+	char			 buf[BUFSIZ];
 	struct roffsu		 su;
 
 	SCALE_VS_INIT(&su, 1);
@@ -631,11 +635,11 @@ mdoc_ss_pre(MDOC_ARGS)
 
 	/* TODO: see note in mdoc_sh_pre() about duplicates. */
 
-	lbuf[0] = 0;
+	buf[0] = '\0';
 	for (nn = n->child; nn; nn = nn->next) {
-		(void)strlcat(lbuf, nn->string, BUFSIZ);
+		html_idcat(buf, nn->string, BUFSIZ);
 		if (nn->next)
-			(void)strlcat(lbuf, "_", BUFSIZ);
+			html_idcat(buf, " ", BUFSIZ);
 	}
 
 	SCALE_HS_INIT(&su, INDENT - HALFINDENT);
@@ -645,7 +649,7 @@ mdoc_ss_pre(MDOC_ARGS)
 	PAIR_CLASS_INIT(&tag[0], "ssec-head");
 	PAIR_STYLE_INIT(&tag[1], h);
 	tag[2].key = ATTR_ID;
-	tag[2].val = lbuf;
+	tag[2].val = buf;
 	print_otag(h, TAG_DIV, 3, tag);
 	return(1);
 }
@@ -949,8 +953,7 @@ mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *w
 	case (MDOC_Item):
 		/* FALLTHROUGH */
 	case (MDOC_Ohang):
-		print_otag(h, TAG_DIV, 0, NULL);
-		break;
+		return(0);
 	case (MDOC_Column):
 		bufcat_su(h, "min-width", width);
 		bufcat_style(h, "clear", "none");
@@ -1111,8 +1114,10 @@ mdoc_bl_pre(MDOC_ARGS)
 		return(1);
 
 	ord = malloc(sizeof(struct ord));
-	if (NULL == ord)
-		err(EXIT_FAILURE, "malloc");
+	if (NULL == ord) {
+		fprintf(stderr, "memory exhausted\n");
+		exit(EXIT_FAILURE);
+	}
 	ord->cookie = n;
 	ord->pos = 1;
 	ord->next = h->ords.head;
@@ -1292,11 +1297,11 @@ mdoc_sx_pre(MDOC_ARGS)
 
 	/* FIXME: duplicates? */
 
-	(void)strlcpy(buf, "#", BUFSIZ);
+	strlcpy(buf, "#", BUFSIZ);
 	for (nn = n->child; nn; nn = nn->next) {
-		(void)strlcat(buf, nn->string, BUFSIZ);
+		html_idcat(buf, nn->string, BUFSIZ);
 		if (nn->next)
-			(void)strlcat(buf, "_", BUFSIZ);
+			html_idcat(buf, " ", BUFSIZ);
 	}
 
 	PAIR_CLASS_INIT(&tag[0], "link-sec");
@@ -1713,8 +1718,11 @@ mdoc_sp_pre(MDOC_ARGS)
 	bufcat_su(h, "height", &su);
 	PAIR_STYLE_INIT(&tag, h);
 	print_otag(h, TAG_DIV, 1, &tag);
-	return(1);
+	/* So the div isn't empty: */
+	print_text(h, "\\~");
 
+	return(0);
+
 }
 
 
@@ -1860,6 +1868,7 @@ mdoc_in_pre(MDOC_ARGS)
 	for (nn = n->child; nn; nn = nn->next) {
 		PAIR_CLASS_INIT(&tag[0], "link-includes");
 		i = 1;
+		bufinit(h);
 		if (h->base_includes) {
 			buffmt_includes(h, nn->string);
 			tag[i].key = ATTR_HREF;