[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Change in tests, more LaTeX tests
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Change in tests, more LaTeX tests |
|
Date: |
Sun, 14 Aug 2022 05:50:17 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 7e562b1244 Change in tests, more LaTeX tests
7e562b1244 is described below
commit 7e562b1244e8f35f0b7c4bf84d4635c9d3e85605
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 14 11:49:45 2022 +0200
Change in tests, more LaTeX tests
---
tp/t/18itemize.t | 7 +-
tp/t/results/itemize/enumerate_in_example.pl | 16 +++
tp/t/results/itemize/itemize_in_example.pl | 195 +++++++++++++++++++++++++--
tp/t/results/itemize/itemize_long_item.pl | 27 ++++
4 files changed, 234 insertions(+), 11 deletions(-)
diff --git a/tp/t/18itemize.t b/tp/t/18itemize.t
index 2bd5a22c9a..7763439ca8 100644
--- a/tp/t/18itemize.t
+++ b/tp/t/18itemize.t
@@ -465,6 +465,10 @@ more.
@item item +
@end itemize
+@itemize m--n
+@item with m--n
+@end itemize
+
@itemize @bullet{} a--n itemize line
@item in an itemize line
@end itemize
@@ -615,7 +619,8 @@ my @test_invalid = (
my @file_latex_tests_cases_tests = ('inter_item_commands_in_itemize',
'inter_item_commands_in_enumerate');
-my @latex_tests_cases_tests = ('w_argument');
+my @latex_tests_cases_tests = ('w_argument', 'enumerate_in_example',
+ 'itemize_long_item', 'itemize_in_example');
foreach my $test (@test_cases) {
push @{$test->[2]->{'test_formats'}}, 'plaintext';
diff --git a/tp/t/results/itemize/enumerate_in_example.pl
b/tp/t/results/itemize/enumerate_in_example.pl
index 75ea6c6186..dcbb147306 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -261,4 +261,20 @@ still second
</div>
';
+
+$result_converted{'latex'}->{'enumerate_in_example'} = '
+\\begin{enumerate}[start=1]
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+first item
+\\end{GNUTexinfopreformatted}
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+second item
+
+still second
+\\end{GNUTexinfopreformatted}
+\\end{enumerate}
+';
+
1;
diff --git a/tp/t/results/itemize/itemize_in_example.pl
b/tp/t/results/itemize/itemize_in_example.pl
index f1aea795f1..c8ba86edc0 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -338,6 +338,105 @@ $result_trees{'itemize_in_example'} = {
{
'parent' => {},
'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'm--n'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemize',
+ 'contents' => [
+ {
+ 'cmdname' => 'item',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'with m--n
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ }
+ ],
+ 'extra' => {
+ 'item_number' => 1,
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'itemize'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'itemize',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'itemize'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {},
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ }
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
',
'type' => 'empty_line'
}
@@ -362,7 +461,7 @@ $result_trees{'itemize_in_example'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 20,
'macro' => ''
}
},
@@ -403,7 +502,7 @@ $result_trees{'itemize_in_example'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -433,7 +532,7 @@ $result_trees{'itemize_in_example'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 22,
'macro' => ''
}
}
@@ -445,7 +544,7 @@ $result_trees{'itemize_in_example'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 20,
'macro' => ''
}
},
@@ -475,7 +574,7 @@ $result_trees{'itemize_in_example'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 23,
'macro' => ''
}
}
@@ -539,9 +638,7 @@
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'parent'}
= $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0];
@@ -551,10 +648,24 @@
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[1];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'parent'}
= $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8]{'parent'}
= $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[8];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[1];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'parent'}
= $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[10]{'parent'}
= $result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[10];
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'itemize_in_example'}{'contents'}[0];
$result_trees{'itemize_in_example'}{'contents'}[0]{'parent'} =
$result_trees{'itemize_in_example'};
@@ -573,6 +684,10 @@ more.
@item item +
@end itemize
+@itemize m--n
+@item with m--n
+@end itemize
+
@itemize @bullet{} a--n itemize line
@item in an itemize line
@end itemize
@@ -588,6 +703,8 @@ as is
item +
+with m--n
+
in an itemize line
';
@@ -606,6 +723,8 @@ $result_converted{'plaintext'}->{'itemize_in_example'} = '
• first
+ item +
+ m–n with m--n
+
• a–n itemize line in an itemize line
';
@@ -628,10 +747,66 @@ more.
</pre></li></ul>
<pre class="example-preformatted">
+</pre><ul class="itemize" style="list-style-type: \'m\\2013 n\'">
+<li><pre class="example-preformatted">with m--n
+</pre></li></ul>
+<pre class="example-preformatted">
+
</pre><ul class="itemize" style="list-style-type: \'\\2022 a\\2013 n itemize
line\'">
<li><pre class="example-preformatted">in an itemize line
</pre></li></ul>
</div>
';
+
+$result_converted{'latex'}->{'itemize_in_example'} =
'\\begin{itemize}[label=\\textbullet{}]
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+first
+
+more.
+\\end{GNUTexinfopreformatted}
+\\end{itemize}
+\\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+
+\\end{GNUTexinfopreformatted}
+\\begin{itemize}
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+as is
+\\end{GNUTexinfopreformatted}
+\\end{itemize}
+\\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+
+\\end{GNUTexinfopreformatted}
+\\begin{itemize}[label=+]
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+item +
+\\end{GNUTexinfopreformatted}
+\\end{itemize}
+\\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+
+\\end{GNUTexinfopreformatted}
+\\begin{itemize}[label=m--n]
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+with m{-}{-}n
+\\end{GNUTexinfopreformatted}
+\\end{itemize}
+\\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+
+\\end{GNUTexinfopreformatted}
+\\begin{itemize}[label=\\textbullet{} a--n itemize line]
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+in an itemize line
+\\end{GNUTexinfopreformatted}
+\\end{itemize}
+';
+
1;
diff --git a/tp/t/results/itemize/itemize_long_item.pl
b/tp/t/results/itemize/itemize_long_item.pl
index c0e54e0ee2..65e2645ad0 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -683,4 +683,31 @@ empty line.
</li></ul>
';
+
+$result_converted{'latex'}->{'itemize_long_item'} =
'\\begin{itemize}[label=youhou itemize very long item aaaaaaaaaaaaaaaa
bbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccc]
+\\item first item
+\\item \\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+In example
+
+end example.
+\\end{GNUTexinfopreformatted}
+\\item
+empty line.
+\\item
+\\begin{GNUTexinfopreformatted}
+\\leftskip=2em\\relax\\ttfamily%
+In second example
+\\end{GNUTexinfopreformatted}
+\\item \\begin{quote}
+Quotation
+\\end{quote}
+
+\\item
+\\begin{quote}
+quotation after a blank line
+\\end{quote}
+\\end{itemize}
+';
+
1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Change in tests, more LaTeX tests,
Patrice Dumas <=