`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, 16 insertions, 1 deletions

diff --git a/mdoc_term.c b/mdoc_term.c
index de73b311..82d32adc 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1019,8 +1019,23 @@ termp_fl_pre(DECL_ARGS)
 {
 
 	term_fontpush(p, TERMFONT_BOLD);
+
+	/* 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);
+	}
+
 	term_word(p, "\\-");
-	p->flags |= TERMP_NOSPACE;
+
+	/* A blank `Fl' should incur a subsequent space. */
+
+	if (n->child)
+		p->flags |= TERMP_NOSPACE;
+
 	return(1);
 }