correctly handle scaling units after .PD

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index dd1d9970ff09a7f385420b0584783eb18bffd0fb..ca51049eec53b7924e409552fc724053087a7c03 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.214 2014/11/30 05:29:00 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.216 2014/12/02 10:08:06 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,11 +26,10 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
+#include "mdoc.h"
 #include "out.h"
 #include "html.h"
-#include "mdoc.h"
 #include "main.h"
 
 #define        INDENT           5
@@ -1202,7 +1201,8 @@ mdoc_bd_pre(MDOC_ARGS)
                default:
                        break;
                }
-               if (nn->next && nn->next->line == nn->line)
+               if (h->flags & HTML_NONEWLINE ||
+                   (nn->next && ! (nn->next->flags & MDOC_LINE)))
                        continue;
                else if (nn->next)
                        print_text(h, "\n");