From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (mandoc.bsd.lv [local]) by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id 725470c2 for ; Tue, 3 Sep 2019 13:20:25 -0500 (EST) Date: Tue, 3 Sep 2019 13:20:25 -0500 (EST) X-Mailinglist: mandoc-source Reply-To: source@mandoc.bsd.lv MIME-Version: 1.0 From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: mandoc: adapt to new

output logic (html.c rev. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: <862a960b3369b714@mandoc.bsd.lv> Log Message: ----------- adapt to new

output logic (html.c rev. 1.260) Modified Files: -------------- mandoc/regress: regress.pl mandoc/regress/char/space: zerowidth.out_html mandoc/regress/char/unicode: ascii.out_html invalid.out_html latin1.out_html latin1diff.out_html named.out_html namediff.out_html nogroff.out_html mandoc/regress/man/HP: literal.out_html mandoc/regress/man/IP: literal.out_html mandoc/regress/man/RS: literal.out_html paragraph.out_html mandoc/regress/man/SH: paragraph.out_html mandoc/regress/man/SS: paragraph.out_html mandoc/regress/man/SY: literal.out_html mandoc/regress/man/TP: literal.out_html mandoc/regress/mdoc/Bd: nf.out_html paragraph.out_html mandoc/regress/mdoc/Bf: paragraph.out_html mandoc/regress/mdoc/D1: spacing.out_html mandoc/regress/mdoc/Rs: paragraph.out_html mandoc/regress/mdoc/Sh: paragraph.out_html mandoc/regress/roff/esc: f.out_html mandoc/regress/roff/ft: badargs.out_html mandoc/regress/roff/sp: fill-man.out_html mandoc/regress/roff/string: dotT.out_html Revision Data ------------- Index: badargs.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/roff/ft/badargs.out_html,v retrieving revision 1.3 retrieving revision 1.4 diff -Lregress/roff/ft/badargs.out_html -Lregress/roff/ft/badargs.out_html -u -p -r1.3 -r1.4 --- regress/roff/ft/badargs.out_html +++ 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 +
Index: regress.pl =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/regress.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -Lregress/regress.pl -Lregress/regress.pl -u -p -r1.11 -r1.12 --- regress/regress.pl +++ regress/regress.pl @@ -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; Index: zerowidth.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/space/zerowidth.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/char/space/zerowidth.out_html -Lregress/char/space/zerowidth.out_html -u -p -r1.1 -r1.2 --- regress/char/space/zerowidth.out_html +++ 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 Index: latin1diff.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/unicode/latin1diff.out_html,v retrieving revision 1.4 retrieving revision 1.5 diff -Lregress/char/unicode/latin1diff.out_html -Lregress/char/unicode/latin1diff.out_html -u -p -r1.4 -r1.5 --- regress/char/unicode/latin1diff.out_html +++ regress/char/unicode/latin1diff.out_html @@ -1,3 +1 @@ -BEGINTEST ¯¯ MACRON -ENDTEST Index: invalid.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/unicode/invalid.out_html,v retrieving revision 1.3 retrieving revision 1.4 diff -Lregress/char/unicode/invalid.out_html -Lregress/char/unicode/invalid.out_html -u -p -r1.3 -r1.4 --- regress/char/unicode/invalid.out_html +++ regress/char/unicode/invalid.out_html @@ -1,8 +1,6 @@ -BEGINTEST too short: >.< just right: >+< too long: >..< too large: >..< trailing garbage: >< not unicode: >_.↑.⇑< -ENDTEST Index: named.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/unicode/named.out_html,v retrieving revision 1.6 retrieving revision 1.7 diff -Lregress/char/unicode/named.out_html -Lregress/char/unicode/named.out_html -u -p -r1.6 -r1.7 --- regress/char/unicode/named.out_html +++ 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 Index: ascii.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/unicode/ascii.out_html,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/char/unicode/ascii.out_html -Lregress/char/unicode/ascii.out_html -u -p -r1.2 -r1.3 --- regress/char/unicode/ascii.out_html +++ 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 Index: latin1.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/unicode/latin1.out_html,v retrieving revision 1.5 retrieving revision 1.6 diff -Lregress/char/unicode/latin1.out_html -Lregress/char/unicode/latin1.out_html -u -p -r1.5 -r1.6 --- regress/char/unicode/latin1.out_html +++ 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 Index: namediff.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/unicode/namediff.out_html,v retrieving revision 1.6 retrieving revision 1.7 diff -Lregress/char/unicode/namediff.out_html -Lregress/char/unicode/namediff.out_html -u -p -r1.6 -r1.7 --- regress/char/unicode/namediff.out_html +++ 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 Index: nogroff.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/char/unicode/nogroff.out_html,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/char/unicode/nogroff.out_html -Lregress/char/unicode/nogroff.out_html -u -p -r1.2 -r1.3 --- regress/char/unicode/nogroff.out_html +++ 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 Index: literal.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/HP/literal.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/man/HP/literal.out_html -Lregress/man/HP/literal.out_html -u -p -r1.1 -r1.2 --- regress/man/HP/literal.out_html +++ 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 Index: literal.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/IP/literal.out_html,v retrieving revision 1.3 retrieving revision 1.4 diff -Lregress/man/IP/literal.out_html -Lregress/man/IP/literal.out_html -u -p -r1.3 -r1.4 --- regress/man/IP/literal.out_html +++ 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 Index: paragraph.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/RS/paragraph.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/man/RS/paragraph.out_html -Lregress/man/RS/paragraph.out_html -u -p -r1.1 -r1.2 --- regress/man/RS/paragraph.out_html +++ regress/man/RS/paragraph.out_html @@ -1,8 +1,6 @@ -BEGINTEST before paragraph

regular paragraph

indented paragraph

nested paragraph

regular text after display
-ENDTEST Index: literal.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/RS/literal.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/man/RS/literal.out_html -Lregress/man/RS/literal.out_html -u -p -r1.1 -r1.2 --- regress/man/RS/literal.out_html +++ 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
 literal text
 after display
-final regular text -
-ENDTEST +

final regular text +
Index: paragraph.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/SH/paragraph.out_html,v retrieving revision 1.3 retrieving revision 1.4 diff -Lregress/man/SH/paragraph.out_html -Lregress/man/SH/paragraph.out_html -u -p -r1.3 -r1.4 --- regress/man/SH/paragraph.out_html +++ 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 Index: paragraph.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/SS/paragraph.out_html,v retrieving revision 1.3 retrieving revision 1.4 diff -Lregress/man/SS/paragraph.out_html -Lregress/man/SS/paragraph.out_html -u -p -r1.3 -r1.4 --- regress/man/SS/paragraph.out_html +++ 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 Index: literal.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/SY/literal.out_html,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/man/SY/literal.out_html -Lregress/man/SY/literal.out_html -u -p -r1.2 -r1.3 --- regress/man/SY/literal.out_html +++ 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 +
Index: literal.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TP/literal.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/man/TP/literal.out_html -Lregress/man/TP/literal.out_html -u -p -r1.1 -r1.2 --- regress/man/TP/literal.out_html +++ 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 Index: paragraph.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/mdoc/Bd/paragraph.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/mdoc/Bd/paragraph.out_html -Lregress/mdoc/Bd/paragraph.out_html -u -p -r1.1 -r1.2 --- regress/mdoc/Bd/paragraph.out_html +++ 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 Index: nf.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/mdoc/Bd/nf.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/mdoc/Bd/nf.out_html -Lregress/mdoc/Bd/nf.out_html -u -p -r1.1 -r1.2 --- regress/mdoc/Bd/nf.out_html +++ 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 Index: paragraph.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/mdoc/Bf/paragraph.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/mdoc/Bf/paragraph.out_html -Lregress/mdoc/Bf/paragraph.out_html -u -p -r1.1 -r1.2 --- regress/mdoc/Bf/paragraph.out_html +++ regress/mdoc/Bf/paragraph.out_html @@ -1,6 +1,4 @@ -BEGINTEST

normal text

literal text

literal paragraph

-ENDTEST Index: spacing.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/mdoc/D1/spacing.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/mdoc/D1/spacing.out_html -Lregress/mdoc/D1/spacing.out_html -u -p -r1.1 -r1.2 --- regress/mdoc/D1/spacing.out_html +++ 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 Index: paragraph.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/mdoc/Rs/paragraph.out_html,v retrieving revision 1.3 retrieving revision 1.4 diff -Lregress/mdoc/Rs/paragraph.out_html -Lregress/mdoc/Rs/paragraph.out_html -u -p -r1.3 -r1.4 --- regress/mdoc/Rs/paragraph.out_html +++ 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
Index: paragraph.out_html
===================================================================
RCS file: /home/cvs/mandoc/mandoc/regress/mdoc/Sh/paragraph.out_html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lregress/mdoc/Sh/paragraph.out_html -Lregress/mdoc/Sh/paragraph.out_html -u -p -r1.3 -r1.4
--- regress/mdoc/Sh/paragraph.out_html
+++ regress/mdoc/Sh/paragraph.out_html
@@ -1,11 +1,9 @@
-BEGINTEST
 
descriptive text

 

 

-initial subsection text
+
initial subsection text

 
subsection paragraph

-ENDTEST Index: f.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/roff/esc/f.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/roff/esc/f.out_html -Lregress/roff/esc/f.out_html -u -p -r1.1 -r1.2 --- regress/roff/esc/f.out_html +++ regress/roff/esc/f.out_html @@ -1,6 +1,4 @@ -BEGINTEST numbers: bolditalicbolditalicroman letters: bolditalicbackbolditalicroman multiletter: boldemptyitalicbackbolditalicroman typewriter: romanboldromanitalicroman -ENDTEST Index: fill-man.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/roff/sp/fill-man.out_html,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/roff/sp/fill-man.out_html -Lregress/roff/sp/fill-man.out_html -u -p -r1.1 -r1.2 --- regress/roff/sp/fill-man.out_html +++ 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 Index: dotT.out_html =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/roff/string/dotT.out_html,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/roff/string/dotT.out_html -Lregress/roff/string/dotT.out_html -u -p -r1.2 -r1.3 --- regress/roff/string/dotT.out_html +++ regress/roff/string/dotT.out_html @@ -1,5 +1,3 @@ -BEGINTEST

We are using the html device.

The device name can be overridden.

-ENDTEST
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
command