===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.168
retrieving revision 1.174
diff -u -p -r1.168 -r1.174
--- mandoc/mdoc_html.c	2011/05/17 11:34:31	1.168
+++ mandoc/mdoc_html.c	2011/07/23 22:57:13	1.174
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.168 2011/05/17 11:34:31 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.174 2011/07/23 22:57:13 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -407,7 +407,6 @@ print_mdoc_node(MDOC_ARGS)
 {
 	int		 child;
 	struct tag	*t;
-	struct htmlpair	 tag;
 
 	child = 1;
 	t = h->tags.head;
@@ -434,9 +433,7 @@ print_mdoc_node(MDOC_ARGS)
 			h->flags |= HTML_NOSPACE;
 		return;
 	case (MDOC_EQN):
-		PAIR_CLASS_INIT(&tag, "eqn");
-		print_otag(h, TAG_SPAN, 1, &tag);
-		print_text(h, n->eqn->data);
+		print_eqn(h, n->eqn);
 		break;
 	case (MDOC_TBL):
 		/*
@@ -610,6 +607,7 @@ mdoc_sh_pre(MDOC_ARGS)
 		return(1);
 
 	bufinit(h);
+	bufcat(h, "x");
 	for (n = n->child; n; n = n->next) {
 		bufcat_id(h, n->string);
 		if (n->next)
@@ -636,6 +634,7 @@ mdoc_ss_pre(MDOC_ARGS)
 		return(1);
 
 	bufinit(h);
+	bufcat(h, "x");
 	for (n = n->child; n; n = n->next) {
 		bufcat_id(h, n->string);
 		if (n->next)
@@ -1171,6 +1170,7 @@ mdoc_sx_pre(MDOC_ARGS)
 	struct htmlpair	 tag[2];
 
 	bufinit(h);
+	bufcat(h, "#x");
 	for (n = n->child; n; n = n->next) {
 		bufcat_id(h, n->string);
 		if (n->next)
@@ -1632,8 +1632,9 @@ mdoc_sp_pre(MDOC_ARGS)
 	SCALE_VS_INIT(&su, 1);
 
 	if (MDOC_sp == n->tok) {
-		if (n->child)
-			a2roffsu(n->child->string, &su, SCALE_VS);
+		if (NULL != (n = n->child))
+			if ( ! a2roffsu(n->string, &su, SCALE_VS))
+				SCALE_VS_INIT(&su, atoi(n->string));
 	} else
 		su.scale = 0;
 
@@ -1665,10 +1666,11 @@ mdoc_lk_pre(MDOC_ARGS)
 
 	print_otag(h, TAG_A, 2, tag);
 
-	for (n = n->next; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
+	if (NULL == n->next)
 		print_text(h, n->string);
-	}
+
+	for (n = n->next; n; n = n->next)
+		print_text(h, n->string);
 
 	return(0);
 }