`Fl' has each argument be in a separate scope (thanks Ingo Schwarze).

Situation of `Fl [arg]* "" [arg]*' is fixed: empty arguments are ignored.  Note that OpenBSD crashes when this happens.
Situation of `Fl' is fixed wrt trailing whitespace.

1 files changed, 24 insertions, 3 deletions

diff --git a/mdoc_html.c b/mdoc_html.c
index 66ce08c7..719d9df5 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -659,12 +659,33 @@ mdoc_fl_pre(MDOC_ARGS)
 {
 	struct htmlpair	 tag;
 
+	/* `Cm' has no leading hyphen. */
+
+	if (MDOC_Cm == n->tok) {
+		PAIR_CLASS_INIT(&tag, "flag");
+		print_otag(h, TAG_SPAN, 1, &tag);
+		return(1);
+	}
+
+	/* A zero-length child shouldn't get a dash. */
+
+	if (n->child) {
+		assert(MDOC_TEXT == n->child->type);
+		assert(n->child->string);
+		if ('\0' == *n->child->string)
+			return(0);
+	}
+
 	PAIR_CLASS_INIT(&tag, "flag");
 	print_otag(h, TAG_SPAN, 1, &tag);
-	if (MDOC_Fl == n->tok) {
-		print_text(h, "\\-");
+
+	print_text(h, "\\-");
+
+	/* A blank `Fl' should incur a subsequent space. */
+
+	if (n->child)
 		h->flags |= HTML_NOSPACE;
-	}
+
 	return(1);
 }