[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Mon, 28 Nov 2022 06:11:55 -0500 (EST) |
branch: master
commit eab048b6a8ecc8a5f565f99c38f96df37287c27b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Nov 28 12:10:55 2022 +0100
Remove @setfilename for tp/t/*.t test files, especially when
they are used in more than one test to avoid differing file name
and setfilename
---
tp/t/input_files/bib-example.texi | 1 -
tp/t/input_files/char_latin1_latin1_in_refs.texi | 4 +-
tp/t/input_files/char_latin1_utf8_in_refs.texi | 4 +-
tp/t/input_files/char_latin2_latin2_in_refs.texi | 3 +-
tp/t/input_files/chinese_mixed_with_en.texi | 1 -
tp/t/input_files/cond.texi | 3 +-
tp/t/input_files/contents_at_document_begin.texi | 4 +-
tp/t/input_files/contents_at_end_document.texi | 4 +-
.../contents_at_end_document_after_node.texi | 4 +-
tp/t/input_files/contents_in_document.texi | 4 +-
tp/t/input_files/defxcond.texi | 3 +-
tp/t/input_files/encoding_index_latin1.texi | 3 +-
tp/t/input_files/encoding_index_utf8.texi | 3 +-
tp/t/input_files/equivalent_nodes.texi | 2 +-
tp/t/input_files/index_split.texi | 2 -
tp/t/input_files/navigation.texi | 2 -
tp/t/input_files/node_footnote.texi | 2 +-
.../nodes_after_top_before_chapter.texi | 2 +-
.../nodes_after_top_before_section.texi | 2 +-
tp/t/input_files/nodes_before_top.texi | 2 +-
.../input_files/nodes_before_top_and_sections.texi | 2 +-
tp/t/input_files/test_refs.texi | 1 -
tp/t/input_files/two_footnotes_in_nodes.texi | 2 -
.../char_latin1_latin1_in_refs.pl | 127 ++++--------
.../res_html/a-e-i-o-u-A-E-I-O-U.html | 8 +-
.../res_html/a-e-i-o-u-y-A-E-I-O-U.html | 8 +-
.../char_latin1_latin1_in_refs/res_html/a-e-u.html | 8 +-
.../char_latin1_latin1_in_refs/res_html/c.html | 8 +-
.../char_latin1_latin1_in_refs/res_html/e.html | 8 +-
.../char_latin1_latin1_in_refs/res_html/index.html | 9 +-
.../res_info/char_latin1_latin1_in_refs.info | Bin 1652 -> 1698 bytes
.../res_latex/char_latin1_latin1_in_refs.tex | 1 -
.../res_xml/char_latin1_latin1_in_refs.xml | 6 +-
.../formats_encodings/char_latin1_utf8_in_refs.pl | 127 ++++--------
.../res_html/a-e-i-o-u-A-E-I-O-U.html | 8 +-
.../res_html/a-e-i-o-u-y-A-E-I-O-U.html | 8 +-
.../char_latin1_utf8_in_refs/res_html/a-e-u.html | 8 +-
.../char_latin1_utf8_in_refs/res_html/c.html | 8 +-
.../char_latin1_utf8_in_refs/res_html/e.html | 8 +-
.../char_latin1_utf8_in_refs/res_html/index.html | 9 +-
.../res_info/char_latin1_utf8_in_refs.info | Bin 1842 -> 1885 bytes
.../char_latin2_latin2_in_refs.pl | 81 +++-----
.../res_html/A-a-_002c-E-e.html | 8 +-
.../char_latin2_latin2_in_refs/res_html/index.html | 9 +-
.../res_info/char_latin2_latin2_in_refs.info | Bin 533 -> 579 bytes
tp/t/results/formatting/cond.pl | 57 +++---
.../results/formatting/cond_ifhtml_ifinfo_iftex.pl | 59 +++---
tp/t/results/formatting/cond_info.pl | 63 +++---
.../formatting/cond_info_ifhtml_ifinfo_iftex.pl | 63 +++---
.../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl | 63 +++---
.../cond_no-ifhtml_no-ifinfo_no-iftex.pl | 57 +++---
tp/t/results/formatting/cond_xml.pl | 60 +++---
tp/t/results/formatting/defcondx_Dbar.pl | 59 +++---
tp/t/results/formatting/defcondx_Ubar.pl | 55 +++---
tp/t/results/formatting/texi_bib_example.pl | 91 +++------
tp/t/results/formatting/texi_cond.pl | 57 +++---
tp/t/results/htmlxref/htmlxref.pl | 183 +++++++----------
tp/t/results/htmlxref/htmlxref_nodes.pl | 183 +++++++----------
tp/t/results/htmlxref/htmlxref_only_mono.pl | 183 +++++++----------
tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl | 183 +++++++----------
tp/t/results/htmlxref/htmlxref_only_split.pl | 183 +++++++----------
tp/t/results/htmlxref/htmlxref_only_split_nodes.pl | 183 +++++++----------
tp/t/results/indices/encoding_index_latin1.pl | 220 +++++++++------------
.../encoding_index_latin1/res_html/index.html | 8 +-
.../res_info/encoding_index_latin1.info | Bin 4272 -> 4308 bytes
.../res_plaintext/encoding_index_latin1.txt | 4 +-
.../encoding_index_latin1_enable_encoding.pl | 220 +++++++++------------
.../res_html/index.html | 8 +-
.../res_info/encoding_index_latin1.info | Bin 4272 -> 4308 bytes
.../encoding_index_latin1_enable_encoding.txt | 4 +-
tp/t/results/indices/encoding_index_utf8.pl | 220 +++++++++------------
.../encoding_index_utf8/res_html/index.html | 8 +-
.../res_info/encoding_index_utf8.info | Bin 4263 -> 4295 bytes
.../res_plaintext/encoding_index_utf8.txt | 4 +-
.../indices/encoding_index_utf8_enable_encoding.pl | 220 +++++++++------------
.../res_html/index.html | 8 +-
.../res_info/encoding_index_utf8.info | Bin 4302 -> 4334 bytes
.../encoding_index_utf8_enable_encoding.txt | 4 +-
tp/t/results/layout/navigation.pl | 94 +++------
.../layout/navigation/res_html/navigation.html | 1 -
tp/t/results/layout/navigation_chapter.pl | 94 +++------
.../layout/navigation_chapter/res_html/index.html | 1 -
.../results/layout/navigation_chapter_no_header.pl | 94 +++------
.../res_html/index.html | 1 -
.../navigation_chapter_no_header_vertical.pl | 94 +++------
.../res_html/index.html | 1 -
tp/t/results/layout/navigation_chapter_vertical.pl | 94 +++------
.../res_html/index.html | 1 -
tp/t/results/layout/navigation_no_header.pl | 94 +++------
.../navigation_no_header/res_html/navigation.html | 1 -
.../layout/navigation_no_header_vertical.pl | 94 +++------
.../res_html/navigation.html | 1 -
tp/t/results/layout/navigation_node.pl | 94 +++------
.../layout/navigation_node/res_html/index.html | 1 -
tp/t/results/layout/navigation_node_no_header.pl | 94 +++------
.../navigation_node_no_header/res_html/index.html | 1 -
.../layout/navigation_node_no_header_vertical.pl | 94 +++------
.../res_html/index.html | 1 -
tp/t/results/layout/navigation_node_vertical.pl | 94 +++------
.../navigation_node_vertical/res_html/index.html | 1 -
tp/t/results/layout/navigation_section.pl | 94 +++------
.../layout/navigation_section/res_html/index.html | 1 -
.../results/layout/navigation_section_no_header.pl | 94 +++------
.../res_html/index.html | 1 -
.../navigation_section_no_header_vertical.pl | 94 +++------
.../res_html/index.html | 1 -
tp/t/results/layout/navigation_section_vertical.pl | 94 +++------
.../res_html/index.html | 1 -
tp/t/results/layout/navigation_vertical.pl | 94 +++------
.../navigation_vertical/res_html/navigation.html | 1 -
tp/t/results/moreindices/index_split.pl | 190 +++++++-----------
.../moreindices/index_split/res_html/index.html | 1 -
tp/t/results/moreindices/index_split_nodes.pl | 188 +++++++-----------
.../index_split_nodes/res_html/index.html | 1 -
tp/t/results/moreindices/nodes_before_top.pl | 49 ++---
.../nodes_before_top_and_sections_monolithic.pl | 6 +-
.../moreindices/nodes_before_top_no_nodes.pl | 49 ++---
tp/t/results/moreindices/nodes_before_top_nodes.pl | 49 ++---
tp/t/results/moresectioning/equivalent_nodes.pl | 49 ++---
.../moresectioning/equivalent_nodes_no_node.pl | 49 ++---
tp/t/results/moresectioning/node_footnote_end.pl | 49 ++---
.../moresectioning/node_footnote_separated.pl | 49 ++---
.../moresectioning/node_footnote_use_node.pl | 49 ++---
.../nodes_after_top_before_chapter.pl | 49 ++---
...s_after_top_before_chapter_use_nodes_chapter.pl | 49 ++---
.../nodes_after_top_before_section.pl | 49 ++---
.../nodes_after_top_before_section_use_nodes.pl | 49 ++---
...s_after_top_before_section_use_nodes_chapter.pl | 49 ++---
.../moresectioning/two_footnotes_in_nodes.pl | 80 ++------
.../res_html/two_footnotes_in_nodes.html | 1 -
.../two_footnotes_in_nodes_separated.pl | 80 ++------
.../res_html/two_footnotes_in_nodes.html | 1 -
.../plaintext_tests/chinese_mixed_with_en.pl | 54 +----
.../sectioning/contents_at_document_begin.pl | 71 ++-----
.../results/sectioning/contents_at_end_document.pl | 72 ++-----
.../contents_at_end_document_after_node.pl | 80 ++------
tp/t/results/sectioning/contents_in_document.pl | 72 ++-----
.../char_latin1_latin1_in_refs.html | 19 +-
.../char_latin1_utf8_in_refs.html | 19 +-
139 files changed, 2203 insertions(+), 4116 deletions(-)
diff --git a/tp/t/input_files/bib-example.texi
b/tp/t/input_files/bib-example.texi
index cf44d0e4b2..b4805d2f8d 100644
--- a/tp/t/input_files/bib-example.texi
+++ b/tp/t/input_files/bib-example.texi
@@ -20,7 +20,6 @@
@c % Boston, MA 02111-1307, USA.
@comment %**start of header
-@setfilename my-file-with-bib.info
@settitle Texinfo with a Bibliography and References
@include my-bib-macros.texi
diff --git a/tp/t/input_files/char_latin1_latin1_in_refs.texi
b/tp/t/input_files/char_latin1_latin1_in_refs.texi
index 5f06f96a9e..058deb22c2 100644
--- a/tp/t/input_files/char_latin1_latin1_in_refs.texi
+++ b/tp/t/input_files/char_latin1_latin1_in_refs.texi
@@ -1,11 +1,9 @@
\input texinfo
-@setfilename char_latin1_latin1_in_refs.info
-
@documentencoding iso-8859-1
@node Top
-@top top
+@top char latin1 latin1 in refs
@menu
* � � � � � � � � � � �::
diff --git a/tp/t/input_files/char_latin1_utf8_in_refs.texi
b/tp/t/input_files/char_latin1_utf8_in_refs.texi
index 527924284b..20729dd039 100644
--- a/tp/t/input_files/char_latin1_utf8_in_refs.texi
+++ b/tp/t/input_files/char_latin1_utf8_in_refs.texi
@@ -1,11 +1,9 @@
\input texinfo
-@setfilename char_latin1_utf8_in_refs.info
-
@documentencoding utf-8
@node Top
-@top top
+@top char latin1 utf8 in refs
@printindex cp
diff --git a/tp/t/input_files/char_latin2_latin2_in_refs.texi
b/tp/t/input_files/char_latin2_latin2_in_refs.texi
index c81a902051..1c9d31bcff 100644
--- a/tp/t/input_files/char_latin2_latin2_in_refs.texi
+++ b/tp/t/input_files/char_latin2_latin2_in_refs.texi
@@ -1,10 +1,9 @@
\input texinfo
-@setfilename char_latin2_latin2_in_refs.info
@documentencoding ISO-8859-2
@node Top
-@top top
+@top char latin2 latin2 in refs
@ref{� � � � �}.
diff --git a/tp/t/input_files/chinese_mixed_with_en.texi
b/tp/t/input_files/chinese_mixed_with_en.texi
index 66dabaad29..4d92c29e5b 100644
--- a/tp/t/input_files/chinese_mixed_with_en.texi
+++ b/tp/t/input_files/chinese_mixed_with_en.texi
@@ -1,6 +1,5 @@
\input texinfo
@documentencoding utf-8
-@setfilename chinese_mixed_with_en.info
@settitle chinese mixed with english
@node Top
diff --git a/tp/t/input_files/cond.texi b/tp/t/input_files/cond.texi
index b60242322d..f40a83fd0a 100644
--- a/tp/t/input_files/cond.texi
+++ b/tp/t/input_files/cond.texi
@@ -1,5 +1,6 @@
\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
diff --git a/tp/t/input_files/contents_at_document_begin.texi
b/tp/t/input_files/contents_at_document_begin.texi
index 8dfbd8cc62..e5380775d0 100644
--- a/tp/t/input_files/contents_at_document_begin.texi
+++ b/tp/t/input_files/contents_at_document_begin.texi
@@ -1,11 +1,9 @@
\input texinfo @c -*-texinfo-*-
-@setfilename contents_at_document_begin.info
-
@contents
@node Top
-@top top
+@top contents at document begin
@chapter chap
diff --git a/tp/t/input_files/contents_at_end_document.texi
b/tp/t/input_files/contents_at_end_document.texi
index ed10a0d8f4..afc3e64502 100644
--- a/tp/t/input_files/contents_at_end_document.texi
+++ b/tp/t/input_files/contents_at_end_document.texi
@@ -1,9 +1,7 @@
\input texinfo @c -*-texinfo-*-
-@setfilename contents_at_end_document.info
-
@node Top
-@top top
+@top contents at end document
@chapter chap
diff --git a/tp/t/input_files/contents_at_end_document_after_node.texi
b/tp/t/input_files/contents_at_end_document_after_node.texi
index f24338c352..759572fc73 100644
--- a/tp/t/input_files/contents_at_end_document_after_node.texi
+++ b/tp/t/input_files/contents_at_end_document_after_node.texi
@@ -1,9 +1,7 @@
\input texinfo @c -*-texinfo-*-
-@setfilename contents_at_end_document_after_node.info
-
@node Top
-@top top
+@top contents at end document after node
@menu
* a node::
diff --git a/tp/t/input_files/contents_in_document.texi
b/tp/t/input_files/contents_in_document.texi
index a5e0e152e3..87917baace 100644
--- a/tp/t/input_files/contents_in_document.texi
+++ b/tp/t/input_files/contents_in_document.texi
@@ -1,9 +1,7 @@
\input texinfo @c -*-texinfo-*-
-@setfilename contents_in_document.info
-
@node Top
-@top top
+@top contents in document
@contents
diff --git a/tp/t/input_files/defxcond.texi b/tp/t/input_files/defxcond.texi
index a7af9e21e7..8fc4ef8707 100644
--- a/tp/t/input_files/defxcond.texi
+++ b/tp/t/input_files/defxcond.texi
@@ -1,5 +1,6 @@
\input texinfo
-@setfilename defxcond.info
+
+@c test def*x in a conditional
@c set this from the command line.
@c set bar
diff --git a/tp/t/input_files/encoding_index_latin1.texi
b/tp/t/input_files/encoding_index_latin1.texi
index 6482f55eb2..61e64cf3ac 100644
--- a/tp/t/input_files/encoding_index_latin1.texi
+++ b/tp/t/input_files/encoding_index_latin1.texi
@@ -1,9 +1,8 @@
-@setfilename encoding_index_latin1.info
@documentencoding iso-8859-1
@node Top
-@top top
+@top encoding index latin1
@cindex � �
@cindex @"{i} @"{i}@"{i}@"{i}
diff --git a/tp/t/input_files/encoding_index_utf8.texi
b/tp/t/input_files/encoding_index_utf8.texi
index 85ef9a4ac4..aaeea31839 100644
--- a/tp/t/input_files/encoding_index_utf8.texi
+++ b/tp/t/input_files/encoding_index_utf8.texi
@@ -1,9 +1,8 @@
-@setfilename encoding_index_utf8.info
@documentencoding utf-8
@node Top
-@top top
+@top encoding index utf8
@cindex é é
@cindex @"{i} @"{i}@"{i}@"{i}
diff --git a/tp/t/input_files/equivalent_nodes.texi
b/tp/t/input_files/equivalent_nodes.texi
index 3e8d39ec2b..99bc84cfae 100644
--- a/tp/t/input_files/equivalent_nodes.texi
+++ b/tp/t/input_files/equivalent_nodes.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
-@setfilename equivalent_nodes.info
+@c test equivalent nodes
@node before top, @asis{node},,(dir)
diff --git a/tp/t/input_files/index_split.texi
b/tp/t/input_files/index_split.texi
index 4676ee764e..899519218d 100644
--- a/tp/t/input_files/index_split.texi
+++ b/tp/t/input_files/index_split.texi
@@ -1,7 +1,5 @@
\input texinfo @c -*-texinfo-*-
-@setfilename index_split
-
@node Top
@top split indices
@cindex entry a
diff --git a/tp/t/input_files/navigation.texi b/tp/t/input_files/navigation.texi
index dccb79a873..62eac71c06 100644
--- a/tp/t/input_files/navigation.texi
+++ b/tp/t/input_files/navigation.texi
@@ -1,7 +1,5 @@
\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
diff --git a/tp/t/input_files/node_footnote.texi
b/tp/t/input_files/node_footnote.texi
index 97d720c496..78a86079be 100644
--- a/tp/t/input_files/node_footnote.texi
+++ b/tp/t/input_files/node_footnote.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
-@setfilename node_footnote.info
+@c test footnotes with nodes only
@node Top
diff --git a/tp/t/input_files/nodes_after_top_before_chapter.texi
b/tp/t/input_files/nodes_after_top_before_chapter.texi
index 0f56a4ca12..f645ac16e7 100644
--- a/tp/t/input_files/nodes_after_top_before_chapter.texi
+++ b/tp/t/input_files/nodes_after_top_before_chapter.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
-@setfilename nodes_after_top_before_chapter.info
+@c test nodes after top before chapter
@node Top
diff --git a/tp/t/input_files/nodes_after_top_before_section.texi
b/tp/t/input_files/nodes_after_top_before_section.texi
index 61d0e73283..90869c39d7 100644
--- a/tp/t/input_files/nodes_after_top_before_section.texi
+++ b/tp/t/input_files/nodes_after_top_before_section.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
-@setfilename nodes_after_top_before_section.info
+@c test nodes after Top before section
@node Top
diff --git a/tp/t/input_files/nodes_before_top.texi
b/tp/t/input_files/nodes_before_top.texi
index 66aa3d0f70..963c600f95 100644
--- a/tp/t/input_files/nodes_before_top.texi
+++ b/tp/t/input_files/nodes_before_top.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
-@setfilename index_nodes
+@c test nodes before Top node
@node first before top, Top, ,(dir)
diff --git a/tp/t/input_files/nodes_before_top_and_sections.texi
b/tp/t/input_files/nodes_before_top_and_sections.texi
index 329473585b..d44831d591 100644
--- a/tp/t/input_files/nodes_before_top_and_sections.texi
+++ b/tp/t/input_files/nodes_before_top_and_sections.texi
@@ -1,6 +1,6 @@
\input texinfo @c -*-texinfo-*-
-@setfilename more_before_top_section
+@setfilename nodes_before_top_and_sections.info
@node first before top, Top, ,(dir)
diff --git a/tp/t/input_files/test_refs.texi b/tp/t/input_files/test_refs.texi
index 661e96256f..d6c849de00 100644
--- a/tp/t/input_files/test_refs.texi
+++ b/tp/t/input_files/test_refs.texi
@@ -1,6 +1,5 @@
\input texinfo @c -*-texinfo-*-
-@setfilename test_refs.info
@node Top
@top Test refs
diff --git a/tp/t/input_files/two_footnotes_in_nodes.texi
b/tp/t/input_files/two_footnotes_in_nodes.texi
index d0f4a40657..c46c7768c9 100644
--- a/tp/t/input_files/two_footnotes_in_nodes.texi
+++ b/tp/t/input_files/two_footnotes_in_nodes.texi
@@ -1,7 +1,5 @@
\input texinfo @c -*-texinfo-*-
-@setfilename two_footnotes_in_nodes.info
-
@node Top
@top 2 footnotes in 2 nodes
diff --git a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
index 25385908ec..0ca1cbd8ef 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs.pl
@@ -12,58 +12,20 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'char_latin1_latin1_in_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'char_latin1_latin1_in_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
{
'args' => [
{
@@ -90,7 +52,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -140,7 +102,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -149,7 +111,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'char latin1 latin1 in refs'
}
],
'info' => {
@@ -222,7 +184,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'menu_entry'
@@ -271,7 +233,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'menu_entry'
@@ -320,7 +282,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
},
'type' => 'menu_entry'
@@ -369,7 +331,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'menu_entry'
@@ -418,7 +380,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'menu_entry'
@@ -447,14 +409,14 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -470,7 +432,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -510,7 +472,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
}
},
@@ -562,7 +524,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 21,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -578,7 +540,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -617,7 +579,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -650,7 +612,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 24,
+ 'line_nr' => 22,
'macro' => ''
}
},
@@ -689,7 +651,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -722,7 +684,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 27,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -761,7 +723,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 27,
'macro' => ''
}
},
@@ -794,7 +756,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 30,
+ 'line_nr' => 28,
'macro' => ''
}
},
@@ -833,7 +795,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -884,7 +846,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 33,
'macro' => ''
}
},
@@ -915,7 +877,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 36,
+ 'line_nr' => 34,
'macro' => ''
}
},
@@ -946,7 +908,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 35,
'macro' => ''
}
},
@@ -977,7 +939,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 38,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -1008,7 +970,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 37,
'macro' => ''
}
},
@@ -1059,7 +1021,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 41,
+ 'line_nr' => 39,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1099,7 +1061,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 42,
+ 'line_nr' => 40,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1139,7 +1101,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1179,7 +1141,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 44,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1219,7 +1181,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1259,7 +1221,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 46,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1276,7 +1238,7 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_latin1_in_refs.texi',
- 'line_nr' => 33,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -1352,12 +1314,10 @@
$result_trees{'char_latin1_latin1_in_refs'}{'contents'}[12]{'contents'}[8]{'extr
$result_texis{'char_latin1_latin1_in_refs'} = '\\input texinfo
-@setfilename char_latin1_latin1_in_refs.info
-
@documentencoding iso-8859-1
@node Top
-@top top
+@top char latin1 latin1 in refs
@menu
* ä ë ï ö ü ÿ Ä Ë Ï Ö Ü::
@@ -1402,9 +1362,8 @@ $result_texis{'char_latin1_latin1_in_refs'} = '\\input
texinfo
$result_texts{'char_latin1_latin1_in_refs'} = '
-
-top
-***
+char latin1 latin1 in refs
+**************************
* ä ë ï ö ü ÿ Ä Ë Ï Ö Ü::
* é::
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index 11b04d32dd..1de46c810e 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>� � � � � � � � � � (top)</title>
+<title>� � � � � � � � � � (char latin1 latin1 in refs)</title>
-<meta name="description" content="� � � � � � � � � � (top)">
-<meta name="keywords" content="� � � � � � � � � � (top)">
+<meta name="description" content="� � � � � � � � � � (char latin1 latin1 in
refs)">
+<meta name="keywords" content="� � � � � � � � � � (char latin1 latin1 in
refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -24,7 +24,7 @@
<div class="chapter-level-extent"
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
<div class="nav-panel">
<p>
-Next: <a href="c.html" accesskey="n" rel="next">�</a>, Previous: <a
href="a-e-u.html" accesskey="p" rel="prev">� � �</a>, Up: <a href="index.html"
accesskey="u" rel="up">top</a> [<a href="a-e-i-o-u-y-A-E-I-O-U.html"
title="Index" rel="index">Index</a>]</p>
+Next: <a href="c.html" accesskey="n" rel="next">�</a>, Previous: <a
href="a-e-u.html" accesskey="p" rel="prev">� � �</a>, Up: <a href="index.html"
accesskey="u" rel="up">char latin1 latin1 in refs</a> [<a
href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="a-e-i-o-u-A-E-I-O-U">4 � � � � � � � � � �</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 75a40c89fc..8053e9253f 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>� � � � � � � � � � � (top)</title>
+<title>� � � � � � � � � � � (char latin1 latin1 in refs)</title>
-<meta name="description" content="� � � � � � � � � � � (top)">
-<meta name="keywords" content="� � � � � � � � � � � (top)">
+<meta name="description" content="� � � � � � � � � � � (char latin1 latin1 in
refs)">
+<meta name="keywords" content="� � � � � � � � � � � (char latin1 latin1 in
refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -33,7 +33,7 @@ th.sections-header-printindex {text-align:left; padding-left:
1em}
<div class="chapter-level-extent"
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
<div class="nav-panel">
<p>
-Next: <a href="e.html" accesskey="n" rel="next">�</a>, Previous: <a
href="index.html" accesskey="p" rel="prev">top</a>, Up: <a href="index.html"
accesskey="u" rel="up">top</a> [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
+Next: <a href="e.html" accesskey="n" rel="next">�</a>, Previous: <a
href="index.html" accesskey="p" rel="prev">char latin1 latin1 in refs</a>, Up:
<a href="index.html" accesskey="u" rel="up">char latin1 latin1 in refs</a>
[<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="a-e-i-o-u-y-A-E-I-O-U">1 � � � � � � � � � � �</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html
index 5bd8adc4f2..ef7edfae58 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/a-e-u.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>� � � (top)</title>
+<title>� � � (char latin1 latin1 in refs)</title>
-<meta name="description" content="� � � (top)">
-<meta name="keywords" content="� � � (top)">
+<meta name="description" content="� � � (char latin1 latin1 in refs)">
+<meta name="keywords" content="� � � (char latin1 latin1 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -24,7 +24,7 @@
<div class="chapter-level-extent" id="g_t_00e0-_00e8-_00f9">
<div class="nav-panel">
<p>
-Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">� � � � � �
� � � �</a>, Previous: <a href="e.html" accesskey="p" rel="prev">�</a>, Up: <a
href="index.html" accesskey="u" rel="up">top</a> [<a
href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">� � � � � �
� � � �</a>, Previous: <a href="e.html" accesskey="p" rel="prev">�</a>, Up: <a
href="index.html" accesskey="u" rel="up">char latin1 latin1 in refs</a>
[<a href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="a-e-u">3 � � �</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
index 9a117c65d9..c9e871157c 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/c.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>� (top)</title>
+<title>� (char latin1 latin1 in refs)</title>
-<meta name="description" content="� (top)">
-<meta name="keywords" content="� (top)">
+<meta name="description" content="� (char latin1 latin1 in refs)">
+<meta name="keywords" content="� (char latin1 latin1 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -23,7 +23,7 @@
<div class="chapter-level-extent" id="g_t_00e7">
<div class="nav-panel">
<p>
-Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">� � � �
� � � � � �</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a>
[<a href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">� � � �
� � � � � �</a>, Up: <a href="index.html" accesskey="u" rel="up">char latin1
latin1 in refs</a> [<a href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index"
rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="c">5 �</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html
index 44e2ffecd9..ecd85013ff 100644
--- a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html
+++ b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/e.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>� (top)</title>
+<title>� (char latin1 latin1 in refs)</title>
-<meta name="description" content="� (top)">
-<meta name="keywords" content="� (top)">
+<meta name="description" content="� (char latin1 latin1 in refs)">
+<meta name="keywords" content="� (char latin1 latin1 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -24,7 +24,7 @@
<div class="chapter-level-extent" id="g_t_00e9">
<div class="nav-panel">
<p>
-Next: <a href="a-e-u.html" accesskey="n" rel="next">� � �</a>, Previous: <a
href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">� � � � � � � � � �
�</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> [<a
href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-u.html" accesskey="n" rel="next">� � �</a>, Previous: <a
href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">� � � � � � � � � �
�</a>, Up: <a href="index.html" accesskey="u" rel="up">char latin1 latin1 in
refs</a> [<a href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index"
rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="e">2 �</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html
index 15235c603c..98a7e36397 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_html/index.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Top (top)</title>
+<title>Top (char latin1 latin1 in refs)</title>
-<meta name="description" content="Top (top)">
-<meta name="keywords" content="Top (top)">
+<meta name="description" content="Top (char latin1 latin1 in refs)">
+<meta name="keywords" content="Top (char latin1 latin1 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -20,14 +20,13 @@
<body lang="en">
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">� � � � �
� � � � � �</a> [<a href="a-e-i-o-u-y-A-E-I-O-U.html" title="Index"
rel="index">Index</a>]</p>
</div>
<hr>
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="char-latin1-latin1-in-refs">char latin1 latin1 in refs</h1>
<ul class="mini-toc">
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_info/char_latin1_latin1_in_refs.info
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_info/char_latin1_latin1_in_refs.info
index 663e23668b..32985b570c 100644
Binary files
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_info/char_latin1_latin1_in_refs.info
and
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_info/char_latin1_latin1_in_refs.info
differ
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
index 61cba8b16b..17b42f8c89 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
@@ -47,7 +47,6 @@
\pagestyle{single}%
-
\begin{document}
\label{anchor:Top}%
\chapter{{� � � � � � � � � � �}}
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
index 228d63e206..d490f2e3cd 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
@@ -4,12 +4,10 @@
<filename file="char_latin1_latin1_in_refs.xml"></filename>
<preamblebeforebeginning>\input texinfo
-</preamblebeforebeginning><setfilename file="char_latin1_latin1_in_refs.info"
spaces=" ">char_latin1_latin1_in_refs.info</setfilename>
-
-<documentencoding encoding="iso-8859-1" spaces="
">iso-8859-1</documentencoding>
+</preamblebeforebeginning><documentencoding encoding="iso-8859-1" spaces="
">iso-8859-1</documentencoding>
<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">�
� � � � � � � � � �</nodenext></node>
-<top spaces=" "><sectiontitle>top</sectiontitle>
+<top spaces=" "><sectiontitle>char latin1 latin1 in refs</sectiontitle>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::">� � � � � � � � � �
�</menunode><menudescription><pre xml:space="preserve">
diff --git a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
index 9016a14a43..e7ec0f656f 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs.pl
@@ -12,58 +12,20 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'char_latin1_utf8_in_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'char_latin1_utf8_in_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
{
'args' => [
{
@@ -90,7 +52,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -141,7 +103,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -150,7 +112,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'char latin1 utf8 in refs'
}
],
'info' => {
@@ -193,7 +155,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -258,7 +220,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
},
'type' => 'menu_entry'
@@ -307,7 +269,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'menu_entry'
@@ -356,7 +318,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'menu_entry'
@@ -405,7 +367,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -454,7 +416,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'menu_entry'
@@ -483,14 +445,14 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -506,7 +468,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -545,7 +507,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -578,7 +540,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 21,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -617,7 +579,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -650,7 +612,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 24,
+ 'line_nr' => 22,
'macro' => ''
}
},
@@ -689,7 +651,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -722,7 +684,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 27,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -761,7 +723,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 27,
'macro' => ''
}
},
@@ -794,7 +756,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 30,
+ 'line_nr' => 28,
'macro' => ''
}
},
@@ -833,7 +795,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -884,7 +846,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 33,
'macro' => ''
}
},
@@ -915,7 +877,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 36,
+ 'line_nr' => 34,
'macro' => ''
}
},
@@ -946,7 +908,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 35,
'macro' => ''
}
},
@@ -977,7 +939,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 38,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -1008,7 +970,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 37,
'macro' => ''
}
},
@@ -1059,7 +1021,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 41,
+ 'line_nr' => 39,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1099,7 +1061,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 42,
+ 'line_nr' => 40,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1139,7 +1101,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1179,7 +1141,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 44,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1219,7 +1181,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1259,7 +1221,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 46,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1276,7 +1238,7 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin1_utf8_in_refs.texi',
- 'line_nr' => 33,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -1352,12 +1314,10 @@
$result_trees{'char_latin1_utf8_in_refs'}{'contents'}[12]{'contents'}[8]{'extra'
$result_texis{'char_latin1_utf8_in_refs'} = '\\input texinfo
-@setfilename char_latin1_utf8_in_refs.info
-
@documentencoding utf-8
@node Top
-@top top
+@top char latin1 utf8 in refs
@printindex cp
@@ -1402,9 +1362,8 @@ $result_texis{'char_latin1_utf8_in_refs'} = '\\input
texinfo
$result_texts{'char_latin1_utf8_in_refs'} = '
-
-top
-***
+char latin1 utf8 in refs
+************************
* ä ë ï ö ü ÿ Ä Ë Ï Ö Ü::
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
index 5cc3e12630..b0822afd91 100644
---
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
+++
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-A-E-I-O-U.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>â ê î ô û Â Ê Î Ô Û (top)</title>
+<title>â ê î ô û Â Ê Î Ô Û (char latin1 utf8 in refs)</title>
-<meta name="description" content="â ê î ô û Â Ê Î Ô Û (top)">
-<meta name="keywords" content="â ê î ô û Â Ê Î Ô Û (top)">
+<meta name="description" content="â ê î ô û Â Ê Î Ô Û (char latin1 utf8 in
refs)">
+<meta name="keywords" content="â ê î ô û Â Ê Î Ô Û (char latin1 utf8 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -24,7 +24,7 @@
<div class="chapter-level-extent"
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
<div class="nav-panel">
<p>
-Next: <a href="c.html" accesskey="n" rel="next">ç</a>, Previous: <a
href="a-e-u.html" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html"
accesskey="u" rel="up">top</a> [<a href="index.html" title="Index"
rel="index">Index</a>]</p>
+Next: <a href="c.html" accesskey="n" rel="next">ç</a>, Previous: <a
href="a-e-u.html" accesskey="p" rel="prev">à è ù</a>, Up: <a href="index.html"
accesskey="u" rel="up">char latin1 utf8 in refs</a> [<a
href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="a-e-i-o-u-A-E-I-O-U">4 â ê î ô û Â Ê Î Ô Û</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
index 9e8a147537..3340e1fada 100644
---
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
+++
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-i-o-u-y-A-E-I-O-U.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>ä ë ï ö ü ÿ Ä Ë Ï Ö Ü (top)</title>
+<title>ä ë ï ö ü ÿ Ä Ë Ï Ö Ü (char latin1 utf8 in refs)</title>
-<meta name="description" content="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü (top)">
-<meta name="keywords" content="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü (top)">
+<meta name="description" content="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü (char latin1 utf8 in
refs)">
+<meta name="keywords" content="ä ë ï ö ü ÿ Ä Ë Ï Ö Ü (char latin1 utf8 in
refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -24,7 +24,7 @@
<div class="chapter-level-extent"
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
<div class="nav-panel">
<p>
-Next: <a href="e.html" accesskey="n" rel="next">é</a>, Previous: <a
href="index.html" accesskey="p" rel="prev">top</a>, Up: <a href="index.html"
accesskey="u" rel="up">top</a> [<a href="index.html" title="Index"
rel="index">Index</a>]</p>
+Next: <a href="e.html" accesskey="n" rel="next">é</a>, Previous: <a
href="index.html" accesskey="p" rel="prev">char latin1 utf8 in refs</a>, Up: <a
href="index.html" accesskey="u" rel="up">char latin1 utf8 in refs</a>
[<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="a-e-i-o-u-y-A-E-I-O-U">1 ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html
index a6fb06c123..a1b8113568 100644
---
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html
+++
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/a-e-u.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>à è ù (top)</title>
+<title>à è ù (char latin1 utf8 in refs)</title>
-<meta name="description" content="à è ù (top)">
-<meta name="keywords" content="à è ù (top)">
+<meta name="description" content="à è ù (char latin1 utf8 in refs)">
+<meta name="keywords" content="à è ù (char latin1 utf8 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -24,7 +24,7 @@
<div class="chapter-level-extent" id="g_t_00e0-_00e8-_00f9">
<div class="nav-panel">
<p>
-Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">â ê î ô û Â
Ê Î Ô Û</a>, Previous: <a href="e.html" accesskey="p" rel="prev">é</a>, Up: <a
href="index.html" accesskey="u" rel="up">top</a> [<a href="index.html"
title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="n" rel="next">â ê î ô û Â
Ê Î Ô Û</a>, Previous: <a href="e.html" accesskey="p" rel="prev">é</a>, Up: <a
href="index.html" accesskey="u" rel="up">char latin1 utf8 in refs</a>
[<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="a-e-u">3 à è ù</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
index 0505c6558e..6d8867cbfa 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/c.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>ç (top)</title>
+<title>ç (char latin1 utf8 in refs)</title>
-<meta name="description" content="ç (top)">
-<meta name="keywords" content="ç (top)">
+<meta name="description" content="ç (char latin1 utf8 in refs)">
+<meta name="keywords" content="ç (char latin1 utf8 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -23,7 +23,7 @@
<div class="chapter-level-extent" id="g_t_00e7">
<div class="nav-panel">
<p>
-Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">â ê î ô
û Â Ê Î Ô Û</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a>
[<a href="index.html" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="a-e-i-o-u-A-E-I-O-U.html" accesskey="p" rel="prev">â ê î ô
û Â Ê Î Ô Û</a>, Up: <a href="index.html" accesskey="u" rel="up">char latin1
utf8 in refs</a> [<a href="index.html" title="Index"
rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="c">5 ç</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html
index a19a872d29..107cfb3c39 100644
--- a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html
+++ b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/e.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>é (top)</title>
+<title>é (char latin1 utf8 in refs)</title>
-<meta name="description" content="é (top)">
-<meta name="keywords" content="é (top)">
+<meta name="description" content="é (char latin1 utf8 in refs)">
+<meta name="keywords" content="é (char latin1 utf8 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -24,7 +24,7 @@
<div class="chapter-level-extent" id="g_t_00e9">
<div class="nav-panel">
<p>
-Next: <a href="a-e-u.html" accesskey="n" rel="next">à è ù</a>, Previous: <a
href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö
Ü</a>, Up: <a href="index.html" accesskey="u" rel="up">top</a> [<a
href="index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="a-e-u.html" accesskey="n" rel="next">à è ù</a>, Previous: <a
href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö
Ü</a>, Up: <a href="index.html" accesskey="u" rel="up">char latin1 utf8 in
refs</a> [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="e">2 é</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
index 9011872ae1..8e7e8893da 100644
---
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
+++
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_html/index.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Top (top)</title>
+<title>Top (char latin1 utf8 in refs)</title>
-<meta name="description" content="Top (top)">
-<meta name="keywords" content="Top (top)">
+<meta name="description" content="Top (char latin1 utf8 in refs)">
+<meta name="keywords" content="Top (char latin1 utf8 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -29,14 +29,13 @@ th.sections-header-printindex {text-align:left;
padding-left: 1em}
<body lang="en">
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
Next: <a href="a-e-i-o-u-y-A-E-I-O-U.html" accesskey="n" rel="next">ä ë ï ö ü
ÿ Ä Ë Ï Ö Ü</a> [<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="char-latin1-utf8-in-refs">char latin1 utf8 in refs</h1>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th>Jump to:
</th><td><a class="summary-letter-printindex"
href="#Top_cp_letter-Â"><b>Â</b></a>
diff --git
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_info/char_latin1_utf8_in_refs.info
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_info/char_latin1_utf8_in_refs.info
index b792ee16dd..69a47f29e2 100644
Binary files
a/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_info/char_latin1_utf8_in_refs.info
and
b/tp/t/results/formats_encodings/char_latin1_utf8_in_refs/res_info/char_latin1_utf8_in_refs.info
differ
diff --git a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
index 8d99fe9cd7..c2dbf0de78 100644
--- a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
+++ b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs.pl
@@ -12,53 +12,20 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'char_latin2_latin2_in_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'char_latin2_latin2_in_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
{
'args' => [
{
@@ -85,7 +52,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -136,7 +103,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -145,7 +112,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'char latin2 latin2 in refs'
}
],
'info' => {
@@ -212,7 +179,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 18,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -225,7 +192,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -267,7 +234,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -348,7 +315,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 15,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -377,14 +344,14 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 16,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -400,7 +367,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -462,7 +429,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 21,
+ 'line_nr' => 20,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -479,7 +446,7 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
},
'source_info' => {
'file_name' => 'char_latin2_latin2_in_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -510,12 +477,11 @@
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
=
$result_trees{'char_latin2_latin2_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'label'};
$result_texis{'char_latin2_latin2_in_refs'} = '\\input texinfo
-@setfilename char_latin2_latin2_in_refs.info
@documentencoding ISO-8859-2
@node Top
-@top top
+@top char latin2 latin2 in refs
@ref{Ą ą ˛ Ę ę}.
@@ -536,9 +502,8 @@ $result_texis{'char_latin2_latin2_in_refs'} = '\\input
texinfo
$result_texts{'char_latin2_latin2_in_refs'} = '
-
-top
-***
+char latin2 latin2 in refs
+**************************
Ą ą ˛ Ę ę.
diff --git
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
index bbcede5468..d713dd57e0 100644
---
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
+++
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/A-a-_002c-E-e.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2">
-<title>� � � � � (top)</title>
+<title>� � � � � (char latin2 latin2 in refs)</title>
-<meta name="description" content="� � � � � (top)">
-<meta name="keywords" content="� � � � � (top)">
+<meta name="description" content="� � � � � (char latin2 latin2 in refs)">
+<meta name="keywords" content="� � � � � (char latin2 latin2 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -23,7 +23,7 @@
<div class="chapter-level-extent" id="g_t_0104-_0105-_02db-_0118-_0119">
<div class="nav-panel">
<p>
-Previous: <a href="index.html" accesskey="p" rel="prev">top</a>, Up: <a
href="index.html" accesskey="u" rel="up">top</a> [<a href="index.html"
title="Index" rel="index">Index</a>]</p>
+Previous: <a href="index.html" accesskey="p" rel="prev">char latin2 latin2 in
refs</a>, Up: <a href="index.html" accesskey="u" rel="up">char latin2 latin2 in
refs</a> [<a href="index.html" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
<h2 class="chapter" id="A-a-_002c-E-e">1 � � � � �</h2>
diff --git
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
index a0a2189733..2b15361a1b 100644
---
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
+++
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_html/index.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-2">
-<title>Top (top)</title>
+<title>Top (char latin2 latin2 in refs)</title>
-<meta name="description" content="Top (top)">
-<meta name="keywords" content="Top (top)">
+<meta name="description" content="Top (char latin2 latin2 in refs)">
+<meta name="keywords" content="Top (char latin2 latin2 in refs)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -29,14 +29,13 @@ th.sections-header-printindex {text-align:left;
padding-left: 1em}
<body lang="en">
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
Next: <a href="A-a-_002c-E-e.html" accesskey="n" rel="next">� � � � �</a>
[<a href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<hr>
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="char-latin2-latin2-in-refs">char latin2 latin2 in refs</h1>
<p><a class="ref" href="A-a-_002c-E-e.html">� � � � �</a>.
</p>
diff --git
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_info/char_latin2_latin2_in_refs.info
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_info/char_latin2_latin2_in_refs.info
index 2ee6d6b385..542815d3bc 100644
Binary files
a/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_info/char_latin2_latin2_in_refs.info
and
b/tp/t/results/formats_encodings/char_latin2_latin2_in_refs/res_info/char_latin2_latin2_in_refs.info
differ
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 2697a847f9..19bbb5b761 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -12,46 +12,34 @@ $result_trees{'cond'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -132,14 +120,14 @@ $result_trees{'cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -235,14 +223,14 @@ $result_trees{'cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -290,7 +278,7 @@ $result_trees{'cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -311,7 +299,8 @@
$result_trees{'cond'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_trees
$result_trees{'cond'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'cond'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'cond'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 80ff41215f..5e4664311a 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -12,46 +12,34 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -132,14 +120,14 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -241,14 +229,14 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -296,7 +284,7 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -317,7 +305,8 @@
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'node_content'
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'cond_ifhtml_ifinfo_iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'cond_ifhtml_ifinfo_iftex'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
@@ -447,7 +436,7 @@
$result_converted_errors{'html'}->{'cond_ifhtml_ifinfo_iftex'} = [
'error_line' => 'warning: raw format tex is not converted
',
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'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 967849fe27..8529722feb 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -12,46 +12,34 @@ $result_trees{'cond_info'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -126,14 +114,14 @@ $result_trees{'cond_info'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -229,14 +217,14 @@ $result_trees{'cond_info'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -284,7 +272,7 @@ $result_trees{'cond_info'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -305,7 +293,8 @@
$result_trees{'cond_info'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_
$result_trees{'cond_info'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'cond_info'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'cond_info'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
@@ -370,10 +359,10 @@ $result_floats{'cond_info'} = {};
-$result_converted{'info'}->{'cond_info'} = 'This is cond.info, produced by
texi2any version from cond.texi.
+$result_converted{'info'}->{'cond_info'} = 'This is , produced by texi2any
version from cond.texi.
-File: cond.info, Node: Top, Up: (dir)
+File: , Node: Top, Up: (dir)
This is ifnothtml text.
@@ -384,7 +373,7 @@ This is ifnothtml text.
Tag Table:
-Node: Top65
+Node: Top56
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 8ca5290868..510fbc8e62 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -12,46 +12,34 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -132,14 +120,14 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -241,14 +229,14 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -296,7 +284,7 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -317,7 +305,8 @@
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'node_con
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'cond_info_ifhtml_ifinfo_iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'cond_info_ifhtml_ifinfo_iftex'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
@@ -384,10 +373,10 @@ $result_floats{'cond_info_ifhtml_ifinfo_iftex'} = {};
-$result_converted{'info'}->{'cond_info_ifhtml_ifinfo_iftex'} = 'This is
cond.info, produced by texi2any version from cond.texi.
+$result_converted{'info'}->{'cond_info_ifhtml_ifinfo_iftex'} = 'This is ,
produced by texi2any version from cond.texi.
-File: cond.info, Node: Top, Up: (dir)
+File: , Node: Top, Up: (dir)
This is html text.
@@ -402,7 +391,7 @@ This is tex text.
Tag Table:
-Node: Top65
+Node: Top56
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 28d7ed5706..bbbc467b20 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
@@ -12,46 +12,34 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -126,14 +114,14 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -229,14 +217,14 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} =
{
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -284,7 +272,7 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -305,7 +293,8 @@
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
@@ -370,10 +359,10 @@ $result_floats{'cond_info_no-ifhtml_no-ifinfo_no-iftex'}
= {};
-$result_converted{'info'}->{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 'This
is cond.info, produced by texi2any version from cond.texi.
+$result_converted{'info'}->{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = 'This
is , produced by texi2any version from cond.texi.
-File: cond.info, Node: Top, Up: (dir)
+File: , Node: Top, Up: (dir)
This is ifnothtml text.
@@ -384,7 +373,7 @@ This is ifnothtml text.
Tag Table:
-Node: Top65
+Node: Top56
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 7fa47eefcd..da1d17e0a1 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
@@ -12,46 +12,34 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -126,14 +114,14 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -229,14 +217,14 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -284,7 +272,7 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -305,7 +293,8 @@
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{'node
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'cond_no-ifhtml_no-ifinfo_no-iftex'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
diff --git a/tp/t/results/formatting/cond_xml.pl
b/tp/t/results/formatting/cond_xml.pl
index 1fe3eef9e7..7b3b7d6efa 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -12,46 +12,34 @@ $result_trees{'cond_xml'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -126,14 +114,14 @@ $result_trees{'cond_xml'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -229,14 +217,14 @@ $result_trees{'cond_xml'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -284,7 +272,7 @@ $result_trees{'cond_xml'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -305,7 +293,8 @@
$result_trees{'cond_xml'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_t
$result_trees{'cond_xml'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'cond_xml'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'cond_xml'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
@@ -371,7 +360,8 @@ $result_floats{'cond_xml'} = {};
$result_converted{'xml'}->{'cond_xml'} = '<preamblebeforebeginning>\\input
texinfo
-</preamblebeforebeginning><setfilename file="cond.info" spaces="
">cond.info</setfilename>
+
+</preamblebeforebeginning><!-- c test conditions -->
<node name="Top" spaces=" "><nodename>Top</nodename></node>
diff --git a/tp/t/results/formatting/defcondx_Dbar.pl
b/tp/t/results/formatting/defcondx_Dbar.pl
index 0e16f43be0..d4d718cd7d 100644
--- a/tp/t/results/formatting/defcondx_Dbar.pl
+++ b/tp/t/results/formatting/defcondx_Dbar.pl
@@ -12,46 +12,34 @@ $result_trees{'defcondx_Dbar'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'defxcond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test def*x in a conditional
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'defxcond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'defxcond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test def*x in a conditional
+'
+ ]
}
},
{
@@ -149,7 +137,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'def_line'
@@ -199,7 +187,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 11,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'def_line'
@@ -252,7 +240,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 16,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -262,7 +250,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -291,7 +279,8 @@
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'ext
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_texis{'defcondx_Dbar'} = '\\input texinfo
-@setfilename defxcond.info
+
+@c test def*x in a conditional
@c set this from the command line.
@c set bar
@@ -325,7 +314,7 @@ $result_errors{'defcondx_Dbar'} = [
'error_line' => 'warning: missing name for @deffn
',
'file_name' => 'defxcond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => '',
'text' => 'missing name for @deffn',
'type' => 'warning'
@@ -334,7 +323,7 @@ $result_errors{'defcondx_Dbar'} = [
'error_line' => 'warning: missing name for @deffnx
',
'file_name' => 'defxcond.texi',
- 'line_nr' => 11,
+ 'line_nr' => 12,
'macro' => '',
'text' => 'missing name for @deffnx',
'type' => 'warning'
diff --git a/tp/t/results/formatting/defcondx_Ubar.pl
b/tp/t/results/formatting/defcondx_Ubar.pl
index 920e45fc68..15f10d2e38 100644
--- a/tp/t/results/formatting/defcondx_Ubar.pl
+++ b/tp/t/results/formatting/defcondx_Ubar.pl
@@ -12,46 +12,34 @@ $result_trees{'defcondx_Ubar'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'defxcond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test def*x in a conditional
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'defxcond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'defxcond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test def*x in a conditional
+'
+ ]
}
},
{
@@ -149,7 +137,7 @@ $result_trees{'defcondx_Ubar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'def_line'
@@ -207,7 +195,7 @@ $result_trees{'defcondx_Ubar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 16,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -217,7 +205,7 @@ $result_trees{'defcondx_Ubar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -245,7 +233,8 @@ $result_trees{'defcondx_Ubar'} = {
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_texis{'defcondx_Ubar'} = '\\input texinfo
-@setfilename defxcond.info
+
+@c test def*x in a conditional
@c set this from the command line.
@c set bar
@@ -277,7 +266,7 @@ $result_errors{'defcondx_Ubar'} = [
'error_line' => 'warning: missing name for @deffn
',
'file_name' => 'defxcond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => '',
'text' => 'missing name for @deffn',
'type' => 'warning'
diff --git a/tp/t/results/formatting/texi_bib_example.pl
b/tp/t/results/formatting/texi_bib_example.pl
index 18a1ef7f55..ec3bc6f187 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -12,15 +12,15 @@ $result_trees{'texi_bib_example'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
+ 'type' => 'text_before_beginning'
+ }
+ ],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -301,39 +301,6 @@ $result_trees{'texi_bib_example'} = {
'
]
}
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'my-file-with-bib.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'my-file-with-bib.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'bib-example.texi',
- 'line_nr' => 23,
- 'macro' => ''
- }
},
{
'args' => [
@@ -357,7 +324,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 24,
+ 'line_nr' => 23,
'macro' => ''
}
},
@@ -3473,7 +3440,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -3555,7 +3522,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
},
'type' => 'menu_entry'
@@ -3604,7 +3571,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 36,
+ 'line_nr' => 35,
'macro' => ''
},
'type' => 'menu_entry'
@@ -3648,14 +3615,14 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 38,
+ 'line_nr' => 37,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 34,
+ 'line_nr' => 33,
'macro' => ''
}
},
@@ -3671,7 +3638,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -3710,7 +3677,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -3823,7 +3790,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -3836,7 +3803,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => 'mybibmakeref'
}
},
@@ -3867,7 +3834,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -3902,7 +3869,7 @@ $result_trees{'texi_bib_example'} = {
'cmdname' => 'asis',
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
},
'type' => 'command_as_argument'
@@ -3955,7 +3922,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => 'mybibitem'
}
},
@@ -4007,7 +3974,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => 'mybibitem'
}
},
@@ -4035,7 +4002,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 56,
+ 'line_nr' => 55,
'macro' => ''
}
}
@@ -4048,7 +4015,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
}
},
@@ -4064,7 +4031,7 @@ $result_trees{'texi_bib_example'} = {
},
'source_info' => {
'file_name' => 'bib-example.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -4118,7 +4085,6 @@ $result_texis{'texi_bib_example'} = '\\input texinfo @c
-*-texinfo-*-
@c % Boston, MA 02111-1307, USA.
@comment %**start of header
-@setfilename my-file-with-bib.info
@settitle Texinfo with a Bibliography and References
@c \\input texinfo @c -*-texinfo-*-
@@ -4661,7 +4627,7 @@ $result_errors{'texi_bib_example'} = [
'error_line' => 'warning: @ifclear should only appear at the beginning of
a line (possibly involving @mybibcite)
',
'file_name' => 'bib-example.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => 'mybibcite',
'text' => '@ifclear should only appear at the beginning of a line',
'type' => 'warning'
@@ -4731,6 +4697,11 @@ th.menu-comment {text-align:left}
+
+
+
+
+
diff --git a/tp/t/results/formatting/texi_cond.pl
b/tp/t/results/formatting/texi_cond.pl
index 147c822cb9..f0d008a1f1 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -12,46 +12,34 @@ $result_trees{'texi_cond'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'cond.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test conditions
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'cond.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'cond.texi',
- 'line_nr' => 2,
- 'macro' => ''
+ 'misc_args' => [
+ ' test conditions
+'
+ ]
}
},
{
@@ -132,14 +120,14 @@ $result_trees{'texi_cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 8,
+ 'line_nr' => 9,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 6,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -235,14 +223,14 @@ $result_trees{'texi_cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 30,
+ 'line_nr' => 31,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 28,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -290,7 +278,7 @@ $result_trees{'texi_cond'} = {
},
'source_info' => {
'file_name' => 'cond.texi',
- 'line_nr' => 4,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -311,7 +299,8 @@
$result_trees{'texi_cond'}{'contents'}[1]{'extra'}{'node_content'}[0] = $result_
$result_trees{'texi_cond'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'texi_cond'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_texis{'texi_cond'} = '\\input texinfo
-@setfilename cond.info
+
+@c test conditions
@node Top
diff --git a/tp/t/results/htmlxref/htmlxref.pl
b/tp/t/results/htmlxref/htmlxref.pl
index 6e98eab0cc..651fb454e8 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -12,54 +12,20 @@ $result_trees{'htmlxref'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'test_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'test_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'test_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- }
- ],
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -100,7 +66,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -182,7 +148,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -211,14 +177,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -248,7 +214,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -277,7 +243,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -326,7 +292,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -389,14 +355,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -425,7 +391,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -467,7 +433,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -527,14 +493,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -563,7 +529,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -612,7 +578,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -675,14 +641,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -711,7 +677,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -751,7 +717,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -811,14 +777,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -848,7 +814,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -877,7 +843,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -922,7 +888,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -985,14 +951,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -1022,7 +988,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
},
@@ -1051,7 +1017,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1164,14 +1130,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 88,
+ 'line_nr' => 87,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 86,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -1218,7 +1184,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 85,
+ 'line_nr' => 84,
'macro' => ''
}
},
@@ -1231,7 +1197,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1287,14 +1253,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -1323,7 +1289,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1430,14 +1396,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 93,
+ 'line_nr' => 92,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 91,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -1484,7 +1450,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 90,
+ 'line_nr' => 89,
'macro' => ''
}
},
@@ -1497,7 +1463,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1556,14 +1522,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -1592,7 +1558,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1625,7 +1591,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1681,14 +1647,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
}
},
@@ -1717,7 +1683,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1821,14 +1787,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 98,
+ 'line_nr' => 97,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 96,
+ 'line_nr' => 95,
'macro' => ''
}
},
@@ -1870,7 +1836,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 95,
+ 'line_nr' => 94,
'macro' => ''
}
},
@@ -1883,7 +1849,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1939,14 +1905,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 65,
+ 'line_nr' => 64,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 63,
+ 'line_nr' => 62,
'macro' => ''
}
},
@@ -1962,7 +1928,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -2050,7 +2016,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 67,
+ 'line_nr' => 66,
'macro' => ''
}
},
@@ -2121,14 +2087,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 72,
+ 'line_nr' => 71,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 70,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -2157,7 +2123,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2190,7 +2156,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2246,14 +2212,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 77,
+ 'line_nr' => 76,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 75,
+ 'line_nr' => 74,
'macro' => ''
}
},
@@ -2318,7 +2284,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 80,
+ 'line_nr' => 79,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2367,7 +2333,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 81,
+ 'line_nr' => 80,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2416,7 +2382,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 82,
+ 'line_nr' => 81,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2445,14 +2411,14 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 83,
+ 'line_nr' => 82,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 79,
+ 'line_nr' => 78,
'macro' => ''
}
},
@@ -2468,7 +2434,7 @@ $result_trees{'htmlxref'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 68,
+ 'line_nr' => 67,
'macro' => ''
}
},
@@ -2536,7 +2502,6 @@ $result_trees{'htmlxref'}{'contents'}[7] =
$result_trees{'htmlxref'}{'contents'}
$result_texis{'htmlxref'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename test_refs.info
@node Top
@top Test refs
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 7e3bc8e2b1..0c74172cc0 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -12,54 +12,20 @@ $result_trees{'htmlxref_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'test_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'test_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'test_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- }
- ],
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -100,7 +66,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -182,7 +148,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -211,14 +177,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -248,7 +214,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -277,7 +243,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -326,7 +292,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -389,14 +355,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -425,7 +391,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -467,7 +433,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -527,14 +493,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -563,7 +529,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -612,7 +578,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -675,14 +641,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -711,7 +677,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -751,7 +717,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -811,14 +777,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -848,7 +814,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -877,7 +843,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -922,7 +888,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -985,14 +951,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -1022,7 +988,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
},
@@ -1051,7 +1017,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1164,14 +1130,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 88,
+ 'line_nr' => 87,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 86,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -1218,7 +1184,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 85,
+ 'line_nr' => 84,
'macro' => ''
}
},
@@ -1231,7 +1197,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1287,14 +1253,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -1323,7 +1289,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1430,14 +1396,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 93,
+ 'line_nr' => 92,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 91,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -1484,7 +1450,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 90,
+ 'line_nr' => 89,
'macro' => ''
}
},
@@ -1497,7 +1463,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1556,14 +1522,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -1592,7 +1558,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1625,7 +1591,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1681,14 +1647,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
}
},
@@ -1717,7 +1683,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1821,14 +1787,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 98,
+ 'line_nr' => 97,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 96,
+ 'line_nr' => 95,
'macro' => ''
}
},
@@ -1870,7 +1836,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 95,
+ 'line_nr' => 94,
'macro' => ''
}
},
@@ -1883,7 +1849,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1939,14 +1905,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 65,
+ 'line_nr' => 64,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 63,
+ 'line_nr' => 62,
'macro' => ''
}
},
@@ -1962,7 +1928,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -2050,7 +2016,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 67,
+ 'line_nr' => 66,
'macro' => ''
}
},
@@ -2121,14 +2087,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 72,
+ 'line_nr' => 71,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 70,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -2157,7 +2123,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2190,7 +2156,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2246,14 +2212,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 77,
+ 'line_nr' => 76,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 75,
+ 'line_nr' => 74,
'macro' => ''
}
},
@@ -2318,7 +2284,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 80,
+ 'line_nr' => 79,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2367,7 +2333,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 81,
+ 'line_nr' => 80,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2416,7 +2382,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 82,
+ 'line_nr' => 81,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2445,14 +2411,14 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 83,
+ 'line_nr' => 82,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 79,
+ 'line_nr' => 78,
'macro' => ''
}
},
@@ -2468,7 +2434,7 @@ $result_trees{'htmlxref_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 68,
+ 'line_nr' => 67,
'macro' => ''
}
},
@@ -2536,7 +2502,6 @@ $result_trees{'htmlxref_nodes'}{'contents'}[7] =
$result_trees{'htmlxref_nodes'}
$result_texis{'htmlxref_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename test_refs.info
@node Top
@top Test refs
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index d3ea0dfc1d..da82199e58 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -12,54 +12,20 @@ $result_trees{'htmlxref_only_mono'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'test_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'test_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'test_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- }
- ],
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -100,7 +66,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -182,7 +148,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -211,14 +177,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -248,7 +214,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -277,7 +243,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -326,7 +292,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -389,14 +355,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -425,7 +391,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -467,7 +433,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -527,14 +493,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -563,7 +529,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -612,7 +578,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -675,14 +641,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -711,7 +677,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -751,7 +717,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -811,14 +777,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -848,7 +814,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -877,7 +843,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -922,7 +888,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -985,14 +951,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -1022,7 +988,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
},
@@ -1051,7 +1017,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1164,14 +1130,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 88,
+ 'line_nr' => 87,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 86,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -1218,7 +1184,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 85,
+ 'line_nr' => 84,
'macro' => ''
}
},
@@ -1231,7 +1197,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1287,14 +1253,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -1323,7 +1289,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1430,14 +1396,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 93,
+ 'line_nr' => 92,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 91,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -1484,7 +1450,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 90,
+ 'line_nr' => 89,
'macro' => ''
}
},
@@ -1497,7 +1463,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1556,14 +1522,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -1592,7 +1558,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1625,7 +1591,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1681,14 +1647,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
}
},
@@ -1717,7 +1683,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1821,14 +1787,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 98,
+ 'line_nr' => 97,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 96,
+ 'line_nr' => 95,
'macro' => ''
}
},
@@ -1870,7 +1836,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 95,
+ 'line_nr' => 94,
'macro' => ''
}
},
@@ -1883,7 +1849,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1939,14 +1905,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 65,
+ 'line_nr' => 64,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 63,
+ 'line_nr' => 62,
'macro' => ''
}
},
@@ -1962,7 +1928,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -2050,7 +2016,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 67,
+ 'line_nr' => 66,
'macro' => ''
}
},
@@ -2121,14 +2087,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 72,
+ 'line_nr' => 71,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 70,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -2157,7 +2123,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2190,7 +2156,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2246,14 +2212,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 77,
+ 'line_nr' => 76,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 75,
+ 'line_nr' => 74,
'macro' => ''
}
},
@@ -2318,7 +2284,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 80,
+ 'line_nr' => 79,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2367,7 +2333,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 81,
+ 'line_nr' => 80,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2416,7 +2382,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 82,
+ 'line_nr' => 81,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2445,14 +2411,14 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 83,
+ 'line_nr' => 82,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 79,
+ 'line_nr' => 78,
'macro' => ''
}
},
@@ -2468,7 +2434,7 @@ $result_trees{'htmlxref_only_mono'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 68,
+ 'line_nr' => 67,
'macro' => ''
}
},
@@ -2536,7 +2502,6 @@ $result_trees{'htmlxref_only_mono'}{'contents'}[7] =
$result_trees{'htmlxref_onl
$result_texis{'htmlxref_only_mono'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename test_refs.info
@node Top
@top Test refs
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index ff53c228f7..b0429c4e83 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -12,54 +12,20 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'test_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'test_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'test_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- }
- ],
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -100,7 +66,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -182,7 +148,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -211,14 +177,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -248,7 +214,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -277,7 +243,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -326,7 +292,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -389,14 +355,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -425,7 +391,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -467,7 +433,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -527,14 +493,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -563,7 +529,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -612,7 +578,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -675,14 +641,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -711,7 +677,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -751,7 +717,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -811,14 +777,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -848,7 +814,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -877,7 +843,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -922,7 +888,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -985,14 +951,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -1022,7 +988,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
},
@@ -1051,7 +1017,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1164,14 +1130,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 88,
+ 'line_nr' => 87,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 86,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -1218,7 +1184,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 85,
+ 'line_nr' => 84,
'macro' => ''
}
},
@@ -1231,7 +1197,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1287,14 +1253,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -1323,7 +1289,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1430,14 +1396,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 93,
+ 'line_nr' => 92,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 91,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -1484,7 +1450,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 90,
+ 'line_nr' => 89,
'macro' => ''
}
},
@@ -1497,7 +1463,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1556,14 +1522,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -1592,7 +1558,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1625,7 +1591,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1681,14 +1647,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
}
},
@@ -1717,7 +1683,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1821,14 +1787,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 98,
+ 'line_nr' => 97,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 96,
+ 'line_nr' => 95,
'macro' => ''
}
},
@@ -1870,7 +1836,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 95,
+ 'line_nr' => 94,
'macro' => ''
}
},
@@ -1883,7 +1849,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1939,14 +1905,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 65,
+ 'line_nr' => 64,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 63,
+ 'line_nr' => 62,
'macro' => ''
}
},
@@ -1962,7 +1928,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -2050,7 +2016,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 67,
+ 'line_nr' => 66,
'macro' => ''
}
},
@@ -2121,14 +2087,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 72,
+ 'line_nr' => 71,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 70,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -2157,7 +2123,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2190,7 +2156,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2246,14 +2212,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 77,
+ 'line_nr' => 76,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 75,
+ 'line_nr' => 74,
'macro' => ''
}
},
@@ -2318,7 +2284,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 80,
+ 'line_nr' => 79,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2367,7 +2333,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 81,
+ 'line_nr' => 80,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2416,7 +2382,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 82,
+ 'line_nr' => 81,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2445,14 +2411,14 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 83,
+ 'line_nr' => 82,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 79,
+ 'line_nr' => 78,
'macro' => ''
}
},
@@ -2468,7 +2434,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 68,
+ 'line_nr' => 67,
'macro' => ''
}
},
@@ -2536,7 +2502,6 @@ $result_trees{'htmlxref_only_mono_nodes'}{'contents'}[7]
= $result_trees{'htmlxr
$result_texis{'htmlxref_only_mono_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename test_refs.info
@node Top
@top Test refs
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 44c8fa86f4..d9d7d1353c 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -12,54 +12,20 @@ $result_trees{'htmlxref_only_split'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'test_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'test_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'test_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- }
- ],
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -100,7 +66,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -182,7 +148,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -211,14 +177,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -248,7 +214,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -277,7 +243,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -326,7 +292,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -389,14 +355,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -425,7 +391,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -467,7 +433,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -527,14 +493,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -563,7 +529,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -612,7 +578,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -675,14 +641,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -711,7 +677,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -751,7 +717,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -811,14 +777,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -848,7 +814,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -877,7 +843,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -922,7 +888,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -985,14 +951,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -1022,7 +988,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
},
@@ -1051,7 +1017,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1164,14 +1130,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 88,
+ 'line_nr' => 87,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 86,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -1218,7 +1184,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 85,
+ 'line_nr' => 84,
'macro' => ''
}
},
@@ -1231,7 +1197,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1287,14 +1253,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -1323,7 +1289,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1430,14 +1396,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 93,
+ 'line_nr' => 92,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 91,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -1484,7 +1450,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 90,
+ 'line_nr' => 89,
'macro' => ''
}
},
@@ -1497,7 +1463,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1556,14 +1522,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -1592,7 +1558,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1625,7 +1591,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1681,14 +1647,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
}
},
@@ -1717,7 +1683,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1821,14 +1787,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 98,
+ 'line_nr' => 97,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 96,
+ 'line_nr' => 95,
'macro' => ''
}
},
@@ -1870,7 +1836,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 95,
+ 'line_nr' => 94,
'macro' => ''
}
},
@@ -1883,7 +1849,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1939,14 +1905,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 65,
+ 'line_nr' => 64,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 63,
+ 'line_nr' => 62,
'macro' => ''
}
},
@@ -1962,7 +1928,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -2050,7 +2016,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 67,
+ 'line_nr' => 66,
'macro' => ''
}
},
@@ -2121,14 +2087,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 72,
+ 'line_nr' => 71,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 70,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -2157,7 +2123,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2190,7 +2156,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2246,14 +2212,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 77,
+ 'line_nr' => 76,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 75,
+ 'line_nr' => 74,
'macro' => ''
}
},
@@ -2318,7 +2284,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 80,
+ 'line_nr' => 79,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2367,7 +2333,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 81,
+ 'line_nr' => 80,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2416,7 +2382,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 82,
+ 'line_nr' => 81,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2445,14 +2411,14 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 83,
+ 'line_nr' => 82,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 79,
+ 'line_nr' => 78,
'macro' => ''
}
},
@@ -2468,7 +2434,7 @@ $result_trees{'htmlxref_only_split'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 68,
+ 'line_nr' => 67,
'macro' => ''
}
},
@@ -2536,7 +2502,6 @@ $result_trees{'htmlxref_only_split'}{'contents'}[7] =
$result_trees{'htmlxref_on
$result_texis{'htmlxref_only_split'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename test_refs.info
@node Top
@top Test refs
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 909800fc16..68a9c3084c 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -12,54 +12,20 @@ $result_trees{'htmlxref_only_split_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'test_refs.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'test_refs.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'test_refs.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- }
- ],
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -100,7 +66,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -182,7 +148,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -211,14 +177,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 7,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -248,7 +214,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -277,7 +243,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -326,7 +292,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -389,14 +355,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -425,7 +391,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -467,7 +433,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -527,14 +493,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -563,7 +529,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -612,7 +578,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
}
},
@@ -675,14 +641,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -711,7 +677,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -751,7 +717,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
}
},
@@ -811,14 +777,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -848,7 +814,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
}
},
@@ -877,7 +843,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -922,7 +888,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
},
@@ -985,14 +951,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -1022,7 +988,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
},
@@ -1051,7 +1017,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1164,14 +1130,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 88,
+ 'line_nr' => 87,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 86,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -1218,7 +1184,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 85,
+ 'line_nr' => 84,
'macro' => ''
}
},
@@ -1231,7 +1197,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
},
@@ -1287,14 +1253,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -1323,7 +1289,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1430,14 +1396,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 93,
+ 'line_nr' => 92,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 91,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -1484,7 +1450,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 90,
+ 'line_nr' => 89,
'macro' => ''
}
},
@@ -1497,7 +1463,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1556,14 +1522,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -1592,7 +1558,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1625,7 +1591,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
}
},
@@ -1681,14 +1647,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
}
},
@@ -1717,7 +1683,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1821,14 +1787,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 98,
+ 'line_nr' => 97,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 96,
+ 'line_nr' => 95,
'macro' => ''
}
},
@@ -1870,7 +1836,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 95,
+ 'line_nr' => 94,
'macro' => ''
}
},
@@ -1883,7 +1849,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
}
},
@@ -1939,14 +1905,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 65,
+ 'line_nr' => 64,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 63,
+ 'line_nr' => 62,
'macro' => ''
}
},
@@ -1962,7 +1928,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -2050,7 +2016,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 67,
+ 'line_nr' => 66,
'macro' => ''
}
},
@@ -2121,14 +2087,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 72,
+ 'line_nr' => 71,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 70,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -2157,7 +2123,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2190,7 +2156,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 74,
+ 'line_nr' => 73,
'macro' => ''
}
},
@@ -2246,14 +2212,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 77,
+ 'line_nr' => 76,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 75,
+ 'line_nr' => 74,
'macro' => ''
}
},
@@ -2318,7 +2284,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 80,
+ 'line_nr' => 79,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2367,7 +2333,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 81,
+ 'line_nr' => 80,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2416,7 +2382,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 82,
+ 'line_nr' => 81,
'macro' => ''
},
'type' => 'menu_entry'
@@ -2445,14 +2411,14 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 83,
+ 'line_nr' => 82,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 79,
+ 'line_nr' => 78,
'macro' => ''
}
},
@@ -2468,7 +2434,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
},
'source_info' => {
'file_name' => 'test_refs.texi',
- 'line_nr' => 68,
+ 'line_nr' => 67,
'macro' => ''
}
},
@@ -2536,7 +2502,6 @@ $result_trees{'htmlxref_only_split_nodes'}{'contents'}[7]
= $result_trees{'htmlx
$result_texis{'htmlxref_only_split_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename test_refs.info
@node Top
@top Test refs
diff --git a/tp/t/results/indices/encoding_index_latin1.pl
b/tp/t/results/indices/encoding_index_latin1.pl
index 5e0619f71a..163c9d2240 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -12,48 +12,15 @@ $result_trees{'encoding_index_latin1'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'encoding_index_latin1.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'encoding_index_latin1.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
{
'args' => [
{
@@ -80,7 +47,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 3,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -131,7 +98,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -140,7 +107,7 @@ $result_trees{'encoding_index_latin1'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'encoding index latin1'
}
],
'info' => {
@@ -192,7 +159,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -215,7 +182,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -236,7 +203,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -254,7 +221,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -272,7 +239,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
@@ -304,7 +271,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -327,7 +294,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -348,7 +315,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -366,7 +333,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -384,7 +351,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -402,7 +369,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -434,7 +401,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -474,7 +441,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -514,7 +481,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 12,
+ 'line_nr' => 11,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -554,7 +521,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -594,7 +561,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -634,7 +601,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 15,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -674,7 +641,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 16,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -714,7 +681,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -754,7 +721,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 18,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -794,7 +761,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -834,7 +801,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -874,7 +841,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 21,
+ 'line_nr' => 20,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -914,7 +881,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 22,
+ 'line_nr' => 21,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -954,7 +921,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -994,7 +961,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 24,
+ 'line_nr' => 23,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1034,7 +1001,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1074,7 +1041,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1114,7 +1081,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 27,
+ 'line_nr' => 26,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1154,7 +1121,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 28,
+ 'line_nr' => 27,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1194,7 +1161,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1234,7 +1201,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 30,
+ 'line_nr' => 29,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1274,7 +1241,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1314,7 +1281,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1354,7 +1321,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 33,
+ 'line_nr' => 32,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1394,7 +1361,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 34,
+ 'line_nr' => 33,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1434,7 +1401,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1474,7 +1441,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 36,
+ 'line_nr' => 35,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1514,7 +1481,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1554,7 +1521,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 38,
+ 'line_nr' => 37,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1572,7 +1539,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'l',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
}
@@ -1604,7 +1571,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1622,7 +1589,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'L',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
}
@@ -1654,7 +1621,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1677,7 +1644,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1698,7 +1665,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1733,7 +1700,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1760,7 +1727,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1771,7 +1738,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1796,7 +1763,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1807,7 +1774,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1842,7 +1809,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1860,7 +1827,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'ss',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
@@ -1892,7 +1859,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1910,7 +1877,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'euro',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
}
}
@@ -1942,7 +1909,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1960,7 +1927,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'AE',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
}
@@ -1992,7 +1959,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2010,7 +1977,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'exclamdown',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
}
}
@@ -2042,7 +2009,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2060,7 +2027,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'TH',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
}
@@ -2092,7 +2059,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2110,7 +2077,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'DH',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
}
@@ -2142,7 +2109,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2160,7 +2127,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'textdegree',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
}
}
@@ -2192,7 +2159,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2232,7 +2199,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2272,7 +2239,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 51,
+ 'line_nr' => 50,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2290,7 +2257,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'quotedblleft',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
}
@@ -2322,7 +2289,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2340,7 +2307,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'geq',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
}
@@ -2372,7 +2339,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2390,7 +2357,7 @@ $result_trees{'encoding_index_latin1'} = {
'cmdname' => 'comma',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
}
}
@@ -2422,7 +2389,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2462,7 +2429,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2502,7 +2469,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 56,
+ 'line_nr' => 55,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2542,7 +2509,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2582,7 +2549,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2622,7 +2589,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 59,
+ 'line_nr' => 58,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2662,7 +2629,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2702,7 +2669,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 61,
+ 'line_nr' => 60,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2742,7 +2709,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2778,7 +2745,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 64,
+ 'line_nr' => 63,
'macro' => ''
}
}
@@ -2789,7 +2756,7 @@ $result_trees{'encoding_index_latin1'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -3030,11 +2997,10 @@
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'
$result_trees{'encoding_index_latin1'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'encoding_index_latin1'}{'contents'}[1];
$result_texis{'encoding_index_latin1'} = '
-@setfilename encoding_index_latin1.info
@documentencoding iso-8859-1
@node Top
-@top top
+@top encoding index latin1
@cindex é é
@cindex @"{i} @"{i}@"{i}@"{i}
@@ -3098,8 +3064,8 @@ $result_texis{'encoding_index_latin1'} = '
$result_texts{'encoding_index_latin1'} = '
-top
-***
+encoding index latin1
+*********************
';
diff --git a/tp/t/results/indices/encoding_index_latin1/res_html/index.html
b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
index 1145d8a921..ecef4064c7 100644
--- a/tp/t/results/indices/encoding_index_latin1/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_latin1/res_html/index.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Top (top)</title>
+<title>Top (encoding index latin1)</title>
-<meta name="description" content="Top (top)">
-<meta name="keywords" content="Top (top)">
+<meta name="description" content="Top (encoding index latin1)">
+<meta name="keywords" content="Top (encoding index latin1)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -29,7 +29,7 @@ th.sections-header-printindex {text-align:left; padding-left:
1em}
<body lang="en">
<div class="top-level-extent" id="Top">
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="encoding-index-latin1">encoding index latin1</h1>
<a class="index-entry-id" id="index-e-e"></a>
<a class="index-entry-id" id="index-i-iii"></a>
diff --git
a/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
b/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
index 2d91f7ea8a..10fd0b2c6d 100644
Binary files
a/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
and
b/tp/t/results/indices/encoding_index_latin1/res_info/encoding_index_latin1.info
differ
diff --git
a/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
b/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
index 0a268f7cea..9eab2eac0f 100644
---
a/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
+++
b/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
@@ -1,5 +1,5 @@
-top
-***
+encoding index latin1
+*********************
* Menu:
diff --git a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
index 03c8a76ad6..b92751400c 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -12,48 +12,15 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'encoding_index_latin1.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'encoding_index_latin1.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
{
'args' => [
{
@@ -80,7 +47,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 3,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -131,7 +98,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -140,7 +107,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'encoding index latin1'
}
],
'info' => {
@@ -192,7 +159,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -215,7 +182,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -236,7 +203,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -254,7 +221,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -272,7 +239,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
@@ -304,7 +271,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -327,7 +294,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -348,7 +315,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -366,7 +333,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -384,7 +351,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -402,7 +369,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -434,7 +401,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -474,7 +441,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -514,7 +481,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 12,
+ 'line_nr' => 11,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -554,7 +521,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -594,7 +561,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -634,7 +601,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 15,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -674,7 +641,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 16,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -714,7 +681,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -754,7 +721,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 18,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -794,7 +761,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -834,7 +801,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -874,7 +841,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 21,
+ 'line_nr' => 20,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -914,7 +881,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 22,
+ 'line_nr' => 21,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -954,7 +921,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -994,7 +961,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 24,
+ 'line_nr' => 23,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1034,7 +1001,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1074,7 +1041,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1114,7 +1081,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 27,
+ 'line_nr' => 26,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1154,7 +1121,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 28,
+ 'line_nr' => 27,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1194,7 +1161,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1234,7 +1201,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 30,
+ 'line_nr' => 29,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1274,7 +1241,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1314,7 +1281,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1354,7 +1321,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 33,
+ 'line_nr' => 32,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1394,7 +1361,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 34,
+ 'line_nr' => 33,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1434,7 +1401,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1474,7 +1441,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 36,
+ 'line_nr' => 35,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1514,7 +1481,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1554,7 +1521,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 38,
+ 'line_nr' => 37,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1572,7 +1539,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'l',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
}
@@ -1604,7 +1571,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1622,7 +1589,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'L',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
}
@@ -1654,7 +1621,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1677,7 +1644,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1698,7 +1665,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1733,7 +1700,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1760,7 +1727,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1771,7 +1738,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1796,7 +1763,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1807,7 +1774,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1842,7 +1809,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1860,7 +1827,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'ss',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
@@ -1892,7 +1859,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1910,7 +1877,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'euro',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
}
}
@@ -1942,7 +1909,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1960,7 +1927,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'AE',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
}
@@ -1992,7 +1959,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2010,7 +1977,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'exclamdown',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
}
}
@@ -2042,7 +2009,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2060,7 +2027,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'TH',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
}
@@ -2092,7 +2059,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2110,7 +2077,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'DH',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
}
@@ -2142,7 +2109,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2160,7 +2127,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'textdegree',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
}
}
@@ -2192,7 +2159,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2232,7 +2199,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2272,7 +2239,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 51,
+ 'line_nr' => 50,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2290,7 +2257,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'quotedblleft',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
}
@@ -2322,7 +2289,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2340,7 +2307,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'geq',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
}
@@ -2372,7 +2339,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2390,7 +2357,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'cmdname' => 'comma',
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
}
}
@@ -2422,7 +2389,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2462,7 +2429,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2502,7 +2469,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 56,
+ 'line_nr' => 55,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2542,7 +2509,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2582,7 +2549,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2622,7 +2589,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 59,
+ 'line_nr' => 58,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2662,7 +2629,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2702,7 +2669,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 61,
+ 'line_nr' => 60,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2742,7 +2709,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2778,7 +2745,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 64,
+ 'line_nr' => 63,
'macro' => ''
}
}
@@ -2789,7 +2756,7 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_latin1.texi',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -3030,11 +2997,10 @@
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'
$result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'encoding_index_latin1_enable_encoding'}{'contents'}[1];
$result_texis{'encoding_index_latin1_enable_encoding'} = '
-@setfilename encoding_index_latin1.info
@documentencoding iso-8859-1
@node Top
-@top top
+@top encoding index latin1
@cindex é é
@cindex @"{i} @"{i}@"{i}@"{i}
@@ -3098,8 +3064,8 @@ $result_texis{'encoding_index_latin1_enable_encoding'} = '
$result_texts{'encoding_index_latin1_enable_encoding'} = '
-top
-***
+encoding index latin1
+*********************
';
diff --git
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
index 23130bb34d..6ac00771e6 100644
---
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
+++
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_html/index.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Top (top)</title>
+<title>Top (encoding index latin1)</title>
-<meta name="description" content="Top (top)">
-<meta name="keywords" content="Top (top)">
+<meta name="description" content="Top (encoding index latin1)">
+<meta name="keywords" content="Top (encoding index latin1)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -29,7 +29,7 @@ th.sections-header-printindex {text-align:left; padding-left:
1em}
<body lang="en">
<div class="top-level-extent" id="Top">
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="encoding-index-latin1">encoding index latin1</h1>
<a class="index-entry-id" id="index-e-e"></a>
<a class="index-entry-id" id="index-i-iii"></a>
diff --git
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
index 9dedfc3daf..52e79cbf9d 100644
Binary files
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
and
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_info/encoding_index_latin1.info
differ
diff --git
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
index 1c28c58b29..df172f7226 100644
---
a/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
+++
b/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
@@ -1,5 +1,5 @@
-top
-***
+encoding index latin1
+*********************
* Menu:
diff --git a/tp/t/results/indices/encoding_index_utf8.pl
b/tp/t/results/indices/encoding_index_utf8.pl
index f97c0a48b2..20059ab37e 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -12,48 +12,15 @@ $result_trees{'encoding_index_utf8'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'encoding_index_utf8.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'encoding_index_utf8.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
{
'args' => [
{
@@ -80,7 +47,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 3,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -131,7 +98,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -140,7 +107,7 @@ $result_trees{'encoding_index_utf8'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'encoding index utf8'
}
],
'info' => {
@@ -192,7 +159,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -215,7 +182,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -236,7 +203,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -254,7 +221,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -272,7 +239,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
@@ -304,7 +271,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -327,7 +294,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -348,7 +315,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -366,7 +333,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -384,7 +351,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -402,7 +369,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -434,7 +401,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -474,7 +441,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -514,7 +481,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 12,
+ 'line_nr' => 11,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -554,7 +521,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -594,7 +561,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -634,7 +601,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 15,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -674,7 +641,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 16,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -714,7 +681,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -754,7 +721,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 18,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -794,7 +761,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -834,7 +801,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -874,7 +841,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 21,
+ 'line_nr' => 20,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -914,7 +881,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 22,
+ 'line_nr' => 21,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -954,7 +921,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -994,7 +961,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 24,
+ 'line_nr' => 23,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1034,7 +1001,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1074,7 +1041,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1114,7 +1081,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 27,
+ 'line_nr' => 26,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1154,7 +1121,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 28,
+ 'line_nr' => 27,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1194,7 +1161,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1234,7 +1201,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 30,
+ 'line_nr' => 29,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1274,7 +1241,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1314,7 +1281,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1354,7 +1321,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 33,
+ 'line_nr' => 32,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1394,7 +1361,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 34,
+ 'line_nr' => 33,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1434,7 +1401,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1474,7 +1441,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 36,
+ 'line_nr' => 35,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1514,7 +1481,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1554,7 +1521,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 38,
+ 'line_nr' => 37,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1572,7 +1539,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'l',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
}
@@ -1604,7 +1571,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1622,7 +1589,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'L',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
}
@@ -1654,7 +1621,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1677,7 +1644,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1698,7 +1665,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1733,7 +1700,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1760,7 +1727,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1771,7 +1738,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1796,7 +1763,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1807,7 +1774,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1842,7 +1809,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1860,7 +1827,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'ss',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
@@ -1892,7 +1859,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1910,7 +1877,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'euro',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
}
}
@@ -1942,7 +1909,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1960,7 +1927,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'AE',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
}
@@ -1992,7 +1959,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2010,7 +1977,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'exclamdown',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
}
}
@@ -2042,7 +2009,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2060,7 +2027,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'TH',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
}
@@ -2092,7 +2059,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2110,7 +2077,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'DH',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
}
@@ -2142,7 +2109,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2160,7 +2127,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'textdegree',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
}
}
@@ -2192,7 +2159,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2232,7 +2199,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2272,7 +2239,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 51,
+ 'line_nr' => 50,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2290,7 +2257,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'quotedblleft',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
}
@@ -2322,7 +2289,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2340,7 +2307,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'geq',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
}
@@ -2372,7 +2339,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2390,7 +2357,7 @@ $result_trees{'encoding_index_utf8'} = {
'cmdname' => 'comma',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
}
}
@@ -2422,7 +2389,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2462,7 +2429,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2502,7 +2469,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 56,
+ 'line_nr' => 55,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2542,7 +2509,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2582,7 +2549,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2622,7 +2589,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 59,
+ 'line_nr' => 58,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2662,7 +2629,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2702,7 +2669,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 61,
+ 'line_nr' => 60,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2742,7 +2709,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2778,7 +2745,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 64,
+ 'line_nr' => 63,
'macro' => ''
}
}
@@ -2789,7 +2756,7 @@ $result_trees{'encoding_index_utf8'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -3030,11 +2997,10 @@
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'in
$result_trees{'encoding_index_utf8'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'encoding_index_utf8'}{'contents'}[1];
$result_texis{'encoding_index_utf8'} = '
-@setfilename encoding_index_utf8.info
@documentencoding utf-8
@node Top
-@top top
+@top encoding index utf8
@cindex é é
@cindex @"{i} @"{i}@"{i}@"{i}
@@ -3098,8 +3064,8 @@ $result_texis{'encoding_index_utf8'} = '
$result_texts{'encoding_index_utf8'} = '
-top
-***
+encoding index utf8
+*******************
';
diff --git a/tp/t/results/indices/encoding_index_utf8/res_html/index.html
b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
index 64774bd68b..f56e5b14a4 100644
--- a/tp/t/results/indices/encoding_index_utf8/res_html/index.html
+++ b/tp/t/results/indices/encoding_index_utf8/res_html/index.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Top (top)</title>
+<title>Top (encoding index utf8)</title>
-<meta name="description" content="Top (top)">
-<meta name="keywords" content="Top (top)">
+<meta name="description" content="Top (encoding index utf8)">
+<meta name="keywords" content="Top (encoding index utf8)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -29,7 +29,7 @@ th.sections-header-printindex {text-align:left; padding-left:
1em}
<body lang="en">
<div class="top-level-extent" id="Top">
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="encoding-index-utf8">encoding index utf8</h1>
<a class="index-entry-id" id="index-e-e"></a>
<a class="index-entry-id" id="index-i-iii"></a>
diff --git
a/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info
b/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info
index d859964967..129eddbe35 100644
Binary files
a/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info
and
b/tp/t/results/indices/encoding_index_utf8/res_info/encoding_index_utf8.info
differ
diff --git
a/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
b/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
index b591d05310..43e5b271ff 100644
---
a/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
+++
b/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
@@ -1,5 +1,5 @@
-top
-***
+encoding index utf8
+*******************
* Menu:
diff --git a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
index e19e819066..61d34c9030 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -12,48 +12,15 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'encoding_index_utf8.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'encoding_index_utf8.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 2,
- 'macro' => ''
- }
- },
{
'args' => [
{
@@ -80,7 +47,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 3,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -131,7 +98,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 5,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -140,7 +107,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'encoding index utf8'
}
],
'info' => {
@@ -192,7 +159,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 8,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -215,7 +182,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -236,7 +203,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -254,7 +221,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -272,7 +239,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
}
}
@@ -304,7 +271,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 9,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -327,7 +294,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -348,7 +315,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -366,7 +333,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -384,7 +351,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -402,7 +369,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -434,7 +401,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 10,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -474,7 +441,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 11,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -514,7 +481,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 12,
+ 'line_nr' => 11,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -554,7 +521,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 13,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -594,7 +561,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 14,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -634,7 +601,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 15,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -674,7 +641,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 16,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -714,7 +681,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 17,
+ 'line_nr' => 16,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -754,7 +721,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 18,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -794,7 +761,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 19,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -834,7 +801,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 20,
+ 'line_nr' => 19,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -874,7 +841,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 21,
+ 'line_nr' => 20,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -914,7 +881,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 22,
+ 'line_nr' => 21,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -954,7 +921,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 23,
+ 'line_nr' => 22,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -994,7 +961,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 24,
+ 'line_nr' => 23,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1034,7 +1001,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 25,
+ 'line_nr' => 24,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1074,7 +1041,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 26,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1114,7 +1081,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 27,
+ 'line_nr' => 26,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1154,7 +1121,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 28,
+ 'line_nr' => 27,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1194,7 +1161,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 29,
+ 'line_nr' => 28,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1234,7 +1201,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 30,
+ 'line_nr' => 29,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1274,7 +1241,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 31,
+ 'line_nr' => 30,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1314,7 +1281,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 32,
+ 'line_nr' => 31,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1354,7 +1321,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 33,
+ 'line_nr' => 32,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1394,7 +1361,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 34,
+ 'line_nr' => 33,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1434,7 +1401,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 35,
+ 'line_nr' => 34,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1474,7 +1441,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 36,
+ 'line_nr' => 35,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1514,7 +1481,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 37,
+ 'line_nr' => 36,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1554,7 +1521,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 38,
+ 'line_nr' => 37,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1572,7 +1539,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'l',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
}
}
@@ -1604,7 +1571,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 39,
+ 'line_nr' => 38,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1622,7 +1589,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'L',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
}
}
@@ -1654,7 +1621,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 40,
+ 'line_nr' => 39,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1677,7 +1644,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1698,7 +1665,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1733,7 +1700,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 41,
+ 'line_nr' => 40,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1760,7 +1727,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1771,7 +1738,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1796,7 +1763,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'dotless',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
}
@@ -1807,7 +1774,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => '^',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
}
},
@@ -1842,7 +1809,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 42,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1860,7 +1827,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'ss',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
}
}
@@ -1892,7 +1859,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 43,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1910,7 +1877,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'euro',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
}
}
@@ -1942,7 +1909,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 44,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1960,7 +1927,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'AE',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
}
}
@@ -1992,7 +1959,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 45,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2010,7 +1977,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'exclamdown',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
}
}
@@ -2042,7 +2009,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 46,
+ 'line_nr' => 45,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2060,7 +2027,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'TH',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
}
}
@@ -2092,7 +2059,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 47,
+ 'line_nr' => 46,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2110,7 +2077,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'DH',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
}
}
@@ -2142,7 +2109,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 48,
+ 'line_nr' => 47,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2160,7 +2127,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'textdegree',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
}
}
@@ -2192,7 +2159,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 49,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2232,7 +2199,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 50,
+ 'line_nr' => 49,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2272,7 +2239,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 51,
+ 'line_nr' => 50,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2290,7 +2257,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'quotedblleft',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
}
}
@@ -2322,7 +2289,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 52,
+ 'line_nr' => 51,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2340,7 +2307,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'geq',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
}
}
@@ -2372,7 +2339,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 53,
+ 'line_nr' => 52,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2390,7 +2357,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'cmdname' => 'comma',
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
}
}
@@ -2422,7 +2389,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 54,
+ 'line_nr' => 53,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2462,7 +2429,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 55,
+ 'line_nr' => 54,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2502,7 +2469,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 56,
+ 'line_nr' => 55,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2542,7 +2509,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 57,
+ 'line_nr' => 56,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2582,7 +2549,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 58,
+ 'line_nr' => 57,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2622,7 +2589,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 59,
+ 'line_nr' => 58,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2662,7 +2629,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 60,
+ 'line_nr' => 59,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2702,7 +2669,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 61,
+ 'line_nr' => 60,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2742,7 +2709,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 62,
+ 'line_nr' => 61,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2778,7 +2745,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 64,
+ 'line_nr' => 63,
'macro' => ''
}
}
@@ -2789,7 +2756,7 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
},
'source_info' => {
'file_name' => 'encoding_index_utf8.texi',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -3030,11 +2997,10 @@
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[
$result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[2]{'contents'}[55]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'encoding_index_utf8_enable_encoding'}{'contents'}[1];
$result_texis{'encoding_index_utf8_enable_encoding'} = '
-@setfilename encoding_index_utf8.info
@documentencoding utf-8
@node Top
-@top top
+@top encoding index utf8
@cindex é é
@cindex @"{i} @"{i}@"{i}@"{i}
@@ -3098,8 +3064,8 @@ $result_texis{'encoding_index_utf8_enable_encoding'} = '
$result_texts{'encoding_index_utf8_enable_encoding'} = '
-top
-***
+encoding index utf8
+*******************
';
diff --git
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
index 564d997289..33b038d974 100644
---
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
+++
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_html/index.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Top (top)</title>
+<title>Top (encoding index utf8)</title>
-<meta name="description" content="Top (top)">
-<meta name="keywords" content="Top (top)">
+<meta name="description" content="Top (encoding index utf8)">
+<meta name="keywords" content="Top (encoding index utf8)">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="viewport" content="width=device-width,initial-scale=1">
@@ -29,7 +29,7 @@ th.sections-header-printindex {text-align:left; padding-left:
1em}
<body lang="en">
<div class="top-level-extent" id="Top">
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="encoding-index-utf8">encoding index utf8</h1>
<a class="index-entry-id" id="index-e-e"></a>
<a class="index-entry-id" id="index-i-iii"></a>
diff --git
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_info/encoding_index_utf8.info
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_info/encoding_index_utf8.info
index 795ec27846..d45355b305 100644
Binary files
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_info/encoding_index_utf8.info
and
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_info/encoding_index_utf8.info
differ
diff --git
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
index e719cc64f6..9ff141743c 100644
---
a/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
+++
b/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
@@ -1,5 +1,5 @@
-top
-***
+encoding index utf8
+*******************
* Menu:
diff --git a/tp/t/results/layout/navigation.pl
b/tp/t/results/layout/navigation.pl
index 977c533760..8ecc14c331 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'node_co
$result_texis{'navigation'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation'} = '
-File used for navigation testing
+$result_texts{'navigation'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation/res_html/navigation.html
b/tp/t/results/layout/navigation/res_html/navigation.html
index 53f2608e10..354e7c6e2b 100644
--- a/tp/t/results/layout/navigation/res_html/navigation.html
+++ b/tp/t/results/layout/navigation/res_html/navigation.html
@@ -27,7 +27,6 @@ ul.toc-numbered-mark {list-style: none}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/layout/navigation_chapter.pl
b/tp/t/results/layout/navigation_chapter.pl
index e12d4fb222..acc280f227 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_chapter'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_chapter'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_chapter'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_chapter'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{
$result_texis{'navigation_chapter'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_chapter'} = '
-File used for navigation testing
+$result_texts{'navigation_chapter'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation_chapter/res_html/index.html
b/tp/t/results/layout/navigation_chapter/res_html/index.html
index 2df7b70fe6..e93fb74d84 100644
--- a/tp/t/results/layout/navigation_chapter/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl
b/tp/t/results/layout/navigation_chapter_no_header.pl
index af9214da76..d090d570d5 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_chapter_no_header'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_chapter_no_header'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_chapter_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_chapter_no_header'}{'contents'}[7]{'extra'}{'nodes_man
$result_texis{'navigation_chapter_no_header'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_chapter_no_header'} = '
-File used for navigation testing
+$result_texts{'navigation_chapter_no_header'} = 'File used for navigation
testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
b/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
index 2df7b70fe6..e93fb74d84 100644
--- a/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter_no_header/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
index 5953a25dd0..b36f98d963 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_chapter_no_header_vertical'}{'contents'}[7]{'extra'}{'
$result_texis{'navigation_chapter_no_header_vertical'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_chapter_no_header_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_chapter_no_header_vertical'} = 'File used for
navigation testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
index 8fc70bb639..8d00b1e17d 100644
---
a/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
+++
b/tp/t/results/layout/navigation_chapter_no_header_vertical/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl
b/tp/t/results/layout/navigation_chapter_vertical.pl
index c5f5f45534..d6e8f809c2 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_chapter_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_chapter_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_chapter_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_chapter_vertical'}{'contents'}[7]{'extra'}{'nodes_manu
$result_texis{'navigation_chapter_vertical'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_chapter_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_chapter_vertical'} = 'File used for navigation
testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
b/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
index 8fc70bb639..8d00b1e17d 100644
--- a/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_chapter_vertical/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/tp/t/results/layout/navigation_no_header.pl
b/tp/t/results/layout/navigation_no_header.pl
index d8253a5561..1ef9f997fc 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_no_header'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_no_header'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_no_header'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0
$result_texis{'navigation_no_header'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_no_header'} = '
-File used for navigation testing
+$result_texts{'navigation_no_header'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation_no_header/res_html/navigation.html
b/tp/t/results/layout/navigation_no_header/res_html/navigation.html
index 04e05bd639..8fea732727 100644
--- a/tp/t/results/layout/navigation_no_header/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_no_header/res_html/navigation.html
@@ -25,7 +25,6 @@ ul.toc-numbered-mark {list-style: none}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<h1 class="top" id="File-used-for-navigation-testing">File used for navigation
testing</h1>
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 05f438f65b..bbd9c0e348 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_no_header_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_no_header_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_no_header_vertical'}{'contents'}[7]{'extra'}{'nodes_ma
$result_texis{'navigation_no_header_vertical'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_no_header_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_no_header_vertical'} = 'File used for navigation
testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
b/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
index d552cd79fe..405a35b1a0 100644
--- a/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_no_header_vertical/res_html/navigation.html
@@ -25,7 +25,6 @@ ul.toc-numbered-mark {list-style: none}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<h1 class="top" id="File-used-for-navigation-testing">File used for navigation
testing</h1>
diff --git a/tp/t/results/layout/navigation_node.pl
b/tp/t/results/layout/navigation_node.pl
index aa5164cf9a..56c85b06f8 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_node'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_node'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_node'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{'no
$result_texis{'navigation_node'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_node'} = '
-File used for navigation testing
+$result_texts{'navigation_node'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation_node/res_html/index.html
b/tp/t/results/layout/navigation_node/res_html/index.html
index c9b5470ea8..4ec17df242 100644
--- a/tp/t/results/layout/navigation_node/res_html/index.html
+++ b/tp/t/results/layout/navigation_node/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/layout/navigation_node_no_header.pl
b/tp/t/results/layout/navigation_node_no_header.pl
index eef2e2e4fa..ef72c2b7a6 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_node_no_header'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_node_no_header'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_node_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_node_no_header'}{'contents'}[7]{'extra'}{'nodes_manual
$result_texis{'navigation_node_no_header'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_node_no_header'} = '
-File used for navigation testing
+$result_texts{'navigation_node_no_header'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation_node_no_header/res_html/index.html
b/tp/t/results/layout/navigation_node_no_header/res_html/index.html
index cc36105bc2..8d1eed2080 100644
--- a/tp/t/results/layout/navigation_node_no_header/res_html/index.html
+++ b/tp/t/results/layout/navigation_node_no_header/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/layout/navigation_node_no_header_vertical.pl
b/tp/t/results/layout/navigation_node_no_header_vertical.pl
index 446a6b96fb..164102c808 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_node_no_header_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_node_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_node_no_header_vertical'}{'contents'}[7]{'extra'}{'nod
$result_texis{'navigation_node_no_header_vertical'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_node_no_header_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_node_no_header_vertical'} = 'File used for
navigation testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
index 0a79509225..bff473d652 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_node_no_header_vertical/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/tp/t/results/layout/navigation_node_vertical.pl
b/tp/t/results/layout/navigation_node_vertical.pl
index fbbcd2b526..7f7fb37864 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_node_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_node_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_node_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_node_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals
$result_texis{'navigation_node_vertical'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_node_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_node_vertical'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation_node_vertical/res_html/index.html
b/tp/t/results/layout/navigation_node_vertical/res_html/index.html
index 696d162dfe..d47c02e45c 100644
--- a/tp/t/results/layout/navigation_node_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_node_vertical/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/tp/t/results/layout/navigation_section.pl
b/tp/t/results/layout/navigation_section.pl
index 728f723ad3..7137f10d45 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_section'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_section'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_section'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_section'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]{
$result_texis{'navigation_section'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_section'} = '
-File used for navigation testing
+$result_texts{'navigation_section'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation_section/res_html/index.html
b/tp/t/results/layout/navigation_section/res_html/index.html
index 193959cff3..9dc7029473 100644
--- a/tp/t/results/layout/navigation_section/res_html/index.html
+++ b/tp/t/results/layout/navigation_section/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/layout/navigation_section_no_header.pl
b/tp/t/results/layout/navigation_section_no_header.pl
index 96ffd334a2..d42b49cc4f 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_section_no_header'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_section_no_header'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_section_no_header'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_section_no_header'}{'contents'}[7]{'extra'}{'nodes_man
$result_texis{'navigation_section_no_header'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_section_no_header'} = '
-File used for navigation testing
+$result_texts{'navigation_section_no_header'} = 'File used for navigation
testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_section_no_header/res_html/index.html
b/tp/t/results/layout/navigation_section_no_header/res_html/index.html
index 193959cff3..9dc7029473 100644
--- a/tp/t/results/layout/navigation_section_no_header/res_html/index.html
+++ b/tp/t/results/layout/navigation_section_no_header/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/layout/navigation_section_no_header_vertical.pl
b/tp/t/results/layout/navigation_section_no_header_vertical.pl
index 7a98b7bdac..0e783c7629 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_section_no_header_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_section_no_header_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_section_no_header_vertical'}{'contents'}[7]{'extra'}{'
$result_texis{'navigation_section_no_header_vertical'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_section_no_header_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_section_no_header_vertical'} = 'File used for
navigation testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
index 696d162dfe..d47c02e45c 100644
---
a/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
+++
b/tp/t/results/layout/navigation_section_no_header_vertical/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/tp/t/results/layout/navigation_section_vertical.pl
b/tp/t/results/layout/navigation_section_vertical.pl
index fc03a7de16..fb2d6b4860 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_section_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_section_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_section_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_section_vertical'}{'contents'}[7]{'extra'}{'nodes_manu
$result_texis{'navigation_section_vertical'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_section_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_section_vertical'} = 'File used for navigation
testing
********************************
* chapter::
diff --git
a/tp/t/results/layout/navigation_section_vertical/res_html/index.html
b/tp/t/results/layout/navigation_section_vertical/res_html/index.html
index 696d162dfe..d47c02e45c 100644
--- a/tp/t/results/layout/navigation_section_vertical/res_html/index.html
+++ b/tp/t/results/layout/navigation_section_vertical/res_html/index.html
@@ -24,7 +24,6 @@ td.menu-entry-destination {vertical-align: top}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/tp/t/results/layout/navigation_vertical.pl
b/tp/t/results/layout/navigation_vertical.pl
index 25a4a9e631..e35bf82d80 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -12,59 +12,20 @@ $result_trees{'navigation_vertical'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'navigation.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'navigation.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'navigation.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -187,7 +148,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -278,7 +239,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -360,7 +321,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'menu_entry'
@@ -389,14 +350,14 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -412,7 +373,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -451,7 +412,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -719,7 +680,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
},
'type' => 'menu_entry'
@@ -748,14 +709,14 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
},
@@ -771,7 +732,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -810,7 +771,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -847,7 +808,7 @@ $result_trees{'navigation_vertical'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -863,7 +824,7 @@ $result_trees{'navigation_vertical'} = {
},
'source_info' => {
'file_name' => 'navigation.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
}
},
@@ -897,8 +858,6 @@
$result_trees{'navigation_vertical'}{'contents'}[7]{'extra'}{'nodes_manuals'}[0]
$result_texis{'navigation_vertical'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename navigation.info
-
@node Top
@top File used for navigation testing
@@ -956,8 +915,7 @@ b b b b b b b b b b b b b b b b b b b b b bb b b b b b b
bb b bb.
';
-$result_texts{'navigation_vertical'} = '
-File used for navigation testing
+$result_texts{'navigation_vertical'} = 'File used for navigation testing
********************************
* chapter::
diff --git a/tp/t/results/layout/navigation_vertical/res_html/navigation.html
b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
index b96ce1b161..2845620620 100644
--- a/tp/t/results/layout/navigation_vertical/res_html/navigation.html
+++ b/tp/t/results/layout/navigation_vertical/res_html/navigation.html
@@ -27,7 +27,6 @@ ul.toc-numbered-mark {list-style: none}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
diff --git a/tp/t/results/moreindices/index_split.pl
b/tp/t/results/moreindices/index_split.pl
index e72e2bc30f..e6bfac1223 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -12,59 +12,20 @@ $result_trees{'index_split'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'index_split'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'index_split'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'index_split.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -106,7 +67,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -162,7 +123,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -198,7 +159,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -233,7 +194,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -282,7 +243,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -347,7 +308,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
},
'type' => 'menu_entry'
@@ -396,7 +357,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'menu_entry'
@@ -445,7 +406,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'menu_entry'
@@ -474,14 +435,14 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 21,
+ 'line_nr' => 19,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
},
@@ -497,7 +458,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -564,7 +525,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 26,
+ 'line_nr' => 24,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -604,7 +565,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 27,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -644,7 +605,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 28,
+ 'line_nr' => 26,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -684,7 +645,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 29,
+ 'line_nr' => 27,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -723,7 +684,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 31,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -758,7 +719,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 33,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -802,7 +763,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 35,
+ 'line_nr' => 33,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -833,7 +794,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 23,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -889,7 +850,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 38,
+ 'line_nr' => 36,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -929,7 +890,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 39,
+ 'line_nr' => 37,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -969,7 +930,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 40,
+ 'line_nr' => 38,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1035,7 +996,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 43,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1084,7 +1045,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 44,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1133,7 +1094,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 45,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1182,7 +1143,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 46,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1231,7 +1192,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 47,
+ 'line_nr' => 45,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1280,7 +1241,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 48,
+ 'line_nr' => 46,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1309,14 +1270,14 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 42,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1332,7 +1293,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 37,
+ 'line_nr' => 35,
'macro' => ''
}
},
@@ -1372,7 +1333,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
},
@@ -1433,7 +1394,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1499,7 +1460,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 57,
+ 'line_nr' => 55,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1548,7 +1509,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 58,
+ 'line_nr' => 56,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1577,14 +1538,14 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 59,
+ 'line_nr' => 57,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -1628,7 +1589,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 62,
+ 'line_nr' => 60,
'macro' => ''
}
},
@@ -1672,7 +1633,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 64,
+ 'line_nr' => 62,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1689,7 +1650,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 52,
+ 'line_nr' => 50,
'macro' => ''
}
},
@@ -1728,7 +1689,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 66,
+ 'line_nr' => 64,
'macro' => ''
}
},
@@ -1775,7 +1736,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 67,
+ 'line_nr' => 65,
'macro' => ''
}
},
@@ -1815,7 +1776,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 71,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -1890,7 +1851,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 76,
+ 'line_nr' => 74,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1926,7 +1887,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 78,
+ 'line_nr' => 76,
'macro' => ''
}
},
@@ -1970,7 +1931,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 80,
+ 'line_nr' => 78,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1987,7 +1948,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 72,
+ 'line_nr' => 70,
'macro' => ''
}
},
@@ -2026,7 +1987,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 82,
+ 'line_nr' => 80,
'macro' => ''
}
},
@@ -2073,7 +2034,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 83,
+ 'line_nr' => 81,
'macro' => ''
}
},
@@ -2113,7 +2074,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 87,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -2174,7 +2135,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 90,
+ 'line_nr' => 88,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2210,7 +2171,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 92,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -2226,7 +2187,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 88,
+ 'line_nr' => 86,
'macro' => ''
}
},
@@ -2306,7 +2267,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 96,
+ 'line_nr' => 94,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2358,7 +2319,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 94,
+ 'line_nr' => 92,
'macro' => ''
}
},
@@ -2433,7 +2394,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 101,
+ 'line_nr' => 99,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2478,7 +2439,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 104,
+ 'line_nr' => 102,
'macro' => ''
}
},
@@ -2522,7 +2483,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 106,
+ 'line_nr' => 104,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2558,7 +2519,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 108,
+ 'line_nr' => 106,
'macro' => ''
}
},
@@ -2602,7 +2563,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 110,
+ 'line_nr' => 108,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2641,7 +2602,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 99,
+ 'line_nr' => 97,
'macro' => ''
}
},
@@ -2716,7 +2677,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 114,
+ 'line_nr' => 112,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2754,7 +2715,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 112,
+ 'line_nr' => 110,
'macro' => ''
}
},
@@ -2793,7 +2754,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 116,
+ 'line_nr' => 114,
'macro' => ''
}
},
@@ -2840,7 +2801,7 @@ $result_trees{'index_split'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 117,
+ 'line_nr' => 115,
'macro' => ''
}
},
@@ -2984,8 +2945,6 @@
$result_trees{'index_split'}{'contents'}[18]{'extra'}{'nodes_manuals'}[0]{'node_
$result_texis{'index_split'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename index_split
-
@node Top
@top split indices
@cindex entry a
@@ -3106,8 +3065,7 @@ Second chapter
';
-$result_texts{'index_split'} = '
-split indices
+$result_texts{'index_split'} = 'split indices
*************
@@ -3759,7 +3717,7 @@ $result_errors{'index_split'} = [
'error_line' => 'warning: node `node in section 3\' is next for `section
3\' in menu but not in sectioning
',
'file_name' => 'index_split.texi',
- 'line_nr' => 87,
+ 'line_nr' => 85,
'macro' => '',
'text' => 'node `node in section 3\' is next for `section 3\' in menu but
not in sectioning',
'type' => 'warning'
diff --git a/tp/t/results/moreindices/index_split/res_html/index.html
b/tp/t/results/moreindices/index_split/res_html/index.html
index 05300b35f7..23aa73b3c6 100644
--- a/tp/t/results/moreindices/index_split/res_html/index.html
+++ b/tp/t/results/moreindices/index_split/res_html/index.html
@@ -29,7 +29,6 @@ th.sections-header-printindex {text-align:left; padding-left:
1em}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/moreindices/index_split_nodes.pl
b/tp/t/results/moreindices/index_split_nodes.pl
index c208d63ffd..f9a828aff6 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -12,59 +12,20 @@ $result_trees{'index_split_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
-',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'index_split'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'index_split'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'index_split.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -106,7 +67,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -162,7 +123,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -198,7 +159,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -233,7 +194,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -282,7 +243,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -347,7 +308,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
},
'type' => 'menu_entry'
@@ -396,7 +357,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'menu_entry'
@@ -445,7 +406,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'menu_entry'
@@ -474,14 +435,14 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 21,
+ 'line_nr' => 19,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
},
@@ -497,7 +458,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -564,7 +525,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 26,
+ 'line_nr' => 24,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -604,7 +565,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 27,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -644,7 +605,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 28,
+ 'line_nr' => 26,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -684,7 +645,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 29,
+ 'line_nr' => 27,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -723,7 +684,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 31,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -758,7 +719,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 33,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -802,7 +763,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 35,
+ 'line_nr' => 33,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -833,7 +794,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 23,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -889,7 +850,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 38,
+ 'line_nr' => 36,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -929,7 +890,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 39,
+ 'line_nr' => 37,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -969,7 +930,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 40,
+ 'line_nr' => 38,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1035,7 +996,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 43,
+ 'line_nr' => 41,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1084,7 +1045,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 44,
+ 'line_nr' => 42,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1133,7 +1094,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 45,
+ 'line_nr' => 43,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1182,7 +1143,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 46,
+ 'line_nr' => 44,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1231,7 +1192,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 47,
+ 'line_nr' => 45,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1280,7 +1241,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 48,
+ 'line_nr' => 46,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1309,14 +1270,14 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 49,
+ 'line_nr' => 47,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 42,
+ 'line_nr' => 40,
'macro' => ''
}
},
@@ -1332,7 +1293,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 37,
+ 'line_nr' => 35,
'macro' => ''
}
},
@@ -1372,7 +1333,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 51,
+ 'line_nr' => 49,
'macro' => ''
}
},
@@ -1433,7 +1394,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 54,
+ 'line_nr' => 52,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1499,7 +1460,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 57,
+ 'line_nr' => 55,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1548,7 +1509,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 58,
+ 'line_nr' => 56,
'macro' => ''
},
'type' => 'menu_entry'
@@ -1577,14 +1538,14 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 59,
+ 'line_nr' => 57,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -1628,7 +1589,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 62,
+ 'line_nr' => 60,
'macro' => ''
}
},
@@ -1672,7 +1633,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 64,
+ 'line_nr' => 62,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1689,7 +1650,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 52,
+ 'line_nr' => 50,
'macro' => ''
}
},
@@ -1728,7 +1689,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 66,
+ 'line_nr' => 64,
'macro' => ''
}
},
@@ -1775,7 +1736,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 67,
+ 'line_nr' => 65,
'macro' => ''
}
},
@@ -1815,7 +1776,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 71,
+ 'line_nr' => 69,
'macro' => ''
}
},
@@ -1890,7 +1851,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 76,
+ 'line_nr' => 74,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1926,7 +1887,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 78,
+ 'line_nr' => 76,
'macro' => ''
}
},
@@ -1970,7 +1931,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 80,
+ 'line_nr' => 78,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -1987,7 +1948,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 72,
+ 'line_nr' => 70,
'macro' => ''
}
},
@@ -2026,7 +1987,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 82,
+ 'line_nr' => 80,
'macro' => ''
}
},
@@ -2073,7 +2034,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 83,
+ 'line_nr' => 81,
'macro' => ''
}
},
@@ -2113,7 +2074,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 87,
+ 'line_nr' => 85,
'macro' => ''
}
},
@@ -2174,7 +2135,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 90,
+ 'line_nr' => 88,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2210,7 +2171,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 92,
+ 'line_nr' => 90,
'macro' => ''
}
},
@@ -2226,7 +2187,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 88,
+ 'line_nr' => 86,
'macro' => ''
}
},
@@ -2306,7 +2267,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 96,
+ 'line_nr' => 94,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2358,7 +2319,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 94,
+ 'line_nr' => 92,
'macro' => ''
}
},
@@ -2433,7 +2394,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 101,
+ 'line_nr' => 99,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2478,7 +2439,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 104,
+ 'line_nr' => 102,
'macro' => ''
}
},
@@ -2522,7 +2483,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 106,
+ 'line_nr' => 104,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2558,7 +2519,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 108,
+ 'line_nr' => 106,
'macro' => ''
}
},
@@ -2602,7 +2563,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 110,
+ 'line_nr' => 108,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2641,7 +2602,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 99,
+ 'line_nr' => 97,
'macro' => ''
}
},
@@ -2716,7 +2677,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 114,
+ 'line_nr' => 112,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -2754,7 +2715,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 112,
+ 'line_nr' => 110,
'macro' => ''
}
},
@@ -2793,7 +2754,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 116,
+ 'line_nr' => 114,
'macro' => ''
}
},
@@ -2840,7 +2801,7 @@ $result_trees{'index_split_nodes'} = {
},
'source_info' => {
'file_name' => 'index_split.texi',
- 'line_nr' => 117,
+ 'line_nr' => 115,
'macro' => ''
}
},
@@ -2984,8 +2945,6 @@
$result_trees{'index_split_nodes'}{'contents'}[18]{'extra'}{'nodes_manuals'}[0]{
$result_texis{'index_split_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename index_split
-
@node Top
@top split indices
@cindex entry a
@@ -3106,8 +3065,7 @@ Second chapter
';
-$result_texts{'index_split_nodes'} = '
-split indices
+$result_texts{'index_split_nodes'} = 'split indices
*************
diff --git a/tp/t/results/moreindices/index_split_nodes/res_html/index.html
b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
index 4273d131c3..bd5debfa71 100644
--- a/tp/t/results/moreindices/index_split_nodes/res_html/index.html
+++ b/tp/t/results/moreindices/index_split_nodes/res_html/index.html
@@ -29,7 +29,6 @@ th.sections-header-printindex {text-align:left; padding-left:
1em}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/moreindices/nodes_before_top.pl
b/tp/t/results/moreindices/nodes_before_top.pl
index eb707eb637..86f15d5554 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -12,51 +12,34 @@ $result_trees{'nodes_before_top'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'index_nodes'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes before Top node
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'index_nodes'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_before_top.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes before Top node
+'
+ ]
}
},
{
@@ -2058,7 +2041,7 @@
$result_trees{'nodes_before_top'}{'contents'}[7]{'extra'}{'nodes_manuals'}[3]{'n
$result_texis{'nodes_before_top'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename index_nodes
+@c test nodes before Top node
@node first before top, Top, ,(dir)
diff --git
a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
index 264d0ab762..7b26e03259 100644
--- a/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
+++ b/tp/t/results/moreindices/nodes_before_top_and_sections_monolithic.pl
@@ -36,7 +36,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
{
'contents' => [
{
- 'text' => 'more_before_top_section'
+ 'text' => 'nodes_before_top_and_sections.info'
}
],
'info' => {
@@ -48,7 +48,7 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} = {
],
'cmdname' => 'setfilename',
'extra' => {
- 'text_arg' => 'more_before_top_section'
+ 'text_arg' => 'nodes_before_top_and_sections.info'
},
'info' => {
'spaces_before_argument' => ' '
@@ -2595,7 +2595,7 @@
$result_trees{'nodes_before_top_and_sections_monolithic'}{'contents'}[11]{'extra
$result_texis{'nodes_before_top_and_sections_monolithic'} = '\\input texinfo
@c -*-texinfo-*-
-@setfilename more_before_top_section
+@setfilename nodes_before_top_and_sections.info
@node first before top, Top, ,(dir)
diff --git a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
index 0f9e0e3fba..72e4214e11 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -12,51 +12,34 @@ $result_trees{'nodes_before_top_no_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'index_nodes'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes before Top node
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'index_nodes'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_before_top.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes before Top node
+'
+ ]
}
},
{
@@ -2058,7 +2041,7 @@
$result_trees{'nodes_before_top_no_nodes'}{'contents'}[7]{'extra'}{'nodes_manual
$result_texis{'nodes_before_top_no_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename index_nodes
+@c test nodes before Top node
@node first before top, Top, ,(dir)
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index c5c177d4d7..dfcbbad5d9 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -12,51 +12,34 @@ $result_trees{'nodes_before_top_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'index_nodes'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes before Top node
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'index_nodes'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_before_top.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes before Top node
+'
+ ]
}
},
{
@@ -2058,7 +2041,7 @@
$result_trees{'nodes_before_top_nodes'}{'contents'}[7]{'extra'}{'nodes_manuals'}
$result_texis{'nodes_before_top_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename index_nodes
+@c test nodes before Top node
@node first before top, Top, ,(dir)
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl
b/tp/t/results/moresectioning/equivalent_nodes.pl
index ffb176e48d..56689cde61 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -12,51 +12,34 @@ $result_trees{'equivalent_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'equivalent_nodes.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test equivalent nodes
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'equivalent_nodes.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test equivalent nodes
+'
+ ]
}
},
{
@@ -685,7 +668,7 @@
$result_trees{'equivalent_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'n
$result_texis{'equivalent_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename equivalent_nodes.info
+@c test equivalent nodes
@node before top, @asis{node},,(dir)
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index 4801925ce2..8eeeb33870 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -12,51 +12,34 @@ $result_trees{'equivalent_nodes_no_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'equivalent_nodes.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test equivalent nodes
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'equivalent_nodes.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'equivalent_nodes.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test equivalent nodes
+'
+ ]
}
},
{
@@ -685,7 +668,7 @@
$result_trees{'equivalent_nodes_no_node'}{'contents'}[3]{'extra'}{'nodes_manuals
$result_texis{'equivalent_nodes_no_node'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename equivalent_nodes.info
+@c test equivalent nodes
@node before top, @asis{node},,(dir)
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl
b/tp/t/results/moresectioning/node_footnote_end.pl
index e5dd34c63e..542f8eb5e1 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -12,51 +12,34 @@ $result_trees{'node_footnote_end'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'node_footnote.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test footnotes with nodes only
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'node_footnote.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'node_footnote.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test footnotes with nodes only
+'
+ ]
}
},
{
@@ -1065,7 +1048,7 @@
$result_trees{'node_footnote_end'}{'contents'}[6]{'extra'}{'nodes_manuals'}[0]{'
$result_texis{'node_footnote_end'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename node_footnote.info
+@c test footnotes with nodes only
@node Top
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl
b/tp/t/results/moresectioning/node_footnote_separated.pl
index da444df4ec..d22a2a5d82 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -12,51 +12,34 @@ $result_trees{'node_footnote_separated'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'node_footnote.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test footnotes with nodes only
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'node_footnote.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'node_footnote.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test footnotes with nodes only
+'
+ ]
}
},
{
@@ -1065,7 +1048,7 @@
$result_trees{'node_footnote_separated'}{'contents'}[6]{'extra'}{'nodes_manuals'
$result_texis{'node_footnote_separated'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename node_footnote.info
+@c test footnotes with nodes only
@node Top
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index ccbe6ef09e..3fc774607c 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -12,51 +12,34 @@ $result_trees{'node_footnote_use_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'node_footnote.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test footnotes with nodes only
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'node_footnote.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'node_footnote.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test footnotes with nodes only
+'
+ ]
}
},
{
@@ -1065,7 +1048,7 @@
$result_trees{'node_footnote_use_node'}{'contents'}[6]{'extra'}{'nodes_manuals'}
$result_texis{'node_footnote_use_node'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename node_footnote.info
+@c test footnotes with nodes only
@node Top
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
index 2a4f566cf9..aced48f8f6 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -12,51 +12,34 @@ $result_trees{'nodes_after_top_before_chapter'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'nodes_after_top_before_chapter.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes after top before chapter
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'nodes_after_top_before_chapter.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes after top before chapter
+'
+ ]
}
},
{
@@ -520,7 +503,7 @@
$result_trees{'nodes_after_top_before_chapter'}{'contents'}[3]{'extra'}{'nodes_m
$result_texis{'nodes_after_top_before_chapter'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename nodes_after_top_before_chapter.info
+@c test nodes after top before chapter
@node Top
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
index be674db42d..9e787f4baf 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
+++
b/tp/t/results/moresectioning/nodes_after_top_before_chapter_use_nodes_chapter.pl
@@ -12,51 +12,34 @@
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'nodes_after_top_before_chapter.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes after top before chapter
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'nodes_after_top_before_chapter.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_chapter.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes after top before chapter
+'
+ ]
}
},
{
@@ -520,7 +503,7 @@
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'}{'contents'}[3]
$result_texis{'nodes_after_top_before_chapter_use_nodes_chapter'} = '\\input
texinfo @c -*-texinfo-*-
-@setfilename nodes_after_top_before_chapter.info
+@c test nodes after top before chapter
@node Top
diff --git a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
index a6b5514779..3372e09ac3 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -12,51 +12,34 @@ $result_trees{'nodes_after_top_before_section'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'nodes_after_top_before_section.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes after Top before section
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'nodes_after_top_before_section.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes after Top before section
+'
+ ]
}
},
{
@@ -520,7 +503,7 @@
$result_trees{'nodes_after_top_before_section'}{'contents'}[3]{'extra'}{'nodes_m
$result_texis{'nodes_after_top_before_section'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename nodes_after_top_before_section.info
+@c test nodes after Top before section
@node Top
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
index d59818d46b..b6aa903b70 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes.pl
@@ -12,51 +12,34 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} =
{
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'nodes_after_top_before_section.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes after Top before section
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'nodes_after_top_before_section.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes after Top before section
+'
+ ]
}
},
{
@@ -520,7 +503,7 @@
$result_trees{'nodes_after_top_before_section_use_nodes'}{'contents'}[3]{'extra'
$result_texis{'nodes_after_top_before_section_use_nodes'} = '\\input texinfo
@c -*-texinfo-*-
-@setfilename nodes_after_top_before_section.info
+@c test nodes after Top before section
@node Top
diff --git
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
index 43f967ec21..4af82fa84f 100644
---
a/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
+++
b/tp/t/results/moresectioning/nodes_after_top_before_section_use_nodes_chapter.pl
@@ -12,51 +12,34 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
{
'args' => [
{
- 'contents' => [
- {
- 'text' => 'nodes_after_top_before_section.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
+ 'text' => ' test nodes after Top before section
+',
+ 'type' => 'misc_arg'
}
],
- 'cmdname' => 'setfilename',
+ 'cmdname' => 'c',
'extra' => {
- 'text_arg' => 'nodes_after_top_before_section.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'nodes_after_top_before_section.texi',
- 'line_nr' => 3,
- 'macro' => ''
+ 'misc_args' => [
+ ' test nodes after Top before section
+'
+ ]
}
},
{
@@ -520,7 +503,7 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'}{'contents'}[3]
$result_texis{'nodes_after_top_before_section_use_nodes_chapter'} = '\\input
texinfo @c -*-texinfo-*-
-@setfilename nodes_after_top_before_section.info
+@c test nodes after Top before section
@node Top
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index 48bf234030..ec19166efd 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -12,59 +12,20 @@ $result_trees{'two_footnotes_in_nodes'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'two_footnotes_in_nodes.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'two_footnotes_in_nodes.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -169,7 +130,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -223,7 +184,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -295,7 +256,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'menu_entry'
@@ -324,14 +285,14 @@ $result_trees{'two_footnotes_in_nodes'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
},
@@ -347,7 +308,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -386,7 +347,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -450,7 +411,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 23,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -504,7 +465,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 27,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -527,7 +488,7 @@ $result_trees{'two_footnotes_in_nodes'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 21,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -553,8 +514,6 @@
$result_trees{'two_footnotes_in_nodes'}{'contents'}[3]{'extra'}{'nodes_manuals'}
$result_texis{'two_footnotes_in_nodes'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename two_footnotes_in_nodes.info
-
@node Top
@top 2 footnotes in 2 nodes
@@ -585,8 +544,7 @@ para2}
';
-$result_texts{'two_footnotes_in_nodes'} = '
-2 footnotes in 2 nodes
+$result_texts{'two_footnotes_in_nodes'} = '2 footnotes in 2 nodes
**********************
A
diff --git
a/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
b/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
index 84a891a149..102dd07d8c 100644
---
a/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
+++
b/tp/t/results/moresectioning/two_footnotes_in_nodes/res_html/two_footnotes_in_nodes.html
@@ -26,7 +26,6 @@ td.name-direction-about {text-align:center}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
index 19c9b884eb..ef33ef9246 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -12,59 +12,20 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'two_footnotes_in_nodes.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'two_footnotes_in_nodes.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -169,7 +130,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -223,7 +184,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -295,7 +256,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'menu_entry'
@@ -324,14 +285,14 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 18,
+ 'line_nr' => 16,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
},
@@ -347,7 +308,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -386,7 +347,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
},
@@ -450,7 +411,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 23,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -504,7 +465,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
'cmdname' => 'footnote',
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 27,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -527,7 +488,7 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
},
'source_info' => {
'file_name' => 'two_footnotes_in_nodes.texi',
- 'line_nr' => 21,
+ 'line_nr' => 19,
'macro' => ''
}
},
@@ -553,8 +514,6 @@
$result_trees{'two_footnotes_in_nodes_separated'}{'contents'}[3]{'extra'}{'nodes
$result_texis{'two_footnotes_in_nodes_separated'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename two_footnotes_in_nodes.info
-
@node Top
@top 2 footnotes in 2 nodes
@@ -585,8 +544,7 @@ para2}
';
-$result_texts{'two_footnotes_in_nodes_separated'} = '
-2 footnotes in 2 nodes
+$result_texts{'two_footnotes_in_nodes_separated'} = '2 footnotes in 2 nodes
**********************
A
diff --git
a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
index 84a891a149..102dd07d8c 100644
---
a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
+++
b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated/res_html/two_footnotes_in_nodes.html
@@ -26,7 +26,6 @@ td.name-direction-about {text-align:center}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
<tr><td>[ < ]</td>
diff --git a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
index ce2bfbe738..456bcfea2b 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -12,15 +12,15 @@ $result_trees{'chinese_mixed_with_en'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo
+ 'text' => '\\input texinfo
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- },
+ 'type' => 'text_before_beginning'
+ }
+ ],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [
{
'args' => [
{
@@ -50,39 +50,6 @@ $result_trees{'chinese_mixed_with_en'} = {
'line_nr' => 2,
'macro' => ''
}
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'chinese_mixed_with_en.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'chinese_mixed_with_en.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'chinese_mixed_with_en.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
},
{
'args' => [
@@ -105,7 +72,7 @@ $result_trees{'chinese_mixed_with_en'} = {
},
'source_info' => {
'file_name' => 'chinese_mixed_with_en.texi',
- 'line_nr' => 4,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -315,7 +282,7 @@ $result_trees{'chinese_mixed_with_en'} = {
},
'source_info' => {
'file_name' => 'chinese_mixed_with_en.texi',
- 'line_nr' => 6,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -337,7 +304,6 @@
$result_trees{'chinese_mixed_with_en'}{'contents'}[1]{'extra'}{'nodes_manuals'}[
$result_texis{'chinese_mixed_with_en'} = '\\input texinfo
@documentencoding utf-8
-@setfilename chinese_mixed_with_en.info
@settitle chinese mixed with english
@node Top
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl
b/tp/t/results/sectioning/contents_at_document_begin.pl
index c5f3f34a16..5bc8b7ff05 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -12,58 +12,20 @@ $result_trees{'contents_at_document_begin'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
+ 'type' => 'text_before_beginning'
+ },
+ {
+ 'text' => '
',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
+ 'type' => 'text_before_beginning'
}
],
- 'type' => 'preamble_before_setfilename'
+ 'type' => 'preamble_before_beginning'
},
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'contents_at_document_begin.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'contents_at_document_begin.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'contents_at_document_begin.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
- },
- {
- 'text' => '
-',
- 'type' => 'empty_line'
- },
{
'args' => [
{
@@ -75,7 +37,7 @@ $result_trees{'contents_at_document_begin'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'contents_at_document_begin.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -125,7 +87,7 @@ $result_trees{'contents_at_document_begin'} = {
},
'source_info' => {
'file_name' => 'contents_at_document_begin.texi',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
},
@@ -134,7 +96,7 @@ $result_trees{'contents_at_document_begin'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'contents at document begin'
}
],
'info' => {
@@ -158,7 +120,7 @@ $result_trees{'contents_at_document_begin'} = {
},
'source_info' => {
'file_name' => 'contents_at_document_begin.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -190,7 +152,7 @@ $result_trees{'contents_at_document_begin'} = {
},
'source_info' => {
'file_name' => 'contents_at_document_begin.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -212,12 +174,10 @@
$result_trees{'contents_at_document_begin'}{'contents'}[1]{'extra'}{'nodes_manua
$result_texis{'contents_at_document_begin'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename contents_at_document_begin.info
-
@contents
@node Top
-@top top
+@top contents at document begin
@chapter chap
@@ -226,9 +186,8 @@ $result_texis{'contents_at_document_begin'} = '\\input
texinfo @c -*-texinfo-*-
$result_texts{'contents_at_document_begin'} = '
-
-top
-***
+contents at document begin
+**************************
1 chap
******
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl
b/tp/t/results/sectioning/contents_at_end_document.pl
index 7c6f41b238..4951302be1 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -12,59 +12,20 @@ $result_trees{'contents_at_end_document'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'contents_at_end_document.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'contents_at_end_document.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'contents_at_end_document'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -114,7 +75,7 @@ $result_trees{'contents_at_end_document'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'contents at end document'
}
],
'info' => {
@@ -138,7 +99,7 @@ $result_trees{'contents_at_end_document'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -175,7 +136,7 @@ $result_trees{'contents_at_end_document'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -190,7 +151,7 @@ $result_trees{'contents_at_end_document'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -212,10 +173,8 @@
$result_trees{'contents_at_end_document'}{'contents'}[1]{'extra'}{'nodes_manuals
$result_texis{'contents_at_end_document'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename contents_at_end_document.info
-
@node Top
-@top top
+@top contents at end document
@chapter chap
@@ -225,9 +184,8 @@ $result_texis{'contents_at_end_document'} = '\\input
texinfo @c -*-texinfo-*-
';
-$result_texts{'contents_at_end_document'} = '
-top
-***
+$result_texts{'contents_at_end_document'} = 'contents at end document
+************************
1 chap
******
diff --git a/tp/t/results/sectioning/contents_at_end_document_after_node.pl
b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
index fc7e76fcc9..af02a23bc4 100644
--- a/tp/t/results/sectioning/contents_at_end_document_after_node.pl
+++ b/tp/t/results/sectioning/contents_at_end_document_after_node.pl
@@ -12,59 +12,20 @@ $result_trees{'contents_at_end_document_after_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'contents_at_end_document_after_node.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'contents_at_end_document_after_node.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -114,7 +75,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'contents at end document after node'
}
],
'info' => {
@@ -187,7 +148,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'menu_entry'
@@ -216,14 +177,14 @@ $result_trees{'contents_at_end_document_after_node'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
],
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -239,7 +200,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -271,7 +232,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -322,7 +283,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
},
@@ -359,7 +320,7 @@ $result_trees{'contents_at_end_document_after_node'} = {
},
'source_info' => {
'file_name' => 'contents_at_end_document_after_node.texi',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
}
},
@@ -386,10 +347,8 @@
$result_trees{'contents_at_end_document_after_node'}{'contents'}[4]{'extra'}{'no
$result_texis{'contents_at_end_document_after_node'} = '\\input texinfo @c
-*-texinfo-*-
-@setfilename contents_at_end_document_after_node.info
-
@node Top
-@top top
+@top contents at end document after node
@menu
* a node::
@@ -405,9 +364,8 @@ $result_texis{'contents_at_end_document_after_node'} =
'\\input texinfo @c -*-te
';
-$result_texts{'contents_at_end_document_after_node'} = '
-top
-***
+$result_texts{'contents_at_end_document_after_node'} = 'contents at end
document after node
+***********************************
* a node::
diff --git a/tp/t/results/sectioning/contents_in_document.pl
b/tp/t/results/sectioning/contents_in_document.pl
index 2fc7e1fda8..f8a55691cf 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -12,59 +12,20 @@ $result_trees{'contents_in_document'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => '\\input texinfo @c -*-texinfo-*-
+ 'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'text_before_beginning'
- },
- {
- 'text' => '
-',
- 'type' => 'text_before_beginning'
- }
- ],
- 'type' => 'preamble_before_beginning'
- }
- ],
- 'type' => 'preamble_before_setfilename'
- },
- {
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'text' => 'contents_in_document.info'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => '
-'
- },
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'text_arg' => 'contents_in_document.info'
- },
- 'info' => {
- 'spaces_before_argument' => ' '
- },
- 'source_info' => {
- 'file_name' => 'contents_in_document.texi',
- 'line_nr' => 3,
- 'macro' => ''
- }
+ 'type' => 'text_before_beginning'
},
{
'text' => '
',
- 'type' => 'empty_line'
+ 'type' => 'text_before_beginning'
}
],
+ 'type' => 'preamble_before_beginning'
+ },
+ {
+ 'contents' => [],
'type' => 'preamble_before_content'
}
],
@@ -105,7 +66,7 @@ $result_trees{'contents_in_document'} = {
},
'source_info' => {
'file_name' => 'contents_in_document.texi',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -114,7 +75,7 @@ $result_trees{'contents_in_document'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'contents in document'
}
],
'info' => {
@@ -142,7 +103,7 @@ $result_trees{'contents_in_document'} = {
'cmdname' => 'contents',
'source_info' => {
'file_name' => 'contents_in_document.texi',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -158,7 +119,7 @@ $result_trees{'contents_in_document'} = {
},
'source_info' => {
'file_name' => 'contents_in_document.texi',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -190,7 +151,7 @@ $result_trees{'contents_in_document'} = {
},
'source_info' => {
'file_name' => 'contents_in_document.texi',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -212,10 +173,8 @@
$result_trees{'contents_in_document'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0
$result_texis{'contents_in_document'} = '\\input texinfo @c -*-texinfo-*-
-@setfilename contents_in_document.info
-
@node Top
-@top top
+@top contents in document
@contents
@@ -225,9 +184,8 @@ $result_texis{'contents_in_document'} = '\\input texinfo @c
-*-texinfo-*-
';
-$result_texts{'contents_in_document'} = '
-top
-***
+$result_texts{'contents_in_document'} = 'contents in document
+********************
1 chap
diff --git
a/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
b/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
index fe55bdc36a..b0c4cb3c37 100644
---
a/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
+++
b/tp/tests/many_input_files/different_encodings_res/char_latin1_latin1_in_refs.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>top</title>
+<title>char latin1 latin1 in refs</title>
-<meta name="description" content="top">
-<meta name="keywords" content="top">
+<meta name="description" content="char latin1 latin1 in refs">
+<meta name="keywords" content="char latin1 latin1 in refs">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
@@ -30,13 +30,12 @@ th.sections-header-printindex {text-align:left;
padding-left: 1em}
<body lang="en">
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
Next: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
accesskey="n" rel="next">� � � � � � � � � � �</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
</div>
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="char-latin1-latin1-in-refs">char latin1 latin1 in refs</h1>
<ul class="mini-toc">
@@ -50,7 +49,7 @@ Next: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_
<div class="chapter-level-extent"
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
<div class="nav-panel">
<p>
-Next: <a href="#g_t_00e9" accesskey="n" rel="next">�</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u"
rel="up">top</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
+Next: <a href="#g_t_00e9" accesskey="n" rel="next">�</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">char latin1 latin1 in refs</a>, Up: <a
href="#Top" accesskey="u" rel="up">char latin1 latin1 in refs</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="a-e-i-o-u-y-A-E-I-O-U">1 � � � � � � � � � � �</h2>
@@ -104,7 +103,7 @@ Next: <a href="#g_t_00e9" accesskey="n" rel="next">
<div class="chapter-level-extent" id="g_t_00e9">
<div class="nav-panel">
<p>
-Next: <a href="#g_t_00e0-_00e8-_00f9" accesskey="n" rel="next">� � �</a>,
Previous: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
accesskey="p" rel="prev">� � � � � � � � � � �</a>, Up: <a href="#Top"
accesskey="u" rel="up">top</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
+Next: <a href="#g_t_00e0-_00e8-_00f9" accesskey="n" rel="next">� � �</a>,
Previous: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
accesskey="p" rel="prev">� � � � � � � � � � �</a>, Up: <a href="#Top"
accesskey="u" rel="up">char latin1 latin1 in refs</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="e">2 �</h2>
@@ -113,7 +112,7 @@ Next: <a href="#g_t_00e0-_00e8-_00f9" accesskey="n"
rel="next">
<div class="chapter-level-extent" id="g_t_00e0-_00e8-_00f9">
<div class="nav-panel">
<p>
-Next: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="n" rel="next">� � � � � � � � � �</a>, Previous: <a href="#g_t_00e9"
accesskey="p" rel="prev">�</a>, Up: <a href="#Top" accesskey="u"
rel="up">top</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
+Next: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="n" rel="next">� � � � � � � � � �</a>, Previous: <a href="#g_t_00e9"
accesskey="p" rel="prev">�</a>, Up: <a href="#Top" accesskey="u" rel="up">char
latin1 latin1 in refs</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="a-e-u">3 � � �</h2>
@@ -122,7 +121,7 @@ Next: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
<div class="chapter-level-extent"
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
<div class="nav-panel">
<p>
-Next: <a href="#g_t_00e7" accesskey="n" rel="next">�</a>, Previous: <a
href="#g_t_00e0-_00e8-_00f9" accesskey="p" rel="prev">� � �</a>, Up: <a
href="#Top" accesskey="u" rel="up">top</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
+Next: <a href="#g_t_00e7" accesskey="n" rel="next">�</a>, Previous: <a
href="#g_t_00e0-_00e8-_00f9" accesskey="p" rel="prev">� � �</a>, Up: <a
href="#Top" accesskey="u" rel="up">char latin1 latin1 in refs</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="a-e-i-o-u-A-E-I-O-U">4 � � � � � � � � � �</h2>
@@ -131,7 +130,7 @@ Next: <a href="#g_t_00e7" accesskey="n" rel="next">
<div class="chapter-level-extent" id="g_t_00e7">
<div class="nav-panel">
<p>
-Previous: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="p" rel="prev">� � � � � � � � � �</a>, Up: <a href="#Top"
accesskey="u" rel="up">top</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
+Previous: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="p" rel="prev">� � � � � � � � � �</a>, Up: <a href="#Top"
accesskey="u" rel="up">char latin1 latin1 in refs</a> � [<a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="c">5 �</h2>
diff --git
a/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
b/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
index 5b2631e7d7..eef4378c33 100644
---
a/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
+++
b/tp/tests/many_input_files/different_encodings_res/char_latin1_utf8_in_refs.html
@@ -3,10 +3,10 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>top</title>
+<title>char latin1 utf8 in refs</title>
-<meta name="description" content="top">
-<meta name="keywords" content="top">
+<meta name="description" content="char latin1 utf8 in refs">
+<meta name="keywords" content="char latin1 utf8 in refs">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
@@ -30,13 +30,12 @@ th.sections-header-printindex {text-align:left;
padding-left: 1em}
<body lang="en">
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
Next: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
accesskey="n" rel="next">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a> [<a href="#Top"
title="Index" rel="index">Index</a>]</p>
</div>
-<h1 class="top" id="top">top</h1>
+<h1 class="top" id="char-latin1-utf8-in-refs">char latin1 utf8 in refs</h1>
<div class="printindex cp-printindex">
<table class="cp-letters-header-printindex"><tr><th>Jump to: </th><td><a
class="summary-letter-printindex" href="#Top_cp_letter-Â"><b>Â</b></a>
@@ -95,7 +94,7 @@ Next: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_
<div class="chapter-level-extent"
id="g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc">
<div class="nav-panel">
<p>
-Next: <a href="#g_t_00e9" accesskey="n" rel="next">é</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">top</a>, Up: <a href="#Top" accesskey="u"
rel="up">top</a> [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#g_t_00e9" accesskey="n" rel="next">é</a>, Previous: <a
href="#Top" accesskey="p" rel="prev">char latin1 utf8 in refs</a>, Up: <a
href="#Top" accesskey="u" rel="up">char latin1 utf8 in refs</a> [<a
href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="a-e-i-o-u-y-A-E-I-O-U">1 ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</h2>
@@ -104,7 +103,7 @@ Next: <a href="#g_t_00e9" accesskey="n" rel="next">é</a>,
Previous: <a href="#T
<div class="chapter-level-extent" id="g_t_00e9">
<div class="nav-panel">
<p>
-Next: <a href="#g_t_00e0-_00e8-_00f9" accesskey="n" rel="next">à è ù</a>,
Previous: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>, Up: <a href="#Top"
accesskey="u" rel="up">top</a> [<a href="#Top" title="Index"
rel="index">Index</a>]</p>
+Next: <a href="#g_t_00e0-_00e8-_00f9" accesskey="n" rel="next">à è ù</a>,
Previous: <a
href="#g_t_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc"
accesskey="p" rel="prev">ä ë ï ö ü ÿ Ä Ë Ï Ö Ü</a>, Up: <a href="#Top"
accesskey="u" rel="up">char latin1 utf8 in refs</a> [<a href="#Top"
title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="e">2 é</h2>
@@ -113,7 +112,7 @@ Next: <a href="#g_t_00e0-_00e8-_00f9" accesskey="n"
rel="next">à è ù</a>, Pre
<div class="chapter-level-extent" id="g_t_00e0-_00e8-_00f9">
<div class="nav-panel">
<p>
-Next: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="n" rel="next">â ê î ô û Â Ê Î Ô Û</a>, Previous: <a href="#g_t_00e9"
accesskey="p" rel="prev">é</a>, Up: <a href="#Top" accesskey="u"
rel="up">top</a> [<a href="#Top" title="Index" rel="index">Index</a>]</p>
+Next: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="n" rel="next">â ê î ô û Â Ê Î Ô Û</a>, Previous: <a href="#g_t_00e9"
accesskey="p" rel="prev">é</a>, Up: <a href="#Top" accesskey="u" rel="up">char
latin1 utf8 in refs</a> [<a href="#Top" title="Index"
rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="a-e-u">3 à è ù</h2>
@@ -122,7 +121,7 @@ Next: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
<div class="chapter-level-extent"
id="g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db">
<div class="nav-panel">
<p>
-Next: <a href="#g_t_00e7" accesskey="n" rel="next">ç</a>, Previous: <a
href="#g_t_00e0-_00e8-_00f9" accesskey="p" rel="prev">à è ù</a>, Up: <a
href="#Top" accesskey="u" rel="up">top</a> [<a href="#Top" title="Index"
rel="index">Index</a>]</p>
+Next: <a href="#g_t_00e7" accesskey="n" rel="next">ç</a>, Previous: <a
href="#g_t_00e0-_00e8-_00f9" accesskey="p" rel="prev">à è ù</a>, Up: <a
href="#Top" accesskey="u" rel="up">char latin1 utf8 in refs</a> [<a
href="#Top" title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="a-e-i-o-u-A-E-I-O-U">4 â ê î ô û Â Ê Î Ô Û</h2>
@@ -131,7 +130,7 @@ Next: <a href="#g_t_00e7" accesskey="n" rel="next">ç</a>,
Previous: <a href="#g
<div class="chapter-level-extent" id="g_t_00e7">
<div class="nav-panel">
<p>
-Previous: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="p" rel="prev">â ê î ô û Â Ê Î Ô Û</a>, Up: <a href="#Top"
accesskey="u" rel="up">top</a> [<a href="#Top" title="Index"
rel="index">Index</a>]</p>
+Previous: <a
href="#g_t_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db"
accesskey="p" rel="prev">â ê î ô û Â Ê Î Ô Û</a>, Up: <a href="#Top"
accesskey="u" rel="up">char latin1 utf8 in refs</a> [<a href="#Top"
title="Index" rel="index">Index</a>]</p>
</div>
<h2 class="chapter" id="c">5 ç</h2>