`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.

3 files changed, 54 insertions, 7 deletions

diff --git a/mdoc_html.c b/mdoc_html.c
index 3fd57d1f..fef64209 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.49 2009/12/02 10:16:55 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.50 2010/01/01 13:17:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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);
 }
 
diff --git a/mdoc_macro.c b/mdoc_macro.c
index 4ca9b5bc..fa4432e9 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.38 2009/10/26 17:05:44 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.39 2010/01/01 13:17:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -808,6 +808,17 @@ in_line(MACRO_PROT_ARGS)
 			cnt++;
 		if ( ! mdoc_word_alloc(m, line, la, p))
 			return(0);
+
+		/*
+		 * `Fl' macros have their scope re-opened with each new
+		 * word so that the `-' can be added to each one without
+		 * having to parse out spaces.
+		 */
+		if (0 == lastpunct && MDOC_Fl == tok) {
+			if ( ! rew_elem(m, tok))
+				return(0);
+			lastpunct = 1;
+		}
 	}
 
 	if (0 == lastpunct && ! rew_elem(m, tok))
diff --git a/mdoc_term.c b/mdoc_term.c
index eaafcb14..f465a559 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.102 2009/11/12 05:50:12 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.103 2010/01/01 13:17:59 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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);
 }