[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.tres, tp/t/latex_tests.t: add a new
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.tres, tp/t/latex_tests.t: add a new test, indices_disable_encoding with the same text as indices, but with ENABLE_ENCODING set to 0. |
|
Date: |
Mon, 26 Dec 2022 06:48:31 -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 3efbb6116d * tp/Makefile.tres, tp/t/latex_tests.t: add a new test,
indices_disable_encoding with the same text as indices, but with
ENABLE_ENCODING set to 0.
3efbb6116d is described below
commit 3efbb6116d866ef0301b8bd3ab447a9f61317511
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 26 12:48:19 2022 +0100
* tp/Makefile.tres, tp/t/latex_tests.t: add a new test,
indices_disable_encoding with the same text as indices, but with
ENABLE_ENCODING set to 0.
* t/include/text_only_image.txt: add to git.
---
ChangeLog | 8 +
tp/Makefile.tres | 3 +
tp/t/include/text_only_image.txt | 3 +
tp/t/latex_tests.t | 64 ++--
tp/t/results/latex_tests/indices.pl | 332 ++++++++++++++--
.../latex_tests/indices/res_latex/indices.tex | 5 +
.../{indices.pl => indices_disable_encoding.pl} | 416 +++++++++++++++++----
.../res_latex/indices_disable_encoding.tex} | 11 +-
8 files changed, 700 insertions(+), 142 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6b201852c4..e845a47705 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-12-26 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.tres, tp/t/latex_tests.t: add a new test,
+ indices_disable_encoding with the same text as indices, but with
+ ENABLE_ENCODING set to 0.
+
+ * t/include/text_only_image.txt: add to git.
+
2022-12-26 Patrice Dumas <pertusus@free.fr>
Set --enable-encoding to be the default for all output formats
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 2d35bdfc61..c7988370d9 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -1029,6 +1029,8 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex \
t/results/latex_tests/indices.pl \
t/results/latex_tests/indices/res_latex/indices.tex \
+ t/results/latex_tests/indices_disable_encoding.pl \
+
t/results/latex_tests/indices_disable_encoding/res_latex/indices_disable_encoding.tex
\
t/results/latex_tests/informative_commands_in_top_node.pl \
t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
\
t/results/latex_tests/nested_enumerate.pl \
@@ -1314,6 +1316,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/misc_commands/footnote_in_center.pl \
t/results/misc_commands/heading_command_in_commands.pl \
t/results/misc_commands/incorrect_allowcodebreaks_argument.pl \
+ t/results/misc_commands/indent_in_command_in_paragraph.pl \
t/results/misc_commands/indent_in_quotation.pl \
t/results/misc_commands/index_entries.pl \
t/results/misc_commands/invalid_clickstyle.pl \
diff --git a/tp/t/include/text_only_image.txt b/tp/t/include/text_only_image.txt
new file mode 100644
index 0000000000..af20372827
--- /dev/null
+++ b/tp/t/include/text_only_image.txt
@@ -0,0 +1,3 @@
+An image
+text
+description
diff --git a/tp/t/latex_tests.t b/tp/t/latex_tests.t
index b3f599c41d..434a9f56e2 100644
--- a/tp/t/latex_tests.t
+++ b/tp/t/latex_tests.t
@@ -118,6 +118,37 @@ Cop. @anchor{a in copying}. Ying.
'],
);
+my $indices_text = '
+@set txiindexbackslashignore
+
+@node Top
+@top top section
+
+@node chapter
+@chapter Index
+
+@cindex @"a @"{o}
+@cindex AA
+@cindex aa
+@cindex i
+@cindex Z
+@cindex @^i
+
+@cindex @math{a!"@@b} "!@@ @"a @"{o} @subentry @sortas{a!"@@b}
sub@math{a!"@@b} sub "!@@ @"a @"{o} @seealso{@math{a!"@@b} "!@@ @"a @"{o}}
+@cindex \cmd
+@cindex totocmd @sortas{\cmd}
+
+@clear txiindexbackslashignore
+
+@cindex \some\command{} for @file{file} @c comment
+
+@findex the @r{person} index @file{aa}
+
+@printindex cp
+
+@printindex fn
+';
+
my @file_tests = (
['settitle_and_headings',
'@settitle Title @* for a manual
@@ -641,32 +672,15 @@ b!}
@end enumerate
'],
+# in the the output pdf file obtained with pdflatex, the index entries
+# with accented characters are at the end and not together with the non
+# accented letters
['indices',
-'
-@set txiindexbackslashignore
-
-@node Top
-@top top section
-
-@node chapter
-@chapter Index
-
-@cindex @"a @"{o}
-
-@cindex @math{a!"@@b} "!@@ @"a @"{o} @subentry @sortas{a!"@@b}
sub@math{a!"@@b} sub "!@@ @"a @"{o} @seealso{@math{a!"@@b} "!@@ @"a @"{o}}
-@cindex \cmd
-@cindex totocmd @sortas{\cmd}
-
-@clear txiindexbackslashignore
-
-@cindex \some\command{} for @file{file} @c comment
-
-@findex the @r{person} index @file{aa}
-
-@printindex cp
-
-@printindex fn
-'],
+$indices_text
+],
+['indices_disable_encoding',
+$indices_text, {ENABLE_ENCODING => 0,}, {ENABLE_ENCODING => 0,}
+],
['error_in_sectioning_command',
'@contents
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices.pl
index f3eb3ce237..414ce96504 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -267,6 +267,231 @@ $result_trees{'indices'} = {
},
'type' => 'index_entry_command'
},
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'AA'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 2,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 3,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 4,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Z'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 5,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 6,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
'text' => '
',
@@ -296,7 +521,7 @@ $result_trees{'indices'} = {
'cmdname' => 'math',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -323,7 +548,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -344,7 +569,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -362,7 +587,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 2,
+ 'entry_number' => 7,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {
@@ -395,7 +620,7 @@ $result_trees{'indices'} = {
'cmdname' => 'sortas',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -426,7 +651,7 @@ $result_trees{'indices'} = {
'cmdname' => 'math',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -453,7 +678,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -474,7 +699,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -506,7 +731,7 @@ $result_trees{'indices'} = {
'cmdname' => 'math',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -533,7 +758,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -554,7 +779,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -565,7 +790,7 @@ $result_trees{'indices'} = {
'cmdname' => 'seealso',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -588,7 +813,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -598,7 +823,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -626,7 +851,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 3,
+ 'entry_number' => 8,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {
@@ -641,7 +866,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -671,7 +896,7 @@ $result_trees{'indices'} = {
'cmdname' => 'sortas',
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 19,
'macro' => ''
}
}
@@ -690,7 +915,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 4,
+ 'entry_number' => 9,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {
@@ -707,7 +932,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 19,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -761,7 +986,7 @@ $result_trees{'indices'} = {
'cmdname' => 'file',
'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => ''
}
}
@@ -795,7 +1020,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 5,
+ 'entry_number' => 10,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {},
@@ -808,7 +1033,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -839,7 +1064,7 @@ $result_trees{'indices'} = {
'cmdname' => 'r',
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -860,7 +1085,7 @@ $result_trees{'indices'} = {
'cmdname' => 'file',
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 25,
'macro' => ''
}
}
@@ -892,7 +1117,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -928,7 +1153,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 22,
+ 'line_nr' => 27,
'macro' => ''
}
},
@@ -963,7 +1188,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 24,
+ 'line_nr' => 29,
'macro' => ''
}
}
@@ -989,12 +1214,18 @@
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[1];
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[2];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[3];
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'seealso'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[4] =
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[4];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[5];
@@ -1003,14 +1234,28 @@
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[6];
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[8];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'seealso'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[9] =
$result_trees{'indices'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[10];
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[12];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[11];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[15];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[17];
+$result_trees{'indices'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
$result_texis{'indices'} = '
@set txiindexbackslashignore
@@ -1022,6 +1267,11 @@ $result_texis{'indices'} = '
@chapter Index
@cindex @"a @"{o}
+@cindex AA
+@cindex aa
+@cindex i
+@cindex Z
+@cindex @^i
@cindex @math{a!"@@b} "!@@ @"a @"{o} @subentry @sortas{a!"@@b}
sub@math{a!"@@b} sub "!@@ @"a @"{o} @seealso{@math{a!"@@b} "!@@ @"a @"{o}}
@cindex \\cmd
@@ -1160,7 +1410,7 @@ $result_errors{'indices'} = [
'error_line' => 'misplaced {
',
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => '',
'text' => 'misplaced {',
'type' => 'error'
@@ -1169,7 +1419,7 @@ $result_errors{'indices'} = [
'error_line' => 'misplaced }
',
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => '',
'text' => 'misplaced }',
'type' => 'error'
@@ -1186,7 +1436,12 @@ $result_indices_sort_strings{'indices'} = {
'\\some\\command for file',
'a!"@b "!@ a" o", a!"@b',
'a" o"',
- 'cmd'
+ 'AA',
+ 'aa',
+ 'cmd',
+ 'i',
+ 'i^',
+ 'Z'
],
'fn' => [
'the person index aa'
@@ -1202,6 +1457,11 @@ $result_converted{'latex_text'}->{'indices'} = '
\\label{anchor:chapter}%
\\index[cp]{ä ö@"\\""{a} "\\""{o}}%
+\\index[cp]{AA@AA}%
+\\index[cp]{aa@aa}%
+\\index[cp]{i@i}%
+\\index[cp]{Z@Z}%
+\\index[cp]{î@\\^{i}}%
\\index[cp]{a"!"""@b """!"@ ä ö@$a"!"""@b$ """!"@ "\\""{a}
"\\""{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ "\\""{a} "\\""{o}|seealso{$a!"@b$
"!@ \\"{a} \\"{o}}}%
\\index[cp]{cmd@\\textbackslash{}cmd}%
diff --git a/tp/t/results/latex_tests/indices/res_latex/indices.tex
b/tp/t/results/latex_tests/indices/res_latex/indices.tex
index e86701a1f3..e012057064 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/indices/res_latex/indices.tex
@@ -54,6 +54,11 @@
\label{anchor:chapter}%
\index[cp]{ä ö@"\""{a} "\""{o}}%
+\index[cp]{AA@AA}%
+\index[cp]{aa@aa}%
+\index[cp]{i@i}%
+\index[cp]{Z@Z}%
+\index[cp]{î@\^{i}}%
\index[cp]{a"!"""@b """!"@ ä ö@$a"!"""@b$ """!"@ "\""{a}
"\""{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ "\""{a} "\""{o}|seealso{$a!"@b$ "!@
\"{a} \"{o}}}%
\index[cp]{cmd@\textbackslash{}cmd}%
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices_disable_encoding.pl
similarity index 61%
copy from tp/t/results/latex_tests/indices.pl
copy to tp/t/results/latex_tests/indices_disable_encoding.pl
index f3eb3ce237..5a7f7c38f3 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices_disable_encoding.pl
@@ -5,7 +5,7 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'indices'} = {
+$result_trees{'indices_disable_encoding'} = {
'contents' => [
{
'contents' => [
@@ -267,6 +267,231 @@ $result_trees{'indices'} = {
},
'type' => 'index_entry_command'
},
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'AA'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 2,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 3,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 4,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Z'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 5,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'following_arg'
+ }
+ ],
+ 'cmdname' => '^',
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'content_normalized' => [],
+ 'entry_content' => [],
+ 'entry_element' => {},
+ 'entry_node' => {},
+ 'entry_number' => 6,
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_ignore_chars' => {
+ '\\' => 1
+ },
+ 'index_name' => 'cp',
+ 'index_type_command' => 'cindex'
+ }
+ },
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'type' => 'index_entry_command'
+ },
{
'text' => '
',
@@ -296,7 +521,7 @@ $result_trees{'indices'} = {
'cmdname' => 'math',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -323,7 +548,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -344,7 +569,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -362,7 +587,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 2,
+ 'entry_number' => 7,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {
@@ -395,7 +620,7 @@ $result_trees{'indices'} = {
'cmdname' => 'sortas',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -426,7 +651,7 @@ $result_trees{'indices'} = {
'cmdname' => 'math',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -453,7 +678,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -474,7 +699,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -506,7 +731,7 @@ $result_trees{'indices'} = {
'cmdname' => 'math',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -533,7 +758,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -554,7 +779,7 @@ $result_trees{'indices'} = {
'cmdname' => '"',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -565,7 +790,7 @@ $result_trees{'indices'} = {
'cmdname' => 'seealso',
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -588,7 +813,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -598,7 +823,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -626,7 +851,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 3,
+ 'entry_number' => 8,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {
@@ -641,7 +866,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 18,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -671,7 +896,7 @@ $result_trees{'indices'} = {
'cmdname' => 'sortas',
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 19,
'macro' => ''
}
}
@@ -690,7 +915,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 4,
+ 'entry_number' => 9,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {
@@ -707,7 +932,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 19,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -761,7 +986,7 @@ $result_trees{'indices'} = {
'cmdname' => 'file',
'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => ''
}
}
@@ -795,7 +1020,7 @@ $result_trees{'indices'} = {
'entry_content' => [],
'entry_element' => {},
'entry_node' => {},
- 'entry_number' => 5,
+ 'entry_number' => 10,
'in_code' => 0,
'index_at_command' => 'cindex',
'index_ignore_chars' => {},
@@ -808,7 +1033,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -839,7 +1064,7 @@ $result_trees{'indices'} = {
'cmdname' => 'r',
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 25,
'macro' => ''
}
},
@@ -860,7 +1085,7 @@ $result_trees{'indices'} = {
'cmdname' => 'file',
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 25,
'macro' => ''
}
}
@@ -892,7 +1117,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 25,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -928,7 +1153,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 22,
+ 'line_nr' => 27,
'macro' => ''
}
},
@@ -963,7 +1188,7 @@ $result_trees{'indices'} = {
},
'source_info' => {
'file_name' => '',
- 'line_nr' => 24,
+ 'line_nr' => 29,
'macro' => ''
}
}
@@ -981,38 +1206,58 @@ $result_trees{'indices'} = {
],
'type' => 'document_root'
};
-$result_trees{'indices'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'indices'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[3]{'extra'}{'node_content'}[0] =
$result_trees{'indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'indices'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[1];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'extra'}{'seealso'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[4] =
$result_trees{'indices'}{'contents'}[4]{'contents'}[3]{'extra'}{'subentry'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[5];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[6];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[10];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'args'}[0]{'contents'};
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices'}{'contents'}[4]{'contents'}[12];
-$result_trees{'indices'}{'contents'}[4]{'contents'}[12]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'indices_disable_encoding'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'indices_disable_encoding'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'indices_disable_encoding'}{'contents'}[3]{'extra'}{'node_content'}[0]
=
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'indices_disable_encoding'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'indices_disable_encoding'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[1]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[2]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[3]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[5]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[6]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'extra'}{'seealso'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'}{'args'}[0]{'contents'}[11];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[9] =
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[8]{'extra'}{'subentry'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[10]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[11]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[15]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_content'}
=
$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'};
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_element'}
= $result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17];
+$result_trees{'indices_disable_encoding'}{'contents'}[4]{'contents'}[17]{'extra'}{'index_entry'}{'entry_node'}
= $result_trees{'indices_disable_encoding'}{'contents'}[3];
-$result_texis{'indices'} = '
+$result_texis{'indices_disable_encoding'} = '
@set txiindexbackslashignore
@node Top
@@ -1022,6 +1267,11 @@ $result_texis{'indices'} = '
@chapter Index
@cindex @"a @"{o}
+@cindex AA
+@cindex aa
+@cindex i
+@cindex Z
+@cindex @^i
@cindex @math{a!"@@b} "!@@ @"a @"{o} @subentry @sortas{a!"@@b}
sub@math{a!"@@b} sub "!@@ @"a @"{o} @seealso{@math{a!"@@b} "!@@ @"a @"{o}}
@cindex \\cmd
@@ -1039,7 +1289,7 @@ $result_texis{'indices'} = '
';
-$result_texts{'indices'} = '
+$result_texts{'indices_disable_encoding'} = '
top section
***********
@@ -1054,7 +1304,7 @@ top section
';
-$result_sectioning{'indices'} = {
+$result_sectioning{'indices_disable_encoding'} = {
'structure' => {
'section_childs' => [
{
@@ -1103,12 +1353,12 @@ $result_sectioning{'indices'} = {
'section_level' => -1
}
};
-$result_sectioning{'indices'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'indices'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'indices'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'indices'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'indices'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'indices'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'indices'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'indices'};
+$result_sectioning{'indices_disable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
=
$result_sectioning{'indices_disable_encoding'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'indices_disable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'indices_disable_encoding'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'indices_disable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
=
$result_sectioning{'indices_disable_encoding'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'indices_disable_encoding'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'indices_disable_encoding'};
-$result_nodes{'indices'} = {
+$result_nodes{'indices_disable_encoding'} = {
'cmdname' => 'node',
'extra' => {
'associated_section' => {
@@ -1143,10 +1393,10 @@ $result_nodes{'indices'} = {
}
}
};
-$result_nodes{'indices'}{'structure'}{'node_next'}{'structure'}{'node_prev'} =
$result_nodes{'indices'};
-$result_nodes{'indices'}{'structure'}{'node_next'}{'structure'}{'node_up'} =
$result_nodes{'indices'};
+$result_nodes{'indices_disable_encoding'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'indices_disable_encoding'};
+$result_nodes{'indices_disable_encoding'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'indices_disable_encoding'};
-$result_menus{'indices'} = {
+$result_menus{'indices_disable_encoding'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -1155,12 +1405,12 @@ $result_menus{'indices'} = {
'structure' => {}
};
-$result_errors{'indices'} = [
+$result_errors{'indices_disable_encoding'} = [
{
'error_line' => 'misplaced {
',
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => '',
'text' => 'misplaced {',
'type' => 'error'
@@ -1169,7 +1419,7 @@ $result_errors{'indices'} = [
'error_line' => 'misplaced }
',
'file_name' => '',
- 'line_nr' => 18,
+ 'line_nr' => 23,
'macro' => '',
'text' => 'misplaced }',
'type' => 'error'
@@ -1177,16 +1427,21 @@ $result_errors{'indices'} = [
];
-$result_floats{'indices'} = {};
+$result_floats{'indices_disable_encoding'} = {};
-$result_indices_sort_strings{'indices'} = {
+$result_indices_sort_strings{'indices_disable_encoding'} = {
'cp' => [
'\\cmd',
'\\some\\command for file',
'a!"@b "!@ a" o", a!"@b',
'a" o"',
- 'cmd'
+ 'AA',
+ 'aa',
+ 'cmd',
+ 'i',
+ 'i^',
+ 'Z'
],
'fn' => [
'the person index aa'
@@ -1195,15 +1450,20 @@ $result_indices_sort_strings{'indices'} = {
-$result_converted{'latex_text'}->{'indices'} = '
+$result_converted{'latex_text'}->{'indices_disable_encoding'} = '
\\begin{document}
\\label{anchor:Top}%
\\chapter{{Index}}
\\label{anchor:chapter}%
-\\index[cp]{ä ö@"\\""{a} "\\""{o}}%
+\\index[cp]{a"" o""@"\\""{a} "\\""{o}}%
+\\index[cp]{AA@AA}%
+\\index[cp]{aa@aa}%
+\\index[cp]{i@i}%
+\\index[cp]{Z@Z}%
+\\index[cp]{i\\^{}@\\^{i}}%
-\\index[cp]{a"!"""@b """!"@ ä ö@$a"!"""@b$ """!"@ "\\""{a}
"\\""{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ "\\""{a} "\\""{o}|seealso{$a!"@b$
"!@ \\"{a} \\"{o}}}%
+\\index[cp]{a"!"""@b """!"@ a"" o""@$a"!"""@b$ """!"@ "\\""{a}
"\\""{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ "\\""{a} "\\""{o}|seealso{$a!"@b$
"!@ \\"{a} \\"{o}}}%
\\index[cp]{cmd@\\textbackslash{}cmd}%
\\index[cp]{\\textbackslash{}cmd@totocmd}%
diff --git a/tp/t/results/latex_tests/indices/res_latex/indices.tex
b/tp/t/results/latex_tests/indices_disable_encoding/res_latex/indices_disable_encoding.tex
similarity index 87%
copy from tp/t/results/latex_tests/indices/res_latex/indices.tex
copy to
tp/t/results/latex_tests/indices_disable_encoding/res_latex/indices_disable_encoding.tex
index e86701a1f3..5fbd9080ea 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++
b/tp/t/results/latex_tests/indices_disable_encoding/res_latex/indices_disable_encoding.tex
@@ -53,9 +53,14 @@
\chapter{{Index}}
\label{anchor:chapter}%
-\index[cp]{ä ö@"\""{a} "\""{o}}%
-
-\index[cp]{a"!"""@b """!"@ ä ö@$a"!"""@b$ """!"@ "\""{a}
"\""{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ "\""{a} "\""{o}|seealso{$a!"@b$ "!@
\"{a} \"{o}}}%
+\index[cp]{a"" o""@"\""{a} "\""{o}}%
+\index[cp]{AA@AA}%
+\index[cp]{aa@aa}%
+\index[cp]{i@i}%
+\index[cp]{Z@Z}%
+\index[cp]{i\^{}@\^{i}}%
+
+\index[cp]{a"!"""@b """!"@ a"" o""@$a"!"""@b$ """!"@ "\""{a}
"\""{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ "\""{a} "\""{o}|seealso{$a!"@b$ "!@
\"{a} \"{o}}}%
\index[cp]{cmd@\textbackslash{}cmd}%
\index[cp]{\textbackslash{}cmd@totocmd}%
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.tres, tp/t/latex_tests.t: add a new test, indices_disable_encoding with the same text as indices, but with ENABLE_ENCODING set to 0.,
Patrice Dumas <=