[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/92formatting.t: remove texi2html style for
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/t/92formatting.t: remove texi2html style for cond.texi related tests, and remove some custmization variables set. |
|
Date: |
Tue, 03 Jan 2023 04:32:56 -0500 |
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 4d15c62a78 * tp/t/92formatting.t: remove texi2html style for cond.texi
related tests, and remove some custmization variables set.
4d15c62a78 is described below
commit 4d15c62a7850434e14b3dcbc6b9a987f2e9630c8
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Jan 3 10:32:29 2023 +0100
* tp/t/92formatting.t: remove texi2html style for cond.texi related
tests, and remove some custmization variables set.
* tp/t/input_files/cond.texi: add @top, move @node Top lower to have
a preamble to test.
---
ChangeLog | 8 +
tp/t/92formatting.t | 13 +-
tp/t/input_files/cond.texi | 5 +-
tp/t/results/formatting/cond.pl | 261 +++++++++++++--------
.../results/formatting/cond_ifhtml_ifinfo_iftex.pl | 259 ++++++++++++--------
tp/t/results/formatting/cond_info.pl | 246 ++++++++++++-------
.../formatting/cond_info_ifhtml_ifinfo_iftex.pl | 252 ++++++++++++--------
.../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl | 246 ++++++++++++-------
.../cond_no-ifhtml_no-ifinfo_no-iftex.pl | 259 ++++++++++++--------
tp/t/results/formatting/cond_xml.pl | 243 ++++++++++++-------
tp/t/results/formatting/texi_cond.pl | 261 +++++++++++++--------
11 files changed, 1265 insertions(+), 788 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 96bd2ba961..11071df7ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-01-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/92formatting.t: remove texi2html style for cond.texi related
+ tests, and remove some custmization variables set.
+
+ * tp/t/input_files/cond.texi: add @top, move @node Top lower to have
+ a preamble to test.
+
2023-01-02 Patrice Dumas <pertusus@free.fr>
* tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/92formatting.t,
diff --git a/tp/t/92formatting.t b/tp/t/92formatting.t
index 4cba144dcc..2a59697bcf 100644
--- a/tp/t/92formatting.t
+++ b/tp/t/92formatting.t
@@ -60,35 +60,35 @@ my @test_cases = (
{'test_file' => 'simplest.texi',
'test_formats' => ['file_html']
},
- {'PREFIX' => 'truc'}
+ {'TEXI2HTML' => 1, 'PREFIX' => 'truc'}
],
['simplest_test_prefix_info',
undef,
{'test_file' => 'simplest.texi',
'test_formats' => ['file_info']
},
- {'PREFIX' => 'truc'}
+ {'TEXI2HTML' => 1, 'PREFIX' => 'truc'}
],
['simplest_test_date_in_header',
undef,
{'test_file' => 'simplest.texi',
'test_formats' => ['file_html']
},
- {'DATE_IN_HEADER' => 1}
+ {'TEXI2HTML' => 1, 'DATE_IN_HEADER' => 1}
],
['float_copying',
undef,
{'test_file' => 'float_copying.texi',
'test_formats' => ['file_html']
},
- {'SPLIT' => 'chapter'}
+ {'TEXI2HTML' => 1, 'SPLIT' => 'chapter'}
],
['split_for_format_not_split',
undef,
{'test_file' => 'simplest.texi',
'test_formats' => ['file_xml']
},
- {'SPLIT' => 'chapter'}
+ {'TEXI2HTML' => 1, 'SPLIT' => 'chapter'}
],
);
@@ -97,9 +97,6 @@ foreach my $test (@test_cases) {
if (!$test->[2]->{'test_formats'}) {
push @{$test->[2]->{'test_formats'}}, 'html';
}
- $test->[3]->{'TEXI2HTML'} = 1;
- $test->[3]->{'TEST'} = 1;
- $test->[3]->{'PROGRAM'} = 'texi2any';
}
run_all('formatting', [@test_cases]);
diff --git a/tp/t/input_files/cond.texi b/tp/t/input_files/cond.texi
index f40a83fd0a..89318d5539 100644
--- a/tp/t/input_files/cond.texi
+++ b/tp/t/input_files/cond.texi
@@ -2,8 +2,6 @@
@c test conditions
-@node Top
-
@html
This is html text.
@end html
@@ -16,6 +14,9 @@ This is ifhtml text.
This is ifnothtml text.
@end ifnothtml
+@node Top
+@top conditionals
+
@ifinfo
This is ifinfo text.
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 19bbb5b761..cf2d71e6dd 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -46,95 +46,70 @@ $result_trees{'cond'} = {
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'This is html text.
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'html',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'html'
+ 'text' => 'This is html text.
+'
}
],
- 'info' => {
- 'spaces_after_argument' => '
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
},
- 'type' => 'line_arg'
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'preamble_before_content'
},
{
'contents' => [
@@ -152,6 +127,70 @@ $result_trees{'cond'} = {
},
{
'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
',
'type' => 'empty_line'
},
@@ -223,14 +262,14 @@ $result_trees{'cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -259,26 +298,13 @@ $result_trees{'cond'} = {
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -302,8 +328,6 @@ $result_texis{'cond'} = '\\input texinfo
@c test conditions
-@node Top
-
@html
This is html text.
@end html
@@ -311,6 +335,9 @@ This is html text.
This is ifhtml text.
+@node Top
+@top conditionals
+
This is ifinfo text.
@@ -328,10 +355,12 @@ This is ifnottex text.
$result_texts{'cond'} = '
-
This is ifhtml text.
+conditionals
+************
+
This is ifinfo text.
@@ -343,9 +372,41 @@ This is ifnottex text.
';
+$result_sectioning{'cond'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'cond'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'cond'};
+
$result_nodes{'cond'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -371,10 +432,10 @@ $result_converted{'html'}->{'cond'} = '<!DOCTYPE html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>conditionals</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="conditionals">
+<meta name="keywords" content="conditionals">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
@@ -391,12 +452,14 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node" id="Top"></a>
This is html text.
<p>This is ifhtml text.
</p>
+<div class="top-level-extent" id="Top">
+<h1 class="top" id="conditionals">conditionals</h1>
+
<p>This is ifinfo text.
</p>
@@ -407,6 +470,7 @@ This is html text.
<p>This is ifnottex text.
</p>
<hr>
+</div>
<p>
<span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
</p>
@@ -416,15 +480,4 @@ This is html text.
</html>
';
-$result_converted_errors{'html'}->{'cond'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'cond.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
1;
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 5e4664311a..2384e4321c 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -46,95 +46,70 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'This is html text.
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'html',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'html'
+ 'text' => 'This is html text.
+'
}
],
- 'info' => {
- 'spaces_after_argument' => '
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
},
- 'type' => 'line_arg'
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'preamble_before_content'
},
{
'contents' => [
@@ -152,6 +127,70 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
},
{
'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
',
'type' => 'empty_line'
},
@@ -229,14 +268,14 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -265,26 +304,13 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -308,8 +334,6 @@ $result_texis{'cond_ifhtml_ifinfo_iftex'} = '\\input texinfo
@c test conditions
-@node Top
-
@html
This is html text.
@end html
@@ -317,6 +341,9 @@ This is html text.
This is ifhtml text.
+@node Top
+@top conditionals
+
This is ifinfo text.
@@ -335,10 +362,12 @@ This is iftex text.
$result_texts{'cond_ifhtml_ifinfo_iftex'} = '
-
This is ifhtml text.
+conditionals
+************
+
This is ifinfo text.
@@ -350,9 +379,41 @@ This is iftex text.
';
+$result_sectioning{'cond_ifhtml_ifinfo_iftex'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'cond_ifhtml_ifinfo_iftex'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'cond_ifhtml_ifinfo_iftex'};
+
$result_nodes{'cond_ifhtml_ifinfo_iftex'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -378,10 +439,10 @@ $result_converted{'html'}->{'cond_ifhtml_ifinfo_iftex'} =
'<!DOCTYPE html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>conditionals</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="conditionals">
+<meta name="keywords" content="conditionals">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
@@ -398,12 +459,14 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node" id="Top"></a>
This is html text.
<p>This is ifhtml text.
</p>
+<div class="top-level-extent" id="Top">
+<h1 class="top" id="conditionals">conditionals</h1>
+
<p>This is ifinfo text.
</p>
@@ -415,6 +478,7 @@ This is tex text.
</p>
<hr>
+</div>
<p>
<span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
</p>
@@ -425,18 +489,11 @@ This is tex text.
';
$result_converted_errors{'html'}->{'cond_ifhtml_ifinfo_iftex'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'cond.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- },
{
'error_line' => 'warning: raw format tex is not converted
',
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => '',
'text' => 'raw format tex is not converted',
'type' => 'warning'
diff --git a/tp/t/results/formatting/cond_info.pl
b/tp/t/results/formatting/cond_info.pl
index 8529722feb..efe7c5a5fc 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -46,104 +46,143 @@ $result_trees{'cond_info'} = {
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
- {
- 'type' => 'elided_block'
},
{
'args' => [
{
- 'contents' => [
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'args' => [
{
- 'text' => 'html'
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
+ },
'info' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
+ 'type' => 'preamble_before_content'
},
{
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'contents' => [
+ {
+ 'text' => 'This is ifnothtml text.
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
'text' => '
',
'type' => 'empty_line'
- },
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'text' => 'This is ifnothtml text.
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
}
],
- 'type' => 'paragraph'
- },
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
{
'text' => '
',
@@ -217,14 +256,14 @@ $result_trees{'cond_info'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -253,26 +292,13 @@ $result_trees{'cond_info'} = {
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -296,14 +322,15 @@ $result_texis{'cond_info'} = '\\input texinfo
@c test conditions
-@node Top
-
@html
@end html
This is ifnothtml text.
+@node Top
+@top conditionals
+
This is ifinfo text.
@@ -322,9 +349,11 @@ This is ifnottex text.
$result_texts{'cond_info'} = '
-
This is ifnothtml text.
+conditionals
+************
+
This is ifinfo text.
@@ -336,9 +365,41 @@ This is ifnottex text.
';
+$result_sectioning{'cond_info'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'cond_info'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'cond_info'};
+
$result_nodes{'cond_info'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -361,19 +422,22 @@ $result_floats{'cond_info'} = {};
$result_converted{'info'}->{'cond_info'} = 'This is , produced by texi2any
version from cond.texi.
+This is ifnothtml text.
+
File: , Node: Top, Up: (dir)
-This is ifnothtml text.
+conditionals
+************
- This is ifinfo text.
+This is ifinfo text.
This is ifnottex text.
Tag Table:
-Node: Top56
+Node: Top81
End Tag Table
diff --git a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
index 510fbc8e62..80b5d888b3 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -46,95 +46,70 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'This is html text.
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'html',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'html'
+ 'text' => 'This is html text.
+'
}
],
- 'info' => {
- 'spaces_after_argument' => '
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
},
- 'type' => 'line_arg'
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'preamble_before_content'
},
{
'contents' => [
@@ -152,6 +127,70 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
},
{
'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
',
'type' => 'empty_line'
},
@@ -229,14 +268,14 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -265,26 +304,13 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -308,8 +334,6 @@ $result_texis{'cond_info_ifhtml_ifinfo_iftex'} = '\\input
texinfo
@c test conditions
-@node Top
-
@html
This is html text.
@end html
@@ -317,6 +341,9 @@ This is html text.
This is ifhtml text.
+@node Top
+@top conditionals
+
This is ifinfo text.
@@ -335,10 +362,12 @@ This is iftex text.
$result_texts{'cond_info_ifhtml_ifinfo_iftex'} = '
-
This is ifhtml text.
+conditionals
+************
+
This is ifinfo text.
@@ -350,9 +379,41 @@ This is iftex text.
';
+$result_sectioning{'cond_info_ifhtml_ifinfo_iftex'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'cond_info_ifhtml_ifinfo_iftex'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'cond_info_ifhtml_ifinfo_iftex'};
+
$result_nodes{'cond_info_ifhtml_ifinfo_iftex'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -375,14 +436,17 @@ $result_floats{'cond_info_ifhtml_ifinfo_iftex'} = {};
$result_converted{'info'}->{'cond_info_ifhtml_ifinfo_iftex'} = 'This is ,
produced by texi2any version from cond.texi.
-
-File: , Node: Top, Up: (dir)
-
This is html text.
This is ifhtml text.
- This is ifinfo text.
+
+File: , Node: Top, Up: (dir)
+
+conditionals
+************
+
+This is ifinfo text.
This is tex text.
@@ -391,7 +455,7 @@ This is tex text.
Tag Table:
-Node: Top56
+Node: Top101
End Tag Table
diff --git a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
index bbbc467b20..4792567a90 100644
--- a/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -46,104 +46,143 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
- {
- 'type' => 'elided_block'
},
{
'args' => [
{
- 'contents' => [
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'args' => [
{
- 'text' => 'html'
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
+ },
'info' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
+ 'type' => 'preamble_before_content'
},
{
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'contents' => [
+ {
+ 'text' => 'This is ifnothtml text.
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
'text' => '
',
'type' => 'empty_line'
- },
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'text' => 'This is ifnothtml text.
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
}
],
- 'type' => 'paragraph'
- },
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
{
'text' => '
',
@@ -217,14 +256,14 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -253,26 +292,13 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -296,14 +322,15 @@ $result_texis{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
'\\input texinfo
@c test conditions
-@node Top
-
@html
@end html
This is ifnothtml text.
+@node Top
+@top conditionals
+
This is ifnotinfo text.
@@ -322,9 +349,11 @@ This is ifnottex text.
$result_texts{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = '
-
This is ifnothtml text.
+conditionals
+************
+
This is ifnotinfo text.
@@ -336,9 +365,41 @@ This is ifnottex text.
';
+$result_sectioning{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'cond_info_no-ifhtml_no-ifinfo_no-iftex'};
+
$result_nodes{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -361,19 +422,22 @@ $result_floats{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}
= {};
$result_converted{'info'}->{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 'This
is , produced by texi2any version from cond.texi.
+This is ifnothtml text.
+
File: , Node: Top, Up: (dir)
-This is ifnothtml text.
+conditionals
+************
- This is ifnotinfo text.
+This is ifnotinfo text.
This is ifnottex text.
Tag Table:
-Node: Top56
+Node: Top81
End Tag Table
diff --git a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
index da1d17e0a1..420f305c7c 100644
--- a/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
+++ b/tp/t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl
@@ -46,104 +46,143 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
- {
- 'type' => 'elided_block'
},
{
'args' => [
{
- 'contents' => [
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'args' => [
{
- 'text' => 'html'
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
+ },
'info' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
+ 'type' => 'preamble_before_content'
},
{
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'contents' => [
+ {
+ 'text' => 'This is ifnothtml text.
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
'text' => '
',
'type' => 'empty_line'
- },
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'text' => 'This is ifnothtml text.
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
}
],
- 'type' => 'paragraph'
- },
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
{
'text' => '
',
@@ -217,14 +256,14 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -253,26 +292,13 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -296,14 +322,15 @@ $result_texis{'cond_no-ifhtml_no-ifinfo_no-iftex'} =
'\\input texinfo
@c test conditions
-@node Top
-
@html
@end html
This is ifnothtml text.
+@node Top
+@top conditionals
+
This is ifnotinfo text.
@@ -322,9 +349,11 @@ This is ifnottex text.
$result_texts{'cond_no-ifhtml_no-ifinfo_no-iftex'} = '
-
This is ifnothtml text.
+conditionals
+************
+
This is ifnotinfo text.
@@ -336,9 +365,41 @@ This is ifnottex text.
';
+$result_sectioning{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'cond_no-ifhtml_no-ifinfo_no-iftex'};
+
$result_nodes{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -364,10 +425,10 @@
$result_converted{'html'}->{'cond_no-ifhtml_no-ifinfo_no-iftex'} = '<!DOCTYPE ht
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>conditionals</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="conditionals">
+<meta name="keywords" content="conditionals">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
@@ -384,11 +445,13 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node" id="Top"></a>
<p>This is ifnothtml text.
</p>
+<div class="top-level-extent" id="Top">
+<h1 class="top" id="conditionals">conditionals</h1>
+
<p>This is ifnotinfo text.
@@ -399,6 +462,7 @@ span.program-in-footer {font-size: smaller}
<p>This is ifnottex text.
</p>
<hr>
+</div>
<p>
<span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
</p>
@@ -408,15 +472,4 @@ span.program-in-footer {font-size: smaller}
</html>
';
-$result_converted_errors{'html'}->{'cond_no-ifhtml_no-ifinfo_no-iftex'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'cond.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
1;
diff --git a/tp/t/results/formatting/cond_xml.pl
b/tp/t/results/formatting/cond_xml.pl
index 7b3b7d6efa..346f3476ba 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -46,104 +46,143 @@ $result_trees{'cond_xml'} = {
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
- {
- 'type' => 'elided_block'
},
{
'args' => [
{
- 'contents' => [
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'html',
+ 'contents' => [
+ {
+ 'type' => 'elided_block'
+ },
+ {
+ 'args' => [
{
- 'text' => 'html'
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
+ },
'info' => {
- 'spaces_after_argument' => '
-'
+ 'spaces_before_argument' => ' '
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
+ 'type' => 'preamble_before_content'
},
{
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'contents' => [
+ {
+ 'text' => 'This is ifnothtml text.
+'
+ }
+ ],
+ 'type' => 'paragraph'
},
{
'text' => '
',
'type' => 'empty_line'
- },
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
{
'contents' => [
{
- 'text' => 'This is ifnothtml text.
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
}
],
- 'type' => 'paragraph'
- },
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
{
'text' => '
',
@@ -217,14 +256,14 @@ $result_trees{'cond_xml'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -253,26 +292,13 @@ $result_trees{'cond_xml'} = {
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -296,14 +322,15 @@ $result_texis{'cond_xml'} = '\\input texinfo
@c test conditions
-@node Top
-
@html
@end html
This is ifnothtml text.
+@node Top
+@top conditionals
+
This is ifnotinfo text.
@@ -322,9 +349,11 @@ This is ifnottex text.
$result_texts{'cond_xml'} = '
-
This is ifnothtml text.
+conditionals
+************
+
This is ifnotinfo text.
@@ -336,9 +365,41 @@ This is ifnottex text.
';
+$result_sectioning{'cond_xml'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'cond_xml'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'cond_xml'};
+
$result_nodes{'cond_xml'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -363,14 +424,15 @@ $result_converted{'xml'}->{'cond_xml'} =
'<preamblebeforebeginning>\\input texin
</preamblebeforebeginning><!-- c test conditions -->
-<node name="Top" spaces=" "><nodename>Top</nodename></node>
-
<html endspaces=" ">
</html>
<para>This is ifnothtml text.
</para>
+<node name="Top" spaces=" "><nodename>Top</nodename></node>
+<top spaces=" "><sectiontitle>conditionals</sectiontitle>
+
<para>This is ifnotinfo text.
@@ -382,6 +444,7 @@ $result_converted{'xml'}->{'cond_xml'} =
'<preamblebeforebeginning>\\input texin
<para>This is ifnottex text.
</para>
+</top>
<bye></bye>
';
diff --git a/tp/t/results/formatting/texi_cond.pl
b/tp/t/results/formatting/texi_cond.pl
index f0d008a1f1..686b1d1d39 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -46,95 +46,70 @@ $result_trees{'texi_cond'} = {
'text' => '
',
'type' => 'empty_line'
- }
- ],
- 'type' => 'preamble_before_content'
- }
- ],
- 'type' => 'before_node_section'
- },
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'Top'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'node',
- 'contents' => [
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'html',
- 'contents' => [
+ },
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'This is html text.
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'rawpreformatted'
- },
- {
- 'args' => [
+ 'cmdname' => 'html',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'html'
+ 'text' => 'This is html text.
+'
}
],
- 'info' => {
- 'spaces_after_argument' => '
+ 'type' => 'rawpreformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'html'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'text_arg' => 'html'
},
- 'type' => 'line_arg'
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
}
],
- 'cmdname' => 'end',
- 'extra' => {
- 'text_arg' => 'html'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 5,
'macro' => ''
}
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 7,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
+ 'type' => 'preamble_before_content'
},
{
'contents' => [
@@ -152,6 +127,70 @@ $result_trees{'texi_cond'} = {
},
{
'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Top'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'cond.texi',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
',
'type' => 'empty_line'
},
@@ -223,14 +262,14 @@ $result_trees{'texi_cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 31,
+ 'line_nr' => 32,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 29,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -259,26 +298,13 @@ $result_trees{'texi_cond'} = {
'type' => 'empty_line'
}
],
- 'extra' => {
- 'node_content' => [
- {}
- ],
- 'nodes_manuals' => [
- {
- 'node_content' => [
- {}
- ],
- 'normalized' => 'Top'
- }
- ],
- 'normalized' => 'Top'
- },
+ 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 5,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -302,8 +328,6 @@ $result_texis{'texi_cond'} = '\\input texinfo
@c test conditions
-@node Top
-
@html
This is html text.
@end html
@@ -311,6 +335,9 @@ This is html text.
This is ifhtml text.
+@node Top
+@top conditionals
+
This is ifinfo text.
@@ -328,10 +355,12 @@ This is ifnottex text.
$result_texts{'texi_cond'} = '
-
This is ifhtml text.
+conditionals
+************
+
This is ifinfo text.
@@ -343,9 +372,41 @@ This is ifnottex text.
';
+$result_sectioning{'texi_cond'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'info' => {}
+ }
+ },
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'texi_cond'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'texi_cond'};
+
$result_nodes{'texi_cond'} = {
'cmdname' => 'node',
'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {}
+ },
'normalized' => 'Top'
},
'info' => {}
@@ -371,10 +432,10 @@ $result_converted{'html'}->{'texi_cond'} = '<!DOCTYPE
html>
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>conditionals</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="conditionals">
+<meta name="keywords" content="conditionals">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
@@ -391,12 +452,14 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
-<a class="node" id="Top"></a>
This is html text.
<p>This is ifhtml text.
</p>
+<div class="top-level-extent" id="Top">
+<h1 class="top" id="conditionals">conditionals</h1>
+
<p>This is ifinfo text.
</p>
@@ -407,6 +470,7 @@ This is html text.
<p>This is ifnottex text.
</p>
<hr>
+</div>
<p>
<span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
</p>
@@ -416,15 +480,4 @@ This is html text.
</html>
';
-$result_converted_errors{'html'}->{'texi_cond'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'cond.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/92formatting.t: remove texi2html style for cond.texi related tests, and remove some custmization variables set.,
Patrice Dumas <=