===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.4
retrieving revision 1.11
diff -u -p -r1.4 -r1.11
--- mandoc/html.c	2008/12/04 11:25:29	1.4
+++ mandoc/html.c	2008/12/05 22:54:44	1.11
@@ -1,4 +1,4 @@
-/* $Id: html.c,v 1.4 2008/12/04 11:25:29 kristaps Exp $ */
+/* $Id: html.c,v 1.11 2008/12/05 22:54:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -32,12 +32,30 @@
 #include "ml.h"
 
 
+/* TODO: allow head/tail-less invocations (just "div" start). */
+
+struct	htmlnode {
+	int		 tok;
+	enum md_ns	 ns;
+	int		 argc[ROFF_MAXLINEARG];
+	char		*argv[ROFF_MAXLINEARG];
+	struct htmlnode	*parent;
+};
+
+
+struct	htmlq {
+	struct htmlnode	*last;
+};
+
+
 static	int		html_loadcss(struct md_mbuf *, const char *);
 
-static	ssize_t		html_endtag(struct md_mbuf *, 
+static	int		html_alloc(void **);
+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_begintag(struct md_mbuf *, 
+static	ssize_t		html_begintag(struct md_mbuf *, void *,
 				const struct md_args *, 
 				enum md_ns, int, 
 				const int *, const char **);
@@ -46,31 +64,228 @@ static	int		html_begin(struct md_mbuf *,
 				const struct tm *, 
 				const char *, const char *, 
 				const char *, const char *);
+static	int		html_printargs(struct md_mbuf *, int, 
+				const char *, const int *, 
+				const char **, size_t *);
 static	int		html_end(struct md_mbuf *, 
 				const struct md_args *);
-static	ssize_t		html_blocktagname(struct md_mbuf *,
-				const struct md_args *, int);
-static	ssize_t		html_blocktagargs(struct md_mbuf *,
+static	int		html_blocktagname(struct md_mbuf *,
+				const struct md_args *, int, 
+				struct htmlq *, const int *, 
+				const char **, size_t *);
+static	int		html_blocktagargs(struct md_mbuf *,
 				const struct md_args *, int,
-				const int *, const char **);
-static	ssize_t		html_blockheadtagname(struct md_mbuf *,
-				const struct md_args *, int);
-static	ssize_t		html_blockheadtagargs(struct md_mbuf *,
+				const int *, const char **, size_t *);
+static	int		html_headtagname(struct md_mbuf *,
+				const struct md_args *, int, 
+				struct htmlq *, const int *, 
+				const char **, size_t *);
+static	int		html_headtagargs(struct md_mbuf *,
 				const struct md_args *, int,
-				const int *, const char **);
-static	ssize_t		html_blockbodytagname(struct md_mbuf *,
-				const struct md_args *, int);
-static	ssize_t		html_blockbodytagargs(struct md_mbuf *,
+				const int *, const char **, size_t *);
+static	int		html_blockbodytagname(struct md_mbuf *,
+				const struct md_args *, 
+				int, struct htmlq *, const int *, 
+				const char **, size_t *);
+static	int		html_blockbodytagargs(struct md_mbuf *,
 				const struct md_args *, int,
-				const int *, const char **);
-static	ssize_t		html_inlinetagname(struct md_mbuf *,
-				const struct md_args *, int);
-static	ssize_t		html_inlinetagargs(struct md_mbuf *,
+				const int *, const char **, size_t *);
+static	int		html_inlinetagname(struct md_mbuf *,
+				const struct md_args *, int, size_t *);
+static	int		html_inlinetagargs(struct md_mbuf *,
 				const struct md_args *, int,
-				const int *, const char **);
+				const int *, const char **, size_t *);
+static	int		html_Bl_bodytagname(struct md_mbuf *, 
+				struct htmlq *, const int *, 
+				const char **, size_t *);
+static	int		html_It_blocktagname(struct md_mbuf *, 
+				struct htmlq *, const int *, 
+				const char **, size_t *);
+static	int		html_It_headtagname(struct md_mbuf *, 
+				struct htmlq *, const int *, 
+				const char **, size_t *);
+static	int		html_It_bodytagname(struct md_mbuf *, 
+				struct htmlq *, const int *, 
+				const char **, size_t *);
 
 
+/* ARGSUSED */
 static int
+html_It_headtagname(struct md_mbuf *mbuf, struct htmlq *q, 
+		const int *argc, const char **argv, size_t *res)
+{
+	struct htmlnode	*n;
+	int		 i;
+
+	for (n = q->last; n; n = n->parent)
+		if (n->tok == ROFF_Bl)
+			break;
+
+	assert(n);
+	for (i = 0; ROFF_ARGMAX != n->argc[i] &&
+			i < ROFF_MAXLINEARG; i++) {
+		switch (n->argc[i]) {
+		case (ROFF_Tag):
+			/* FALLTHROUGH */
+		case (ROFF_Column): 
+			return(ml_nputs(mbuf, "td", 2, res));
+		default:
+			break;
+		}
+	}
+
+	assert(i != ROFF_MAXLINEARG);
+	abort();
+	/* NOTREACHED */
+
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, 
+		const int *argc, const char **argv, size_t *res)
+{
+	struct htmlnode	*n;
+	int		 i;
+
+	for (n = q->last; n; n = n->parent)
+		if (n->tok == ROFF_Bl)
+			break;
+
+	assert(n);
+	for (i = 0; ROFF_ARGMAX != n->argc[i] &&
+			i < ROFF_MAXLINEARG; i++) {
+		switch (n->argc[i]) {
+		case (ROFF_Enum):
+			/* FALLTHROUGH */
+		case (ROFF_Bullet):
+			/* FALLTHROUGH */
+		case (ROFF_Dash):
+			/* FALLTHROUGH */
+		case (ROFF_Hyphen):
+			/* FALLTHROUGH */
+		case (ROFF_Item):
+			/* FALLTHROUGH */
+		case (ROFF_Diag):
+			/* FALLTHROUGH */
+		case (ROFF_Hang):
+			/* FALLTHROUGH */
+		case (ROFF_Ohang): 
+			/* FALLTHROUGH */
+		case (ROFF_Inset):
+			return(ml_nputs(mbuf, "div", 3, res));
+		case (ROFF_Tag):
+			/* FALLTHROUGH */
+		case (ROFF_Column): 
+			return(ml_nputs(mbuf, "td", 2, res));
+		default:
+			break;
+		}
+	}
+
+	assert(i != ROFF_MAXLINEARG);
+	abort();
+	/* NOTREACHED */
+
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, 
+		const int *argc, const char **argv, size_t *res)
+{
+	int		 i;
+
+	for (i = 0; ROFF_ARGMAX != argc[i]
+			&& i < ROFF_MAXLINEARG; i++) {
+		switch (argc[i]) {
+		case (ROFF_Enum):
+			return(ml_nputs(mbuf, "ol", 2, res));
+		case (ROFF_Bullet):
+			/* FALLTHROUGH */
+		case (ROFF_Dash):
+			/* FALLTHROUGH */
+		case (ROFF_Hyphen):
+			/* FALLTHROUGH */
+		case (ROFF_Item):
+			/* FALLTHROUGH */
+		case (ROFF_Diag):
+			/* FALLTHROUGH */
+		case (ROFF_Hang):
+			/* FALLTHROUGH */
+		case (ROFF_Ohang): 
+			/* FALLTHROUGH */
+		case (ROFF_Inset):
+			return(ml_nputs(mbuf, "ul", 2, res));
+		case (ROFF_Tag):
+			/* FALLTHROUGH */
+		case (ROFF_Column): 
+			return(ml_nputs(mbuf, "table", 5, res));
+		default:
+			break;
+		}
+	}
+
+	assert(i != ROFF_MAXLINEARG);
+	abort();
+	/* NOTREACHED */
+}
+
+
+/* ARGSUSED */
+static int
+html_It_blocktagname(struct md_mbuf *mbuf, struct htmlq *q, 
+		const int *argc, const char **argv, size_t *res)
+{
+	struct htmlnode	*n;
+	int		 i;
+
+	for (n = q->last; n; n = n->parent)
+		if (n->tok == ROFF_Bl)
+			break;
+
+	assert(n);
+	for (i = 0; ROFF_ARGMAX != n->argc[i] &&
+			i < ROFF_MAXLINEARG; i++) {
+		switch (n->argc[i]) {
+		case (ROFF_Enum):
+			/* FALLTHROUGH */
+		case (ROFF_Bullet):
+			/* FALLTHROUGH */
+		case (ROFF_Dash):
+			/* FALLTHROUGH */
+		case (ROFF_Hyphen):
+			/* FALLTHROUGH */
+		case (ROFF_Item):
+			/* FALLTHROUGH */
+		case (ROFF_Diag):
+			/* FALLTHROUGH */
+		case (ROFF_Hang):
+			/* FALLTHROUGH */
+		case (ROFF_Ohang): 
+			/* FALLTHROUGH */
+		case (ROFF_Inset):
+			return(ml_nputs(mbuf, "li", 2, res));
+		case (ROFF_Tag):
+			/* FALLTHROUGH */
+		case (ROFF_Column): 
+			return(ml_nputs(mbuf, "tr", 2, res));
+		default:
+			break;
+		}
+	}
+
+	assert(i != ROFF_MAXLINEARG);
+	abort();
+	/* NOTREACHED */
+}
+
+
+static int
 html_loadcss(struct md_mbuf *mbuf, const char *css)
 {
 	size_t		 res, bufsz;
@@ -151,7 +366,7 @@ html_begin(struct md_mbuf *mbuf, const struct md_args 
 	trail = 
 	"</head>\n"
 	"<body>\n"
-	"<div class=\"mdoc\">\n";
+	"<div class=\"mdoc\">";
 
 	res = 0;
 
@@ -163,7 +378,7 @@ html_begin(struct md_mbuf *mbuf, const struct md_args 
 
 	assert(args->params.html.css);
 	if (HTML_CSS_EMBED & args->params.html.flags) {
-		if ( ! ml_puts(mbuf, "    <style><!--\n", &res))
+		if ( ! ml_puts(mbuf, "    <style type=\"text/css\"><!--\n", &res))
 			return(0);
 		if ( ! html_loadcss(mbuf, args->params.html.css))
 			return(0);
@@ -187,181 +402,220 @@ html_begin(struct md_mbuf *mbuf, const struct md_args 
 static int 
 html_end(struct md_mbuf *mbuf, const struct md_args *args)
 {
-	size_t		 res;
 
-	res = 0;
-	if ( ! ml_puts(mbuf, "</div></body>\n</html>", &res))
-		return(0);
-
-	return(1);
+	return(ml_puts(mbuf, "</div></body>\n</html>", NULL));
 }
 
 
 /* ARGSUSED */
-static ssize_t
+static int
 html_blockbodytagname(struct md_mbuf *mbuf, 
-		const struct md_args *args, int tok)
+		const struct md_args *args, int tok, struct htmlq *q, 
+		const int *argc, const char **argv, size_t *res)
 {
-	size_t		 res;
 
-	res = 0;
-	if ( ! ml_puts(mbuf, "div", &res))
-		return(-1);
+	switch (tok) {
+	case (ROFF_Bl):
+		return(html_Bl_bodytagname(mbuf, q, argc, argv, res));
+	case (ROFF_It):
+		return(html_It_bodytagname(mbuf, q, argc, argv, res));
+	default:
+		break;
+	}
 
-	return((ssize_t)res);
+	return(ml_puts(mbuf, "div", res));
 }
 
 
-
-
 /* ARGSUSED */
-static ssize_t
-html_blockheadtagname(struct md_mbuf *mbuf, 
-		const struct md_args *args, int tok)
+static int
+html_headtagname(struct md_mbuf *mbuf, 
+		const struct md_args *args, int tok, struct htmlq *q, 
+		const int *argc, const char **argv, size_t *res)
 {
-	size_t		 res;
 
-	res = 0;
-	if ( ! ml_puts(mbuf, "div", &res))
-		return(-1);
+	switch (tok) {
+	case (ROFF_It):
+		return(html_It_headtagname(mbuf, q, argc, argv, res));
+	case (ROFF_Sh):
+		return(ml_puts(mbuf, "h1", res));
+	case (ROFF_Ss):
+		return(ml_puts(mbuf, "h2", res));
+	default:
+		break;
+	}
 
-	return((ssize_t)res);
+	return(ml_puts(mbuf, "div", res));
 }
 
 
 /* ARGSUSED */
-static ssize_t
-html_blocktagname(struct md_mbuf *mbuf, 
-		const struct md_args *args, int tok)
+static int
+html_blocktagname(struct md_mbuf *mbuf, const struct md_args *args, 
+		int tok, struct htmlq *q, const int *argc, 
+		const char **argv, size_t *res)
 {
-	size_t		 res;
 
-	res = 0;
-	if ( ! ml_puts(mbuf, "div", &res))
-		return(-1);
+	switch (tok) {
+	case (ROFF_It):
+		return(html_It_blocktagname(mbuf, q, argc, argv, res));
+	default:
+		break;
+	}
 
-	return((ssize_t)res);
+	return(ml_puts(mbuf, "div", res));
 }
 
 
 /* ARGSUSED */
-static ssize_t
-html_blockheadtagargs(struct md_mbuf *mbuf, const struct md_args *args, 
-		int tok, const int *argc, const char **argv)
+static int
+html_printargs(struct md_mbuf *mbuf, int tok, const char *ns,
+		const int *argc, const char **argv, size_t *res)
 {
-	size_t		 res;
 
-	res = 0;
-
-	if ( ! ml_puts(mbuf, " class=\"head-", &res))
+	if ( ! ml_puts(mbuf, " class=\"", res))
 		return(0);
-	if ( ! ml_puts(mbuf, toknames[tok], &res))
+	if ( ! ml_puts(mbuf, ns, res))
 		return(0);
-	if ( ! ml_puts(mbuf, "\"", &res))
+	if ( ! ml_puts(mbuf, "-", res))
 		return(0);
+	if ( ! ml_puts(mbuf, toknames[tok], res))
+		return(0);
+	return(ml_puts(mbuf, "\"", res));
+}
 
-	switch (tok) {
-	default:
-		break;
-	}
 
-	return(0);
+/* ARGSUSED */
+static int
+html_headtagargs(struct md_mbuf *mbuf, 
+		const struct md_args *args, int tok, 
+		const int *argc, const char **argv, size_t *res)
+{
+
+	return(html_printargs(mbuf, tok, "head", argc, argv, res));
 }
 
 
 /* ARGSUSED */
-static ssize_t
-html_blockbodytagargs(struct md_mbuf *mbuf, const struct md_args *args, 
-		int tok, const int *argc, const char **argv)
+static int
+html_blockbodytagargs(struct md_mbuf *mbuf, 
+		const struct md_args *args, int tok, 
+		const int *argc, const char **argv, size_t *res)
 {
-	size_t		 res;
 
-	res = 0;
+	return(html_printargs(mbuf, tok, "body", argc, argv, res));
+}
 
-	if ( ! ml_puts(mbuf, " class=\"body-", &res))
-		return(0);
-	if ( ! ml_puts(mbuf, toknames[tok], &res))
-		return(0);
-	if ( ! ml_puts(mbuf, "\"", &res))
-		return(0);
 
-	switch (tok) {
-	default:
-		break;
-	}
+/* ARGSUSED */
+static int
+html_blocktagargs(struct md_mbuf *mbuf, 
+		const struct md_args *args, int tok, 
+		const int *argc, const char **argv, size_t *res)
+{
 
-	return(res);
+	return(html_printargs(mbuf, tok, "block", argc, argv, res));
 }
 
 
 /* ARGSUSED */
-static ssize_t
-html_blocktagargs(struct md_mbuf *mbuf, const struct md_args *args, 
-		int tok, const int *argc, const char **argv)
+static int
+html_inlinetagargs(struct md_mbuf *mbuf, 
+		const struct md_args *args, int tok, 
+		const int *argc, const char **argv, size_t *res)
 {
-	size_t		 res;
 
-	res = 0;
+	return(html_printargs(mbuf, tok, "inline", argc, argv, res));
+}
 
-	if ( ! ml_puts(mbuf, " class=\"block-", &res))
-		return(0);
-	if ( ! ml_puts(mbuf, toknames[tok], &res))
-		return(0);
-	if ( ! ml_puts(mbuf, "\"", &res))
-		return(0);
 
+/* ARGSUSED */
+static int
+html_inlinetagname(struct md_mbuf *mbuf, 
+		const struct md_args *args, int tok, size_t *res)
+{
+
 	switch (tok) {
+	case (ROFF_Pp):
+		return(ml_puts(mbuf, "div", res));
 	default:
 		break;
 	}
 
-	return(0);
+	return(ml_puts(mbuf, "span", res));
 }
 
 
-/* ARGSUSED */
-static ssize_t
-html_inlinetagargs(struct md_mbuf *mbuf, const struct md_args *args, 
+static ssize_t 
+html_begintag(struct md_mbuf *mbuf, void *data,
+		const struct md_args *args, enum md_ns ns, 
 		int tok, const int *argc, const char **argv)
 {
 	size_t		 res;
+	struct htmlq	*q;
+	struct htmlnode	*node;
+	int		 i;
 
+	assert(ns != MD_NS_DEFAULT);
 	res = 0;
 
-	if ( ! ml_puts(mbuf, " class=\"inline-", &res))
-		return(0);
-	if ( ! ml_puts(mbuf, toknames[tok], &res))
-		return(0);
-	if ( ! ml_puts(mbuf, "\"", &res))
-		return(0);
+	assert(data);
+	q = (struct htmlq *)data;
 
-
-	switch (tok) {
-	default:
-		break;
+	if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) {
+		warn("calloc");
+		return(-1);
 	}
 
-	return(0);
-}
+	node->parent = q->last;
+	node->tok = tok;
+	node->ns = ns;
 
+	if (argc)  {
+		/* TODO: argv. */
 
-/* ARGSUSED */
-static ssize_t
-html_inlinetagname(struct md_mbuf *mbuf, 
-		const struct md_args *args, int tok)
-{
-	size_t		 res;
+		assert(argv);
+		for (i = 0; ROFF_ARGMAX != argc[i]
+				&& i < ROFF_MAXLINEARG; i++) 
+			node->argc[i] = argc[i];
+		assert(i != ROFF_MAXLINEARG);
+	} else
+		assert(NULL == argv);
 
-	res = 0;
 
-	switch (tok) {
-	case (ROFF_Pp):
-		if ( ! ml_puts(mbuf, "div", &res))
+	q->last = node;
+
+	switch (ns) {
+	case (MD_NS_BLOCK):
+		if ( ! html_blocktagname(mbuf, args, tok, 
+					q, argc, argv, &res))
 			return(-1);
+		if ( ! html_blocktagargs(mbuf, args, tok, 
+					argc, argv, &res))
+			return(-1);
 		break;
+	case (MD_NS_BODY):
+		if ( ! html_blockbodytagname(mbuf, args, tok, 
+					q, argc, argv, &res))
+			return(-1);
+		if ( ! html_blockbodytagargs(mbuf, args, tok, 
+					argc, argv, &res))
+			return(-1);
+		break;
+	case (MD_NS_HEAD):
+		if ( ! html_headtagname(mbuf, args, tok, q,
+					argc, argv, &res))
+			return(-1);
+		if ( ! html_headtagargs(mbuf, args, tok, 
+					argc, argv, &res))
+			return(-1);
+		break;
 	default:
-		if ( ! ml_puts(mbuf, "span", &res))
+		if ( ! html_inlinetagname(mbuf, args, tok, &res))
 			return(-1);
+		if ( ! html_inlinetagargs(mbuf, args, tok, 
+					argc, argv, &res))
+			return(-1);
 		break;
 	}
 
@@ -370,56 +624,80 @@ html_inlinetagname(struct md_mbuf *mbuf, 
 
 
 static ssize_t 
-html_begintag(struct md_mbuf *mbuf, const struct md_args *args, 
-		enum md_ns ns, int tok, 
-		const int *argc, const char **argv)
+html_endtag(struct md_mbuf *mbuf, void *data,
+		const struct md_args *args, enum md_ns ns, int tok)
 {
+	size_t		 res;
+	struct htmlq	*q;
+	struct htmlnode	*node;
 
 	assert(ns != MD_NS_DEFAULT);
+	res = 0;
+
+	assert(data);
+	q = (struct htmlq *)data;
+	node = q->last;
+
 	switch (ns) {
 	case (MD_NS_BLOCK):
-		if ( ! html_blocktagname(mbuf, args, tok))
-			return(0);
-		return(html_blocktagargs(mbuf, args, 
-					tok, argc, argv));
+		if ( ! html_blocktagname(mbuf, args, tok, 
+					q, node->argc, 
+					(const char **)node->argv, &res))
+			return(-1);
+		break;
 	case (MD_NS_BODY):
-		if ( ! html_blockbodytagname(mbuf, args, tok))
-			return(0);
-		return(html_blockbodytagargs(mbuf, args, 
-					tok, argc, argv));
+		if ( ! html_blockbodytagname(mbuf, args, tok, 
+					q, node->argc, 
+					(const char **)node->argv, &res))
+			return(-1);
+		break;
 	case (MD_NS_HEAD):
-		if ( ! html_blockheadtagname(mbuf, args, tok))
-			return(0);
-		return(html_blockheadtagargs(mbuf, args, 
-					tok, argc, argv));
+		if ( ! html_headtagname(mbuf, args, tok, 
+					q, node->argc,
+					(const char **)node->argv, &res))
+			return(-1);
+		break;
 	default:
+		if ( ! html_inlinetagname(mbuf, args, tok, &res))
+			return(-1);
 		break;
 	}
 
-	if ( ! html_inlinetagname(mbuf, args, tok))
+	q->last = node->parent;
+
+	free(node);
+
+	return((ssize_t)res);
+}
+
+
+static int
+html_alloc(void **p)
+{
+
+	if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) {
+		warn("calloc");
 		return(0);
-	return(html_inlinetagargs(mbuf, args, tok, argc, argv));
+	}
+	return(1);
 }
 
 
-static ssize_t 
-html_endtag(struct md_mbuf *mbuf, const struct md_args *args, 
-		enum md_ns ns, int tok)
+static void
+html_free(void *p)
 {
+	struct htmlq	*q;
+	struct htmlnode	*n;
 
-	assert(ns != MD_NS_DEFAULT);
-	switch (ns) {
-	case (MD_NS_BLOCK):
-		return(html_blocktagname(mbuf, args, tok));
-	case (MD_NS_BODY):
-		return(html_blockbodytagname(mbuf, args, tok));
-	case (MD_NS_HEAD):
-		return(html_blockheadtagname(mbuf, args, tok));
-	default:
-		break;
+	assert(p);
+	q = (struct htmlq *)p;
+
+	while ((n = q->last)) {
+		q->last = n->parent;
+		free(n);
 	}
 
-	return(html_inlinetagname(mbuf, args, tok));
+	free(q);
 }
 
 
@@ -443,8 +721,15 @@ void *
 md_init_html(const struct md_args *args,
 		struct md_mbuf *mbuf, const struct md_rbuf *rbuf)
 {
+	struct ml_cbs	 cbs;
 
-	return(mlg_alloc(args, rbuf, mbuf, html_begintag, 
-				html_endtag, html_begin, html_end));
+	cbs.ml_alloc = html_alloc;
+	cbs.ml_free = html_free;
+	cbs.ml_begintag = html_begintag;
+	cbs.ml_endtag = html_endtag;
+	cbs.ml_begin = html_begin;
+	cbs.ml_end = html_end;
+
+	return(mlg_alloc(args, rbuf, mbuf, &cbs));
 }