adapt to new <p> output logic (html.c rev. 1.131)

27 files changed, 27 insertions, 79 deletions

diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc
index 590421caf1d..06cb40ee255 100644
--- a/regress/usr.bin/mandoc/Makefile.inc
+++ b/regress/usr.bin/mandoc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.24 2017/07/04 14:53:23 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.25 2019/09/03 18:17:50 schwarze Exp $
 
 .include "Makefile.sub"
 
@@ -89,7 +89,7 @@ htmlval: ${_HTMLVALS}
 
 .in.mandoc_html:
 	@${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} | \
-		sed -n '/^BEGINTEST/,/^ENDTEST/p' > ${.TARGET}
+		sed -n '/BEGINTEST/,/ENDTEST/p' | sed '1d;$$d' > ${.TARGET}
 
 .mandoc_html.diff_html:
 	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_html$/out_html/} ${.IMPSRC}
@@ -277,7 +277,7 @@ ${t}.out_utf8:
 .for t in ${HTML_TARGETS}
 ${t}.out_html: ${t}.in
 	${MANDOC} ${MOPTS} -Thtml ${.ALLSRC} | \
-		sed -n '/^BEGINTEST/,/^ENDTEST/p' > ${.TARGET}
+		sed -n '/BEGINTEST/,/ENDTEST/p' | sed '1d;$$d' > ${.TARGET}
 .endfor
 
 .for t in ${REGRESS_TARGETS}
diff --git a/regress/usr.bin/mandoc/char/space/zerowidth.out_html b/regress/usr.bin/mandoc/char/space/zerowidth.out_html
index f317aafda4b..afca2d1711b 100644
--- a/regress/usr.bin/mandoc/char/space/zerowidth.out_html
+++ b/regress/usr.bin/mandoc/char/space/zerowidth.out_html
@@ -1,6 +1,4 @@
-BEGINTEST
 zero width space \& between A and B: AB
 hyphenation allowed \% between A and B: AB
 half-narrow (1/12) space \^ between A and B: AB
 narrow space (1/6) \| between A and B: AB
-ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/ascii.out_html b/regress/usr.bin/mandoc/char/unicode/ascii.out_html
index 7ebda578849..264fa356d1a 100644
--- a/regress/usr.bin/mandoc/char/unicode/ascii.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/ascii.out_html
@@ -1,4 +1,3 @@
-BEGINTEST
 """	QUOTATION MARK
 ###	NUMBER SIGN
 $$$	DOLLAR SIGN
@@ -19,4 +18,3 @@ ____	LOW LINE
 ||||	VERTICAL LINE
 }}}	RIGHT CURLY BRACKET
 ~~~~	TILDE
-ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/invalid.out_html b/regress/usr.bin/mandoc/char/unicode/invalid.out_html
index 0de972f1836..f22176ed513 100644
--- a/regress/usr.bin/mandoc/char/unicode/invalid.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/invalid.out_html
@@ -1,8 +1,6 @@
-BEGINTEST
 too short: >.<
 just right: >+<
 too long: >..<
 too large: >..<
 trailing garbage: ><
 not unicode: >_.↑.⇑<
-ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/latin1.out_html b/regress/usr.bin/mandoc/char/unicode/latin1.out_html
index db54b987b68..a50dbf0ffe6 100644
--- a/regress/usr.bin/mandoc/char/unicode/latin1.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/latin1.out_html
@@ -1,4 +1,3 @@
-BEGINTEST
 ¡¡	INVERTED EXCLAMATION MARK
 ¢¢	CENT SIGN
 ££	POUND SIGN
@@ -93,4 +92,3 @@ BEGINTEST
 ýý	LATIN SMALL LETTER Y WITH ACUTE
 þþ	LATIN SMALL LETTER THORN
 ÿÿ	LATIN SMALL LETTER Y WITH DIAERESIS
-ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html b/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html
index 5f3b3b1782f..dea123b9787 100644
--- a/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/latin1diff.out_html
@@ -1,3 +1 @@
-BEGINTEST
 ¯¯	MACRON
-ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/named.out_html b/regress/usr.bin/mandoc/char/unicode/named.out_html
index 5d77d840152..22220902bb7 100644
--- a/regress/usr.bin/mandoc/char/unicode/named.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/named.out_html
@@ -1,4 +1,3 @@
-BEGINTEST
 ıı	LATIN SMALL LETTER DOTLESS I
 IJIJ	LATIN CAPITAL LIGATURE IJ
 ijij	LATIN SMALL LIGATURE IJ
@@ -167,4 +166,3 @@ BEGINTEST
 ♦♦	BLACK DIAMOND SUIT
 ⟨⟨	MATHEMATICAL LEFT ANGLE BRACKET
 ⟩⟩	MATHEMATICAL RIGHT ANGLE BRACKET
-ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/namediff.out_html b/regress/usr.bin/mandoc/char/unicode/namediff.out_html
index 4afee5ce711..c2f2c3e6cac 100644
--- a/regress/usr.bin/mandoc/char/unicode/namediff.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/namediff.out_html
@@ -1,4 +1,3 @@
-BEGINTEST
 ‾‾ OVERLINE
 ℏℏℏ PLANCK CONSTANT OVER TWO PI
 ↕↕ UP DOWN ARROW
@@ -22,4 +21,3 @@ BEGINTEST
 ⎫⎫ RIGHT CURLY BRACKET UPPER HOOK
 ⎬⎬ RIGHT CURLY BRACKET MIDDLE PIECE
 ⎭⎭ RIGHT CURLY BRACKET LOWER HOOK
-ENDTEST
diff --git a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html
index a865d2d1917..6a87860c53b 100644
--- a/regress/usr.bin/mandoc/char/unicode/nogroff.out_html
+++ b/regress/usr.bin/mandoc/char/unicode/nogroff.out_html
@@ -1,4 +1,3 @@
-BEGINTEST
 ��	<control> NULL
 ��	<control> START OF HEADING
 ��	<control> BELL
@@ -34,4 +33,3 @@ BEGINTEST
 􏿽	<Plane 16 Private Use, Last>
 	<undefined>
 	<undefined>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/man/HP/literal.out_html b/regress/usr.bin/mandoc/man/HP/literal.out_html
index d40ee9a5847..08fb26b96f9 100644
--- a/regress/usr.bin/mandoc/man/HP/literal.out_html
+++ b/regress/usr.bin/mandoc/man/HP/literal.out_html
@@ -1,4 +1,3 @@
-BEGINTEST before hanged paragraph
 <p class="Pp HP">tag indented text</p>
 <p class="Pp">regular paragraph</p>
 <pre>
@@ -17,4 +16,3 @@ paragraph
 </pre>
 regular text
 <br/>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/man/IP/literal.out_html b/regress/usr.bin/mandoc/man/IP/literal.out_html
index dce47df1e77..b61fc843f96 100644
--- a/regress/usr.bin/mandoc/man/IP/literal.out_html
+++ b/regress/usr.bin/mandoc/man/IP/literal.out_html
@@ -1,4 +1,3 @@
-BEGINTEST before indentation
 <dl class="Bl-tag">
   <dt>tag</dt>
   <dd>indented regular text</dd>
@@ -27,7 +26,7 @@ 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>
-regular text
+<p class="Pp">regular text</p>
 <pre>
 literal
 text
@@ -47,7 +46,7 @@ text
 <section class="Ss">
 <h2 class="Ss" id="literal_out_of_indented_paragraph"><a class="permalink" href="#literal_out_of_indented_paragraph">literal
   out of indented paragraph</a></h2>
-regular text
+<p class="Pp">regular text</p>
 <dl class="Bl-tag">
   <dt>tag</dt>
   <dd>indented regular text
@@ -65,4 +64,3 @@ paragraph
 </pre>
 regular text
 <br/>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/man/RS/literal.out_html b/regress/usr.bin/mandoc/man/RS/literal.out_html
index 9475f40709e..7bd5431bf31 100644
--- a/regress/usr.bin/mandoc/man/RS/literal.out_html
+++ b/regress/usr.bin/mandoc/man/RS/literal.out_html
@@ -1,6 +1,5 @@
-BEGINTEST
-<br/>
-initial regular text
+  <br/>
+  initial regular text</p>
 <pre>
 literal text
 before display
@@ -15,6 +14,5 @@ This is a very long line that would wrap if it weren't in literal context.
 literal text
 after display
 </pre>
-final regular text
-<br/>
-ENDTEST
+<p class="Pp">final regular text
+  <br/>
diff --git a/regress/usr.bin/mandoc/man/RS/paragraph.out_html b/regress/usr.bin/mandoc/man/RS/paragraph.out_html
index 8b518698a07..24bd7c5f1fc 100644
--- a/regress/usr.bin/mandoc/man/RS/paragraph.out_html
+++ b/regress/usr.bin/mandoc/man/RS/paragraph.out_html
@@ -1,8 +1,6 @@
-BEGINTEST before paragraph
 <p class="Pp">regular paragraph</p>
 <div class="Bd-indent">indented paragraph
 <p class="Pp">nested paragraph</p>
 </div>
 regular text after display
 <br/>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/man/SH/paragraph.out_html b/regress/usr.bin/mandoc/man/SH/paragraph.out_html
index 6423855ade4..abe932b4d5a 100644
--- a/regress/usr.bin/mandoc/man/SH/paragraph.out_html
+++ b/regress/usr.bin/mandoc/man/SH/paragraph.out_html
@@ -1,10 +1,8 @@
-BEGINTEST
 </section>
 <section class="Sh">
 <h1 class="Sh" id="DESCRIPTION"><a class="permalink" href="#DESCRIPTION">DESCRIPTION</a></h1>
-This text immediately follows a section header.
+<p class="Pp">This text immediately follows a section header.</p>
 <p class="Pp">This is a paragraph.</p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/man/SS/paragraph.out_html b/regress/usr.bin/mandoc/man/SS/paragraph.out_html
index fa385635e2f..22591deb759 100644
--- a/regress/usr.bin/mandoc/man/SS/paragraph.out_html
+++ b/regress/usr.bin/mandoc/man/SS/paragraph.out_html
@@ -1,11 +1,9 @@
-BEGINTEST
 <section class="Ss">
 <h2 class="Ss" id="First_subsection"><a class="permalink" href="#First_subsection">First
   subsection</a></h2>
-This text immediately follows a subsection header.
+<p class="Pp">This text immediately follows a subsection header.</p>
 <p class="Pp">This is a paragraph.</p>
 </section>
 <section class="Ss">
 <h2 class="Ss" id="Second_subsection"><a class="permalink" href="#Second_subsection">Second
   subsection</a></h2>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/man/SY/literal.out_html b/regress/usr.bin/mandoc/man/SY/literal.out_html
index 5daf74ef581..9b3e84866b2 100644
--- a/regress/usr.bin/mandoc/man/SY/literal.out_html
+++ b/regress/usr.bin/mandoc/man/SY/literal.out_html
@@ -1,6 +1,5 @@
-BEGINTEST
-<br/>
-initial regular text
+  <br/>
+  initial regular text</p>
 <table class="Nm">
   <tr>
     <td><code class="Nm">command</code></td>
@@ -26,6 +25,5 @@ before display
 literal text
 after display
 </pre>
-final regular text
-<br/>
-ENDTEST
+<p class="Pp">final regular text
+  <br/>
diff --git a/regress/usr.bin/mandoc/man/TP/literal.out_html b/regress/usr.bin/mandoc/man/TP/literal.out_html
index 14bfb834826..7f5b1c1fb5c 100644
--- a/regress/usr.bin/mandoc/man/TP/literal.out_html
+++ b/regress/usr.bin/mandoc/man/TP/literal.out_html
@@ -1,4 +1,3 @@
-BEGINTEST before indentation
 <dl class="Bl-tag">
   <dt>tag</dt>
   <dd>regular indented text</dd>
@@ -24,4 +23,3 @@ paragraph
 </pre>
 regular text
 <br/>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/nf.out_html b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_html
index 31642e07054..394eb7edefa 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/nf.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Bd/nf.out_html
@@ -1,9 +1,8 @@
-BEGINTEST initial text
 <pre>
 after .nf
 request
 </pre>
-after .fi request
+<p class="Pp">after .fi request</p>
 <div class="Bd Pp">
 <pre>
 in unfilled
@@ -19,4 +18,3 @@ in filled block
 </div>
 after end of filled block
 <br/>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html
index c2c6993ed62..bec13a8864f 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Bd/paragraph.out_html
@@ -1,4 +1,3 @@
-BEGINTEST initial text
 <p class="Pp">normal paragraph</p>
 <div class="Bd Pp">filled display
 <p class="Pp">paragraph in display</p>
@@ -16,4 +15,3 @@ paragraph
 </div>
 again back to normal
 <br/>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html
index e86b979a463..cd22d5670a2 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Bf/paragraph.out_html
@@ -1,6 +1,4 @@
-BEGINTEST
 <p class="Pp">normal text</p>
 <div class="Bf Li">literal text
 <p class="Pp">literal paragraph</p>
 </div>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_html b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_html
index b1a1d4dabb6..3db40161041 100644
--- a/regress/usr.bin/mandoc/mdoc/D1/spacing.out_html
+++ b/regress/usr.bin/mandoc/mdoc/D1/spacing.out_html
@@ -1,8 +1,6 @@
-BEGINTEST
 <p class="Pp">preceding paragraph</p>
 <div class="Bd Bd-indent">spacing in and around one-line displays</div>
 empty display:
 <div class="Bd Bd-indent"></div>
 following text
 <br/>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html
index 251d0d0c87d..ba5fb63a8de 100644
--- a/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Rs/paragraph.out_html
@@ -1,18 +1,16 @@
-BEGINTEST
-<br/>
-initial reference: <cite class="Rs"><span class="RsA">author name</span>,
-  <i class="RsB">book title</i>.</cite>
+  <br/>
+  initial reference: <cite class="Rs"><span class="RsA">author name</span>,
+    <i class="RsB">book title</i>.</cite></p>
 <p class="Pp">in a paragraph: <cite class="Rs"><span class="RsA">another
     author</span>, <i class="RsB">another book</i>.</cite></p>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="SEE_ALSO"><a class="permalink" href="#SEE_ALSO">SEE
   ALSO</a></h1>
-initial reference:
+<p class="Pp">initial reference:</p>
 <p class="Pp"><cite class="Rs"><span class="RsA">author name</span>,
     <i class="RsB">book title</i>.</cite></p>
 <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>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html
index 3b5154deb34..82ede5beac5 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html
+++ b/regress/usr.bin/mandoc/mdoc/Sh/paragraph.out_html
@@ -1,11 +1,9 @@
-BEGINTEST
 <p class="Pp">descriptive text</p>
 <section class="Ss">
 <h2 class="Ss" id="Subsection"><a class="permalink" href="#Subsection">Subsection</a></h2>
-initial subsection text
+<p class="Pp">initial subsection text</p>
 <p class="Pp">subsection paragraph</p>
 </section>
 </section>
 <section class="Sh">
 <h1 class="Sh" id="EXAMPLES"><a class="permalink" href="#EXAMPLES">EXAMPLES</a></h1>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/roff/esc/f.out_html b/regress/usr.bin/mandoc/roff/esc/f.out_html
index 332e0f008cc..887175f66fd 100644
--- a/regress/usr.bin/mandoc/roff/esc/f.out_html
+++ b/regress/usr.bin/mandoc/roff/esc/f.out_html
@@ -1,6 +1,4 @@
-BEGINTEST
 numbers: <b><i>bolditalic</i></b><b>bold</b><i>italic</i>roman
 letters: <b>bold</b><i>italic</i><b>back</b><b><i>bolditalic</i></b>roman
 multiletter: <b>bold</b>empty<i>italic</i>back<b><i>bolditalic</i></b>roman
 typewriter: <span class="Li">roman</span><b>bold</b><span class="Li">roman</span><i>italic</i>roman
-ENDTEST
diff --git a/regress/usr.bin/mandoc/roff/ft/badargs.out_html b/regress/usr.bin/mandoc/roff/ft/badargs.out_html
index 0fa4a816460..a332e3a2fe4 100644
--- a/regress/usr.bin/mandoc/roff/ft/badargs.out_html
+++ b/regress/usr.bin/mandoc/roff/ft/badargs.out_html
@@ -1,8 +1,6 @@
-BEGINTEST
-<br/>
-default font <i>italic</i> <b><i>bold italic</i></b>
-  <span class="Li">typeqriter</span> <span class="Li">roman</span> <b>bold</b>
-  <i>italic</i> <b>bold</b> <b>still bold</b> <i>italic</i> <i>back to bold</i>
-  <i>back to italic</i>
-<br/>
-ENDTEST
+  <br/>
+  default font <i>italic</i> <b><i>bold italic</i></b>
+    <span class="Li">typeqriter</span> <span class="Li">roman</span> <b>bold</b>
+    <i>italic</i> <b>bold</b> <b>still bold</b> <i>italic</i> <i>back to
+    bold</i> <i>back to italic</i>
+  <br/>
diff --git a/regress/usr.bin/mandoc/roff/sp/fill-man.out_html b/regress/usr.bin/mandoc/roff/sp/fill-man.out_html
index 3fcfa2a6865..054b63596dd 100644
--- a/regress/usr.bin/mandoc/roff/sp/fill-man.out_html
+++ b/regress/usr.bin/mandoc/roff/sp/fill-man.out_html
@@ -1,4 +1,3 @@
-BEGINTEST in fill mode:
 <p class="Pp">switch to no-fill mode:</p>
 <pre>
 in no-fill mode:
@@ -6,4 +5,3 @@ in no-fill mode:
 back to
 fill mode:
 </pre>
-ENDTEST
diff --git a/regress/usr.bin/mandoc/roff/string/dotT.out_html b/regress/usr.bin/mandoc/roff/string/dotT.out_html
index 8143fd889c4..0a019b20d59 100644
--- a/regress/usr.bin/mandoc/roff/string/dotT.out_html
+++ b/regress/usr.bin/mandoc/roff/string/dotT.out_html
@@ -1,5 +1,3 @@
-BEGINTEST
 <p class="Pp">We are using the html device.</p>
 <p class="Pp">The device name can be overridden.</p>
 <pre>
-ENDTEST