correctly handle scaling units after .PD

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 706b05603da95f0849f478cb2c8b4418c14f857c..ca51049eec53b7924e409552fc724053087a7c03 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.215 2014/12/01 08:05:52 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>
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -1201,7 +1201,8 @@ mdoc_bd_pre(MDOC_ARGS)
                default:
                        break;
                }
                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");
                        continue;
                else if (nn->next)
                        print_text(h, "\n");