[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Remove setfilename in index tests with latex
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Remove setfilename in index tests with latex |
|
Date: |
Thu, 01 Sep 2022 12:31:29 -0400 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new d2d3a5257a Remove setfilename in index tests with latex
d2d3a5257a is described below
commit d2d3a5257a544dd9fb529705a1051c9099a01b4e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Sep 1 18:31:00 2022 +0200
Remove setfilename in index tests with latex
---
tp/t/09indices.t | 20 +-
tp/t/results/indices/def_syn_indices.pl | 257 ++++++++++++++-------
.../def_syn_indices/res_latex/def_syn_indices.tex | 120 ----------
tp/t/results/indices/double_seeentry_seealso.pl | 176 ++++++++------
.../res_latex/double_seeentry_seealso.tex | 76 ------
tp/t/results/indices/seeentry.pl | 167 +++++++------
.../indices/seeentry/res_latex/seeentry.tex | 77 ------
tp/t/results/indices/subentries.pl | 205 +++++++++-------
.../indices/subentries/res_latex/subentries.tex | 87 -------
tp/t/results/indices/subentry_and_sortas.pl | 172 ++++++++------
.../res_latex/subentry_and_sortas.tex | 81 -------
11 files changed, 609 insertions(+), 829 deletions(-)
diff --git a/tp/t/09indices.t b/tp/t/09indices.t
index c297ba869d..3c81c000c6 100644
--- a/tp/t/09indices.t
+++ b/tp/t/09indices.t
@@ -416,9 +416,7 @@ vr index.
@printindex vr
'],
['def_syn_indices',
-'@setfilename def_syn_indices.info
-
-@syncodeindex cp fn
+'@syncodeindex cp fn
@node Top
@top top
@@ -548,9 +546,7 @@ in a reuglar para @sortas{foo}. @code{inside another
@sortas{command}}.
@printindex cp
'],
['subentries',
-'@setfilename subentries.info
-
-@node Top
+'@node Top
@top
@node chapter index
@@ -571,9 +567,7 @@ in a reuglar para @sortas{foo}. @code{inside another
@sortas{command}}.
', {'test_formats' => ['docbook']}
],
['seeentry',
-'@setfilename seeentry.info
-
-@node Top
+'@node Top
@top
@node chapter index
@@ -590,9 +584,7 @@ in a reuglar para @sortas{foo}. @code{inside another
@sortas{command}}.
', {'test_formats' => ['docbook']}
],
['double_seeentry_seealso',
-'@setfilename double_seeentry_seealso.info
-
-@node top
+'@node top
@top top
@node node index
@@ -615,9 +607,7 @@ in a reuglar para @sortas{foo}. @code{inside another
@sortas{command}}.
@printindex cp
'],
['subentry_and_sortas',
-'@setfilename subentry_and_sortas.info
-
-@node Top
+'@node Top
@top
@node chapter index
diff --git a/tp/t/results/indices/def_syn_indices.pl
b/tp/t/results/indices/def_syn_indices.pl
index ba3fab6121..405786012e 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -11,41 +11,6 @@ $result_trees{'def_syn_indices'} = {
'contents' => [
{
'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'def_syn_indices.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'def_syn_indices.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- },
{
'args' => [
{
@@ -74,7 +39,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -129,7 +94,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 5,
+ 'line_nr' => 3,
'macro' => ''
}
},
@@ -165,7 +130,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -207,7 +172,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 8,
+ 'line_nr' => 6,
'macro' => ''
}
},
@@ -270,7 +235,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -325,7 +290,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -363,7 +328,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
},
@@ -399,7 +364,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -425,7 +390,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -455,7 +420,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -469,7 +434,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
}
@@ -501,7 +466,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -548,7 +513,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 21,
+ 'line_nr' => 19,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -587,7 +552,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 23,
+ 'line_nr' => 21,
'macro' => ''
}
},
@@ -633,7 +598,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 25,
+ 'line_nr' => 23,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -674,7 +639,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 26,
+ 'line_nr' => 24,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -713,7 +678,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 28,
+ 'line_nr' => 26,
'macro' => ''
}
},
@@ -750,7 +715,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 30,
+ 'line_nr' => 28,
'macro' => ''
}
},
@@ -781,7 +746,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 31,
+ 'line_nr' => 29,
'macro' => ''
}
},
@@ -819,7 +784,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 33,
+ 'line_nr' => 31,
'macro' => ''
}
},
@@ -851,7 +816,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 34,
+ 'line_nr' => 32,
'macro' => ''
}
},
@@ -897,7 +862,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 36,
+ 'line_nr' => 34,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -944,7 +909,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 38,
+ 'line_nr' => 36,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -993,7 +958,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 41,
+ 'line_nr' => 39,
'macro' => ''
}
},
@@ -1041,7 +1006,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 44,
+ 'line_nr' => 42,
'macro' => ''
}
},
@@ -1089,7 +1054,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 47,
+ 'line_nr' => 45,
'macro' => ''
}
},
@@ -1137,7 +1102,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => ''
}
},
@@ -1185,7 +1150,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => ''
}
},
@@ -1233,7 +1198,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => ''
}
},
@@ -1281,7 +1246,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 59,
+ 'line_nr' => 57,
'macro' => ''
}
},
@@ -1329,7 +1294,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 62,
+ 'line_nr' => 60,
'macro' => ''
}
},
@@ -1377,7 +1342,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 65,
+ 'line_nr' => 63,
'macro' => ''
}
}
@@ -1388,7 +1353,7 @@ $result_trees{'def_syn_indices'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
}
@@ -1399,10 +1364,6 @@
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'a
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0];
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0];
-$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0];
-$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0];
$result_trees{'def_syn_indices'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'def_syn_indices'}{'contents'}[0];
$result_trees{'def_syn_indices'}{'contents'}[0]{'parent'} =
$result_trees{'def_syn_indices'};
$result_trees{'def_syn_indices'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def_syn_indices'}{'contents'}[1]{'args'}[0];
@@ -1578,9 +1539,7 @@
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[53]{'args'}[0]{'pare
$result_trees{'def_syn_indices'}{'contents'}[4]{'contents'}[53]{'parent'} =
$result_trees{'def_syn_indices'}{'contents'}[4];
$result_trees{'def_syn_indices'}{'contents'}[4]{'parent'} =
$result_trees{'def_syn_indices'};
-$result_texis{'def_syn_indices'} = '@setfilename def_syn_indices.info
-
-@syncodeindex cp fn
+$result_texis{'def_syn_indices'} = '@syncodeindex cp fn
@node Top
@top top
@@ -1647,7 +1606,6 @@ fn
$result_texts{'def_syn_indices'} = '
-
top
***
@@ -1784,7 +1742,7 @@ $result_errors{'def_syn_indices'} = [
'error_line' => 'warning: printing an index `ky\' merged in another one,
`pg\'
',
'file_name' => '',
- 'line_nr' => 44,
+ 'line_nr' => 42,
'macro' => '',
'text' => 'printing an index `ky\' merged in another one, `pg\'',
'type' => 'warning'
@@ -1793,7 +1751,7 @@ $result_errors{'def_syn_indices'} = [
'error_line' => 'warning: printing an index `truc\' merged in another one,
`fn\'
',
'file_name' => '',
- 'line_nr' => 47,
+ 'line_nr' => 45,
'macro' => '',
'text' => 'printing an index `truc\' merged in another one, `fn\'',
'type' => 'warning'
@@ -1802,7 +1760,7 @@ $result_errors{'def_syn_indices'} = [
'error_line' => 'warning: printing an index `truc\' merged in another one,
`fn\'
',
'file_name' => '',
- 'line_nr' => 50,
+ 'line_nr' => 48,
'macro' => '',
'text' => 'printing an index `truc\' merged in another one, `fn\'',
'type' => 'warning'
@@ -1811,7 +1769,7 @@ $result_errors{'def_syn_indices'} = [
'error_line' => 'warning: printing an index `cp\' merged in another one,
`fn\'
',
'file_name' => '',
- 'line_nr' => 53,
+ 'line_nr' => 51,
'macro' => '',
'text' => 'printing an index `cp\' merged in another one, `fn\'',
'type' => 'warning'
@@ -1820,7 +1778,7 @@ $result_errors{'def_syn_indices'} = [
'error_line' => 'warning: printing an index `cp\' merged in another one,
`fn\'
',
'file_name' => '',
- 'line_nr' => 56,
+ 'line_nr' => 54,
'macro' => '',
'text' => 'printing an index `cp\' merged in another one, `fn\'',
'type' => 'warning'
@@ -1829,7 +1787,7 @@ $result_errors{'def_syn_indices'} = [
'error_line' => 'warning: printing an index `defg\' merged in another one,
`pg\'
',
'file_name' => '',
- 'line_nr' => 59,
+ 'line_nr' => 57,
'macro' => '',
'text' => 'printing an index `defg\' merged in another one, `pg\'',
'type' => 'warning'
@@ -1838,7 +1796,7 @@ $result_errors{'def_syn_indices'} = [
'error_line' => 'warning: printing an index `abc\' merged in another one,
`pg\'
',
'file_name' => '',
- 'line_nr' => 62,
+ 'line_nr' => 60,
'macro' => '',
'text' => 'printing an index `abc\' merged in another one, `pg\'',
'type' => 'warning'
@@ -1938,10 +1896,10 @@ $result_indices_sort_strings{'def_syn_indices'} = {
-$result_converted{'info'}->{'def_syn_indices'} = 'This is
def_syn_indices.info, produced from .
+$result_converted{'info'}->{'def_syn_indices'} = 'This is , produced from .
-File: def_syn_indices.info, Node: Top, Next: Chapter index, Up: (dir)
+File: , Node: Top, Next: Chapter index, Up: (dir)
top
***
@@ -1951,7 +1909,7 @@ top
* Chapter index::
-File: def_syn_indices.info, Node: Chapter index, Prev: Top, Up: Top
+File: , Node: Chapter index, Prev: Top, Up: Top
1 Index
*******
@@ -1993,8 +1951,8 @@ definedx truc after
Tag Table:
-Node: Top47
-Node: Chapter index160
+Node: Top27
+Node: Chapter index120
End Tag Table
@@ -2047,7 +2005,6 @@ definedx truc after
$result_converted{'html_text'}->{'def_syn_indices'} = '
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
@@ -2166,4 +2123,126 @@ after
</div>
';
+
+$result_converted{'file_latex'}->{'def_syn_indices'} = '\\documentclass{book}
+\\usepackage{imakeidx}
+\\usepackage{amsfonts}
+\\usepackage{amsmath}
+\\usepackage[gen]{eurosym}
+\\usepackage[T1]{fontenc}
+\\usepackage{textcomp}
+\\usepackage{graphicx}
+\\usepackage{etoolbox}
+\\usepackage{titleps}
+\\usepackage{float}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\\usepackage[hidelinks]{hyperref}
+\\usepackage[utf8]{inputenc}
+
+\\makeatletter
+\\newcommand{\\GNUTexinfosettitle}{No Title}%
+
+\\makeindex[name=codeidx]%
+\\makeindex[name=fn]%
+\\makeindex[name=pg]%
+
+% style command for var in \'cmd_text\' formatting context
+\\newcommand\\GNUTexinfocommandstyletextvar[1]{{\\normalfont{}\\textsl{#1}}}%
+
+% redefine the \\mainmatter command such that it does not clear page
+% as if in double page
+\\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
+% add command aliases to use the same command in book and report
+\\newcommand\\GNUTexinfomainmatter{\\mainmatter}
+\\newcommand\\GNUTexinfofrontmatter{\\frontmatter}
+\\newenvironment{GNUTexinfopreformatted}{%
+ \\par\\obeylines\\obeyspaces\\frenchspacing
+ \\parskip=\\z@\\parindent=\\z@}{}
+\\newenvironment{GNUTexinfoindented}
+ {\\begin{list}{}{}
+ \\item\\relax}
+ {\\end{list}}
+% command that does nothing used to help with substitutions in commands
+\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+
+% plain page style, for part and chapter, which call \\thispagestyle{plain}
+\\renewpagestyle{plain}{\\sethead[\\thepage{}][][]
+ {}{}{\\thepage{}}}
+
+% single header
+\\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{}
\\chaptertitle{}][][\\thepage]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting single headers
+\\newcommand{\\GNUTexinfosetsingleheader}{\\pagestyle{single}}
+
+% double header
+\\newpagestyle{double}{\\sethead[\\thepage{}][][\\GNUTexinfosettitle]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting double headers
+\\newcommand{\\GNUTexinfosetdoubleheader}{\\pagestyle{double}}
+
+
+% avoid pagebreak and headings setting for a sectionning command
+\\newcommand{\\GNUTexinfonopagebreakheading}[2]{{\\let\\clearpage\\relax
\\let\\cleardoublepage\\relax \\let\\thispagestyle\\GNUTexinfoplaceholder
#1{#2}}}
+
+\\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
+
+\\makeatother
+% set default for @setchapternewpage
+\\makeatletter
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
+\\makeatother
+\\GNUTexinfosetsingleheader{}%
+
+
+\\begin{document}
+\\label{anchor:Top}%
+\\chapter{{Index}}
+\\label{anchor:Chapter-index}%
+
+definedx truc
+after
+
+\\index[fn]{index truc}%
+
+
+\\index[codeidx]{a index entry te\\~{} i\\^{}@\\texttt{a
\\GNUTexinfocommandstyletextvar{index entry}\\ t\\~{e}\\ \\^{\\i{}}}}%
+
+\\index[fn]{cindex entry@\\texttt{cindex entry}}%
+
+
+\\index[pg]{truc kindex@\\texttt{truc kindex}}%
+\\index[pg]{pindex codeidx@\\texttt{pindex codeidx}}%
+
+
+
+
+\\index[pg]{defg index entry}%
+
+\\index[pg]{abc index entry}%
+
+pg
+\\printindex[pg]
+
+ky
+
+truc
+
+value truc
+
+cp
+
+value cp
+
+defg
+
+abc
+
+fn
+\\printindex[fn]
+\\end{document}
+';
+
1;
diff --git a/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
b/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
deleted file mode 100644
index 33c3569208..0000000000
--- a/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
+++ /dev/null
@@ -1,120 +0,0 @@
-\documentclass{book}
-\usepackage{imakeidx}
-\usepackage{amsfonts}
-\usepackage{amsmath}
-\usepackage[gen]{eurosym}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{graphicx}
-\usepackage{etoolbox}
-\usepackage{titleps}
-\usepackage{float}
-% use hidelinks to remove boxes around links to be similar with Texinfo TeX
-\usepackage[hidelinks]{hyperref}
-\usepackage[utf8]{inputenc}
-
-\makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
-
-\makeindex[name=codeidx]%
-\makeindex[name=fn]%
-\makeindex[name=pg]%
-
-% style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
-
-% redefine the \mainmatter command such that it does not clear page
-% as if in double page
-\renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-% add command aliases to use the same command in book and report
-\newcommand\GNUTexinfomainmatter{\mainmatter}
-\newcommand\GNUTexinfofrontmatter{\frontmatter}
-\newenvironment{GNUTexinfopreformatted}{%
- \par\obeylines\obeyspaces\frenchspacing
- \parskip=\z@\parindent=\z@}{}
-\newenvironment{GNUTexinfoindented}
- {\begin{list}{}{}
- \item\relax}
- {\end{list}}
-% command that does nothing used to help with substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
-
-% plain page style, for part and chapter, which call \thispagestyle{plain}
-\renewpagestyle{plain}{\sethead[\thepage{}][][]
- {}{}{\thepage{}}}
-
-% single header
-\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting single headers
-\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{single}}
-
-% double header
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting double headers
-\newcommand{\GNUTexinfosetdoubleheader}{\pagestyle{double}}
-
-
-% avoid pagebreak and headings setting for a sectionning command
-\newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
-
-\renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
-
-\makeatother
-% set default for @setchapternewpage
-\makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
-\makeatother
-\GNUTexinfosetsingleheader{}%
-
-
-
-\begin{document}
-\label{anchor:Top}%
-\chapter{{Index}}
-\label{anchor:Chapter-index}%
-
-definedx truc
-after
-
-\index[fn]{index truc}%
-
-
-\index[codeidx]{a index entry te\~{} i\^{}@\texttt{a
\GNUTexinfocommandstyletextvar{index entry}\ t\~{e}\ \^{\i{}}}}%
-
-\index[fn]{cindex entry@\texttt{cindex entry}}%
-
-
-\index[pg]{truc kindex@\texttt{truc kindex}}%
-\index[pg]{pindex codeidx@\texttt{pindex codeidx}}%
-
-
-
-
-\index[pg]{defg index entry}%
-
-\index[pg]{abc index entry}%
-
-pg
-\printindex[pg]
-
-ky
-
-truc
-
-value truc
-
-cp
-
-value cp
-
-defg
-
-abc
-
-fn
-\printindex[fn]
-\end{document}
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl
b/tp/t/results/indices/double_seeentry_seealso.pl
index 7c53e49731..f887d66d77 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -10,43 +10,7 @@ $result_trees{'double_seeentry_seealso'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'double_seeentry_seealso.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'double_seeentry_seealso.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -91,7 +55,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -127,7 +91,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -169,7 +133,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -229,7 +193,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -256,7 +220,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
}
@@ -288,7 +252,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -315,7 +279,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -351,7 +315,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
@@ -383,7 +347,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -419,7 +383,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -446,7 +410,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -479,7 +443,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -506,7 +470,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -564,7 +528,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -586,7 +550,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -594,7 +558,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -633,7 +597,7 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
}
}
@@ -644,17 +608,13 @@ $result_trees{'double_seeentry_seealso'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0];
-$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0];
$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'double_seeentry_seealso'}{'contents'}[0];
$result_trees{'double_seeentry_seealso'}{'contents'}[0]{'parent'} =
$result_trees{'double_seeentry_seealso'};
$result_trees{'double_seeentry_seealso'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'double_seeentry_seealso'}{'contents'}[1]{'args'}[0];
@@ -748,9 +708,7 @@
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[7]{'args'}[0
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'contents'}[7]{'parent'}
= $result_trees{'double_seeentry_seealso'}{'contents'}[4];
$result_trees{'double_seeentry_seealso'}{'contents'}[4]{'parent'} =
$result_trees{'double_seeentry_seealso'};
-$result_texis{'double_seeentry_seealso'} = '@setfilename
double_seeentry_seealso.info
-
-@node top
+$result_texis{'double_seeentry_seealso'} = '@node top
@top top
@node node index
@@ -765,8 +723,7 @@ $result_texis{'double_seeentry_seealso'} = '@setfilename
double_seeentry_seealso
';
-$result_texts{'double_seeentry_seealso'} = '
-top
+$result_texts{'double_seeentry_seealso'} = 'top
***
1 Chapter Index
@@ -886,10 +843,10 @@ $result_converted{'docbook'}->{'double_seeentry_seealso'}
= '<chapter label="1"
';
-$result_converted{'info'}->{'double_seeentry_seealso'} = 'This is
double_seeentry_seealso.info, produced from .
+$result_converted{'info'}->{'double_seeentry_seealso'} = 'This is , produced
from .
-File: double_seeentry_seealso.info, Node: Top, Next: node index, Up: (dir)
+File: , Node: Top, Next: node index, Up: (dir)
top
***
@@ -899,7 +856,7 @@ top
* node index::
-File: double_seeentry_seealso.info, Node: node index, Prev: Top, Up: Top
+File: , Node: node index, Prev: Top, Up: Top
1 Chapter Index
***************
@@ -907,8 +864,8 @@ File: double_seeentry_seealso.info, Node: node index,
Prev: Top, Up: Top
Tag Table:
-Node: Top55
-Node: node index170
+Node: Top27
+Node: node index114
End Tag Table
@@ -928,8 +885,7 @@ $result_converted{'plaintext'}->{'double_seeentry_seealso'}
= 'top
';
-$result_converted{'html_text'}->{'double_seeentry_seealso'} = '
-<div class="top-level-extent" id="Top">
+$result_converted{'html_text'}->{'double_seeentry_seealso'} = '<div
class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
[<a href="#node-index" title="Index" rel="index">Index</a>]</p>
@@ -952,4 +908,82 @@
$result_converted{'html_text'}->{'double_seeentry_seealso'} = '
</div>
';
+
+$result_converted{'file_latex'}->{'double_seeentry_seealso'} =
'\\documentclass{book}
+\\usepackage{amsfonts}
+\\usepackage{amsmath}
+\\usepackage[gen]{eurosym}
+\\usepackage[T1]{fontenc}
+\\usepackage{textcomp}
+\\usepackage{graphicx}
+\\usepackage{etoolbox}
+\\usepackage{titleps}
+\\usepackage{float}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\\usepackage[hidelinks]{hyperref}
+\\usepackage[utf8]{inputenc}
+
+\\makeatletter
+\\newcommand{\\GNUTexinfosettitle}{No Title}%
+
+% redefine the \\mainmatter command such that it does not clear page
+% as if in double page
+\\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
+% add command aliases to use the same command in book and report
+\\newcommand\\GNUTexinfomainmatter{\\mainmatter}
+\\newcommand\\GNUTexinfofrontmatter{\\frontmatter}
+\\newenvironment{GNUTexinfopreformatted}{%
+ \\par\\obeylines\\obeyspaces\\frenchspacing
+ \\parskip=\\z@\\parindent=\\z@}{}
+\\newenvironment{GNUTexinfoindented}
+ {\\begin{list}{}{}
+ \\item\\relax}
+ {\\end{list}}
+% command that does nothing used to help with substitutions in commands
+\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+
+% plain page style, for part and chapter, which call \\thispagestyle{plain}
+\\renewpagestyle{plain}{\\sethead[\\thepage{}][][]
+ {}{}{\\thepage{}}}
+
+% single header
+\\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{}
\\chaptertitle{}][][\\thepage]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting single headers
+\\newcommand{\\GNUTexinfosetsingleheader}{\\pagestyle{single}}
+
+% double header
+\\newpagestyle{double}{\\sethead[\\thepage{}][][\\GNUTexinfosettitle]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting double headers
+\\newcommand{\\GNUTexinfosetdoubleheader}{\\pagestyle{double}}
+
+
+% avoid pagebreak and headings setting for a sectionning command
+\\newcommand{\\GNUTexinfonopagebreakheading}[2]{{\\let\\clearpage\\relax
\\let\\cleardoublepage\\relax \\let\\thispagestyle\\GNUTexinfoplaceholder
#1{#2}}}
+
+\\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
+
+\\makeatother
+% set default for @setchapternewpage
+\\makeatletter
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
+\\makeatother
+\\GNUTexinfosetsingleheader{}%
+
+\\begin{document}
+\\label{anchor:Top}%
+\\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}}%
+
+\\end{document}
+';
+
1;
diff --git
a/tp/t/results/indices/double_seeentry_seealso/res_latex/double_seeentry_seealso.tex
b/tp/t/results/indices/double_seeentry_seealso/res_latex/double_seeentry_seealso.tex
deleted file mode 100644
index d47ec29f28..0000000000
---
a/tp/t/results/indices/double_seeentry_seealso/res_latex/double_seeentry_seealso.tex
+++ /dev/null
@@ -1,76 +0,0 @@
-\documentclass{book}
-\usepackage{amsfonts}
-\usepackage{amsmath}
-\usepackage[gen]{eurosym}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{graphicx}
-\usepackage{etoolbox}
-\usepackage{titleps}
-\usepackage{float}
-% use hidelinks to remove boxes around links to be similar with Texinfo TeX
-\usepackage[hidelinks]{hyperref}
-\usepackage[utf8]{inputenc}
-
-\makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
-
-% redefine the \mainmatter command such that it does not clear page
-% as if in double page
-\renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-% add command aliases to use the same command in book and report
-\newcommand\GNUTexinfomainmatter{\mainmatter}
-\newcommand\GNUTexinfofrontmatter{\frontmatter}
-\newenvironment{GNUTexinfopreformatted}{%
- \par\obeylines\obeyspaces\frenchspacing
- \parskip=\z@\parindent=\z@}{}
-\newenvironment{GNUTexinfoindented}
- {\begin{list}{}{}
- \item\relax}
- {\end{list}}
-% command that does nothing used to help with substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
-
-% plain page style, for part and chapter, which call \thispagestyle{plain}
-\renewpagestyle{plain}{\sethead[\thepage{}][][]
- {}{}{\thepage{}}}
-
-% single header
-\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting single headers
-\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{single}}
-
-% double header
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting double headers
-\newcommand{\GNUTexinfosetdoubleheader}{\pagestyle{double}}
-
-
-% avoid pagebreak and headings setting for a sectionning command
-\newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
-
-\renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
-
-\makeatother
-% set default for @setchapternewpage
-\makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
-\makeatother
-\GNUTexinfosetsingleheader{}%
-
-
-\begin{document}
-\label{anchor:Top}%
-\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}}%
-
-\end{document}
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index c4ec30c9c6..e4b609b0ba 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -10,43 +10,7 @@ $result_trees{'seeentry'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'seeentry.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'seeentry.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -91,7 +55,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -120,7 +84,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -162,7 +126,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -222,7 +186,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
}
@@ -254,7 +218,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -281,7 +245,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
},
@@ -322,7 +286,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -364,7 +328,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -396,7 +360,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -423,7 +387,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -464,7 +428,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -502,7 +466,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
},
@@ -533,7 +497,7 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
}
@@ -544,17 +508,13 @@ $result_trees{'seeentry'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'seeentry'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'seeentry'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'seeentry'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'seeentry'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'seeentry'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'seeentry'}{'contents'}[0]{'contents'}[0];
-$result_trees{'seeentry'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'seeentry'}{'contents'}[0]{'contents'}[0];
$result_trees{'seeentry'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'seeentry'}{'contents'}[0];
$result_trees{'seeentry'}{'contents'}[0]{'parent'} = $result_trees{'seeentry'};
$result_trees{'seeentry'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} =
$result_trees{'seeentry'}{'contents'}[1]{'args'}[0];
@@ -631,9 +591,7 @@
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'parent'} = $
$result_trees{'seeentry'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'seeentry'}{'contents'}[4];
$result_trees{'seeentry'}{'contents'}[4]{'parent'} = $result_trees{'seeentry'};
-$result_texis{'seeentry'} = '@setfilename seeentry.info
-
-@node Top
+$result_texis{'seeentry'} = '@node Top
@top
@node chapter index
@@ -651,7 +609,6 @@ $result_texis{'seeentry'} = '@setfilename seeentry.info
$result_texts{'seeentry'} = '
-
1 Index
*******
@@ -773,17 +730,17 @@ $result_converted{'docbook'}->{'seeentry'} = '<chapter
label="1" id="chapter-ind
';
-$result_converted{'info'}->{'seeentry'} = 'This is seeentry.info, produced
from .
+$result_converted{'info'}->{'seeentry'} = 'This is , produced from .
-File: seeentry.info, Node: Top, Next: chapter index, Up: (dir)
+File: , Node: Top, Next: chapter index, Up: (dir)
* Menu:
* chapter index::
-File: seeentry.info, Node: chapter index, Prev: Top, Up: Top
+File: , Node: chapter index, Prev: Top, Up: Top
1 Index
*******
@@ -791,8 +748,8 @@ File: seeentry.info, Node: chapter index, Prev: Top, Up:
Top
Tag Table:
-Node: Top40
-Node: chapter index137
+Node: Top27
+Node: chapter index111
End Tag Table
@@ -809,8 +766,7 @@ $result_converted{'plaintext'}->{'seeentry'} = '1 Index
';
-$result_converted{'html_text'}->{'seeentry'} = '
-<div class="top-level-extent" id="Top">
+$result_converted{'html_text'}->{'seeentry'} = '<div class="top-level-extent"
id="Top">
<div class="nav-panel">
<p>
[<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -833,4 +789,83 @@ $result_converted{'html_text'}->{'seeentry'} = '
</div>
';
+
+$result_converted{'file_latex'}->{'seeentry'} = '\\documentclass{book}
+\\usepackage{amsfonts}
+\\usepackage{amsmath}
+\\usepackage[gen]{eurosym}
+\\usepackage[T1]{fontenc}
+\\usepackage{textcomp}
+\\usepackage{graphicx}
+\\usepackage{etoolbox}
+\\usepackage{titleps}
+\\usepackage{float}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\\usepackage[hidelinks]{hyperref}
+\\usepackage[utf8]{inputenc}
+
+\\makeatletter
+\\newcommand{\\GNUTexinfosettitle}{No Title}%
+
+% redefine the \\mainmatter command such that it does not clear page
+% as if in double page
+\\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
+% add command aliases to use the same command in book and report
+\\newcommand\\GNUTexinfomainmatter{\\mainmatter}
+\\newcommand\\GNUTexinfofrontmatter{\\frontmatter}
+\\newenvironment{GNUTexinfopreformatted}{%
+ \\par\\obeylines\\obeyspaces\\frenchspacing
+ \\parskip=\\z@\\parindent=\\z@}{}
+\\newenvironment{GNUTexinfoindented}
+ {\\begin{list}{}{}
+ \\item\\relax}
+ {\\end{list}}
+% command that does nothing used to help with substitutions in commands
+\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+
+% plain page style, for part and chapter, which call \\thispagestyle{plain}
+\\renewpagestyle{plain}{\\sethead[\\thepage{}][][]
+ {}{}{\\thepage{}}}
+
+% single header
+\\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{}
\\chaptertitle{}][][\\thepage]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting single headers
+\\newcommand{\\GNUTexinfosetsingleheader}{\\pagestyle{single}}
+
+% double header
+\\newpagestyle{double}{\\sethead[\\thepage{}][][\\GNUTexinfosettitle]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting double headers
+\\newcommand{\\GNUTexinfosetdoubleheader}{\\pagestyle{double}}
+
+
+% avoid pagebreak and headings setting for a sectionning command
+\\newcommand{\\GNUTexinfonopagebreakheading}[2]{{\\let\\clearpage\\relax
\\let\\cleardoublepage\\relax \\let\\thispagestyle\\GNUTexinfoplaceholder
#1{#2}}}
+
+\\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
+
+\\makeatother
+% set default for @setchapternewpage
+\\makeatletter
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
+\\makeatother
+\\GNUTexinfosetsingleheader{}%
+
+\\begin{document}
+\\label{anchor:Top}%
+\\chapter{{Index}}
+\\label{anchor:chapter-index}%
+
+\\index[cp]{aaa|see{bbb}}%
+\\index[cp]{ddd|seealso{ccc}}%
+
+\\index[fn]{f--aaa@\\texttt{f{-}{-}{-}aaa}|see{f---bbb}}%
+\\index[fn]{f--ddd@\\texttt{f{-}{-}{-}ddd}|seealso{f---ccc}}%
+
+\\end{document}
+';
+
1;
diff --git a/tp/t/results/indices/seeentry/res_latex/seeentry.tex
b/tp/t/results/indices/seeentry/res_latex/seeentry.tex
deleted file mode 100644
index 5759a0340e..0000000000
--- a/tp/t/results/indices/seeentry/res_latex/seeentry.tex
+++ /dev/null
@@ -1,77 +0,0 @@
-\documentclass{book}
-\usepackage{amsfonts}
-\usepackage{amsmath}
-\usepackage[gen]{eurosym}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{graphicx}
-\usepackage{etoolbox}
-\usepackage{titleps}
-\usepackage{float}
-% use hidelinks to remove boxes around links to be similar with Texinfo TeX
-\usepackage[hidelinks]{hyperref}
-\usepackage[utf8]{inputenc}
-
-\makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
-
-% redefine the \mainmatter command such that it does not clear page
-% as if in double page
-\renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-% add command aliases to use the same command in book and report
-\newcommand\GNUTexinfomainmatter{\mainmatter}
-\newcommand\GNUTexinfofrontmatter{\frontmatter}
-\newenvironment{GNUTexinfopreformatted}{%
- \par\obeylines\obeyspaces\frenchspacing
- \parskip=\z@\parindent=\z@}{}
-\newenvironment{GNUTexinfoindented}
- {\begin{list}{}{}
- \item\relax}
- {\end{list}}
-% command that does nothing used to help with substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
-
-% plain page style, for part and chapter, which call \thispagestyle{plain}
-\renewpagestyle{plain}{\sethead[\thepage{}][][]
- {}{}{\thepage{}}}
-
-% single header
-\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting single headers
-\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{single}}
-
-% double header
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting double headers
-\newcommand{\GNUTexinfosetdoubleheader}{\pagestyle{double}}
-
-
-% avoid pagebreak and headings setting for a sectionning command
-\newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
-
-\renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
-
-\makeatother
-% set default for @setchapternewpage
-\makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
-\makeatother
-\GNUTexinfosetsingleheader{}%
-
-
-\begin{document}
-\label{anchor:Top}%
-\chapter{{Index}}
-\label{anchor:chapter-index}%
-
-\index[cp]{aaa|see{bbb}}%
-\index[cp]{ddd|seealso{ccc}}%
-
-\index[fn]{f--aaa@\texttt{f{-}{-}{-}aaa}|see{f---bbb}}%
-\index[fn]{f--ddd@\texttt{f{-}{-}{-}ddd}|seealso{f---ccc}}%
-
-\end{document}
diff --git a/tp/t/results/indices/subentries.pl
b/tp/t/results/indices/subentries.pl
index c8954a663f..739ccca55f 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -10,43 +10,7 @@ $result_trees{'subentries'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'subentries.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'subentries.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -91,7 +55,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -120,7 +84,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -162,7 +126,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -227,7 +191,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -288,7 +252,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
}
}
@@ -296,7 +260,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 10,
+ 'line_nr' => 8,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -378,7 +342,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -386,7 +350,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -394,7 +358,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -497,7 +461,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -505,7 +469,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -513,7 +477,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
}
}
@@ -521,7 +485,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -571,7 +535,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -632,7 +596,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
}
}
@@ -640,7 +604,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 15,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -722,7 +686,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
}
@@ -730,7 +694,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
}
}
@@ -738,7 +702,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 16,
+ 'line_nr' => 14,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -841,7 +805,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
@@ -849,7 +813,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
@@ -857,7 +821,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
}
}
@@ -865,7 +829,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -906,7 +870,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 19,
+ 'line_nr' => 17,
'macro' => ''
}
},
@@ -937,7 +901,7 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 20,
+ 'line_nr' => 18,
'macro' => ''
}
}
@@ -948,17 +912,13 @@ $result_trees{'subentries'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'subentries'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'subentries'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'subentries'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'subentries'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'subentries'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'subentries'}{'contents'}[0]{'contents'}[0];
-$result_trees{'subentries'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'subentries'}{'contents'}[0]{'contents'}[0];
$result_trees{'subentries'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'subentries'}{'contents'}[0];
$result_trees{'subentries'}{'contents'}[0]{'parent'} =
$result_trees{'subentries'};
$result_trees{'subentries'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'subentries'}{'contents'}[1]{'args'}[0];
@@ -1091,9 +1051,7 @@
$result_trees{'subentries'}{'contents'}[4]{'contents'}[24]{'args'}[0]{'parent'}
$result_trees{'subentries'}{'contents'}[4]{'contents'}[24]{'parent'} =
$result_trees{'subentries'}{'contents'}[4];
$result_trees{'subentries'}{'contents'}[4]{'parent'} =
$result_trees{'subentries'};
-$result_texis{'subentries'} = '@setfilename subentries.info
-
-@node Top
+$result_texis{'subentries'} = '@node Top
@top
@node chapter index
@@ -1115,7 +1073,6 @@ $result_texis{'subentries'} = '@setfilename
subentries.info
$result_texts{'subentries'} = '
-
1 Index
*******
@@ -1220,7 +1177,7 @@ $result_errors{'subentries'} = [
'error_line' => 'no more than two levels of index subentry are allowed
',
'file_name' => '',
- 'line_nr' => 12,
+ 'line_nr' => 10,
'macro' => '',
'text' => 'no more than two levels of index subentry are allowed',
'type' => 'error'
@@ -1229,7 +1186,7 @@ $result_errors{'subentries'} = [
'error_line' => 'no more than two levels of index subentry are allowed
',
'file_name' => '',
- 'line_nr' => 17,
+ 'line_nr' => 15,
'macro' => '',
'text' => 'no more than two levels of index subentry are allowed',
'type' => 'error'
@@ -1270,17 +1227,17 @@ $result_converted{'docbook'}->{'subentries'} =
'<chapter label="1" id="chapter-i
';
-$result_converted{'info'}->{'subentries'} = 'This is subentries.info, produced
from .
+$result_converted{'info'}->{'subentries'} = 'This is , produced from .
-File: subentries.info, Node: Top, Next: chapter index, Up: (dir)
+File: , Node: Top, Next: chapter index, Up: (dir)
* Menu:
* chapter index::
-File: subentries.info, Node: chapter index, Prev: Top, Up: Top
+File: , Node: chapter index, Prev: Top, Up: Top
1 Index
*******
@@ -1304,8 +1261,8 @@ File: subentries.info, Node: chapter index, Prev: Top,
Up: Top
Tag Table:
-Node: Top42
-Node: chapter index141
+Node: Top27
+Node: chapter index111
End Tag Table
@@ -1336,8 +1293,7 @@ $result_converted{'plaintext'}->{'subentries'} = '1 Index
';
-$result_converted{'html_text'}->{'subentries'} = '
-<div class="top-level-extent" id="Top">
+$result_converted{'html_text'}->{'subentries'} = '<div
class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
[<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -1416,4 +1372,93 @@ $result_converted{'html_text'}->{'subentries'} = '
</div>
';
+
+$result_converted{'file_latex'}->{'subentries'} = '\\documentclass{book}
+\\usepackage{imakeidx}
+\\usepackage{amsfonts}
+\\usepackage{amsmath}
+\\usepackage[gen]{eurosym}
+\\usepackage[T1]{fontenc}
+\\usepackage{textcomp}
+\\usepackage{graphicx}
+\\usepackage{etoolbox}
+\\usepackage{titleps}
+\\usepackage{float}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\\usepackage[hidelinks]{hyperref}
+\\usepackage[utf8]{inputenc}
+
+\\makeatletter
+\\newcommand{\\GNUTexinfosettitle}{No Title}%
+
+\\makeindex[name=cp]%
+\\makeindex[name=fn]%
+
+% redefine the \\mainmatter command such that it does not clear page
+% as if in double page
+\\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
+% add command aliases to use the same command in book and report
+\\newcommand\\GNUTexinfomainmatter{\\mainmatter}
+\\newcommand\\GNUTexinfofrontmatter{\\frontmatter}
+\\newenvironment{GNUTexinfopreformatted}{%
+ \\par\\obeylines\\obeyspaces\\frenchspacing
+ \\parskip=\\z@\\parindent=\\z@}{}
+\\newenvironment{GNUTexinfoindented}
+ {\\begin{list}{}{}
+ \\item\\relax}
+ {\\end{list}}
+% command that does nothing used to help with substitutions in commands
+\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+
+% plain page style, for part and chapter, which call \\thispagestyle{plain}
+\\renewpagestyle{plain}{\\sethead[\\thepage{}][][]
+ {}{}{\\thepage{}}}
+
+% single header
+\\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{}
\\chaptertitle{}][][\\thepage]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting single headers
+\\newcommand{\\GNUTexinfosetsingleheader}{\\pagestyle{single}}
+
+% double header
+\\newpagestyle{double}{\\sethead[\\thepage{}][][\\GNUTexinfosettitle]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting double headers
+\\newcommand{\\GNUTexinfosetdoubleheader}{\\pagestyle{double}}
+
+
+% avoid pagebreak and headings setting for a sectionning command
+\\newcommand{\\GNUTexinfonopagebreakheading}[2]{{\\let\\clearpage\\relax
\\let\\cleardoublepage\\relax \\let\\thispagestyle\\GNUTexinfoplaceholder
#1{#2}}}
+
+\\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
+
+\\makeatother
+% set default for @setchapternewpage
+\\makeatletter
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
+\\makeatother
+\\GNUTexinfosetsingleheader{}%
+
+\\begin{document}
+\\label{anchor:Top}%
+\\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[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[fn]{f---ggg@\\texttt{f{-}{-}{-}ggg}!f---hhh
fjjj@\\texttt{f{-}{-}{-}hhh
fjjj}!f---kkk@\\texttt{f{-}{-}{-}kkk}!f---lll@\\texttt{f{-}{-}{-}lll}}%
+
+\\printindex[cp]
+\\printindex[fn]
+\\end{document}
+';
+
1;
diff --git a/tp/t/results/indices/subentries/res_latex/subentries.tex
b/tp/t/results/indices/subentries/res_latex/subentries.tex
deleted file mode 100644
index b47ba2a02f..0000000000
--- a/tp/t/results/indices/subentries/res_latex/subentries.tex
+++ /dev/null
@@ -1,87 +0,0 @@
-\documentclass{book}
-\usepackage{imakeidx}
-\usepackage{amsfonts}
-\usepackage{amsmath}
-\usepackage[gen]{eurosym}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{graphicx}
-\usepackage{etoolbox}
-\usepackage{titleps}
-\usepackage{float}
-% use hidelinks to remove boxes around links to be similar with Texinfo TeX
-\usepackage[hidelinks]{hyperref}
-\usepackage[utf8]{inputenc}
-
-\makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
-
-\makeindex[name=cp]%
-\makeindex[name=fn]%
-
-% redefine the \mainmatter command such that it does not clear page
-% as if in double page
-\renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-% add command aliases to use the same command in book and report
-\newcommand\GNUTexinfomainmatter{\mainmatter}
-\newcommand\GNUTexinfofrontmatter{\frontmatter}
-\newenvironment{GNUTexinfopreformatted}{%
- \par\obeylines\obeyspaces\frenchspacing
- \parskip=\z@\parindent=\z@}{}
-\newenvironment{GNUTexinfoindented}
- {\begin{list}{}{}
- \item\relax}
- {\end{list}}
-% command that does nothing used to help with substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
-
-% plain page style, for part and chapter, which call \thispagestyle{plain}
-\renewpagestyle{plain}{\sethead[\thepage{}][][]
- {}{}{\thepage{}}}
-
-% single header
-\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting single headers
-\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{single}}
-
-% double header
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting double headers
-\newcommand{\GNUTexinfosetdoubleheader}{\pagestyle{double}}
-
-
-% avoid pagebreak and headings setting for a sectionning command
-\newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
-
-\renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
-
-\makeatother
-% set default for @setchapternewpage
-\makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
-\makeatother
-\GNUTexinfosetsingleheader{}%
-
-
-\begin{document}
-\label{anchor:Top}%
-\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[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[fn]{f---ggg@\texttt{f{-}{-}{-}ggg}!f---hhh fjjj@\texttt{f{-}{-}{-}hhh
fjjj}!f---kkk@\texttt{f{-}{-}{-}kkk}!f---lll@\texttt{f{-}{-}{-}lll}}%
-
-\printindex[cp]
-\printindex[fn]
-\end{document}
diff --git a/tp/t/results/indices/subentry_and_sortas.pl
b/tp/t/results/indices/subentry_and_sortas.pl
index 978855a4d6..995dc00f6e 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -10,43 +10,7 @@ $result_trees{'subentry_and_sortas'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => 'subentry_and_sortas.info'
- }
- ],
- 'extra' => {
- 'spaces_after_argument' => '
-'
- },
- 'parent' => {},
- 'type' => 'line_arg'
- }
- ],
- 'cmdname' => 'setfilename',
- 'extra' => {
- 'spaces_before_argument' => ' ',
- 'text_arg' => 'subentry_and_sortas.info'
- },
- 'parent' => {},
- 'source_info' => {
- 'file_name' => '',
- 'line_nr' => 1,
- 'macro' => ''
- }
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'empty_line'
- }
- ],
+ 'contents' => [],
'parent' => {},
'type' => 'preamble_before_content'
}
@@ -91,7 +55,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 3,
+ 'line_nr' => 1,
'macro' => ''
}
},
@@ -120,7 +84,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 4,
+ 'line_nr' => 2,
'macro' => ''
}
},
@@ -162,7 +126,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 6,
+ 'line_nr' => 4,
'macro' => ''
}
},
@@ -222,7 +186,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
}
@@ -273,7 +237,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
},
@@ -304,7 +268,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
}
}
@@ -312,7 +276,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 9,
+ 'line_nr' => 7,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -355,7 +319,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -406,7 +370,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
},
@@ -437,7 +401,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
}
}
@@ -445,7 +409,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 11,
+ 'line_nr' => 9,
'macro' => ''
},
'type' => 'index_entry_command'
@@ -484,7 +448,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 13,
+ 'line_nr' => 11,
'macro' => ''
}
},
@@ -515,7 +479,7 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 14,
+ 'line_nr' => 12,
'macro' => ''
}
}
@@ -526,17 +490,13 @@ $result_trees{'subentry_and_sortas'} = {
'parent' => {},
'source_info' => {
'file_name' => '',
- 'line_nr' => 7,
+ 'line_nr' => 5,
'macro' => ''
}
}
],
'type' => 'document_root'
};
-$result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0];
-$result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0];
$result_trees{'subentry_and_sortas'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'subentry_and_sortas'}{'contents'}[0];
$result_trees{'subentry_and_sortas'}{'contents'}[0]{'parent'} =
$result_trees{'subentry_and_sortas'};
$result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'subentry_and_sortas'}{'contents'}[1]{'args'}[0];
@@ -603,9 +563,7 @@
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[8]{'args'}[0]{'p
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'subentry_and_sortas'}{'contents'}[4];
$result_trees{'subentry_and_sortas'}{'contents'}[4]{'parent'} =
$result_trees{'subentry_and_sortas'};
-$result_texis{'subentry_and_sortas'} = '@setfilename subentry_and_sortas.info
-
-@node Top
+$result_texis{'subentry_and_sortas'} = '@node Top
@top
@node chapter index
@@ -621,7 +579,6 @@ $result_texis{'subentry_and_sortas'} = '@setfilename
subentry_and_sortas.info
$result_texts{'subentry_and_sortas'} = '
-
1 Index
*******
@@ -792,7 +749,6 @@ th.sections-header-printindex {text-align:left}
</head>
<body lang="en">
-
<div class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
@@ -852,17 +808,17 @@ $result_converted_errors{'html'}->{'subentry_and_sortas'}
= [
-$result_converted{'info'}->{'subentry_and_sortas'} = 'This is
subentry_and_sortas.info, produced from .
+$result_converted{'info'}->{'subentry_and_sortas'} = 'This is , produced from .
-File: subentry_and_sortas.info, Node: Top, Next: chapter index, Up: (dir)
+File: , Node: Top, Next: chapter index, Up: (dir)
* Menu:
* chapter index::
-File: subentry_and_sortas.info, Node: chapter index, Prev: Top, Up: Top
+File: , Node: chapter index, Prev: Top, Up: Top
1 Index
*******
@@ -880,8 +836,8 @@ File: subentry_and_sortas.info, Node: chapter index,
Prev: Top, Up: Top
Tag Table:
-Node: Top51
-Node: chapter index159
+Node: Top27
+Node: chapter index111
End Tag Table
@@ -906,8 +862,7 @@ $result_converted{'plaintext'}->{'subentry_and_sortas'} =
'1 Index
';
-$result_converted{'html_text'}->{'subentry_and_sortas'} = '
-<div class="top-level-extent" id="Top">
+$result_converted{'html_text'}->{'subentry_and_sortas'} = '<div
class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
[<a href="#chapter-index" title="Index" rel="index">Index</a>]</p>
@@ -950,4 +905,87 @@ $result_converted{'html_text'}->{'subentry_and_sortas'} = '
</div>
';
+
+$result_converted{'file_latex'}->{'subentry_and_sortas'} =
'\\documentclass{book}
+\\usepackage{imakeidx}
+\\usepackage{amsfonts}
+\\usepackage{amsmath}
+\\usepackage[gen]{eurosym}
+\\usepackage[T1]{fontenc}
+\\usepackage{textcomp}
+\\usepackage{graphicx}
+\\usepackage{etoolbox}
+\\usepackage{titleps}
+\\usepackage{float}
+% use hidelinks to remove boxes around links to be similar with Texinfo TeX
+\\usepackage[hidelinks]{hyperref}
+\\usepackage[utf8]{inputenc}
+
+\\makeatletter
+\\newcommand{\\GNUTexinfosettitle}{No Title}%
+
+\\makeindex[name=cp]%
+\\makeindex[name=fn]%
+
+% redefine the \\mainmatter command such that it does not clear page
+% as if in double page
+\\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
+% add command aliases to use the same command in book and report
+\\newcommand\\GNUTexinfomainmatter{\\mainmatter}
+\\newcommand\\GNUTexinfofrontmatter{\\frontmatter}
+\\newenvironment{GNUTexinfopreformatted}{%
+ \\par\\obeylines\\obeyspaces\\frenchspacing
+ \\parskip=\\z@\\parindent=\\z@}{}
+\\newenvironment{GNUTexinfoindented}
+ {\\begin{list}{}{}
+ \\item\\relax}
+ {\\end{list}}
+% command that does nothing used to help with substitutions in commands
+\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+
+% plain page style, for part and chapter, which call \\thispagestyle{plain}
+\\renewpagestyle{plain}{\\sethead[\\thepage{}][][]
+ {}{}{\\thepage{}}}
+
+% single header
+\\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{}
\\chaptertitle{}][][\\thepage]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting single headers
+\\newcommand{\\GNUTexinfosetsingleheader}{\\pagestyle{single}}
+
+% double header
+\\newpagestyle{double}{\\sethead[\\thepage{}][][\\GNUTexinfosettitle]
+ {\\chaptername{} \\thechapter{}
\\chaptertitle{}}{}{\\thepage}}
+
+% called when setting double headers
+\\newcommand{\\GNUTexinfosetdoubleheader}{\\pagestyle{double}}
+
+
+% avoid pagebreak and headings setting for a sectionning command
+\\newcommand{\\GNUTexinfonopagebreakheading}[2]{{\\let\\clearpage\\relax
\\let\\cleardoublepage\\relax \\let\\thispagestyle\\GNUTexinfoplaceholder
#1{#2}}}
+
+\\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
+
+\\makeatother
+% set default for @setchapternewpage
+\\makeatletter
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
+\\makeatother
+\\GNUTexinfosetsingleheader{}%
+
+\\begin{document}
+\\label{anchor:Top}%
+\\chapter{{Index}}
+\\label{anchor:chapter-index}%
+
+\\index[cp]{A---S@aaa!B---S1@bbb}%
+
+\\index[fn]{X---S@\\texttt{xxx}!X---S1@\\texttt{zzz}}%
+
+\\printindex[cp]
+\\printindex[fn]
+\\end{document}
+';
+
1;
diff --git
a/tp/t/results/indices/subentry_and_sortas/res_latex/subentry_and_sortas.tex
b/tp/t/results/indices/subentry_and_sortas/res_latex/subentry_and_sortas.tex
deleted file mode 100644
index 01b006bb5c..0000000000
--- a/tp/t/results/indices/subentry_and_sortas/res_latex/subentry_and_sortas.tex
+++ /dev/null
@@ -1,81 +0,0 @@
-\documentclass{book}
-\usepackage{imakeidx}
-\usepackage{amsfonts}
-\usepackage{amsmath}
-\usepackage[gen]{eurosym}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{graphicx}
-\usepackage{etoolbox}
-\usepackage{titleps}
-\usepackage{float}
-% use hidelinks to remove boxes around links to be similar with Texinfo TeX
-\usepackage[hidelinks]{hyperref}
-\usepackage[utf8]{inputenc}
-
-\makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
-
-\makeindex[name=cp]%
-\makeindex[name=fn]%
-
-% redefine the \mainmatter command such that it does not clear page
-% as if in double page
-\renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-% add command aliases to use the same command in book and report
-\newcommand\GNUTexinfomainmatter{\mainmatter}
-\newcommand\GNUTexinfofrontmatter{\frontmatter}
-\newenvironment{GNUTexinfopreformatted}{%
- \par\obeylines\obeyspaces\frenchspacing
- \parskip=\z@\parindent=\z@}{}
-\newenvironment{GNUTexinfoindented}
- {\begin{list}{}{}
- \item\relax}
- {\end{list}}
-% command that does nothing used to help with substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
-
-% plain page style, for part and chapter, which call \thispagestyle{plain}
-\renewpagestyle{plain}{\sethead[\thepage{}][][]
- {}{}{\thepage{}}}
-
-% single header
-\newpagestyle{single}{\sethead[\chaptername{} \thechapter{}
\chaptertitle{}][][\thepage]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting single headers
-\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{single}}
-
-% double header
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
- {\chaptername{} \thechapter{}
\chaptertitle{}}{}{\thepage}}
-
-% called when setting double headers
-\newcommand{\GNUTexinfosetdoubleheader}{\pagestyle{double}}
-
-
-% avoid pagebreak and headings setting for a sectionning command
-\newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
-
-\renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
-
-\makeatother
-% set default for @setchapternewpage
-\makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
-\makeatother
-\GNUTexinfosetsingleheader{}%
-
-
-\begin{document}
-\label{anchor:Top}%
-\chapter{{Index}}
-\label{anchor:chapter-index}%
-
-\index[cp]{A---S@aaa!B---S1@bbb}%
-
-\index[fn]{X---S@\texttt{xxx}!X---S1@\texttt{zzz}}%
-
-\printindex[cp]
-\printindex[fn]
-\end{document}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Remove setfilename in index tests with latex,
Patrice Dumas <=