===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.18
retrieving revision 1.22
diff -u -p -r1.18 -r1.22
--- mandoc/mdoc_html.c	2009/10/03 16:36:06	1.18
+++ mandoc/mdoc_html.c	2009/10/04 15:24:54	1.22
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.18 2009/10/03 16:36:06 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.22 2009/10/04 15:24:54 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -35,9 +35,6 @@
 #define	MDOC_ARGS	  const struct mdoc_meta *m, \
 			  const struct mdoc_node *n, \
 			  struct html *h
-#define	MAN_ARGS	  const struct man_meta *m, \
-			  const struct man_node *n, \
-			  struct html *h
 
 struct	htmlmdoc {
 	int		(*pre)(MDOC_ARGS);
@@ -385,21 +382,19 @@ print_mdoc(MDOC_ARGS)
 static void
 print_mdoc_head(MDOC_ARGS)
 {
-	char		b[BUFSIZ];
 
 	print_gen_head(h);
+	bufinit(h);
+	buffmt(h, "%s(%d)", m->title, m->msec);
 
-	(void)snprintf(b, BUFSIZ - 1, 
-			"%s(%d)", m->title, m->msec);
-
 	if (m->arch) {
-		(void)strlcat(b, " (", BUFSIZ);
-		(void)strlcat(b, m->arch, BUFSIZ);
-		(void)strlcat(b, ")", BUFSIZ);
+		bufcat(h, " (");
+		bufcat(h, m->arch);
+		bufcat(h, ")");
 	}
 
 	print_otag(h, TAG_TITLE, 0, NULL);
-	print_text(h, b);
+	print_text(h, h->buf);
 }
 
 
@@ -547,21 +542,17 @@ mdoc_sh_pre(MDOC_ARGS)
 {
 	struct htmlpair		 tag[2];
 	const struct mdoc_node	*nn;
+	char			 link[BUFSIZ];
 
-	if (MDOC_HEAD == n->type) {
+	if (MDOC_BODY == n->type) {
+		buffmt(h, "margin-left: %dem;", INDENT);
+
 		tag[0].key = ATTR_CLASS;
-		tag[0].val = "sec-head";
-		print_otag(h, TAG_DIV, 1, tag);
-		print_otag(h, TAG_SPAN, 1, tag);
+		tag[0].val = "sec-body";
+		tag[1].key = ATTR_STYLE;
+		tag[1].val = h->buf;
 
-		for (nn = n->child; nn; nn = nn->next) {
-			bufcat(h, nn->string);
-			if (nn->next)
-				bufncat(h, " ", 1);
-		}
-		tag[0].key = ATTR_NAME;
-		tag[0].val = h->buf;
-		print_otag(h, TAG_A, 1, tag);
+		print_otag(h, TAG_DIV, 2, tag);
 		return(1);
 	} else if (MDOC_BLOCK == n->type) {
 		tag[0].key = ATTR_CLASS;
@@ -578,17 +569,23 @@ mdoc_sh_pre(MDOC_ARGS)
 
 		tag[1].key = ATTR_STYLE;
 		tag[1].val = h->buf;
-
 		print_otag(h, TAG_DIV, 2, tag);
 		return(1);
 	}
 
-	buffmt(h, "margin-left: %dem;", INDENT);
-	
+	link[0] = 0;
+	for (nn = n->child; nn; nn = nn->next) {
+		(void)strlcat(link, nn->string, BUFSIZ);
+		if (nn->next)
+			(void)strlcat(link, "_", BUFSIZ);
+	}
+
+	/* FIXME: make sure no duplicates! */
+
 	tag[0].key = ATTR_CLASS;
-	tag[0].val = "sec-body";
-	tag[1].key = ATTR_STYLE;
-	tag[1].val = h->buf;
+	tag[0].val = "sec-head";
+	tag[1].key = ATTR_ID;
+	tag[1].val = link;
 
 	print_otag(h, TAG_DIV, 2, tag);
 	return(1);
@@ -599,54 +596,58 @@ mdoc_sh_pre(MDOC_ARGS)
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
-	struct htmlpair	 	 tag[2];
+	struct htmlpair	 	 tag[3];
 	int		 	 i;
 	const struct mdoc_node	*nn;
+	char			 link[BUFSIZ];
 
 	i = 0;
 
 	if (MDOC_BODY == n->type) {
 		tag[i].key = ATTR_CLASS;
 		tag[i++].val = "ssec-body";
+
 		if (n->parent->next && n->child) {
 			bufcat(h, "margin-bottom: 1em;");
 			tag[i].key = ATTR_STYLE;
 			tag[i++].val = h->buf;
 		}
+
 		print_otag(h, TAG_DIV, i, tag);
 		return(1);
 	} else if (MDOC_BLOCK == n->type) {
 		tag[i].key = ATTR_CLASS;
 		tag[i++].val = "ssec-block";
+
 		if (n->prev) {
 			bufcat(h, "margin-top: 1em;");
 			tag[i].key = ATTR_STYLE;
 			tag[i++].val = h->buf;
 		}
+
 		print_otag(h, TAG_DIV, i, tag);
 		return(1);
 	}
 
+	link[0] = 0;
+	for (nn = n->child; nn; nn = nn->next) {
+		(void)strlcat(link, nn->string, BUFSIZ);
+		if (nn->next)
+			(void)strlcat(link, "_", BUFSIZ);
+	}
+
 	buffmt(h, "margin-left: -%dem;", INDENT - HALFINDENT);
 
+	/* FIXME: make sure no duplicates! */
+
 	tag[0].key = ATTR_CLASS;
 	tag[0].val = "ssec-head";
 	tag[1].key = ATTR_STYLE;
 	tag[1].val = h->buf;
+	tag[2].key = ATTR_ID;
+	tag[2].val = link;
 
-	print_otag(h, TAG_DIV, 2, tag);
-	print_otag(h, TAG_SPAN, 1, tag);
-
-	bufinit(h);
-	for (nn = n->child; nn; nn = nn->next) {
-		bufcat(h, nn->string);
-		if (nn->next)
-			bufcat(h, " ");
-	}
-	tag[0].key = ATTR_NAME;
-	tag[0].val = h->buf;
-	print_otag(h, TAG_A, 1, tag);
-
+	print_otag(h, TAG_DIV, 3, tag);
 	return(1);
 }
 
@@ -1274,18 +1275,19 @@ mdoc_sx_pre(MDOC_ARGS)
 {
 	struct htmlpair		 tag[2];
 	const struct mdoc_node	*nn;
+	char			 link[BUFSIZ];
 
-	bufcat(h, "#");
+	(void)strlcpy(link, "#", BUFSIZ);
 	for (nn = n->child; nn; nn = nn->next) {
-		bufcat(h, nn->string);
+		(void)strlcat(link, nn->string, BUFSIZ);
 		if (nn->next)
-			bufcat(h, " ");
+			(void)strlcat(link, "_", BUFSIZ);
 	}
 
-	tag[0].key = ATTR_HREF;
-	tag[0].val = h->buf;
-	tag[1].key = ATTR_CLASS;
-	tag[1].val = "link-sec";
+	tag[0].key = ATTR_CLASS;
+	tag[0].val = "link-sec";
+	tag[1].key = ATTR_HREF;
+	tag[1].val = link;
 
 	print_otag(h, TAG_A, 2, tag);
 	return(1);
@@ -1438,6 +1440,8 @@ mdoc_an_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
+	/* TODO: -split and -nosplit (see termp_an_pre()). */
+
 	tag.key = ATTR_CLASS;
 	tag.val = "author";
 	print_otag(h, TAG_SPAN, 1, &tag);
@@ -1616,23 +1620,26 @@ mdoc_fn_pre(MDOC_ARGS)
 	}
 
 	/* Split apart into type and name. */
-
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "ftype";
-	t = print_otag(h, TAG_SPAN, 1, tag);
-
 	assert(n->child->string);
 	sp = n->child->string;
-	while (NULL != (ep = strchr(sp, ' '))) {
-		sz = MIN((int)(ep - sp), BUFSIZ - 1);
-		(void)memcpy(nbuf, sp, (size_t)sz);
-		nbuf[sz] = '\0';
-		print_text(h, nbuf);
-		sp = ++ep;
+
+	if ((ep = strchr(sp, ' '))) {
+		tag[0].key = ATTR_CLASS;
+		tag[0].val = "ftype";
+	
+		t = print_otag(h, TAG_SPAN, 1, tag);
+	
+		while (ep) {
+			sz = MIN((int)(ep - sp), BUFSIZ - 1);
+			(void)memcpy(nbuf, sp, (size_t)sz);
+			nbuf[sz] = '\0';
+			print_text(h, nbuf);
+			sp = ++ep;
+			ep = strchr(sp, ' ');
+		}
+		print_tagq(h, t);
 	}
 
-	print_tagq(h, t);
-
 	tag[0].key = ATTR_CLASS;
 	tag[0].val = "fname";
 	t = print_otag(h, TAG_SPAN, 1, tag);
@@ -1691,7 +1698,7 @@ mdoc_sp_pre(MDOC_ARGS)
 		break;
 	}
 
-	buffmt(h, "height: %dem", len);
+	buffmt(h, "height: %dem;", len);
 	tag.key = ATTR_STYLE;
 	tag.val = h->buf;
 	print_otag(h, TAG_DIV, 1, &tag);