From 7f36e58ef077e2bf3ff4592144b6be7ccc0db8de Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Fri, 16 Oct 2020 17:22:43 +0000
Subject: In HTML output, avoid printing a newline right after <pre> and right
 before </pre> because that resulted in vertical whitespace not requested by
 the manual page author.

Formatting bug reported by
Aman Verma <amanraoverma plus vim at gmail dot com> on discuss@.
---
 regress/man/HP/literal.out_html    | 18 ++++++----------
 regress/man/IP/literal.out_html    | 42 +++++++++++++-------------------------
 regress/man/RS/literal.out_html    | 18 ++++++----------
 regress/man/SY/literal.out_html    | 16 +++++----------
 regress/man/TP/literal.out_html    | 18 ++++++----------
 regress/mdoc/Bd/nf.out_html        | 18 ++++++----------
 regress/mdoc/Bd/paragraph.out_html |  6 ++----
 regress/mdoc/Rs/paragraph.out_html |  1 -
 regress/roff/sp/fill-man.out_html  |  6 ++----
 regress/roff/string/dotT.out_html  |  1 -
 10 files changed, 47 insertions(+), 97 deletions(-)

(limited to 'regress')

diff --git a/regress/man/HP/literal.out_html b/regress/man/HP/literal.out_html
index 08fb26b9..48089e36 100644
--- a/regress/man/HP/literal.out_html
+++ b/regress/man/HP/literal.out_html
@@ -1,18 +1,12 @@
 <p class="Pp HP">tag indented text</p>
 <p class="Pp">regular paragraph</p>
-<pre>
-literal
-text
-</pre>
-<pre>
-tag
+<pre>literal
+text</pre>
+<pre>tag
 literal
 hanged
-paragraph
-</pre>
-<pre>
-literal
-paragraph
-</pre>
+paragraph</pre>
+<pre>literal
+paragraph</pre>
 regular text
 <br/>
diff --git a/regress/man/IP/literal.out_html b/regress/man/IP/literal.out_html
index aa0536e7..ceb26a56 100644
--- a/regress/man/IP/literal.out_html
+++ b/regress/man/IP/literal.out_html
@@ -3,42 +3,32 @@
   <dd>indented regular text</dd>
 </dl>
 <p class="Pp">new regular paragraph</p>
-<pre>
-literal
-text
-</pre>
+<pre>literal
+text</pre>
 <dl class="Bl-tag">
   <dt id="tag~2"><a class="permalink" href="#tag~2">tag</a></dt>
   <dd>
-    <pre>
-indented
+    <pre>indented
 literal
-text
-    </pre>
+text</pre>
   </dd>
 </dl>
-<pre>
-new
+<pre>new
 literal
-paragraph
-</pre>
+paragraph</pre>
 regular text
 <section class="Ss">
 <h2 class="Ss" id="literal_into_indented_paragraph"><a class="permalink" href="#literal_into_indented_paragraph">literal
   into indented paragraph</a></h2>
 <p class="Pp">regular text</p>
-<pre>
-literal
-text
-</pre>
+<pre>literal
+text</pre>
 <dl class="Bl-tag">
   <dt id="tag~3"><a class="permalink" href="#tag~3">tag</a></dt>
   <dd>
-    <pre>
-indented
+    <pre>indented
 literal
-text
-    </pre>
+text</pre>
     indented regular text</dd>
 </dl>
 <p class="Pp">new regular paragraph</p>
@@ -50,17 +40,13 @@ text
 <dl class="Bl-tag">
   <dt id="tag~4"><a class="permalink" href="#tag~4">tag</a></dt>
   <dd>indented regular text
-    <pre>
-indented
+    <pre>indented
 literal
-text
-    </pre>
+text</pre>
   </dd>
 </dl>
-<pre>
-new
+<pre>new
 literal
-paragraph
-</pre>
+paragraph</pre>
 regular text
 <br/>
diff --git a/regress/man/RS/literal.out_html b/regress/man/RS/literal.out_html
index 7bd5431b..3429d849 100644
--- a/regress/man/RS/literal.out_html
+++ b/regress/man/RS/literal.out_html
@@ -1,18 +1,12 @@
   <br/>
   initial regular text</p>
-<pre>
-literal text
-before display
-</pre>
+<pre>literal text
+before display</pre>
 <div class="Bd-indent">
-<pre>
-This is a short line.
-This is a very long line that would wrap if it weren't in literal context.
-</pre>
+<pre>This is a short line.
+This is a very long line that would wrap if it weren't in literal context.</pre>
 </div>
-<pre>
-literal text
-after display
-</pre>
+<pre>literal text
+after display</pre>
 <p class="Pp">final regular text
   <br/>
diff --git a/regress/man/SY/literal.out_html b/regress/man/SY/literal.out_html
index 9b3e8486..3d63b516 100644
--- a/regress/man/SY/literal.out_html
+++ b/regress/man/SY/literal.out_html
@@ -7,23 +7,17 @@
   </tr>
 </table>
 middle regular text
-<pre>
-literal text
-before display
-</pre>
+<pre>literal text
+before display</pre>
 <table class="Nm">
   <tr>
     <td><code class="Nm">command</code></td>
     <td>
-    <pre>
-<i>arguments</i>
-    </pre>
+    <pre><i>arguments</i></pre>
     </td>
   </tr>
 </table>
-<pre>
-literal text
-after display
-</pre>
+<pre>literal text
+after display</pre>
 <p class="Pp">final regular text
   <br/>
diff --git a/regress/man/TP/literal.out_html b/regress/man/TP/literal.out_html
index 914c7b5c..71194770 100644
--- a/regress/man/TP/literal.out_html
+++ b/regress/man/TP/literal.out_html
@@ -3,23 +3,17 @@
   <dd>regular indented text</dd>
 </dl>
 <p class="Pp">regular paragraph</p>
-<pre>
-literal
-text
-</pre>
+<pre>literal
+text</pre>
 <dl class="Bl-tag">
   <dt id="tag~2"><a class="permalink" href="#tag~2">tag</a></dt>
   <dd>
-    <pre>
-indented
+    <pre>indented
 literal
-text
-    </pre>
+text</pre>
   </dd>
 </dl>
-<pre>
-literal
-paragraph
-</pre>
+<pre>literal
+paragraph</pre>
 regular text
 <br/>
diff --git a/regress/mdoc/Bd/nf.out_html b/regress/mdoc/Bd/nf.out_html
index 394eb7ed..83083353 100644
--- a/regress/mdoc/Bd/nf.out_html
+++ b/regress/mdoc/Bd/nf.out_html
@@ -1,20 +1,14 @@
-<pre>
-after .nf
-request
-</pre>
+<pre>after .nf
+request</pre>
 <p class="Pp">after .fi request</p>
 <div class="Bd Pp">
-<pre>
-in unfilled
-block
-</pre>
+<pre>in unfilled
+block</pre>
 after .fi request in unfilled block</div>
 after end of unfilled block
 <div class="Bd Pp">in filled block
-<pre>
-after .nf request
-in filled block
-</pre>
+<pre>after .nf request
+in filled block</pre>
 </div>
 after end of filled block
 <br/>
diff --git a/regress/mdoc/Bd/paragraph.out_html b/regress/mdoc/Bd/paragraph.out_html
index cc3491c9..22355ed1 100644
--- a/regress/mdoc/Bd/paragraph.out_html
+++ b/regress/mdoc/Bd/paragraph.out_html
@@ -8,13 +8,11 @@
 back to normal
 <p class="Pp">another paragraph</p>
 <div class="Bd Pp" id="unfilled">
-<pre>
-<a class="permalink" href="#unfilled">unfilled</a> literal
+<pre><a class="permalink" href="#unfilled">unfilled</a> literal
 display
 <mark id="upara"></mark>
 <a class="permalink" href="#upara">unfilled</a> literal
-paragraph
-</pre>
+paragraph</pre>
 </div>
 again back to normal
 <br/>
diff --git a/regress/mdoc/Rs/paragraph.out_html b/regress/mdoc/Rs/paragraph.out_html
index ba5fb63a..bfb0a724 100644
--- a/regress/mdoc/Rs/paragraph.out_html
+++ b/regress/mdoc/Rs/paragraph.out_html
@@ -13,4 +13,3 @@
 <p class="Pp">in a paragraph:</p>
 <p class="Pp"><cite class="Rs"><span class="RsA">another author</span>,
     <i class="RsB">another book</i>.</cite></p>
-<pre>
diff --git a/regress/roff/sp/fill-man.out_html b/regress/roff/sp/fill-man.out_html
index 054b6359..213d4601 100644
--- a/regress/roff/sp/fill-man.out_html
+++ b/regress/roff/sp/fill-man.out_html
@@ -1,7 +1,5 @@
 <p class="Pp">switch to no-fill mode:</p>
-<pre>
-in no-fill mode:
+<pre>in no-fill mode:
 
 back to
-fill mode:
-</pre>
+fill mode:</pre>
diff --git a/regress/roff/string/dotT.out_html b/regress/roff/string/dotT.out_html
index 0a019b20..51ab1411 100644
--- a/regress/roff/string/dotT.out_html
+++ b/regress/roff/string/dotT.out_html
@@ -1,3 +1,2 @@
 <p class="Pp">We are using the html device.</p>
 <p class="Pp">The device name can be overridden.</p>
-<pre>
-- 
cgit v1.2.3-56-ge451