===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.57
retrieving revision 1.61
diff -u -p -r1.57 -r1.61
--- mandoc/mdoc_html.c	2010/04/05 08:51:56	1.57
+++ mandoc/mdoc_html.c	2010/04/08 08:17:55	1.61
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.57 2010/04/05 08:51:56 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.61 2010/04/08 08:17:55 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -666,10 +666,10 @@ mdoc_fl_pre(MDOC_ARGS)
 
 	print_text(h, "\\-");
 
-	/* A blank `Fl' should incur a subsequent space. */
-
 	if (n->child)
 		h->flags |= HTML_NOSPACE;
+	else if (n->next && n->next->line == n->line)
+		h->flags |= HTML_NOSPACE;
 
 	return(1);
 }
@@ -1116,6 +1116,8 @@ mdoc_bl_pre(MDOC_ARGS)
 {
 	struct ord	*ord;
 
+	if (MDOC_HEAD == n->type)
+		return(0);
 	if (MDOC_BLOCK != n->type)
 		return(1);
 	if (MDOC_Enum != a2list(n))
@@ -1386,6 +1388,7 @@ mdoc_bd_pre(MDOC_ARGS)
 		}
 
 	/* FIXME: -centered, etc. formatting. */
+	/* FIXME: does not respect -offset ??? */
 
 	if (MDOC_BLOCK == n->type) {
 		bufcat_su(h, "margin-left", &su);
@@ -2219,8 +2222,6 @@ mdoc__x_pre(MDOC_ARGS)
 		break;
 	case(MDOC__T):
 		PAIR_CLASS_INIT(&tag[0], "ref-title");
-		print_text(h, "\\(lq");
-		h->flags |= HTML_NOSPACE;
 		break;
 	case(MDOC__U):
 		PAIR_CLASS_INIT(&tag[0], "link-ref");
@@ -2249,14 +2250,8 @@ static void
 mdoc__x_post(MDOC_ARGS)
 {
 
+	/* TODO: %U */
+
 	h->flags |= HTML_NOSPACE;
-	switch (n->tok) {
-	case (MDOC__T):
-		print_text(h, "\\(rq");
-		h->flags |= HTML_NOSPACE;
-		break;
-	default:
-		break;
-	}
 	print_text(h, n->next ? "," : ".");
 }