texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/Texinfo/Convert/LaTeX.pm: Change \GNUTexinfo


From: Gavin D. Smith
Subject: branch master updated: * tp/Texinfo/Convert/LaTeX.pm: Change \GNUTexinfo- prefix to \Texinfo- throughout, both for brevity and to make it easier for others to make their own non-GNU version of Texinfo.
Date: Sat, 08 Oct 2022 17:05:07 -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 f708ceb6ba * tp/Texinfo/Convert/LaTeX.pm: Change \GNUTexinfo- prefix 
to \Texinfo- throughout, both for brevity and to make it easier for others to 
make their own non-GNU version of Texinfo.
f708ceb6ba is described below

commit f708ceb6badcd664fdf3139c9f786192ad00fde7
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Oct 8 22:04:42 2022 +0100

    * tp/Texinfo/Convert/LaTeX.pm: Change \GNUTexinfo- prefix
    to \Texinfo- throughout, both for brevity and to make it
    easier for others to make their own non-GNU version of Texinfo.
---
 ChangeLog                                          |    6 +
 tp/Texinfo/Convert/LaTeX.pm                        |   68 +-
 .../results/converters_tests/at_commands_in_raw.pl |    4 +-
 .../combined_fonts/res_latex/combined_fonts.tex    |   52 +-
 tp/t/results/converters_tests/complex_nestings.pl  |   30 +-
 .../res_latex/definition_commands.tex              |  120 +-
 .../converters_tests/empty/res_latex/empty.tex     |   14 +-
 tp/t/results/converters_tests/form_feeds.pl        |    8 +-
 .../converters_tests/frenchspacing_and_code.pl     |   24 +-
 tp/t/results/converters_tests/image_formatting.pl  |    8 +-
 .../index_entry_in_preformatted.pl                 |    8 +-
 .../res_latex/minimal_empty_empty.tex              |   14 +-
 .../res_latex/minimal_empty_with_bye.tex           |   14 +-
 .../res_latex/minimal_empty_with_input.tex         |   14 +-
 .../converters_tests/normal_font_in_monospace.pl   |    8 +-
 .../printindex_merged_indices_code_style.tex       |   14 +-
 .../res_latex/references_to_top_no_top_output.tex  |   14 +-
 .../res_latex/simplest_no_node_section.tex         |   14 +-
 tp/t/results/converters_tests/sp_in_example.pl     |    8 +-
 .../table_in_display_in_example.pl                 |   12 +-
 .../table_in_example_in_display.pl                 |   12 +-
 tp/t/results/coverage/cartouche.pl                 |    2 +-
 tp/t/results/coverage/cartouche_in_example.pl      |   18 +-
 tp/t/results/coverage/cartouche_in_quotation.pl    |    2 +-
 tp/t/results/coverage/commands.pl                  |    2 +-
 tp/t/results/coverage/comment_on_cartouche_line.pl |    2 +-
 tp/t/results/coverage/def.pl                       |    4 +-
 tp/t/results/coverage/exdent_and_commands.pl       |   16 +-
 tp/t/results/coverage/exdent_and_formats.pl        |   40 +-
 tp/t/results/coverage/flushleft_flushright.pl      |    8 +-
 .../coverage/flushleft_flushright_in_quotation.pl  |    8 +-
 tp/t/results/coverage/flushright_example_nested.pl |   24 +-
 tp/t/results/coverage/preformatted.pl              |   12 +-
 tp/t/results/coverage/table.pl                     |    4 +-
 .../format_on_first_footnote_line.pl               |    8 +-
 tp/t/results/coverage_braces/kbd.pl                |   16 +-
 tp/t/results/coverage_braces/nested.pl             |    2 +-
 tp/t/results/coverage_braces/nested_args.pl        |    2 +-
 .../one_argument_leading_trailing_spaces.pl        |    2 +-
 .../formats_encodings/at_commands_in_refs.pl       |    8 +-
 .../res_latex/char_latin1_latin1_in_refs.tex       |   14 +-
 .../mathjax_with_texinfo_enable_encoding.tex       |   14 +-
 tp/t/results/indices/def_syn_indices.pl            |   18 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   14 +-
 tp/t/results/indices/empty_cindex_entry.pl         |   14 +-
 tp/t/results/indices/empty_index_entry.pl          |   14 +-
 tp/t/results/indices/empty_string_index_entry.pl   |   14 +-
 tp/t/results/indices/explicit_sort_key.pl          |   14 +-
 .../multiple_index_text_sortas_seeentry_seealso.pl |   14 +-
 tp/t/results/indices/same_only_seealso_seeentry.pl |   14 +-
 tp/t/results/indices/same_seealso_seeentry.pl      |   14 +-
 tp/t/results/indices/seealso_duplicate.pl          |   14 +-
 tp/t/results/indices/seeentry.pl                   |   14 +-
 tp/t/results/indices/subentries.pl                 |   14 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   14 +-
 tp/t/results/indices/subentry_and_sortas_spaces.pl |   14 +-
 tp/t/results/indices/syncode_index_print_both.pl   |   14 +-
 tp/t/results/indices/transparent_sort_chars.pl     |   14 +-
 tp/t/results/itemize/enumerate_in_example.pl       |   12 +-
 .../res_latex/inter_item_commands_in_enumerate.tex |   14 +-
 .../res_latex/inter_item_commands_in_itemize.tex   |   14 +-
 tp/t/results/itemize/itemize_in_example.pl         |   40 +-
 tp/t/results/itemize/itemize_long_item.pl          |   16 +-
 .../res_latex/multiple_lang_chapters.tex           |   14 +-
 ...anchor_links_xref_xrefautomaticsectiontitle.tex |   14 +-
 .../brace_in_index/res_latex/brace_in_index.tex    |   14 +-
 tp/t/results/latex_tests/custom_headings.pl        |    4 +-
 .../custom_headings/res_latex/custom_headings.tex  |   18 +-
 .../res_latex/enumerate_arguments.tex              |   14 +-
 .../res_latex/error_in_sectioning_command.tex      |   14 +-
 tp/t/results/latex_tests/example_in_cartouche.pl   |   12 +-
 .../res_latex/example_in_cartouche.tex             |   28 +-
 .../float_and_refs/res_latex/float_and_refs.tex    |   14 +-
 .../fonttextsize/res_latex/fonttextsize.tex        |   14 +-
 .../latex_tests/indices/res_latex/indices.tex      |   14 +-
 .../informative_commands_in_top_node.pl            |    2 +-
 .../res_latex/informative_commands_in_top_node.tex |   16 +-
 .../res_latex/nested_enumerate.tex                 |   14 +-
 .../nested_itemize/res_latex/nested_itemize.tex    |   14 +-
 .../no_titlepage_and_setchapternewpage_odd.tex     |   18 +-
 .../no_titlepage_and_setchapternewpage_on.pl       |    2 +-
 .../no_titlepage_and_setchapternewpage_on.tex      |   14 +-
 .../latex_tests/pagesizes/res_latex/pagesizes.tex  |   14 +-
 .../latex_tests/pagetype/res_latex/pagetype.tex    |   14 +-
 .../setchapternewpage_on_odd_titlepage.pl          |    4 +-
 .../setchapternewpage_on_odd_titlepage.tex         |   18 +-
 .../res_latex/settitle_and_headings.tex            |   16 +-
 .../shorttitlepage/res_latex/shorttitlepage.tex    |   14 +-
 .../three_setchapternewpage_on_odd_off.pl          |    6 +-
 .../three_setchapternewpage_on_odd_off.tex         |   20 +-
 .../res_latex/titlepage_and_headings.tex           |   14 +-
 .../titlepage_and_setchapternewpage_odd.tex        |   18 +-
 .../titlepage_and_setchapternewpage_on.pl          |    2 +-
 .../titlepage_and_setchapternewpage_on.tex         |   14 +-
 .../res_latex/titlepage_classical.tex              |   14 +-
 .../res_latex/titlepage_in_top_node.tex            |   14 +-
 .../res_latex/titlepage_long_title.tex             |   14 +-
 .../res_latex/titlepage_no_author.tex              |   14 +-
 .../res_latex/titlepage_no_title.tex               |   14 +-
 .../titlepage_with_commands_classical.tex          |   14 +-
 .../latex_tests/two_setchapternewpage_odd_on.pl    |    2 +-
 .../res_latex/two_setchapternewpage_odd_on.tex     |   20 +-
 .../latex_tests/two_setchapternewpage_on_odd.pl    |    4 +-
 .../res_latex/two_setchapternewpage_on_odd.tex     |   18 +-
 .../res_latex/verbatim_in_smallformat.tex          |   14 +-
 .../codequoteundirected_codequotebacktick.pl       |   98 +-
 .../misc_commands/command_in_heading_footing.pl    |   14 +-
 .../misc_commands/comment_space_command_on_line.pl |   14 +-
 tp/t/results/misc_commands/comments_in_text.pl     |   14 +-
 tp/t/results/misc_commands/definfoenclose.pl       |   14 +-
 .../misc_commands/definfoenclose_with_empty_arg.pl |   14 +-
 tp/t/results/misc_commands/empty_center.pl         |   14 +-
 .../results/misc_commands/empty_center_with_arg.pl |   14 +-
 tp/t/results/misc_commands/footnote_in_center.pl   |   22 +-
 .../misc_commands/heading_command_in_commands.pl   |   22 +-
 .../incorrect_allowcodebreaks_argument.pl          |   14 +-
 tp/t/results/misc_commands/indent_in_quotation.pl  |   14 +-
 tp/t/results/misc_commands/kbdinputstyle.pl        |   58 +-
 .../misc_commands/kbdinputstyle_in_table.pl        |   40 +-
 .../no_empty_line_between_headings.pl              |   14 +-
 .../misc_commands/noindent_after_smallexample.pl   |   18 +-
 tp/t/results/misc_commands/noindent_empty_para.pl  |   14 +-
 .../results/misc_commands/noindent_in_paragraph.pl |   14 +-
 tp/t/results/misc_commands/noindent_indent.pl      |   14 +-
 tp/t/results/misc_commands/ref_in_center.pl        |   14 +-
 tp/t/results/misc_commands/setfilename.pl          |   14 +-
 tp/t/results/misc_commands/test_allowcodebreaks.pl |   14 +-
 tp/t/results/misc_commands/vskip.pl                |   14 +-
 tp/t/results/preformatted/caption_in_example.pl    |   12 +-
 .../comment_example_and_blank_lines.pl             |   32 +-
 tp/t/results/preformatted/comments_in_example.pl   |   24 +-
 tp/t/results/preformatted/def_in_example.pl        |    8 +-
 tp/t/results/preformatted/empty_line.pl            |    8 +-
 .../preformatted/example_at_commands_arguments.pl  |    8 +-
 tp/t/results/preformatted/example_class.pl         |    8 +-
 .../preformatted/example_empty_arguments.pl        |   24 +-
 tp/t/results/preformatted/example_multi_class.pl   |    8 +-
 .../preformatted/insertcopying_in_example.pl       |    8 +-
 .../preformatted/nested_example_and_comment.pl     |   64 +-
 tp/t/results/preformatted/nested_formats.pl        |   16 +-
 tp/t/results/preformatted/page_in_example.pl       |    8 +-
 tp/t/results/preformatted/quote_dash_in_display.pl |    8 +-
 tp/t/results/preformatted/quote_dash_in_example.pl |    8 +-
 .../preformatted/text_on_display_command_line.pl   |   28 +-
 .../preformatted/text_on_example_command_line.pl   |   28 +-
 tp/t/results/preformatted/titlefont_in_example.pl  |    8 +-
 tp/t/results/quotation/empty_quotation.pl          |   14 +-
 tp/t/results/quotation/quotation_and_author.pl     |   14 +-
 .../quotation/quotation_author_in_example.pl       |   22 +-
 .../space_at_commands_end_quotation_line.pl        |   14 +-
 tp/t/results/regions/format_in_titlepage.pl        |    4 +-
 .../regions/format_in_titlepage_titlepage.pl       |    4 +-
 .../res_latex/chapter_between_nodes.tex            |   14 +-
 .../lone_Top_node/res_latex/lone_Top_node.tex      |   14 +-
 .../sectioning/loop_nodes/res_latex/loop_nodes.tex |   14 +-
 .../node_sectop_before_chapter_no_node.tex         |   14 +-
 .../res_latex/node_sectop_before_lone_node_Top.tex |   14 +-
 .../res_latex/nodes_before_after_top.tex           |   14 +-
 .../res_latex/nodes_before_after_top_xref.tex      |   14 +-
 .../res_latex/nodes_before_top.tex                 |   14 +-
 .../res_latex/section_before_after_top_node.tex    |   14 +-
 .../section_before_after_top_node_last_node.tex    |   14 +-
 .../res_latex/section_chapter_before_top_nodes.tex |   14 +-
 .../res_latex/top_node_part_top.tex                |   14 +-
 .../res_latex/inter_item_commands_in_table.tex     |   38 +-
 .../inter_item_commands_in_table_in_example.tex    |   32 +-
 .../non_ascii_test_latex/os\303\251_utf8.tex"      |   14 +-
 .../indices_in_begin_tables_lists.tex              |   38 +-
 .../indices_in_begin_tables_lists.tex              |   38 +-
 .../res_parser/formatting_latex/formatting.tex     | 2330 ++++++++++----------
 170 files changed, 2544 insertions(+), 2538 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ffe84f870..9f5fefcb40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-10-08  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Convert/LaTeX.pm: Change \GNUTexinfo- prefix
+       to \Texinfo- throughout, both for brevity and to make it
+       easier for others to make their own non-GNU version of Texinfo.
+
 2022-10-08  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.texi (Generic Translator texi2any):
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 5af8399856..ebdb0a9208 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -260,7 +260,7 @@ my %LaTeX_in_heading_commands_formatting = (
   'thissectionnum' => '\thesection{}',
   'thisfile' => '',
   'thispage' => '\thepage{}',
-  'thistitle' => '\GNUTexinfosettitle{}',
+  'thistitle' => '\Texinfosettitle{}',
 );
 
 foreach my $kept_command (keys(%LaTeX_in_heading_commands_formatting),
@@ -305,9 +305,9 @@ my %section_map = (
    'section' => 'section',
    'subsection' => 'subsection',
    'subsubsection' => 'subsubsection',
-   # embed in a \GNUTexinfonopagebreakheading call to remove pagebreaks
-   'chapheading' => 'GNUTexinfonopagebreakheading{\chapter*}',
-   'majorheading' => 'GNUTexinfonopagebreakheading{\chapter*}',
+   # embed in a \Texinfonopagebreakheading call to remove pagebreaks
+   'chapheading' => 'Texinfonopagebreakheading{\chapter*}',
+   'majorheading' => 'Texinfonopagebreakheading{\chapter*}',
    'heading' => 'section*',
    'subheading' => 'subsection*',
    'subsubheading' => 'subsubsection*',
@@ -503,8 +503,8 @@ my $small_font_size = 'footnotesize';
 
 my %LaTeX_environment_commands = (
   'raggedright' => ['flushleft'],
-  'flushleft' => ['flushleft', 'GNUTexinfopreformatted'],
-  'flushright' => ['flushright', 'GNUTexinfopreformatted'],
+  'flushleft' => ['flushleft', 'Texinfopreformatted'],
+  'flushright' => ['flushright', 'Texinfopreformatted'],
   'quotation' => ['quote'],
   'smallquotation' => ['quote', $small_font_size],
   'indentedblock' => ['quote'],
@@ -515,13 +515,13 @@ my %LaTeX_environment_commands = (
   'table' => ['description'],
   'vtable' => ['description'],
   'ftable' => ['description'],
-  'example' => ['GNUTexinfoindented'],
-  'lisp' => ['GNUTexinfoindented'],
-  'display' => ['GNUTexinfoindented'],
+  'example' => ['Texinfoindented'],
+  'lisp' => ['Texinfoindented'],
+  'display' => ['Texinfoindented'],
 );
 
 my %LaTeX_environment_options = (
-  'cartouche' => {'mdframed' => 'style=GNUTexinfocartouche'},
+  'cartouche' => {'mdframed' => 'style=Texinfocartouche'},
 );
 
 my %LaTeX_environment_packages = (
@@ -530,7 +530,7 @@ my %LaTeX_environment_packages = (
 
 my %LaTeX_fixed_width_environments = (
   'verbatim' => 1,
-  'GNUTexinfopreformatted' => 1,
+  'Texinfopreformatted' => 1,
 );
 
 foreach my $environment_command (@LaTeX_same_block_commands) {
@@ -572,7 +572,7 @@ foreach my $ignored_type(keys(%ignored_types)) {
 # seems to be in italic.  it is better to look at the results with
 # \usepackage{lmodern}.
 
-my $style_command_new_commands_prefix = 'GNUTexinfocommandstyle';
+my $style_command_new_commands_prefix = 'Texinfocommandstyle';
 # if new commands are setup for styles, they are in this hash
 my %style_brace_format_command_new_commands;
 
@@ -715,7 +715,7 @@ foreach my $quoted_command (@quoted_commands) {
 # are defined for every style command if needed.
 my %description_command_format;
 
-my $description_command_new_commands_prefix = 'GNUTexinfotablestyle';
+my $description_command_new_commands_prefix = 'Texinfotablestyle';
 
 # if new commands are setup for descriptions, they are in this hash
 my %description_command_new_commands = ();
@@ -1171,22 +1171,22 @@ my %front_main_matter_definitions = (
 );
 
 # not used as it is complicated to use section and chapter title
-# NB this will not work any more as the \GNUTexinfoset... macros are
+# NB this will not work any more as the \Texinfoset... 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
-\newcommand{\GNUTexinfosetsingleheader}{\pagestyle{fancy}
+\newcommand{\Texinfosetsingleheader}{\pagestyle{fancy}
 \fancyhf{}
 \lhead{\nouppercase{\leftmark}}
 \rhead{\thepage}
 }
 
 % called when setting double headers
-\newcommand{\GNUTexinfosetdoubleheader}{\pagestyle{fancy}
+\newcommand{\Texinfosetdoubleheader}{\pagestyle{fancy}
 \fancyhf{}
 \fancyhead[LE,RO]{\thepage}
-\fancyhead[RE]{\GNUTexinfosettitle}
+\fancyhead[RE]{\Texinfosettitle}
 \fancyhead[LO]{\nouppercase{\leftmark}}
 }
 
@@ -1216,7 +1216,7 @@ sub _latex_header() {
   $header_code .= "\\makeatletter\n";
 
   # for @thistitle and headers
-  $header_code .= "\\newcommand{\\GNUTexinfosettitle}{$settitle}%\n";
+  $header_code .= "\\newcommand{\\Texinfosettitle}{$settitle}%\n";
   $header_code .= "\n";
 
   if ($self->{'floats'}) {
@@ -1281,13 +1281,13 @@ sub _latex_header() {
   }
 
   $header_code .=
-'\newenvironment{GNUTexinfopreformatted}{%
+'\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
 ';
 
   $header_code .=
-'\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+'\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 ';
 
@@ -1327,7 +1327,7 @@ sub _latex_header() {
     $header_code .= "\n";
   }
   $header_code .= '% used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 ';
 
@@ -1341,23 +1341,23 @@ sub _latex_header() {
 
   if ($self->{'page_styles'}->{'double'}) {
     $header_code .=
-'\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+'\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 ';
   }
 
-  if ($self->{'extra_definitions'}->{'GNUTexinfonopagebreakheading'}) {
+  if ($self->{'extra_definitions'}->{'Texinfonopagebreakheading'}) {
     $header_code .=
 '% avoid pagebreak and headings setting for a sectioning command
-\newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax 
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
+\newcommand{\Texinfonopagebreakheading}[2]{{\let\clearpage\relax 
\let\cleardoublepage\relax \let\thispagestyle\Texinfoplaceholder #1{#2}}}
 
 ';
   }
 
   if ($self->{'packages'}->{'mdframed'}) {
    $header_code .= '% the mdframed style for @cartouche
-\mdfdefinestyle{GNUTexinfocartouche}{
+\mdfdefinestyle{Texinfocartouche}{
 innertopmargin=10pt, innerbottommargin=10pt,%
 roundcorner=10pt}
 
@@ -1376,8 +1376,8 @@ roundcorner=10pt}
   }
 
   $header_code .= '% allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 ';
 
   # this is in order to be able to run pdflatex even
@@ -1817,7 +1817,7 @@ my $default_chapter_page_code = 
$odd_chapter_new_page_code;
 # distinctive code that does nothing.  This is needed when
 # code is simply removed or when simple code is substituted.
 my $chapter_new_page_marking_placeholder
-   = '\GNUTexinfoplaceholder{setchapternewpage placeholder}';
+   = '\Texinfoplaceholder{setchapternewpage placeholder}';
 
 my %setchapternewpage_new_page_spec_code = (
   'on' => $chapter_new_page_marking_placeholder.'\clearpage',
@@ -1880,8 +1880,8 @@ sub _open_preformatted($$)
   }
 
   my $result = '';
-  $result .= '\\begin{GNUTexinfopreformatted}%'."\n";
-  $self->{'fixed_width_environments'}->{'GNUTexinfopreformatted'} = 1;
+  $result .= '\\begin{Texinfopreformatted}%'."\n";
+  $self->{'fixed_width_environments'}->{'Texinfopreformatted'} = 1;
   # The % comments out the newline to avoid extra vertical space.
 
   if ($preformatted_code_commands{$command}) {
@@ -1902,7 +1902,7 @@ sub _close_preformatted($$)
   if ($preformatted_code_commands{$command}) {
     pop @{$self->{'formatting_context'}->[-1]->{'code'}};
   }
-  return '\\end{GNUTexinfopreformatted}'."\n";
+  return '\\end{Texinfopreformatted}'."\n";
 }
 
 sub _open_preformatted_command($$)
@@ -3119,7 +3119,7 @@ sub _convert($$)
           # For @flushright and @flushleft, which don't use 'preformatted'
           # elements, unlike @display and @format.  This comments out the
           # newline.
-          $result .= '%' if $environment eq 'GNUTexinfopreformatted';
+          $result .= '%' if $environment eq 'Texinfopreformatted';
           $result .= "\n";
         }
         if ($LaTeX_environment_packages{$cmdname}) {
@@ -3244,8 +3244,8 @@ sub _convert($$)
           }
           # NOTE we used an extra layer of { } to avoid buggy interactions with
           # square brackets when the titleps package is being used.
-          $self->{'extra_definitions'}->{'GNUTexinfonopagebreakheading'} = 1
-            if $section_cmd =~ /^GNUTexinfonopagebreakheading\{/;
+          $self->{'extra_definitions'}->{'Texinfonopagebreakheading'} = 1
+            if $section_cmd =~ /^Texinfonopagebreakheading\{/;
         }
         # we add a label even if in_skipped_node_top (should only
         # be for the Top node, as another node ends in_skipped_node_top).
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index 976ca53e69..844086ea9e 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1582,14 +1582,14 @@ $result_converted{'latex_text'}->{'at_commands_in_raw'} 
= '\\label{anchor:Top}%
 
 <b>in b\\footnote{in footnote}.</b>
 \\label{anchor:anchor-in-html}%
-\\GNUTexinfocommandstyletextkbd{in kbd before tex}\\footnote{second footnote}.
+\\Texinfocommandstyletextkbd{in kbd before tex}\\footnote{second footnote}.
 
 
 
 
 \\{No value for `flag\'\\}.
 
-\\GNUTexinfocommandstyletextkbd{in kbd after tex}.
+\\Texinfocommandstyletextkbd{in kbd after tex}.
 
 See \\hyperref[anchor:anchor-in-html]{[anchor in html], 
page~\\pageref*{anchor:anchor-in-html}}.
 
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 0763d25b58..7f3e458ed4 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
@@ -13,41 +13,41 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % style command for cite in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextcite[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextcite[1]{{\normalfont{}\textsl{#1}}}%
 
 % style command for kbd in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextkbd[1]{{\ttfamily\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextkbd[1]{{\ttfamily\textsl{#1}}}%
 
 % style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
@@ -57,19 +57,19 @@
 \chapter{{chapter}}
 \label{anchor:chapter}%
 
-\texttt{c{-}{-}ode}, \textsl{d--fn}, \GNUTexinfocommandstyletextvar{v--ar}, 
\textbf{s--trong}, \GNUTexinfocommandstyletextkbd{k{-}{-}bd}, 
`\texttt{s{-}{-}amp}'.
+\texttt{c{-}{-}ode}, \textsl{d--fn}, \Texinfocommandstyletextvar{v--ar}, 
\textbf{s--trong}, \Texinfocommandstyletextkbd{k{-}{-}bd}, 
`\texttt{s{-}{-}amp}'.
 
 \texttt{\textsl{d{-}{-}fn in code}}
-\GNUTexinfocommandstyletextvar{\texttt{c{-}{-}ode in var}}
-\texttt{\GNUTexinfocommandstyletextvar{v--ar in code}}
-\textbf{\GNUTexinfocommandstyletextkbd{k{-}{-}bd in strong}}
+\Texinfocommandstyletextvar{\texttt{c{-}{-}ode in var}}
+\texttt{\Texinfocommandstyletextvar{v--ar in code}}
+\textbf{\Texinfocommandstyletextkbd{k{-}{-}bd in strong}}
 `\texttt{\textbf{s{-}{-}trong in samp}}'
 \textbf{`\texttt{s{-}{-}amp in strong}'}
 
-\GNUTexinfocommandstyletextcite{c--ite}
+\Texinfocommandstyletextcite{c--ite}
 
-\texttt{\GNUTexinfocommandstyletextcite{c--ite in code}}
-\GNUTexinfocommandstyletextcite{\texttt{c{-}{-}ode in cite}}
+\texttt{\Texinfocommandstyletextcite{c--ite in code}}
+\Texinfocommandstyletextcite{\texttt{c{-}{-}ode in cite}}
 
 \texttt{c{-}{-}ode} \textsl{s--lanted} \textbf{b--} \texttt{t{-}{-}}
 
@@ -79,13 +79,13 @@
 \textsl{\textbf{b-- in slanted}}
 \texttt{\textsl{s{-}{-}lanted in t}}
 \textsl{\texttt{t{-}{-} in slanted}}
-\texttt{\GNUTexinfocommandstyletextvar{v--ar in t}}
-\GNUTexinfocommandstyletextvar{\texttt{t{-}{-} in var}}
-
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextvar{v--ar in example}
-\GNUTexinfocommandstyletextcite{c--ite in example}
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\texttt{\Texinfocommandstyletextvar{v--ar in t}}
+\Texinfocommandstyletextvar{\texttt{t{-}{-} in var}}
+
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextvar{v--ar in example}
+\Texinfocommandstyletextcite{c--ite in example}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 \end{document}
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index b3912b1d1e..ce5c4dc715 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -1752,14 +1752,14 @@ $result_converted{'latex_text'}->{'complex_nestings'} = 
'\\label{anchor:Top}%
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily deffs
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
-\\texttt{my def \\EmbracOn{}\\textnormal{\\textsl{args 
\\GNUTexinfocommandstyletextvar{arg} \\dots{}\\@}}\\EmbracOff{}}& [Function]
+\\texttt{my def \\EmbracOn{}\\textnormal{\\textsl{args 
\\Texinfocommandstyletextvar{arg} \\dots{}\\@}}\\EmbracOff{}}& [Function]
 \\end{tabularx}
 
 \\index[fn]{my def@\\texttt{my def}}%
@@ -1788,9 +1788,9 @@ $result_converted{'latex_text'}->{'complex_nestings'} = 
'\\label{anchor:Top}%
 \\end{tabularx}
 
 \\index[vr]{variables@\\texttt{variables}}%
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
@@ -1800,33 +1800,33 @@ $result_converted{'latex_text'}->{'complex_nestings'} = 
'\\label{anchor:Top}%
 \\index[vr]{variables too@\\texttt{variables too}}%
 \\begin{quote}
 \\unskip{\\parskip=0pt\\noindent}%
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily THis is the defvar
 
 A table within the def
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 item}}]
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily text
 
 more text
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\item[{\\parbox[b]{\\linewidth}{%
 second item}}]
 \\end{description}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
 explanation
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{quote}
 \\end{quote}
 \\end{quote}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
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 0f0efe008b..99bf30174b 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
@@ -17,7 +17,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -25,18 +25,18 @@
 \makeindex[name=vr,title=]%
 
 % style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
@@ -46,14 +46,14 @@
 \EmbracOff{}%
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
@@ -71,19 +71,19 @@
 \index[fn]{fname@\texttt{fname}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-deffn no var for \GNUTexinfocommandstyletextvar{a---rg1} and 
\GNUTexinfocommandstyletextvar{a--rg2}
+deffn no var for \Texinfocommandstyletextvar{a---rg1} and 
\Texinfocommandstyletextvar{a--rg2}
 \end{quote}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{fname 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{a---rg1} 
\GNUTexinfocommandstyletextvar{a--rg2}}}\EmbracOff{}}& [Func]
+\texttt{fname 
\EmbracOn{}\textnormal{\textsl{\Texinfocommandstyletextvar{a---rg1} 
\Texinfocommandstyletextvar{a--rg2}}}\EmbracOff{}}& [Func]
 \end{tabularx}
 
 \index[fn]{fname@\texttt{fname}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-deffn explict var for \GNUTexinfocommandstyletextvar{a---rg1} and 
\GNUTexinfocommandstyletextvar{a--rg2}
+deffn explict var for \Texinfocommandstyletextvar{a---rg1} and 
\Texinfocommandstyletextvar{a--rg2}
 \end{quote}
 
 
@@ -95,7 +95,7 @@ deffn explict var for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocom
 \index[fn]{fname@\texttt{fname}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} and 
\GNUTexinfocommandstyletextvar{a--rg2}
+deffn r slanted for \Texinfocommandstyletextvar{a---rg1} and 
\Texinfocommandstyletextvar{a--rg2}
 \end{quote}
 
 
@@ -115,7 +115,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\GNUTexinfocommandstyletextvar{[}from to 
\GNUTexinfocommandstyletextvar{[}inc\GNUTexinfocommandstyletextvar{]]}) 
var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\Texinfocommandstyletextvar{[}from to 
\Texinfocommandstyletextvar{[}inc\Texinfocommandstyletextvar{]]}) 
var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -150,7 +150,7 @@ deffn r slanted for \GNUTexinfocommandstyletextvar{a---rg1} 
and \GNUTexinfocomma
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{]]}}\EmbracOn{})
 r:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\Texinfocommandstyletextvar{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\Texinfocommandstyletextvar{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\Texinfocommandstyletextvar{]]}}\EmbracOn{})
 r:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -178,14 +178,14 @@ deffn r slanted for 
\GNUTexinfocommandstyletextvar{a---rg1} and \GNUTexinfocomma
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 code:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\Texinfocommandstyletextvar{[}}from to 
\texttt{\Texinfocommandstyletextvar{[}}inc\texttt{\Texinfocommandstyletextvar{]]}})
 code:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\GNUTexinfocommandstyletextvar{[}}from to 
\texttt{\GNUTexinfocommandstyletextvar{[}}inc\texttt{\GNUTexinfocommandstyletextvar{]]}})
 t:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\texttt{\Texinfocommandstyletextvar{[}}from to 
\texttt{\Texinfocommandstyletextvar{[}}inc\texttt{\Texinfocommandstyletextvar{]]}})
 t:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -218,7 +218,7 @@ separators
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\GNUTexinfocommandstyletextvar{va---riable} 
var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\Texinfocommandstyletextvar{va---riable} 
var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -260,7 +260,7 @@ separators
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\GNUTexinfocommandstyletextvar{va---riable}}\EmbracOn{}
 r:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\EmbracOff{}\textnormal{\Texinfocommandstyletextvar{va---riable}}\EmbracOn{}
 r:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -288,14 +288,14 @@ separators
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 code:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\Texinfocommandstyletextvar{va---riable}}
 code:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\GNUTexinfocommandstyletextvar{va---riable}}
 t:var}}\EmbracOff{}}& [Special Form]
+\texttt{foobar 
\EmbracOn{}\textnormal{\textsl{\texttt{\Texinfocommandstyletextvar{va---riable}}
 t:var}}\EmbracOff{}}& [Special Form]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -356,8 +356,8 @@ name
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
 The \texttt{ft} request and the \texttt{\textbackslash{}f} escape change the 
current font
-to \GNUTexinfocommandstyletextvar{font} (one-character 
name~\GNUTexinfocommandstyletextvar{f}, two-character name
-\GNUTexinfocommandstyletextvar{fn}).
+to \Texinfocommandstyletextvar{font} (one-character 
name~\Texinfocommandstyletextvar{f}, two-character name
+\Texinfocommandstyletextvar{fn}).
 \end{quote}
 
 
@@ -382,13 +382,13 @@ test formatting of separators
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar})}& [Library Function]
+\texttt{int foobar (int\ \Texinfocommandstyletextvar{f---oo},\ float\ 
\Texinfocommandstyletextvar{b--ar})}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\dots{}\@ with var for \GNUTexinfocommandstyletextvar{f---oo} and 
\GNUTexinfocommandstyletextvar{b--ar}
+\dots{}\@ with var for \Texinfocommandstyletextvar{f---oo} and 
\Texinfocommandstyletextvar{b--ar}
 \end{quote}
 
 
@@ -400,7 +400,7 @@ test formatting of separators
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\dots{}\@ with r slanted for \GNUTexinfocommandstyletextvar{f---oo} and 
\GNUTexinfocommandstyletextvar{b--ar}
+\dots{}\@ with r slanted for \Texinfocommandstyletextvar{f---oo} and 
\Texinfocommandstyletextvar{b--ar}
 \end{quote}
 
 \noindent{}produces:
@@ -432,13 +432,13 @@ test formatting of separators
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{foo},\ float\ 
\GNUTexinfocommandstyletextvar{bar})}& [Library Function]
+\texttt{int foobar (int\ \Texinfocommandstyletextvar{foo},\ float\ 
\Texinfocommandstyletextvar{bar})}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\dots{}\@ for \GNUTexinfocommandstyletextvar{foo} and 
\GNUTexinfocommandstyletextvar{bar}
+\dots{}\@ for \Texinfocommandstyletextvar{foo} and 
\Texinfocommandstyletextvar{bar}
 \end{quote}
 \end{quote}
 
@@ -451,7 +451,7 @@ test formatting of separators
 \index[fn]{apply@\texttt{apply}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\texttt{apply} calls no var \GNUTexinfocommandstyletextvar{function} with 
\GNUTexinfocommandstyletextvar{arguments}
+\texttt{apply} calls no var \Texinfocommandstyletextvar{function} with 
\Texinfocommandstyletextvar{arguments}
 \end{quote}
 
 
@@ -463,13 +463,13 @@ test formatting of separators
 \index[fn]{apply@\texttt{apply}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-explicit keyword marking, no var \GNUTexinfocommandstyletextvar{function} with 
\GNUTexinfocommandstyletextvar{arguments}
+explicit keyword marking, no var \Texinfocommandstyletextvar{function} with 
\Texinfocommandstyletextvar{arguments}
 \end{quote}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{name \EmbracOn{}\textnormal{\textsl{argument \texttt{int} 
\texttt{a{-}{-}b} \GNUTexinfocommandstyletextvar{v--ar1}, word \texttt{{-}{-}} 
(\texttt{type o{-}{-}ther}, \GNUTexinfocommandstyletextvar{v---ar2}  
[\texttt{float} [\GNUTexinfocommandstyletextvar{var4}]])}}\EmbracOff{}}& 
[Category]
+\texttt{name \EmbracOn{}\textnormal{\textsl{argument \texttt{int} 
\texttt{a{-}{-}b} \Texinfocommandstyletextvar{v--ar1}, word \texttt{{-}{-}} 
(\texttt{type o{-}{-}ther}, \Texinfocommandstyletextvar{v---ar2}  
[\texttt{float} [\Texinfocommandstyletextvar{var4}]])}}\EmbracOff{}}& [Category]
 \end{tabularx}
 
 \index[fn]{name@\texttt{name}}%
@@ -481,105 +481,105 @@ In deffn with code and var used
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
+\texttt{int foobar (int\ \Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{[},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{]})\ r}& [Library Function]
+\texttt{int foobar (int\ \Texinfocommandstyletextvar{f---oo}\textnormal{[},\ 
float\ \Texinfocommandstyletextvar{b--ar}\textnormal{]})\ r}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\GNUTexinfocommandstyletextvar{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\GNUTexinfocommandstyletextvar{]})\ 
var}& [Library Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\Texinfocommandstyletextvar{[},\ float\ 
\Texinfocommandstyletextvar{b--ar}\Texinfocommandstyletextvar{]})\ var}& 
[Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}\textsl{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\textsl{]})\ slanted}& [Library 
Function]
+\texttt{int foobar (int\ \Texinfocommandstyletextvar{f---oo}\textsl{[},\ 
float\ \Texinfocommandstyletextvar{b--ar}\textsl{]})\ slanted}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ code}& [Library 
Function]
+\texttt{int foobar (int\ \Texinfocommandstyletextvar{f---oo}\texttt{[},\ 
float\ \Texinfocommandstyletextvar{b--ar}\texttt{]})\ code}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ \GNUTexinfocommandstyletextvar{f---oo}\texttt{[},\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}\texttt{]})\ t}& [Library Function]
+\texttt{int foobar (int\ \Texinfocommandstyletextvar{f---oo}\texttt{[},\ 
float\ \Texinfocommandstyletextvar{b--ar}\texttt{]})\ t}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textbf{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textbf{]}})\ t:b}& [Library 
Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\texttt{\textbf{[}},\ float\ 
\Texinfocommandstyletextvar{b--ar}\texttt{\textbf{]}})\ t:b}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\GNUTexinfocommandstyletextvar{]}})\
 r:var}& [Library Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\textnormal{\Texinfocommandstyletextvar{[}},\
 float\ 
\Texinfocommandstyletextvar{b--ar}\textnormal{\Texinfocommandstyletextvar{]}})\ 
r:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\textsl{]}})\ r:slanted}& 
[Library Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\textnormal{\textsl{[}},\ float\ 
\Texinfocommandstyletextvar{b--ar}\textnormal{\textsl{]}})\ r:slanted}& 
[Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ r:code}& 
[Library Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\Texinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ r:code}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ r:t}& [Library 
Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\textnormal{\texttt{[}},\ float\ 
\Texinfocommandstyletextvar{b--ar}\textnormal{\texttt{]}})\ r:t}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 code:var}& [Library Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\texttt{\Texinfocommandstyletextvar{[}},\ 
float\ 
\Texinfocommandstyletextvar{b--ar}\texttt{\Texinfocommandstyletextvar{]}})\ 
code:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\GNUTexinfocommandstyletextvar{[}},\
 float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\GNUTexinfocommandstyletextvar{]}})\
 t:var}& [Library Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\texttt{\Texinfocommandstyletextvar{[}},\ 
float\ 
\Texinfocommandstyletextvar{b--ar}\texttt{\Texinfocommandstyletextvar{]}})\ 
t:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ code:slanted}& 
[Library Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\Texinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ code:slanted}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (int\ 
\GNUTexinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ t:slanted}& [Library 
Function]
+\texttt{int foobar (int\ 
\Texinfocommandstyletextvar{f---oo}\texttt{\textsl{[}},\ float\ 
\Texinfocommandstyletextvar{b--ar}\texttt{\textsl{]}})\ t:slanted}& [Library 
Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
@@ -591,105 +591,105 @@ separators
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (i{-}{-}nt\ \GNUTexinfocommandstyletextvar{f---oo}[,\ 
float\ \GNUTexinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
+\texttt{int foobar (i{-}{-}nt\ \Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ default}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\textnormal{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r}& [Library Function]
+\texttt{int foobar (\textnormal{i--nt}\ \Texinfocommandstyletextvar{f---oo}[,\ 
float\ \Texinfocommandstyletextvar{b--ar}])\ r}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\GNUTexinfocommandstyletextvar{i--nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ var}& [Library Function]
+\texttt{int foobar (\Texinfocommandstyletextvar{i--nt}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\textsl{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ slanted}& [Library Function]
+\texttt{int foobar (\textsl{i{-}{-}nt}\ \Texinfocommandstyletextvar{f---oo}[,\ 
float\ \Texinfocommandstyletextvar{b--ar}])\ slanted}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code}& [Library Function]
+\texttt{int foobar (\texttt{i{-}{-}nt}\ \Texinfocommandstyletextvar{f---oo}[,\ 
float\ \Texinfocommandstyletextvar{b--ar}])\ code}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\texttt{i{-}{-}nt}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t}& [Library Function]
+\texttt{int foobar (\texttt{i{-}{-}nt}\ \Texinfocommandstyletextvar{f---oo}[,\ 
float\ \Texinfocommandstyletextvar{b--ar}])\ t}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\texttt{\textbf{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:b}& [Library Function]
+\texttt{int foobar (\texttt{\textbf{i{-}{-}nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ t:b}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\textnormal{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:var}& [Library Function]
+\texttt{int foobar (\textnormal{\Texinfocommandstyletextvar{i--nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ r:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\textnormal{\textsl{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:slanted}& [Library Function]
+\texttt{int foobar (\textnormal{\textsl{i--nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ r:slanted}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:code}& [Library Function]
+\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ r:code}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ r:t}& [Library Function]
+\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ r:t}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:var}& [Library Function]
+\texttt{int foobar (\texttt{\Texinfocommandstyletextvar{i--nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ code:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\texttt{\GNUTexinfocommandstyletextvar{i--nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:var}& [Library Function]
+\texttt{int foobar (\texttt{\Texinfocommandstyletextvar{i--nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ t:var}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ code:slanted}& [Library Function]
+\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ code:slanted}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\GNUTexinfocommandstyletextvar{f---oo}[,\ float\ 
\GNUTexinfocommandstyletextvar{b--ar}])\ t:slanted}& [Library Function]
+\texttt{int foobar (\texttt{\textsl{i{-}{-}nt}}\ 
\Texinfocommandstyletextvar{f---oo}[,\ float\ 
\Texinfocommandstyletextvar{b--ar}])\ t:slanted}& [Library Function]
 \end{tabularx}
 
 \index[fn]{foobar@\texttt{foobar}}%
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 2eb2a1598d..26e39cf6eb 100644
--- a/tp/t/results/converters_tests/empty/res_latex/empty.tex
+++ b/tp/t/results/converters_tests/empty/res_latex/empty.tex
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 8d12c5e91b..0df61cdcd7 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -1445,11 +1445,11 @@ cc \\par{}
 
 See \\hyperref[anchor:first-node]{[firstnode], 
page~\\pageref*{anchor:first-node}}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily in example
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 \\begin{center}
 around center
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 68651867e4..5b56b318e2 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -2493,16 +2493,16 @@ In text w: z? n; p. f
 
 \\texttt{a:\\ b!\\ gg;\\ h}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily c:\\ d?\\ j
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
-\\texttt{type:\\ t.\\ c name?\\ n.\\ d arg?\\ e:\\ f.\\  
\\GNUTexinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ k}}& [cat: r. 
a on \\texttt{class:\\ MyC.\\ b}]
+\\texttt{type:\\ t.\\ c name?\\ n.\\ d arg?\\ e:\\ f.\\  
\\Texinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ k}}& [cat: r. a 
on \\texttt{class:\\ MyC.\\ b}]
 \\end{tabularx}
 
 \\index[fn]{name? n. d on class: MyC. b@\\texttt{name?\\ n.\\ d\\ on class:\\ 
MyC.\\ b}}%
@@ -2514,7 +2514,7 @@ deftypeop
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
-\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: f. 
\\GNUTexinfocommandstyletextvar{vv: g? b} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{vclass:\\ MyC.\\ u}]
+\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: f. 
\\Texinfocommandstyletextvar{vv: g? b} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{vclass:\\ MyC.\\ u}]
 \\end{tabularx}
 
 \\index[fn]{vname? n; d on vclass: MyC. u@\\texttt{vname?\\ n;\\ d\\ on 
vclass:\\ MyC.\\ u}}%
@@ -2531,16 +2531,16 @@ In text w: z? n; p. fn
 
 \\texttt{a:\\ b!\\ gg;\\ hn}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily c:\\ d?\\ jn
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
-\\texttt{type:\\ t.\\ c name?\\ n.\\ d narg?\\ e:\\ f.\\  
\\GNUTexinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ k}}& [cat: r. 
a on \\texttt{class:\\ MyC.\\ b}]
+\\texttt{type:\\ t.\\ c name?\\ n.\\ d narg?\\ e:\\ f.\\  
\\Texinfocommandstyletextvar{v: g. h}\\ \\texttt{code?\\ is:\\ k}}& [cat: r. a 
on \\texttt{class:\\ MyC.\\ b}]
 \\end{tabularx}
 
 \\index[fn]{name? n. d on class: MyC. b@\\texttt{name?\\ n.\\ d\\ on class:\\ 
MyC.\\ b}}%
@@ -2552,7 +2552,7 @@ deftypeop n
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
-\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: f. 
\\GNUTexinfocommandstyletextvar{vv: g? b} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{nvclass:\\ MyC.\\ u}]
+\\texttt{vname?\\ n;\\ d \\EmbracOn{}\\textnormal{\\textsl{varg? ve: f. 
\\Texinfocommandstyletextvar{vv: g? b} \\texttt{vcode?\\ is:\\ 
a}}}\\EmbracOff{}}& [vcat: r. z on \\texttt{nvclass:\\ MyC.\\ u}]
 \\end{tabularx}
 
 \\index[fn]{vname? n; d on nvclass: MyC. u@\\texttt{vname?\\ n;\\ d\\ on 
nvclass:\\ MyC.\\ u}}%
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 1b44ca76e1..5c5153f43d 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -2967,8 +2967,8 @@ $result_converted{'latex_text'}->{'image_formatting'} = 
'\\label{anchor:Top}%
 \\texttt{@image\\{@file\\{f{-}{-}ile\\}@@@.,aze,az,alt,@file\\{file ext\\}\\ 
e{-}{-}xt@\\}} \\includegraphics[width=aze,height=az]{f--ile@.}
 \\includegraphics{image} \\includegraphics{image}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\texttt{@image\\{f{-}{-}ile\\}}\\ \\includegraphics{f--ile}
 \\texttt{@image\\{f{-}{-}ile,l{-}{-}i\\}}\\ 
\\includegraphics[width=l--i]{f--ile}
 \\texttt{@image\\{f{-}{-}ile{,}{,}l{-}{-}e\\}}\\ 
\\includegraphics[height=l--e]{f--ile}
@@ -2978,8 +2978,8 @@ $result_converted{'latex_text'}->{'image_formatting'} = 
'\\label{anchor:Top}%
 \\texttt{@image\\{f-ile,aze{,}{,}a{-}{-}lt\\}}\\ 
\\includegraphics[width=aze]{f-ile}
 \\texttt{@image\\{@file\\{f{-}{-}ile\\}@@@.,aze,az,alt,@file\\{file ext\\}\\ 
e{-}{-}xt@\\}}\\ \\includegraphics[width=aze,height=az]{f--ile@.}
 \\includegraphics{image}\\ \\includegraphics{image}
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 \\includegraphics{f--ile}
 
diff --git a/tp/t/results/converters_tests/index_entry_in_preformatted.pl 
b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
index ca265a317e..8bcd647232 100644
--- a/tp/t/results/converters_tests/index_entry_in_preformatted.pl
+++ b/tp/t/results/converters_tests/index_entry_in_preformatted.pl
@@ -637,16 +637,16 @@ 
$result_converted{'latex_text'}->{'index_entry_in_preformatted'} = '\\label{anch
 \\chapter{{Chapter}}
 \\label{anchor:chap}%
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\index[cp]{first@first}%
 text
 
 \\index[cp]{other@other}%
 text2
 \\index[cp]{last@last}%
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
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 2eb2a1598d..26e39cf6eb 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 2eb2a1598d..26e39cf6eb 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 2eb2a1598d..26e39cf6eb 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/converters_tests/normal_font_in_monospace.pl 
b/tp/t/results/converters_tests/normal_font_in_monospace.pl
index 3b31b54c6e..1878ff34ac 100644
--- a/tp/t/results/converters_tests/normal_font_in_monospace.pl
+++ b/tp/t/results/converters_tests/normal_font_in_monospace.pl
@@ -279,11 +279,11 @@ 
$result_converted{'docbook'}->{'normal_font_in_monospace'} = '<screen>in example
 </para>';
 
 
-$result_converted{'latex_text'}->{'normal_font_in_monospace'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'normal_font_in_monospace'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily in example \\textnormal{in r---now \\texttt{in co{-}{-}{-}de}}
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 \\texttt{in command{-}{-}{-}c \\textnormal{in r---r \\texttt{in 
file{-}{-}{-}}}}.
 ';
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 d932a08ce7..474a955fa1 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
@@ -14,7 +14,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -23,26 +23,26 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 145eec80e3..9c0249e58e 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
@@ -14,7 +14,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % new float for type `list'
 \newfloat{TexinfoFloatlist}{htb}{tfl}[chapter]
@@ -26,26 +26,26 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \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 4d8a00edfb..86050fd471 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/converters_tests/sp_in_example.pl 
b/tp/t/results/converters_tests/sp_in_example.pl
index d6cac5abc2..0e1a1f2154 100644
--- a/tp/t/results/converters_tests/sp_in_example.pl
+++ b/tp/t/results/converters_tests/sp_in_example.pl
@@ -457,8 +457,8 @@ sp after para
 </screen>';
 
 
-$result_converted{'latex_text'}->{'sp_in_example'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'sp_in_example'} = '\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily Para
 \\vskip 1\\baselineskip %
 other para
@@ -475,8 +475,8 @@ B
 
 sp after para
 \\vskip 1\\baselineskip %
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl 
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index d01f04401e..136bea714e 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -321,17 +321,17 @@ 
$result_converted{'docbook'}->{'table_in_display_in_example'} = '<variablelist><
 </literallayout></listitem></varlistentry></variablelist>';
 
 
-$result_converted{'latex_text'}->{'table_in_display_in_example'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'table_in_display_in_example'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 item}}]
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 Line
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{description}
-\\end{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl 
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index 8b6e0bdc16..a6f0df250b 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -321,17 +321,17 @@ 
$result_converted{'docbook'}->{'table_in_example_in_display'} = '<variablelist><
 </screen></listitem></varlistentry></variablelist>';
 
 
-$result_converted{'latex_text'}->{'table_in_example_in_display'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'table_in_example_in_display'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 item}}]
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily Line
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{description}
-\\end{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/coverage/cartouche.pl 
b/tp/t/results/coverage/cartouche.pl
index 56282b79e7..fb9b63ad68 100644
--- a/tp/t/results/coverage/cartouche.pl
+++ b/tp/t/results/coverage/cartouche.pl
@@ -112,7 +112,7 @@ $result_converted{'xml'}->{'cartouche'} = '<cartouche 
endspaces=" ">
 </para></cartouche>';
 
 
-$result_converted{'latex_text'}->{'cartouche'} = 
'\\begin{mdframed}[style=GNUTexinfocartouche]
+$result_converted{'latex_text'}->{'cartouche'} = 
'\\begin{mdframed}[style=Texinfocartouche]
 in cartouche.
 \\end{mdframed}
 ';
diff --git a/tp/t/results/coverage/cartouche_in_example.pl 
b/tp/t/results/coverage/cartouche_in_example.pl
index e8fd1b831c..453acf2eb6 100644
--- a/tp/t/results/coverage/cartouche_in_example.pl
+++ b/tp/t/results/coverage/cartouche_in_example.pl
@@ -215,19 +215,19 @@ $result_converted{'xml'}->{'cartouche_in_example'} = 
'<example endspaces=" ">
 ';
 
 
-$result_converted{'latex_text'}->{'cartouche_in_example'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'cartouche_in_example'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily In example
-\\end{GNUTexinfopreformatted}
-\\begin{mdframed}[style=GNUTexinfocartouche]
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\begin{mdframed}[style=Texinfocartouche]
+\\begin{Texinfopreformatted}%
 \\ttfamily In cartouche in example
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{mdframed}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily end example
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 
diff --git a/tp/t/results/coverage/cartouche_in_quotation.pl 
b/tp/t/results/coverage/cartouche_in_quotation.pl
index 4292a227ac..331ff24543 100644
--- a/tp/t/results/coverage/cartouche_in_quotation.pl
+++ b/tp/t/results/coverage/cartouche_in_quotation.pl
@@ -217,7 +217,7 @@ $result_converted{'xml'}->{'cartouche_in_quotation'} = 
'<quotation endspaces=" "
 
 $result_converted{'latex_text'}->{'cartouche_in_quotation'} = '\\begin{quote}
 In quotation
-\\begin{mdframed}[style=GNUTexinfocartouche]
+\\begin{mdframed}[style=Texinfocartouche]
 In cartouche in quotation
 \\end{mdframed}
 end quotation
diff --git a/tp/t/results/coverage/commands.pl 
b/tp/t/results/coverage/commands.pl
index 860e604bbf..7088074aee 100644
--- a/tp/t/results/coverage/commands.pl
+++ b/tp/t/results/coverage/commands.pl
@@ -607,7 +607,7 @@ File $\\rightarrow{}$ Open\\@.
 
 \\index[cp]{index entry ""in text"" LaTeX@index entry ``in text\'\' \\LaTeX{}}%
 
-\\GNUTexinfonopagebreakheading{\\chapter*}{{majorheading \\textbf{in b}}}
+\\Texinfonopagebreakheading{\\chapter*}{{majorheading \\textbf{in b}}}
 ';
 
 
diff --git a/tp/t/results/coverage/comment_on_cartouche_line.pl 
b/tp/t/results/coverage/comment_on_cartouche_line.pl
index 12c0ca36a7..b94445fa5d 100644
--- a/tp/t/results/coverage/comment_on_cartouche_line.pl
+++ b/tp/t/results/coverage/comment_on_cartouche_line.pl
@@ -139,7 +139,7 @@ $result_converted{'xml'}->{'comment_on_cartouche_line'} = 
'<cartouche spaces=" "
 ';
 
 
-$result_converted{'latex_text'}->{'comment_on_cartouche_line'} = 
'\\begin{mdframed}[style=GNUTexinfocartouche]
+$result_converted{'latex_text'}->{'comment_on_cartouche_line'} = 
'\\begin{mdframed}[style=Texinfocartouche]
 in cartouche.
 \\end{mdframed}
 ';
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 0e3dbbc9f4..0d415fa70f 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -2536,10 +2536,10 @@ def--fn
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
-\\texttt{\\GNUTexinfocommandstyletextvar{i} 
\\EmbracOn{}\\textnormal{\\textsl{a g}}\\EmbracOff{}}& [fset]
+\\texttt{\\Texinfocommandstyletextvar{i} \\EmbracOn{}\\textnormal{\\textsl{a 
g}}\\EmbracOff{}}& [fset]
 \\end{tabularx}
 
-\\index[fn]{i@\\texttt{\\GNUTexinfocommandstyletextvar{i}}}%
+\\index[fn]{i@\\texttt{\\Texinfocommandstyletextvar{i}}}%
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
diff --git a/tp/t/results/coverage/exdent_and_commands.pl 
b/tp/t/results/coverage/exdent_and_commands.pl
index 5eed4bd069..2130e80715 100644
--- a/tp/t/results/coverage/exdent_and_commands.pl
+++ b/tp/t/results/coverage/exdent_and_commands.pl
@@ -486,25 +486,25 @@ in exdented a @* \\leavevmode{}\\\\ and following
 after exdented
 \\end{quote}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily example
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\leavevmode{}\\\\
 \\hbox{\\kern -\\leftmargin}%
 in exdented protected eol \\ {}
 \\\\
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily following
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\leavevmode{}\\\\
 \\hbox{\\kern -\\leftmargin}%
 in exdented a @* \\leavevmode{}\\\\ and following
 \\\\
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily after exdented
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 
diff --git a/tp/t/results/coverage/exdent_and_formats.pl 
b/tp/t/results/coverage/exdent_and_formats.pl
index 9d4dbd702f..486bb4b4da 100644
--- a/tp/t/results/coverage/exdent_and_formats.pl
+++ b/tp/t/results/coverage/exdent_and_formats.pl
@@ -1997,37 +1997,37 @@ quotation2
 ';
 
 
-$result_converted{'latex_text'}->{'exdent_and_formats'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'exdent_and_formats'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\ Example   Hoho.\\ \\TeX{}\\ .\\ \\leavevmode{}\\\\\\ @.
 
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\leavevmode{}\\\\
 \\hbox{\\kern -\\leftmargin}%
 Other line
 \\\\
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily not exdented
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 
-\\begin{GNUTexinfoindented}
+\\begin{Texinfoindented}
 \\leavevmode{}\\\\
 \\hbox{\\kern -\\leftmargin}%
 exdented  and dash --- in example
 \\\\
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily Not exdented
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\leavevmode{}\\\\
 \\hbox{\\kern -\\leftmargin}%
 exdented
 \\\\
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily Not exdented
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 Para1.
 
@@ -2053,20 +2053,20 @@ quotation para 1
 quotation para 2
 \\end{quote}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily Example   Hoho.
-\\end{GNUTexinfopreformatted}
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily Nested Other line
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\leavevmode{}\\\\
 \\hbox{\\kern -\\leftmargin}%
 exdented nested other line
 \\\\
-\\end{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
+\\end{Texinfoindented}
 
 \\begin{quote}
 \\leavevmode{}\\\\
diff --git a/tp/t/results/coverage/flushleft_flushright.pl 
b/tp/t/results/coverage/flushleft_flushright.pl
index 5656b88dc3..ed4f685a67 100644
--- a/tp/t/results/coverage/flushleft_flushright.pl
+++ b/tp/t/results/coverage/flushleft_flushright.pl
@@ -322,23 +322,23 @@ ldskf dsflj
 
 $result_converted{'latex_text'}->{'flushleft_flushright'} = '
 \\begin{flushleft}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
 ldskf dsflj
      lklsdlv l    lll. Bbb.
 
 lhds
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{flushleft}
 
 \\begin{flushright}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb ccccccccccccccc
 ldskf dsflj
      lklsdlv l    lll. Bbb.
 
 lhds
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{flushright}
 ';
 
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index 4a7a55d2ee..87319c16e0 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -292,15 +292,15 @@ 
$result_converted{'xml'}->{'flushleft_flushright_in_quotation'} = '
 $result_converted{'latex_text'}->{'flushleft_flushright_in_quotation'} = '
 \\begin{quote}
 \\begin{flushleft}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
    f l
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{flushleft}
 
 \\begin{flushright}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
   f r
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{flushright}
 \\end{quote}
 ';
diff --git a/tp/t/results/coverage/flushright_example_nested.pl 
b/tp/t/results/coverage/flushright_example_nested.pl
index c7ec68c2d2..741d7da601 100644
--- a/tp/t/results/coverage/flushright_example_nested.pl
+++ b/tp/t/results/coverage/flushright_example_nested.pl
@@ -362,27 +362,27 @@ flush then example
 ';
 
 
-$result_converted{'latex_text'}->{'flushright_example_nested'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'flushright_example_nested'} = 
'\\begin{Texinfoindented}
 \\begin{flushright}
-\\begin{GNUTexinfopreformatted}%
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily in   {-}{-}{-} flushright
 
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{flushright}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 
 \\begin{flushright}
-\\begin{GNUTexinfopreformatted}%
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily in   {-}{-}{-} example
 
 flush then example
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+\\end{Texinfopreformatted}
 \\end{flushright}
 ';
 
diff --git a/tp/t/results/coverage/preformatted.pl 
b/tp/t/results/coverage/preformatted.pl
index 82e29f247d..fe9f2966a7 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -425,23 +425,23 @@ in table in format
 
 
 $result_converted{'latex_text'}->{'preformatted'} = '
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily e{-}{-}xample  some  
 
 \\   text
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 \\texttt{item in table in format}
 \\index[vr]{item in table in format@\\texttt{item in table in format}}%
 }}]
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 
 in table in format
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{description}
 ';
 
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 538fffe482..7e66d81235 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -895,10 +895,10 @@ In table
 \\item[] \\index[cp]{index entry@index entry}%
 
 \\item[{\\parbox[b]{\\linewidth}{%
-\\GNUTexinfotablestylesamp{vtable item}\\\\
+\\Texinfotablestylesamp{vtable item}\\\\
 \\index[vr]{vtable item@\\texttt{vtable item}}%
 \\index[ky]{key@\\texttt{key}}%
-\\GNUTexinfotablestylesamp{itemx vtable}
+\\Texinfotablestylesamp{itemx vtable}
 \\index[vr]{itemx vtable@\\texttt{itemx vtable}}%
 }}]
 
diff --git a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl 
b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
index 341d0ee712..3003b0e0a3 100644
--- a/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
+++ b/tp/t/results/coverage_braces/format_on_first_footnote_line.pl
@@ -305,11 +305,11 @@ in quotation on the first footnote line
 \\end{quote}
 }.
 
-Last text \\footnote{\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+Last text \\footnote{\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily in example
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 }
 ';
diff --git a/tp/t/results/coverage_braces/kbd.pl 
b/tp/t/results/coverage_braces/kbd.pl
index 378739b8f7..3c31f91c39 100644
--- a/tp/t/results/coverage_braces/kbd.pl
+++ b/tp/t/results/coverage_braces/kbd.pl
@@ -564,25 +564,25 @@ $result_converted{'html_text'}->{'kbd'} = '<p>kbd: <code 
class="code">in kbd</co
 
 $result_converted{'latex_text'}->{'kbd'} = 'kbd: \\texttt{in kbd}.
 
-kbd in code: \\texttt{in first \\GNUTexinfocommandstyletextkbd{in nested kbd}}.
+kbd in code: \\texttt{in first \\Texinfocommandstyletextkbd{in nested kbd}}.
 
-kbd in kbd: \\GNUTexinfocommandstyletextkbd{in top kbd 
\\GNUTexinfocommandstyletextkbd{in nested kbd}}.
+kbd in kbd: \\Texinfocommandstyletextkbd{in top kbd 
\\Texinfocommandstyletextkbd{in nested kbd}}.
 
 kbd in @example:
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily in example
 \\texttt{in example in kbd}.
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 kbd in @format:
 
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 in format
 \\texttt{in format in kbd}.
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 ';
 
 1;
diff --git a/tp/t/results/coverage_braces/nested.pl 
b/tp/t/results/coverage_braces/nested.pl
index 955c75545c..5d26c82c1c 100644
--- a/tp/t/results/coverage_braces/nested.pl
+++ b/tp/t/results/coverage_braces/nested.pl
@@ -102,6 +102,6 @@ $result_converted{'plaintext'}->{'nested'} = 'type the 
characters ‘l o g o u t
 $result_converted{'html_text'}->{'nested'} = '<p>type the characters <kbd 
class="kbd">l o g o u t <kbd class="key">RET</kbd></kbd>.</p>';
 
 
-$result_converted{'latex_text'}->{'nested'} = 'type the characters 
\\GNUTexinfocommandstyletextkbd{l o g o u t \\texttt{RET}}.';
+$result_converted{'latex_text'}->{'nested'} = 'type the characters 
\\Texinfocommandstyletextkbd{l o g o u t \\texttt{RET}}.';
 
 1;
diff --git a/tp/t/results/coverage_braces/nested_args.pl 
b/tp/t/results/coverage_braces/nested_args.pl
index 527f40e30f..b74faeb145 100644
--- a/tp/t/results/coverage_braces/nested_args.pl
+++ b/tp/t/results/coverage_braces/nested_args.pl
@@ -233,6 +233,6 @@ $result_converted{'plaintext'}->{'nested_args'} = '*Note 
descr in b: (‘manual
 $result_converted{'html_text'}->{'nested_args'} = '<p>See <a 
data-manual="manual" 
href="manual.html#g_t_0040-in-samp">(manual)S&#7869;ction</a>.</p>';
 
 
-$result_converted{'latex_text'}->{'nested_args'} = 'See Section 
``S\\~{e}ction\'\' in \\texttt{\\GNUTexinfocommandstyletextcite{manual}}.';
+$result_converted{'latex_text'}->{'nested_args'} = 'See Section 
``S\\~{e}ction\'\' in \\texttt{\\Texinfocommandstyletextcite{manual}}.';
 
 1;
diff --git 
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index 8043a37629..4d2ec6789d 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -328,7 +328,7 @@ 
$result_converted{'html_text'}->{'one_argument_leading_trailing_spaces'} = '<p><
 </p>';
 
 
-$result_converted{'latex_text'}->{'one_argument_leading_trailing_spaces'} = 
'\\texttt{\\ in code } \\textsl{ in slanted } \\GNUTexinfocommandstyletextvar{ 
var } \\textsubscript{ sub }
+$result_converted{'latex_text'}->{'one_argument_leading_trailing_spaces'} = 
'\\texttt{\\ in code } \\textsl{ in slanted } \\Texinfocommandstyletextvar{ var 
} \\textsubscript{ sub }
 \\hyphenation{a-b c-d}`\\texttt{\\ http://example.com }\' ሴ \\hbox{ w } 
\\verb: verb :.
 ';
 
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl 
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index 2302944278..adbff5b1fb 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -22887,10 +22887,10 @@ 
$result_converted{'latex_text'}->{'at_commands_in_refs'} = '\\begin{document}
 \\chapter{{\\verb. @ {} . .}}
 \\label{anchor:-_0040-_007b_007d-_002e-}%
 
-\\chapter{{\\GNUTexinfocommandstyletextcite{cite asis} \\hbox{in @w 
\\textbf{b}} \\textnormal{in r} \\textsc{sc} \\textbf{str} \\texttt{t} 
\\GNUTexinfocommandstyletextvar{var} \\textsl{dfn} \\textit{i}}}
+\\chapter{{\\Texinfocommandstyletextcite{cite asis} \\hbox{in @w \\textbf{b}} 
\\textnormal{in r} \\textsc{sc} \\textbf{str} \\texttt{t} 
\\Texinfocommandstyletextvar{var} \\textsl{dfn} \\textit{i}}}
 \\label{anchor:cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i}%
 
-\\chapter{{\\texttt{env} \\texttt{code} \\texttt{option} `\\texttt{samp}\' 
\\texttt{command} \\texttt{file} \\GNUTexinfocommandstyletextkbd{C-x 
\\texttt{ESC}}}}
+\\chapter{{\\texttt{env} \\texttt{code} \\texttt{option} `\\texttt{samp}\' 
\\texttt{command} \\texttt{file} \\Texinfocommandstyletextkbd{C-x 
\\texttt{ESC}}}}
 \\label{anchor:env-code-option-samp-command-file-C_002dx-ESC}%
 
 \\chapter{{8.27\\thinspace in}}
@@ -22948,9 +22948,9 @@ 
$result_converted{'latex_text'}->{'at_commands_in_refs'} = '\\begin{document}
 
 
\\hyperref[anchor:-_0040-_007b_007d-_002e-]{\\chaptername~\\ref*{anchor:-_0040-_007b_007d-_002e-}
 [\\verb. @ {} . .], page~\\pageref*{anchor:-_0040-_007b_007d-_002e-}}
 
-\\hyperref[anchor:cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i]{\\chaptername~\\ref*{anchor:cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i}
 [\\GNUTexinfocommandstyletextcite{cite asis} \\hbox{in @w \\textbf{b}} 
\\textnormal{in r} \\textsc{sc} \\textbf{str} \\texttt{t} 
\\GNUTexinfocommandstyletextvar{var} \\textsl{dfn} \\textit{i}], 
page~\\pageref*{anchor:cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i}}
+\\hyperref[anchor:cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i]{\\chaptername~\\ref*{anchor:cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i}
 [\\Texinfocommandstyletextcite{cite asis} \\hbox{in @w \\textbf{b}} 
\\textnormal{in r} \\textsc{sc} \\textbf{str} \\texttt{t} 
\\Texinfocommandstyletextvar{var} \\textsl{dfn} \\textit{i}], 
page~\\pageref*{anchor:cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i}}
 
-\\hyperref[anchor:env-code-option-samp-command-file-C_002dx-ESC]{\\chaptername~\\ref*{anchor:env-code-option-samp-command-file-C_002dx-ESC}
 [\\texttt{env} \\texttt{code} \\texttt{option} `\\texttt{samp}\' 
\\texttt{command} \\texttt{file} \\GNUTexinfocommandstyletextkbd{C-x 
\\texttt{ESC}}], 
page~\\pageref*{anchor:env-code-option-samp-command-file-C_002dx-ESC}}
+\\hyperref[anchor:env-code-option-samp-command-file-C_002dx-ESC]{\\chaptername~\\ref*{anchor:env-code-option-samp-command-file-C_002dx-ESC}
 [\\texttt{env} \\texttt{code} \\texttt{option} `\\texttt{samp}\' 
\\texttt{command} \\texttt{file} \\Texinfocommandstyletextkbd{C-x 
\\texttt{ESC}}], 
page~\\pageref*{anchor:env-code-option-samp-command-file-C_002dx-ESC}}
 
 \\hyperref[anchor:8_002e27in]{\\chaptername~\\ref*{anchor:8_002e27in} 
[8.27\\thinspace in], page~\\pageref*{anchor:8_002e27in}}
 
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 223fcd7e82..b847983eef 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
@@ -14,7 +14,7 @@
 \usepackage[latin1]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -23,26 +23,26 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \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 e620489ced..cce95edec4 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/indices/def_syn_indices.pl 
b/tp/t/results/indices/def_syn_indices.pl
index d627acb8c5..d8af325828 100644
--- a/tp/t/results/indices/def_syn_indices.pl
+++ b/tp/t/results/indices/def_syn_indices.pl
@@ -2202,7 +2202,7 @@ $result_converted{'latex'}->{'def_syn_indices'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -2211,31 +2211,31 @@ $result_converted{'latex'}->{'def_syn_indices'} = 
'\\documentclass{book}
 \\makeindex[name=pg,title=]%
 
 % style command for var in \'cmd_text\' formatting context
-\\newcommand\\GNUTexinfocommandstyletextvar[1]{{\\normalfont{}\\textsl{#1}}}%
+\\newcommand\\Texinfocommandstyletextvar[1]{{\\normalfont{}\\textsl{#1}}}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
@@ -2251,7 +2251,7 @@ after
 \\index[fn]{index truc@index truc}%
 
 
-\\index[codeidx]{a index entry te\\~{} i\\^{}@\\texttt{a 
\\GNUTexinfocommandstyletextvar{index entry}\\ t\\~{e}\\ \\^{\\i{}}}}%
+\\index[codeidx]{a index entry te\\~{} i\\^{}@\\texttt{a 
\\Texinfocommandstyletextvar{index entry}\\ t\\~{e}\\ \\^{\\i{}}}}%
 
 \\index[fn]{cindex entry@\\texttt{cindex entry}}%
 
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 06b5facd22..46d902c93f 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -994,7 +994,7 @@ $result_converted{'latex'}->{'double_seeentry_seealso'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -1003,26 +1003,26 @@ $result_converted{'latex'}->{'double_seeentry_seealso'} 
= '\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/empty_cindex_entry.pl 
b/tp/t/results/indices/empty_cindex_entry.pl
index 6744c88542..5287a381bf 100644
--- a/tp/t/results/indices/empty_cindex_entry.pl
+++ b/tp/t/results/indices/empty_cindex_entry.pl
@@ -253,31 +253,31 @@ $result_converted{'latex'}->{'empty_cindex_entry'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 4e5520525e..6a8ee99df3 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -435,31 +435,31 @@ $result_converted{'latex'}->{'empty_index_entry'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index f576c4b86a..ee68cae8c1 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -1072,7 +1072,7 @@ $result_converted{'latex'}->{'empty_string_index_entry'} 
= '\\documentclass{book
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -1081,16 +1081,16 @@ 
$result_converted{'latex'}->{'empty_string_index_entry'} = '\\documentclass{book
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \\setlist[description]{style=nextline, font=\\normalfont}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
@@ -1100,14 +1100,14 @@ 
$result_converted{'latex'}->{'empty_string_index_entry'} = '\\documentclass{book
 \\EmbracOff{}%
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 621f3ba9e6..e12ec4862d 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -1156,7 +1156,7 @@ $result_converted{'latex'}->{'explicit_sort_key'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -1165,26 +1165,26 @@ $result_converted{'latex'}->{'explicit_sort_key'} = 
'\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
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 14847044d5..d5bc9053be 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
@@ -822,7 +822,7 @@ 
$result_converted{'latex'}->{'multiple_index_text_sortas_seeentry_seealso'} = '\
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -831,26 +831,26 @@ 
$result_converted{'latex'}->{'multiple_index_text_sortas_seeentry_seealso'} = '\
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/same_only_seealso_seeentry.pl 
b/tp/t/results/indices/same_only_seealso_seeentry.pl
index d688c8ba45..40afec4a74 100644
--- a/tp/t/results/indices/same_only_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_only_seealso_seeentry.pl
@@ -976,7 +976,7 @@ $result_converted{'latex'}->{'same_only_seealso_seeentry'} 
= '\\documentclass{bo
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -985,26 +985,26 @@ 
$result_converted{'latex'}->{'same_only_seealso_seeentry'} = '\\documentclass{bo
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/same_seealso_seeentry.pl 
b/tp/t/results/indices/same_seealso_seeentry.pl
index 342be5bb6e..ef8425f5cc 100644
--- a/tp/t/results/indices/same_seealso_seeentry.pl
+++ b/tp/t/results/indices/same_seealso_seeentry.pl
@@ -1057,7 +1057,7 @@ $result_converted{'latex'}->{'same_seealso_seeentry'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -1066,26 +1066,26 @@ $result_converted{'latex'}->{'same_seealso_seeentry'} = 
'\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/seealso_duplicate.pl 
b/tp/t/results/indices/seealso_duplicate.pl
index 6d8016fc25..d04792f6c0 100644
--- a/tp/t/results/indices/seealso_duplicate.pl
+++ b/tp/t/results/indices/seealso_duplicate.pl
@@ -496,7 +496,7 @@ $result_converted{'latex'}->{'seealso_duplicate'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -505,26 +505,26 @@ $result_converted{'latex'}->{'seealso_duplicate'} = 
'\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index 1a13cc28eb..2ab585cf4d 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -834,7 +834,7 @@ $result_converted{'latex'}->{'seeentry'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -844,26 +844,26 @@ $result_converted{'latex'}->{'seeentry'} = 
'\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/subentries.pl 
b/tp/t/results/indices/subentries.pl
index d02bf1ef84..f3b304d82f 100644
--- a/tp/t/results/indices/subentries.pl
+++ b/tp/t/results/indices/subentries.pl
@@ -1409,7 +1409,7 @@ $result_converted{'latex'}->{'subentries'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -1419,26 +1419,26 @@ $result_converted{'latex'}->{'subentries'} = 
'\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 053f1c63ae..40e8b738f9 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -830,7 +830,7 @@ $result_converted{'latex'}->{'subentry_and_sortas'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -840,26 +840,26 @@ $result_converted{'latex'}->{'subentry_and_sortas'} = 
'\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/subentry_and_sortas_spaces.pl 
b/tp/t/results/indices/subentry_and_sortas_spaces.pl
index 0475806fd5..85d4918f13 100644
--- a/tp/t/results/indices/subentry_and_sortas_spaces.pl
+++ b/tp/t/results/indices/subentry_and_sortas_spaces.pl
@@ -972,7 +972,7 @@ $result_converted{'latex'}->{'subentry_and_sortas_spaces'} 
= '\\documentclass{bo
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -981,26 +981,26 @@ 
$result_converted{'latex'}->{'subentry_and_sortas_spaces'} = '\\documentclass{bo
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/syncode_index_print_both.pl 
b/tp/t/results/indices/syncode_index_print_both.pl
index 283790828b..5199a850b8 100644
--- a/tp/t/results/indices/syncode_index_print_both.pl
+++ b/tp/t/results/indices/syncode_index_print_both.pl
@@ -832,7 +832,7 @@ $result_converted{'latex'}->{'syncode_index_print_both'} = 
'\\documentclass{book
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -841,26 +841,26 @@ $result_converted{'latex'}->{'syncode_index_print_both'} 
= '\\documentclass{book
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/indices/transparent_sort_chars.pl 
b/tp/t/results/indices/transparent_sort_chars.pl
index f9eb25e816..575b35a817 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -640,7 +640,7 @@ $result_converted{'latex'}->{'transparent_sort_chars'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \\indexsetup{level=\\relax,toclevel=section,noclearpage}%
@@ -649,26 +649,26 @@ $result_converted{'latex'}->{'transparent_sort_chars'} = 
'\\documentclass{book}
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index 072e755cb8..4aa5868ec5 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -265,18 +265,18 @@ still second
 
 
 $result_converted{'latex_text'}->{'enumerate_in_example'} = '
-\\begin{GNUTexinfoindented}
+\\begin{Texinfoindented}
 \\begin{enumerate}[start=1]
-\\item \\begin{GNUTexinfopreformatted}%
+\\item \\begin{Texinfopreformatted}%
 \\ttfamily first item
-\\end{GNUTexinfopreformatted}
-\\item \\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\item \\begin{Texinfopreformatted}%
 \\ttfamily second  item
 
 still second
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{enumerate}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 ';
 
 1;
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 44dd91f91e..9b45501731 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
@@ -15,7 +15,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -24,29 +24,29 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[enumerate]{label=\arabic*.}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 9402009b40..6b1340c7b0 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
@@ -15,7 +15,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -24,29 +24,29 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[itemize]{label=\textbullet}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index 9b648991d1..5cc1054551 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -760,47 +760,47 @@ more.
 ';
 
 
-$result_converted{'latex_text'}->{'itemize_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'itemize_in_example'} = 
'\\begin{Texinfoindented}
 \\begin{itemize}[label=\\textbullet{}]
-\\item \\begin{GNUTexinfopreformatted}%
+\\item \\begin{Texinfopreformatted}%
 \\ttfamily first
 
 more.
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{itemize}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\begin{itemize}
-\\item \\begin{GNUTexinfopreformatted}%
+\\item \\begin{Texinfopreformatted}%
 \\ttfamily as is
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{itemize}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\begin{itemize}[label=+]
-\\item \\begin{GNUTexinfopreformatted}%
+\\item \\begin{Texinfopreformatted}%
 \\ttfamily item +
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{itemize}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\begin{itemize}[label=m--n]
-\\item \\begin{GNUTexinfopreformatted}%
+\\item \\begin{Texinfopreformatted}%
 \\ttfamily with m{-}{-}n
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{itemize}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\begin{itemize}[label=\\textbullet{} a--n itemize line]
-\\item \\begin{GNUTexinfopreformatted}%
+\\item \\begin{Texinfopreformatted}%
 \\ttfamily in an itemize line
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{itemize}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index fa0ced55b3..59e2253db4 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -648,21 +648,21 @@ empty line.
 
 $result_converted{'latex_text'}->{'itemize_long_item'} = 
'\\begin{itemize}[label=youhou itemize very long item aaaaaaaaaaaaaaaa 
bbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccc]
 \\item first item
-\\item \\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\item \\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily In example
 
 end example.
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 \\item 
 empty line.
 \\item 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily In second example
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 \\item \\begin{quote}
 Quotation
 \\end{quote}
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 6ee08b45c0..b8a6d1aa1a 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
@@ -18,7 +18,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -27,10 +27,10 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 
 % this allows to select languages based on bcp47 codes.  bcp47 is a superset
@@ -40,7 +40,7 @@
   autoload.bcp47.options = import
 }
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
@@ -50,14 +50,14 @@
 \EmbracOff{}%
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 5856c044ae..d9a3aefee3 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 730c555b67..c1fde8fc53 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
@@ -17,7 +17,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -27,13 +27,13 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
@@ -43,14 +43,14 @@
 \EmbracOff{}%
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 1bcd89a1a8..7b16bee60d 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -1066,7 +1066,7 @@ $result_converted{'latex_text'}->{'custom_headings'} = 
'\\newpagestyle{custom}{%
 \\renewpagestyle{custom}{%
 \\sethead[\\thepage{} \\sectiontitle{}][\\thesection{} Section \\thesection{} 
\\sectiontitle{}][\\chaptertitle{} \\thechapter{}]%
 {}{}{}%
-\\setfoot[\\chaptername{} \\thechapter{} \\chaptertitle{} 
\\GNUTexinfosettitle{}][][\\texttt{\\chaptertitle{}}]%
+\\setfoot[\\chaptername{} \\thechapter{} \\chaptertitle{} 
\\Texinfosettitle{}][][\\texttt{\\chaptertitle{}}]%
 {}{}{}%
 }%
 \\pagestyle{custom}%
@@ -1093,7 +1093,7 @@ after ch--ap second page
 \\renewpagestyle{custom}{%
 \\sethead[toto][titi][]%
 {toto}{titi}{}%
-\\setfoot[\\chaptername{} \\thechapter{} \\chaptertitle{} 
\\GNUTexinfosettitle{}][][\\texttt{\\chaptertitle{}}]%
+\\setfoot[\\chaptername{} \\thechapter{} \\chaptertitle{} 
\\Texinfosettitle{}][][\\texttt{\\chaptertitle{}}]%
 {}{}{}%
 }%
 \\pagestyle{custom}%
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 7b928c2ba0..4b47d310f6 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
@@ -49,7 +49,7 @@
 \renewpagestyle{custom}{%
 \sethead[\thepage{} \sectiontitle{}][\thesection{} Section \thesection{} 
\sectiontitle{}][\chaptertitle{} \thechapter{}]%
 {}{}{}%
-\setfoot[\chaptername{} \thechapter{} \chaptertitle{} 
\GNUTexinfosettitle{}][][\texttt{\chaptertitle{}}]%
+\setfoot[\chaptername{} \thechapter{} \chaptertitle{} 
\Texinfosettitle{}][][\texttt{\chaptertitle{}}]%
 {}{}{}%
 }%
 \pagestyle{custom}%
@@ -76,7 +76,7 @@ after ch--ap second page
 \renewpagestyle{custom}{%
 \sethead[toto][titi][]%
 {toto}{titi}{}%
-\setfoot[\chaptername{} \thechapter{} \chaptertitle{} 
\GNUTexinfosettitle{}][][\texttt{\chaptertitle{}}]%
+\setfoot[\chaptername{} \thechapter{} \chaptertitle{} 
\Texinfosettitle{}][][\texttt{\chaptertitle{}}]%
 {}{}{}%
 }%
 \pagestyle{custom}%
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 ac00ab88dd..c1edf473b2 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
@@ -14,34 +14,34 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[enumerate]{label=\arabic*.}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 5e54c38774..4dec06cfac 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/latex_tests/example_in_cartouche.pl 
b/tp/t/results/latex_tests/example_in_cartouche.pl
index ec4c5c56b4..3c809014cc 100644
--- a/tp/t/results/latex_tests/example_in_cartouche.pl
+++ b/tp/t/results/latex_tests/example_in_cartouche.pl
@@ -279,19 +279,19 @@ $result_floats{'example_in_cartouche'} = {};
 
 
 $result_converted{'latex_text'}->{'example_in_cartouche'} = '\\begin{document}
-\\begin{mdframed}[style=GNUTexinfocartouche]
+\\begin{mdframed}[style=Texinfocartouche]
 Normal cartouche
 
 New para
 \\end{mdframed}
 
-\\begin{mdframed}[style=GNUTexinfocartouche]
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{mdframed}[style=Texinfocartouche]
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\% pwd
 /usr/local/share/emacs
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 \\end{mdframed}
 ';
 
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 798332c757..f6b04cd414 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
@@ -14,53 +14,53 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % the mdframed style for @cartouche
-\mdfdefinestyle{GNUTexinfocartouche}{
+\mdfdefinestyle{Texinfocartouche}{
 innertopmargin=10pt, innerbottommargin=10pt,%
 roundcorner=10pt}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
 \begin{document}
-\begin{mdframed}[style=GNUTexinfocartouche]
+\begin{mdframed}[style=Texinfocartouche]
 Normal cartouche
 
 New para
 \end{mdframed}
 
-\begin{mdframed}[style=GNUTexinfocartouche]
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{mdframed}[style=Texinfocartouche]
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily \% pwd
 /usr/local/share/emacs
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 \end{mdframed}
 \end{document}
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 48bdb3f7a0..64aded5be0 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
@@ -13,7 +13,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % new float for type `'
 \newfloat{TexinfoFloat}{htb}{tfl}[chapter]
@@ -24,26 +24,26 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 fc3d1ddbc5..c47fae078b 100644
--- a/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
+++ b/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
@@ -14,31 +14,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 491c69a044..2b3231dc70 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/indices/res_latex/indices.tex
@@ -14,7 +14,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -24,26 +24,26 @@
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git a/tp/t/results/latex_tests/informative_commands_in_top_node.pl 
b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
index ed89d3fc27..b33edc577a 100644
--- a/tp/t/results/latex_tests/informative_commands_in_top_node.pl
+++ b/tp/t/results/latex_tests/informative_commands_in_top_node.pl
@@ -516,7 +516,7 @@ 
$result_converted{'latex_text'}->{'informative_commands_in_top_node'} = '\\begin
 \\label{anchor:Top}%
 \\setlength{\\parindent}{5em}
 \\newpagestyle{custom}{%
-\\setfoot[\\chaptername{} \\thechapter{} \\chaptertitle{} 
\\GNUTexinfosettitle{}][][\\texttt{\\chaptertitle{}}]%
+\\setfoot[\\chaptername{} \\thechapter{} \\chaptertitle{} 
\\Texinfosettitle{}][][\\texttt{\\chaptertitle{}}]%
 {}{}{}%
 }%
 \\pagestyle{custom}%
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 fa43f069a6..fb3662b154 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
@@ -45,7 +45,7 @@
 \label{anchor:Top}%
 \setlength{\parindent}{5em}
 \newpagestyle{custom}{%
-\setfoot[\chaptername{} \thechapter{} \chaptertitle{} 
\GNUTexinfosettitle{}][][\texttt{\chaptertitle{}}]%
+\setfoot[\chaptername{} \thechapter{} \chaptertitle{} 
\Texinfosettitle{}][][\texttt{\chaptertitle{}}]%
 {}{}{}%
 }%
 \pagestyle{custom}%
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 e0aedf2779..ebb71b5088 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
@@ -14,34 +14,34 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[enumerate]{label=\arabic*.}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 81c61882cb..fea4c4b725 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
@@ -14,34 +14,34 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[itemize]{label=\textbullet}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 d12555ae07..8c4b9d8f46 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
@@ -13,39 +13,39 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
 \makeatletter
-\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
 \makeatother
 \pagestyle{double}%
 \begin{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 820a0e6cd3..24f252abd4 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
@@ -73,7 +73,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}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\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 0901b67d69..b0ef49ea4d 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 3e82932990..e4482c2661 100644
--- a/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
+++ b/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
@@ -14,31 +14,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 f2763e1b7b..2c73145a79 100644
--- a/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
+++ b/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
@@ -14,31 +14,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 deeea33b78..7a6f9a2c42 100644
--- a/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
+++ b/tp/t/results/latex_tests/setchapternewpage_on_odd_titlepage.pl
@@ -207,11 +207,11 @@ $result_floats{'setchapternewpage_on_odd_titlepage'} = {};
 
 
 $result_converted{'latex_text'}->{'setchapternewpage_on_odd_titlepage'} = 
'\\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 
 \\makeatletter
-\\patchcmd{\\chapter}{\\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
+\\patchcmd{\\chapter}{\\Texinfoplaceholder{setchapternewpage 
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
 \\makeatother
 
 \\begin{document}
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 2be21f3f47..aa79269366 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
@@ -45,7 +45,7 @@
 
 
 \makeatletter
-\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
 \makeatother
 
 \begin{document}
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 f31313f8fe..c97848e547 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
@@ -13,34 +13,34 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{Title \leavevmode{}\\ for a manual}%
+\newcommand{\Texinfosettitle}{Title \leavevmode{}\\ for a manual}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 20be0c22f3..ec782c3ef2 100644
--- a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
+++ b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 2bb3ed3178..69a97e7ab4 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
@@ -180,17 +180,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}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
 \\makeatletter
-\\patchcmd{\\chapter}{\\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
+\\patchcmd{\\chapter}{\\Texinfoplaceholder{setchapternewpage 
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
 \\makeatother
 \\pagestyle{double}%
 
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}}{}{}
 \\makeatother
 \\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 bdbab77501..8d99935959 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
@@ -13,46 +13,46 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
 \pagestyle{single}%
 
 \makeatletter
-\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
 \makeatother
 \pagestyle{double}%
 
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}}{}{}
 \makeatother
 \pagestyle{single}%
 \begin{document}
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 3b207eead1..68ade3e45a 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 8373a5358e..de7aeba5ff 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
@@ -13,38 +13,38 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
 \pagestyle{empty}%
 
 \makeatletter
-\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
 \makeatother
 
 
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 d0b95f8bdb..ba265dab61 100644
--- a/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
+++ b/tp/t/results/latex_tests/titlepage_and_setchapternewpage_on.pl
@@ -162,7 +162,7 @@ $result_floats{'titlepage_and_setchapternewpage_on'} = {};
 
 
 $result_converted{'latex_text'}->{'titlepage_and_setchapternewpage_on'} = 
'\\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 
 
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 ebe96bc131..8b3287952a 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 8ac5229444..f4c308fe7d 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 4a94892868..87e43a3081 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 9dc7ef44c4..72d8dc2ba5 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 4464202b5c..21c4c52b52 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 bd8e295c67..2d81dcb8a8 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 2e219ac97c..1fdd7aa655 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
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 67ead7a7c2..fc61641da0 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_odd_on.pl
@@ -129,7 +129,7 @@ $result_floats{'two_setchapternewpage_odd_on'} = {};
 $result_converted{'latex_text'}->{'two_setchapternewpage_odd_on'} = 
'\\pagestyle{double}%
 
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\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 06e4047a8c..3d93ca3f8a 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
@@ -13,44 +13,44 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
 \makeatletter
-\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
 \makeatother
 \pagestyle{double}%
 
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 \begin{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 ab32caccfe..4d938ecdb6 100644
--- a/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
+++ b/tp/t/results/latex_tests/two_setchapternewpage_on_odd.pl
@@ -127,12 +127,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}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
 \\makeatletter
-\\patchcmd{\\chapter}{\\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
+\\patchcmd{\\chapter}{\\Texinfoplaceholder{setchapternewpage 
placeholder}\\clearpage}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{}{}
 \\makeatother
 \\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 db0e37b6c0..d3f4bd0eed 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
@@ -13,41 +13,41 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
-\newpagestyle{double}{\sethead[\thepage{}][][\GNUTexinfosettitle]
+\newpagestyle{double}{\sethead[\thepage{}][][\Texinfosettitle]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
 \pagestyle{single}%
 
 \makeatletter
-\patchcmd{\chapter}{\GNUTexinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
+\patchcmd{\chapter}{\Texinfoplaceholder{setchapternewpage 
placeholder}\clearpage}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}
 \makeatother
 \pagestyle{double}%
 \begin{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 96441755d7..092bbb8009 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
@@ -13,32 +13,32 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index aa47c60c21..25f4690f0c 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -5389,35 +5389,35 @@ 
$result_converted{'latex'}->{'codequoteundirected_codequotebacktick'} = '\\docum
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % style command for kbd in \'cmd_text\' formatting context
-\\newcommand\\GNUTexinfocommandstyletextkbd[1]{{\\ttfamily\\textsl{#1}}}%
+\\newcommand\\Texinfocommandstyletextkbd[1]{{\\ttfamily\\textsl{#1}}}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 
 % no headings before titlepage
@@ -5442,33 +5442,33 @@ Titlepage
 code: \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 strong: \\textbf{``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{}} \\leavevmode{}\\\\
-kbd: 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
+kbd: 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily @codequoteundirected on
 @codequotebacktick on
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 code: \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 strong: \\textbf{``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{}} \\leavevmode{}\\\\
-kbd: 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
+kbd: 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily @codequoteundirected off
 @codequotebacktick off
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 code: \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 strong: \\textbf{``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{}} \\leavevmode{}\\\\
-kbd: 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
+kbd: 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
 \\endgroup
 \\end{titlepage}
@@ -5482,75 +5482,75 @@ samp: 
`\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} `s
 code: \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 strong: \\textbf{``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{}} \\leavevmode{}\\\\
-kbd: 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
+kbd: 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily @codequoteundirected on
 @codequotebacktick on
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 code: \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 strong: \\textbf{``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{}} \\leavevmode{}\\\\
-kbd: 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
+kbd: 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily @codequoteundirected off
 @codequotebacktick off
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 code: \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 asis: ``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{} \\leavevmode{}\\\\
 strong: \\textbf{``simple-double--three---four----\'\' `simple\' quotedblleft: 
\\textquotedblleft{}} \\leavevmode{}\\\\
-kbd: 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
+kbd: 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}} \\leavevmode{}\\\\
 samp: `\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\' \\leavevmode{}\\\\
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily {`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}\\ \\leavevmode{}\\\\
 code:\\ \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
 asis:\\ {`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}\\ \\leavevmode{}\\\\
 strong:\\ 
\\textbf{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
-kbd:\\ 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
+kbd:\\ 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
 samp:\\ 
`\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\'\\ \\leavevmode{}\\\\
 
-\\end{GNUTexinfopreformatted}
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily @codequoteundirected on
 @codequotebacktick on
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily {`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}\\ \\leavevmode{}\\\\
 code:\\ \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
 asis:\\ {`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}\\ \\leavevmode{}\\\\
 strong:\\ 
\\textbf{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
-kbd:\\ 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
+kbd:\\ 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
 samp:\\ 
`\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\'\\ \\leavevmode{}\\\\
 
-\\end{GNUTexinfopreformatted}
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily @codequoteundirected off
 @codequotebacktick off
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily {`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}\\ \\leavevmode{}\\\\
 code:\\ \\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
 asis:\\ {`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}\\ \\leavevmode{}\\\\
 strong:\\ 
\\textbf{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
-kbd:\\ 
\\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
+kbd:\\ 
\\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'}
 `simple\' quotedblleft:\\ \\textquotedblleft{}}\\ \\leavevmode{}\\\\
 samp:\\ 
`\\texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{\'}{\'} 
`simple\' quotedblleft:\\ \\textquotedblleft{}}\'\\ \\leavevmode{}\\\\
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 \\end{document}
 ';
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 95c3cc3c7e..d31f6d230a 100644
--- a/tp/t/results/misc_commands/command_in_heading_footing.pl
+++ b/tp/t/results/misc_commands/command_in_heading_footing.pl
@@ -230,31 +230,31 @@ 
$result_converted{'latex'}->{'command_in_heading_footing'} = '\\documentclass{bo
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
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 49b86b7a71..41825a543d 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
@@ -1134,7 +1134,7 @@ 
$result_converted{'latex'}->{'comment_space_command_on_line'} = '\\documentclass
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{Settitle \\ {}}%
+\\newcommand{\\Texinfosettitle}{Settitle \\ {}}%
 
 % new float for type `Text\'
 \\newfloat{TexinfoFloatText}{htb}{tfl}[chapter]
@@ -1146,26 +1146,26 @@ 
$result_converted{'latex'}->{'comment_space_command_on_line'} = '\\documentclass
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/comments_in_text.pl 
b/tp/t/results/misc_commands/comments_in_text.pl
index 0031d75694..0002dc7f6b 100644
--- a/tp/t/results/misc_commands/comments_in_text.pl
+++ b/tp/t/results/misc_commands/comments_in_text.pl
@@ -229,31 +229,31 @@ $result_converted{'latex'}->{'comments_in_text'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/definfoenclose.pl 
b/tp/t/results/misc_commands/definfoenclose.pl
index 081d13427b..d9e53de635 100644
--- a/tp/t/results/misc_commands/definfoenclose.pl
+++ b/tp/t/results/misc_commands/definfoenclose.pl
@@ -488,31 +488,31 @@ $result_converted{'latex'}->{'definfoenclose'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
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 e881748f81..33b437c6aa 100644
--- a/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
+++ b/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl
@@ -180,31 +180,31 @@ 
$result_converted{'latex'}->{'definfoenclose_with_empty_arg'} = '\\documentclass
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/empty_center.pl 
b/tp/t/results/misc_commands/empty_center.pl
index 9bd2a2a710..dfd35032b6 100644
--- a/tp/t/results/misc_commands/empty_center.pl
+++ b/tp/t/results/misc_commands/empty_center.pl
@@ -87,31 +87,31 @@ $result_converted{'latex'}->{'empty_center'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
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 47f9a26695..9fba57d0e2 100644
--- a/tp/t/results/misc_commands/empty_center_with_arg.pl
+++ b/tp/t/results/misc_commands/empty_center_with_arg.pl
@@ -97,31 +97,31 @@ $result_converted{'latex'}->{'empty_center_with_arg'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl 
b/tp/t/results/misc_commands/footnote_in_center.pl
index 016f804c51..b43f16615c 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -363,35 +363,35 @@ $result_converted{'latex'}->{'footnote_in_center'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 
 % set defaults for lists that match Texinfo TeX formatting
 \\setlist[description]{style=nextline, font=\\normalfont}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
@@ -399,15 +399,15 @@ $result_converted{'latex'}->{'footnote_in_center'} = 
'\\documentclass{book}
 Centered text with a footnote\\footnote{This footnote
 shows an important feature of the centered text.
 
-\\begin{GNUTexinfoindented}
+\\begin{Texinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 item}}]
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily line
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{description}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 } and text after the footnote.
 \\end{center}
 \\end{document}
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 020c594c38..be46076437 100644
--- a/tp/t/results/misc_commands/heading_command_in_commands.pl
+++ b/tp/t/results/misc_commands/heading_command_in_commands.pl
@@ -357,32 +357,32 @@ 
$result_converted{'latex'}->{'heading_command_in_commands'} = '\\documentclass{b
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
@@ -395,15 +395,15 @@ 
$result_converted{'latex'}->{'heading_command_in_commands'} = '\\documentclass{b
 \\pagestyle{custom}%
 }
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\renewpagestyle{custom}{%
 \\sethead[in example][][]%
 {in example}{}{}%
 }%
 \\pagestyle{custom}%
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 \\begin{quote}
 \\renewpagestyle{custom}{%
diff --git a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl 
b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
index 1d1f2a93e5..a88821ec75 100644
--- a/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
+++ b/tp/t/results/misc_commands/incorrect_allowcodebreaks_argument.pl
@@ -134,31 +134,31 @@ 
$result_converted{'latex'}->{'incorrect_allowcodebreaks_argument'} = '\\document
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index f8f3ad353a..a95aabb28b 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -148,31 +148,31 @@ $result_converted{'latex'}->{'indent_in_quotation'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index c102c6d388..42f26c197c 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -2202,35 +2202,35 @@ $result_converted{'latex'}->{'kbdinputstyle'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % style command for kbd in \'cmd_text\' formatting context
-\\newcommand\\GNUTexinfocommandstyletextkbd[1]{{\\ttfamily\\textsl{#1}}}%
+\\newcommand\\Texinfocommandstyletextkbd[1]{{\\ttfamily\\textsl{#1}}}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
@@ -2244,14 +2244,14 @@ $result_converted{'latex'}->{'kbdinputstyle'} = 
'\\documentclass{book}
 \\texttt{for nesting \\textnormal{r in code \\texttt{in r in code}}}
 
 in example
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\texttt{in code in example \\texttt{in nested code}}.
 \\texttt{kbd in example}.
 \\texttt{kbd \\texttt{in code}\\ in example}.
 \\texttt{for nesting in example \\textnormal{r in code in example \\texttt{in 
r in code in example}}}
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 @kbdinputstyle example
 
@@ -2262,32 +2262,32 @@ in example
 \\texttt{for nesting \\textnormal{r in code \\texttt{in r in code}}}
 
 in example
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\texttt{in code in example \\texttt{in nested code}}.
-\\GNUTexinfocommandstyletextkbd{kbd in example}.
-\\texttt{kbd \\GNUTexinfocommandstyletextkbd{in code}\\ in example}.
-\\texttt{for nesting in example \\textnormal{r in code in example 
\\GNUTexinfocommandstyletextkbd{in r in code in example}}}
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\Texinfocommandstyletextkbd{kbd in example}.
+\\texttt{kbd \\Texinfocommandstyletextkbd{in code}\\ in example}.
+\\texttt{for nesting in example \\textnormal{r in code in example 
\\Texinfocommandstyletextkbd{in r in code in example}}}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 @kbdinputstyle distinct
 
 
 \\texttt{in code out of example \\texttt{in nested code}}.
-\\GNUTexinfocommandstyletextkbd{kbd out of example}.
-\\texttt{kbd \\GNUTexinfocommandstyletextkbd{in code}}.
-\\texttt{for nesting \\textnormal{r in code \\GNUTexinfocommandstyletextkbd{in 
r in code}}}
+\\Texinfocommandstyletextkbd{kbd out of example}.
+\\texttt{kbd \\Texinfocommandstyletextkbd{in code}}.
+\\texttt{for nesting \\textnormal{r in code \\Texinfocommandstyletextkbd{in r 
in code}}}
 
 in example
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily \\texttt{in code in example \\texttt{in nested code}}.
-\\GNUTexinfocommandstyletextkbd{kbd in example}.
-\\texttt{kbd \\GNUTexinfocommandstyletextkbd{in code}\\ in example}.
-\\texttt{for nesting in example \\textnormal{r in code in example 
\\GNUTexinfocommandstyletextkbd{in r in code in example}}}
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\Texinfocommandstyletextkbd{kbd in example}.
+\\texttt{kbd \\Texinfocommandstyletextkbd{in code}\\ in example}.
+\\texttt{for nesting in example \\textnormal{r in code in example 
\\Texinfocommandstyletextkbd{in r in code in example}}}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 \\end{document}
 ';
 
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 596f429e89..b90bb3a240 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -2384,37 +2384,37 @@ $result_converted{'latex'}->{'kbdinputstyle_in_table'} 
= '\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % style command for kbd in \'cmd_text\' formatting context
-\\newcommand\\GNUTexinfocommandstyletextkbd[1]{{\\ttfamily\\textsl{#1}}}%
+\\newcommand\\Texinfocommandstyletextkbd[1]{{\\ttfamily\\textsl{#1}}}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \\setlist[description]{style=nextline, font=\\normalfont}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
@@ -2433,7 +2433,7 @@ $result_converted{'latex'}->{'kbdinputstyle_in_table'} = 
'\\documentclass{book}
 \\end{description}
 
 in example
-\\begin{GNUTexinfoindented}
+\\begin{Texinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
 \\texttt{i{-}{-}tem in example}}}]
@@ -2442,7 +2442,7 @@ in example
 \\item[{\\parbox[b]{\\linewidth}{%
 \\texttt{braced i{-}{-}tem in example}}}]
 \\end{description}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 
 @kbdinputstyle example
 
@@ -2458,41 +2458,41 @@ in example
 \\end{description}
 
 in example
-\\begin{GNUTexinfoindented}
+\\begin{Texinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
-\\GNUTexinfocommandstyletextkbd{i{-}{-}tem in example}}}]
+\\Texinfocommandstyletextkbd{i{-}{-}tem in example}}}]
 \\end{description}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
-\\GNUTexinfocommandstyletextkbd{braced i{-}{-}tem in example}}}]
+\\Texinfocommandstyletextkbd{braced i{-}{-}tem in example}}}]
 \\end{description}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 
 @kbdinputstyle distinct
 
 
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
-\\GNUTexinfocommandstyletextkbd{i{-}{-}tem out of example}}}]
+\\Texinfocommandstyletextkbd{i{-}{-}tem out of example}}}]
 \\end{description}
 
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
-\\GNUTexinfocommandstyletextkbd{braced i{-}{-}tem out of example}}}]
+\\Texinfocommandstyletextkbd{braced i{-}{-}tem out of example}}}]
 \\end{description}
 
 in example
-\\begin{GNUTexinfoindented}
+\\begin{Texinfoindented}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
-\\GNUTexinfocommandstyletextkbd{i{-}{-}tem in example}}}]
+\\Texinfocommandstyletextkbd{i{-}{-}tem in example}}}]
 \\end{description}
 \\begin{description}
 \\item[{\\parbox[b]{\\linewidth}{%
-\\GNUTexinfocommandstyletextkbd{braced i{-}{-}tem in example}}}]
+\\Texinfocommandstyletextkbd{braced i{-}{-}tem in example}}}]
 \\end{description}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 \\end{document}
 ';
 
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 930815087b..760fa3f8b8 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
@@ -260,31 +260,31 @@ 
$result_converted{'latex'}->{'no_empty_line_between_headings'} = '\\documentclas
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index bd138ed294..423d058a18 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -192,40 +192,40 @@ 
$result_converted{'latex'}->{'noindent_after_smallexample'} = '\\documentclass{b
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
 To obtain.
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily \\footnotesize \\$ wget 
\'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD\\&content-type=text/plain\'
 \\$ wget 
\'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD\\&content-type=text/plain\'
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\noindent{}Less recent versions are also present.
 \\end{document}
 ';
diff --git a/tp/t/results/misc_commands/noindent_empty_para.pl 
b/tp/t/results/misc_commands/noindent_empty_para.pl
index 2bff7b3526..98470ac474 100644
--- a/tp/t/results/misc_commands/noindent_empty_para.pl
+++ b/tp/t/results/misc_commands/noindent_empty_para.pl
@@ -96,31 +96,31 @@ $result_converted{'latex'}->{'noindent_empty_para'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/noindent_in_paragraph.pl 
b/tp/t/results/misc_commands/noindent_in_paragraph.pl
index 7f5c8f9ce0..021ae121c0 100644
--- a/tp/t/results/misc_commands/noindent_in_paragraph.pl
+++ b/tp/t/results/misc_commands/noindent_in_paragraph.pl
@@ -150,31 +150,31 @@ $result_converted{'latex'}->{'noindent_in_paragraph'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/noindent_indent.pl 
b/tp/t/results/misc_commands/noindent_indent.pl
index c58843751a..e0ea67538d 100644
--- a/tp/t/results/misc_commands/noindent_indent.pl
+++ b/tp/t/results/misc_commands/noindent_indent.pl
@@ -252,31 +252,31 @@ $result_converted{'latex'}->{'noindent_indent'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/ref_in_center.pl 
b/tp/t/results/misc_commands/ref_in_center.pl
index e856799b61..1708eb531e 100644
--- a/tp/t/results/misc_commands/ref_in_center.pl
+++ b/tp/t/results/misc_commands/ref_in_center.pl
@@ -541,31 +541,31 @@ $result_converted{'latex'}->{'ref_in_center'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/setfilename.pl 
b/tp/t/results/misc_commands/setfilename.pl
index 88cc2ed6ac..d7c346666e 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -316,31 +316,31 @@ $result_converted{'latex'}->{'setfilename'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index e3767bc9af..d53c6d8f5e 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -2756,31 +2756,31 @@ $result_converted{'latex'}->{'test_allowcodebreaks'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/misc_commands/vskip.pl 
b/tp/t/results/misc_commands/vskip.pl
index 0d7d27b475..c566e615ff 100644
--- a/tp/t/results/misc_commands/vskip.pl
+++ b/tp/t/results/misc_commands/vskip.pl
@@ -72,31 +72,31 @@ $result_converted{'latex'}->{'vskip'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/preformatted/caption_in_example.pl 
b/tp/t/results/preformatted/caption_in_example.pl
index 48687e77f7..9b67e1e7dc 100644
--- a/tp/t/results/preformatted/caption_in_example.pl
+++ b/tp/t/results/preformatted/caption_in_example.pl
@@ -384,18 +384,18 @@ After caption
 
 $result_converted{'latex_text'}->{'caption_in_example'} = 
'\\begin{TexinfoFloatfloat}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily in example 
 
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\caption{caption}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily 
 
 After caption
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 \\end{TexinfoFloatfloat}
 ';
 
diff --git a/tp/t/results/preformatted/comment_example_and_blank_lines.pl 
b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
index 7fb418b667..f2f311379d 100644
--- a/tp/t/results/preformatted/comment_example_and_blank_lines.pl
+++ b/tp/t/results/preformatted/comment_example_and_blank_lines.pl
@@ -610,32 +610,32 @@ 
$result_converted{'xml'}->{'comment_example_and_blank_lines'} = '<para>Para.
 
 $result_converted{'latex_text'}->{'comment_example_and_blank_lines'} = 'Para.
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily comment,\\ blank after \\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily comment,\\ blank after \\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 Para.
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily comment,\\ no blank after \\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily comment,\\ no blank after \\end{Texinfopreformatted}
+\\end{Texinfoindented}
 Para.
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily no comment,\\ blank after
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 Para.
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily no comment,\\ no blank after
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 Para.
 ';
 
diff --git a/tp/t/results/preformatted/comments_in_example.pl 
b/tp/t/results/preformatted/comments_in_example.pl
index 22eb4a3465..4a6000d85c 100644
--- a/tp/t/results/preformatted/comments_in_example.pl
+++ b/tp/t/results/preformatted/comments_in_example.pl
@@ -508,24 +508,24 @@ second line
 
 
 $result_converted{'latex_text'}->{'comments_in_example'} = 'Example with 
comments 2 lines
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily line second line \\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily line second line \\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 Example with comments 1 line
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily line \\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily line \\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
 Example with newline after comment
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily line 
 second line
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index 1516fbe889..55c9de12a3 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -351,7 +351,7 @@ $result_converted{'xml'}->{'def_in_example'} = '<example 
endspaces=" ">
 ';
 
 
-$result_converted{'latex_text'}->{'def_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'def_in_example'} = '\\begin{Texinfoindented}
 
 \\noindent\\begin{tabularx}{\\linewidth}{@{}Xr}
 \\rightskip=5em plus 1 fill \\hangindent=2em \\hyphenpenalty=10000
@@ -361,11 +361,11 @@ $result_converted{'latex_text'}->{'def_in_example'} = 
'\\begin{GNUTexinfoindente
 \\index[fn]{name@\\texttt{name}}%
 \\begin{quote}
 \\unskip{\\parskip=0pt\\noindent}%
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily in defun
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{quote}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/empty_line.pl 
b/tp/t/results/preformatted/empty_line.pl
index 71ce43a7a3..6f449c7720 100644
--- a/tp/t/results/preformatted/empty_line.pl
+++ b/tp/t/results/preformatted/empty_line.pl
@@ -186,13 +186,13 @@ after empty line
 ';
 
 
-$result_converted{'latex_text'}->{'empty_line'} = '\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'empty_line'} = '\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily example
 
 after empty line
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/example_at_commands_arguments.pl 
b/tp/t/results/preformatted/example_at_commands_arguments.pl
index 24c1626516..486a77fb3d 100644
--- a/tp/t/results/preformatted/example_at_commands_arguments.pl
+++ b/tp/t/results/preformatted/example_at_commands_arguments.pl
@@ -351,11 +351,11 @@ 
$result_converted{'xml'}->{'example_at_commands_arguments'} = '<example spaces="
 ';
 
 
-$result_converted{'latex_text'}->{'example_at_commands_arguments'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'example_at_commands_arguments'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily example with @-commands and other special characters
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/example_class.pl 
b/tp/t/results/preformatted/example_class.pl
index 47f95bb6eb..166698f5f2 100644
--- a/tp/t/results/preformatted/example_class.pl
+++ b/tp/t/results/preformatted/example_class.pl
@@ -320,8 +320,8 @@ $result_converted{'xml'}->{'example_class'} = '<example 
spaces=" " endspaces=" "
 ';
 
 
-$result_converted{'latex_text'}->{'example_class'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'example_class'} = '\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily foreach my \\$unclosed\\_file (keys(\\%unclosed\\_files)) \\{
 \\  if (!close(\\$unclosed\\_files\\{\\$unclosed\\_file\\})) \\{
 \\    warn(sprintf("\\%s:\\ error on closing \\%s:\\ \\%s\\textbackslash{}n",
@@ -330,8 +330,8 @@ $result_converted{'latex_text'}->{'example_class'} = 
'\\begin{GNUTexinfoindented
 \\    \\_exit(\\$error\\_count,\\ \\textbackslash{}@opened\\_files);
 \\  \\}
 \\}
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/example_empty_arguments.pl 
b/tp/t/results/preformatted/example_empty_arguments.pl
index 192b845a46..6bb80fdaad 100644
--- a/tp/t/results/preformatted/example_empty_arguments.pl
+++ b/tp/t/results/preformatted/example_empty_arguments.pl
@@ -459,23 +459,23 @@ $result_converted{'xml'}->{'example_empty_arguments'} = 
'<example spaces=" " end
 ';
 
 
-$result_converted{'latex_text'}->{'example_empty_arguments'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'example_empty_arguments'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily example with empty args
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily example with empty args with spaces
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily example with empty and non empty args mix
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/example_multi_class.pl 
b/tp/t/results/preformatted/example_multi_class.pl
index b581e2aabd..269659f763 100644
--- a/tp/t/results/preformatted/example_multi_class.pl
+++ b/tp/t/results/preformatted/example_multi_class.pl
@@ -448,8 +448,8 @@ $result_converted{'xml'}->{'example_multi_class'} = 
'<example spaces=" " endspac
 ';
 
 
-$result_converted{'latex_text'}->{'example_multi_class'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'example_multi_class'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily void StateManager::deallocate() \\{
 \\    if(buffer) \\{
 \\        delete [] buffer;
@@ -464,8 +464,8 @@ $result_converted{'latex_text'}->{'example_multi_class'} = 
'\\begin{GNUTexinfoin
 \\        in\\_state = NULL;
 \\    \\}
 \\}
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/insertcopying_in_example.pl 
b/tp/t/results/preformatted/insertcopying_in_example.pl
index 6e5675bdbf..60fa60c3fd 100644
--- a/tp/t/results/preformatted/insertcopying_in_example.pl
+++ b/tp/t/results/preformatted/insertcopying_in_example.pl
@@ -182,11 +182,11 @@ $result_converted{'xml'}->{'insertcopying_in_example'} = 
'<example endspaces=" "
 ';
 
 
-$result_converted{'latex_text'}->{'insertcopying_in_example'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'insertcopying_in_example'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily text
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/nested_example_and_comment.pl 
b/tp/t/results/preformatted/nested_example_and_comment.pl
index fb2bf3712f..eb076a3c79 100644
--- a/tp/t/results/preformatted/nested_example_and_comment.pl
+++ b/tp/t/results/preformatted/nested_example_and_comment.pl
@@ -746,41 +746,41 @@ $result_converted{'xml'}->{'nested_example_and_comment'} 
= '<example endspaces="
 ';
 
 
-$result_converted{'latex_text'}->{'nested_example_and_comment'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily First line 0 \\end{GNUTexinfopreformatted}
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'nested_example_and_comment'} = 
'\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily First line 0 \\end{Texinfopreformatted}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily Nested example
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily In first one
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily First line 1 \\end{GNUTexinfopreformatted}
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily Nested example \\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily First line 1 \\end{Texinfopreformatted}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily Nested example \\end{Texinfopreformatted}
+\\end{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily In first one
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily First line 2 \\end{GNUTexinfopreformatted}
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily Nested example \\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
-\\ttfamily In first one \\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
+
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily First line 2 \\end{Texinfopreformatted}
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily Nested example \\end{Texinfopreformatted}
+\\end{Texinfoindented}
+\\begin{Texinfopreformatted}%
+\\ttfamily In first one \\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/nested_formats.pl 
b/tp/t/results/preformatted/nested_formats.pl
index 28d0102c62..728d4ea8d3 100644
--- a/tp/t/results/preformatted/nested_formats.pl
+++ b/tp/t/results/preformatted/nested_formats.pl
@@ -430,21 +430,21 @@ in -- example/format
 ';
 
 
-$result_converted{'latex_text'}->{'nested_formats'} = 
'\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'nested_formats'} = '\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily 
 in {-}{-} format/example
 
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 
 in -- example/format
 
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/page_in_example.pl 
b/tp/t/results/preformatted/page_in_example.pl
index 4ee1391fc5..ec5430a53e 100644
--- a/tp/t/results/preformatted/page_in_example.pl
+++ b/tp/t/results/preformatted/page_in_example.pl
@@ -178,13 +178,13 @@ $result_converted{'xml'}->{'page_in_example'} = '<example 
endspaces=" ">
 ';
 
 
-$result_converted{'latex_text'}->{'page_in_example'} = 
'\\begin{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'page_in_example'} = 
'\\begin{Texinfoindented}
 \\newpage{}%
 \\phantom{blabla}%
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily text
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/quote_dash_in_display.pl 
b/tp/t/results/preformatted/quote_dash_in_display.pl
index 4610f44a06..dd26112ff6 100644
--- a/tp/t/results/preformatted/quote_dash_in_display.pl
+++ b/tp/t/results/preformatted/quote_dash_in_display.pl
@@ -188,12 +188,12 @@ $result_converted{'xml'}->{'quote_dash_in_display'} = '
 
 
 $result_converted{'latex_text'}->{'quote_dash_in_display'} = '
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 and now -- yes---now and ``so\'\'.
 
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/quote_dash_in_example.pl 
b/tp/t/results/preformatted/quote_dash_in_example.pl
index d2cfccadb9..a41c4169a6 100644
--- a/tp/t/results/preformatted/quote_dash_in_example.pl
+++ b/tp/t/results/preformatted/quote_dash_in_example.pl
@@ -187,12 +187,12 @@ $result_converted{'xml'}->{'quote_dash_in_example'} = '
 
 
 $result_converted{'latex_text'}->{'quote_dash_in_example'} = '
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily and now {-}{-} yes{-}{-}{-}now and {`}{`}so{\'}{\'}.
 
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/text_on_display_command_line.pl 
b/tp/t/results/preformatted/text_on_display_command_line.pl
index b0a9eb054a..296105d2ab 100644
--- a/tp/t/results/preformatted/text_on_display_command_line.pl
+++ b/tp/t/results/preformatted/text_on_display_command_line.pl
@@ -497,25 +497,25 @@ 
$result_converted{'xml'}->{'text_on_display_command_line'} = '<display spaces="
 ';
 
 
-$result_converted{'latex_text'}->{'text_on_display_command_line'} = 
'\\begin{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'text_on_display_command_line'} = 
'\\begin{Texinfoindented}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 normal text
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 in display
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
+\\begin{Texinfoindented}
+\\begin{Texinfoindented}
+\\end{Texinfoindented}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/text_on_example_command_line.pl 
b/tp/t/results/preformatted/text_on_example_command_line.pl
index 86911658de..dcbb926b3f 100644
--- a/tp/t/results/preformatted/text_on_example_command_line.pl
+++ b/tp/t/results/preformatted/text_on_example_command_line.pl
@@ -496,25 +496,25 @@ 
$result_converted{'xml'}->{'text_on_example_command_line'} = '<example spaces="
 ';
 
 
-$result_converted{'latex_text'}->{'text_on_example_command_line'} = 
'\\begin{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
+$result_converted{'latex_text'}->{'text_on_example_command_line'} = 
'\\begin{Texinfoindented}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily normal text
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfoindented}
+\\begin{Texinfopreformatted}%
 \\ttfamily in example
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 
-\\begin{GNUTexinfoindented}
-\\begin{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
-\\end{GNUTexinfoindented}
+\\begin{Texinfoindented}
+\\begin{Texinfoindented}
+\\end{Texinfoindented}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/preformatted/titlefont_in_example.pl 
b/tp/t/results/preformatted/titlefont_in_example.pl
index ff53ca7bd6..6000ca1f64 100644
--- a/tp/t/results/preformatted/titlefont_in_example.pl
+++ b/tp/t/results/preformatted/titlefont_in_example.pl
@@ -188,12 +188,12 @@ Text.
 ';
 
 
-$result_converted{'latex_text'}->{'titlefont_in_example'} = 
'\\begin{GNUTexinfoindented}
-{\\huge \\bfseries Title}\\begin{GNUTexinfopreformatted}%
+$result_converted{'latex_text'}->{'titlefont_in_example'} = 
'\\begin{Texinfoindented}
+{\\huge \\bfseries Title}\\begin{Texinfopreformatted}%
 \\ttfamily 
 Text.
-\\end{GNUTexinfopreformatted}
-\\end{GNUTexinfoindented}
+\\end{Texinfopreformatted}
+\\end{Texinfoindented}
 ';
 
 1;
diff --git a/tp/t/results/quotation/empty_quotation.pl 
b/tp/t/results/quotation/empty_quotation.pl
index 319b0693fc..18f1837bfb 100644
--- a/tp/t/results/quotation/empty_quotation.pl
+++ b/tp/t/results/quotation/empty_quotation.pl
@@ -383,31 +383,31 @@ $result_converted{'latex'}->{'empty_quotation'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/quotation/quotation_and_author.pl 
b/tp/t/results/quotation/quotation_and_author.pl
index ff088a0adc..fbbfd38865 100644
--- a/tp/t/results/quotation/quotation_and_author.pl
+++ b/tp/t/results/quotation/quotation_and_author.pl
@@ -531,31 +531,31 @@ $result_converted{'latex'}->{'quotation_and_author'} = 
'\\documentclass{book}
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/quotation/quotation_author_in_example.pl 
b/tp/t/results/quotation/quotation_author_in_example.pl
index 57fa37928c..589cef49e1 100644
--- a/tp/t/results/quotation/quotation_author_in_example.pl
+++ b/tp/t/results/quotation/quotation_author_in_example.pl
@@ -243,45 +243,45 @@ 
$result_converted{'latex'}->{'quotation_author_in_example'} = '\\documentclass{b
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
-\\begin{GNUTexinfoindented}
+\\begin{Texinfoindented}
 \\begin{quote}
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 \\ttfamily A quot{-}{-}{-}ation
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 \\end{quote}
 \\begin{center}
 --- \\emph{Some One}
 \\end{center}
-\\end{GNUTexinfoindented}
+\\end{Texinfoindented}
 \\end{document}
 ';
 
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 3cecc15787..2f004d48a4 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
@@ -318,31 +318,31 @@ 
$result_converted{'latex'}->{'space_at_commands_end_quotation_line'} = '\\docume
 \\usepackage[utf8]{inputenc}
 
 \\makeatletter
-\\newcommand{\\GNUTexinfosettitle}{No Title}%
+\\newcommand{\\Texinfosettitle}{No Title}%
 
 % redefine the \\mainmatter command such that it does not clear page
 % as if in double page
 \\renewcommand\\mainmatter{\\clearpage\\@mainmattertrue\\pagenumbering{arabic}}
-\\newenvironment{GNUTexinfopreformatted}{%
+\\newenvironment{Texinfopreformatted}{%
   
\\par\\GNUTobeylines\\obeyspaces\\frenchspacing\\parskip=\\z@\\parindent=\\z@}{}
 {\\catcode`\\^^M=13 \\gdef\\GNUTobeylines{\\catcode`\\^^M=13 
\\def^^M{\\null\\par}}}
-\\newenvironment{GNUTexinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
+\\newenvironment{Texinfoindented}{\\begin{list}{}{}\\item\\relax}{\\end{list}}
 
 % used for substitutions in commands
-\\newcommand{\\GNUTexinfoplaceholder}[1]{}
+\\newcommand{\\Texinfoplaceholder}[1]{}
 
 \\newpagestyle{single}{\\sethead[\\chaptername{} \\thechapter{} 
\\chaptertitle{}][][\\thepage]
                               {\\chaptername{} \\thechapter{} 
\\chaptertitle{}}{}{\\thepage}}
 
 % allow line breaking at underscore
-\\let\\GNUTexinfounderscore\\_
-\\renewcommand{\\_}{\\GNUTexinfounderscore\\discretionary{}{}{}}
+\\let\\Texinfounderscore\\_
+\\renewcommand{\\_}{\\Texinfounderscore\\discretionary{}{}{}}
 \\renewcommand{\\includegraphics}[1]{\\fbox{FIG \\detokenize{#1}}}
 
 \\makeatother
 % set default for @setchapternewpage
 \\makeatletter
-\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
+\\patchcmd{\\chapter}{\\if@openright\\cleardoublepage\\else\\clearpage\\fi}{\\Texinfoplaceholder{setchapternewpage
 placeholder}\\clearpage}{}{}
 \\makeatother
 \\pagestyle{single}%
 
diff --git a/tp/t/results/regions/format_in_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage.pl
index 48ae31447c..e42a8867cc 100644
--- a/tp/t/results/regions/format_in_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage.pl
@@ -332,9 +332,9 @@ $result_converted{'latex_text'}->{'format_in_titlepage'} = '
 % Leave some space at the very top of the page.
     \\vglue\\titlepagetopglue
 
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 Published
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 
 \\endgroup
 \\end{titlepage}
diff --git a/tp/t/results/regions/format_in_titlepage_titlepage.pl 
b/tp/t/results/regions/format_in_titlepage_titlepage.pl
index 661d210d37..e0b729839a 100644
--- a/tp/t/results/regions/format_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/format_in_titlepage_titlepage.pl
@@ -343,9 +343,9 @@ 
$result_converted{'latex_text'}->{'format_in_titlepage_titlepage'} = '
 % Leave some space at the very top of the page.
     \\vglue\\titlepagetopglue
 
-\\begin{GNUTexinfopreformatted}%
+\\begin{Texinfopreformatted}%
 Published
-\\end{GNUTexinfopreformatted}
+\\end{Texinfopreformatted}
 
 \\endgroup
 \\end{titlepage}
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 89a084738d..e393af74a5 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 c789a58ee5..3b1cf4fc59 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 bc53d05aa7..767e177bc3 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 bb12ff614c..ac43148c0d 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 cdae126877..e6f768c253 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 a7f7283554..4ceb36b97f 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 2a6826974e..566ddf1077 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 a15dca0666..0a8a47fba2 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 38f1082090..c1fd401fd0 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 bb322cc09c..14d237ee78 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 1656fa9dda..4774cd3d56 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
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
diff --git 
a/tp/t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex 
b/tp/t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex
index b95b83764f..1b35724519 100644
--- a/tp/t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex
+++ b/tp/t/results/sectioning/top_node_part_top/res_latex/top_node_part_top.tex
@@ -13,31 +13,31 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 e0c8183d47..2134a9bb3d 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
@@ -15,7 +15,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -24,37 +24,37 @@
 \makeindex[name=vr,title=]%
 
 % command used in \description format for samp
-\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
+\newcommand\Texinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
 
 % style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[description]{style=nextline, font=\normalfont}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
@@ -83,17 +83,17 @@ l--ine
 
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{avar--b}\\
+\Texinfocommandstyletextvar{avar--b}\\
 \index[fn]{avar--b@\texttt{avar{-}{-}b}}%
 \index[cp]{index entry between item and itemx@index entry between item and 
itemx}%
-\GNUTexinfocommandstyletextvar{b}
+\Texinfocommandstyletextvar{b}
 \index[fn]{b@\texttt{b}}%
 }}]
 l--ine
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{c}\\
+\Texinfocommandstyletextvar{c}\\
 \index[fn]{c@\texttt{c}}%
-\GNUTexinfocommandstyletextvar{d}
+\Texinfocommandstyletextvar{d}
 \index[fn]{d@\texttt{d}}%
 }}]
 
@@ -116,7 +116,7 @@ Texte before first item.
 \begin{description}
 \item[] \index[cp]{samp cindex in table@samp cindex in table}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb}}}]
 l--ine samp
 \end{description}
 
@@ -124,7 +124,7 @@ l--ine samp
 \item[] \index[cp]{samp cindex in table@samp cindex in table}%
 Texte before first item samp.
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb}}}]
 \end{description}
 
 \begin{description}
@@ -132,21 +132,21 @@ Texte before first item samp.
 \index[cp]{cindex between lines@cindex between lines}%
 
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb1}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb1}}}]
 \end{description}
 
 \begin{description}
 \item[] \index[cp]{cindex before line@cindex before line}%
 
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \begin{description}
 \item[] 
 \index[cp]{cindex after line@cindex after line}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \begin{description}
@@ -154,7 +154,7 @@ Texte before first item samp.
 \index[cp]{second@second}%
 \index[cp]{third@third}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 
diff --git 
a/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
 
b/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
index 51f99fd0ba..9afb28ad0f 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
@@ -15,58 +15,58 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
 \makeindex[name=cp,title=]%
 
 % style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[description]{style=nextline, font=\normalfont}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
 \begin{document}
-\begin{GNUTexinfoindented}
+\begin{Texinfoindented}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{a--b}\\
+\Texinfocommandstyletextvar{a--b}\\
 \index[cp]{index entry between item and itemx@index entry between item and 
itemx}%
-\GNUTexinfocommandstyletextvar{b}\\
-\GNUTexinfocommandstyletextvar{c}}}]
-\begin{GNUTexinfopreformatted}%
+\Texinfocommandstyletextvar{b}\\
+\Texinfocommandstyletextvar{c}}}]
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}ine
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{d}}}]
+\Texinfocommandstyletextvar{d}}}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 \end{document}
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 a5c6e95cc0..c13565391c 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"
@@ -13,32 +13,32 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
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 53b2c93e75..80d0e10cec 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
@@ -15,7 +15,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -24,18 +24,18 @@
 \makeindex[name=vr,title=]%
 
 % command used in \description format for samp
-\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
+\newcommand\Texinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
 
 % style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[description]{style=nextline, font=\normalfont}
@@ -43,20 +43,20 @@
 \setlist[enumerate]{label=\arabic*.}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
@@ -141,17 +141,17 @@ l--ine
 
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{avar--b}\\
+\Texinfocommandstyletextvar{avar--b}\\
 \index[fn]{avar--b@\texttt{avar{-}{-}b}}%
 \index[cp]{index entry between item and itemx@index entry between item and 
itemx}%
-\GNUTexinfocommandstyletextvar{b}
+\Texinfocommandstyletextvar{b}
 \index[fn]{b@\texttt{b}}%
 }}]
 l--ine
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{c}\\
+\Texinfocommandstyletextvar{c}\\
 \index[fn]{c@\texttt{c}}%
-\GNUTexinfocommandstyletextvar{d}
+\Texinfocommandstyletextvar{d}
 \index[fn]{d@\texttt{d}}%
 }}]
 
@@ -174,7 +174,7 @@ Texte before first item.
 \begin{description}
 \item[] \index[cp]{samp cindex in table@samp cindex in table}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb}}}]
 l--ine samp
 \end{description}
 
@@ -182,7 +182,7 @@ l--ine samp
 \item[] \index[cp]{samp cindex in table@samp cindex in table}%
 Texte before first item samp.
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb}}}]
 \end{description}
 
 \begin{description}
@@ -190,21 +190,21 @@ Texte before first item samp.
 \index[cp]{cindex between lines@cindex between lines}%
 
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb1}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb1}}}]
 \end{description}
 
 \begin{description}
 \item[] \index[cp]{cindex before line@cindex before line}%
 
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \begin{description}
 \item[] 
 \index[cp]{cindex after line@cindex after line}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \begin{description}
@@ -212,7 +212,7 @@ Texte before first item samp.
 \index[cp]{second@second}%
 \index[cp]{third@third}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \chapter{{printindex}}
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 53b2c93e75..80d0e10cec 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
@@ -15,7 +15,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -24,18 +24,18 @@
 \makeindex[name=vr,title=]%
 
 % command used in \description format for samp
-\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
+\newcommand\Texinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
 
 % style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 % set defaults for lists that match Texinfo TeX formatting
 \setlist[description]{style=nextline, font=\normalfont}
@@ -43,20 +43,20 @@
 \setlist[enumerate]{label=\arabic*.}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 \pagestyle{single}%
 
@@ -141,17 +141,17 @@ l--ine
 
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{avar--b}\\
+\Texinfocommandstyletextvar{avar--b}\\
 \index[fn]{avar--b@\texttt{avar{-}{-}b}}%
 \index[cp]{index entry between item and itemx@index entry between item and 
itemx}%
-\GNUTexinfocommandstyletextvar{b}
+\Texinfocommandstyletextvar{b}
 \index[fn]{b@\texttt{b}}%
 }}]
 l--ine
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextvar{c}\\
+\Texinfocommandstyletextvar{c}\\
 \index[fn]{c@\texttt{c}}%
-\GNUTexinfocommandstyletextvar{d}
+\Texinfocommandstyletextvar{d}
 \index[fn]{d@\texttt{d}}%
 }}]
 
@@ -174,7 +174,7 @@ Texte before first item.
 \begin{description}
 \item[] \index[cp]{samp cindex in table@samp cindex in table}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb}}}]
 l--ine samp
 \end{description}
 
@@ -182,7 +182,7 @@ l--ine samp
 \item[] \index[cp]{samp cindex in table@samp cindex in table}%
 Texte before first item samp.
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb}}}]
 \end{description}
 
 \begin{description}
@@ -190,21 +190,21 @@ Texte before first item samp.
 \index[cp]{cindex between lines@cindex between lines}%
 
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb1}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb1}}}]
 \end{description}
 
 \begin{description}
 \item[] \index[cp]{cindex before line@cindex before line}%
 
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \begin{description}
 \item[] 
 \index[cp]{cindex after line@cindex after line}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \begin{description}
@@ -212,7 +212,7 @@ Texte before first item samp.
 \index[cp]{second@second}%
 \index[cp]{third@third}%
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
+\Texinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
 \chapter{{printindex}}
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index def8f6f60a..1f644454cb 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -21,7 +21,7 @@
 \usepackage[utf8]{inputenc}
 
 \makeatletter
-\newcommand{\GNUTexinfosettitle}{No Title}%
+\newcommand{\Texinfosettitle}{No Title}%
 
 % no index headers or page break
 \indexsetup{level=\relax,toclevel=section,noclearpage}%
@@ -32,24 +32,24 @@
 \makeindex[name=truc,title=]%
 
 % command used in \description format for samp
-\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
+\newcommand\Texinfotablestylesamp[1]{\ifstrempty{#1}{}{`\texttt{#1}'}}%
 
 % style command for cite in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextcite[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextcite[1]{{\normalfont{}\textsl{#1}}}%
 
 % style command for kbd in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextkbd[1]{{\ttfamily\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextkbd[1]{{\ttfamily\textsl{#1}}}%
 
 % style command for var in 'cmd_text' formatting context
-\newcommand\GNUTexinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
+\newcommand\Texinfocommandstyletextvar[1]{{\normalfont{}\textsl{#1}}}%
 
 % redefine the \mainmatter command such that it does not clear page
 % as if in double page
 \renewcommand\mainmatter{\clearpage\@mainmattertrue\pagenumbering{arabic}}
-\newenvironment{GNUTexinfopreformatted}{%
+\newenvironment{Texinfopreformatted}{%
   \par\GNUTobeylines\obeyspaces\frenchspacing\parskip=\z@\parindent=\z@}{}
 {\catcode`\^^M=13 \gdef\GNUTobeylines{\catcode`\^^M=13 \def^^M{\null\par}}}
-\newenvironment{GNUTexinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
+\newenvironment{Texinfoindented}{\begin{list}{}{}\item\relax}{\end{list}}
 
 
 % set defaults for lists that match Texinfo TeX formatting
@@ -58,16 +58,16 @@
 \setlist[enumerate]{label=\arabic*.}
 
 % used for substitutions in commands
-\newcommand{\GNUTexinfoplaceholder}[1]{}
+\newcommand{\Texinfoplaceholder}[1]{}
 
 \newpagestyle{single}{\sethead[\chaptername{} \thechapter{} 
\chaptertitle{}][][\thepage]
                               {\chaptername{} \thechapter{} 
\chaptertitle{}}{}{\thepage}}
 
 % avoid pagebreak and headings setting for a sectioning command
-\newcommand{\GNUTexinfonopagebreakheading}[2]{{\let\clearpage\relax 
\let\cleardoublepage\relax \let\thispagestyle\GNUTexinfoplaceholder #1{#2}}}
+\newcommand{\Texinfonopagebreakheading}[2]{{\let\clearpage\relax 
\let\cleardoublepage\relax \let\thispagestyle\Texinfoplaceholder #1{#2}}}
 
 % the mdframed style for @cartouche
-\mdfdefinestyle{GNUTexinfocartouche}{
+\mdfdefinestyle{Texinfocartouche}{
 innertopmargin=10pt, innerbottommargin=10pt,%
 roundcorner=10pt}
 
@@ -76,14 +76,14 @@ roundcorner=10pt}
 \EmbracOff{}%
 
 % allow line breaking at underscore
-\let\GNUTexinfounderscore\_
-\renewcommand{\_}{\GNUTexinfounderscore\discretionary{}{}{}}
+\let\Texinfounderscore\_
+\renewcommand{\_}{\Texinfounderscore\discretionary{}{}{}}
 \renewcommand{\includegraphics}[1]{\fbox{FIG \detokenize{#1}}}
 
 \makeatother
 % set default for @setchapternewpage
 \makeatletter
-\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\GNUTexinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{\Texinfoplaceholder{setchapternewpage
 placeholder}\clearpage}{}{}
 \makeatother
 
 % no headings before titlepage
@@ -121,7 +121,7 @@ In titlepage
 code: \texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}} 
\leavevmode{}\\
 asis: ``simple-double--three---four----'' \leavevmode{}\\
 strong: \textbf{``simple-double--three---four----''} \leavevmode{}\\
-kbd: 
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
+kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
 
 `\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
 
@@ -236,7 +236,7 @@ but , ,\@
 \texttt{@abbr\{@'E{-}{-}.\ @comma\{\}A.\}} \'{E}--.\@ ,A.\@
 \texttt{@asis\{{-}{-}a\}} --a
 \texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \GNUTexinfocommandstyletextcite{--a}
+\texttt{@cite\{{-}{-}a\}} \Texinfocommandstyletextcite{--a}
 \texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@dfn\{{-}{-}a\}} \textsl{--a}
@@ -248,7 +248,7 @@ but , ,\@
 \texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@i\{{-}{-}a\}} \textit{--a}
-\texttt{@kbd\{{-}{-}a\}} \GNUTexinfocommandstyletextkbd{{-}{-}a}
+\texttt{@kbd\{{-}{-}a\}} \Texinfocommandstyletextkbd{{-}{-}a}
 \texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\}\ @minus\{\}\}} $--a 
{\frac{1}{2}} -$
 \texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -271,7 +271,7 @@ but , ,\@
 \texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
 \texttt{@url\{{-}{-}a,\}} \url{--a}
 \texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \GNUTexinfocommandstyletextvar{--a}
+\texttt{@var\{{-}{-}a\}} \Texinfocommandstyletextvar{--a}
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
@@ -355,24 +355,24 @@ $$
 \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} slanted
 $$
 
-\GNUTexinfocommandstyletextkbd{default kbdinputstyle}
+\Texinfocommandstyletextkbd{default kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
 \index[cp]{vtable i--tem default kbdinputstyle@\texttt{vtable i{-}{-}tem 
default kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example default kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example default kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example default 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example default kbdinputstyle}
 \index[cp]{vtable i--tem in example default kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example default kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{code kbdinputstyle}
 \begin{description}
@@ -381,17 +381,17 @@ $$
 \index[cp]{vtable i--tem code kbdinputstyle@\texttt{vtable i{-}{-}tem code 
kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily \texttt{in example code kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 \texttt{vtable i{-}{-}tem in example code kbdinputstyle}
 \index[cp]{vtable i--tem in example code kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example code kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{example kbdinputstyle}
 \begin{description}
@@ -400,36 +400,36 @@ $$
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example example kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example example kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
-\GNUTexinfocommandstyletextkbd{distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{distinct kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
 \index[cp]{vtable i--tem distinct kbdinputstyle@\texttt{vtable i{-}{-}tem 
distinct kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example distinct kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example distinct kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
 \index[cp]{vtable i--tem in example distinct kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example distinct kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \begin{quote}
 A quot---ation
@@ -620,151 +620,151 @@ lone mu--ltitable item&\\
 truc &bidule\\
 \end{tabular}%
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily e{-}{-}xample  some
 \   text
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example one arg
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example two args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example three args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example four args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example five args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily The something \'{e}\ \TeX{}\ is here.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily A @\ at the end of the @example line.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty and non empty args mix
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Exam{-}{-}{-}ple
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 Other li---ne
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily not exdented
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
+\begin{Texinfoindented}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented  and dash --- in example
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented one
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented two
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented two
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Example   Hoho.
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Nested Other line
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented nested other line
 \\
-\end{GNUTexinfoindented}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}mallexample
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \texttt{@noindent} after smallexample.
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD\&content-type=text/plain'
 \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD\&content-type=text/plain'
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \noindent{}Less recent versions are also present.
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 d--isplay
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--malldisplay
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}isp
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}malllisp
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--ormat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--mallformat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -793,10 +793,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn@index entry within deffn}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -928,10 +928,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -1457,27 +1457,27 @@ Value--table code
 \begin{description}
 \item[] Title
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{a{-}{-}samp}\\
-\GNUTexinfotablestylesamp{a2{-}{-}samp}}}]
+\Texinfotablestylesamp{a{-}{-}samp}\\
+\Texinfotablestylesamp{a2{-}{-}samp}}}]
 Value--table samp
 \end{description}
 
-\begin{mdframed}[style=GNUTexinfocartouche]
+\begin{mdframed}[style=Texinfocartouche]
 c--artouche
 \end{mdframed}
 
 \begin{flushleft}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushleft
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushleft}
 
 \begin{flushright}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushright
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushright}
 
 \begin{center}
@@ -1513,9 +1513,9 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
+\Texinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
+\Texinfonopagebreakheading{\chapter*}{{chapheading}}
 
 \section*{{heading}}
 
@@ -1688,10 +1688,10 @@ Various deff lines
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\Texinfocommandstyletextvar{invalid} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
-\index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
+\index[fn]{invalid@\texttt{\Texinfocommandstyletextvar{invalid}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -1773,7 +1773,7 @@ In copying
 code: \texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}} 
\leavevmode{}\\
 asis: ``simple-double--three---four----'' \leavevmode{}\\
 strong: \textbf{``simple-double--three---four----''} \leavevmode{}\\
-kbd: 
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
+kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
 
 `\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
 
@@ -1888,7 +1888,7 @@ but , ,\@
 \texttt{@abbr\{@'E{-}{-}.\ @comma\{\}A.\}} \'{E}--.\@ ,A.\@
 \texttt{@asis\{{-}{-}a\}} --a
 \texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \GNUTexinfocommandstyletextcite{--a}
+\texttt{@cite\{{-}{-}a\}} \Texinfocommandstyletextcite{--a}
 \texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@dfn\{{-}{-}a\}} \textsl{--a}
@@ -1900,7 +1900,7 @@ but , ,\@
 \texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@i\{{-}{-}a\}} \textit{--a}
-\texttt{@kbd\{{-}{-}a\}} \GNUTexinfocommandstyletextkbd{{-}{-}a}
+\texttt{@kbd\{{-}{-}a\}} \Texinfocommandstyletextkbd{{-}{-}a}
 \texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\}\ @minus\{\}\}} $--a 
{\frac{1}{2}} -$
 \texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -1923,7 +1923,7 @@ but , ,\@
 \texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
 \texttt{@url\{{-}{-}a,\}} \url{--a}
 \texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \GNUTexinfocommandstyletextvar{--a}
+\texttt{@var\{{-}{-}a\}} \Texinfocommandstyletextvar{--a}
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
@@ -2004,24 +2004,24 @@ $$
 \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} slanted
 $$
 
-\GNUTexinfocommandstyletextkbd{default kbdinputstyle}
+\Texinfocommandstyletextkbd{default kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
 \index[cp]{vtable i--tem default kbdinputstyle@\texttt{vtable i{-}{-}tem 
default kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example default kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example default kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example default 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example default kbdinputstyle}
 \index[cp]{vtable i--tem in example default kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example default kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{code kbdinputstyle}
 \begin{description}
@@ -2030,17 +2030,17 @@ $$
 \index[cp]{vtable i--tem code kbdinputstyle@\texttt{vtable i{-}{-}tem code 
kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily \texttt{in example code kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 \texttt{vtable i{-}{-}tem in example code kbdinputstyle}
 \index[cp]{vtable i--tem in example code kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example code kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{example kbdinputstyle}
 \begin{description}
@@ -2049,36 +2049,36 @@ $$
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example example kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example example kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
-\GNUTexinfocommandstyletextkbd{distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{distinct kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
 \index[cp]{vtable i--tem distinct kbdinputstyle@\texttt{vtable i{-}{-}tem 
distinct kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example distinct kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example distinct kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
 \index[cp]{vtable i--tem in example distinct kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example distinct kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \begin{quote}
 A quot---ation
@@ -2269,151 +2269,151 @@ lone mu--ltitable item&\\
 truc &bidule\\
 \end{tabular}%
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily e{-}{-}xample  some
 \   text
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example one arg
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example two args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example three args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example four args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example five args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily The something \'{e}\ \TeX{}\ is here.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily A @\ at the end of the @example line.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty and non empty args mix
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Exam{-}{-}{-}ple
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 Other li---ne
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily not exdented
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
+\begin{Texinfoindented}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented  and dash --- in example
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented one
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented two
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented two
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Example   Hoho.
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Nested Other line
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented nested other line
 \\
-\end{GNUTexinfoindented}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}mallexample
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \texttt{@noindent} after smallexample.
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD\&content-type=text/plain'
 \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD\&content-type=text/plain'
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \noindent{}Less recent versions are also present.
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 d--isplay
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--malldisplay
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}isp
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}malllisp
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--ormat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--mallformat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -2442,10 +2442,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn@index entry within deffn}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -2577,10 +2577,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -3106,27 +3106,27 @@ Value--table code
 \begin{description}
 \item[] Title
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{a{-}{-}samp}\\
-\GNUTexinfotablestylesamp{a2{-}{-}samp}}}]
+\Texinfotablestylesamp{a{-}{-}samp}\\
+\Texinfotablestylesamp{a2{-}{-}samp}}}]
 Value--table samp
 \end{description}
 
-\begin{mdframed}[style=GNUTexinfocartouche]
+\begin{mdframed}[style=Texinfocartouche]
 c--artouche
 \end{mdframed}
 
 \begin{flushleft}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushleft
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushleft}
 
 \begin{flushright}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushright
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushright}
 
 \begin{center}
@@ -3162,9 +3162,9 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
+\Texinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
+\Texinfonopagebreakheading{\chapter*}{{chapheading}}
 
 \section*{{heading}}
 
@@ -3337,10 +3337,10 @@ Various deff lines
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\Texinfocommandstyletextvar{invalid} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
-\index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
+\index[fn]{invalid@\texttt{\Texinfocommandstyletextvar{invalid}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -3443,7 +3443,7 @@ In copying
 code: \texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}} 
\leavevmode{}\\
 asis: ``simple-double--three---four----'' \leavevmode{}\\
 strong: \textbf{``simple-double--three---four----''} \leavevmode{}\\
-kbd: 
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
+kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
 
 `\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
 
@@ -3558,7 +3558,7 @@ but , ,\@
 \texttt{@abbr\{@'E{-}{-}.\ @comma\{\}A.\}} \'{E}--.\@ ,A.\@
 \texttt{@asis\{{-}{-}a\}} --a
 \texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \GNUTexinfocommandstyletextcite{--a}
+\texttt{@cite\{{-}{-}a\}} \Texinfocommandstyletextcite{--a}
 \texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@dfn\{{-}{-}a\}} \textsl{--a}
@@ -3570,7 +3570,7 @@ but , ,\@
 \texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@i\{{-}{-}a\}} \textit{--a}
-\texttt{@kbd\{{-}{-}a\}} \GNUTexinfocommandstyletextkbd{{-}{-}a}
+\texttt{@kbd\{{-}{-}a\}} \Texinfocommandstyletextkbd{{-}{-}a}
 \texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\}\ @minus\{\}\}} $--a 
{\frac{1}{2}} -$
 \texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -3593,7 +3593,7 @@ but , ,\@
 \texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
 \texttt{@url\{{-}{-}a,\}} \url{--a}
 \texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \GNUTexinfocommandstyletextvar{--a}
+\texttt{@var\{{-}{-}a\}} \Texinfocommandstyletextvar{--a}
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
@@ -3674,24 +3674,24 @@ $$
 \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} slanted
 $$
 
-\GNUTexinfocommandstyletextkbd{default kbdinputstyle}
+\Texinfocommandstyletextkbd{default kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
 \index[cp]{vtable i--tem default kbdinputstyle@\texttt{vtable i{-}{-}tem 
default kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example default kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example default kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example default 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example default kbdinputstyle}
 \index[cp]{vtable i--tem in example default kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example default kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{code kbdinputstyle}
 \begin{description}
@@ -3700,17 +3700,17 @@ $$
 \index[cp]{vtable i--tem code kbdinputstyle@\texttt{vtable i{-}{-}tem code 
kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily \texttt{in example code kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 \texttt{vtable i{-}{-}tem in example code kbdinputstyle}
 \index[cp]{vtable i--tem in example code kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example code kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{example kbdinputstyle}
 \begin{description}
@@ -3719,36 +3719,36 @@ $$
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example example kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example example kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
-\GNUTexinfocommandstyletextkbd{distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{distinct kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
 \index[cp]{vtable i--tem distinct kbdinputstyle@\texttt{vtable i{-}{-}tem 
distinct kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example distinct kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example distinct kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
 \index[cp]{vtable i--tem in example distinct kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example distinct kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \begin{quote}
 A quot---ation
@@ -3939,151 +3939,151 @@ lone mu--ltitable item&\\
 truc &bidule\\
 \end{tabular}%
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily e{-}{-}xample  some
 \   text
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example one arg
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example two args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example three args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example four args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example five args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily The something \'{e}\ \TeX{}\ is here.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily A @\ at the end of the @example line.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty and non empty args mix
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Exam{-}{-}{-}ple
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 Other li---ne
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily not exdented
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
+\begin{Texinfoindented}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented  and dash --- in example
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented one
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented two
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented two
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Example   Hoho.
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Nested Other line
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented nested other line
 \\
-\end{GNUTexinfoindented}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}mallexample
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \texttt{@noindent} after smallexample.
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD\&content-type=text/plain'
 \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD\&content-type=text/plain'
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \noindent{}Less recent versions are also present.
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 d--isplay
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--malldisplay
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}isp
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}malllisp
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--ormat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--mallformat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -4112,10 +4112,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn@index entry within deffn}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -4247,10 +4247,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -4776,27 +4776,27 @@ Value--table code
 \begin{description}
 \item[] Title
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{a{-}{-}samp}\\
-\GNUTexinfotablestylesamp{a2{-}{-}samp}}}]
+\Texinfotablestylesamp{a{-}{-}samp}\\
+\Texinfotablestylesamp{a2{-}{-}samp}}}]
 Value--table samp
 \end{description}
 
-\begin{mdframed}[style=GNUTexinfocartouche]
+\begin{mdframed}[style=Texinfocartouche]
 c--artouche
 \end{mdframed}
 
 \begin{flushleft}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushleft
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushleft}
 
 \begin{flushright}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushright
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushright}
 
 \begin{center}
@@ -4832,9 +4832,9 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
+\Texinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
+\Texinfonopagebreakheading{\chapter*}{{chapheading}}
 
 \section*{{heading}}
 
@@ -5007,10 +5007,10 @@ Various deff lines
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\Texinfocommandstyletextvar{invalid} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
-\index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
+\index[fn]{invalid@\texttt{\Texinfocommandstyletextvar{invalid}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -5091,7 +5091,7 @@ Normal text
 code: \texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}} 
\leavevmode{}\\
 asis: ``simple-double--three---four----'' \leavevmode{}\\
 strong: \textbf{``simple-double--three---four----''} \leavevmode{}\\
-kbd: 
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
+kbd: 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}
 \leavevmode{}\\
 
 `\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'\leavevmode{}\\
 
@@ -5206,7 +5206,7 @@ but , ,\@
 \texttt{@abbr\{@'E{-}{-}.\ @comma\{\}A.\}} \'{E}--.\@ ,A.\@
 \texttt{@asis\{{-}{-}a\}} --a
 \texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \GNUTexinfocommandstyletextcite{--a}
+\texttt{@cite\{{-}{-}a\}} \Texinfocommandstyletextcite{--a}
 \texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@dfn\{{-}{-}a\}} \textsl{--a}
@@ -5218,7 +5218,7 @@ but , ,\@
 \texttt{@env\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@file\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@i\{{-}{-}a\}} \textit{--a}
-\texttt{@kbd\{{-}{-}a\}} \GNUTexinfocommandstyletextkbd{{-}{-}a}
+\texttt{@kbd\{{-}{-}a\}} \Texinfocommandstyletextkbd{{-}{-}a}
 \texttt{@key\{{-}{-}a\}} \texttt{{-}{-}a}
 \texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\}\ @minus\{\}\}} $--a 
{\frac{1}{2}} -$
 \texttt{@option\{{-}{-}a\}} \texttt{{-}{-}a}
@@ -5241,7 +5241,7 @@ but , ,\@
 \texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
 \texttt{@url\{{-}{-}a,\}} \url{--a}
 \texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \GNUTexinfocommandstyletextvar{--a}
+\texttt{@var\{{-}{-}a\}} \Texinfocommandstyletextvar{--a}
 \texttt{@verb\{:{-}{-}a:\}} \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}} \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
@@ -5322,24 +5322,24 @@ $$
 \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} slanted
 $$
 
-\GNUTexinfocommandstyletextkbd{default kbdinputstyle}
+\Texinfocommandstyletextkbd{default kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
 \index[cp]{vtable i--tem default kbdinputstyle@\texttt{vtable i{-}{-}tem 
default kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example default kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example default kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example default 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example default kbdinputstyle}
 \index[cp]{vtable i--tem in example default kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example default kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{code kbdinputstyle}
 \begin{description}
@@ -5348,17 +5348,17 @@ $$
 \index[cp]{vtable i--tem code kbdinputstyle@\texttt{vtable i{-}{-}tem code 
kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily \texttt{in example code kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 \texttt{vtable i{-}{-}tem in example code kbdinputstyle}
 \index[cp]{vtable i--tem in example code kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example code kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \texttt{example kbdinputstyle}
 \begin{description}
@@ -5367,36 +5367,36 @@ $$
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example example kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example example kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
-\GNUTexinfocommandstyletextkbd{distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{distinct kbdinputstyle}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
 \index[cp]{vtable i--tem distinct kbdinputstyle@\texttt{vtable i{-}{-}tem 
distinct kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example distinct kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example distinct kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
 \index[cp]{vtable i--tem in example distinct kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example distinct kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
 
 \begin{quote}
 A quot---ation
@@ -5587,151 +5587,151 @@ lone mu--ltitable item&\\
 truc &bidule\\
 \end{tabular}%
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily e{-}{-}xample  some
 \   text
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example one arg
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example two args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example three args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example four args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example five args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily The something \'{e}\ \TeX{}\ is here.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily A @\ at the end of the @example line.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty and non empty args mix
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Exam{-}{-}{-}ple
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 Other li---ne
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily not exdented
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
+\begin{Texinfoindented}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented  and dash --- in example
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented one
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented two
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented two
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Example   Hoho.
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Nested Other line
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented nested other line
 \\
-\end{GNUTexinfoindented}
-\end{GNUTexinfoindented}
+\end{Texinfoindented}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}mallexample
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \texttt{@noindent} after smallexample.
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD\&content-type=text/plain'
 \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD\&content-type=text/plain'
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \noindent{}Less recent versions are also present.
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 d--isplay
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--malldisplay
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}isp
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}malllisp
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--ormat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \footnotesize s--mallformat
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -5760,10 +5760,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 \index[cp]{index entry within deffn@index entry within deffn}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
@@ -5895,10 +5895,10 @@ def--fn
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -6424,27 +6424,27 @@ Value--table code
 \begin{description}
 \item[] Title
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{a{-}{-}samp}\\
-\GNUTexinfotablestylesamp{a2{-}{-}samp}}}]
+\Texinfotablestylesamp{a{-}{-}samp}\\
+\Texinfotablestylesamp{a2{-}{-}samp}}}]
 Value--table samp
 \end{description}
 
-\begin{mdframed}[style=GNUTexinfocartouche]
+\begin{mdframed}[style=Texinfocartouche]
 c--artouche
 \end{mdframed}
 
 \begin{flushleft}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushleft
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushleft}
 
 \begin{flushright}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 f--lushright
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushright}
 
 \begin{center}
@@ -6480,9 +6480,9 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
+\Texinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
+\Texinfonopagebreakheading{\chapter*}{{chapheading}}
 
 \section*{{heading}}
 
@@ -6655,10 +6655,10 @@ Various deff lines
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\Texinfocommandstyletextvar{invalid} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
-\index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
+\index[fn]{invalid@\texttt{\Texinfocommandstyletextvar{invalid}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -6727,8 +6727,8 @@ g--roupe
 
 
 In example.
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
 <
 >
@@ -6741,7 +6741,7 @@ In example.
 code:\ \texttt{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}\ 
\leavevmode{}\\
 asis:\ {`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}\ 
\leavevmode{}\\
 strong:\ \textbf{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}\ 
\leavevmode{}\\
-kbd:\ 
\GNUTexinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}\
 \leavevmode{}\\
+kbd:\ 
\Texinfocommandstyletextkbd{{`}{`}simple-double{-}{-}three{-}{-}{-}four{-}{-}{-}-{'}{'}}\
 \leavevmode{}\\
 
 
`\hbox{}`simple-double-\hbox{}-three{-}{-}{-}four{-}{-}{-}-'\hbox{}'\leavevmode{}\\
 
@@ -6856,7 +6856,7 @@ but ,\ ,\@
 \texttt{@abbr\{@'E{-}{-}.\ @comma\{\}A.\}}\ \'{E}{-}{-}.\@\ ,A.\@
 \texttt{@asis\{{-}{-}a\}}\ {-}{-}a
 \texttt{@b\{{-}{-}a\}}\ \textbf{{-}{-}a}
-\texttt{@cite\{{-}{-}a\}}\ \GNUTexinfocommandstyletextcite{--a}
+\texttt{@cite\{{-}{-}a\}}\ \Texinfocommandstyletextcite{--a}
 \texttt{@code\{{-}{-}a\}}\ \texttt{{-}{-}a}
 \texttt{@command\{{-}{-}a\}}\ \texttt{{-}{-}a}
 \texttt{@dfn\{{-}{-}a\}}\ \textsl{{-}{-}a}
@@ -6868,7 +6868,7 @@ but ,\ ,\@
 \texttt{@env\{{-}{-}a\}}\ \texttt{{-}{-}a}
 \texttt{@file\{{-}{-}a\}}\ \texttt{{-}{-}a}
 \texttt{@i\{{-}{-}a\}}\ \textit{{-}{-}a}
-\texttt{@kbd\{{-}{-}a\}}\ \GNUTexinfocommandstyletextkbd{{-}{-}a}
+\texttt{@kbd\{{-}{-}a\}}\ \Texinfocommandstyletextkbd{{-}{-}a}
 \texttt{@key\{{-}{-}a\}}\ \texttt{{-}{-}a}
 \texttt{@math\{{-}{-}a \{\textbackslash{}frac\{1\}\{2\}\}\ @minus\{\}\}}\ $--a 
{\frac{1}{2}} -$
 \texttt{@option\{{-}{-}a\}}\ \texttt{{-}{-}a}
@@ -6879,8 +6879,8 @@ but ,\ ,\@
 \texttt{@t\{{-}{-}a\}}\ \texttt{{-}{-}a}
 \texttt{@sansserif\{{-}{-}a\}}\ \textsf{{-}{-}a}
 \texttt{@slanted\{{-}{-}a\}}\ \textsl{{-}{-}a}
-\texttt{@titlefont\{{-}{-}a\}}\ \end{GNUTexinfopreformatted}
-{\huge \bfseries --a}\begin{GNUTexinfopreformatted}%
+\texttt{@titlefont\{{-}{-}a\}}\ \end{Texinfopreformatted}
+{\huge \bfseries --a}\begin{Texinfopreformatted}%
 \ttfamily 
 \texttt{@indicateurl\{{-}{-}a\}}\ `\texttt{{-}{-}a}'
 \texttt{@uref\{{-}{-}a,{-}{-}b\}}\ \href{--a}{{-}{-}b (\nolinkurl{--a})}
@@ -6893,7 +6893,7 @@ but ,\ ,\@
 \texttt{@url\{{-}{-}a,{-}{-}b\}}\ \href{--a}{{-}{-}b (\nolinkurl{--a})}
 \texttt{@url\{{-}{-}a,\}}\ \url{--a}
 \texttt{@url\{,{-}{-}b\}}\ {-}{-}b
-\texttt{@var\{{-}{-}a\}}\ \GNUTexinfocommandstyletextvar{--a}
+\texttt{@var\{{-}{-}a\}}\ \Texinfocommandstyletextvar{--a}
 \texttt{@verb\{:{-}{-}a:\}}\ \verb:--a:
 \texttt{@verb\{:a  < \& @\ \% " {-}{-}    b:\}}\ \verb:a  < & @ % " --    b:
 \texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a\}}\ \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a 
a a}
@@ -6924,36 +6924,36 @@ but ,\ ,\@
 \texttt{@sp 2}\leavevmode{}\\
 \vskip 2\baselineskip %
 \texttt{@page}\leavevmode{}\\
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \newpage{}%
 \phantom{blabla}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 \texttt{need 1002}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \needspace{1.002pt}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 \texttt{@clicksequence\{click @click\{\}\ A\}}\ click $\rightarrow{}$\ A
 After clickstyle $\Rightarrow{}$
 \texttt{@clicksequence\{click @click\{\}\ A\}}\ click $\Rightarrow{}$\ A
 
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e^{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 \mathbf{``simple-double--three---four----''} \hbox{aa}
 `\hbox{}`simple-double-\hbox{}-three---four----'\hbox{}'
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 \imath{} \jmath{}
 \mathord{\text{\l{}}} \textsl{\c{c}}
@@ -6961,9 +6961,9 @@ $$
  \ {}\ {} \ {}\-{}  ! @ \} \{ 
 \today{}
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 \rightarrow{}
 u
@@ -6973,666 +6973,666 @@ u
 \mathord{\text{\TH{}}} \mathord{\text{\dh{}}} \mathord{\text{\th{}}} 
\mathord{\text{\textexclamdown{}}} \mathord{\text{\textquestiondown{}}} 
\mathsterling{}
 \mathord{\text{\textordfeminine{}}} \mathord{\text{\textordmasculine{}}} , 
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 \mathord{\text{\textquotedblleft{}}} \mathord{\text{\textquotedblright{}}} 
 \mathord{\text{\textquoteleft{}}} \mathord{\text{\textquoteright{}}} 
\mathord{\text{\quotedblbase{}}} \mathord{\text{\quotesinglbase{}}} 
\mathord{\text{\guillemotleft{}}}
 \mathord{\text{\guillemotright{}}} \mathord{\text{\guillemotleft{}}} 
\mathord{\text{\guillemotright{}}} \mathord{\text{\guilsinglleft{}}}
 \mathord{\text{\guilsinglright{}}} \euro{} \rightarrow{} \leq{} \geq{}
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 \mathbf{b} \mathit{i} \mathrm{r} sc \mathsf{sansserif} slanted
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\GNUTexinfocommandstyletextkbd{default kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\Texinfocommandstyletextkbd{default kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem default kbdinputstyle}
 \index[cp]{vtable i--tem default kbdinputstyle@\texttt{vtable i{-}{-}tem 
default kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example default kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example default kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example default 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example default kbdinputstyle}
 \index[cp]{vtable i--tem in example default kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example default kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
 \texttt{code kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 \texttt{vtable i{-}{-}tem code kbdinputstyle}
 \index[cp]{vtable i--tem code kbdinputstyle@\texttt{vtable i{-}{-}tem code 
kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily \texttt{in example code kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 \texttt{vtable i{-}{-}tem in example code kbdinputstyle}
 \index[cp]{vtable i--tem in example code kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example code kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\GNUTexinfocommandstyletextkbd{example kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\Texinfocommandstyletextkbd{example kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem example kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem example kbdinputstyle}
 \index[cp]{vtable i--tem example kbdinputstyle@\texttt{vtable i{-}{-}tem 
example kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example example kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example example kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example example 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example example kbdinputstyle}
 \index[cp]{vtable i--tem in example example kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example example kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\GNUTexinfocommandstyletextkbd{distinct kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\Texinfocommandstyletextkbd{distinct kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem distinct kbdinputstyle}
 \index[cp]{vtable i--tem distinct kbdinputstyle@\texttt{vtable i{-}{-}tem 
distinct kbdinputstyle}}%
 }}]
 \end{description}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
-\ttfamily \GNUTexinfocommandstyletextkbd{in example distinct kbdinputstyle}
-\end{GNUTexinfopreformatted}
+\begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
+\ttfamily \Texinfocommandstyletextkbd{in example distinct kbdinputstyle}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
+\Texinfocommandstyletextkbd{vtable i{-}{-}tem in example distinct 
kbdinputstyle}
 \index[cp]{vtable i--tem in example distinct kbdinputstyle@\texttt{vtable 
i{-}{-}tem in example distinct kbdinputstyle}}%
 }}]
 \end{description}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily A quot{-}{-}{-}ation
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{Note:} \begin{GNUTexinfopreformatted}%
+\textbf{Note:} \begin{Texinfopreformatted}%
 \ttfamily A Note
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{note:} \begin{GNUTexinfopreformatted}%
+\textbf{note:} \begin{Texinfopreformatted}%
 \ttfamily A note
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{Caution:} \begin{GNUTexinfopreformatted}%
+\textbf{Caution:} \begin{Texinfopreformatted}%
 \ttfamily Caution
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{Important:} \begin{GNUTexinfopreformatted}%
+\textbf{Important:} \begin{Texinfopreformatted}%
 \ttfamily Important
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{Tip:} \begin{GNUTexinfopreformatted}%
+\textbf{Tip:} \begin{Texinfopreformatted}%
 \ttfamily a Tip
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{Warning:} \begin{GNUTexinfopreformatted}%
+\textbf{Warning:} \begin{Texinfopreformatted}%
 \ttfamily a Warning.
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{something \'{e} \TeX{}:} \begin{GNUTexinfopreformatted}%
+\textbf{something \'{e} \TeX{}:} \begin{Texinfopreformatted}%
 \ttfamily The something \'{e}\ \TeX{}\ is here.
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{@ at the end of line \ {}:} \begin{GNUTexinfopreformatted}%
+\textbf{@ at the end of line \ {}:} \begin{Texinfopreformatted}%
 \ttfamily A @\ at the end of the @quotation line.
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{something, other thing:} \begin{GNUTexinfopreformatted}%
+\textbf{something, other thing:} \begin{Texinfopreformatted}%
 \ttfamily something,\ other thing
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\textbf{Note, the note:} \begin{GNUTexinfopreformatted}%
+\textbf{Note, the note:} \begin{Texinfopreformatted}%
 \ttfamily Note,\ the note
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \textbf{Empty:} \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \textbf{:} \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \textbf{\leavevmode{}\\:} \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily aaa quotation
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
 \begin{center}
 --- \emph{quotation author}
 \end{center}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily indent in quotation
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented quotation line   and dash --- in quotation
 \\
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented followed by exdented
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented quotation line
 \\
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented quotation line
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Followed by not exdented 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily quotation1
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 in exdented protected eol \ {}
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily following
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 in exdented a @* \leavevmode{}\\ and following
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily after exdented
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \begin{footnotesize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily A small quot{-}{-}{-}ation
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{footnotesize}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \begin{footnotesize}
-\textbf{Note:} \begin{GNUTexinfopreformatted}%
+\textbf{Note:} \begin{Texinfopreformatted}%
 \ttfamily A small Note
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{footnotesize}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{quote}
 \begin{footnotesize}
-\textbf{something, other thing:} \begin{GNUTexinfopreformatted}%
+\textbf{something, other thing:} \begin{Texinfopreformatted}%
 \ttfamily something,\ other thing
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{footnotesize}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily i{-}{-}temize
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=+]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily i{-}{-}tem +
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=\textbullet{}]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily b{-}{-}ullet
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=-]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily minu{-}{-}s
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=\emph{after emph}]
-\item \begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily e{-}{-}mph item
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=\textbullet{} a--n itemize line]
-\item \begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily \index[cp]{index entry within itemize@index entry within itemize}%
 i{-}{-}tem 1
-\end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily i{-}{-}tem 2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label={}]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily with w a{-}{-}b
-\end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily with w c{-}{-}d
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=\hbox{} on a line]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily line w a{-}{-}b
-\end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily line with w c{-}{-}d
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{enumerate}[start=1]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily e{-}{-}numerate
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{enumerate}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{enumerate}[start=3]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily first third
-\end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily second third
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{enumerate}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{enumerate}[label=\alph*.]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily e{-}{-}numerate
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{enumerate}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{enumerate}[label=\alph*.,start=3]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily first c
-\end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily second c
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{enumerate}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{tabular}{m{0.4\textwidth} m{0.6\textwidth}}%
-\begin{GNUTexinfopreformatted}%
-\ttfamily mu{-}{-}ltitable headitem \end{GNUTexinfopreformatted}&
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
+\ttfamily mu{-}{-}ltitable headitem \end{Texinfopreformatted}&
+\begin{Texinfopreformatted}%
 \ttfamily another tab
-\end{GNUTexinfopreformatted}\\
-\begin{GNUTexinfopreformatted}%
-\ttfamily mu{-}{-}ltitable item \end{GNUTexinfopreformatted}&
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}\\
+\begin{Texinfopreformatted}%
+\ttfamily mu{-}{-}ltitable item \end{Texinfopreformatted}&
+\begin{Texinfopreformatted}%
 \ttfamily multitable tab
-\end{GNUTexinfopreformatted}\\
-\begin{GNUTexinfopreformatted}%
-\ttfamily mu{-}{-}ltitable item 2 \end{GNUTexinfopreformatted}&
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}\\
+\begin{Texinfopreformatted}%
+\ttfamily mu{-}{-}ltitable item 2 \end{Texinfopreformatted}&
+\begin{Texinfopreformatted}%
 \ttfamily multitable tab 2
 \index[cp]{index entry within multitable@index entry within multitable}%
-\end{GNUTexinfopreformatted}\\
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}\\
+\begin{Texinfopreformatted}%
 \ttfamily lone mu{-}{-}ltitable item
-\end{GNUTexinfopreformatted}&\\
+\end{Texinfopreformatted}&\\
 \end{tabular}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{tabular}{m{0.4\textwidth} m{0.6\textwidth}}%
-\begin{GNUTexinfopreformatted}%
-\ttfamily truc \end{GNUTexinfopreformatted}&
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
+\ttfamily truc \end{Texinfopreformatted}&
+\begin{Texinfopreformatted}%
 \ttfamily bidule
-\end{GNUTexinfopreformatted}\\
+\end{Texinfopreformatted}\\
 \end{tabular}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily e{-}{-}xample  some
 \   text
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example one arg
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example two args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example three args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example four args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example five args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily The something \'{e}\ \TeX{}\ is here.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily A @\ at the end of the @example line.
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty args
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily example with empty and non empty args mix
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Exam{-}{-}{-}ple
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 Other li---ne
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily not exdented
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented  and dash --- in example
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented one
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented two
 \\
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Not exdented two
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Example   Hoho.
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily Nested Other line
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \leavevmode{}\\
 \hbox{\kern -\leftmargin}%
 exdented nested other line
 \\
-\end{GNUTexinfoindented}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfoindented}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}mallexample
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily 
 \texttt{@noindent}\ after smallexample.
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.guess?rev=HEAD\&content-type=text/plain'
 \$ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEAD\&content-type=text/plain'
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily \noindent{}Less recent versions are also present.
 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 d--isplay
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \footnotesize s--malldisplay
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}isp
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\end{Texinfoindented}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily \footnotesize s{-}{-}malllisp
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 f--ormat
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \footnotesize s--mallformat
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7642,13 +7642,13 @@ f--ormat
 \index[fn]{d--effn\_name@\texttt{d{-}{-}effn\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}effn
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7658,23 +7658,23 @@ f--ormat
 \index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily def{-}{-}fn
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
-\begin{GNUTexinfopreformatted}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
+\begin{Texinfopreformatted}%
 \ttfamily \index[cp]{index entry within deffn@index entry within deffn}%
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7757,8 +7757,8 @@ f--ormat
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
-\begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
+\begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7779,10 +7779,10 @@ f--ormat
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7790,9 +7790,9 @@ f--ormat
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7800,8 +7800,8 @@ f--ormat
 \end{tabularx}
 
 \index[fn]{deffn@\texttt{deffn}}%
-\begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
+\begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7809,16 +7809,16 @@ f--ormat
 \end{tabularx}
 
 \index[fn]{deffnx@\texttt{deffnx}}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
+\texttt{\Texinfocommandstyletextvar{i} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fset]
 \end{tabularx}
 
-\index[fn]{i@\texttt{\GNUTexinfocommandstyletextvar{i}}}%
+\index[fn]{i@\texttt{\Texinfocommandstyletextvar{i}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7828,14 +7828,14 @@ f--ormat
 \index[fn]{truc@\texttt{truc}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily text in def item for second def item
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7845,13 +7845,13 @@ f--ormat
 \index[cp]{d--efvr\_name@\texttt{d{-}{-}efvr\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efvr
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7861,13 +7861,13 @@ f--ormat
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}effn
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7877,13 +7877,13 @@ f--ormat
 \index[fn]{n--ame@\texttt{n{-}{-}ame}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}effn no arg
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7893,13 +7893,13 @@ f--ormat
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypefn
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7909,13 +7909,13 @@ f--ormat
 \index[fn]{d--eftypefn\_name@\texttt{d{-}{-}eftypefn\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypefn no arg
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7925,13 +7925,13 @@ f--ormat
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypeop
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7941,13 +7941,13 @@ f--ormat
 \index[fn]{d--eftypeop\_name on c--lass@\texttt{d{-}{-}eftypeop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypeop no arg
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7957,13 +7957,13 @@ f--ormat
 \index[cp]{d--eftypevr\_name@\texttt{d{-}{-}eftypevr\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypevr
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7973,13 +7973,13 @@ f--ormat
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efcv
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -7989,13 +7989,13 @@ f--ormat
 \index[cp]{d--efcv\_name@\texttt{d{-}{-}efcv\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efcv with arguments
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8005,13 +8005,13 @@ f--ormat
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypecv
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8021,13 +8021,13 @@ f--ormat
 \index[cp]{d--eftypecv\_name of c--lass@\texttt{d{-}{-}eftypecv\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypecv with arguments
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8037,13 +8037,13 @@ f--ormat
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efop
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8053,13 +8053,13 @@ f--ormat
 \index[fn]{d--efop\_name on c--lass@\texttt{d{-}{-}efop\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efop no arg
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8069,13 +8069,13 @@ f--ormat
 \index[tp]{d--eftp\_name@\texttt{d{-}{-}eftp\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftp
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8085,13 +8085,13 @@ f--ormat
 \index[fn]{d--efun\_name@\texttt{d{-}{-}efun\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efun
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8101,13 +8101,13 @@ f--ormat
 \index[fn]{d--efmac\_name@\texttt{d{-}{-}efmac\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efmac
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8117,13 +8117,13 @@ f--ormat
 \index[fn]{d--efspec\_name@\texttt{d{-}{-}efspec\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efspec
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8133,13 +8133,13 @@ f--ormat
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efvar
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8149,13 +8149,13 @@ f--ormat
 \index[cp]{d--efvar\_name@\texttt{d{-}{-}efvar\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efvar with args
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8165,13 +8165,13 @@ f--ormat
 \index[cp]{d--efopt\_name@\texttt{d{-}{-}efopt\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efopt
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8181,13 +8181,13 @@ f--ormat
 \index[fn]{d--eftypefun\_name@\texttt{d{-}{-}eftypefun\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypefun
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8197,13 +8197,13 @@ f--ormat
 \index[cp]{d--eftypevar\_name@\texttt{d{-}{-}eftypevar\_name}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypevar
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8213,13 +8213,13 @@ f--ormat
 \index[cp]{d--efivar\_name of c--lass@\texttt{d{-}{-}efivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efivar
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8229,13 +8229,13 @@ f--ormat
 \index[cp]{d--eftypeivar\_name of c--lass@\texttt{d{-}{-}eftypeivar\_name\ of 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypeivar
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8245,13 +8245,13 @@ f--ormat
 \index[fn]{d--efmethod\_name on c--lass@\texttt{d{-}{-}efmethod\_name\ on 
c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}efmethod
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8261,14 +8261,14 @@ f--ormat
 \index[fn]{d--eftypemethod\_name on c--lass@\texttt{d{-}{-}eftypemethod\_name\ 
on c{-}{-}lass}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypemethod
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8278,13 +8278,13 @@ f--ormat
 \index[fn]{name2@\texttt{name2}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily aaa2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8294,13 +8294,13 @@ f--ormat
 \index[fn]{d--eftypefn\_name2@\texttt{d{-}{-}eftypefn\_name2}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypefn no arg2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8310,13 +8310,13 @@ f--ormat
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypeop2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8326,13 +8326,13 @@ f--ormat
 \index[fn]{d--eftypeop\_name2 on c--lass2@\texttt{d{-}{-}eftypeop\_name2\ on 
c{-}{-}lass2}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypeop no arg2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8342,13 +8342,13 @@ f--ormat
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypecv2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8358,13 +8358,13 @@ f--ormat
 \index[cp]{d--eftypecv\_name2 of c--lass2@\texttt{d{-}{-}eftypecv\_name2\ of 
c{-}{-}lass2}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily d{-}{-}eftypecv with arguments2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8374,11 +8374,11 @@ f--ormat
 \index[fn]{arg2@\texttt{arg2}}%
 \begin{quote}
 \unskip{\parskip=0pt\noindent}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily fff2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{quote}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 
 \texttt{@xref\{c{-}{-}{-}hapter@@,\ cross r{-}{-}{-}ef name@@,\ 
t{-}{-}{-}itle@@,\ file n{-}{-}{-}ame@@,\ ma{-}{-}{-}nual@@\}}\ See Section 
``t{-}{-}{-}itle@'' in \textsl{ma{-}{-}{-}nual@}.
@@ -8446,19 +8446,19 @@ Section ``s{-}{-}ect,ion'' in \texttt{a comma,\ in file}
 Section ``title with uref2 \href{href://http/myhost.com/index2.html}{uref2 
(\nolinkurl{href://http/myhost.com/index2.html})}'' in \textsl{printed manual 
with uref4 \href{href://http/myhost.com/index4.html}{uref4 
(\nolinkurl{href://http/myhost.com/index4.html})}}
 \hyperref[anchor:chapter]{\chaptername~\ref*{anchor:chapter} [title with uref2 
\href{href://http/myhost.com/index2.html}{uref2 
(\nolinkurl{href://http/myhost.com/index2.html})}], 
page~\pageref*{anchor:chapter}}
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
-\item[] \begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
+\item[] \begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
 \item[{\parbox[b]{\linewidth}{%
 \textbf{a--strong}}}]
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}ine
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 a--asis\\
@@ -8466,13 +8466,13 @@ a--asis\\
 b
 \index[cp]{b@\texttt{b}}%
 }}]
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}ine
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 \emph{a}\\
@@ -8481,85 +8481,85 @@ b
 \emph{b}
 \index[fn]{b@\texttt{b}}%
 }}]
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}ine
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
-\item[] \begin{GNUTexinfopreformatted}%
+\item[] \begin{Texinfopreformatted}%
 \ttfamily Title
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \item[{\parbox[b]{\linewidth}{%
 \texttt{a{-}{-}code}}}]
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Value{-}{-}table code
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
-\item[] \begin{GNUTexinfopreformatted}%
+\item[] \begin{Texinfopreformatted}%
 \ttfamily Title
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylesamp{a{-}{-}samp}\\
-\GNUTexinfotablestylesamp{a2{-}{-}samp}}}]
-\begin{GNUTexinfopreformatted}%
+\Texinfotablestylesamp{a{-}{-}samp}\\
+\Texinfotablestylesamp{a2{-}{-}samp}}}]
+\begin{Texinfopreformatted}%
 \ttfamily Value{-}{-}table samp
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{mdframed}[style=GNUTexinfocartouche]
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{mdframed}[style=Texinfocartouche]
+\begin{Texinfopreformatted}%
 \ttfamily c{-}{-}artouche
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{mdframed}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{flushleft}
-\begin{GNUTexinfopreformatted}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily f{-}{-}lushleft
 more text
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushleft}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{flushright}
-\begin{GNUTexinfopreformatted}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily f{-}{-}lushright
 more text
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushright}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{center}
 ce--ntered line
 \end{center}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{flushleft}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily r{-}{-}raggedright
 more text
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{flushleft}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{verbatim}
 \input texinfo @c -*-texinfo-*-
 
@@ -8573,13 +8573,13 @@ This is a very simple texi manual @  <>.
 
 @bye
 \end{verbatim}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{verbatim}
 in verbatim ''
 \end{verbatim}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 
 
@@ -8587,25 +8587,25 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\end{GNUTexinfopreformatted}
-\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\Texinfonopagebreakheading{\chapter*}{{majorheading}}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\Texinfonopagebreakheading{\chapter*}{{chapheading}}
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \section*{{heading}}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \subsection*{{subheading}}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \subsubsection*{{subsubheading}}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
 
 \texttt{@acronym\{{-}{-}a,an accronym @comma\{\}\ @enddots\{\}\}}\ {-}{-}a\ 
(an accronym ,\ \dots{})
@@ -8663,90 +8663,90 @@ Invalid use of @':\leavevmode{}\\
 
 {\bfseries author}%
 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 \ddot{u} \ddot{U} \tilde{n} \hat{a} \acute{e} \bar{o} \grave{i} \acute{e} 
\grave{\bar{E}}
 \textsl{\c{\'{C}}} \textsl{\c{\'{C}}} \textsl{\H{a}} \dot{a} \mathring{a} 
\textsl{\t{a}}
 \breve{a} \check{a}
  ? .
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 TeX LaTeX \star{} \mathord{\text{\aa{}}} \circledR{} ^{\circ{}} 
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 $$
 \mathtt{t} 
 $$
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=\emph{}]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily e{-}{-}mph item
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=\emph{} after emph]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily e{-}{-}mph item
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label=\textbullet{} a--n itemize line]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily i{-}{-}tem 1
-\end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily i{-}{-}tem 2
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{itemize}[label={}]
-\item \begin{GNUTexinfopreformatted}%
+\item \begin{Texinfopreformatted}%
 \ttfamily without brace w a{-}{-}b
-\end{GNUTexinfopreformatted}
-\item \begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\item \begin{Texinfopreformatted}%
 \ttfamily without brace w c{-}{-}d
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{itemize}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
-\item[] \begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
+\item[] \begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
 \item[{\parbox[b]{\linewidth}{%
 a}}]
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}ine
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
-\item[] \begin{GNUTexinfopreformatted}%
-\ttfamily \end{GNUTexinfopreformatted}
+\item[] \begin{Texinfopreformatted}%
+\ttfamily \end{Texinfopreformatted}
 \item[{\parbox[b]{\linewidth}{%
 a--missing style formatting}}]
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}ine
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \begin{description}
 \item[{\parbox[b]{\linewidth}{%
 a\\
@@ -8755,13 +8755,13 @@ a\\
 b
 \index[fn]{b@\texttt{b}}%
 }}]
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily l{-}{-}ine
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 \end{description}
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8803,9 +8803,9 @@ b
 \end{tabularx}
 
 \index[fn]{followed@\texttt{followed}}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily Various deff lines
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8813,16 +8813,16 @@ b
 \end{tabularx}
 
 \index[fn]{after@\texttt{after}}%
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
+\end{Texinfopreformatted}
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{\GNUTexinfocommandstyletextvar{invalid} 
\EmbracOn{}\textnormal{\textsl{a g}}\EmbracOff{}}& [fsetinv]
+\texttt{\Texinfocommandstyletextvar{invalid} \EmbracOn{}\textnormal{\textsl{a 
g}}\EmbracOff{}}& [fsetinv]
 \end{tabularx}
 
-\index[fn]{invalid@\texttt{\GNUTexinfocommandstyletextvar{invalid}}}%
+\index[fn]{invalid@\texttt{\Texinfocommandstyletextvar{invalid}}}%
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
@@ -8848,13 +8848,13 @@ b
 \texttt{}& [truc]
 \end{tabularx}
 
-\begin{GNUTexinfopreformatted}%
+\begin{Texinfopreformatted}%
 \ttfamily 
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily g{-}{-}roupe
-\end{GNUTexinfopreformatted}
-\begin{GNUTexinfopreformatted}%
+\end{Texinfopreformatted}
+\begin{Texinfopreformatted}%
 \ttfamily 
 \texttt{@ref\{node\}}\ node
 
@@ -8894,8 +8894,8 @@ b
 \texttt{@inforef\{\}}\ 
 
 
-\end{GNUTexinfopreformatted}
-\end{GNUTexinfoindented}
+\end{Texinfopreformatted}
+\end{Texinfoindented}
 
 \index[cp]{t-ruc@t--ruc}%
 \index[cp]{T-ruc@T--ruc}%
@@ -8928,7 +8928,7 @@ b
 
 \index[fn]{@\texttt{\hbox{}}}%
 
-\index[codeidx]{a index---entry te\~{} --- i\^{}@\texttt{a 
\GNUTexinfocommandstyletextvar{index---entry}\ t\~{e}\ {-}{-}{-} \^{\i{}}}}%
+\index[codeidx]{a index---entry te\~{} --- i\^{}@\texttt{a 
\Texinfocommandstyletextvar{index---entry}\ t\~{e}\ {-}{-}{-} \^{\i{}}}}%
 
 \index[truc]{truc@truc}%
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]