[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Shorter LaTeX preamble
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Shorter LaTeX preamble |
|
Date: |
Sat, 03 Sep 2022 06:13:31 -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 deeee4ee5b Shorter LaTeX preamble
deeee4ee5b is described below
commit deeee4ee5b81de1c3097570dcfa4c2956e1f0f82
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Sep 3 11:13:21 2022 +0100
Shorter LaTeX preamble
* tp/Texinfo/Convert/LaTeX.pm (_set_headings): Call \pagestyle
directly, rather than via macros defined in preamble.
---
ChangeLog | 7 +++++++
tp/Texinfo/Convert/LaTeX.pm | 12 ++++--------
.../combined_fonts/res_latex/combined_fonts.tex | 8 +-------
.../definition_commands/res_latex/definition_commands.tex | 8 +-------
tp/t/results/converters_tests/empty/res_latex/empty.tex | 8 +-------
.../minimal_empty_empty/res_latex/minimal_empty_empty.tex | 8 +-------
.../res_latex/minimal_empty_with_bye.tex | 8 +-------
.../res_latex/minimal_empty_with_input.tex | 8 +-------
.../res_latex/printindex_merged_indices_code_style.tex | 8 +-------
.../res_latex/references_to_top_no_top_output.tex | 8 +-------
.../res_latex/simplest_no_node_section.tex | 8 +-------
.../res_latex/char_latin1_latin1_in_refs.tex | 8 +-------
.../res_latex/mathjax_with_texinfo_enable_encoding.tex | 8 +-------
tp/t/results/indices/def_syn_indices.pl | 8 +-------
tp/t/results/indices/double_seeentry_seealso.pl | 8 +-------
tp/t/results/indices/empty_cindex_entry.pl | 8 +-------
tp/t/results/indices/empty_index_entry.pl | 8 +-------
tp/t/results/indices/empty_string_index_entry.pl | 8 +-------
tp/t/results/indices/explicit_sort_key.pl | 8 +-------
.../indices/multiple_index_text_sortas_seeentry_seealso.pl | 8 +-------
tp/t/results/indices/seealso_duplicate.pl | 8 +-------
tp/t/results/indices/seeentry.pl | 8 +-------
tp/t/results/indices/subentries.pl | 8 +-------
tp/t/results/indices/subentry_and_sortas.pl | 8 +-------
tp/t/results/indices/syncode_index_print_both.pl | 8 +-------
tp/t/results/indices/transparent_sort_chars.pl | 8 +-------
.../res_latex/inter_item_commands_in_enumerate.tex | 8 +-------
.../res_latex/inter_item_commands_in_itemize.tex | 8 +-------
.../res_latex/multiple_lang_chapters.tex | 8 +-------
.../anchor_in_copying_insertcopying_titlepage.pl | 2 +-
.../anchor_in_copying_insertcopying_titlepage_chap.pl | 2 +-
.../anchor_links_xref_xrefautomaticsectiontitle.tex | 8 +-------
.../brace_in_index/res_latex/brace_in_index.tex | 8 +-------
.../custom_headings/res_latex/custom_headings.tex | 8 +-------
.../enumerate_arguments/res_latex/enumerate_arguments.tex | 8 +-------
.../res_latex/error_in_sectioning_command.tex | 8 +-------
.../res_latex/example_in_cartouche.tex | 8 +-------
.../float_and_refs/res_latex/float_and_refs.tex | 8 +-------
.../latex_tests/fonttextsize/res_latex/fonttextsize.tex | 8 +-------
tp/t/results/latex_tests/indices/res_latex/indices.tex | 8 +-------
.../res_latex/informative_commands_in_top_node.tex | 8 +-------
.../nested_enumerate/res_latex/nested_enumerate.tex | 8 +-------
.../nested_itemize/res_latex/nested_itemize.tex | 8 +-------
.../latex_tests/no_titlepage_and_setchapternewpage_odd.pl | 2 +-
.../res_latex/no_titlepage_and_setchapternewpage_odd.tex | 10 ++--------
.../latex_tests/no_titlepage_and_setchapternewpage_on.pl | 2 +-
.../res_latex/no_titlepage_and_setchapternewpage_on.tex | 10 ++--------
tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex | 8 +-------
tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex | 8 +-------
.../latex_tests/setchapternewpage_on_odd_titlepage.pl | 2 +-
.../res_latex/setchapternewpage_on_odd_titlepage.tex | 8 +-------
tp/t/results/latex_tests/settitle_and_headings.pl | 2 +-
.../res_latex/settitle_and_headings.tex | 10 ++--------
tp/t/results/latex_tests/shorttitlepage.pl | 2 +-
.../shorttitlepage/res_latex/shorttitlepage.tex | 8 +-------
.../latex_tests/three_setchapternewpage_on_odd_off.pl | 6 +++---
.../res_latex/three_setchapternewpage_on_odd_off.tex | 14 ++++----------
tp/t/results/latex_tests/titlepage_and_headings.pl | 2 +-
.../res_latex/titlepage_and_headings.tex | 8 +-------
.../latex_tests/titlepage_and_setchapternewpage_odd.pl | 2 +-
.../res_latex/titlepage_and_setchapternewpage_odd.tex | 8 +-------
.../latex_tests/titlepage_and_setchapternewpage_on.pl | 2 +-
.../res_latex/titlepage_and_setchapternewpage_on.tex | 8 +-------
tp/t/results/latex_tests/titlepage_classical.pl | 2 +-
.../titlepage_classical/res_latex/titlepage_classical.tex | 8 +-------
tp/t/results/latex_tests/titlepage_in_top_node.pl | 2 +-
.../res_latex/titlepage_in_top_node.tex | 8 +-------
tp/t/results/latex_tests/titlepage_long_title.pl | 2 +-
.../res_latex/titlepage_long_title.tex | 8 +-------
tp/t/results/latex_tests/titlepage_no_author.pl | 2 +-
.../titlepage_no_author/res_latex/titlepage_no_author.tex | 8 +-------
tp/t/results/latex_tests/titlepage_no_title.pl | 2 +-
.../titlepage_no_title/res_latex/titlepage_no_title.tex | 8 +-------
.../latex_tests/titlepage_with_commands_classical.pl | 2 +-
.../res_latex/titlepage_with_commands_classical.tex | 8 +-------
tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl | 4 ++--
.../res_latex/two_setchapternewpage_odd_on.tex | 12 +++---------
tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl | 4 ++--
.../res_latex/two_setchapternewpage_on_odd.tex | 12 +++---------
.../res_latex/verbatim_in_smallformat.tex | 8 +-------
.../misc_commands/codequoteundirected_codequotebacktick.pl | 8 +-------
tp/t/results/misc_commands/command_in_heading_footing.pl | 8 +-------
.../results/misc_commands/comment_space_command_on_line.pl | 8 +-------
tp/t/results/misc_commands/comments_in_text.pl | 8 +-------
tp/t/results/misc_commands/definfoenclose.pl | 8 +-------
.../results/misc_commands/definfoenclose_with_empty_arg.pl | 8 +-------
tp/t/results/misc_commands/empty_center.pl | 8 +-------
tp/t/results/misc_commands/empty_center_with_arg.pl | 8 +-------
tp/t/results/misc_commands/footnote_in_center.pl | 8 +-------
tp/t/results/misc_commands/heading_command_in_commands.pl | 8 +-------
.../misc_commands/incorrect_allowcodebreaks_argument.pl | 8 +-------
tp/t/results/misc_commands/indent_in_quotation.pl | 8 +-------
tp/t/results/misc_commands/kbdinputstyle.pl | 8 +-------
tp/t/results/misc_commands/kbdinputstyle_in_table.pl | 8 +-------
.../misc_commands/no_empty_line_between_headings.pl | 8 +-------
tp/t/results/misc_commands/noindent_after_smallexample.pl | 8 +-------
tp/t/results/misc_commands/noindent_empty_para.pl | 8 +-------
tp/t/results/misc_commands/noindent_in_paragraph.pl | 8 +-------
tp/t/results/misc_commands/noindent_indent.pl | 8 +-------
tp/t/results/misc_commands/ref_in_center.pl | 8 +-------
tp/t/results/misc_commands/setfilename.pl | 8 +-------
tp/t/results/misc_commands/test_allowcodebreaks.pl | 8 +-------
tp/t/results/misc_commands/vskip.pl | 8 +-------
tp/t/results/quotation/empty_quotation.pl | 8 +-------
tp/t/results/quotation/quotation_and_author.pl | 8 +-------
tp/t/results/quotation/quotation_author_in_example.pl | 8 +-------
.../quotation/space_at_commands_end_quotation_line.pl | 8 +-------
tp/t/results/regions/anchor_in_titlepage.pl | 2 +-
tp/t/results/regions/anchor_in_titlepage_titlepage.pl | 2 +-
tp/t/results/regions/format_in_titlepage.pl | 2 +-
tp/t/results/regions/format_in_titlepage_titlepage.pl | 2 +-
.../res_latex/chapter_between_nodes.tex | 8 +-------
.../sectioning/lone_Top_node/res_latex/lone_Top_node.tex | 8 +-------
.../results/sectioning/loop_nodes/res_latex/loop_nodes.tex | 8 +-------
.../res_latex/node_sectop_before_chapter_no_node.tex | 8 +-------
.../res_latex/node_sectop_before_lone_node_Top.tex | 8 +-------
.../res_latex/nodes_before_after_top.tex | 8 +-------
.../res_latex/nodes_before_after_top_xref.tex | 8 +-------
.../nodes_before_top/res_latex/nodes_before_top.tex | 8 +-------
.../res_latex/section_before_after_top_node.tex | 8 +-------
.../res_latex/section_before_after_top_node_last_node.tex | 8 +-------
.../res_latex/section_chapter_before_top_nodes.tex | 8 +-------
tp/t/results/sectioning/top_node_part_top.pl | 8 +-------
.../res_latex/inter_item_commands_in_table.tex | 8 +-------
.../res_latex/inter_item_commands_in_table_in_example.tex | 8 +-------
.../res_parser/non_ascii_test_latex/os\303\251_utf8.tex" | 8 +-------
.../indices_in_begin_tables_lists.tex | 8 +-------
.../indices_in_begin_tables_lists.tex | 8 +-------
tp/tests/layout/res_parser/formatting_latex/formatting.tex | 8 +-------
129 files changed, 152 insertions(+), 773 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b1235b07dd..8ae571b6a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-09-03 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Shorter LaTeX preamble
+
+ * tp/Texinfo/Convert/LaTeX.pm (_set_headings): Call \pagestyle
+ directly, rather than via macros defined in preamble.
+
2022-09-03 Gavin Smith <gavinsmith0123@gmail.com>
Keep blank lines in @example
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 528d774aec..683e363e70 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1163,6 +1163,8 @@ my %front_main_matter_definitions = (
);
# not used as it is complicated to use section and chapter title
+# this will not work any more as the \GNUTexinfoset... macros are
+# not used, and \pagestyle is used directly.
my $fancyhdr_preamble =
'% called when setting single headers
% use \nouppercase to match with Texinfo TeX style
@@ -1197,15 +1199,9 @@ my $titleps_preamble = '% plain page style, for part and
chapter, which call \th
\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}}
';
# TODO translation
@@ -1670,9 +1666,9 @@ sub _set_headings($$)
my $result = '';
if ($headings_type eq 'single') {
- $result = "\\GNUTexinfosetsingleheader{}%\n";
+ $result = "\\pagestyle{single}%\n";
} elsif ($headings_type eq 'double') {
- $result = "\\GNUTexinfosetdoubleheader{}%\n";
+ $result = "\\pagestyle{double}%\n";
} elsif ($headings_type eq 'off') {
$result = "\\pagestyle{empty}%\n";
}
diff --git
a/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
b/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
index cf0463b527..d503eac3ee 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
+++ b/tp/t/results/converters_tests/combined_fonts/res_latex/combined_fonts.tex
@@ -49,16 +49,10 @@
\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}}}
@@ -70,7 +64,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
index ce2874f0b9..86df19a49f 100644
---
a/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
+++
b/tp/t/results/converters_tests/definition_commands/res_latex/definition_commands.tex
@@ -50,16 +50,10 @@
\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}}}
@@ -75,7 +69,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:Top}%
diff --git a/tp/t/results/converters_tests/empty/res_latex/empty.tex
b/tp/t/results/converters_tests/empty/res_latex/empty.tex
index 080975969d..4a71e14030 100644
--- a/tp/t/results/converters_tests/empty/res_latex/empty.tex
+++ b/tp/t/results/converters_tests/empty/res_latex/empty.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\end{document}
diff --git
a/tp/t/results/converters_tests/minimal_empty_empty/res_latex/minimal_empty_empty.tex
b/tp/t/results/converters_tests/minimal_empty_empty/res_latex/minimal_empty_empty.tex
index 080975969d..4a71e14030 100644
---
a/tp/t/results/converters_tests/minimal_empty_empty/res_latex/minimal_empty_empty.tex
+++
b/tp/t/results/converters_tests/minimal_empty_empty/res_latex/minimal_empty_empty.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\end{document}
diff --git
a/tp/t/results/converters_tests/minimal_empty_with_bye/res_latex/minimal_empty_with_bye.tex
b/tp/t/results/converters_tests/minimal_empty_with_bye/res_latex/minimal_empty_with_bye.tex
index 080975969d..4a71e14030 100644
---
a/tp/t/results/converters_tests/minimal_empty_with_bye/res_latex/minimal_empty_with_bye.tex
+++
b/tp/t/results/converters_tests/minimal_empty_with_bye/res_latex/minimal_empty_with_bye.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\end{document}
diff --git
a/tp/t/results/converters_tests/minimal_empty_with_input/res_latex/minimal_empty_with_input.tex
b/tp/t/results/converters_tests/minimal_empty_with_input/res_latex/minimal_empty_with_input.tex
index 080975969d..4a71e14030 100644
---
a/tp/t/results/converters_tests/minimal_empty_with_input/res_latex/minimal_empty_with_input.tex
+++
b/tp/t/results/converters_tests/minimal_empty_with_input/res_latex/minimal_empty_with_input.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\end{document}
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 6c53114207..3928164439 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
@@ -43,16 +43,10 @@
\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}}}
@@ -64,7 +58,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:Top}%
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 c21a46e9c4..0b1ddf2936 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
@@ -46,16 +46,10 @@
\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}}}
@@ -67,7 +61,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
diff --git
a/tp/t/results/converters_tests/simplest_no_node_section/res_latex/simplest_no_node_section.tex
b/tp/t/results/converters_tests/simplest_no_node_section/res_latex/simplest_no_node_section.tex
index a0926f1f91..cba7466391 100644
---
a/tp/t/results/converters_tests/simplest_no_node_section/res_latex/simplest_no_node_section.tex
+++
b/tp/t/results/converters_tests/simplest_no_node_section/res_latex/simplest_no_node_section.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
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 bc73d793bb..150345c32b 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
@@ -43,16 +43,10 @@
\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}}}
@@ -64,7 +58,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
diff --git
a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding/res_latex/mathjax_with_texinfo_enable_encoding.tex
b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding/res_latex/mathjax_with_texinfo_enable_encoding.tex
index 64a7a49df9..6512104761 100644
---
a/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding/res_latex/mathjax_with_texinfo_enable_encoding.tex
+++
b/tp/t/results/html_tests/mathjax_with_texinfo_enable_encoding/res_latex/mathjax_with_texinfo_enable_encoding.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
$$
diff --git a/tp/t/results/indices/def_syn_indices.pl
b/tp/t/results/indices/def_syn_indices.pl
index 4b8a148b41..ed0aefa753 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -2174,16 +2174,10 @@ $result_converted{'latex'}->{'def_syn_indices'} =
'\\documentclass{book}
\\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}}}
@@ -2195,7 +2189,7 @@ $result_converted{'latex'}->{'def_syn_indices'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl
b/tp/t/results/indices/double_seeentry_seealso.pl
index 60ce579c48..26bc18aab1 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -951,16 +951,10 @@ $result_converted{'latex'}->{'double_seeentry_seealso'} =
'\\documentclass{book}
\\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}}}
@@ -972,7 +966,7 @@ $result_converted{'latex'}->{'double_seeentry_seealso'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/empty_cindex_entry.pl
b/tp/t/results/indices/empty_cindex_entry.pl
index 2131c91fd7..7ee599785d 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -276,16 +276,10 @@ $result_converted{'latex'}->{'empty_cindex_entry'} =
'\\documentclass{book}
\\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}}}
@@ -297,7 +291,7 @@ $result_converted{'latex'}->{'empty_cindex_entry'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/empty_index_entry.pl
b/tp/t/results/indices/empty_index_entry.pl
index 0f9a5214b9..fefb90b979 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -456,16 +456,10 @@ $result_converted{'latex'}->{'empty_index_entry'} =
'\\documentclass{book}
\\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}}}
@@ -477,7 +471,7 @@ $result_converted{'latex'}->{'empty_index_entry'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index bcf13abaf3..607064aa3d 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -1104,16 +1104,10 @@
$result_converted{'latex'}->{'empty_string_index_entry'} = '\\documentclass{book
\\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}}}
@@ -1129,7 +1123,7 @@ $result_converted{'latex'}->{'empty_string_index_entry'}
= '\\documentclass{book
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/explicit_sort_key.pl
b/tp/t/results/indices/explicit_sort_key.pl
index 306e0336f6..f0a6f2da94 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -1192,16 +1192,10 @@ $result_converted{'latex'}->{'explicit_sort_key'} =
'\\documentclass{book}
\\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}}}
@@ -1213,7 +1207,7 @@ $result_converted{'latex'}->{'explicit_sort_key'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
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 0c9f61b584..71dbff8a23 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
@@ -750,16 +750,10 @@
$result_converted{'latex'}->{'multiple_index_text_sortas_seeentry_seealso'} = '\
\\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}}}
@@ -771,7 +765,7 @@
$result_converted{'latex'}->{'multiple_index_text_sortas_seeentry_seealso'} = '\
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/seealso_duplicate.pl
b/tp/t/results/indices/seealso_duplicate.pl
index 0a5ed82d1c..dd9c6251e4 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -520,16 +520,10 @@ $result_converted{'latex'}->{'seealso_duplicate'} =
'\\documentclass{book}
\\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}}}
@@ -541,7 +535,7 @@ $result_converted{'latex'}->{'seealso_duplicate'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index a268eedf11..2c88be499b 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -832,16 +832,10 @@ $result_converted{'latex'}->{'seeentry'} =
'\\documentclass{book}
\\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}}}
@@ -853,7 +847,7 @@ $result_converted{'latex'}->{'seeentry'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/subentries.pl
b/tp/t/results/indices/subentries.pl
index b8545eef73..8a6c55d7e3 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -1419,16 +1419,10 @@ $result_converted{'latex'}->{'subentries'} =
'\\documentclass{book}
\\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}}}
@@ -1440,7 +1434,7 @@ $result_converted{'latex'}->{'subentries'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/subentry_and_sortas.pl
b/tp/t/results/indices/subentry_and_sortas.pl
index 3d49b48dc9..92ae1a437c 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -850,16 +850,10 @@ $result_converted{'latex'}->{'subentry_and_sortas'} =
'\\documentclass{book}
\\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}}}
@@ -871,7 +865,7 @@ $result_converted{'latex'}->{'subentry_and_sortas'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/indices/syncode_index_print_both.pl
b/tp/t/results/indices/syncode_index_print_both.pl
index 879cecc29b..2b2cb2d63f 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -838,16 +838,10 @@ $result_converted{'latex'}->{'syncode_index_print_both'}
= '\\documentclass{book
\\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}}}
@@ -859,7 +853,7 @@ $result_converted{'latex'}->{'syncode_index_print_both'} =
'\\documentclass{book
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
diff --git a/tp/t/results/indices/transparent_sort_chars.pl
b/tp/t/results/indices/transparent_sort_chars.pl
index 94e689eaab..0d5eb5b856 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -657,16 +657,10 @@ $result_converted{'latex'}->{'transparent_sort_chars'} =
'\\documentclass{book}
\\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}}}
@@ -678,7 +672,7 @@ $result_converted{'latex'}->{'transparent_sort_chars'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
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 3955525eec..dacfa17968 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
@@ -47,16 +47,10 @@
\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}}}
@@ -68,7 +62,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:Top}%
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 1ed84e697a..6ea6ba03e7 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
@@ -47,16 +47,10 @@
\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}}}
@@ -68,7 +62,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:Top}%
diff --git
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
index 071433b767..2378da65aa 100644
---
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
+++
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
@@ -54,16 +54,10 @@
\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}}}
@@ -79,7 +73,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\selectlanguage{ja}%
diff --git
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index 553e6c45ef..743acdc70e 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -748,7 +748,7 @@
$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage'} =
Cop. \\label{anchor:a-in-copying}%
. Ying.
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chap}}
diff --git
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index 4cd2dfdded..168110747c 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -748,7 +748,7 @@
$result_converted{'latex_text'}->{'anchor_in_copying_insertcopying_titlepage_cha
Cop. \\label{anchor:a-in-copying}%
. Ying.
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chap}}
diff --git
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
index 214e45e399..265bb340c8 100644
---
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
+++
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:node-before}%
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 9b9b1d66df..1e6f2d6ef2 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
@@ -47,16 +47,10 @@
\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}}}
@@ -72,7 +66,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\{
diff --git
a/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex
b/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex
index 851b708c7e..ecae8e775f 100644
--- a/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex
+++ b/tp/t/results/latex_tests/custom_headings/res_latex/custom_headings.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\newpagestyle{custom}{%
\sethead[\thepage{} \sectiontitle{}][\thesection{} Section \thesection{}
\sectiontitle{}][\chaptertitle{} \thechapter{}]%
diff --git
a/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
b/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
index 0dc517a11d..2850372bed 100644
---
a/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
+++
b/tp/t/results/latex_tests/enumerate_arguments/res_latex/enumerate_arguments.tex
@@ -44,16 +44,10 @@
\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}}}
@@ -65,7 +59,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\begin{enumerate}[label=\alph*.]
diff --git
a/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
b/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
index 65a0cde2e3..60033d6b81 100644
---
a/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
+++
b/tp/t/results/latex_tests/error_in_sectioning_command/res_latex/error_in_sectioning_command.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
b/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
index 58bc4e66a5..e5d114ac63 100644
---
a/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
+++
b/tp/t/results/latex_tests/example_in_cartouche/res_latex/example_in_cartouche.tex
@@ -41,16 +41,10 @@
\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}}}
@@ -67,7 +61,7 @@ roundcorner=10pt}
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\begin{mdframed}[style=GNUTexinfocartouche]
diff --git
a/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex
b/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex
index 922b20171b..e37dc72aa0 100644
--- a/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex
+++ b/tp/t/results/latex_tests/float_and_refs/res_latex/float_and_refs.tex
@@ -46,16 +46,10 @@
\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}}}
@@ -67,7 +61,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:Top}%
diff --git a/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
b/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
index a75adf2449..a99d3bd3a2 100644
--- a/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
+++ b/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
@@ -41,16 +41,10 @@
\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}}}
@@ -62,7 +56,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\changefontsize{10}
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 cddc91190a..3f8ae73b44 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/indices/res_latex/indices.tex
@@ -44,16 +44,10 @@
\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}}}
@@ -65,7 +59,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
b/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
index f3b54d20f8..c70adbc93c 100644
---
a/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
+++
b/tp/t/results/latex_tests/informative_commands_in_top_node/res_latex/informative_commands_in_top_node.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:Top}%
diff --git
a/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
b/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
index aef58d0f5e..abb038a425 100644
--- a/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
+++ b/tp/t/results/latex_tests/nested_enumerate/res_latex/nested_enumerate.tex
@@ -44,16 +44,10 @@
\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}}}
@@ -65,7 +59,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\begin{enumerate}[start=1]
diff --git
a/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex
b/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex
index 6a2dbdb4ab..231eace5f5 100644
--- a/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex
+++ b/tp/t/results/latex_tests/nested_itemize/res_latex/nested_itemize.tex
@@ -44,16 +44,10 @@
\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}}}
@@ -65,7 +59,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\begin{itemize}
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
index c200b42bd5..caa076e9ff 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd.pl
@@ -72,7 +72,7 @@ $result_floats{'no_titlepage_and_setchapternewpage_odd'} = {};
-$result_converted{'latex_text'}->{'no_titlepage_and_setchapternewpage_odd'} =
'\\GNUTexinfosetdoubleheader{}%
+$result_converted{'latex_text'}->{'no_titlepage_and_setchapternewpage_odd'} =
'\\pagestyle{double}%
\\begin{document}
';
diff --git
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
index e930a7299f..16dd5aa908 100644
---
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
+++
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_odd/res_latex/no_titlepage_and_setchapternewpage_odd.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,11 +55,11 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\makeatletter
\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
\makeatother
-\GNUTexinfosetdoubleheader{}%
+\pagestyle{double}%
\begin{document}
\end{document}
diff --git a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
index 51d1741658..820a0e6cd3 100644
--- a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on.pl
@@ -75,7 +75,7 @@ $result_floats{'no_titlepage_and_setchapternewpage_on'} = {};
$result_converted{'latex_text'}->{'no_titlepage_and_setchapternewpage_on'} =
'\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
';
diff --git
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
index be64f99869..118dd2e032 100644
---
a/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
+++
b/tp/t/results/latex_tests/no_titlepage_and_setchapternewpage_on/res_latex/no_titlepage_and_setchapternewpage_on.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,8 +55,8 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\end{document}
diff --git a/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
b/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
index aec39068f0..3035f760f5 100644
--- a/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
+++ b/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
@@ -41,16 +41,10 @@
\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}}}
@@ -62,7 +56,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\newgeometry{textheight=200mm,textwidth=150mm}
diff --git a/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
b/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
index 904bc58ecd..bb7945d31e 100644
--- a/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
+++ b/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
@@ -41,16 +41,10 @@
\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}}}
@@ -62,7 +56,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\geometry{papername=a4paper}%
diff --git a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
index 5e3184552d..3fc9ff27d9 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -233,7 +233,7 @@
$result_converted{'latex_text'}->{'setchapternewpage_on_odd_titlepage'} = '\\mak
in titlepage
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetdoubleheader{}%
+\\pagestyle{double}%
\\GNUTexinfomainmatter
';
diff --git
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
index 080fd5ec34..1ed88bb884 100644
---
a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
+++
b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage/res_latex/setchapternewpage_on_odd_titlepage.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -83,6 +77,6 @@
in titlepage
\endgroup
\end{titlepage}
-\GNUTexinfosetdoubleheader{}%
+\pagestyle{double}%
\GNUTexinfomainmatter
\end{document}
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl
b/tp/t/results/latex_tests/settitle_and_headings.pl
index bb897a1393..bb76bf6e30 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -285,7 +285,7 @@ $result_floats{'settitle_and_headings'} = {};
$result_converted{'latex_text'}->{'settitle_and_headings'} = '
-\\GNUTexinfosetdoubleheader{}%
+\\pagestyle{double}%
\\begin{document}
\\chapter{{chap}}
diff --git
a/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
b/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
index 41ca5dadaa..bd219024b9 100644
---
a/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
+++
b/tp/t/results/latex_tests/settitle_and_headings/res_latex/settitle_and_headings.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,10 +55,10 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
-\GNUTexinfosetdoubleheader{}%
+\pagestyle{double}%
\begin{document}
\chapter{{chap}}
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl
b/tp/t/results/latex_tests/shorttitlepage.pl
index e02d976f69..ec5637ecfb 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -386,7 +386,7 @@ $result_converted{'latex_text'}->{'shorttitlepage'} = '
\\newpage{}
\\phantom{blabla}\\newpage{}
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chapter}}
diff --git
a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
index 14b6008c67..dac13e640e 100644
--- a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
+++ b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -74,7 +68,7 @@
\newpage{}
\phantom{blabla}\newpage{}
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\label{anchor:Top}%
\chapter{{Chapter}}
diff --git a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
index 50ce343c9d..2bb3ed3178 100644
--- a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
+++ b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off.pl
@@ -182,17 +182,17 @@ $result_floats{'three_setchapternewpage_on_odd_off'} = {};
$result_converted{'latex_text'}->{'three_setchapternewpage_on_odd_off'} =
'\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\makeatletter
\\patchcmd{\\chapter}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
\\makeatother
-\\GNUTexinfosetdoubleheader{}%
+\\pagestyle{double}%
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
';
diff --git
a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
index f2e6196245..47dcf9a2ba 100644
---
a/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
+++
b/tp/t/results/latex_tests/three_setchapternewpage_on_odd_off/res_latex/three_setchapternewpage_on_odd_off.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,18 +55,18 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\makeatletter
\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
\makeatother
-\GNUTexinfosetdoubleheader{}%
+\pagestyle{double}%
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_and_headings.pl
b/tp/t/results/latex_tests/titlepage_and_headings.pl
index 69e9616658..8a78b25005 100644
--- a/tp/t/results/latex_tests/titlepage_and_headings.pl
+++ b/tp/t/results/latex_tests/titlepage_and_headings.pl
@@ -137,7 +137,7 @@ $result_converted{'latex_text'}->{'titlepage_and_headings'}
= '
in titlepage
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
';
diff --git
a/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
index 8adee7d21f..fc7ed28707 100644
---
a/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
+++
b/tp/t/results/latex_tests/titlepage_and_headings/res_latex/titlepage_and_headings.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -79,6 +73,6 @@
in titlepage
\endgroup
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
index f7bcaf3977..9a0efd4b82 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd.pl
@@ -182,7 +182,7 @@
$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_odd'} = '
in titlepage
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetdoubleheader{}%
+\\pagestyle{double}%
\\GNUTexinfomainmatter
';
diff --git
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
index 7893671c9b..204d89c1af 100644
---
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
+++
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_odd/res_latex/titlepage_and_setchapternewpage_odd.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -83,6 +77,6 @@
in titlepage
\endgroup
\end{titlepage}
-\GNUTexinfosetdoubleheader{}%
+\pagestyle{double}%
\GNUTexinfomainmatter
\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
index daa889c8cc..d6d1a17344 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -185,7 +185,7 @@
$result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_on'} = '\\mak
in titlepage
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
';
diff --git
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
index ac64cd0710..5caacf72a2 100644
---
a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
+++
b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on/res_latex/titlepage_and_setchapternewpage_on.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -80,6 +74,6 @@
in titlepage
\endgroup
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\end{document}
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl
b/tp/t/results/latex_tests/titlepage_classical.pl
index e6c636dc95..e01fec7c0c 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -787,7 +787,7 @@ $result_converted{'latex_text'}->{'titlepage_classical'} = '
\\vskip 0pt plus 1filll
in Copying
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chapter}}
diff --git
a/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
b/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
index e5944c61c5..6e0dc9f369 100644
---
a/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
+++
b/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -95,7 +89,7 @@
\vskip 0pt plus 1filll
in Copying
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\label{anchor:Top}%
\chapter{{Chapter}}
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index 129998c74c..9e67bc7e78 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -469,7 +469,7 @@ $result_converted{'latex_text'}->{'titlepage_in_top_node'}
= '\\begin{document}
\\vskip\\titlepagebottomglue
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{chap}}
diff --git
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
index 1e4283a95a..f8079eed4c 100644
---
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
+++
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -81,7 +75,7 @@
\vskip\titlepagebottomglue
\endgroup
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\label{anchor:Top}%
\chapter{{chap}}
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 67426535a4..f77606478a 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -466,7 +466,7 @@ $result_converted{'latex_text'}->{'titlepage_long_title'} =
'
\\vskip\\titlepagebottomglue
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chapter}}
diff --git
a/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
b/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
index 2968e8996e..00f34041cd 100644
---
a/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
+++
b/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -83,7 +77,7 @@
\vskip\titlepagebottomglue
\endgroup
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\label{anchor:Top}%
\chapter{{Chapter}}
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl
b/tp/t/results/latex_tests/titlepage_no_author.pl
index e5b32a57b9..19b86e557b 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -447,7 +447,7 @@ $result_converted{'latex_text'}->{'titlepage_no_author'} = '
\\vskip\\titlepagebottomglue
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chapter}}
diff --git
a/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
b/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
index e8524ba9fe..6d7db1acac 100644
---
a/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
+++
b/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -82,7 +76,7 @@
\vskip\titlepagebottomglue
\endgroup
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\label{anchor:Top}%
\chapter{{Chapter}}
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl
b/tp/t/results/latex_tests/titlepage_no_title.pl
index b9b92896f8..47c830f429 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -489,7 +489,7 @@ $result_converted{'latex_text'}->{'titlepage_no_title'} = '
\\leftline{\\Large \\bfseries Some Author}%
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chapter}}
diff --git
a/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
b/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
index 599a7a8030..a876f84651 100644
---
a/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
+++
b/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -82,7 +76,7 @@
\leftline{\Large \bfseries Some Author}%
\endgroup
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\label{anchor:Top}%
\chapter{{Chapter}}
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index 76d2b32b7a..e198d6578c 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -1017,7 +1017,7 @@ $$
\\vskip 0pt plus 1filll
in Copying
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chapter}}
diff --git
a/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
b/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
index a82fc9c7dd..145989bb8c 100644
---
a/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
+++
b/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -101,7 +95,7 @@ $$
\vskip 0pt plus 1filll
in Copying
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\label{anchor:Top}%
\chapter{{Chapter}}
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
index b05b1e70a8..67ead7a7c2 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
@@ -126,12 +126,12 @@ $result_floats{'two_setchapternewpage_odd_on'} = {};
-$result_converted{'latex_text'}->{'two_setchapternewpage_odd_on'} =
'\\GNUTexinfosetdoubleheader{}%
+$result_converted{'latex_text'}->{'two_setchapternewpage_odd_on'} =
'\\pagestyle{double}%
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
';
diff --git
a/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
index 789ff9ef05..5ad7350fdc 100644
---
a/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
+++
b/tp/t/results/latex_tests/two_setchapternewpage_odd_on/res_latex/two_setchapternewpage_odd_on.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,16 +55,16 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\makeatletter
\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
\makeatother
-\GNUTexinfosetdoubleheader{}%
+\pagestyle{double}%
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\end{document}
diff --git a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
index fe3ccca308..ab32caccfe 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
@@ -129,12 +129,12 @@ $result_floats{'two_setchapternewpage_on_odd'} = {};
$result_converted{'latex_text'}->{'two_setchapternewpage_on_odd'} =
'\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\makeatletter
\\patchcmd{\\chapter}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
\\makeatother
-\\GNUTexinfosetdoubleheader{}%
+\\pagestyle{double}%
\\begin{document}
';
diff --git
a/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
index 737e86f174..a1394afa45 100644
---
a/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
+++
b/tp/t/results/latex_tests/two_setchapternewpage_on_odd/res_latex/two_setchapternewpage_on_odd.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,13 +55,13 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\makeatletter
\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
\makeatother
-\GNUTexinfosetdoubleheader{}%
+\pagestyle{double}%
\begin{document}
\end{document}
diff --git
a/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
b/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
index 4103dfbd7c..97f78931d9 100644
---
a/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
+++
b/tp/t/results/latex_tests/verbatim_in_smallformat/res_latex/verbatim_in_smallformat.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\begin{verbatim}
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index e43c94d45b..31a6e1ce2c 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5596,16 +5596,10 @@
$result_converted{'latex'}->{'codequoteundirected_codequotebacktick'} = '\\docum
\\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}}}
@@ -5670,7 +5664,7 @@ kbd:
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four
samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
\\chapter{{Chapter}}
diff --git a/tp/t/results/misc_commands/command_in_heading_footing.pl
b/tp/t/results/misc_commands/command_in_heading_footing.pl
index f7605432e5..fce8c4224a 100644
--- a/tp/t/results/misc_commands/command_in_heading_footing.pl
+++ b/tp/t/results/misc_commands/command_in_heading_footing.pl
@@ -258,16 +258,10 @@
$result_converted{'latex'}->{'command_in_heading_footing'} = '\\documentclass{bo
\\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}}}
@@ -279,7 +273,7 @@ $result_converted{'latex'}->{'command_in_heading_footing'}
= '\\documentclass{bo
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\newpagestyle{custom}{%
\\sethead[something \\thepage{} \\thechapter{}][][]%
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 d731cea6d3..8b7b2a465c 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
@@ -1107,16 +1107,10 @@
$result_converted{'latex'}->{'comment_space_command_on_line'} = '\\documentclass
\\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}}}
@@ -1128,7 +1122,7 @@
$result_converted{'latex'}->{'comment_space_command_on_line'} = '\\documentclass
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\label{anchor:Top}%
diff --git a/tp/t/results/misc_commands/comments_in_text.pl
b/tp/t/results/misc_commands/comments_in_text.pl
index d93de61076..2340dc02a8 100644
--- a/tp/t/results/misc_commands/comments_in_text.pl
+++ b/tp/t/results/misc_commands/comments_in_text.pl
@@ -256,16 +256,10 @@ $result_converted{'latex'}->{'comments_in_text'} =
'\\documentclass{book}
\\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}}}
@@ -277,7 +271,7 @@ $result_converted{'latex'}->{'comments_in_text'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
diff --git a/tp/t/results/misc_commands/definfoenclose.pl
b/tp/t/results/misc_commands/definfoenclose.pl
index eddee5bf4f..a16d402576 100644
--- a/tp/t/results/misc_commands/definfoenclose.pl
+++ b/tp/t/results/misc_commands/definfoenclose.pl
@@ -504,16 +504,10 @@ $result_converted{'latex'}->{'definfoenclose'} =
'\\documentclass{book}
\\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}}}
@@ -525,7 +519,7 @@ $result_converted{'latex'}->{'definfoenclose'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
definfoenclose phoo,//,\\textbackslash{}
diff --git a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
index fc383c9f9b..ec969a0a74 100644
--- a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
+++ b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
@@ -203,16 +203,10 @@
$result_converted{'latex'}->{'definfoenclose_with_empty_arg'} = '\\documentclass
\\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}}}
@@ -224,7 +218,7 @@
$result_converted{'latex'}->{'definfoenclose_with_empty_arg'} = '\\documentclass
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
diff --git a/tp/t/results/misc_commands/empty_center.pl
b/tp/t/results/misc_commands/empty_center.pl
index bb9fd58325..fe11839c16 100644
--- a/tp/t/results/misc_commands/empty_center.pl
+++ b/tp/t/results/misc_commands/empty_center.pl
@@ -115,16 +115,10 @@ $result_converted{'latex'}->{'empty_center'} =
'\\documentclass{book}
\\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}}}
@@ -136,7 +130,7 @@ $result_converted{'latex'}->{'empty_center'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\end{document}
';
diff --git a/tp/t/results/misc_commands/empty_center_with_arg.pl
b/tp/t/results/misc_commands/empty_center_with_arg.pl
index e6240d3023..35d44acfd5 100644
--- a/tp/t/results/misc_commands/empty_center_with_arg.pl
+++ b/tp/t/results/misc_commands/empty_center_with_arg.pl
@@ -126,16 +126,10 @@ $result_converted{'latex'}->{'empty_center_with_arg'} =
'\\documentclass{book}
\\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}}}
@@ -147,7 +141,7 @@ $result_converted{'latex'}->{'empty_center_with_arg'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{center}
\\hbox{}
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl
b/tp/t/results/misc_commands/footnote_in_center.pl
index 6fc3be82ff..d8cae59d21 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -404,16 +404,10 @@ $result_converted{'latex'}->{'footnote_in_center'} =
'\\documentclass{book}
\\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}}}
@@ -425,7 +419,7 @@ $result_converted{'latex'}->{'footnote_in_center'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{center}
Centered text with a footnote\\footnote{This footnote
diff --git a/tp/t/results/misc_commands/heading_command_in_commands.pl
b/tp/t/results/misc_commands/heading_command_in_commands.pl
index e7c1955515..0cceb2e91a 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -397,16 +397,10 @@
$result_converted{'latex'}->{'heading_command_in_commands'} = '\\documentclass{b
\\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}}}
@@ -418,7 +412,7 @@ $result_converted{'latex'}->{'heading_command_in_commands'}
= '\\documentclass{b
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\texttt{
diff --git a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
index 59eeeeafe1..11398cf505 100644
--- a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
+++ b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
@@ -162,16 +162,10 @@
$result_converted{'latex'}->{'incorrect_allowcodebreaks_argument'} = '\\document
\\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}}}
@@ -183,7 +177,7 @@
$result_converted{'latex'}->{'incorrect_allowcodebreaks_argument'} = '\\document
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\texttt{b a}
\\end{document}
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 12e876039d..ead685e1e3 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -185,16 +185,10 @@ $result_converted{'latex'}->{'indent_in_quotation'} =
'\\documentclass{book}
\\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}}}
@@ -206,7 +200,7 @@ $result_converted{'latex'}->{'indent_in_quotation'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{quote}
indent in quotation
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 2756e5feeb..7490ecfbf0 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -2279,16 +2279,10 @@ $result_converted{'latex'}->{'kbdinputstyle'} =
'\\documentclass{book}
\\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}}}
@@ -2300,7 +2294,7 @@ $result_converted{'latex'}->{'kbdinputstyle'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
@kbdinputstyle code
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 1a8601d4f7..672f493dcd 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -2470,16 +2470,10 @@ $result_converted{'latex'}->{'kbdinputstyle_in_table'}
= '\\documentclass{book}
\\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}}}
@@ -2491,7 +2485,7 @@ $result_converted{'latex'}->{'kbdinputstyle_in_table'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
@kbdinputstyle code
diff --git a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
index 871956e683..506793983e 100644
--- a/tp/t/results/misc_commands/no_empty_line_between_headings.pl
+++ b/tp/t/results/misc_commands/no_empty_line_between_headings.pl
@@ -290,16 +290,10 @@
$result_converted{'latex'}->{'no_empty_line_between_headings'} = '\\documentclas
\\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}}}
@@ -311,7 +305,7 @@
$result_converted{'latex'}->{'no_empty_line_between_headings'} = '\\documentclas
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\part*{{Top}}
\\GNUTexinfonopagebreakheading{\\subsection*}{{Subheading}}
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index 09f977eb30..2a87a2a0e9 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -229,16 +229,10 @@
$result_converted{'latex'}->{'noindent_after_smallexample'} = '\\documentclass{b
\\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}}}
@@ -250,7 +244,7 @@ $result_converted{'latex'}->{'noindent_after_smallexample'}
= '\\documentclass{b
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
To obtain.
\\begin{GNUTexinfopreformatted}%
diff --git a/tp/t/results/misc_commands/noindent_empty_para.pl
b/tp/t/results/misc_commands/noindent_empty_para.pl
index b8a4a77512..0622104b4b 100644
--- a/tp/t/results/misc_commands/noindent_empty_para.pl
+++ b/tp/t/results/misc_commands/noindent_empty_para.pl
@@ -137,16 +137,10 @@ $result_converted{'latex'}->{'noindent_empty_para'} =
'\\documentclass{book}
\\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}}}
@@ -158,7 +152,7 @@ $result_converted{'latex'}->{'noindent_empty_para'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\noindent{}
aaa
diff --git a/tp/t/results/misc_commands/noindent_in_paragraph.pl
b/tp/t/results/misc_commands/noindent_in_paragraph.pl
index f40545b9e7..6406356c19 100644
--- a/tp/t/results/misc_commands/noindent_in_paragraph.pl
+++ b/tp/t/results/misc_commands/noindent_in_paragraph.pl
@@ -185,16 +185,10 @@ $result_converted{'latex'}->{'noindent_in_paragraph'} =
'\\documentclass{book}
\\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}}}
@@ -206,7 +200,7 @@ $result_converted{'latex'}->{'noindent_in_paragraph'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
Begin para
\\noindent{}after noindent.
diff --git a/tp/t/results/misc_commands/noindent_indent.pl
b/tp/t/results/misc_commands/noindent_indent.pl
index 7ffab27f64..584003520a 100644
--- a/tp/t/results/misc_commands/noindent_indent.pl
+++ b/tp/t/results/misc_commands/noindent_indent.pl
@@ -295,16 +295,10 @@ $result_converted{'latex'}->{'noindent_indent'} =
'\\documentclass{book}
\\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}}}
@@ -316,7 +310,7 @@ $result_converted{'latex'}->{'noindent_indent'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
First para
diff --git a/tp/t/results/misc_commands/ref_in_center.pl
b/tp/t/results/misc_commands/ref_in_center.pl
index f872f0a591..1dc0718385 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -573,16 +573,10 @@ $result_converted{'latex'}->{'ref_in_center'} =
'\\documentclass{book}
\\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}}}
@@ -594,7 +588,7 @@ $result_converted{'latex'}->{'ref_in_center'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/misc_commands/setfilename.pl
b/tp/t/results/misc_commands/setfilename.pl
index 5c3b11bac2..1493b3e541 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -344,16 +344,10 @@ $result_converted{'latex'}->{'setfilename'} =
'\\documentclass{book}
\\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}}}
@@ -365,7 +359,7 @@ $result_converted{'latex'}->{'setfilename'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 557268a44d..24fd625d60 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2835,16 +2835,10 @@ $result_converted{'latex'}->{'test_allowcodebreaks'} =
'\\documentclass{book}
\\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}}}
@@ -2856,7 +2850,7 @@ $result_converted{'latex'}->{'test_allowcodebreaks'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\label{anchor:Top}%
diff --git a/tp/t/results/misc_commands/vskip.pl
b/tp/t/results/misc_commands/vskip.pl
index 64ec5617da..c6d27a50d7 100644
--- a/tp/t/results/misc_commands/vskip.pl
+++ b/tp/t/results/misc_commands/vskip.pl
@@ -99,16 +99,10 @@ $result_converted{'latex'}->{'vskip'} =
'\\documentclass{book}
\\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}}}
@@ -120,7 +114,7 @@ $result_converted{'latex'}->{'vskip'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\vskip 0pt plus 1filll
\\end{document}
diff --git a/tp/t/results/quotation/empty_quotation.pl
b/tp/t/results/quotation/empty_quotation.pl
index e2aeffba80..6e97aac49b 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -427,16 +427,10 @@ $result_converted{'latex'}->{'empty_quotation'} =
'\\documentclass{book}
\\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}}}
@@ -448,7 +442,7 @@ $result_converted{'latex'}->{'empty_quotation'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{quote}
\\end{quote}
diff --git a/tp/t/results/quotation/quotation_and_author.pl
b/tp/t/results/quotation/quotation_and_author.pl
index 1744e914f5..fdba31f237 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -569,16 +569,10 @@ $result_converted{'latex'}->{'quotation_and_author'} =
'\\documentclass{book}
\\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}}}
@@ -590,7 +584,7 @@ $result_converted{'latex'}->{'quotation_and_author'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
Text before quotation
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl
b/tp/t/results/quotation/quotation_author_in_example.pl
index 62ed0cd2ed..317fafe106 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -280,16 +280,10 @@
$result_converted{'latex'}->{'quotation_author_in_example'} = '\\documentclass{b
\\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}}}
@@ -301,7 +295,7 @@ $result_converted{'latex'}->{'quotation_author_in_example'}
= '\\documentclass{b
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{GNUTexinfoindented}
\\begin{quote}
diff --git a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
index 3b3448e5b2..28ed643bb6 100644
--- a/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
+++ b/tp/t/results/quotation/space_at_commands_end_quotation_line.pl
@@ -351,16 +351,10 @@
$result_converted{'latex'}->{'space_at_commands_end_quotation_line'} = '\\docume
\\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}}}
@@ -372,7 +366,7 @@
$result_converted{'latex'}->{'space_at_commands_end_quotation_line'} = '\\docume
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{quote}
\\textbf{@ at the end of line \\ {}:} A @ at the end of the @quotation line.
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage.pl
index 36dc583ab9..43eeba72c7 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -566,7 +566,7 @@ $result_converted{'latex_text'}->{'anchor_in_titlepage'} = '
\\label{anchor:in-titlepage}%
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\part*{{top}}
\\label{anchor:Top}%
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 0b064dd26a..4caa979d48 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -568,7 +568,7 @@
$result_converted{'latex_text'}->{'anchor_in_titlepage_titlepage'} = '
\\label{anchor:in-titlepage}%
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\part*{{top}}
\\label{anchor:Top}%
diff --git a/tp/t/results/regions/format_in_titlepage.pl
b/tp/t/results/regions/format_in_titlepage.pl
index 5abba04027..c299d4b4a2 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -350,7 +350,7 @@ Published
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
';
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 1d73fd3f29..78a7b8a46b 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -361,7 +361,7 @@ Published
\\endgroup
\\end{titlepage}
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\GNUTexinfomainmatter
\\label{anchor:Top}%
';
diff --git
a/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
b/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
index ce43abf13f..1fc463c622 100644
---
a/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
+++
b/tp/t/results/sectioning/chapter_between_nodes/res_latex/chapter_between_nodes.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git a/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
b/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
index 0d478804bc..8d6b7a129b 100644
--- a/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
+++ b/tp/t/results/sectioning/lone_Top_node/res_latex/lone_Top_node.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git a/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
b/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
index e489c116ba..79b9afe710 100644
--- a/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
+++ b/tp/t/results/sectioning/loop_nodes/res_latex/loop_nodes.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
index 410ba6e4cb..f6f016e472 100644
---
a/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
+++
b/tp/t/results/sectioning/node_sectop_before_chapter_no_node/res_latex/node_sectop_before_chapter_no_node.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
index 6b07054937..d4c97b7ffb 100644
---
a/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
+++
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top/res_latex/node_sectop_before_lone_node_Top.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
b/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
index 91328982a3..a5ad76852c 100644
---
a/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
+++
b/tp/t/results/sectioning/nodes_before_after_top/res_latex/nodes_before_after_top.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/nodes_before_after_top_xref/res_latex/nodes_before_after_top_xref.tex
b/tp/t/results/sectioning/nodes_before_after_top_xref/res_latex/nodes_before_after_top_xref.tex
index 81dc0a2a94..c1bb445754 100644
---
a/tp/t/results/sectioning/nodes_before_after_top_xref/res_latex/nodes_before_after_top_xref.tex
+++
b/tp/t/results/sectioning/nodes_before_after_top_xref/res_latex/nodes_before_after_top_xref.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
b/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
index d6b0102a2b..cfa9caeeae 100644
--- a/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
+++ b/tp/t/results/sectioning/nodes_before_top/res_latex/nodes_before_top.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
b/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
index 73dc1162ad..d0701910c2 100644
---
a/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
+++
b/tp/t/results/sectioning/section_before_after_top_node/res_latex/section_before_after_top_node.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
b/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
index 0ca119137e..9c92f06a55 100644
---
a/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
+++
b/tp/t/results/sectioning/section_before_after_top_node_last_node/res_latex/section_before_after_top_node_last_node.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git
a/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
b/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
index e0c20f56ac..85ed57fb26 100644
---
a/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
+++
b/tp/t/results/sectioning/section_chapter_before_top_nodes/res_latex/section_chapter_before_top_nodes.tex
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git a/tp/t/results/sectioning/top_node_part_top.pl
b/tp/t/results/sectioning/top_node_part_top.pl
index a6afe32f94..9afd8e6919 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -511,16 +511,10 @@ $result_converted{'file_latex'}->{'top_node_part_top'} =
'\\documentclass{book}
\\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}}}
@@ -532,7 +526,7 @@ $result_converted{'file_latex'}->{'top_node_part_top'} =
'\\documentclass{book}
\\makeatletter
\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
placeholder}\\clearpage}{}{}
\\makeatother
-\\GNUTexinfosetsingleheader{}%
+\\pagestyle{single}%
\\begin{document}
\\part{{part}}
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 6f37e7abba..78c16a5fd8 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
@@ -55,16 +55,10 @@
\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}}}
@@ -76,7 +70,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\label{anchor:Top}%
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 830e07baae..4ff15dd1c4 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
@@ -50,16 +50,10 @@
\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}}}
@@ -71,7 +65,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
\begin{GNUTexinfoindented}
diff --git
"a/tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.tex"
"b/tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.tex"
index 2b49790dc6..9099cf57c0 100644
--- "a/tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.tex"
+++ "b/tp/tests/formatting/res_parser/non_ascii_test_latex/os\303\251_utf8.tex"
@@ -40,16 +40,10 @@
\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}}}
@@ -61,7 +55,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
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 e23b09ad4c..587c3edc38 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
@@ -57,16 +57,10 @@
\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}}}
@@ -78,7 +72,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
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 e23b09ad4c..587c3edc38 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
@@ -57,16 +57,10 @@
\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}}}
@@ -78,7 +72,7 @@
\makeatletter
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
placeholder}\clearpage}{}{}
\makeatother
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\begin{document}
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index ab3f3a860f..d98fd177ac 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -71,16 +71,10 @@
\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}}}
@@ -3562,7 +3556,7 @@ g--roupe
\end{titlepage}
-\GNUTexinfosetsingleheader{}%
+\pagestyle{single}%
\GNUTexinfomainmatter
\tableofcontents\newpage
- branch master updated: Shorter LaTeX preamble,
Gavin D. Smith <=