When in a <PRE>, don't print out the <BR> before lines that have leading

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 8b1478dedd5fe489f880fb023998932fbb557723..4d42a5b7a77184e99597472016a278f799534019 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.148 2011/01/25 16:20:24 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.149 2011/01/29 14:49:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -422,8 +422,14 @@ print_mdoc_node(MDOC_ARGS)
        case (MDOC_TEXT):
                /* No tables in this mode... */
                assert(NULL == h->tblt);
+
+               /*
+                * Make sure that if we're in a literal mode already
+                * (i.e., within a <PRE>) don't print the newline.
+                */
                if (' ' == *n->string && MDOC_LINE & n->flags)
-                       print_otag(h, TAG_BR, 0, NULL);
+                       if ( ! (HTML_LITERAL & h->flags))
+                               print_otag(h, TAG_BR, 0, NULL);
                print_text(h, n->string);
                return;
        case (MDOC_TBL):
@@ -1175,7 +1181,7 @@ static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
-       int                      comp;
+       int                      comp, sv;
        const struct mdoc_node  *nn;
        struct roffsu            su;
 
@@ -1214,6 +1220,11 @@ mdoc_bd_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[1], "lit display");
        print_otag(h, TAG_PRE, 2, tag);
 
+       /* This can be recursive: save & set our literal state. */
+
+       sv = h->flags & HTML_LITERAL;
+       h->flags |= HTML_LITERAL;
+
        for (nn = n->child; nn; nn = nn->next) {
                print_mdoc_node(m, nn, h);
                /*
@@ -1250,6 +1261,9 @@ mdoc_bd_pre(MDOC_ARGS)
                h->flags |= HTML_NOSPACE;
        }
 
+       if (0 == sv)
+               h->flags &= ~HTML_LITERAL;
+
        return(0);
 }