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 o9A9xnpV016664
	for <source@mdocml.bsd.lv>; Sun, 10 Oct 2010 05:59:49 -0400 (EDT)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id o9A9xnK7011289;
	Sun, 10 Oct 2010 05:59:49 -0400 (EDT)
Date: Sun, 10 Oct 2010 05:59:49 -0400 (EDT)
Message-Id: <201010100959.o9A9xnK7011289@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: `Sm' no longer produces a linebreak when used in `Bd'.
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
`Sm' no longer produces a linebreak when used in `Bd'.

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.58
retrieving revision 1.59
diff -LTODO -LTODO -u -p -r1.58 -r1.59
--- TODO
+++ TODO
@@ -109,9 +109,6 @@
   is just "o\bo".
   see for example OpenBSD ksh(1)
 
-- .Sm should *not* produce as a blank line in .Bd -literal
-  see for example "Brace expansion" in OpenBSD ksh(1)
-
 - The characters "|" and "\*(Ba" should never be bold,
   not even in the middle of a word, e.g. ".Cm b\*(Bac" in
   "mknod [-m mode] name b|c major minor"
Index: mdoc_html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_html.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.110 -r1.111
--- mdoc_html.c
+++ mdoc_html.c
@@ -1323,6 +1323,8 @@ mdoc_bd_pre(MDOC_ARGS)
 		 * anyway, so don't sweat it.
 		 */
 		switch (nn->tok) {
+		case (MDOC_Sm):
+			/* FALLTHROUGH */
 		case (MDOC_br):
 			/* FALLTHROUGH */
 		case (MDOC_sp):
@@ -1603,7 +1605,16 @@ mdoc_sm_pre(MDOC_ARGS)
 
 	assert(n->child && MDOC_TEXT == n->child->type);
 	if (0 == strcmp("on", n->child->string)) {
-		/* FIXME: no p->col to check... */
+		/* 
+		 * FIXME: no p->col to check.  Thus, if we have
+		 *  .Bd -literal
+		 *  .Sm off
+		 *  1 2
+		 *  .Sm on
+		 *  3
+		 *  .Ed
+		 * the "3" is preceded by a space.
+		 */
 		h->flags &= ~HTML_NOSPACE;
 		h->flags &= ~HTML_NONOSPACE;
 	} else
Index: mdoc_term.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_term.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.192 -r1.193
--- mdoc_term.c
+++ mdoc_term.c
@@ -1584,6 +1584,8 @@ termp_bd_pre(DECL_ARGS)
 		 * anyway, so don't sweat it.
 		 */
 		switch (nn->tok) {
+		case (MDOC_Sm):
+			/* FALLTHROUGH */
 		case (MDOC_br):
 			/* FALLTHROUGH */
 		case (MDOC_sp):
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv