From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id p0PGKPQa025147
	for <source@mdocml.bsd.lv>; Tue, 25 Jan 2011 11:20:25 -0500 (EST)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id p0PGKPeH004751;
	Tue, 25 Jan 2011 11:20:25 -0500 (EST)
Date: Tue, 25 Jan 2011 11:20:25 -0500 (EST)
Message-Id: <201101251620.p0PGKPeH004751@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Arguments to `Bsx' and friends are separated by a non-breaking 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Arguments to `Bsx' and friends are separated by a non-breaking space.
This removes a TODO raised by schwarze@.

Modified Files:
--------------
    mdocml:
        TODO
        mdoc_html.c
        mdoc_term.c

Revision Data
-------------
Index: TODO
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/TODO,v
retrieving revision 1.85
retrieving revision 1.86
diff -LTODO -LTODO -u -p -r1.85 -r1.86
--- TODO
+++ 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).
Index: mdoc_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_html.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.147 -r1.148
--- mdoc_html.c
+++ 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);
 }
 
 
Index: mdoc_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_term.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.213 -r1.214
--- mdoc_term.c
+++ 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);
 }
 
 
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv