[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_index_entry): Alw
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_index_entry): Always output a sort key for cases like '@cindex @code{aaa} bbb' where the index text uses \commands. |
|
Date: |
Sat, 08 Oct 2022 15:40:18 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new fef8c97399 * tp/Texinfo/Convert/LaTeX.pm (_index_entry): Always output
a sort key for cases like '@cindex @code{aaa} bbb' where the index text uses
\commands.
fef8c97399 is described below
commit fef8c97399327be52fc6a87ba05a20f011022840
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 8 20:39:52 2022 +0100
* tp/Texinfo/Convert/LaTeX.pm (_index_entry): Always output
a sort key for cases like '@cindex @code{aaa} bbb' where the
index text uses \commands.
---
ChangeLog | 6 ++
tp/Texinfo/Convert/LaTeX.pm | 15 +---
.../index_entry_in_preformatted.pl | 6 +-
.../printindex_merged_indices_code_style.tex | 6 +-
.../res_latex/references_to_top_no_top_output.tex | 2 +-
tp/t/results/coverage/commands.pl | 2 +-
tp/t/results/coverage/multitable.pl | 2 +-
.../coverage/punctuation_in_line_commands.pl | 2 +-
tp/t/results/coverage/table.pl | 2 +-
.../results/coverage_braces/heading_in_footnote.pl | 2 +-
.../res_latex/char_latin1_latin1_in_refs.tex | 12 +--
tp/t/results/indices/def_syn_indices.pl | 6 +-
tp/t/results/indices/double_seeentry_seealso.pl | 8 +-
tp/t/results/indices/explicit_sort_key.pl | 2 +-
.../multiple_index_text_sortas_seeentry_seealso.pl | 2 +-
tp/t/results/indices/same_only_seealso_seeentry.pl | 12 +--
tp/t/results/indices/same_seealso_seeentry.pl | 14 +--
tp/t/results/indices/seeentry.pl | 4 +-
tp/t/results/indices/subentries.pl | 8 +-
tp/t/results/indices/subentry_and_sortas_spaces.pl | 6 +-
tp/t/results/indices/syncode_index_print_both.pl | 2 +-
.../res_latex/inter_item_commands_in_enumerate.tex | 14 +--
.../res_latex/inter_item_commands_in_itemize.tex | 8 +-
tp/t/results/latex_tests/brace_in_index.pl | 6 +-
.../brace_in_index/res_latex/brace_in_index.tex | 6 +-
tp/t/results/latex_tests/indices.pl | 2 +-
.../latex_tests/indices/res_latex/indices.tex | 2 +-
tp/t/results/latex_tests/vbar_in_index.pl | 2 +-
.../misc_commands/comment_space_command_on_line.pl | 2 +-
.../res_latex/inter_item_commands_in_table.tex | 22 ++---
.../inter_item_commands_in_table_in_example.tex | 2 +-
.../indices_in_begin_tables_lists.tex | 44 ++++-----
.../indices_in_begin_tables_lists.tex | 44 ++++-----
.../res_parser/formatting_latex/formatting.tex | 100 ++++++++++-----------
34 files changed, 186 insertions(+), 189 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3e2c4a661f..f7b3117b3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-10-08 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/Texinfo/Convert/LaTeX.pm (_index_entry): Always output
+ a sort key for cases like '@cindex @code{aaa} bbb' where the
+ index text uses \commands.
+
2022-10-08 Patrice Dumas <pertusus@free.fr>
* Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index e491d6596b..c645293da9 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2125,19 +2125,10 @@ sub _index_entry($$)
my $index_entry = _convert($self, $subentry);
if ($in_code) {
pop @{$self->{'formatting_context'}->[-1]->{'code'}};
- # always setup a string to sort with code as we use a command
- $sortas = Texinfo::Structuring::index_entry_sort_string($entry,
- $subentry, $subentry_sortas, $options);
- } else {
- if (defined($subentry_sortas)) {
- $sortas = $subentry_sortas;
- } elsif (exists($entry->{'index_ignore_chars'})
- and scalar(keys(%{$entry->{'index_ignore_chars'}}) > 0)) {
- # setup a sort string if some characters are ignored
- $sortas = Texinfo::Structuring::index_entry_sort_string($entry,
- $subentry, $subentry_sortas, $options);
- }
}
+ # always setup a string to sort with code as we may use commands
+ $sortas = Texinfo::Structuring::index_entry_sort_string($entry,
+ $subentry, $subentry_sortas, $options);
my $result = '';
if (defined($sortas)) {
# | in sort key breaks with hyperref
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index 89ff3f1002..ca265a317e 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -639,12 +639,12 @@
$result_converted{'latex_text'}->{'index_entry_in_preformatted'} = '\\label{anch
\\begin{GNUTexinfoindented}
\\begin{GNUTexinfopreformatted}%
-\\ttfamily \\index[cp]{first}%
+\\ttfamily \\index[cp]{first@first}%
text
-\\index[cp]{other}%
+\\index[cp]{other@other}%
text2
-\\index[cp]{last}%
+\\index[cp]{last@last}%
\\end{GNUTexinfopreformatted}
\\end{GNUTexinfoindented}
';
diff --git
a/tp/t/results/converters_tests/printindex_merged_indices_code_style/res_latex/printindex_merged_indices_code_style.tex
b/tp/t/results/converters_tests/printindex_merged_indices_code_style/res_latex/printindex_merged_indices_code_style.tex
index 2d0630f043..d932a08ce7 100644
---
a/tp/t/results/converters_tests/printindex_merged_indices_code_style/res_latex/printindex_merged_indices_code_style.tex
+++
b/tp/t/results/converters_tests/printindex_merged_indices_code_style/res_latex/printindex_merged_indices_code_style.tex
@@ -53,15 +53,15 @@
-\index[fn]{c``b}%
+\index[fn]{c""b@c``b}%
-\index[fn]{v``j}%
+\index[fn]{v""j@v``j}%
\index[fn]{f``g@\texttt{f{`}{`}g}}%
-\index[fn]{cdi``h}%
+\index[fn]{cdi""h@cdi``h}%
diff --git
a/tp/t/results/converters_tests/references_to_top_no_top_output/res_latex/references_to_top_no_top_output.tex
b/tp/t/results/converters_tests/references_to_top_no_top_output/res_latex/references_to_top_no_top_output.tex
index 6342658067..145eec80e3 100644
---
a/tp/t/results/converters_tests/references_to_top_no_top_output/res_latex/references_to_top_no_top_output.tex
+++
b/tp/t/results/converters_tests/references_to_top_no_top_output/res_latex/references_to_top_no_top_output.tex
@@ -67,7 +67,7 @@ see \hyperref[anchor:a-in-float]{[a in float],
page~\pageref*{anchor:a-in-float}
see \hyperref[anchor:a-in-caption]{[a in caption],
page~\pageref*{anchor:a-in-caption}}
see \hyperref[anchor:a-in-paragraph-in-top]{[a in paragraph in top],
page~\pageref*{anchor:a-in-paragraph-in-top}}
-\index[cp]{chap index}%
+\index[cp]{chap index@chap index}%
\printindex[cp]
diff --git a/tp/t/results/coverage/commands.pl
b/tp/t/results/coverage/commands.pl
index f3234de5a3..860e604bbf 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -605,7 +605,7 @@ File $\\rightarrow{}$ Open\\@.
\\href{mailto:a}{b} \\texttt{code {-}{-}{-} {-}{-} {\'}{\'} {`}{`}}
--- -- \'\' ``. \\textsc{small caps}.
-\\index[cp]{index entry ``in text\'\' \\LaTeX{}}%
+\\index[cp]{index entry ""in text"" LaTeX@index entry ``in text\'\' \\LaTeX{}}%
\\GNUTexinfonopagebreakheading{\\chapter*}{{majorheading \\textbf{in b}}}
';
diff --git a/tp/t/results/coverage/multitable.pl
b/tp/t/results/coverage/multitable.pl
index eaca6e6713..20bda74ed3 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -768,7 +768,7 @@ $result_converted{'latex_text'}->{'multitable'} = '
mu--ltitable headitem &another tab\\\\
mu--ltitable item &multitable tab\\\\
mu--ltitable item 2 &multitable tab 2
-\\index[cp]{index entry within multitable}%
+\\index[cp]{index entry within multitable@index entry within multitable}%
\\\\
lone mu--ltitable item&\\\\
\\end{tabular}%
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 0f5836a461..53a32b1115 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -1295,7 +1295,7 @@ In float with caption.
\\listof{TexinfoFloatfloattypeAfterpunc}{}
-\\index[cp]{index"! After punc}%
+\\index[cp]{index"! After punc@index"! After punc}%
\\section*{{heading! After punc}}
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 8bc92cdb07..538fffe482 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -892,7 +892,7 @@ In table
\\end{description}
\\begin{description}
-\\item[] \\index[cp]{index entry}%
+\\item[] \\index[cp]{index entry@index entry}%
\\item[{\\parbox[b]{\\linewidth}{%
\\GNUTexinfotablestylesamp{vtable item}\\\\
diff --git a/tp/t/results/coverage_braces/heading_in_footnote.pl
b/tp/t/results/coverage_braces/heading_in_footnote.pl
index 47ff04982f..a0358ea775 100644
--- a/tp/t/results/coverage_braces/heading_in_footnote.pl
+++ b/tp/t/results/coverage_braces/heading_in_footnote.pl
@@ -229,7 +229,7 @@ $result_converted{'html_text'}->{'heading_in_footnote'} =
'<p>T<a class="footnot
$result_converted{'latex_text'}->{'heading_in_footnote'} = 'T\\footnote{AAA
\\section*{{H1}}
-\\index[cp]{ind e}%
+\\index[cp]{ind e@ind e}%
BBB
}
';
diff --git
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
index 1b216ab67b..223fcd7e82 100644
---
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
+++
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_latex/char_latin1_latin1_in_refs.tex
@@ -73,11 +73,11 @@
\hyperref[anchor:_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db]{\chaptername~\ref*{anchor:_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db}
[� � � � � � � � � �],
page~\pageref*{anchor:_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db}}
\hyperref[anchor:_00e7]{\chaptername~\ref*{anchor:_00e7} [�],
page~\pageref*{anchor:_00e7}}
-\index[cp]{� � � � � �}%
-\index[cp]{� � � � �}%
-\index[cp]{�}%
-\index[cp]{�}%
-\index[cp]{� � � � � � � � � �}%
-\index[cp]{�}%
+\index[cp]{� � � � � �@� � � � � �}%
+\index[cp]{� � � � �@� � � � �}%
+\index[cp]{�@�}%
+\index[cp]{�@�}%
+\index[cp]{� � � � � � � � � �@� � � � � � � � � �}%
+\index[cp]{�@�}%
\end{document}
diff --git a/tp/t/results/indices/def_syn_indices.pl
b/tp/t/results/indices/def_syn_indices.pl
index c3198381c9..d627acb8c5 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -2248,7 +2248,7 @@ $result_converted{'latex'}->{'def_syn_indices'} =
'\\documentclass{book}
definedx truc
after
-\\index[fn]{index truc}%
+\\index[fn]{index truc@index truc}%
\\index[codeidx]{a index entry te\\~{} i\\^{}@\\texttt{a
\\GNUTexinfocommandstyletextvar{index entry}\\ t\\~{e}\\ \\^{\\i{}}}}%
@@ -2262,9 +2262,9 @@ after
-\\index[pg]{defg index entry}%
+\\index[pg]{defg index entry@defg index entry}%
-\\index[pg]{abc index entry}%
+\\index[pg]{abc index entry@abc index entry}%
pg
\\printindex[pg]
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl
b/tp/t/results/indices/double_seeentry_seealso.pl
index 15e5005e81..06b5facd22 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -1031,10 +1031,10 @@ $result_converted{'latex'}->{'double_seeentry_seealso'}
= '\\documentclass{book}
\\chapter{{Chapter Index}}
\\label{anchor:node-index}%
-\\index[cp]{aaa|see{ccc}}%
-\\index[cp]{ddd|seealso{eee}}%
-\\index[cp]{ggg|see{hhh}}%
-\\index[cp]{!subggg|seealso{fff}}%
+\\index[cp]{aaa@aaa|see{ccc}}%
+\\index[cp]{ddd@ddd|seealso{eee}}%
+\\index[cp]{ggg@ggg|see{hhh}}%
+\\index[cp]{@!subggg@subggg|seealso{fff}}%
\\printindex[cp]
\\end{document}
diff --git a/tp/t/results/indices/explicit_sort_key.pl
b/tp/t/results/indices/explicit_sort_key.pl
index 2592cd1597..621f3ba9e6 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -1196,7 +1196,7 @@ $result_converted{'latex'}->{'explicit_sort_key'} =
'\\documentclass{book}
\\index[SK]{A@bbbbbbb (first)}%
\\index[SK]{B@aaaaaaa (second)}%
\\index[SK]{0@zero sort key}%
-\\index[SK]{\\textbf{aaa }}%
+\\index[SK]{aaa @\\textbf{aaa }}%
in a reuglar para . \\texttt{inside another }.
diff --git
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index de6556b8e3..14847044d5 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -861,7 +861,7 @@
$result_converted{'latex'}->{'multiple_index_text_sortas_seeentry_seealso'} = '\
\\index[cp]{A---S@aaa continue aagain|see{other second}}%
\\index[cp]{BB@other second}%
-\\index[cp]{entry secret|see{something else}}%
+\\index[cp]{entry secret@entry secret|see{something else}}%
\\printindex[cp]
\\end{document}
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index 3c77c970ed..d688c8ba45 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -1013,14 +1013,14 @@
$result_converted{'latex'}->{'same_only_seealso_seeentry'} = '\\documentclass{bo
\\chapter{{chap}}
\\label{anchor:node}%
-\\index[cp]{aaa|seealso{sss}}%
-\\index[cp]{aaa|seealso{123}}%
+\\index[cp]{aaa@aaa|seealso{sss}}%
+\\index[cp]{aaa@aaa|seealso{123}}%
-\\index[cp]{bbb|see{yyy}}%
-\\index[cp]{bbb|see{ttt}}%
+\\index[cp]{bbb@bbb|see{yyy}}%
+\\index[cp]{bbb@bbb|see{ttt}}%
-\\index[cp]{ccc|seealso{also}}%
-\\index[cp]{ccc|see{entry}}%
+\\index[cp]{ccc@ccc|seealso{also}}%
+\\index[cp]{ccc@ccc|see{entry}}%
\\printindex[cp]
\\end{document}
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl
b/tp/t/results/indices/same_seealso_seeentry.pl
index 908837ecd5..342be5bb6e 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -1094,16 +1094,16 @@ $result_converted{'latex'}->{'same_seealso_seeentry'} =
'\\documentclass{book}
\\chapter{{chap}}
\\label{anchor:node}%
-\\index[cp]{aaa|seealso{sss}}%
-\\index[cp]{aaa|seealso{123}}%
+\\index[cp]{aaa@aaa|seealso{sss}}%
+\\index[cp]{aaa@aaa|seealso{123}}%
-\\index[cp]{bbb|see{yyy}}%
-\\index[cp]{bbb|see{ttt}}%
+\\index[cp]{bbb@bbb|see{yyy}}%
+\\index[cp]{bbb@bbb|see{ttt}}%
-\\index[cp]{ccc|seealso{also}}%
-\\index[cp]{ccc|see{entry}}%
+\\index[cp]{ccc@ccc|seealso{also}}%
+\\index[cp]{ccc@ccc|see{entry}}%
-\\index[cp]{entry}%
+\\index[cp]{entry@entry}%
\\printindex[cp]
\\end{document}
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 0e3248473a..1a13cc28eb 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -872,8 +872,8 @@ $result_converted{'latex'}->{'seeentry'} =
'\\documentclass{book}
\\chapter{{Index}}
\\label{anchor:chapter-index}%
-\\index[cp]{aaa|see{bbb}}%
-\\index[cp]{ddd|seealso{ccc}}%
+\\index[cp]{aaa@aaa|see{bbb}}%
+\\index[cp]{ddd@ddd|seealso{ccc}}%
\\index[fn]{f---aaa@\\texttt{f{-}{-}{-}aaa}|see{f---bbb}}%
\\index[fn]{f---ddd@\\texttt{f{-}{-}{-}ddd}|seealso{f---ccc}}%
diff --git a/tp/t/results/indices/subentries.pl
b/tp/t/results/indices/subentries.pl
index bf327f5374..d02bf1ef84 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -1447,10 +1447,10 @@ $result_converted{'latex'}->{'subentries'} =
'\\documentclass{book}
\\chapter{{Index}}
\\label{anchor:chapter-index}%
-\\index[cp]{a---a}%
-\\index[cp]{b---b!c---c}%
-\\index[cp]{d---dd!e---ee!f---ff}%
-\\index[cp]{g---gg!h---hh jjj!k---kk!l---ll}%
+\\index[cp]{a--a@a---a}%
+\\index[cp]{b--b@b---b!c--c@c---c}%
+\\index[cp]{d--dd@d---dd!e--ee@e---ee!f--ff@f---ff}%
+\\index[cp]{g--gg@g---gg!h--hh jjj@h---hh jjj!k--kk@k---kk!l--ll@l---ll}%
\\index[fn]{f---aa@\\texttt{f{-}{-}{-}aa}}%
\\index[fn]{f---bb@\\texttt{f{-}{-}{-}bb}!f---cc@\\texttt{f{-}{-}{-}cc}}%
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 77c11c0c73..0475806fd5 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -1010,9 +1010,9 @@
$result_converted{'latex'}->{'subentry_and_sortas_spaces'} = '\\documentclass{bo
\\label{anchor:chapter-index}%
\\index[cp]{A---S@aaa!C---S1@bbb sort as c}%
-\\index[cp]{aaa!B---S1@}%
-\\index[cp]{aaa!bbb!D@ccc}%
-\\index[cp]{aaa!bbb!ccc}%
+\\index[cp]{aaa@aaa!B---S1@}%
+\\index[cp]{aaa@aaa!bbb@bbb!D@ccc}%
+\\index[cp]{aaa@aaa!bbb@bbb!ccc@ccc}%
\\printindex[cp]
\\end{document}
diff --git a/tp/t/results/indices/syncode_index_print_both.pl
b/tp/t/results/indices/syncode_index_print_both.pl
index 49e70e50f2..283790828b 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -870,7 +870,7 @@ $result_converted{'latex'}->{'syncode_index_print_both'} =
'\\documentclass{book
\\chapter{{index}}
\\label{anchor:chapter-index}%
-\\index[cp]{c---oncept}%
+\\index[cp]{c--oncept@c---oncept}%
\\index[cp]{f---un@\\texttt{f{-}{-}{-}un}}%
diff --git
a/tp/t/results/itemize/inter_item_commands_in_enumerate/res_latex/inter_item_commands_in_enumerate.tex
b/tp/t/results/itemize/inter_item_commands_in_enumerate/res_latex/inter_item_commands_in_enumerate.tex
index 755f17e91f..44dd91f91e 100644
---
a/tp/t/results/itemize/inter_item_commands_in_enumerate/res_latex/inter_item_commands_in_enumerate.tex
+++
b/tp/t/results/itemize/inter_item_commands_in_enumerate/res_latex/inter_item_commands_in_enumerate.tex
@@ -62,33 +62,33 @@
\begin{enumerate}[start=1]
\item
-\index[cp]{index inter in enumerate between lines}%
+\index[cp]{index inter in enumerate between lines@index inter in enumerate
between lines}%
\item enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
\item
-\index[cp]{index inter in enumerate after line}%
+\index[cp]{index inter in enumerate after line@index inter in enumerate after
line}%
\item enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{index inter in enumerate before line}%
+\item \index[cp]{index inter in enumerate before line@index inter in enumerate
before line}%
\item enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
\item Title
-\index[cp]{cindex}%
+\index[cp]{cindex@cindex}%
\item enum
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{first idx}%
-\index[cp]{sedond idx}%
-\index[cp]{another}%
+\item \index[cp]{first idx@first idx}%
+\index[cp]{sedond idx@sedond idx}%
+\index[cp]{another@another}%
\item enum
\end{enumerate}
diff --git
a/tp/t/results/itemize/inter_item_commands_in_itemize/res_latex/inter_item_commands_in_itemize.tex
b/tp/t/results/itemize/inter_item_commands_in_itemize/res_latex/inter_item_commands_in_itemize.tex
index 4820e4c407..9402009b40 100644
---
a/tp/t/results/itemize/inter_item_commands_in_itemize/res_latex/inter_item_commands_in_itemize.tex
+++
b/tp/t/results/itemize/inter_item_commands_in_itemize/res_latex/inter_item_commands_in_itemize.tex
@@ -56,20 +56,20 @@
\label{anchor:chapter}%
\begin{itemize}[label=-]
-\item \index[cp]{also a cindex in itemize}%
+\item \index[cp]{also a cindex in itemize@also a cindex in itemize}%
\item e--mph item
\end{itemize}
\begin{itemize}[label=\textbullet{}]
-\item \index[cp]{index entry within itemize}%
+\item \index[cp]{index entry within itemize@index entry within itemize}%
\item i--tem 1
-\item \index[cp]{index entry right after "@item}%
+\item \index[cp]{index entry right after "@item@index entry right after
"@item}%
i--tem 2
\end{itemize}
\begin{itemize}
\item T--ext before items.
-\index[cp]{also a cindex in itemize}%
+\index[cp]{also a cindex in itemize@also a cindex in itemize}%
\item bullet item
\end{itemize}
\end{document}
diff --git a/tp/t/results/latex_tests/brace_in_index.pl
b/tp/t/results/latex_tests/brace_in_index.pl
index 4a6c5163e1..2d328e8b82 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -669,11 +669,11 @@ $$
\\{
$$
-\\index[cp]{\\textbraceleft{}}%
+\\index[cp]{@\\textbraceleft{}}%
-\\index[cp]{$\\lbrace{}$}%
+\\index[cp]{@$\\lbrace{}$}%
-\\index[cp]{`\\texttt{\\textbraceleft{}}\'}%
+\\index[cp]{@`\\texttt{\\textbraceleft{}}\'}%
\\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
diff --git
a/tp/t/results/latex_tests/brace_in_index/res_latex/brace_in_index.tex
b/tp/t/results/latex_tests/brace_in_index/res_latex/brace_in_index.tex
index 49dcb7b249..730c555b67 100644
--- a/tp/t/results/latex_tests/brace_in_index/res_latex/brace_in_index.tex
+++ b/tp/t/results/latex_tests/brace_in_index/res_latex/brace_in_index.tex
@@ -63,11 +63,11 @@ $$
\{
$$
-\index[cp]{\textbraceleft{}}%
+\index[cp]{@\textbraceleft{}}%
-\index[cp]{$\lbrace{}$}%
+\index[cp]{@$\lbrace{}$}%
-\index[cp]{`\texttt{\textbraceleft{}}'}%
+\index[cp]{@`\texttt{\textbraceleft{}}'}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices.pl
index e748b7c76e..32d41724ae 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1324,7 +1324,7 @@ $result_converted{'latex_text'}->{'indices'} = '
\\index[cp]{\\textbackslash{}cmd@totocmd}%
-\\index[cp]{\\textbackslash{}some\\textbackslash{}command for \\texttt{file}}%
+\\index[cp]{\\textbackslash{}some\\textbackslash{}command for
file@\\textbackslash{}some\\textbackslash{}command for \\texttt{file}}%
\\index[fn]{the person index aa@\\texttt{the \\textnormal{person}\\ index
\\texttt{aa}}}%
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 2e65884329..491c69a044 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/indices/res_latex/indices.tex
@@ -58,7 +58,7 @@
\index[cp]{\textbackslash{}cmd@totocmd}%
-\index[cp]{\textbackslash{}some\textbackslash{}command for \texttt{file}}%
+\index[cp]{\textbackslash{}some\textbackslash{}command for
file@\textbackslash{}some\textbackslash{}command for \texttt{file}}%
\index[fn]{the person index aa@\texttt{the \textnormal{person}\ index
\texttt{aa}}}%
diff --git a/tp/t/results/latex_tests/vbar_in_index.pl
b/tp/t/results/latex_tests/vbar_in_index.pl
index 48192cdf78..01571ccf8a 100644
--- a/tp/t/results/latex_tests/vbar_in_index.pl
+++ b/tp/t/results/latex_tests/vbar_in_index.pl
@@ -161,7 +161,7 @@ $result_indices_sort_strings{'vbar_in_index'} = {
$result_converted{'latex_text'}->{'vbar_in_index'} = '\\begin{document}
\\index[fn]{AB@\\texttt{A"|B}}%
-\\index[cp]{C"|D}%
+\\index[cp]{CD@C"|D}%
';
1;
diff --git a/tp/t/results/misc_commands/comment_space_command_on_line.pl
b/tp/t/results/misc_commands/comment_space_command_on_line.pl
index 087c49af8b..49b86b7a71 100644
--- a/tp/t/results/misc_commands/comment_space_command_on_line.pl
+++ b/tp/t/results/misc_commands/comment_space_command_on_line.pl
@@ -1178,7 +1178,7 @@
$result_converted{'latex'}->{'comment_space_command_on_line'} = '\\documentclass
\\microtypesetup{activate=false}%
-\\index[cp]{index entry \\ {}}%
+\\index[cp]{index entry @index entry \\ {}}%
\\section*{{Heading \\ {}}}
diff --git
a/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
b/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
index 2fe635bdb6..e0c8183d47 100644
---
a/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
+++
b/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
@@ -85,7 +85,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfocommandstyletextvar{avar--b}\\
\index[fn]{avar--b@\texttt{avar{-}{-}b}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\GNUTexinfocommandstyletextvar{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -100,28 +100,28 @@ l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table}%
+\item[] \index[cp]{cindex in table@cindex in table}%
\item[{\parbox[b]{\linewidth}{%
\texttt{abb}}}]
l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table}%
+\item[] \index[cp]{cindex in table@cindex in table}%
Texte before first item.
\item[{\parbox[b]{\linewidth}{%
\texttt{abb}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table}%
+\item[] \index[cp]{samp cindex in table@samp cindex in table}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
l--ine samp
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table}%
+\item[] \index[cp]{samp cindex in table@samp cindex in table}%
Texte before first item samp.
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
@@ -129,14 +129,14 @@ Texte before first item samp.
\begin{description}
\item[]
-\index[cp]{cindex between lines}%
+\index[cp]{cindex between lines@cindex between lines}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb1}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{cindex before line}%
+\item[] \index[cp]{cindex before line@cindex before line}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
@@ -144,15 +144,15 @@ Texte before first item samp.
\begin{description}
\item[]
-\index[cp]{cindex after line}%
+\index[cp]{cindex after line@cindex after line}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{cindex first}%
-\index[cp]{second}%
-\index[cp]{third}%
+\item[] \index[cp]{cindex first@cindex first}%
+\index[cp]{second@second}%
+\index[cp]{third@third}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
diff --git
a/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
b/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
index 7ea9e6fa66..51f99fd0ba 100644
---
a/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
+++
b/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
@@ -59,7 +59,7 @@
\begin{description}
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfocommandstyletextvar{a--b}\\
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\GNUTexinfocommandstyletextvar{b}\\
\GNUTexinfocommandstyletextvar{c}}}]
\begin{GNUTexinfopreformatted}%
diff --git
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
index 97b936e619..53b2c93e75 100644
---
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
+++
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
@@ -67,20 +67,20 @@
\label{anchor:chapter}%
\begin{itemize}[label=-]
-\item \index[cp]{also a cindex in itemize}%
+\item \index[cp]{also a cindex in itemize@also a cindex in itemize}%
e--mph item
\end{itemize}
\begin{itemize}[label=\textbullet{}]
-\item \index[cp]{index entry within itemize}%
+\item \index[cp]{index entry within itemize@index entry within itemize}%
i--tem 1
-\item \index[cp]{index entry right after "@item}%
+\item \index[cp]{index entry right after "@item@index entry right after
"@item}%
i--tem 2
\end{itemize}
\begin{itemize}
\item T--ext before items.
-\item \index[cp]{also a cindex in itemize}%
+\item \index[cp]{also a cindex in itemize@also a cindex in itemize}%
bullet item
\end{itemize}
@@ -91,33 +91,33 @@ bullet item
\begin{enumerate}[start=1]
\item
-\index[cp]{index inter in enumerate between lines}%
+\index[cp]{index inter in enumerate between lines@index inter in enumerate
between lines}%
\item enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{index inter in enumerate after line}%
+\item \index[cp]{index inter in enumerate after line@index inter in enumerate
after line}%
enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{index inter in enumerate before line}%
+\item \index[cp]{index inter in enumerate before line@index inter in enumerate
before line}%
\item enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
\item Title
-\item \index[cp]{cindex}%
+\item \index[cp]{cindex@cindex}%
enum
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{first idx}%
-\index[cp]{sedond idx}%
-\index[cp]{another}%
+\item \index[cp]{first idx@first idx}%
+\index[cp]{sedond idx@sedond idx}%
+\index[cp]{another@another}%
enum
\end{enumerate}
@@ -143,7 +143,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfocommandstyletextvar{avar--b}\\
\index[fn]{avar--b@\texttt{avar{-}{-}b}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\GNUTexinfocommandstyletextvar{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -158,28 +158,28 @@ l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table}%
+\item[] \index[cp]{cindex in table@cindex in table}%
\item[{\parbox[b]{\linewidth}{%
\texttt{abb}}}]
l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table}%
+\item[] \index[cp]{cindex in table@cindex in table}%
Texte before first item.
\item[{\parbox[b]{\linewidth}{%
\texttt{abb}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table}%
+\item[] \index[cp]{samp cindex in table@samp cindex in table}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
l--ine samp
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table}%
+\item[] \index[cp]{samp cindex in table@samp cindex in table}%
Texte before first item samp.
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
@@ -187,14 +187,14 @@ Texte before first item samp.
\begin{description}
\item[]
-\index[cp]{cindex between lines}%
+\index[cp]{cindex between lines@cindex between lines}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb1}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{cindex before line}%
+\item[] \index[cp]{cindex before line@cindex before line}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
@@ -202,15 +202,15 @@ Texte before first item samp.
\begin{description}
\item[]
-\index[cp]{cindex after line}%
+\index[cp]{cindex after line@cindex after line}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{cindex first}%
-\index[cp]{second}%
-\index[cp]{third}%
+\item[] \index[cp]{cindex first@cindex first}%
+\index[cp]{second@second}%
+\index[cp]{third@third}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
diff --git
a/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
b/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
index 97b936e619..53b2c93e75 100644
---
a/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
+++
b/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
@@ -67,20 +67,20 @@
\label{anchor:chapter}%
\begin{itemize}[label=-]
-\item \index[cp]{also a cindex in itemize}%
+\item \index[cp]{also a cindex in itemize@also a cindex in itemize}%
e--mph item
\end{itemize}
\begin{itemize}[label=\textbullet{}]
-\item \index[cp]{index entry within itemize}%
+\item \index[cp]{index entry within itemize@index entry within itemize}%
i--tem 1
-\item \index[cp]{index entry right after "@item}%
+\item \index[cp]{index entry right after "@item@index entry right after
"@item}%
i--tem 2
\end{itemize}
\begin{itemize}
\item T--ext before items.
-\item \index[cp]{also a cindex in itemize}%
+\item \index[cp]{also a cindex in itemize@also a cindex in itemize}%
bullet item
\end{itemize}
@@ -91,33 +91,33 @@ bullet item
\begin{enumerate}[start=1]
\item
-\index[cp]{index inter in enumerate between lines}%
+\index[cp]{index inter in enumerate between lines@index inter in enumerate
between lines}%
\item enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{index inter in enumerate after line}%
+\item \index[cp]{index inter in enumerate after line@index inter in enumerate
after line}%
enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{index inter in enumerate before line}%
+\item \index[cp]{index inter in enumerate before line@index inter in enumerate
before line}%
\item enumerate item
\end{enumerate}
\begin{enumerate}[start=1]
\item Title
-\item \index[cp]{cindex}%
+\item \index[cp]{cindex@cindex}%
enum
\end{enumerate}
\begin{enumerate}[start=1]
-\item \index[cp]{first idx}%
-\index[cp]{sedond idx}%
-\index[cp]{another}%
+\item \index[cp]{first idx@first idx}%
+\index[cp]{sedond idx@sedond idx}%
+\index[cp]{another@another}%
enum
\end{enumerate}
@@ -143,7 +143,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfocommandstyletextvar{avar--b}\\
\index[fn]{avar--b@\texttt{avar{-}{-}b}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\GNUTexinfocommandstyletextvar{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -158,28 +158,28 @@ l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table}%
+\item[] \index[cp]{cindex in table@cindex in table}%
\item[{\parbox[b]{\linewidth}{%
\texttt{abb}}}]
l--ine
\end{description}
\begin{description}
-\item[] \index[cp]{cindex in table}%
+\item[] \index[cp]{cindex in table@cindex in table}%
Texte before first item.
\item[{\parbox[b]{\linewidth}{%
\texttt{abb}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table}%
+\item[] \index[cp]{samp cindex in table@samp cindex in table}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
l--ine samp
\end{description}
\begin{description}
-\item[] \index[cp]{samp cindex in table}%
+\item[] \index[cp]{samp cindex in table@samp cindex in table}%
Texte before first item samp.
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
@@ -187,14 +187,14 @@ Texte before first item samp.
\begin{description}
\item[]
-\index[cp]{cindex between lines}%
+\index[cp]{cindex between lines@cindex between lines}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb1}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{cindex before line}%
+\item[] \index[cp]{cindex before line@cindex before line}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
@@ -202,15 +202,15 @@ Texte before first item samp.
\begin{description}
\item[]
-\index[cp]{cindex after line}%
+\index[cp]{cindex after line@cindex after line}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
\begin{description}
-\item[] \index[cp]{cindex first}%
-\index[cp]{second}%
-\index[cp]{third}%
+\item[] \index[cp]{cindex first@cindex first}%
+\index[cp]{second@second}%
+\index[cp]{third@third}%
\item[{\parbox[b]{\linewidth}{%
\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
\end{description}
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 40268acf2a..def8f6f60a 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -125,8 +125,8 @@ kbd:
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{
`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
-\index[cp]{--option}%
-\index[cp]{``}%
+\index[cp]{-option@--option}%
+\index[cp]{""@``}%
\index[fn]{``@\texttt{{`}{`}}}%
\index[fn]{--foption@\texttt{{-}{-}foption}}%
@@ -574,7 +574,7 @@ A small quot---ation
\end{itemize}
\begin{itemize}[label=\textbullet{} a--n itemize line]
-\item \index[cp]{index entry within itemize}%
+\item \index[cp]{index entry within itemize@index entry within itemize}%
i--tem 1
\item i--tem 2
\end{itemize}
@@ -611,7 +611,7 @@ i--tem 1
mu--ltitable headitem &another tab\\
mu--ltitable item &multitable tab\\
mu--ltitable item 2 &multitable tab 2
-\index[cp]{index entry within multitable}%
+\index[cp]{index entry within multitable@index entry within multitable}%
\\
lone mu--ltitable item&\\
\end{tabular}%
@@ -797,7 +797,7 @@ def--fn
\end{tabularx}
\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\index[cp]{index entry within deffn}%
+\index[cp]{index entry within deffn@index entry within deffn}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -1440,7 +1440,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
\emph{a}\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\emph{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -1628,7 +1628,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
a\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
b
\index[fn]{b@\texttt{b}}%
}}]
@@ -1777,8 +1777,8 @@ kbd:
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{
`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
-\index[cp]{--option}%
-\index[cp]{``}%
+\index[cp]{-option@--option}%
+\index[cp]{""@``}%
\index[fn]{``@\texttt{{`}{`}}}%
\index[fn]{--foption@\texttt{{-}{-}foption}}%
@@ -2223,7 +2223,7 @@ A small quot---ation
\end{itemize}
\begin{itemize}[label=\textbullet{} a--n itemize line]
-\item \index[cp]{index entry within itemize}%
+\item \index[cp]{index entry within itemize@index entry within itemize}%
i--tem 1
\item i--tem 2
\end{itemize}
@@ -2260,7 +2260,7 @@ i--tem 1
mu--ltitable headitem &another tab\\
mu--ltitable item &multitable tab\\
mu--ltitable item 2 &multitable tab 2
-\index[cp]{index entry within multitable}%
+\index[cp]{index entry within multitable@index entry within multitable}%
\\
lone mu--ltitable item&\\
\end{tabular}%
@@ -2446,7 +2446,7 @@ def--fn
\end{tabularx}
\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\index[cp]{index entry within deffn}%
+\index[cp]{index entry within deffn@index entry within deffn}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -3089,7 +3089,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
\emph{a}\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\emph{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -3277,7 +3277,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
a\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
b
\index[fn]{b@\texttt{b}}%
}}]
@@ -3447,8 +3447,8 @@ kbd:
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{
`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
-\index[cp]{--option}%
-\index[cp]{``}%
+\index[cp]{-option@--option}%
+\index[cp]{""@``}%
\index[fn]{``@\texttt{{`}{`}}}%
\index[fn]{--foption@\texttt{{-}{-}foption}}%
@@ -3893,7 +3893,7 @@ A small quot---ation
\end{itemize}
\begin{itemize}[label=\textbullet{} a--n itemize line]
-\item \index[cp]{index entry within itemize}%
+\item \index[cp]{index entry within itemize@index entry within itemize}%
i--tem 1
\item i--tem 2
\end{itemize}
@@ -3930,7 +3930,7 @@ i--tem 1
mu--ltitable headitem &another tab\\
mu--ltitable item &multitable tab\\
mu--ltitable item 2 &multitable tab 2
-\index[cp]{index entry within multitable}%
+\index[cp]{index entry within multitable@index entry within multitable}%
\\
lone mu--ltitable item&\\
\end{tabular}%
@@ -4116,7 +4116,7 @@ def--fn
\end{tabularx}
\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\index[cp]{index entry within deffn}%
+\index[cp]{index entry within deffn@index entry within deffn}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -4759,7 +4759,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
\emph{a}\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\emph{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -4947,7 +4947,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
a\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
b
\index[fn]{b@\texttt{b}}%
}}]
@@ -5095,8 +5095,8 @@ kbd:
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{
`\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
-\index[cp]{--option}%
-\index[cp]{``}%
+\index[cp]{-option@--option}%
+\index[cp]{""@``}%
\index[fn]{``@\texttt{{`}{`}}}%
\index[fn]{--foption@\texttt{{-}{-}foption}}%
@@ -5541,7 +5541,7 @@ A small quot---ation
\end{itemize}
\begin{itemize}[label=\textbullet{} a--n itemize line]
-\item \index[cp]{index entry within itemize}%
+\item \index[cp]{index entry within itemize@index entry within itemize}%
i--tem 1
\item i--tem 2
\end{itemize}
@@ -5578,7 +5578,7 @@ i--tem 1
mu--ltitable headitem &another tab\\
mu--ltitable item &multitable tab\\
mu--ltitable item 2 &multitable tab 2
-\index[cp]{index entry within multitable}%
+\index[cp]{index entry within multitable@index entry within multitable}%
\\
lone mu--ltitable item&\\
\end{tabular}%
@@ -5764,7 +5764,7 @@ def--fn
\end{tabularx}
\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\index[cp]{index entry within deffn}%
+\index[cp]{index entry within deffn@index entry within deffn}%
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
\rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -6407,7 +6407,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
\emph{a}\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\emph{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -6595,7 +6595,7 @@ l--ine
\item[{\parbox[b]{\linewidth}{%
a\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
b
\index[fn]{b@\texttt{b}}%
}}]
@@ -6745,8 +6745,8 @@ kbd:\
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four
`\hbox{}`simple-double-\hbox{}-three{-}{-}{-}four{-}{-}{-}-'\hbox{}'\leavevmode{}\\
-\index[cp]{--option}%
-\index[cp]{``}%
+\index[cp]{-option@--option}%
+\index[cp]{""@``}%
\index[fn]{``@\texttt{{`}{`}}}%
\index[fn]{--foption@\texttt{{-}{-}foption}}%
@@ -7341,7 +7341,7 @@ in exdented a @* \leavevmode{}\\ and following
\item \begin{GNUTexinfopreformatted}%
\ttfamily \end{GNUTexinfopreformatted}
\item \begin{GNUTexinfopreformatted}%
-\ttfamily \index[cp]{index entry within itemize}%
+\ttfamily \index[cp]{index entry within itemize@index entry within itemize}%
i{-}{-}tem 1
\end{GNUTexinfopreformatted}
\item \begin{GNUTexinfopreformatted}%
@@ -7426,7 +7426,7 @@ i{-}{-}tem 1
\ttfamily mu{-}{-}ltitable item 2 \end{GNUTexinfopreformatted}&
\begin{GNUTexinfopreformatted}%
\ttfamily multitable tab 2
-\index[cp]{index entry within multitable}%
+\index[cp]{index entry within multitable@index entry within multitable}%
\end{GNUTexinfopreformatted}\\
\begin{GNUTexinfopreformatted}%
\ttfamily lone mu{-}{-}ltitable item
@@ -7673,7 +7673,7 @@ f--ormat
\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
\begin{GNUTexinfopreformatted}%
-\ttfamily \index[cp]{index entry within deffn}%
+\ttfamily \index[cp]{index entry within deffn@index entry within deffn}%
\end{GNUTexinfopreformatted}
\noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -8477,7 +8477,7 @@ b
\item[{\parbox[b]{\linewidth}{%
\emph{a}\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
\emph{b}
\index[fn]{b@\texttt{b}}%
}}]
@@ -8751,7 +8751,7 @@ a--missing style formatting}}]
\item[{\parbox[b]{\linewidth}{%
a\\
\index[fn]{a@\texttt{a}}%
-\index[cp]{index entry between item and itemx}%
+\index[cp]{index entry between item and itemx@index entry between item and
itemx}%
b
\index[fn]{b@\texttt{b}}%
}}]
@@ -8897,27 +8897,27 @@ b
\end{GNUTexinfopreformatted}
\end{GNUTexinfoindented}
-\index[cp]{t--ruc}%
-\index[cp]{T--ruc}%
-\index[cp]{.}%
-\index[cp]{?}%
-\index[cp]{a}%
+\index[cp]{t-ruc@t--ruc}%
+\index[cp]{T-ruc@T--ruc}%
+\index[cp]{.@.}%
+\index[cp]{?@?}%
+\index[cp]{a@a}%
\index[fn]{t--ruc@\texttt{t{-}{-}ruc}}%
\index[fn]{T--ruc@\texttt{T{-}{-}ruc}}%
\index[fn]{.@\texttt{.}}%
\index[fn]{?@\texttt{?}}%
\index[fn]{a@\texttt{a}}%
-\index[cp]{a---a}%
-\index[cp]{b---b!c---c}%
-\index[cp]{d---dd!e---ee!f---ff}%
+\index[cp]{a--a@a---a}%
+\index[cp]{b--b@b---b!c--c@c---c}%
+\index[cp]{d--dd@d---dd!e--ee@e---ee!f--ff@f---ff}%
\index[fn]{f---aa@\texttt{f{-}{-}{-}aa}}%
\index[fn]{f---bb@\texttt{f{-}{-}{-}bb}!f---cc@\texttt{f{-}{-}{-}cc}}%
\index[fn]{f---ddd@\texttt{f{-}{-}{-}ddd}!f---eee@\texttt{f{-}{-}{-}eee}!ffff@\texttt{ffff}}%
-\index[cp]{aaa|see{bbb}}%
-\index[cp]{ddd|seealso{ccc}}%
+\index[cp]{aaa@aaa|see{bbb}}%
+\index[cp]{ddd@ddd|seealso{ccc}}%
\index[fn]{f---aaa@\texttt{f{-}{-}{-}aaa}|see{f---bbb}}%
\index[fn]{f---ddd@\texttt{f{-}{-}{-}ddd}|seealso{f---ccc}}%
@@ -8930,25 +8930,25 @@ b
\index[codeidx]{a index---entry te\~{} --- i\^{}@\texttt{a
\GNUTexinfocommandstyletextvar{index---entry}\ t\~{e}\ {-}{-}{-} \^{\i{}}}}%
-\index[truc]{truc}%
+\index[truc]{truc@truc}%
-\index[cp]{g---gg!h---hh jjj!k---kk!l---ll}%
+\index[cp]{g--gg@g---gg!h--hh jjj@h---hh jjj!k--kk@k---kk!l--ll@l---ll}%
\index[fn]{f---ggg@\texttt{f{-}{-}{-}ggg}!f---hhh fjjj@\texttt{f{-}{-}{-}hhh
fjjj}!f---kkk@\texttt{f{-}{-}{-}kkk}!f---lll@\texttt{f{-}{-}{-}lll}}%
-\index[cp]{ddd|seealso{ccc}}%
+\index[cp]{ddd@ddd|seealso{ccc}}%
\index[fn]{f---ddd@\texttt{f{-}{-}{-}ddd}|seealso{f---ccc}}%
Text\footnote{in footnote
-\index[cp]{index entry in footnote}%
+\index[cp]{index entry in footnote@index entry in footnote}%
Blah
Blih
-\index[cp]{counting entry}%
+\index[cp]{counting entry@counting entry}%
}
truc
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/LaTeX.pm (_index_entry): Always output a sort key for cases like '@cindex @code{aaa} bbb' where the index text uses \commands.,
Gavin D. Smith <=