Explicit block closure macros clobber next-line block head scope,

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 69daf4d7ebec50c8e91251d77c4acd504dcd9b69..1455e1e4aec9bcc4970466d754a45888d646c154 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,6 +1,6 @@
-/*     $Id: man_html.c,v 1.103 2014/09/27 10:56:18 kristaps Exp $ */
+/*     $Id: man_html.c,v 1.107 2014/12/04 02:05:42 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>

  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -25,11 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

+#include "man.h"

 #include "out.h"
 #include "html.h"
 #include "out.h"
 #include "html.h"

-#include "man.h"

 #include "main.h"
 
 /* TODO: preserve ident widths. */
 #include "main.h"
 
 /* TODO: preserve ident widths. */


@@ -213,21 +212,14 @@ print_man_node(MAN_ARGS)
                man_root_pre(man, n, mh, h);
                break;
        case MAN_TEXT:
                man_root_pre(man, n, mh, h);
                break;
        case MAN_TEXT:

-               /*
-                * If we have a blank line, output a vertical space.
-                * If we have a space as the first character, break
-                * before printing the line's data.
-                */

                if ('\0' == *n->string) {
                        print_paragraph(h);
                        return;
                }
                if ('\0' == *n->string) {
                        print_paragraph(h);
                        return;
                }

-
-               if (' ' == *n->string && MAN_LINE & n->flags)
-                       print_otag(h, TAG_BR, 0, NULL);
-               else if (MANH_LITERAL & mh->fl && n->prev)
+               if (n->flags & MAN_LINE && (*n->string == ' ' || 
+                   (n->prev != NULL && mh->fl & MANH_LITERAL &&
+                    ! (h->flags & HTML_NONEWLINE))))

                        print_otag(h, TAG_BR, 0, NULL);
                        print_otag(h, TAG_BR, 0, NULL);

-

                print_text(h, n->string);
                return;
        case MAN_EQN:
                print_text(h, n->string);
                return;
        case MAN_EQN:


@@ -290,7 +282,7 @@ a2width(const struct man_node *n, struct roffsu *su)
 
        if (MAN_TEXT != n->type)
                return(0);
 
        if (MAN_TEXT != n->type)
                return(0);

-       if (a2roffsu(n->string, su, SCALE_BU))
+       if (a2roffsu(n->string, su, SCALE_EN))

                return(1);
 
        return(0);
                return(1);
 
        return(0);