Arguments to `Bsx' and friends are separated by a non-breaking space.

This removes a TODO raised by schwarze@.

3 files changed, 13 insertions, 6 deletions

diff --git a/TODO b/TODO
index c745ae59..c67f84b8 100644
--- a/TODO
+++ b/TODO
@@ -225,9 +225,6 @@
   should be "NetBSD 1.0A", not "NetBSD 1.0a",
   see OpenBSD ccdconfig(8).
 
-- The space character joining .Dx .Fx .Nx .Ox (are these all?) to its
-  argument is non-breaking.  See the cdio(1) HISTORY and many others.
-
 - In .Bl -tag, if a tag exceeds the right margin and must be continued
   on the next line, it must be indented by -width, not width+1;
   see "rule block|pass" in OpenBSD ifconfig(8).
diff --git a/mdoc_html.c b/mdoc_html.c
index 5accf6f8..831580ec 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -823,8 +823,14 @@ mdoc_xx_pre(MDOC_ARGS)
 
 	PAIR_CLASS_INIT(&tag, "unix");
 	print_otag(h, TAG_SPAN, 1, &tag);
+
 	print_text(h, pp);
-	return(1);
+	if (n->child) {
+		h->flags |= HTML_KEEP;
+		print_text(h, n->child->string);
+		h->flags &= ~HTML_KEEP;
+	}
+	return(0);
 }
 
 
diff --git a/mdoc_term.c b/mdoc_term.c
index 703f2d06..942753b0 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1728,9 +1728,13 @@ termp_xx_pre(DECL_ARGS)
 		break;
 	}
 
-	assert(pp);
 	term_word(p, pp);
-	return(1);
+	if (n->child) {
+		p->flags |= TERMP_KEEP;
+		term_word(p, n->child->string);
+		p->flags &= ~TERMP_KEEP;
+	}
+	return(0);
 }