* mandoc: adapt to new <p> output logic (html.c rev.
@ 2019-09-03 18:20 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2019-09-03 18:20 UTC (permalink / raw)
To: source
Log Message:
-----------
adapt to new <p> 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
-<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/>
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/.*<math class="eqn">//) {
$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
<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
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
<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
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
<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
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
-<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
literal text
after display
</pre>
-final regular text
-<br/>
-ENDTEST
+<p class="Pp">final regular text
+ <br/>
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
</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
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
<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
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
-<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/>
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
<dl class="Bl-tag">
<dt>tag</dt>
<dd>regular indented text</dd>
@@ -24,4 +23,3 @@ paragraph
</pre>
regular text
<br/>
-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
<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
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
<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
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
<p class="Pp">normal text</p>
<div class="Bf Li">literal text
<p class="Pp">literal paragraph</p>
</div>
-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
<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
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
-<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
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
<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
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: <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
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:
<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
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
<p class="Pp">We are using the html device.</p>
<p class="Pp">The device name can be overridden.</p>
<pre>
-ENDTEST
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-09-03 18:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-03 18:20 mandoc: adapt to new <p> output logic (html.c rev schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).