===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.48
retrieving revision 1.51
diff -u -p -r1.48 -r1.51
--- mandoc/mdoc_html.c	2009/11/16 08:46:59	1.48
+++ mandoc/mdoc_html.c	2010/01/01 13:35:30	1.51
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.48 2009/11/16 08:46:59 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.51 2010/01/01 13:35:30 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -661,10 +661,19 @@ mdoc_fl_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "flag");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	if (MDOC_Fl == n->tok) {
-		print_text(h, "\\-");
+
+	/* `Cm' has no leading hyphen. */
+
+	if (MDOC_Cm == n->tok)
+		return(1);
+
+	print_text(h, "\\-");
+
+	/* A blank `Fl' should incur a subsequent space. */
+
+	if (n->child)
 		h->flags |= HTML_NOSPACE;
-	}
+
 	return(1);
 }
 
@@ -1573,9 +1582,9 @@ mdoc_vt_pre(MDOC_ARGS)
 	struct roffsu	 su;
 
 	if (SEC_SYNOPSIS == n->sec) {
-		if (n->next && MDOC_Vt != n->next->tok) {
+		if (n->prev && MDOC_Vt != n->prev->tok) {
 			SCALE_VS_INIT(&su, 1);
-			bufcat_su(h, "margin-bottom", &su);
+			bufcat_su(h, "margin-top", &su);
 			PAIR_STYLE_INIT(&tag, h);
 			print_otag(h, TAG_DIV, 1, &tag);
 		} else