[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Remove @setfilename for tests, use test_input_fil
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Remove @setfilename for tests, use test_input_file_name |
|
Date: |
Sun, 04 Sep 2022 19:11:36 -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 b8899b99c9 Remove @setfilename for tests, use test_input_file_name
b8899b99c9 is described below
commit b8899b99c9c3b547fcdff4044825c44a3308e4eb
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Sep 5 01:11:00 2022 +0200
Remove @setfilename for tests, use test_input_file_name
---
tp/t/30sectioning.t | 17 ++--
tp/t/results/sectioning/chapter_between_nodes.pl | 83 ++++--------------
.../res_latex/chapter_between_nodes.tex | 1 -
.../sectioning/section_before_after_top_node.pl | 67 +++------------
.../res_latex/section_before_after_top_node.tex | 1 -
.../section_before_after_top_node_last_node.pl | 73 ++++------------
.../section_before_after_top_node_last_node.tex | 1 -
.../sectioning/section_chapter_before_top_nodes.pl | 97 ++++++----------------
.../res_latex/section_chapter_before_top_nodes.tex | 1 -
tp/t/results/sectioning/top_node_part_top.pl | 52 +-----------
.../res_latex/top_node_part_top.tex} | 6 +-
11 files changed, 78 insertions(+), 321 deletions(-)
diff --git a/tp/t/30sectioning.t b/tp/t/30sectioning.t
index b1b7495a81..f080285c00 100644
--- a/tp/t/30sectioning.t
+++ b/tp/t/30sectioning.t
@@ -863,9 +863,7 @@ ref to ref @ref{ref}.
# in the Top node is not output, while the closing element is output
# at the end of the document
['chapter_between_nodes',
-'@setfilename chapter_between_nodes.info
-
-@node Top
+'@node Top
@top top section
Top node
@@ -885,9 +883,7 @@ section.
@contents
', {}, {'CONTENTS_OUTPUT_LOCATION' => 'inline'}],
['section_before_after_top_node_last_node',
-'@setfilename section_before_after_top_node_last_node.info
-
-@unnumbered before
+'@unnumbered before
@node Top
@top top section
@@ -899,9 +895,7 @@ in chapter
@node node after
'],
['section_before_after_top_node',
-'@setfilename section_before_after_top_node.info
-
-@unnumbered before
+'@unnumbered before
@node Top
@top top section
@@ -1111,9 +1105,7 @@ Top node
@end menu
'],
['section_chapter_before_top_nodes',
-'@setfilename section_chapter_before_top_nodes.info
-
-@node section node
+'@node section node
@section section
@node chapter node
@@ -2157,6 +2149,7 @@ foreach my $test (@tests_info) {
}
if (grep {$_ eq $test->[0]} @file_latex_tests_info_tests) {
push @{$test->[2]->{'test_formats'}}, 'file_latex';
+ $test->[2]->{'test_input_file_name'} = $test->[0] . '.texi';
$test->[2]->{'full_document'} = 1 unless
(exists($test->[2]->{'full_document'}));
}
}
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl
b/tp/t/results/sectioning/chapter_between_nodes.pl
index 7e07fe5f51..bbd694d921 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -10,43 +10,7 @@ $result_trees{'chapter_between_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'chapter_between_nodes.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'chapter_between_nodes.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -91,7 +55,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -197,7 +161,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
},
'type' => 'menu_entry'
@@ -228,7 +192,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
}
@@ -239,7 +203,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -256,7 +220,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -309,7 +273,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -378,7 +342,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -437,7 +401,7 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
}
@@ -448,17 +412,13 @@ $result_trees{'chapter_between_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0];
-$result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0];
$result_trees{'chapter_between_nodes'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'chapter_between_nodes'}{'contents'}[0];
$result_trees{'chapter_between_nodes'}{'contents'}[0]{'parent'} =
$result_trees{'chapter_between_nodes'};
$result_trees{'chapter_between_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'chapter_between_nodes'}{'contents'}[1]{'args'}[0];
@@ -516,9 +476,7 @@
$result_trees{'chapter_between_nodes'}{'contents'}[5]{'contents'}[3]{'args'}[0]{
$result_trees{'chapter_between_nodes'}{'contents'}[5]{'contents'}[3]{'parent'}
= $result_trees{'chapter_between_nodes'}{'contents'}[5];
$result_trees{'chapter_between_nodes'}{'contents'}[5]{'parent'} =
$result_trees{'chapter_between_nodes'};
-$result_texis{'chapter_between_nodes'} = '@setfilename
chapter_between_nodes.info
-
-@node Top
+$result_texis{'chapter_between_nodes'} = '@node Top
@top top section
Top node
@@ -539,8 +497,7 @@ section.
';
-$result_texts{'chapter_between_nodes'} = '
-top section
+$result_texts{'chapter_between_nodes'} = 'top section
***********
Top node
@@ -689,10 +646,10 @@ $result_floats{'chapter_between_nodes'} = {};
-$result_converted{'info'}->{'chapter_between_nodes'} = 'This is
chapter_between_nodes.info, produced from .
+$result_converted{'info'}->{'chapter_between_nodes'} = 'This is , produced
from chapter_between_nodes.texi.
-File: chapter_between_nodes.info, Node: Top, Next: section node, Up: (dir)
+File: , Node: Top, Next: section node, Up: (dir)
top section
***********
@@ -709,7 +666,7 @@ Top node
In chapter
-File: chapter_between_nodes.info, Node: section node, Prev: Top, Up: Top
+File: , Node: section node, Prev: Top, Up: Top
1.1 section
===========
@@ -720,7 +677,7 @@ section.
Tag Table:
Node: Top53
-Node: section node229
+Node: section node203
End Tag Table
@@ -756,7 +713,6 @@ ul.toc-numbered-mark {list-style: none}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
@@ -811,9 +767,7 @@ Previous: <a href="#Top" accesskey="p" rel="prev">top
section</a>, Up: <a href="
';
-$result_converted{'xml'}->{'chapter_between_nodes'} = '<setfilename
file="chapter_between_nodes.info" spaces="
">chapter_between_nodes.info</setfilename>
-
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext
automatic="on">section node</nodenext></node>
+$result_converted{'xml'}->{'chapter_between_nodes'} = '<node name="Top"
spaces=" "><nodename>Top</nodename><nodenext automatic="on">section
node</nodenext></node>
<top spaces=" "><sectiontitle>top section</sectiontitle>
<para>Top node
</para>
@@ -847,8 +801,7 @@ $result_converted{'docbook'}->{'chapter_between_nodes'} =
'<sect1 label="1.1" id
';
-$result_converted{'latex_text'}->{'chapter_between_nodes'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'chapter_between_nodes'} = '\\begin{document}
\\label{anchor:Top}%
\\section{{section}}
\\label{anchor:section-node}%
diff --git
a/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
b/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
index 1863f26547..df45c74153 100644
---
a/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
+++
b/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
@@ -37,7 +37,6 @@
\makeatother
\pagestyle{single}%
-
\begin{document}
\label{anchor:Top}%
\section{{section}}
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl
b/tp/t/results/sectioning/section_before_after_top_node.pl
index b09bf9bebb..b1468025a7 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -10,43 +10,7 @@ $result_trees{'section_before_after_top_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'section_before_after_top_node.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'section_before_after_top_node.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -86,7 +50,7 @@ $result_trees{'section_before_after_top_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -127,7 +91,7 @@ $result_trees{'section_before_after_top_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -163,7 +127,7 @@ $result_trees{'section_before_after_top_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -210,17 +174,13 @@ $result_trees{'section_before_after_top_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0];
-$result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0];
$result_trees{'section_before_after_top_node'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'section_before_after_top_node'}{'contents'}[0];
$result_trees{'section_before_after_top_node'}{'contents'}[0]{'parent'} =
$result_trees{'section_before_after_top_node'};
$result_trees{'section_before_after_top_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'section_before_after_top_node'}{'contents'}[1]{'args'}[0];
@@ -243,9 +203,7 @@
$result_trees{'section_before_after_top_node'}{'contents'}[4]{'contents'}[1]{'co
$result_trees{'section_before_after_top_node'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'section_before_after_top_node'}{'contents'}[4];
$result_trees{'section_before_after_top_node'}{'contents'}[4]{'parent'} =
$result_trees{'section_before_after_top_node'};
-$result_texis{'section_before_after_top_node'} = '@setfilename
section_before_after_top_node.info
-
-@unnumbered before
+$result_texis{'section_before_after_top_node'} = '@unnumbered before
@node Top
@top top section
@@ -256,8 +214,7 @@ in chapter
';
-$result_texts{'section_before_after_top_node'} = '
-before
+$result_texts{'section_before_after_top_node'} = 'before
******
top section
@@ -346,7 +303,7 @@ $result_errors{'section_before_after_top_node'} = [
'error_line' => 'warning: lowering the section level of @top appearing
after a lower element
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => '',
'text' => 'lowering the section level of @top appearing after a lower
element',
'type' => 'warning'
@@ -358,13 +315,13 @@ $result_floats{'section_before_after_top_node'} = {};
-$result_converted{'info'}->{'section_before_after_top_node'} = 'This is
section_before_after_top_node.info, produced from .
+$result_converted{'info'}->{'section_before_after_top_node'} = 'This is ,
produced from section_before_after_top_node.texi.
before
******
-File: section_before_after_top_node.info, Node: Top, Up: (dir)
+File: , Node: Top, Up: (dir)
top section
***********
@@ -406,7 +363,6 @@
$result_converted{'html'}->{'section_before_after_top_node'} = '<!DOCTYPE html>
</head>
<body lang="en">
-
<div class="unnumbered-level-extent" id="before">
<h2 class="unnumbered">before</h2>
@@ -435,8 +391,7 @@
$result_converted{'docbook'}->{'section_before_after_top_node'} = '<chapter labe
';
-$result_converted{'latex_text'}->{'section_before_after_top_node'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'section_before_after_top_node'} =
'\\begin{document}
\\chapter*{{before}}
\\label{anchor:Top}%
diff --git
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
b/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
index ac4cc46717..c31df3668f 100644
---
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
+++
b/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
@@ -37,7 +37,6 @@
\makeatother
\pagestyle{single}%
-
\begin{document}
\chapter*{{before}}
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index 154c7d9557..145e17ff3d 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -10,43 +10,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'section_before_after_top_node_last_node.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'section_before_after_top_node_last_node.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -86,7 +50,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -127,7 +91,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -163,7 +127,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -216,7 +180,7 @@ $result_trees{'section_before_after_top_node_last_node'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -257,17 +221,13 @@ $result_trees{'section_before_after_top_node_last_node'}
= {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0];
-$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0];
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'section_before_after_top_node_last_node'}{'contents'}[0];
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[0]{'parent'}
= $result_trees{'section_before_after_top_node_last_node'};
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[1]{'args'}[0];
@@ -296,9 +256,7 @@
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'extra'}
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'args'}[0]{'contents'}[0];
$result_trees{'section_before_after_top_node_last_node'}{'contents'}[5]{'parent'}
= $result_trees{'section_before_after_top_node_last_node'};
-$result_texis{'section_before_after_top_node_last_node'} = '@setfilename
section_before_after_top_node_last_node.info
-
-@unnumbered before
+$result_texis{'section_before_after_top_node_last_node'} = '@unnumbered before
@node Top
@top top section
@@ -311,8 +269,7 @@ in chapter
';
-$result_texts{'section_before_after_top_node_last_node'} = '
-before
+$result_texts{'section_before_after_top_node_last_node'} = 'before
******
top section
@@ -416,7 +373,7 @@ $result_errors{'section_before_after_top_node_last_node'} =
[
'error_line' => 'warning: lowering the section level of @top appearing
after a lower element
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => '',
'text' => 'lowering the section level of @top appearing after a lower
element',
'type' => 'warning'
@@ -428,13 +385,13 @@ $result_floats{'section_before_after_top_node_last_node'}
= {};
-$result_converted{'info'}->{'section_before_after_top_node_last_node'} = 'This
is section_before_after_top_node_last_node.info, produced from .
+$result_converted{'info'}->{'section_before_after_top_node_last_node'} = 'This
is , produced from section_before_after_top_node_last_node.texi.
before
******
-File: section_before_after_top_node_last_node.info, Node: Top, Next: node
after, Up: (dir)
+File: , Node: Top, Next: node after, Up: (dir)
top section
***********
@@ -445,13 +402,13 @@ top section
in chapter
-File: section_before_after_top_node_last_node.info, Node: node after, Prev:
Top
+File: , Node: node after, Prev: Top
Tag Table:
Node: Top86
-Node: node after241
+Node: node after197
End Tag Table
@@ -481,7 +438,6 @@
$result_converted{'html'}->{'section_before_after_top_node_last_node'} = '<!DOCT
</head>
<body lang="en">
-
<div class="unnumbered-level-extent" id="before">
<div class="nav-panel">
<p>
@@ -522,8 +478,7 @@
$result_converted{'docbook'}->{'section_before_after_top_node_last_node'} = '<ch
';
-$result_converted{'latex_text'}->{'section_before_after_top_node_last_node'} =
'
-\\begin{document}
+$result_converted{'latex_text'}->{'section_before_after_top_node_last_node'} =
'\\begin{document}
\\chapter*{{before}}
\\label{anchor:Top}%
diff --git
a/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
b/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
index 4ca5c35580..ee835b37c8 100644
---
a/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
+++
b/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
@@ -37,7 +37,6 @@
\makeatother
\pagestyle{single}%
-
\begin{document}
\chapter*{{before}}
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index 9f88ffe8a4..4edba287d1 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -10,43 +10,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'section_chapter_before_top_nodes.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'section_chapter_before_top_nodes.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -91,7 +55,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -127,7 +91,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -168,7 +132,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -263,7 +227,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'menu_entry'
@@ -294,7 +258,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -305,7 +269,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -322,7 +286,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -363,7 +327,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -458,7 +422,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'menu_entry'
@@ -489,7 +453,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
}
}
@@ -500,7 +464,7 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
},
@@ -517,17 +481,13 @@ $result_trees{'section_chapter_before_top_nodes'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0];
-$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0];
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'section_chapter_before_top_nodes'}{'contents'}[0];
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[0]{'parent'} =
$result_trees{'section_chapter_before_top_nodes'};
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'section_chapter_before_top_nodes'}{'contents'}[1]{'args'}[0];
@@ -592,9 +552,7 @@
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[1]{
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'contents'}[2]{'parent'}
= $result_trees{'section_chapter_before_top_nodes'}{'contents'}[6];
$result_trees{'section_chapter_before_top_nodes'}{'contents'}[6]{'parent'} =
$result_trees{'section_chapter_before_top_nodes'};
-$result_texis{'section_chapter_before_top_nodes'} = '@setfilename
section_chapter_before_top_nodes.info
-
-@node section node
+$result_texis{'section_chapter_before_top_nodes'} = '@node section node
@section section
@node chapter node
@@ -614,8 +572,7 @@ $result_texis{'section_chapter_before_top_nodes'} =
'@setfilename section_chapte
';
-$result_texts{'section_chapter_before_top_nodes'} = '
-1 section
+$result_texts{'section_chapter_before_top_nodes'} = '1 section
=========
2 chapter
@@ -807,7 +764,7 @@ $result_errors{'section_chapter_before_top_nodes'} = [
'error_line' => 'warning: lowering the section level of @chapter appearing
after a lower element
',
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => '',
'text' => 'lowering the section level of @chapter appearing after a lower
element',
'type' => 'warning'
@@ -816,7 +773,7 @@ $result_errors{'section_chapter_before_top_nodes'} = [
'error_line' => 'warning: lowering the section level of @top appearing
after a lower element
',
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => '',
'text' => 'lowering the section level of @top appearing after a lower
element',
'type' => 'warning'
@@ -825,7 +782,7 @@ $result_errors{'section_chapter_before_top_nodes'} = [
'error_line' => 'warning: node `chapter node\' is up for `section node\'
in menu but not in sectioning
',
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => '',
'text' => 'node `chapter node\' is up for `section node\' in menu but not
in sectioning',
'type' => 'warning'
@@ -834,7 +791,7 @@ $result_errors{'section_chapter_before_top_nodes'} = [
'error_line' => 'warning: node `Top\' is up for `chapter node\' in menu
but not in sectioning
',
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => '',
'text' => 'node `Top\' is up for `chapter node\' in menu but not in
sectioning',
'type' => 'warning'
@@ -846,16 +803,16 @@ $result_floats{'section_chapter_before_top_nodes'} = {};
-$result_converted{'info'}->{'section_chapter_before_top_nodes'} = 'This is
section_chapter_before_top_nodes.info, produced from .
+$result_converted{'info'}->{'section_chapter_before_top_nodes'} = 'This is ,
produced from section_chapter_before_top_nodes.texi.
-File: section_chapter_before_top_nodes.info, Node: section node, Next:
chapter node, Up: chapter node
+File: , Node: section node, Next: chapter node, Up: chapter node
1 section
=========
-File: section_chapter_before_top_nodes.info, Node: chapter node, Next: Top,
Prev: section node, Up: Top
+File: , Node: chapter node, Next: Top, Prev: section node, Up: Top
2 chapter
=========
@@ -865,7 +822,7 @@ File: section_chapter_before_top_nodes.info, Node: chapter
node, Next: Top, P
* section node::
-File: section_chapter_before_top_nodes.info, Node: Top, Next: chapter node,
Up: (dir)
+File: , Node: Top, Next: chapter node, Up: (dir)
top
===
@@ -878,8 +835,8 @@ top
Tag Table:
Node: section node64
-Node: chapter node193
-Node: Top352
+Node: chapter node156
+Node: Top278
End Tag Table
@@ -909,7 +866,6 @@
$result_converted{'html'}->{'section_chapter_before_top_nodes'} = '<!DOCTYPE htm
</head>
<body lang="en">
-
<div class="section-level-extent" id="section-node">
<div class="nav-panel">
<p>
@@ -958,8 +914,7 @@
$result_converted{'docbook'}->{'section_chapter_before_top_nodes'} = '<sect1 lab
';
-$result_converted{'latex_text'}->{'section_chapter_before_top_nodes'} = '
-\\begin{document}
+$result_converted{'latex_text'}->{'section_chapter_before_top_nodes'} =
'\\begin{document}
\\section{{section}}
\\label{anchor:section-node}%
diff --git
a/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
b/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
index a8a56fc594..66ed507b07 100644
---
a/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
+++
b/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
@@ -37,7 +37,6 @@
\makeatother
\pagestyle{single}%
-
\begin{document}
\section{{section}}
\label{anchor:section-node}%
diff --git a/tp/t/results/sectioning/top_node_part_top.pl
b/tp/t/results/sectioning/top_node_part_top.pl
index c116f5171e..4757cd34ec 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -383,7 +383,7 @@ $result_directions_text{'top_node_part_top'} = 'element:
@top top
';
-$result_converted{'info'}->{'top_node_part_top'} = 'This is , produced from .
+$result_converted{'info'}->{'top_node_part_top'} = 'This is , produced from
top_node_part_top.texi.
File: , Node: Top, Up: (dir)
@@ -394,7 +394,7 @@ top
Tag Table:
-Node: Top27
+Node: Top49
End Tag Table
@@ -468,52 +468,4 @@ $result_converted{'latex_text'}->{'top_node_part_top'} =
'\\begin{document}
\\label{anchor:Top}%
';
-
-$result_converted{'file_latex'}->{'top_node_part_top'} = '\\documentclass{book}
-\\usepackage{amsfonts}
-\\usepackage{amsmath}
-\\usepackage[gen]{eurosym}
-\\usepackage[T1]{fontenc}
-\\usepackage{textcomp}
-\\usepackage{graphicx}
-\\usepackage{etoolbox}
-\\usepackage{titleps}
-\\usepackage{float}
-% use hidelinks to remove boxes around links to be similar to Texinfo TeX
-\\usepackage[hidelinks]{hyperref}
-\\usepackage[utf8]{inputenc}
-
-\\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
-
-% redefine the \\mainmatter command such that it does not clear page
-% as if in double page
-\\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
-
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
-{\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
-% used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
-
-\\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{}
\\chaptertitle{}][][\\thepage]
- {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
-
-\\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
-
-\\makeatother
-% set default for @setchapternewpage
-\\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
-\\makeatother
-\\pagestyle{single}%
-
-\\begin{document}
-\\part{{part}}
-
-\\part*{{top}}
-\\label{anchor:Top}%
-\\end{document}
-';
-
1;
diff --git
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
b/tp/t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex
similarity index 97%
copy from
tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
copy to
tp/t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex
index ac4cc46717..454b8d16b6 100644
---
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
+++ b/tp/t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex
@@ -37,11 +37,9 @@
\makeatother
\pagestyle{single}%
-
\begin{document}
-\chapter*{{before}}
+\part{{part}}
+\part*{{top}}
\label{anchor:Top}%
-
-(`Top' node ignored)
\end{document}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Remove @setfilename for tests, use test_input_file_name,
Patrice Dumas <=