===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- mandoc/man_html.c	2009/10/07 12:35:23	1.7
+++ mandoc/man_html.c	2009/10/13 10:57:25	1.10
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.7 2009/10/07 12:35:23 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.10 2009/10/13 10:57:25 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,6 +27,7 @@
 #include "out.h"
 #include "html.h"
 #include "man.h"
+#include "main.h"
 
 /* TODO: preserve ident widths. */
 
@@ -50,13 +51,20 @@ static	void		  print_man_node(MAN_ARGS);
 static	int		  a2width(const struct man_node *,
 				struct roffsu *);
 
+static	int		  man_alt_pre(MAN_ARGS);
 static	int		  man_br_pre(MAN_ARGS);
+static	int		  man_ign_pre(MAN_ARGS);
+static	void		  man_root_post(MAN_ARGS);
+static	int		  man_root_pre(MAN_ARGS);
+static	int		  man_B_pre(MAN_ARGS);
 static	int		  man_HP_pre(MAN_ARGS);
+static	int		  man_I_pre(MAN_ARGS);
 static	int		  man_IP_pre(MAN_ARGS);
 static	int		  man_PP_pre(MAN_ARGS);
-static	void		  man_root_post(MAN_ARGS);
-static	int		  man_root_pre(MAN_ARGS);
+static	int		  man_RS_pre(MAN_ARGS);
+static	int		  man_SB_pre(MAN_ARGS);
 static	int		  man_SH_pre(MAN_ARGS);
+static	int		  man_SM_pre(MAN_ARGS);
 static	int		  man_SS_pre(MAN_ARGS);
 
 #ifdef __linux__
@@ -75,17 +83,17 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_PP_pre, NULL }, /* P */
 	{ man_IP_pre, NULL }, /* IP */
 	{ man_HP_pre, NULL }, /* HP */ 
-	{ NULL, NULL }, /* SM */
-	{ NULL, NULL }, /* SB */
-	{ NULL, NULL }, /* BI */
-	{ NULL, NULL }, /* IB */
-	{ NULL, NULL }, /* BR */
-	{ NULL, NULL }, /* RB */
+	{ man_SM_pre, NULL }, /* SM */
+	{ man_SB_pre, NULL }, /* SB */
+	{ man_alt_pre, NULL }, /* BI */
+	{ man_alt_pre, NULL }, /* IB */
+	{ man_alt_pre, NULL }, /* BR */
+	{ man_alt_pre, NULL }, /* RB */
 	{ NULL, NULL }, /* R */
-	{ NULL, NULL }, /* B */
-	{ NULL, NULL }, /* I */
-	{ NULL, NULL }, /* IR */
-	{ NULL, NULL }, /* RI */
+	{ man_B_pre, NULL }, /* B */
+	{ man_I_pre, NULL }, /* I */
+	{ man_alt_pre, NULL }, /* IR */
+	{ man_alt_pre, NULL }, /* RI */
 	{ NULL, NULL }, /* na */
 	{ NULL, NULL }, /* i */
 	{ man_br_pre, NULL }, /* sp */
@@ -93,9 +101,9 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ NULL, NULL }, /* fi */
 	{ NULL, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
-	{ NULL, NULL }, /* RS */
-	{ NULL, NULL }, /* DT */
-	{ NULL, NULL }, /* UC */
+	{ man_RS_pre, NULL }, /* RS */
+	{ man_ign_pre, NULL }, /* DT */
+	{ man_ign_pre, NULL }, /* UC */
 };
 
 
@@ -370,6 +378,82 @@ man_SH_pre(MAN_ARGS)
 
 /* ARGSUSED */
 static int
+man_alt_pre(MAN_ARGS)
+{
+	const struct man_node	*nn;
+	struct tag		*t;
+	int			 i;
+	struct htmlpair		 tagi, tagb, *tagp;
+
+	PAIR_CLASS_INIT(&tagi, "italic");
+	PAIR_CLASS_INIT(&tagb, "bold");
+
+	for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
+		switch (n->tok) {
+		case (MAN_BI):
+			tagp = i % 2 ? &tagi : &tagb;
+			break;
+		case (MAN_IB):
+			tagp = i % 2 ? &tagb : &tagi;
+			break;
+		case (MAN_RI):
+			tagp = i % 2 ? &tagi : NULL;
+			break;
+		case (MAN_IR):
+			tagp = i % 2 ? NULL : &tagi;
+			break;
+		case (MAN_BR):
+			tagp = i % 2 ? NULL : &tagb;
+			break;
+		case (MAN_RB):
+			tagp = i % 2 ? &tagb : NULL;
+			break;
+		default:
+			abort();
+			/* NOTREACHED */
+		}
+
+		if (i)
+			h->flags |= HTML_NOSPACE;
+
+		if (tagp) {
+			t = print_otag(h, TAG_SPAN, 1, tagp);
+			print_man_node(m, nn, h);
+			print_tagq(h, t);
+		} else
+			print_man_node(m, nn, h);
+	}
+
+	return(0);
+}
+
+
+/* ARGSUSED */
+static int
+man_SB_pre(MAN_ARGS)
+{
+	struct htmlpair	 tag;
+	
+	PAIR_CLASS_INIT(&tag, "small bold");
+	print_otag(h, TAG_SPAN, 1, &tag);
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+man_SM_pre(MAN_ARGS)
+{
+	struct htmlpair	 tag;
+	
+	PAIR_CLASS_INIT(&tag, "small");
+	print_otag(h, TAG_SPAN, 1, &tag);
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
 man_SS_pre(MAN_ARGS)
 {
 	struct htmlpair	 tag[3];
@@ -483,6 +567,8 @@ man_IP_pre(MAN_ARGS)
 
 	if (MAN_BLOCK == n->type) {
 		bufcat_su(h, "margin-left", &su);
+		SCALE_VS_INIT(&su, 1);
+		bufcat_su(h, "margin-top", &su);
 		bufcat_style(h, "clear", "both");
 		PAIR_STYLE_INIT(&tag, h);
 		print_otag(h, TAG_DIV, 1, &tag);
@@ -539,6 +625,8 @@ man_HP_pre(MAN_ARGS)
 
 	if (MAN_BLOCK == n->type) {
 		bufcat_su(h, "margin-left", &su);
+		SCALE_VS_INIT(&su, 1);
+		bufcat_su(h, "margin-top", &su);
 		bufcat_style(h, "clear", "both");
 		PAIR_STYLE_INIT(&tag, h);
 		print_otag(h, TAG_DIV, 1, &tag);
@@ -554,3 +642,62 @@ man_HP_pre(MAN_ARGS)
 	return(1);
 }
 
+
+/* ARGSUSED */
+static int
+man_B_pre(MAN_ARGS)
+{
+	struct htmlpair	 tag;
+
+	PAIR_CLASS_INIT(&tag, "bold");
+	print_otag(h, TAG_SPAN, 1, &tag);
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+man_I_pre(MAN_ARGS)
+{
+	struct htmlpair	 tag;
+
+	PAIR_CLASS_INIT(&tag, "italic");
+	print_otag(h, TAG_SPAN, 1, &tag);
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+man_ign_pre(MAN_ARGS)
+{
+
+	return(0);
+}
+
+
+/* ARGSUSED */
+static int
+man_RS_pre(MAN_ARGS)
+{
+	struct htmlpair	 tag;
+	struct roffsu	 su;
+
+	if (MAN_HEAD == n->type)
+		return(0);
+	else if (MAN_BODY == n->type)
+		return(1);
+
+	SCALE_HS_INIT(&su, INDENT);
+	bufcat_su(h, "margin-left", &su);
+
+	if (n->head->child) {
+		SCALE_VS_INIT(&su, 1);
+		a2width(n->head->child, &su);
+		bufcat_su(h, "margin-top", &su);
+	}
+
+	PAIR_STYLE_INIT(&tag, h);
+	print_otag(h, TAG_DIV, 1, &tag);
+	return(1);
+}