From b1ad91c5a16d5524b4b2b04aa37194c728a02d6e Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Tue, 3 Sep 2019 18:19:37 +0000 Subject: adapt to new

output logic (html.c rev. 1.260) --- regress/char/space/zerowidth.out_html | 2 -- regress/char/unicode/ascii.out_html | 2 -- regress/char/unicode/invalid.out_html | 2 -- regress/char/unicode/latin1.out_html | 2 -- regress/char/unicode/latin1diff.out_html | 2 -- regress/char/unicode/named.out_html | 2 -- regress/char/unicode/namediff.out_html | 2 -- regress/char/unicode/nogroff.out_html | 2 -- regress/man/HP/literal.out_html | 2 -- regress/man/IP/literal.out_html | 6 ++---- regress/man/RS/literal.out_html | 10 ++++------ regress/man/RS/paragraph.out_html | 2 -- regress/man/SH/paragraph.out_html | 4 +--- regress/man/SS/paragraph.out_html | 4 +--- regress/man/SY/literal.out_html | 10 ++++------ regress/man/TP/literal.out_html | 2 -- regress/mdoc/Bd/nf.out_html | 4 +--- regress/mdoc/Bd/paragraph.out_html | 2 -- regress/mdoc/Bf/paragraph.out_html | 2 -- regress/mdoc/D1/spacing.out_html | 2 -- regress/mdoc/Rs/paragraph.out_html | 10 ++++------ regress/mdoc/Sh/paragraph.out_html | 4 +--- regress/regress.pl | 9 ++++++--- regress/roff/esc/f.out_html | 2 -- regress/roff/ft/badargs.out_html | 14 ++++++-------- regress/roff/sp/fill-man.out_html | 2 -- regress/roff/string/dotT.out_html | 2 -- 27 files changed, 30 insertions(+), 79 deletions(-) diff --git a/regress/char/space/zerowidth.out_html b/regress/char/space/zerowidth.out_html index f317aafd..afca2d17 100644 --- a/regress/char/space/zerowidth.out_html +++ b/regress/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/char/unicode/ascii.out_html b/regress/char/unicode/ascii.out_html index 7ebda578..264fa356 100644 --- a/regress/char/unicode/ascii.out_html +++ b/regress/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/char/unicode/invalid.out_html b/regress/char/unicode/invalid.out_html index 0de972f1..f22176ed 100644 --- a/regress/char/unicode/invalid.out_html +++ b/regress/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/char/unicode/latin1.out_html b/regress/char/unicode/latin1.out_html index db54b987..a50dbf0f 100644 --- a/regress/char/unicode/latin1.out_html +++ b/regress/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/char/unicode/latin1diff.out_html b/regress/char/unicode/latin1diff.out_html index 5f3b3b17..dea123b9 100644 --- a/regress/char/unicode/latin1diff.out_html +++ b/regress/char/unicode/latin1diff.out_html @@ -1,3 +1 @@ -BEGINTEST ¯¯ MACRON -ENDTEST diff --git a/regress/char/unicode/named.out_html b/regress/char/unicode/named.out_html index 5d77d840..22220902 100644 --- a/regress/char/unicode/named.out_html +++ b/regress/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/char/unicode/namediff.out_html b/regress/char/unicode/namediff.out_html index 4afee5ce..c2f2c3e6 100644 --- a/regress/char/unicode/namediff.out_html +++ b/regress/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/char/unicode/nogroff.out_html b/regress/char/unicode/nogroff.out_html index a865d2d1..6a87860c 100644 --- a/regress/char/unicode/nogroff.out_html +++ b/regress/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/man/HP/literal.out_html b/regress/man/HP/literal.out_html index d40ee9a5..08fb26b9 100644 --- a/regress/man/HP/literal.out_html +++ b/regress/man/HP/literal.out_html @@ -1,4 +1,3 @@ -BEGINTEST before hanged paragraph

tag indented text

regular paragraph

@@ -17,4 +16,3 @@ paragraph
regular text
-ENDTEST diff --git a/regress/man/IP/literal.out_html b/regress/man/IP/literal.out_html index dce47df1..b61fc843 100644 --- a/regress/man/IP/literal.out_html +++ b/regress/man/IP/literal.out_html @@ -1,4 +1,3 @@ -BEGINTEST before indentation
tag
indented regular text
@@ -27,7 +26,7 @@ regular text

-regular text +

regular text

 literal
 text
@@ -47,7 +46,7 @@ text
 

 

-regular text
+
regular text

 

   
tag

   
indented regular text
@@ -65,4 +64,3 @@ paragraph
regular text
-ENDTEST diff --git a/regress/man/RS/literal.out_html b/regress/man/RS/literal.out_html index 9475f407..7bd5431b 100644 --- a/regress/man/RS/literal.out_html +++ b/regress/man/RS/literal.out_html @@ -1,6 +1,5 @@ -BEGINTEST -
-initial regular text +
+ initial regular text

 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
-final regular text -
-ENDTEST +

final regular text +
diff --git a/regress/man/RS/paragraph.out_html b/regress/man/RS/paragraph.out_html index 8b518698..24bd7c5f 100644 --- a/regress/man/RS/paragraph.out_html +++ b/regress/man/RS/paragraph.out_html @@ -1,8 +1,6 @@ -BEGINTEST before paragraph

regular paragraph

indented paragraph

nested paragraph

regular text after display
-ENDTEST diff --git a/regress/man/SH/paragraph.out_html b/regress/man/SH/paragraph.out_html index 6423855a..abe932b4 100644 --- a/regress/man/SH/paragraph.out_html +++ b/regress/man/SH/paragraph.out_html @@ -1,10 +1,8 @@ -BEGINTEST

-This text immediately follows a section header. +

This text immediately follows a section header.

This is a paragraph.

-ENDTEST diff --git a/regress/man/SS/paragraph.out_html b/regress/man/SS/paragraph.out_html index fa385635..22591deb 100644 --- a/regress/man/SS/paragraph.out_html +++ b/regress/man/SS/paragraph.out_html @@ -1,11 +1,9 @@ -BEGINTEST

-This text immediately follows a subsection header. +

This text immediately follows a subsection header.

This is a paragraph.

-ENDTEST diff --git a/regress/man/SY/literal.out_html b/regress/man/SY/literal.out_html index 5daf74ef..9b3e8486 100644 --- a/regress/man/SY/literal.out_html +++ b/regress/man/SY/literal.out_html @@ -1,6 +1,5 @@ -BEGINTEST -
-initial regular text +
+ initial regular text

@@ -26,6 +25,5 @@ before display literal text after display -final regular text -
-ENDTEST +

final regular text +
diff --git a/regress/man/TP/literal.out_html b/regress/man/TP/literal.out_html index 14bfb834..7f5b1c1f 100644 --- a/regress/man/TP/literal.out_html +++ b/regress/man/TP/literal.out_html @@ -1,4 +1,3 @@ -BEGINTEST before indentation

tag
regular indented text
@@ -24,4 +23,3 @@ paragraph regular text
-ENDTEST diff --git a/regress/mdoc/Bd/nf.out_html b/regress/mdoc/Bd/nf.out_html index 31642e07..394eb7ed 100644 --- a/regress/mdoc/Bd/nf.out_html +++ b/regress/mdoc/Bd/nf.out_html @@ -1,9 +1,8 @@ -BEGINTEST initial text 
 after .nf
 request
-after .fi request +

after .fi request

 in unfilled
@@ -19,4 +18,3 @@ in filled block
after end of filled block
-ENDTEST diff --git a/regress/mdoc/Bd/paragraph.out_html b/regress/mdoc/Bd/paragraph.out_html index c2c6993e..bec13a88 100644 --- a/regress/mdoc/Bd/paragraph.out_html +++ b/regress/mdoc/Bd/paragraph.out_html @@ -1,4 +1,3 @@ -BEGINTEST initial text

normal paragraph

filled display

paragraph in display

@@ -16,4 +15,3 @@ paragraph
again back to normal
-ENDTEST diff --git a/regress/mdoc/Bf/paragraph.out_html b/regress/mdoc/Bf/paragraph.out_html index e86b979a..cd22d567 100644 --- a/regress/mdoc/Bf/paragraph.out_html +++ b/regress/mdoc/Bf/paragraph.out_html @@ -1,6 +1,4 @@ -BEGINTEST

normal text

literal text

literal paragraph

-ENDTEST diff --git a/regress/mdoc/D1/spacing.out_html b/regress/mdoc/D1/spacing.out_html index b1a1d4da..3db40161 100644 --- a/regress/mdoc/D1/spacing.out_html +++ b/regress/mdoc/D1/spacing.out_html @@ -1,8 +1,6 @@ -BEGINTEST

preceding paragraph

spacing in and around one-line displays
empty display:
following text
-ENDTEST diff --git a/regress/mdoc/Rs/paragraph.out_html b/regress/mdoc/Rs/paragraph.out_html index 251d0d0c..ba5fb63a 100644 --- a/regress/mdoc/Rs/paragraph.out_html +++ b/regress/mdoc/Rs/paragraph.out_html @@ -1,18 +1,16 @@ -BEGINTEST -
-initial reference: author name, - book title. +
+ initial reference: author name, + book title.

in a paragraph: another author, another book.

-initial reference: +

initial reference:

author name, book title.

in a paragraph:

another author, another book.

-ENDTEST
diff --git a/regress/mdoc/Sh/paragraph.out_html b/regress/mdoc/Sh/paragraph.out_html
index 3b5154de..82ede5be 100644
--- a/regress/mdoc/Sh/paragraph.out_html
+++ b/regress/mdoc/Sh/paragraph.out_html
@@ -1,11 +1,9 @@
-BEGINTEST
 
descriptive text

 

 

-initial subsection text
+
initial subsection text

 
subsection paragraph

-ENDTEST diff --git a/regress/regress.pl b/regress/regress.pl index 8ee2640d..d275a7ba 100755 --- a/regress/regress.pl +++ b/regress/regress.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # -# $Id: regress.pl,v 1.11 2019/07/01 22:56:26 schwarze Exp $ +# $Id: regress.pl,v 1.12 2019/09/03 18:19:37 schwarze Exp $ # # Copyright (c) 2017 Ingo Schwarze # @@ -86,8 +86,12 @@ sub syshtml ($@) { if (!$state && s/.*//) { $state = 'math'; next unless length; - } elsif (/^BEGINTEST/) { + } elsif (/BEGINTEST/) { $state = 'other'; + next; + } elsif (/ENDTEST/) { + $state = 0; + next; } if ($state eq 'math') { s/^ *//; @@ -98,7 +102,6 @@ sub syshtml ($@) { } } print $outfd "$_\n" if $state; - $state = 0 if /^ENDTEST/; } close $outfd; close $infd; diff --git a/regress/roff/esc/f.out_html b/regress/roff/esc/f.out_html index 332e0f00..887175f6 100644 --- a/regress/roff/esc/f.out_html +++ b/regress/roff/esc/f.out_html @@ -1,6 +1,4 @@ -BEGINTEST numbers: bolditalicbolditalicroman letters: bolditalicbackbolditalicroman multiletter: boldemptyitalicbackbolditalicroman typewriter: romanboldromanitalicroman -ENDTEST diff --git a/regress/roff/ft/badargs.out_html b/regress/roff/ft/badargs.out_html index 0fa4a816..a332e3a2 100644 --- a/regress/roff/ft/badargs.out_html +++ b/regress/roff/ft/badargs.out_html @@ -1,8 +1,6 @@ -BEGINTEST -
-default font italic bold italic - typeqriter roman bold - italic bold still bold italic back to bold - back to italic -
-ENDTEST +
+ default font italic bold italic + typeqriter roman bold + italic bold still bold italic back to + bold back to italic +
diff --git a/regress/roff/sp/fill-man.out_html b/regress/roff/sp/fill-man.out_html index 3fcfa2a6..054b6359 100644 --- a/regress/roff/sp/fill-man.out_html +++ b/regress/roff/sp/fill-man.out_html @@ -1,4 +1,3 @@ -BEGINTEST in fill mode:

switch to no-fill mode:

 in no-fill mode:
@@ -6,4 +5,3 @@ in no-fill mode:
 back to
 fill mode:
-ENDTEST diff --git a/regress/roff/string/dotT.out_html b/regress/roff/string/dotT.out_html index 8143fd88..0a019b20 100644 --- a/regress/roff/string/dotT.out_html +++ b/regress/roff/string/dotT.out_html @@ -1,5 +1,3 @@ -BEGINTEST

We are using the html device.

The device name can be overridden.

-ENDTEST
-- 
cgit v1.2.3-56-ge451
command