===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.86
retrieving revision 1.91
diff -u -p -r1.86 -r1.91
--- mandoc/html.c	2009/11/14 12:00:24	1.86
+++ mandoc/html.c	2009/11/16 08:46:58	1.91
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.86 2009/11/14 12:00:24 kristaps Exp $ */
+/*	$Id: html.c,v 1.91 2009/11/16 08:46:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -66,6 +66,12 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"base",	HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */
 };
 
+static	const char	*const htmlfonts[HTMLFONT_MAX] = {
+	"roman",
+	"bold",
+	"italic"
+};
+
 static	const char	*const htmlattrs[ATTR_MAX] = {
 	"http-equiv",
 	"content",
@@ -91,7 +97,8 @@ extern	int		  getsubopt(char **, char * const *, char 
 static	void		  print_spec(struct html *, const char *, size_t);
 static	void		  print_res(struct html *, const char *, size_t);
 static	void		  print_ctag(struct html *, enum htmltag);
-static	int		  print_encode(struct html *, const char *);
+static	int		  print_encode(struct html *, const char *, int);
+static	void		  print_metaf(struct html *, enum roffdeco);
 
 
 void *
@@ -220,8 +227,54 @@ print_res(struct html *h, const char *p, size_t len)
 }
 
 
+struct tag *
+print_ofont(struct html *h, enum htmlfont font)
+{
+	struct htmlpair	 tag;
+
+	h->metal = h->metac;
+	h->metac = font;
+
+	/* FIXME: DECO_ROMAN should just close out preexisting. */
+
+	if (h->metaf && h->tags.head == h->metaf)
+		print_tagq(h, h->metaf);
+
+	PAIR_CLASS_INIT(&tag, htmlfonts[font]);
+	h->metaf = print_otag(h, TAG_SPAN, 1, &tag);
+	return(h->metaf);
+}
+
+
+static void
+print_metaf(struct html *h, enum roffdeco deco)
+{
+	enum htmlfont	 font;
+
+	switch (deco) {
+	case (DECO_PREVIOUS):
+		font = h->metal;
+		break;
+	case (DECO_ITALIC):
+		font = HTMLFONT_ITALIC;
+		break;
+	case (DECO_BOLD):
+		font = HTMLFONT_BOLD;
+		break;
+	case (DECO_ROMAN):
+		font = HTMLFONT_NONE;
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
+	}
+
+	(void)print_ofont(h, font);
+}
+
+
 static int
-print_encode(struct html *h, const char *p)
+print_encode(struct html *h, const char *p, int norecurse)
 {
 	size_t		 sz;
 	int		 len, nospace;
@@ -259,6 +312,17 @@ print_encode(struct html *h, const char *p)
 		case (DECO_SPECIAL):
 			print_spec(h, seq, sz);
 			break;
+		case (DECO_PREVIOUS):
+			/* FALLTHROUGH */
+		case (DECO_BOLD):
+			/* FALLTHROUGH */
+		case (DECO_ITALIC):
+			/* FALLTHROUGH */
+		case (DECO_ROMAN):
+			if (norecurse)
+				break;
+			print_metaf(h, deco);
+			break;
 		default:
 			break;
 		}
@@ -300,22 +364,16 @@ print_otag(struct html *h, enum htmltag tag, 
 	for (i = 0; i < sz; i++) {
 		printf(" %s=\"", htmlattrs[p[i].key]);
 		assert(p->val);
-		(void)print_encode(h, p[i].val);
+		(void)print_encode(h, p[i].val, 1);
 		putchar('\"');
 	}
 	putchar('>');
 
 	h->flags |= HTML_NOSPACE;
-	if (HTML_CLRLINE & htmltags[tag].flags)
-		h->flags |= HTML_NEWLINE;
-	else
-		h->flags &= ~HTML_NEWLINE;
-
 	return(t);
 }
 
 
-/* ARGSUSED */
 static void
 print_ctag(struct html *h, enum htmltag tag)
 {
@@ -323,10 +381,8 @@ print_ctag(struct html *h, enum htmltag tag)
 	printf("</%s>", htmltags[tag].name);
 	if (HTML_CLRLINE & htmltags[tag].flags) {
 		h->flags |= HTML_NOSPACE;
-		h->flags |= HTML_NEWLINE;
 		putchar('\n');
-	} else
-		h->flags &= ~HTML_NEWLINE;
+	} 
 }
 
 
@@ -372,10 +428,8 @@ print_text(struct html *h, const char *p)
 	if ( ! (h->flags & HTML_NOSPACE))
 		putchar(' ');
 
-	h->flags &= ~HTML_NEWLINE;
-
 	assert(p);
-	if ( ! print_encode(h, p))
+	if ( ! print_encode(h, p, 0))
 		h->flags &= ~HTML_NOSPACE;
 
 	if (*p && 0 == *(p + 1))
@@ -399,6 +453,8 @@ print_tagq(struct html *h, const struct tag *until)
 	struct tag	*tag;
 
 	while ((tag = h->tags.head) != NULL) {
+		if (tag == h->metaf)
+			h->metaf = NULL;
 		print_ctag(h, tag->tag);
 		h->tags.head = tag->next;
 		free(tag);
@@ -416,6 +472,8 @@ print_stagq(struct html *h, const struct tag *suntil)
 	while ((tag = h->tags.head) != NULL) {
 		if (suntil && tag == suntil)
 			return;
+		if (tag == h->metaf)
+			h->metaf = NULL;
 		print_ctag(h, tag->tag);
 		h->tags.head = tag->next;
 		free(tag);