[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Conve
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/NodeNameNormalization.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/ParserNonXS.pm (parse_texi_file), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/parser.c (parse_texi_file): rename preamble type as preamble_before_beginning and preamble_text as text_before_beginning. |
|
Date: |
Thu, 30 Dec 2021 14:45:03 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 76b2f91b8a * tp/Texinfo/Convert/DocBook.pm,
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
tp/Texinfo/Convert/NodeNameNormalization.pm, tp/Texinfo/Convert/Plaintext.pm,
tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Convert/Text.pm,
tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/ParserNonXS.pm (parse_texi_file),
tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/parser.c
(parse_texi_file): rename preamble type as preamble_before_beginning and
preamble_text [...]
76b2f91b8a is described below
commit 76b2f91b8a25b68bd1a6022b25696296fafd76ad
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Dec 30 20:44:50 2021 +0100
* tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm,
tp/Texinfo/Convert/LaTeX.pm,
tp/Texinfo/Convert/NodeNameNormalization.pm,
tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm,
tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm,
tp/Texinfo/ParserNonXS.pm (parse_texi_file),
tp/Texinfo/XS/parsetexi/element_types.txt,
tp/Texinfo/XS/parsetexi/parser.c (parse_texi_file):
rename preamble type as preamble_before_beginning and
preamble_text as text_before_beginning.
* tp/Texinfo/ParserNonXS.pm (parse_texi_text, _parse_texi):
defined $root in parse_texi_text() instead of _parse_texi().
* tp/Texinfo/XS/parsetexi/Parsetexi.pm (parse_texi_file): simplify
code with the new tree geometry.
---
ChangeLog | 19 ++++++++++++
tp/Texinfo/Convert/DocBook.pm | 2 +-
tp/Texinfo/Convert/HTML.pm | 2 +-
tp/Texinfo/Convert/LaTeX.pm | 2 +-
tp/Texinfo/Convert/NodeNameNormalization.pm | 2 +-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/TexinfoXML.pm | 2 +-
tp/Texinfo/Convert/Text.pm | 2 +-
tp/Texinfo/Convert/TextContent.pm | 2 +-
tp/Texinfo/ParserNonXS.pm | 36 ++++++++--------------
tp/Texinfo/XS/parsetexi/Parsetexi.pm | 10 ++----
tp/Texinfo/XS/parsetexi/element_types.c | 4 +--
tp/Texinfo/XS/parsetexi/element_types.h | 4 +--
tp/Texinfo/XS/parsetexi/element_types.txt | 4 +--
tp/Texinfo/XS/parsetexi/parser.c | 22 ++++++-------
.../converters_tests/simplest_no_node_section.pl | 6 ++--
.../res_xml/simplest_no_node_section.xml | 4 +--
.../converters_tests/things_before_setfilename.pl | 10 +++---
.../things_before_setfilename_no_element.pl | 10 +++---
tp/t/results/coverage/delcomment.pl | 4 +--
.../char_latin1_latin1_in_refs.pl | 6 ++--
.../res_xml/char_latin1_latin1_in_refs.xml | 4 +--
.../formats_encodings/char_latin1_utf8_in_refs.pl | 6 ++--
.../char_latin2_latin2_in_refs.pl | 4 +--
.../formats_encodings/japanese_shift_jis.pl | 4 +--
tp/t/results/formats_encodings/sample_utf8.pl | 4 +--
tp/t/results/formatting/cond.pl | 4 +--
.../results/formatting/cond_ifhtml_ifinfo_iftex.pl | 4 +--
tp/t/results/formatting/cond_info.pl | 4 +--
.../formatting/cond_info_ifhtml_ifinfo_iftex.pl | 4 +--
.../cond_info_no-ifhtml_no-ifinfo_no-iftex.pl | 4 +--
.../cond_no-ifhtml_no-ifinfo_no-iftex.pl | 4 +--
tp/t/results/formatting/cond_xml.pl | 8 ++---
tp/t/results/formatting/defcondx_Dbar.pl | 4 +--
tp/t/results/formatting/defcondx_Ubar.pl | 4 +--
.../formatting/direntry_dircategory_info_split.pl | 6 ++--
.../formatting/documentlanguage_set_option.pl | 4 +--
.../formatting/documentlanguage_set_option_info.pl | 4 +--
.../formatting/documentlanguage_set_unknown.pl | 4 +--
tp/t/results/formatting/float_copying.pl | 6 ++--
tp/t/results/formatting/one_line_no_content.pl | 4 +--
.../formatting/simplest_test_date_in_header.pl | 6 ++--
tp/t/results/formatting/simplest_test_prefix.pl | 6 ++--
.../formatting/simplest_test_prefix_info.pl | 6 ++--
.../formatting/split_for_format_not_split.pl | 6 ++--
.../res_xml/simplest.xml | 4 +--
tp/t/results/formatting/split_nocopying.pl | 4 +--
tp/t/results/formatting/split_nocopying_split.pl | 4 +--
tp/t/results/formatting/texi_bib_example.pl | 4 +--
tp/t/results/formatting/texi_cond.pl | 4 +--
tp/t/results/formatting/texi_glossary.pl | 6 ++--
.../empty_lines_at_beginning_no_setfilename.pl | 8 ++---
...lines_at_beginning_no_setfilename_no_element.pl | 8 ++---
tp/t/results/htmlxref/htmlxref.pl | 6 ++--
tp/t/results/htmlxref/htmlxref_nodes.pl | 6 ++--
tp/t/results/htmlxref/htmlxref_only_mono.pl | 6 ++--
tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl | 6 ++--
tp/t/results/htmlxref/htmlxref_only_split.pl | 6 ++--
tp/t/results/htmlxref/htmlxref_only_split_nodes.pl | 6 ++--
tp/t/results/include/cpp_lines.pl | 4 +--
tp/t/results/indices/encoding_index_latin1.pl | 4 +--
.../encoding_index_latin1_enable_encoding.pl | 4 +--
tp/t/results/indices/encoding_index_utf8.pl | 4 +--
.../indices/encoding_index_utf8_enable_encoding.pl | 4 +--
tp/t/results/layout/navigation.pl | 6 ++--
tp/t/results/layout/navigation_chapter.pl | 6 ++--
.../results/layout/navigation_chapter_no_header.pl | 6 ++--
.../navigation_chapter_no_header_vertical.pl | 6 ++--
tp/t/results/layout/navigation_chapter_vertical.pl | 6 ++--
tp/t/results/layout/navigation_no_header.pl | 6 ++--
.../layout/navigation_no_header_vertical.pl | 6 ++--
tp/t/results/layout/navigation_node.pl | 6 ++--
tp/t/results/layout/navigation_node_no_header.pl | 6 ++--
.../layout/navigation_node_no_header_vertical.pl | 6 ++--
tp/t/results/layout/navigation_node_vertical.pl | 6 ++--
tp/t/results/layout/navigation_section.pl | 6 ++--
.../results/layout/navigation_section_no_header.pl | 6 ++--
.../navigation_section_no_header_vertical.pl | 6 ++--
tp/t/results/layout/navigation_section_vertical.pl | 6 ++--
tp/t/results/layout/navigation_vertical.pl | 6 ++--
tp/t/results/layout/no_monolithic.pl | 6 ++--
tp/t/results/morecoverage/formatting_fr.pl | 4 +--
tp/t/results/morecoverage/texi_formatting.pl | 4 +--
tp/t/results/moreindices/double_index_entry.pl | 4 +--
tp/t/results/moreindices/index_no_node.pl | 6 ++--
tp/t/results/moreindices/index_split.pl | 6 ++--
tp/t/results/moreindices/index_split_nodes.pl | 6 ++--
tp/t/results/moreindices/nodes_before_top.pl | 6 ++--
.../nodes_before_top_and_sections_monolithic.pl | 6 ++--
.../moreindices/nodes_before_top_no_nodes.pl | 6 ++--
tp/t/results/moreindices/nodes_before_top_nodes.pl | 6 ++--
tp/t/results/moreindices/split_chapter_index.pl | 6 ++--
tp/t/results/moresectioning/equivalent_nodes.pl | 6 ++--
.../moresectioning/equivalent_nodes_no_node.pl | 6 ++--
.../moresectioning/more_sections_than_nodes.pl | 6 ++--
tp/t/results/moresectioning/node_footnote_end.pl | 6 ++--
.../moresectioning/node_footnote_separated.pl | 6 ++--
.../moresectioning/node_footnote_use_node.pl | 6 ++--
.../nodes_after_top_before_chapter.pl | 6 ++--
...s_after_top_before_chapter_use_nodes_chapter.pl | 6 ++--
.../nodes_after_top_before_section.pl | 6 ++--
.../nodes_after_top_before_section_use_nodes.pl | 6 ++--
...s_after_top_before_section_use_nodes_chapter.pl | 6 ++--
.../moresectioning/placed_things_before_element.pl | 4 +--
tp/t/results/moresectioning/sectioning_frames.pl | 6 ++--
.../results/moresectioning/top_node_up_explicit.pl | 4 +--
.../results/moresectioning/top_node_up_implicit.pl | 4 +--
.../moresectioning/two_footnotes_in_nodes.pl | 6 ++--
.../two_footnotes_in_nodes_separated.pl | 6 ++--
.../plaintext_tests/chinese_mixed_with_en.pl | 4 +--
tp/t/results/plaintext_tests/japanese_utf8.pl | 4 +--
.../sectioning/contents_at_document_begin.pl | 6 ++--
.../results/sectioning/contents_at_end_document.pl | 6 ++--
.../contents_at_end_document_after_node.pl | 6 ++--
tp/t/results/sectioning/contents_in_document.pl | 6 ++--
tp/t/results/sectioning/contents_no_section.pl | 6 ++--
.../res_parser/formatting_xml/formatting.xml | 4 +--
util/texinfo.dtd | 6 ++--
118 files changed, 338 insertions(+), 335 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5ceb78fc32..30bb20e6b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2021-12-30 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm,
+ tp/Texinfo/Convert/LaTeX.pm,
+ tp/Texinfo/Convert/NodeNameNormalization.pm,
+ tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm,
+ tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm,
+ tp/Texinfo/ParserNonXS.pm (parse_texi_file),
+ tp/Texinfo/XS/parsetexi/element_types.txt,
+ tp/Texinfo/XS/parsetexi/parser.c (parse_texi_file):
+ rename preamble type as preamble_before_beginning and
+ preamble_text as text_before_beginning.
+
+ * tp/Texinfo/ParserNonXS.pm (parse_texi_text, _parse_texi):
+ defined $root in parse_texi_text() instead of _parse_texi().
+
+ * tp/Texinfo/XS/parsetexi/Parsetexi.pm (parse_texi_file): simplify
+ code with the new tree geometry.
+
2021-12-30 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_close_commands, _setup_text_root)
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index a1565d073a..995b105fdb 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -212,7 +212,7 @@ foreach my $type (
'empty_spaces_before_paragraph',
'menu_entry_leading_text',
'menu_entry_separator',
- 'preamble',
+ 'preamble_before_beginning',
'preamble_before_setfilename',
'spaces_at_end',
) {
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1919d1913e..fb89a8faad 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -4310,7 +4310,7 @@ sub default_types_conversion($$)
}
# Ignored commands
-foreach my $type ('empty_line_after_command', 'preamble',
+foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
'preamble_before_setfilename',
'empty_spaces_after_command', 'spaces_at_end',
'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 3b2ce260eb..dce087d022 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -555,7 +555,7 @@ foreach my $type ('empty_line_after_command',
# ignore 'command_as_argument_inserted' in order to use the default
# setting for @itemize if there is no argument
my %ignored_types;
-foreach my $type ('preamble',
+foreach my $type ('preamble_before_beginning',
'preamble_before_setfilename', 'command_as_argument_inserted') {
$ignored_types{$type} = 1;
}
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index 4ddd502840..39d139adbe 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -68,7 +68,7 @@ foreach my $ignored_brace_command ('anchor', 'footnote',
'shortcaption',
}
my %ignored_types;
-foreach my $type ('empty_line_after_command', 'preamble',
+foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
'empty_spaces_after_command', 'spaces_at_end',
'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
'space_at_end_menu_node',
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index e321a3aeef..b64518e3ff 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -258,7 +258,7 @@ foreach my $type ('empty_line_after_command',
}
my %ignored_types;
-foreach my $type ('preamble',
+foreach my $type ('preamble_before_beginning',
'preamble_before_setfilename') {
$ignored_types{$type} = 1;
}
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 3db9b2fa3e..55781d7caf 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -396,7 +396,7 @@ my %type_elements = (
'menu_comment' => 'menucomment',
'menu_entry_description' => 'menudescription',
'menu_entry_name' => 'menutitle',
- 'preamble' => 'preamble',
+ 'preamble_before_beginning' => 'preamblebeforebeginning',
'table_item' => 'tableitem',
'table_entry' => 'tableentry',
'table_term' => 'tableterm',
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 38145beb8f..97ee80f15d 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -152,7 +152,7 @@ foreach my $command ('verbatiminclude', 'sp', 'center',
'exdent',
}
my %ignored_types;
-foreach my $type ('empty_line_after_command', 'preamble',
+foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
'empty_spaces_after_command', 'spaces_at_end',
'empty_spaces_before_argument', 'empty_spaces_before_paragraph',
'empty_spaces_after_close_brace') {
diff --git a/tp/Texinfo/Convert/TextContent.pm
b/tp/Texinfo/Convert/TextContent.pm
index 0709e30f24..73e0f2bd16 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -45,7 +45,7 @@ foreach my $ignored_command (
}
my %ignored_types;
-foreach my $type ('empty_line_after_command', 'preamble',
+foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
'empty_spaces_after_command',
'empty_spaces_before_paragraph',
'empty_spaces_after_close_brace') {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 0ad2c983c2..0ec3e180cb 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -873,7 +873,10 @@ sub parse_texi_text($$;$$$$)
$self = parser() if (!defined($self));
$self->{'input'} = [{'pending' => $lines_array}];
- my $tree = $self->_parse_texi();
+
+ my ($root) = _setup_text_root();
+
+ my $tree = $self->_parse_texi($root);
$self->_set_global_informations();
@@ -943,12 +946,12 @@ sub parse_texi_file($$)
}
my ($document_root, $text_root) = _setup_text_root();
if (@first_lines) {
- push @{$text_root->{'contents'}}, { 'type' => 'preamble', 'contents' => [],
- 'parent' => $text_root };
+ push @{$text_root->{'contents'}}, {'type' => 'preamble_before_beginning',
+ 'contents' => [], 'parent' =>
$text_root };
foreach my $line (@first_lines) {
push @{$text_root->{'contents'}->[-1]->{'contents'}},
{ 'text' => $line,
- 'type' => 'preamble_text',
+ 'type' => 'text_before_beginning',
'parent' => $text_root->{'contents'}->[-1]
};
}
@@ -968,21 +971,10 @@ sub parse_texi_file($$)
my $tree = $self->_parse_texi($document_root);
- ## Find 'text_root', which contains everything before first node/section.
- ## if there are elements, 'text_root' is the first content, otherwise it
- ## is the root.
- #my $text_root;
- #if ($tree->{'type'} eq 'text_root') {
- # $text_root = $tree;
- #} elsif ($tree->{'contents'} and $tree->{'contents'}->[0]
- # and $tree->{'contents'}->[0]->{'type'} eq 'text_root') {
- # $text_root = $tree->{'contents'}->[0];
- #}
-
# Put everything before @setfilename in a special type. This allows to
# ignore everything before @setfilename.
- if ($self->{'IGNORE_BEFORE_SETFILENAME'} and $text_root and
- $self->{'extra'} and $self->{'extra'}->{'setfilename'}
+ if ($self->{'IGNORE_BEFORE_SETFILENAME'}
+ and $self->{'extra'}->{'setfilename'}
and $self->{'extra'}->{'setfilename'}->{'parent'} eq $text_root) {
my $before_setfilename = {'type' => 'preamble_before_setfilename',
'parent' => $text_root,
@@ -3681,12 +3673,10 @@ sub _setup_text_root()
}
# the main subroutine
-sub _parse_texi($;$)
+sub _parse_texi($$)
{
my ($self, $root) = @_;
- ($root) = _setup_text_root() if (!defined($root));
-
my $current;
if ($root->{'type'} and $root->{'type'} eq 'document_root') {
$current = $root->{'contents'}->[0];
@@ -3921,7 +3911,7 @@ sub _parse_texi($;$)
my $at_command_length;
my ($at_command, $open_brace, $asterisk, $single_letter_command,
- $separator_match, $misc_text) = _parse_texi_regex ($line);
+ $separator_match, $misc_text) = _parse_texi_regex($line);
if ($at_command) {
$at_command_length = length($at_command) + 1;
@@ -6654,7 +6644,7 @@ C<@verb>, C<@html>, C<@macro> body).
The last end of line in a raw block (except for C<@verbatim>).
-=item preamble_text
+=item text_before_beginning
Text appearing before real content, including the C<\input texinfo.tex>.
@@ -6687,7 +6677,7 @@ and C<text_root> becomes the first element in the
contents of C<document_root>.
C<root_line> is the type of the root tree when parsing Texinfo line
fragments using C<parse_texi_line>.
-=item preamble
+=item preamble_before_beginning
This container holds the text appearing before the first content, including
the C<\input texinfo.tex> line and following blank lines.
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index 7370aecb55..f48d54ad84 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -212,7 +212,7 @@ use File::Basename; # for fileparse
sub _maybe_ignore_before_setfilename {
my ($self, $text_root) = @_;
- if ($self->{'IGNORE_BEFORE_SETFILENAME'} and $text_root
+ if ($self->{'IGNORE_BEFORE_SETFILENAME'}
and $self->{'extra'}->{'setfilename'}
and $self->{'extra'}->{'setfilename'}->{'parent'} eq $text_root) {
my $before_setfilename = {'type' => 'preamble_before_setfilename',
@@ -256,13 +256,7 @@ sub parse_texi_file ($$)
_associate_node_menus ($self, $TREE);
- my $text_root;
- if ($TREE->{'type'} eq 'text_root') {
- $text_root = $TREE;
- } elsif ($TREE->{'contents'} and $TREE->{'contents'}->[0]
- and $TREE->{'contents'}->[0]->{'type'} eq 'text_root') {
- $text_root = $TREE->{'contents'}->[0];
- }
+ my $text_root = $TREE->{'contents'}->[0];
_maybe_ignore_before_setfilename($self, $text_root);
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c
b/tp/Texinfo/XS/parsetexi/element_types.c
index d76fcb481a..6f5ed2333e 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -17,7 +17,7 @@ char *element_type_names[] = {
"empty_spaces_before_argument",
"empty_spaces_after_close_brace",
"empty_spaces_before_paragraph",
-"preamble_text",
+"text_before_beginning",
"space_at_end_menu_node",
"after_description_line",
"spaces",
@@ -25,7 +25,7 @@ char *element_type_names[] = {
"text_root",
"document_root",
"root_line",
-"preamble",
+"preamble_before_beginning",
"preamble_before_setfilename",
"paragraph",
"preformatted",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h
b/tp/Texinfo/XS/parsetexi/element_types.h
index 9a6fb59c9b..5c0830aed9 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -20,7 +20,7 @@ ET_space_at_end_block_command,
ET_empty_spaces_before_argument,
ET_empty_spaces_after_close_brace,
ET_empty_spaces_before_paragraph,
-ET_preamble_text,
+ET_text_before_beginning,
ET_space_at_end_menu_node,
ET_after_description_line,
ET_spaces,
@@ -28,7 +28,7 @@ ET_spaces_inserted,
ET_text_root,
ET_document_root,
ET_root_line,
-ET_preamble,
+ET_preamble_before_beginning,
ET_preamble_before_setfilename,
ET_paragraph,
ET_preformatted,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt
b/tp/Texinfo/XS/parsetexi/element_types.txt
index 68764f6af1..30555c91ae 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -35,7 +35,7 @@ space_at_end_block_command
empty_spaces_before_argument
empty_spaces_after_close_brace
empty_spaces_before_paragraph
-preamble_text
+text_before_beginning
space_at_end_menu_node
after_description_line
spaces
@@ -45,7 +45,7 @@ spaces_inserted
text_root
document_root
root_line
-preamble
+preamble_before_beginning
preamble_before_setfilename
paragraph
preformatted
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 5914029aa9..8bf2f9963e 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -352,7 +352,7 @@ parse_texi_file (char *filename)
char *p, *q;
char *linep, *line = 0;
ELEMENT *text_root = setup_text_root ();
- ELEMENT *preamble = 0;
+ ELEMENT *preamble_before_beginning = 0;
ELEMENT *document_root = text_root->parent;
char c;
@@ -380,8 +380,8 @@ parse_texi_file (char *filename)
*p = c;
}
- /* Put all lines up to a line starting "\input" inside a "preamble"
- element. */
+ /* Put all the empty lines up to a line starting "\input" inside a
+ "preamble_before_beginning" element. */
while (1)
{
ELEMENT *l;
@@ -395,22 +395,22 @@ parse_texi_file (char *filename)
linep += strspn (linep, whitespace_chars);
if (*linep && !looking_at (linep, "\\input"))
{
- /* This line is not part of the preamble. Shove back
- into input stream. */
+ /* This line is not part of the preamble_before_beginning.
+ Shove back into input stream. */
input_push (line, 0, line_nr.file_name, line_nr.line_nr);
break;
}
- if (!preamble)
- preamble = new_element (ET_preamble);
+ if (!preamble_before_beginning)
+ preamble_before_beginning = new_element (ET_preamble_before_beginning);
- l = new_element (ET_preamble_text);
+ l = new_element (ET_text_before_beginning);
text_append (&l->text, line);
- add_to_element_contents (preamble, l);
+ add_to_element_contents (preamble_before_beginning, l);
}
- if (preamble)
- add_to_element_contents (text_root, preamble);
+ if (preamble_before_beginning)
+ add_to_element_contents (text_root, preamble_before_beginning);
return parse_texi (document_root);
}
diff --git a/tp/t/results/converters_tests/simplest_no_node_section.pl
b/tp/t/results/converters_tests/simplest_no_node_section.pl
index b3a5befb2b..5fc290bd15 100644
--- a/tp/t/results/converters_tests/simplest_no_node_section.pl
+++ b/tp/t/results/converters_tests/simplest_no_node_section.pl
@@ -17,17 +17,17 @@ $result_trees{'simplest_no_node_section'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git
a/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
b/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
index 5b4a5daf7f..0ae3fdb86e 100644
---
a/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
+++
b/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
@@ -2,9 +2,9 @@
<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
<texinfo>
<filename file="simplest_no_node_section.xml"></filename>
-<preamble>\input texinfo @c -*-texinfo-*-
+<preamblebeforebeginning>\input texinfo @c -*-texinfo-*-
-</preamble><setfilename file="simplest_no_node_section.info" spaces="
">simplest_no_node_section.info</setfilename>
+</preamblebeforebeginning><setfilename file="simplest_no_node_section.info"
spaces=" ">simplest_no_node_section.info</setfilename>
<para>This is a very simple texi manual <spacecmd type="spc"/> <>.
</para>
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl
b/tp/t/results/converters_tests/things_before_setfilename.pl
index dc65e0c3dd..c0b8e21d6d 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -17,17 +17,17 @@ $result_trees{'things_before_setfilename'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
@@ -1562,9 +1562,9 @@ ul.no-bullet {list-style: none}
';
-$result_converted{'xml'}->{'things_before_setfilename'} = '<preamble>\\input
texinfo
+$result_converted{'xml'}->{'things_before_setfilename'} =
'<preamblebeforebeginning>\\input texinfo
-</preamble><anchor name="An-anchor">An anchor</anchor>
+</preamblebeforebeginning><anchor name="An-anchor">An anchor</anchor>
<para>Ref to the anchor:
<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
diff --git
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index ef42ab47eb..eda2b6bc09 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -17,17 +17,17 @@ $result_trees{'things_before_setfilename_no_element'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
@@ -1425,9 +1425,9 @@
$result_converted_errors{'html'}->{'things_before_setfilename_no_element'} = [
-$result_converted{'xml'}->{'things_before_setfilename_no_element'} =
'<preamble>\\input texinfo
+$result_converted{'xml'}->{'things_before_setfilename_no_element'} =
'<preamblebeforebeginning>\\input texinfo
-</preamble><anchor name="An-anchor">An anchor</anchor>
+</preamblebeforebeginning><anchor name="An-anchor">An anchor</anchor>
<para>Ref to the anchor:
<ref label="An-anchor"><xrefnodename>An anchor</xrefnodename></ref>
diff --git a/tp/t/results/coverage/delcomment.pl
b/tp/t/results/coverage/delcomment.pl
index 414bac1138..10fc237787 100644
--- a/tp/t/results/coverage/delcomment.pl
+++ b/tp/t/results/coverage/delcomment.pl
@@ -17,11 +17,11 @@ $result_trees{'delcomment'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 5725e8fb29..e48e5e41a9 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
@@ -17,17 +17,17 @@ $result_trees{'char_latin1_latin1_in_refs'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 b93659737c..bd8545dfed 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
@@ -2,9 +2,9 @@
<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
<texinfo>
<filename file="char_latin1_latin1_in_refs.xml"></filename>
-<preamble>\input texinfo
+<preamblebeforebeginning>\input texinfo
-</preamble><setfilename file="char_latin1_latin1_in_refs.info" spaces="
">char_latin1_latin1_in_refs.info</setfilename>
+</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>
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 3b3a3cc9e3..039969e5dd 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
@@ -17,17 +17,17 @@ $result_trees{'char_latin1_utf8_in_refs'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 6a52e608bf..65bcb4d3c9 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
@@ -17,11 +17,11 @@ $result_trees{'char_latin2_latin2_in_refs'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formats_encodings/japanese_shift_jis.pl
b/tp/t/results/formats_encodings/japanese_shift_jis.pl
index a8fac4359a..48ad76a8f6 100644
--- a/tp/t/results/formats_encodings/japanese_shift_jis.pl
+++ b/tp/t/results/formats_encodings/japanese_shift_jis.pl
@@ -17,11 +17,11 @@ $result_trees{'japanese_shift_jis'} = {
'parent' => {},
'text' => '\\input texinfo @c -*- coding: utf-8; mode:
texinfo; -*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl
b/tp/t/results/formats_encodings/sample_utf8.pl
index 9dc2c01ea4..f8fb02331b 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -17,11 +17,11 @@ $result_trees{'sample_utf8'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/formatting/cond.pl b/tp/t/results/formatting/cond.pl
index 45051fc6df..e937328793 100644
--- a/tp/t/results/formatting/cond.pl
+++ b/tp/t/results/formatting/cond.pl
@@ -17,11 +17,11 @@ $result_trees{'cond'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
index 1bc787b8c1..9658f65160 100644
--- a/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_ifhtml_ifinfo_iftex.pl
@@ -17,11 +17,11 @@ $result_trees{'cond_ifhtml_ifinfo_iftex'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/cond_info.pl
b/tp/t/results/formatting/cond_info.pl
index bae717f443..457d227e42 100644
--- a/tp/t/results/formatting/cond_info.pl
+++ b/tp/t/results/formatting/cond_info.pl
@@ -17,11 +17,11 @@ $result_trees{'cond_info'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 5b4bcfb5a4..f7efee3845 100644
--- a/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
+++ b/tp/t/results/formatting/cond_info_ifhtml_ifinfo_iftex.pl
@@ -17,11 +17,11 @@ $result_trees{'cond_info_ifhtml_ifinfo_iftex'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 bfd9c8041e..730f0ec129 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
@@ -17,11 +17,11 @@ $result_trees{'cond_info_no-ifhtml_no-ifinfo_no-iftex'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 35519b0e99..c0fd8300f0 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
@@ -17,11 +17,11 @@ $result_trees{'cond_no-ifhtml_no-ifinfo_no-iftex'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/cond_xml.pl
b/tp/t/results/formatting/cond_xml.pl
index 4f94ac5cc9..2250064bad 100644
--- a/tp/t/results/formatting/cond_xml.pl
+++ b/tp/t/results/formatting/cond_xml.pl
@@ -17,11 +17,11 @@ $result_trees{'cond_xml'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
@@ -437,8 +437,8 @@ $result_floats{'cond_xml'} = {};
-$result_converted{'xml'}->{'cond_xml'} = '<preamble>\\input texinfo
-</preamble><setfilename file="cond.info" spaces=" ">cond.info</setfilename>
+$result_converted{'xml'}->{'cond_xml'} = '<preamblebeforebeginning>\\input
texinfo
+</preamblebeforebeginning><setfilename file="cond.info" spaces="
">cond.info</setfilename>
<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 0484ae6942..5719f59cb2 100644
--- a/tp/t/results/formatting/defcondx_Dbar.pl
+++ b/tp/t/results/formatting/defcondx_Dbar.pl
@@ -17,11 +17,11 @@ $result_trees{'defcondx_Dbar'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/defcondx_Ubar.pl
b/tp/t/results/formatting/defcondx_Ubar.pl
index 56672274d5..3af3d2e3e5 100644
--- a/tp/t/results/formatting/defcondx_Ubar.pl
+++ b/tp/t/results/formatting/defcondx_Ubar.pl
@@ -17,11 +17,11 @@ $result_trees{'defcondx_Ubar'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index ff6d486a17..d3a78aa553 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -17,17 +17,17 @@ $result_trees{'direntry_dircategory_info_split'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/documentlanguage_set_option.pl
b/tp/t/results/formatting/documentlanguage_set_option.pl
index f917dccd5f..6b675eeaf6 100644
--- a/tp/t/results/formatting/documentlanguage_set_option.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option.pl
@@ -17,11 +17,11 @@ $result_trees{'documentlanguage_set_option'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/formatting/documentlanguage_set_option_info.pl
b/tp/t/results/formatting/documentlanguage_set_option_info.pl
index fa75d5560e..01235cd992 100644
--- a/tp/t/results/formatting/documentlanguage_set_option_info.pl
+++ b/tp/t/results/formatting/documentlanguage_set_option_info.pl
@@ -17,11 +17,11 @@ $result_trees{'documentlanguage_set_option_info'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/formatting/documentlanguage_set_unknown.pl
b/tp/t/results/formatting/documentlanguage_set_unknown.pl
index 9b43024806..c4186d2388 100644
--- a/tp/t/results/formatting/documentlanguage_set_unknown.pl
+++ b/tp/t/results/formatting/documentlanguage_set_unknown.pl
@@ -17,11 +17,11 @@ $result_trees{'documentlanguage_set_unknown'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/formatting/float_copying.pl
b/tp/t/results/formatting/float_copying.pl
index 1f43ee28e4..820c523a34 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -17,17 +17,17 @@ $result_trees{'float_copying'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/one_line_no_content.pl
b/tp/t/results/formatting/one_line_no_content.pl
index 2380a0de22..afec15edf6 100644
--- a/tp/t/results/formatting/one_line_no_content.pl
+++ b/tp/t/results/formatting/one_line_no_content.pl
@@ -15,11 +15,11 @@ $result_trees{'one_line_no_content'} = {
'parent' => {},
'text' => '\\input texinfo.tex
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/simplest_test_date_in_header.pl
b/tp/t/results/formatting/simplest_test_date_in_header.pl
index d6c8d74d68..1cbcc863da 100644
--- a/tp/t/results/formatting/simplest_test_date_in_header.pl
+++ b/tp/t/results/formatting/simplest_test_date_in_header.pl
@@ -17,17 +17,17 @@ $result_trees{'simplest_test_date_in_header'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/simplest_test_prefix.pl
b/tp/t/results/formatting/simplest_test_prefix.pl
index 8430794d58..97e3c4dc29 100644
--- a/tp/t/results/formatting/simplest_test_prefix.pl
+++ b/tp/t/results/formatting/simplest_test_prefix.pl
@@ -17,17 +17,17 @@ $result_trees{'simplest_test_prefix'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/simplest_test_prefix_info.pl
b/tp/t/results/formatting/simplest_test_prefix_info.pl
index 1725cfd6d5..c6e79e2af0 100644
--- a/tp/t/results/formatting/simplest_test_prefix_info.pl
+++ b/tp/t/results/formatting/simplest_test_prefix_info.pl
@@ -17,17 +17,17 @@ $result_trees{'simplest_test_prefix_info'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/split_for_format_not_split.pl
b/tp/t/results/formatting/split_for_format_not_split.pl
index 3afcc7156d..be19493e8d 100644
--- a/tp/t/results/formatting/split_for_format_not_split.pl
+++ b/tp/t/results/formatting/split_for_format_not_split.pl
@@ -17,17 +17,17 @@ $result_trees{'split_for_format_not_split'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git
a/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
b/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
index 646d8b8e9c..c206a5a3ed 100644
--- a/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
+++ b/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
@@ -2,9 +2,9 @@
<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
<texinfo>
<filename file="simplest.xml"></filename>
-<preamble>\input texinfo @c -*-texinfo-*-
+<preamblebeforebeginning>\input texinfo @c -*-texinfo-*-
-</preamble><setfilename file="simplest.info" spaces="
">simplest.info</setfilename>
+</preamblebeforebeginning><setfilename file="simplest.info" spaces="
">simplest.info</setfilename>
<node name="Top" spaces=" "><nodename>Top</nodename></node>
diff --git a/tp/t/results/formatting/split_nocopying.pl
b/tp/t/results/formatting/split_nocopying.pl
index b1dd085904..3297c67738 100644
--- a/tp/t/results/formatting/split_nocopying.pl
+++ b/tp/t/results/formatting/split_nocopying.pl
@@ -17,11 +17,11 @@ $result_trees{'split_nocopying'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/split_nocopying_split.pl
b/tp/t/results/formatting/split_nocopying_split.pl
index d764ae6dd5..49e8a1e424 100644
--- a/tp/t/results/formatting/split_nocopying_split.pl
+++ b/tp/t/results/formatting/split_nocopying_split.pl
@@ -17,11 +17,11 @@ $result_trees{'split_nocopying_split'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/texi_bib_example.pl
b/tp/t/results/formatting/texi_bib_example.pl
index ed015425a8..f43f3bfc3d 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -17,11 +17,11 @@ $result_trees{'texi_bib_example'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/formatting/texi_cond.pl
b/tp/t/results/formatting/texi_cond.pl
index 10377ddce5..7244ac3cf2 100644
--- a/tp/t/results/formatting/texi_cond.pl
+++ b/tp/t/results/formatting/texi_cond.pl
@@ -17,11 +17,11 @@ $result_trees{'texi_cond'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/formatting/texi_glossary.pl
b/tp/t/results/formatting/texi_glossary.pl
index dc8cc8aca2..f03690d422 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -17,17 +17,17 @@ $result_trees{'texi_glossary'} = {
'parent' => {},
'text' => '\\input texinfo.tex
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
index 1d65ec2bd9..bab038e3a3 100644
--- a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
+++ b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename.pl
@@ -15,23 +15,23 @@ $result_trees{'empty_lines_at_beginning_no_setfilename'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
index 5dc24414ed..690aab87fe 100644
---
a/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
+++
b/tp/t/results/html_tests/empty_lines_at_beginning_no_setfilename_no_element.pl
@@ -15,23 +15,23 @@
$result_trees{'empty_lines_at_beginning_no_setfilename_no_element'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/htmlxref/htmlxref.pl
b/tp/t/results/htmlxref/htmlxref.pl
index 92d19870a3..b9cc37d7cf 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -17,17 +17,17 @@ $result_trees{'htmlxref'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index 7e595a642c..0e0fd74f68 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'htmlxref_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index e04e7d3668..fe7ab5d869 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -17,17 +17,17 @@ $result_trees{'htmlxref_only_mono'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 3b585f02c1..5fc22bb05e 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 3c7a8a8a44..e3009a7764 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -17,17 +17,17 @@ $result_trees{'htmlxref_only_split'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index 00e8722d58..521a6640a6 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'htmlxref_only_split_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index b992d3a6ba..ac4e9d0fc0 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -17,11 +17,11 @@ $result_trees{'cpp_lines'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/indices/encoding_index_latin1.pl
b/tp/t/results/indices/encoding_index_latin1.pl
index 8123324595..88d1d9629e 100644
--- a/tp/t/results/indices/encoding_index_latin1.pl
+++ b/tp/t/results/indices/encoding_index_latin1.pl
@@ -17,11 +17,11 @@ $result_trees{'encoding_index_latin1'} = {
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 962d399989..de84ba5c94 100644
--- a/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
@@ -17,11 +17,11 @@ $result_trees{'encoding_index_latin1_enable_encoding'} = {
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/indices/encoding_index_utf8.pl
b/tp/t/results/indices/encoding_index_utf8.pl
index 0a6c648004..9b6ae947d7 100644
--- a/tp/t/results/indices/encoding_index_utf8.pl
+++ b/tp/t/results/indices/encoding_index_utf8.pl
@@ -17,11 +17,11 @@ $result_trees{'encoding_index_utf8'} = {
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 7247a89ddd..c5b82c90bb 100644
--- a/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
+++ b/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
@@ -17,11 +17,11 @@ $result_trees{'encoding_index_utf8_enable_encoding'} = {
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation.pl
b/tp/t/results/layout/navigation.pl
index 4b1a74a94c..e15531bcd0 100644
--- a/tp/t/results/layout/navigation.pl
+++ b/tp/t/results/layout/navigation.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_chapter.pl
b/tp/t/results/layout/navigation_chapter.pl
index 08d0deb360..5762e5384f 100644
--- a/tp/t/results/layout/navigation_chapter.pl
+++ b/tp/t/results/layout/navigation_chapter.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_chapter'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_chapter_no_header.pl
b/tp/t/results/layout/navigation_chapter_no_header.pl
index b7f1127d7b..ffc3d950ac 100644
--- a/tp/t/results/layout/navigation_chapter_no_header.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_chapter_no_header'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 628afd66e7..ef95de58f2 100644
--- a/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_no_header_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_chapter_no_header_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_chapter_vertical.pl
b/tp/t/results/layout/navigation_chapter_vertical.pl
index 8c1fffaf97..cc535314c3 100644
--- a/tp/t/results/layout/navigation_chapter_vertical.pl
+++ b/tp/t/results/layout/navigation_chapter_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_chapter_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_no_header.pl
b/tp/t/results/layout/navigation_no_header.pl
index 513413ca91..7a62c648d6 100644
--- a/tp/t/results/layout/navigation_no_header.pl
+++ b/tp/t/results/layout/navigation_no_header.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_no_header'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_no_header_vertical.pl
b/tp/t/results/layout/navigation_no_header_vertical.pl
index 15b5e3b613..d6ed5efca3 100644
--- a/tp/t/results/layout/navigation_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_no_header_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_no_header_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_node.pl
b/tp/t/results/layout/navigation_node.pl
index cb7cfd0d16..d227c50766 100644
--- a/tp/t/results/layout/navigation_node.pl
+++ b/tp/t/results/layout/navigation_node.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_node'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_node_no_header.pl
b/tp/t/results/layout/navigation_node_no_header.pl
index 63cdbee725..4e5fee9658 100644
--- a/tp/t/results/layout/navigation_node_no_header.pl
+++ b/tp/t/results/layout/navigation_node_no_header.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_node_no_header'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 05b59c5646..76dc73fb5b 100644
--- a/tp/t/results/layout/navigation_node_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_node_no_header_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_node_no_header_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_node_vertical.pl
b/tp/t/results/layout/navigation_node_vertical.pl
index f6e07b8a82..b49b5c19c3 100644
--- a/tp/t/results/layout/navigation_node_vertical.pl
+++ b/tp/t/results/layout/navigation_node_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_node_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_section.pl
b/tp/t/results/layout/navigation_section.pl
index 8eea409f43..283dd03815 100644
--- a/tp/t/results/layout/navigation_section.pl
+++ b/tp/t/results/layout/navigation_section.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_section'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_section_no_header.pl
b/tp/t/results/layout/navigation_section_no_header.pl
index 0e0e0bfd74..76ef28b4f4 100644
--- a/tp/t/results/layout/navigation_section_no_header.pl
+++ b/tp/t/results/layout/navigation_section_no_header.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_section_no_header'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 e954b77b1d..b3ccddc520 100644
--- a/tp/t/results/layout/navigation_section_no_header_vertical.pl
+++ b/tp/t/results/layout/navigation_section_no_header_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_section_no_header_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_section_vertical.pl
b/tp/t/results/layout/navigation_section_vertical.pl
index cd8978e204..f03c905fad 100644
--- a/tp/t/results/layout/navigation_section_vertical.pl
+++ b/tp/t/results/layout/navigation_section_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_section_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/navigation_vertical.pl
b/tp/t/results/layout/navigation_vertical.pl
index c6d9594592..33c5708f95 100644
--- a/tp/t/results/layout/navigation_vertical.pl
+++ b/tp/t/results/layout/navigation_vertical.pl
@@ -17,17 +17,17 @@ $result_trees{'navigation_vertical'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/layout/no_monolithic.pl
b/tp/t/results/layout/no_monolithic.pl
index a2d98eed7e..a816ebfd96 100644
--- a/tp/t/results/layout/no_monolithic.pl
+++ b/tp/t/results/layout/no_monolithic.pl
@@ -17,17 +17,17 @@ $result_trees{'no_monolithic'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/morecoverage/formatting_fr.pl
b/tp/t/results/morecoverage/formatting_fr.pl
index b1fcef212a..7af8ff4b1d 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -17,11 +17,11 @@ $result_trees{'formatting_fr'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/morecoverage/texi_formatting.pl
b/tp/t/results/morecoverage/texi_formatting.pl
index ffaadfce29..eb09d05d9a 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -17,11 +17,11 @@ $result_trees{'texi_formatting'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moreindices/double_index_entry.pl
b/tp/t/results/moreindices/double_index_entry.pl
index 4350c091e6..4c3c197583 100644
--- a/tp/t/results/moreindices/double_index_entry.pl
+++ b/tp/t/results/moreindices/double_index_entry.pl
@@ -15,11 +15,11 @@ $result_trees{'double_index_entry'} = {
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moreindices/index_no_node.pl
b/tp/t/results/moreindices/index_no_node.pl
index 690c47797b..7286111dcb 100644
--- a/tp/t/results/moreindices/index_no_node.pl
+++ b/tp/t/results/moreindices/index_no_node.pl
@@ -17,17 +17,17 @@ $result_trees{'index_no_node'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moreindices/index_split.pl
b/tp/t/results/moreindices/index_split.pl
index 3dd86d3e2a..c3d7ae0642 100644
--- a/tp/t/results/moreindices/index_split.pl
+++ b/tp/t/results/moreindices/index_split.pl
@@ -17,17 +17,17 @@ $result_trees{'index_split'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moreindices/index_split_nodes.pl
b/tp/t/results/moreindices/index_split_nodes.pl
index 974931ba93..962e2d3977 100644
--- a/tp/t/results/moreindices/index_split_nodes.pl
+++ b/tp/t/results/moreindices/index_split_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'index_split_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moreindices/nodes_before_top.pl
b/tp/t/results/moreindices/nodes_before_top.pl
index 0f0238a07b..7033cb7523 100644
--- a/tp/t/results/moreindices/nodes_before_top.pl
+++ b/tp/t/results/moreindices/nodes_before_top.pl
@@ -17,17 +17,17 @@ $result_trees{'nodes_before_top'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 6151f31e33..a7a001fb2e 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
@@ -17,17 +17,17 @@ $result_trees{'nodes_before_top_and_sections_monolithic'} =
{
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 d01b6cc3b7..331bffa721 100644
--- a/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_no_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'nodes_before_top_no_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moreindices/nodes_before_top_nodes.pl
b/tp/t/results/moreindices/nodes_before_top_nodes.pl
index 8f99541511..5b85eefaf4 100644
--- a/tp/t/results/moreindices/nodes_before_top_nodes.pl
+++ b/tp/t/results/moreindices/nodes_before_top_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'nodes_before_top_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moreindices/split_chapter_index.pl
b/tp/t/results/moreindices/split_chapter_index.pl
index 6149bf492d..3cd7459170 100644
--- a/tp/t/results/moreindices/split_chapter_index.pl
+++ b/tp/t/results/moreindices/split_chapter_index.pl
@@ -17,17 +17,17 @@ $result_trees{'split_chapter_index'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/equivalent_nodes.pl
b/tp/t/results/moresectioning/equivalent_nodes.pl
index bdd8eaa400..2b49c9b6d6 100644
--- a/tp/t/results/moresectioning/equivalent_nodes.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'equivalent_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
index 4a8d785c47..4d267b385d 100644
--- a/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
+++ b/tp/t/results/moresectioning/equivalent_nodes_no_node.pl
@@ -17,17 +17,17 @@ $result_trees{'equivalent_nodes_no_node'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/more_sections_than_nodes.pl
b/tp/t/results/moresectioning/more_sections_than_nodes.pl
index e0ad065eec..1cc7a2391b 100644
--- a/tp/t/results/moresectioning/more_sections_than_nodes.pl
+++ b/tp/t/results/moresectioning/more_sections_than_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'more_sections_than_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_end.pl
b/tp/t/results/moresectioning/node_footnote_end.pl
index 34227a82da..f533a2d6e6 100644
--- a/tp/t/results/moresectioning/node_footnote_end.pl
+++ b/tp/t/results/moresectioning/node_footnote_end.pl
@@ -17,17 +17,17 @@ $result_trees{'node_footnote_end'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_separated.pl
b/tp/t/results/moresectioning/node_footnote_separated.pl
index 08483be4e4..b4bde9fab6 100644
--- a/tp/t/results/moresectioning/node_footnote_separated.pl
+++ b/tp/t/results/moresectioning/node_footnote_separated.pl
@@ -17,17 +17,17 @@ $result_trees{'node_footnote_separated'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/node_footnote_use_node.pl
b/tp/t/results/moresectioning/node_footnote_use_node.pl
index 3cbd55d72c..c1919445bd 100644
--- a/tp/t/results/moresectioning/node_footnote_use_node.pl
+++ b/tp/t/results/moresectioning/node_footnote_use_node.pl
@@ -17,17 +17,17 @@ $result_trees{'node_footnote_use_node'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 d1b38486a3..cb659decd7 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_chapter.pl
@@ -17,17 +17,17 @@ $result_trees{'nodes_after_top_before_chapter'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 5b4ff52664..b476957ca7 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
@@ -17,17 +17,17 @@
$result_trees{'nodes_after_top_before_chapter_use_nodes_chapter'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 ab48eab71f..9ba1d52d72 100644
--- a/tp/t/results/moresectioning/nodes_after_top_before_section.pl
+++ b/tp/t/results/moresectioning/nodes_after_top_before_section.pl
@@ -17,17 +17,17 @@ $result_trees{'nodes_after_top_before_section'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 12a939450c..072f57f24f 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
@@ -17,17 +17,17 @@ $result_trees{'nodes_after_top_before_section_use_nodes'} =
{
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 dbe4cb4afb..b424147f3f 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
@@ -17,17 +17,17 @@
$result_trees{'nodes_after_top_before_section_use_nodes_chapter'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 236776c897..8106785a04 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -17,11 +17,11 @@ $result_trees{'placed_things_before_element'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl
b/tp/t/results/moresectioning/sectioning_frames.pl
index 177cc9fa72..8dc6d65250 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -15,17 +15,17 @@ $result_trees{'sectioning_frames'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/top_node_up_explicit.pl
b/tp/t/results/moresectioning/top_node_up_explicit.pl
index 08ce444af9..57adce90c1 100644
--- a/tp/t/results/moresectioning/top_node_up_explicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_explicit.pl
@@ -17,11 +17,11 @@ $result_trees{'top_node_up_explicit'} = {
'parent' => {},
'text' => '\\input texinfo @c public domain
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/top_node_up_implicit.pl
b/tp/t/results/moresectioning/top_node_up_implicit.pl
index 8ac127b6e3..99ff235f20 100644
--- a/tp/t/results/moresectioning/top_node_up_implicit.pl
+++ b/tp/t/results/moresectioning/top_node_up_implicit.pl
@@ -17,11 +17,11 @@ $result_trees{'top_node_up_implicit'} = {
'parent' => {},
'text' => '\\input texinfo @c public domain
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
index 8d14e52289..02d38821fa 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes.pl
@@ -17,17 +17,17 @@ $result_trees{'two_footnotes_in_nodes'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 44f395ad03..b8915782cd 100644
--- a/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
+++ b/tp/t/results/moresectioning/two_footnotes_in_nodes_separated.pl
@@ -17,17 +17,17 @@ $result_trees{'two_footnotes_in_nodes_separated'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 de6d0652c4..92d4a77522 100644
--- a/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
+++ b/tp/t/results/plaintext_tests/chinese_mixed_with_en.pl
@@ -17,11 +17,11 @@ $result_trees{'chinese_mixed_with_en'} = {
'parent' => {},
'text' => '\\input texinfo
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/plaintext_tests/japanese_utf8.pl
b/tp/t/results/plaintext_tests/japanese_utf8.pl
index 0ded49bd2c..9fd523da26 100644
--- a/tp/t/results/plaintext_tests/japanese_utf8.pl
+++ b/tp/t/results/plaintext_tests/japanese_utf8.pl
@@ -17,11 +17,11 @@ $result_trees{'japanese_utf8'} = {
'parent' => {},
'text' => '\\input texinfo @c -*- coding: utf-8; mode:
texinfo; -*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
},
{
'args' => [
diff --git a/tp/t/results/sectioning/contents_at_document_begin.pl
b/tp/t/results/sectioning/contents_at_document_begin.pl
index 60dd51dc6c..4824eacb9b 100644
--- a/tp/t/results/sectioning/contents_at_document_begin.pl
+++ b/tp/t/results/sectioning/contents_at_document_begin.pl
@@ -17,17 +17,17 @@ $result_trees{'contents_at_document_begin'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/sectioning/contents_at_end_document.pl
b/tp/t/results/sectioning/contents_at_end_document.pl
index edcd113748..94767335da 100644
--- a/tp/t/results/sectioning/contents_at_end_document.pl
+++ b/tp/t/results/sectioning/contents_at_end_document.pl
@@ -17,17 +17,17 @@ $result_trees{'contents_at_end_document'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
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 6b9d32f171..e8faeeee0a 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
@@ -17,17 +17,17 @@ $result_trees{'contents_at_end_document_after_node'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/sectioning/contents_in_document.pl
b/tp/t/results/sectioning/contents_in_document.pl
index 43cc054390..fba1cfef70 100644
--- a/tp/t/results/sectioning/contents_in_document.pl
+++ b/tp/t/results/sectioning/contents_in_document.pl
@@ -17,17 +17,17 @@ $result_trees{'contents_in_document'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/t/results/sectioning/contents_no_section.pl
b/tp/t/results/sectioning/contents_no_section.pl
index 6a4ac408db..ec445dbbac 100644
--- a/tp/t/results/sectioning/contents_no_section.pl
+++ b/tp/t/results/sectioning/contents_no_section.pl
@@ -17,17 +17,17 @@ $result_trees{'contents_no_section'} = {
'parent' => {},
'text' => '\\input texinfo @c -*-texinfo-*-
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
},
{
'parent' => {},
'text' => '
',
- 'type' => 'preamble_text'
+ 'type' => 'text_before_beginning'
}
],
'parent' => {},
- 'type' => 'preamble'
+ 'type' => 'preamble_before_beginning'
}
],
'parent' => {},
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 31245ebbf1..d7bb9ec4e2 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -2,8 +2,8 @@
<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN"
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
<texinfo>
<filename file="formatting.xml"></filename>
-<preamble>\input texinfo @c -*-texinfo-*-
-</preamble><setfilename file="formatting.info" spaces="
">formatting.info</setfilename>
+<preamblebeforebeginning>\input texinfo @c -*-texinfo-*-
+</preamblebeforebeginning><setfilename file="formatting.info" spaces="
">formatting.info</setfilename>
<dircategory spaces=" ">Formatting <accent type="acute"
bracketed="off">e</accent> <code>&arobase; &tex;</code> test</dircategory>
<direntry endspaces=" ">
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 40dfbcec18..a112a56c90 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -205,7 +205,7 @@
<!-- ELEMENTS -->
<!-- TOP Level Element -->
-<!ELEMENT texinfo (filename?, preamble?, (%metainformation;
+<!ELEMENT texinfo (filename?, preamblebeforebeginning?, (%metainformation;
| %section.all; | %main.content;)*, bye?)>
<!ATTLIST texinfo xml:lang (%languagecodes;) 'en'>
@@ -255,8 +255,8 @@
%lineattr;
command NMTOKEN #REQUIRED>
-<!-- preamble -->
-<!ELEMENT preamble (#PCDATA)>
+<!-- preamble before texinfo code beginning (empty lines and \input) -->
+<!ELEMENT preamblebeforebeginning (#PCDATA)>
<!-- ToC -->
<!ELEMENT contents EMPTY>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/DocBook.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/NodeNameNormalization.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/TexinfoXML.pm, tp/Texinfo/Convert/Text.pm, tp/Texinfo/Convert/TextContent.pm, tp/Texinfo/ParserNonXS.pm (parse_texi_file), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/parser.c (parse_texi_file): rename preamble type as preamble_before_beginning and preamble_text as text_before_beginning.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_commands, _setup_text_root) (_parse_texi), tp/Texinfo/XS/parsetexi/api.c (parse_text), tp/Texinfo/XS/parsetexi/close.c (close_commands), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command), tp/Texinfo/XS/parsetexi/parser.c (setup_text_root, parse_texi_file) (parse_texi): create a document_root if there is a text_root in order to always have the same geometry for the root of the tree.
- Next by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_setup_document_root_and_text_root) (parse_texi_text, parse_texi_file, parse_texi_line, _parse_texi), tp/Texinfo/XS/parsetexi/api.c (parse_file, parse_text), tp/Texinfo/XS/parsetexi/parser.c (setup_document_root_and_text_root), (parse_texi_file, parse_texi): pass both root element and current element to parse_texi(). Rename setup_text_root() as setup_document_root_and_text_root().
- Previous by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_close_commands, _setup_text_root) (_parse_texi), tp/Texinfo/XS/parsetexi/api.c (parse_text), tp/Texinfo/XS/parsetexi/close.c (close_commands), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command), tp/Texinfo/XS/parsetexi/parser.c (setup_text_root, parse_texi_file) (parse_texi): create a document_root if there is a text_root in order to always have the same geometry for the root of the tree.
- Next by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_setup_document_root_and_text_root) (parse_texi_text, parse_texi_file, parse_texi_line, _parse_texi), tp/Texinfo/XS/parsetexi/api.c (parse_file, parse_text), tp/Texinfo/XS/parsetexi/parser.c (setup_document_root_and_text_root), (parse_texi_file, parse_texi): pass both root element and current element to parse_texi(). Rename setup_text_root() as setup_document_root_and_text_root().
- Index(es):