===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -p -r1.16 -r1.18
--- mandoc/mdoc_html.c	2009/10/03 15:08:09	1.16
+++ mandoc/mdoc_html.c	2009/10/03 16:36:06	1.18
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.16 2009/10/03 15:08:09 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.18 2009/10/03 16:36:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -54,13 +53,6 @@ static	int		  a2width(const char *);
 static	int		  a2offs(const char *);
 static	int		  a2list(const struct mdoc_node *);
 
-static	void		  buffmt_man(struct html *, 
-				const char *, const char *);
-static	void		  buffmt(struct html *, const char *, ...);
-static	void		  bufcat(struct html *, const char *);
-static	void		  bufncat(struct html *, const char *, size_t);
-
-
 static	void		  mdoc_root_post(MDOC_ARGS);
 static	int		  mdoc_root_pre(MDOC_ARGS);
 static	int		  mdoc_tbl_pre(MDOC_ARGS, int);
@@ -281,80 +273,6 @@ html_mdoc(void *arg, const struct mdoc *m)
 }
 
 
-static void
-bufinit(struct html *h)
-{
-
-	h->buf[0] = '\0';
-	h->buflen = 0;
-}
-
-
-static void
-bufcat(struct html *h, const char *p)
-{
-
-	bufncat(h, p, strlen(p));
-}
-
-
-static void
-buffmt(struct html *h, const char *fmt, ...)
-{
-	va_list		 ap;
-
-	va_start(ap, fmt);
-	(void)vsnprintf(h->buf + h->buflen, 
-			BUFSIZ - h->buflen - 1, fmt, ap);
-	va_end(ap);
-	h->buflen = strlen(h->buf);
-	assert('\0' == h->buf[h->buflen]);
-}
-
-
-static void
-bufncat(struct html *h, const char *p, size_t sz)
-{
-
-	if (h->buflen + sz > BUFSIZ - 1)
-		sz = BUFSIZ - 1 - h->buflen;
-
-	(void)strncat(h->buf, p, sz);
-	h->buflen += sz;
-	assert('\0' == h->buf[h->buflen]);
-}
-
-
-static void
-buffmt_man(struct html *h, 
-		const char *name, const char *sec)
-{
-	const char	*p, *pp;
-
-	pp = h->base_man;
-
-	/* FIXME: URL-encode contents. */
-
-	while ((p = strchr(pp, '%'))) {
-		bufncat(h, pp, p - pp);
-		switch (*(p + 1)) {
-		case('S'):
-			bufcat(h, sec);
-			break;
-		case('N'):
-			buffmt(h, name ? name : "1");
-			break;
-		default:
-			bufncat(h, p, 2);
-			break;
-		}
-		pp = p + 2;
-	}
-	if (pp)
-		bufcat(h, pp);
-}
-
-
 static int
 a2list(const struct mdoc_node *n)
 {
@@ -829,17 +747,21 @@ mdoc_xr_pre(MDOC_ARGS)
 {
 	struct htmlpair	 	 tag[2];
 	const struct mdoc_node	*nn;
+	int			 i;
 
-	buffmt_man(h, n->child->string, 
-			n->child->next ? 
-			n->child->next->string : NULL);
+	i = 0;
+	tag[i].key = ATTR_CLASS;
+	tag[i++].val = "link-man";
 
-	tag[0].key = ATTR_CLASS;
-	tag[0].val = "link-man";
-	tag[1].key = ATTR_HREF;
-	tag[1].val = h->buf;
-	print_otag(h, TAG_A, 2, tag);
+	if (h->base_man) {
+		buffmt_man(h, n->child->string, n->child->next ? 
+				n->child->next->string : NULL);
+		tag[i].key = ATTR_HREF;
+		tag[i++].val = h->buf;
+	}
 
+	print_otag(h, TAG_A, i, tag);
+
 	nn = n->child;
 	print_text(h, nn->string);
 
@@ -1896,21 +1818,23 @@ static int
 mdoc_in_pre(MDOC_ARGS)
 {
 	const struct mdoc_node	*nn;
-	struct htmlpair		 tag;
+	struct htmlpair		 tag[2];
+	struct tag		*t;
+	int			 i;
 
 	if (SEC_SYNOPSIS == n->sec) {
 		if (n->next && MDOC_In != n->next->tok) {
-			tag.key = ATTR_STYLE;
-			tag.val = "margin-bottom: 1em;";
-			print_otag(h, TAG_DIV, 1, &tag);
+			tag[0].key = ATTR_STYLE;
+			tag[0].val = "margin-bottom: 1em;";
+			print_otag(h, TAG_DIV, 1, tag);
 		} else
 			print_otag(h, TAG_DIV, 0, NULL);
 	}
 
-	tag.key = ATTR_CLASS;
-	tag.val = "includes";
+	tag[0].key = ATTR_CLASS;
+	tag[0].val = "includes";
 
-	print_otag(h, TAG_SPAN, 1, &tag);
+	print_otag(h, TAG_SPAN, 1, tag);
 
 	if (SEC_SYNOPSIS == n->sec)
 		print_text(h, "#include");
@@ -1920,8 +1844,20 @@ mdoc_in_pre(MDOC_ARGS)
 
 	/* XXX -- see warning in termp_in_post(). */
 
-	for (nn = n->child; nn; nn = nn->next)
+	for (nn = n->child; nn; nn = nn->next) {
+		assert(MDOC_TEXT == nn->type);
+		i = 0;
+		tag[i].key = ATTR_CLASS;
+		tag[i++].val = "link-includes";
+		if (h->base_includes) {
+			buffmt_includes(h, nn->string);
+			tag[i].key = ATTR_HREF;
+			tag[i++].val = h->buf;
+		}
+		t = print_otag(h, TAG_A, i, tag);
 		print_mdoc_node(m, nn, h);
+		print_tagq(h, t);
+	}
 
 	h->flags |= HTML_NOSPACE;
 	print_text(h, ">");