===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.12
retrieving revision 1.16
diff -u -p -r1.12 -r1.16
--- mandoc/html.c	2008/12/06 19:41:41	1.12
+++ mandoc/html.c	2008/12/08 16:29:57	1.16
@@ -1,4 +1,4 @@
-/* $Id: html.c,v 1.12 2008/12/06 19:41:41 kristaps Exp $ */
+/* $Id: html.c,v 1.16 2008/12/08 16:29:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -55,6 +55,18 @@ static	void		html_free(void *);
 static	ssize_t		html_endtag(struct md_mbuf *, void *,
 				const struct md_args *, 
 				enum md_ns, int);
+static	ssize_t		html_beginstring(struct md_mbuf *, 
+				const struct md_args *, 
+				const char *, size_t);
+static	ssize_t		html_beginhttp(struct md_mbuf *, 
+				const struct md_args *, 
+				const char *, size_t);
+static	ssize_t		html_endstring(struct md_mbuf *, 
+				const struct md_args *, 
+				const char *, size_t);
+static	ssize_t		html_endhttp(struct md_mbuf *, 
+				const struct md_args *, 
+				const char *, size_t);
 static	ssize_t		html_begintag(struct md_mbuf *, void *,
 				const struct md_args *, 
 				enum md_ns, int, 
@@ -63,7 +75,7 @@ static	int		html_begin(struct md_mbuf *,
 	       			const struct md_args *, 
 				const struct tm *, 
 				const char *, const char *, 
-				const char *, const char *);
+				enum roffmsec, const char *);
 static	int		html_printargs(struct md_mbuf *, int, 
 				const char *, const int *, 
 				const char **, size_t *);
@@ -122,9 +134,13 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq
 			break;
 
 	assert(n);
+
+	/* LINTED */
 	for (i = 0; ROFF_ARGMAX != n->argc[i] &&
 			i < ROFF_MAXLINEARG; i++) {
 		switch (n->argc[i]) {
+		case (ROFF_Ohang):
+			return(ml_nputs(mbuf, "div", 3, res));
 		case (ROFF_Tag):
 			/* FALLTHROUGH */
 		case (ROFF_Column): 
@@ -134,11 +150,7 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq
 		}
 	}
 
-	assert(i != ROFF_MAXLINEARG);
-	abort();
-	/* NOTREACHED */
-
-	return(1);
+	return(0);
 }
 
 
@@ -155,6 +167,8 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq
 			break;
 
 	assert(n);
+
+	/* LINTED */
 	for (i = 0; ROFF_ARGMAX != n->argc[i] &&
 			i < ROFF_MAXLINEARG; i++) {
 		switch (n->argc[i]) {
@@ -186,10 +200,7 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq
 	}
 
 	assert(i != ROFF_MAXLINEARG);
-	abort();
-	/* NOTREACHED */
-
-	return(1);
+	return(0);
 }
 
 
@@ -231,8 +242,7 @@ html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq
 	}
 
 	assert(i != ROFF_MAXLINEARG);
-	abort();
-	/* NOTREACHED */
+	return(0);
 }
 
 
@@ -249,6 +259,8 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html
 			break;
 
 	assert(n);
+
+	/* LINTED */
 	for (i = 0; ROFF_ARGMAX != n->argc[i] &&
 			i < ROFF_MAXLINEARG; i++) {
 		switch (n->argc[i]) {
@@ -280,8 +292,7 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html
 	}
 
 	assert(i != ROFF_MAXLINEARG);
-	abort();
-	/* NOTREACHED */
+	return(0);
 }
 
 
@@ -343,7 +354,7 @@ out:
 static int 
 html_begin(struct md_mbuf *mbuf, const struct md_args *args,
 		const struct tm *tm, const char *os, 
-		const char *title, const char *section, 
+		const char *title, enum roffmsec section, 
 		const char *vol)
 {
 	const char	*preamble, *css, *trail;
@@ -371,7 +382,7 @@ html_begin(struct md_mbuf *mbuf, const struct md_args 
 	res = 0;
 
 	(void)snprintf(buf, sizeof(buf) - 1,
-			preamble, title, section);
+			preamble, title, ml_section(section));
 
 	if ( ! ml_puts(mbuf, buf, &res))
 		return(0);
@@ -549,6 +560,7 @@ html_inlinetagargs(struct md_mbuf *mbuf, 
 			return(0);
 		if ( ! ml_nputs(mbuf, "\"", 1, res))
 			return(0);
+		break;
 	default:
 		break;
 	}
@@ -605,6 +617,7 @@ html_begintag(struct md_mbuf *mbuf, void *data,
 		/* TODO: argv. */
 
 		assert(argv);
+		/* LINTED */
 		for (i = 0; ROFF_ARGMAX != argc[i]
 				&& i < ROFF_MAXLINEARG; i++) 
 			node->argc[i] = argc[i];
@@ -721,6 +734,7 @@ html_free(void *p)
 	assert(p);
 	q = (struct htmlq *)p;
 
+	/* LINTED */
 	while ((n = q->last)) {
 		q->last = n->parent;
 		free(n);
@@ -730,6 +744,70 @@ html_free(void *p)
 }
 
 
+static ssize_t 
+html_beginhttp(struct md_mbuf *mbuf, 
+		const struct md_args *args, 
+		const char *buf, size_t sz)
+{
+	size_t		 res;
+
+	res = 0;
+
+	if ( ! ml_puts(mbuf, "<a href=\"", &res))
+		return(-1);
+	if (1 != ml_nputstring(mbuf, buf, sz, &res))
+		return(-1);
+	if ( ! ml_puts(mbuf, "\">", &res))
+		return(-1);
+
+	return((ssize_t)res);
+}
+
+
+static ssize_t 
+html_endhttp(struct md_mbuf *mbuf, 
+		const struct md_args *args, 
+		const char *buf, size_t sz)
+{
+	size_t		 res;
+
+	res = 0;
+
+	if ( ! ml_puts(mbuf, "</a>", &res))
+		return(-1);
+
+	return((ssize_t)res);
+}
+
+
+/* ARGSUSED */
+static ssize_t 
+html_beginstring(struct md_mbuf *mbuf, 
+		const struct md_args *args, 
+		const char *buf, size_t sz)
+{
+
+	if (0 == strncmp(buf, "http://", 7))
+		return(html_beginhttp(mbuf, args, buf, sz));
+
+	return(0);
+}
+
+
+/* ARGSUSED */
+static ssize_t 
+html_endstring(struct md_mbuf *mbuf, 
+		const struct md_args *args, 
+		const char *buf, size_t sz)
+{
+	
+	if (0 == strncmp(buf, "http://", 7))
+		return(html_endhttp(mbuf, args, buf, sz));
+
+	return(0);
+}
+
+
 int
 md_line_html(void *data, char *buf)
 {
@@ -758,7 +836,8 @@ md_init_html(const struct md_args *args,
 	cbs.ml_endtag = html_endtag;
 	cbs.ml_begin = html_begin;
 	cbs.ml_end = html_end;
+	cbs.ml_beginstring = html_beginstring;
+	cbs.ml_endstring = html_endstring;
 
 	return(mlg_alloc(args, rbuf, mbuf, &cbs));
 }
-