When .Sm is called without an argument, groff toggles the spacing mode,

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 07a2e3ec5ffbb223fad3d2f894a3e0c6ac3c4bcc..7133330287bd6277857d4675eba70baec787ee39 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.191 2014/07/02 03:48:07 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.192 2014/07/02 19:55:10 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -1524,23 +1524,16 @@ static int
 mdoc_sm_pre(MDOC_ARGS)
 {
 
 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.  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;
+       if (NULL == n->child)
+               h->flags ^= HTML_NONOSPACE;
+       else if (0 == strcmp("on", n->child->string))

                h->flags &= ~HTML_NONOSPACE;
                h->flags &= ~HTML_NONOSPACE;

-       } else
+       else

                h->flags |= HTML_NONOSPACE;
 
                h->flags |= HTML_NONOSPACE;
 

+       if ( ! (HTML_NONOSPACE & h->flags))
+               h->flags &= ~HTML_NOSPACE;
+

        return(0);
 }
 
        return(0);
 }