texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Do not protect ] in LaTeX


From: Gavin D. Smith
Subject: branch master updated: Do not protect ] in LaTeX
Date: Sun, 07 Aug 2022 06:35:56 -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 30227c850c Do not protect ] in LaTeX
30227c850c is described below

commit 30227c850c3430b6bf2ebf1f4d95d67b611ffd9a
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Aug 7 11:35:10 2022 +0100

    Do not protect ] in LaTeX
    
    * tp/Texinfo/Convert/LaTeX.pm (_protect_text): Do nothing for ].
    Protecting it interfered with the operation of the embrac package.
    Report from Patrice.
    (_convert) <heading commands>: Wrap argument in extra layer of
    braces to avoid buggy treatment of square brackets in a section
    title.  The problems occur when the titleps package in is use.
---
 ChangeLog                                          | 11 ++++
 tp/Texinfo/Convert/LaTeX.pm                        |  8 +--
 .../results/converters_tests/at_commands_in_raw.pl |  2 +-
 .../res_latex/definition_commands.tex              | 72 +++++++++++-----------
 .../results/converters_tests/footnote_no_number.pl |  2 +-
 .../footnote_no_number_separate.pl                 |  2 +-
 tp/t/results/converters_tests/image_formatting.pl  |  2 +-
 tp/t/results/converters_tests/non_empty_part.pl    | 20 +++---
 .../printindex_merged_indices_code_style.tex       |  2 +-
 tp/t/results/converters_tests/ref_in_sectioning.pl | 30 ++++-----
 .../res_latex/references_to_top_no_top_output.tex  |  2 +-
 tp/t/results/converters_tests/refs_formatting.pl   |  2 +-
 .../some_at_commands_in_ref_nodes.pl               |  2 +-
 .../converters_tests/test_deftypefnnewline.pl      |  2 +-
 .../converters_tests/things_before_setfilename.pl  |  2 +-
 tp/t/results/formats_encodings/accentenc.pl        |  2 +-
 .../res_latex/char_latin1_latin1_in_refs.tex       | 10 +--
 .../def_syn_indices/res_latex/def_syn_indices.tex  |  2 +-
 .../res_latex/double_seeentry_seealso.tex          |  2 +-
 .../indices/seeentry/res_latex/seeentry.tex        |  2 +-
 .../indices/subentries/res_latex/subentries.tex    |  2 +-
 .../res_latex/subentry_and_sortas.tex              |  2 +-
 .../res_latex/syncode_index_print_both.tex         |  2 +-
 .../res_latex/inter_item_commands_in_enumerate.tex |  2 +-
 .../res_latex/inter_item_commands_in_itemize.tex   |  2 +-
 .../res_latex/multiple_lang_chapters.tex           | 10 +--
 tp/t/results/latex_tests/anchor_before_top.pl      |  2 +-
 tp/t/results/latex_tests/anchor_in_copying.pl      |  2 +-
 .../anchor_in_copying_insertcopying_chap.pl        |  2 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |  2 +-
 ...chor_in_copying_insertcopying_titlepage_chap.pl |  2 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |  2 +-
 ...anchor_links_xref_xrefautomaticsectiontitle.tex |  2 +-
 tp/t/results/latex_tests/combined_fonts.pl         |  2 +-
 .../combined_fonts/res_latex/combined_fonts.tex    |  2 +-
 tp/t/results/latex_tests/custom_headings.pl        |  8 +--
 .../custom_headings/res_latex/custom_headings.tex  |  8 +--
 .../latex_tests/error_in_sectioning_command.pl     |  2 +-
 .../res_latex/error_in_sectioning_command.tex      |  2 +-
 tp/t/results/latex_tests/float_and_refs.pl         |  6 +-
 .../float_and_refs/res_latex/float_and_refs.tex    |  6 +-
 tp/t/results/latex_tests/fonttextsize.pl           | 12 ++--
 .../fonttextsize/res_latex/fonttextsize.tex        | 12 ++--
 tp/t/results/latex_tests/indices.pl                |  2 +-
 .../latex_tests/indices/res_latex/indices.tex      |  2 +-
 .../informative_commands_in_top_node.pl            |  2 +-
 .../res_latex/informative_commands_in_top_node.tex |  2 +-
 tp/t/results/latex_tests/node_before_top.pl        |  2 +-
 tp/t/results/latex_tests/pagesizes.pl              |  4 +-
 .../latex_tests/pagesizes/res_latex/pagesizes.tex  |  4 +-
 tp/t/results/latex_tests/pagetype.pl               |  4 +-
 .../latex_tests/pagetype/res_latex/pagetype.tex    |  4 +-
 tp/t/results/latex_tests/settitle_and_headings.pl  |  2 +-
 .../res_latex/settitle_and_headings.tex            |  2 +-
 tp/t/results/latex_tests/shorttitlepage.pl         |  2 +-
 .../shorttitlepage/res_latex/shorttitlepage.tex    |  2 +-
 tp/t/results/latex_tests/titlepage_classical.pl    |  2 +-
 .../res_latex/titlepage_classical.tex              |  2 +-
 tp/t/results/latex_tests/titlepage_in_top_node.pl  |  2 +-
 .../res_latex/titlepage_in_top_node.tex            |  2 +-
 tp/t/results/latex_tests/titlepage_long_title.pl   |  2 +-
 .../res_latex/titlepage_long_title.tex             |  2 +-
 tp/t/results/latex_tests/titlepage_no_author.pl    |  2 +-
 .../res_latex/titlepage_no_author.tex              |  2 +-
 tp/t/results/latex_tests/titlepage_no_title.pl     |  2 +-
 .../res_latex/titlepage_no_title.tex               |  2 +-
 .../titlepage_with_commands_classical.pl           |  2 +-
 .../titlepage_with_commands_classical.tex          |  2 +-
 .../latex_tests/top_no_sectioning_command.pl       |  2 +-
 tp/t/results/sectioning/chapter_between_nodes.pl   |  2 +-
 .../res_latex/chapter_between_nodes.tex            |  2 +-
 tp/t/results/sectioning/lone_Top_node.pl           |  2 +-
 .../lone_Top_node/res_latex/lone_Top_node.tex      |  2 +-
 .../sectioning/node_sectop_before_lone_node_Top.pl |  4 +-
 .../res_latex/node_sectop_before_lone_node_Top.tex |  4 +-
 tp/t/results/sectioning/nodes_before_after_top.pl  |  2 +-
 .../res_latex/nodes_before_after_top.tex           |  2 +-
 .../sectioning/nodes_before_after_top_xref.pl      |  2 +-
 .../res_latex/nodes_before_after_top_xref.tex      |  2 +-
 tp/t/results/sectioning/nodes_before_top.pl        |  2 +-
 .../res_latex/nodes_before_top.tex                 |  2 +-
 .../sectioning/section_before_after_top_node.pl    |  2 +-
 .../res_latex/section_before_after_top_node.tex    |  2 +-
 .../section_before_after_top_node_last_node.pl     |  2 +-
 .../section_before_after_top_node_last_node.tex    |  2 +-
 .../sectioning/section_chapter_before_top_nodes.pl |  4 +-
 .../res_latex/section_chapter_before_top_nodes.tex |  4 +-
 tp/t/results/sectioning/top_node_part_top.pl       |  8 +--
 tp/t/results/sectioning/two_nodes_at_the_end.pl    |  2 +-
 .../unnumbered_top_without_node_sections.pl        |  6 +-
 .../res_latex/inter_item_commands_in_table.tex     |  2 +-
 .../indices_in_begin_tables_lists.tex              |  4 +-
 .../indices_in_begin_tables_lists.tex              |  4 +-
 .../res_parser/formatting_latex/formatting.tex     | 62 +++++++++----------
 94 files changed, 238 insertions(+), 227 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2e71e7458..0e863de637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-08-06  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       Do not protect ] in LaTeX
+
+       * tp/Texinfo/Convert/LaTeX.pm (_protect_text): Do nothing for ].
+       Protecting it interfered with the operation of the embrac package.
+       Report from Patrice.
+       (_convert) <heading commands>: Wrap argument in extra layer of
+       braces to avoid buggy treatment of square brackets in a section
+       title.  The problems occur when the titleps package in is use.
+
 2022-08-07  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 45b238c88f..0f3056abaa 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1628,8 +1628,6 @@ sub _protect_text($$)
 
     $text =~ s/\x08/\\textbackslash{}/g;
 
-    $text =~ s/]/{]}/g;
-
     if ($self->{'formatting_context'}->[-1]->{'index'}) {
       $text = _protect_index_text($text);
     }
@@ -3203,10 +3201,12 @@ sub _convert($$)
           die "BUG: no section_map for $cmdname"
                      if (not defined($section_map{$cmdname}));
           if ($cmdname ne 'centerchap') {
-            $result .= "\\".$section_cmd."{$heading}\n";
+            $result .= "\\".$section_cmd."{{$heading}}\n";
           } else {
-            $result .= "\\".$section_cmd."{\\centering $heading}\n";
+            $result .= "\\".$section_cmd."{{\\centering $heading}}\n";
           }
+          # NOTE we used an extra layer of { } to avoid buggy interactions with
+          # square brackets when the titleps package is being used.
         }
         # 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 c43529bfa1..d3bbc25848 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -1570,7 +1570,7 @@ $result_converted{'docbook'}->{'at_commands_in_raw'} = 
'<chapter label="1" id="c
 
 
 $result_converted{'latex'}->{'at_commands_in_raw'} = '\\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chap}%
 
 <b>in b\\footnote{in footnote}.</b>
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 d2e396c0c9..7dcbf2f2bf 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
@@ -68,7 +68,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chapter}
+\chapter{{chapter}}
 \label{anchor:chapter}%
 
 \noindent\texttt{fname \EmbracOn{}\textnormal{\textsl{a---rg1 
a--rg2}}\EmbracOff{}}\hfill[Func]
@@ -98,36 +98,36 @@ deffn explict var for \textsl{a---rg1} and \textsl{a--rg2}
 deffn r slanted for \textsl{a---rg1} and \textsl{a--rg2}
 \end{quote}
 
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var [from to 
[inc{]}{]}) default}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var [from to [inc]]) 
default}}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{[}\EmbracOn{}from to 
\EmbracOff{}\textnormal{[}\EmbracOn{}inc\EmbracOff{}\textnormal{{]}{]}}\EmbracOn{})
 r}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{[}\EmbracOn{}from to 
\EmbracOff{}\textnormal{[}\EmbracOn{}inc\EmbracOff{}\textnormal{]]}\EmbracOn{}) 
r}}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{{]}{]}}) slanted}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var \textsl{[}from to 
\textsl{[}inc\textsl{]]}) slanted}}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{{]}{]}}) 
code}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
code}}\EmbracOff{}}\hfill[Special Form]
 
 
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{{]}{]}}) 
t}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{[}from to \texttt{[}inc\texttt{]]}) 
t}}\EmbracOff{}}\hfill[Special Form]
 
 
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{[}}from to 
\texttt{\textbf{[}}inc\texttt{\textbf{{]}{]}}}) 
t:b}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracMakeKnown{texttt}\texttt{\EmbracMakeKnown{textbf}\textbf{[}}from to 
\texttt{\textbf{[}}inc\texttt{\textbf{]]}}) t:b}}\EmbracOff{}}\hfill[Special 
Form]
 
 
 \ExplSyntaxOn%
@@ -135,17 +135,17 @@ deffn r slanted for \textsl{a---rg1} and \textsl{a--rg2}
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{{]}{]}}}\EmbracOn{})
 r:slanted}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\textsl{]]}}\EmbracOn{})
 r:slanted}}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{{]}{]}}}\EmbracOn{})
 r:code}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:code}}\EmbracOff{}}\hfill[Special Form]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{{]}{]}}}\EmbracOn{})
 r:t}}\EmbracOff{}}\hfill[Special Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{(var 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}from to 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{}inc\EmbracOff{}\textnormal{\texttt{]]}}\EmbracOn{})
 r:t}}\EmbracOff{}}\hfill[Special Form]
 
 
 
@@ -220,7 +220,7 @@ separators
 name
 \end{quote}
 
-\noindent\texttt{\texttt{.ft} 
\EmbracOn{}\textnormal{\textsl{[\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}{]}}}\EmbracOff{}}\hfill[Request]
+\noindent\texttt{\texttt{.ft} 
\EmbracOn{}\textnormal{\textsl{[\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}]}}\EmbracOff{}}\hfill[Request]
 
 
 
@@ -235,32 +235,32 @@ name
 
 
 
\index[fn]{\textbackslash{}f(fn@\texttt{\texttt{\textbackslash{}f(}\textnormal{\textsl{fn}}\texttt{}}}%
-\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{{]}}
 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{{]}}}}\EmbracOff{}}\hfill[Escape\hbox{}sequence]
+\noindent\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}
 
\EmbracOn{}\textnormal{\textsl{\EmbracMakeKnown{texttt}\texttt{\textbackslash{}f[}\EmbracOff{}\textnormal{\textsl{font}}\EmbracOn{}\texttt{]}}}\EmbracOff{}}\hfill[Escape\hbox{}sequence]
 
 
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
-\index[fn]{\textbackslash{}f[font{]}@\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{{]}}}}%
-\noindent\texttt{\texttt{\textbackslash{}n[.sty{]}}}\hfill[Register]
+\index[fn]{\textbackslash{}f[font]@\texttt{\texttt{\textbackslash{}f[}\textnormal{\textsl{font}}\texttt{]}}}%
+\noindent\texttt{\texttt{\textbackslash{}n[.sty]}}\hfill[Register]
 
 
 
-\index[fn]{\textbackslash{}n[.sty{]}@\texttt{\texttt{\textbackslash{}n[.sty{]}}}}%
+\index[fn]{\textbackslash{}n[.sty]@\texttt{\texttt{\textbackslash{}n[.sty]}}}%
 \begin{quote}
 The \texttt{ft} request and the \texttt{\textbackslash{}f} escape change the 
current font
 to \textsl{font} (one-character name\hbox{}\textsl{f}, two-character name
 \textsl{fn}).
 \end{quote}
 
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[} 
\EmbracMakeKnown{texttt}\texttt{[} \texttt{[} 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} , 
\EmbracOff{}\textnormal{,}\EmbracOn{} \textsl{,} \texttt{,} \texttt{,} 
\EmbracOff{}\textnormal{\textsl{,}}\EmbracOn{} \EmbracOff{}\textnormal [...]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[ 
\EmbracOff{}\textnormal{[}\EmbracOn{} \textsl{[} 
\EmbracMakeKnown{texttt}\texttt{[} \texttt{[} 
\EmbracOff{}\textnormal{\textsl{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[}}\EmbracOn{} , 
\EmbracOff{}\textnormal{,}\EmbracOn{} \textsl{,} \texttt{,} \texttt{,} 
\EmbracOff{}\textnormal{\textsl{,}}\EmbracOn{} \EmbracOff{}\textnormal [...]
 
 
 \ExplSyntaxOn%
 
\cs_undefine:N{\embrac_texttt:nn}\cs_undefine:N{\embrac_orig_texttt:n}\cs_undefine:N{\__embrac_texttt:n}%
 \ExplSyntaxOff%
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[{]} 
\EmbracOff{}\textnormal{[{]}}\EmbracOn{} \textsl{[{]}} 
\EmbracMakeKnown{texttt}\texttt{[{]}} \texttt{[{]}} 
\EmbracOff{}\textnormal{\textsl{[{]}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[{]}}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[{]}}}}\EmbracOn{}}}\EmbracOff{}}\hfill[Special
 Form]
+\noindent\texttt{foobar \EmbracOn{}\textnormal{\textsl{[] 
\EmbracOff{}\textnormal{[]}\EmbracOn{} \textsl{[]} 
\EmbracMakeKnown{texttt}\texttt{[]} \texttt{[]} 
\EmbracOff{}\textnormal{\textsl{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{[]}}\EmbracOn{} 
\EmbracOff{}\textnormal{\texttt{\textsl{[]}}}\EmbracOn{}}}\EmbracOff{}}\hfill[Special
 Form]
 
 
 \ExplSyntaxOn%
@@ -337,7 +337,7 @@ test formatting of separators
 explicit keyword marking, no var \textsl{function} with \textsl{arguments}
 \end{quote}
 
-\noindent\texttt{name \EmbracOn{}\textnormal{\textsl{argument 
\EmbracMakeKnown{texttt}\texttt{int} \texttt{a{-}{-}b} \textsl{v--ar1}, word 
\texttt{{-}{-}} (\texttt{type o{-}{-}ther}, \textsl{v---ar2}  [\texttt{float} 
[\textsl{var4}{]}{]})}}\EmbracOff{}}\hfill[Category]
+\noindent\texttt{name \EmbracOn{}\textnormal{\textsl{argument 
\EmbracMakeKnown{texttt}\texttt{int} \texttt{a{-}{-}b} \textsl{v--ar1}, word 
\texttt{{-}{-}} (\texttt{type o{-}{-}ther}, \textsl{v---ar2}  [\texttt{float} 
[\textsl{var4}]])}}\EmbracOff{}}\hfill[Category]
 
 
 \ExplSyntaxOn%
@@ -348,47 +348,47 @@ explicit keyword marking, no var \textsl{function} with 
\textsl{arguments}
 In deffn with code and var used
 \end{quote}
 
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}{]}) default}\hfill[Library Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) default}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{[}, float 
\textsl{b{-}{-}ar}\textnormal{{]}}) r}\hfill[Library Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{[}, float 
\textsl{b{-}{-}ar}\textnormal{]}) r}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textsl{[}, float 
\textsl{b{-}{-}ar}\textsl{{]}}) slanted}\hfill[Library Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textsl{[}, float 
\textsl{b{-}{-}ar}\textsl{]}) slanted}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{[}, float 
\textsl{b{-}{-}ar}\texttt{{]}}) code}\hfill[Library Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{[}, float 
\textsl{b{-}{-}ar}\texttt{]}) code}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{[}, float 
\textsl{b{-}{-}ar}\texttt{{]}}) t}\hfill[Library Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{[}, float 
\textsl{b{-}{-}ar}\texttt{]}) t}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{\textbf{[}}, 
float \textsl{b{-}{-}ar}\texttt{\textbf{{]}}}) t:b}\hfill[Library Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\texttt{\textbf{[}}, 
float \textsl{b{-}{-}ar}\texttt{\textbf{]}}) t:b}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\textsl{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\textsl{{]}}}) r:slanted}\hfill[Library 
Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\textsl{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\textsl{]}}) r:slanted}\hfill[Library 
Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\texttt{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\texttt{{]}}}) r:code}\hfill[Library 
Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\texttt{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\texttt{]}}) r:code}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\texttt{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\texttt{{]}}}) r:t}\hfill[Library Function]
+\noindent\texttt{int foobar (int \textsl{f{-}{-}{-}oo}\textnormal{\texttt{[}}, 
float \textsl{b{-}{-}ar}\textnormal{\texttt{]}}) r:t}\hfill[Library Function]
 
 
 
@@ -397,47 +397,47 @@ In deffn with code and var used
 separators
 \end{quote}
 
-\noindent\texttt{int foobar (i{-}{-}nt \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}{]}) default}\hfill[Library Function]
+\noindent\texttt{int foobar (i{-}{-}nt \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) default}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{i--nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}{]}) r}\hfill[Library Function]
+\noindent\texttt{int foobar (\textnormal{i--nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) r}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textsl{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}{]}) slanted}\hfill[Library Function]
+\noindent\texttt{int foobar (\textsl{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) slanted}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\texttt{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}{]}) code}\hfill[Library Function]
+\noindent\texttt{int foobar (\texttt{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) code}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\texttt{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}{]}) t}\hfill[Library Function]
+\noindent\texttt{int foobar (\texttt{i{-}{-}nt} \textsl{f{-}{-}{-}oo}[, float 
\textsl{b{-}{-}ar}]) t}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\texttt{\textbf{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}{]}) t:b}\hfill[Library 
Function]
+\noindent\texttt{int foobar (\texttt{\textbf{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) t:b}\hfill[Library Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{\textsl{i--nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}{]}) r:slanted}\hfill[Library 
Function]
+\noindent\texttt{int foobar (\textnormal{\textsl{i--nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) r:slanted}\hfill[Library 
Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}{]}) r:code}\hfill[Library 
Function]
+\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) r:code}\hfill[Library 
Function]
 
 
 
 \index[fn]{foobar@\texttt{foobar}}%
-\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}{]}) r:t}\hfill[Library 
Function]
+\noindent\texttt{int foobar (\textnormal{\texttt{i{-}{-}nt}} 
\textsl{f{-}{-}{-}oo}[, float \textsl{b{-}{-}ar}]) r:t}\hfill[Library Function]
 
 
 
diff --git a/tp/t/results/converters_tests/footnote_no_number.pl 
b/tp/t/results/converters_tests/footnote_no_number.pl
index c7caee8833..7577e299fb 100644
--- a/tp/t/results/converters_tests/footnote_no_number.pl
+++ b/tp/t/results/converters_tests/footnote_no_number.pl
@@ -495,7 +495,7 @@ $result_converted{'docbook'}->{'footnote_no_number'} = 
'<chapter label="1" id="c
 
 
 $result_converted{'latex'}->{'footnote_no_number'} = '\\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chap}%
 
 Para\\footnote{Footnote 1.}.
diff --git a/tp/t/results/converters_tests/footnote_no_number_separate.pl 
b/tp/t/results/converters_tests/footnote_no_number_separate.pl
index 6a5e266122..801b486a0f 100644
--- a/tp/t/results/converters_tests/footnote_no_number_separate.pl
+++ b/tp/t/results/converters_tests/footnote_no_number_separate.pl
@@ -495,7 +495,7 @@ 
$result_converted{'docbook'}->{'footnote_no_number_separate'} = '<chapter label=
 
 
 $result_converted{'latex'}->{'footnote_no_number_separate'} = 
'\\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chap}%
 
 Para\\footnote{Footnote 1.}.
diff --git a/tp/t/results/converters_tests/image_formatting.pl 
b/tp/t/results/converters_tests/image_formatting.pl
index 3c67915a90..2eecad5497 100644
--- a/tp/t/results/converters_tests/image_formatting.pl
+++ b/tp/t/results/converters_tests/image_formatting.pl
@@ -3022,7 +3022,7 @@ $result_converted_errors{'docbook'}->{'image_formatting'} 
= [
 
 
 $result_converted{'latex'}->{'image_formatting'} = '\\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chap}%
 
 \\texttt{@image\\{f{-}{-}ile\\}} \\includegraphics{f--ile}
diff --git a/tp/t/results/converters_tests/non_empty_part.pl 
b/tp/t/results/converters_tests/non_empty_part.pl
index 55f4147d32..c953a18ee2 100644
--- a/tp/t/results/converters_tests/non_empty_part.pl
+++ b/tp/t/results/converters_tests/non_empty_part.pl
@@ -1778,39 +1778,39 @@ $result_converted{'docbook'}->{'non_empty_part'} = 
'<part label="">
 
 
 $result_converted{'latex'}->{'non_empty_part'} = '\\label{anchor:Top}%
-\\part{part I}
+\\part{{part I}}
 
 Content I
 
-\\chapter{chap in Top node}
+\\chapter{{chap in Top node}}
 
-\\part{Part II}
+\\part{{Part II}}
 
 Content II
 
-\\part{part III}
+\\part{{part III}}
 
 Content III
 
-\\chapter{chapter with part node}
+\\chapter{{chapter with part node}}
 \\label{anchor:part-chapter-node}%
 
-\\part{Part IV}
+\\part{{Part IV}}
 
 Content IV
 
-\\part{Part V}
+\\part{{Part V}}
 
 Content V
 
-\\chapter{with part no node}
+\\chapter{{with part no node}}
 
-\\part{Part VI}
+\\part{{Part VI}}
 
 Content VI
 
 
-\\chapter{chapter after part node}
+\\chapter{{chapter after part node}}
 \\label{anchor:node-between-part-and-chapter}%
 
 ';
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 8d2eb7d751..d9e53b4752 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
@@ -60,7 +60,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chap}%
 
 
diff --git a/tp/t/results/converters_tests/ref_in_sectioning.pl 
b/tp/t/results/converters_tests/ref_in_sectioning.pl
index f90f911639..7c5f6a6b5a 100644
--- a/tp/t/results/converters_tests/ref_in_sectioning.pl
+++ b/tp/t/results/converters_tests/ref_in_sectioning.pl
@@ -2982,37 +2982,37 @@ $result_converted{'docbook'}->{'ref_in_sectioning'} = 
'<chapter label="1" id="no
 
 $result_converted{'latex'}->{'ref_in_sectioning'} = '
 \\label{anchor:Top}%
-\\chapter{See Section ``title\'\' in \\textsl{Manual}.}
+\\chapter{{See Section ``title\'\' in \\textsl{Manual}.}}
 \\label{anchor:node}%
 
-\\chapter{\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node}
 [node], page~\\pageref*{anchor:node}}}{node} just node}
+\\chapter{{\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node}
 [node], page~\\pageref*{anchor:node}}}{node} just node}}
 \\label{anchor:chap}%
 
-\\section{for example 
\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node} 
[node], page~\\pageref*{anchor:node}}}{node} (\\texorpdfstring{see 
\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node} [node], 
page~\\pageref*{anchor:node}}}{see node}) (see Section ``Top\'\' in 
\\textsl{Manual})}
+\\section{{for example 
\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node} 
[node], page~\\pageref*{anchor:node}}}{node} (\\texorpdfstring{see 
\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node} [node], 
page~\\pageref*{anchor:node}}}{see node}) (see Section ``Top\'\' in 
\\textsl{Manual})}}
 
-\\section{\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node}
 [node], page~\\pageref*{anchor:node}}}{node}  node, crossref arg2}
+\\section{{\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node}
 [node], page~\\pageref*{anchor:node}}}{node}  node, crossref arg2}}
 
-\\section{\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node}
 [`\\texttt{title}\'], page~\\pageref*{anchor:node}}}{`\\texttt{title}\'}  code 
node, samptitle arg3}
+\\section{{\\texorpdfstring{\\hyperref[anchor:node]{\\chaptername~\\ref*{anchor:node}
 [`\\texttt{title}\'], page~\\pageref*{anchor:node}}}{`\\texttt{title}\'}  code 
node, samptitle arg3}}
 
-\\section{Section ``\\texttt{node}\'\' in \\texttt{file name} code node, file 
name}
+\\section{{Section ``\\texttt{node}\'\' in \\texttt{file name} code node, file 
name}}
 
-\\section{Section ``node\'\' in \\textsl{Manual} node and manual}
+\\section{{Section ``node\'\' in \\textsl{Manual} node and manual}}
 
-\\section{Section ``Top\'\' in \\textsl{Manual} Top and manual}
+\\section{{Section ``Top\'\' in \\textsl{Manual} Top and manual}}
 
-\\section{\\textsl{Manual} no node just manual}
+\\section{{\\textsl{Manual} no node just manual}}
 
-\\section{\\texttt{file name} no node just file name}
+\\section{{\\texttt{file name} no node just file name}}
 
-\\section{Section ``a\'\' in \\texttt{c} inforef a b c}
+\\section{{Section ``a\'\' in \\texttt{c} inforef a b c}}
 
-\\section{(see Section ``Top\'\' in \\texttt{file name}) pxref Top file name, 
spaces}
+\\section{{(see Section ``Top\'\' in \\texttt{file name}) pxref Top file name, 
spaces}}
 
-\\section{(see \\texttt{file name}) pxref file name only, spaces}
+\\section{{(see \\texttt{file name}) pxref file name only, spaces}}
 
-\\section{See Section ``Top\'\' in \\texttt{filename}, xref Top filename only, 
no spaces}
+\\section{{See Section ``Top\'\' in \\texttt{filename}, xref Top filename 
only, no spaces}}
 
-\\section{See \\texttt{filename}. xref filename only, no spaces}
+\\section{{See \\texttt{filename}. xref filename only, no spaces}}
 
 ';
 
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 e40922a84a..2fcdf28de0 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
@@ -69,7 +69,7 @@
 \label{anchor:a-in-paragraph-in-top}%
 \label{anchor:a-in-float}%
 \label{anchor:My-Flist}%
-\chapter{Chap}
+\chapter{{Chap}}
 \label{anchor:chapter}%
 
 see \hyperref[anchor:a-in-copying]{[a in copying], 
page~\pageref*{anchor:a-in-copying}}.
diff --git a/tp/t/results/converters_tests/refs_formatting.pl 
b/tp/t/results/converters_tests/refs_formatting.pl
index 5b64ef3edf..92f999cbee 100644
--- a/tp/t/results/converters_tests/refs_formatting.pl
+++ b/tp/t/results/converters_tests/refs_formatting.pl
@@ -4584,7 +4584,7 @@ $result_converted{'docbook'}->{'refs_formatting'} = 
'<chapter label="1" id="chap
 ';
 
 
-$result_converted{'latex'}->{'refs_formatting'} = '\\chapter{chapter}
+$result_converted{'latex'}->{'refs_formatting'} = '\\chapter{{chapter}}
 \\label{anchor:chapter}%
 
 \\texttt{@ref\\{chapter,cross ref name\\}} 
\\hyperref[anchor:chapter]{\\chaptername~\\ref*{anchor:chapter} [chapter], 
page~\\pageref*{anchor:chapter}}
diff --git a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl 
b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
index b88d631335..4bdaa85471 100644
--- a/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
+++ b/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl
@@ -2292,7 +2292,7 @@ 
$result_converted{'docbook'}->{'some_at_commands_in_ref_nodes'} = '<chapter labe
 
 $result_converted{'latex'}->{'some_at_commands_in_ref_nodes'} = '
 \\label{anchor:Top}%
-\\chapter{A \\textsc{sc} node \\"{i} \\"{\\i{}} \\`{\\={E}} \\l{} \\c{\\\'{C}} 
\\textexclamdown{}}
+\\chapter{{A \\textsc{sc} node \\"{i} \\"{\\i{}} \\`{\\={E}} \\l{} 
\\c{\\\'{C}} \\textexclamdown{}}}
 \\label{anchor:A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1}%
 
 see Section ``a \\textbf{strong} ref with \\textsc{sc}, a i trema \\"{i}, a 
dotless i trema \\"{\\i{}} \\`{\\={E}} and exclamdown \\textexclamdown{}\'\' in 
\\texttt{manual}.
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index c66f173721..4d18b580bb 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -3620,7 +3620,7 @@ $result_converted{'docbook'}->{'test_deftypefnnewline'} = 
'<chapter label="1" id
 $result_converted{'latex'}->{'test_deftypefnnewline'} = '
 
 \\label{anchor:Top}%
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:chapter}%
 
 \\noindent\\texttt{data-type\\leavevmode{}\\\\name 
arguments...}\\hfill[Function]
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 2a49694dcd..d4f06facf2 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -1772,7 +1772,7 @@ $result_converted{'latex'}->{'things_before_setfilename'} 
= '
 \\begin{document}
 \\tableofcontents\\newpage
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chap}%
 
 Ref to anchor
diff --git a/tp/t/results/formats_encodings/accentenc.pl 
b/tp/t/results/formats_encodings/accentenc.pl
index b3226756a1..3456cd4c95 100644
--- a/tp/t/results/formats_encodings/accentenc.pl
+++ b/tp/t/results/formats_encodings/accentenc.pl
@@ -3548,7 +3548,7 @@ $result_converted{'docbook'}->{'accentenc'} = '<chapter 
label="" id="Top-node">
 
 $result_converted{'latex'}->{'accentenc'} = '
 \\begin{document}
-\\part*{top}
+\\part*{{top}}
 \\label{anchor:Top-node}%
 
 should be e`: \\`{e} \\`{e}
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 e22d7f2bae..6e01ad53c4 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
@@ -62,21 +62,21 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{� � � � � � � � � � �}
+\chapter{{� � � � � � � � � � �}}
 
\label{anchor:_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}%
 
 \printindex[cp]
 
-\chapter{�}
+\chapter{{�}}
 \label{anchor:_00e9}%
 
-\chapter{� � �}
+\chapter{{� � �}}
 \label{anchor:_00e0-_00e8-_00f9}%
 
-\chapter{� � � � � � � � � �}
+\chapter{{� � � � � � � � � �}}
 \label{anchor:_00e2-_00ea-_00ee-_00f4-_00fb-_00c2-_00ca-_00ce-_00d4-_00db}%
 
-\chapter{�}
+\chapter{{�}}
 \label{anchor:_00e7}%
 
 
\hyperref[anchor:_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc]{\chaptername~\ref*{anchor:_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}
 [� � � � � � � � � � �], 
page~\pageref*{anchor:_00e4-_00eb-_00ef-_00f6-_00fc-_00ff-_00c4-_00cb-_00cf-_00d6-_00dc}}
diff --git a/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex 
b/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
index f0dd66041b..1f1c9ee64d 100644
--- a/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
+++ b/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
@@ -64,7 +64,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Index}
+\chapter{{Index}}
 \label{anchor:Chapter-index}%
 
 definedx truc
diff --git 
a/tp/t/results/indices/double_seeentry_seealso/res_latex/double_seeentry_seealso.tex
 
b/tp/t/results/indices/double_seeentry_seealso/res_latex/double_seeentry_seealso.tex
index d6656c27e5..5dabc165b5 100644
--- 
a/tp/t/results/indices/double_seeentry_seealso/res_latex/double_seeentry_seealso.tex
+++ 
b/tp/t/results/indices/double_seeentry_seealso/res_latex/double_seeentry_seealso.tex
@@ -58,7 +58,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Chapter Index}
+\chapter{{Chapter Index}}
 \label{anchor:node-index}%
 
 \index[cp]{aaa|see{ccc}}%
diff --git a/tp/t/results/indices/seeentry/res_latex/seeentry.tex 
b/tp/t/results/indices/seeentry/res_latex/seeentry.tex
index 4d651930e1..5c2989cda7 100644
--- a/tp/t/results/indices/seeentry/res_latex/seeentry.tex
+++ b/tp/t/results/indices/seeentry/res_latex/seeentry.tex
@@ -58,7 +58,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Index}
+\chapter{{Index}}
 \label{anchor:chapter-index}%
 
 \index[cp]{aaa|see{bbb}}%
diff --git a/tp/t/results/indices/subentries/res_latex/subentries.tex 
b/tp/t/results/indices/subentries/res_latex/subentries.tex
index 565dbf1520..9eb232390a 100644
--- a/tp/t/results/indices/subentries/res_latex/subentries.tex
+++ b/tp/t/results/indices/subentries/res_latex/subentries.tex
@@ -62,7 +62,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Index}
+\chapter{{Index}}
 \label{anchor:chapter-index}%
 
 \index[cp]{a---a}%
diff --git 
a/tp/t/results/indices/subentry_and_sortas/res_latex/subentry_and_sortas.tex 
b/tp/t/results/indices/subentry_and_sortas/res_latex/subentry_and_sortas.tex
index d0db68c2df..903fe37b00 100644
--- a/tp/t/results/indices/subentry_and_sortas/res_latex/subentry_and_sortas.tex
+++ b/tp/t/results/indices/subentry_and_sortas/res_latex/subentry_and_sortas.tex
@@ -62,7 +62,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Index}
+\chapter{{Index}}
 \label{anchor:chapter-index}%
 
 \index[cp]{A---S@aaa!B---S1@bbb}%
diff --git 
a/tp/t/results/indices/syncode_index_print_both/res_latex/syncode_index_print_both.tex
 
b/tp/t/results/indices/syncode_index_print_both/res_latex/syncode_index_print_both.tex
index 9937cf32d3..626fe64c98 100644
--- 
a/tp/t/results/indices/syncode_index_print_both/res_latex/syncode_index_print_both.tex
+++ 
b/tp/t/results/indices/syncode_index_print_both/res_latex/syncode_index_print_both.tex
@@ -62,7 +62,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{index}
+\chapter{{index}}
 \label{anchor:chapter-index}%
 
 \index[cp]{c---oncept}%
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 75a8804edc..63aaeec5da 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
@@ -65,7 +65,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chapter}%
 
 \begin{enumerate}[start=1]
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 d16f97ed04..170192c941 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
@@ -65,7 +65,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chapter}%
 
 \begin{itemize}[label=-]
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 3eb4beefce..3412ffcb25 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
@@ -78,7 +78,7 @@
 \begin{document}
 \label{anchor:Top}%
 \selectlanguage{ja}%
-\chapter{ja}
+\chapter{{ja}}
 \label{anchor:chapter-ja}%
 
 In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
@@ -89,7 +89,7 @@ In japanese. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-
 \index[vr]{BBB of AAA@\texttt{BBB of AAA}}%
 
 \selectlanguage{en}%
-\chapter{en}
+\chapter{{en}}
 \label{anchor:chapter-en}%
 
 In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
@@ -100,7 +100,7 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \index[vr]{BBB of AAA@\texttt{BBB of AAA}}%
 
 \selectlanguage{fr-FR}%
-\chapter{fr\_FR}
+\chapter{{fr\_FR}}
 \label{anchor:chapter-fr_005fFR}%
 
 \noindent\texttt{BBB 
\EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}\hfill[Variable d'instance of 
\texttt{AAA}]
@@ -110,11 +110,11 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 \index[vr]{BBB of AAA@\texttt{BBB of AAA}}%
 
 \selectlanguage{de}%
-\chapter{de}
+\chapter{{de}}
 \label{anchor:chapter-de}%
 
 \selectlanguage{pt-BR}%
-\chapter{pt\_bR}
+\chapter{{pt\_bR}}
 \label{anchor:chapter-pt_005fBR}%
 
 In brazilian. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-ja} [chapter 
ja], page~\pageref*{anchor:chapter-ja}}.
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index 45e55a1be3..cfc178709e 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -429,7 +429,7 @@ $result_converted{'latex'}->{'anchor_before_top'} = 
'\\begin{document}
 \\label{anchor:a-before-Top}%
 
 \\label{anchor:Top}%
-\\chapter{Chap}
+\\chapter{{Chap}}
 \\label{anchor:Chapter}%
 
 see \\hyperref[anchor:a-before-Top]{[a before Top], 
page~\\pageref*{anchor:a-before-Top}}
diff --git a/tp/t/results/latex_tests/anchor_in_copying.pl 
b/tp/t/results/latex_tests/anchor_in_copying.pl
index 54643bbd31..2b0b2d19db 100644
--- a/tp/t/results/latex_tests/anchor_in_copying.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying.pl
@@ -491,7 +491,7 @@ $result_floats{'anchor_in_copying'} = {};
 $result_converted{'latex'}->{'anchor_in_copying'} = '
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{Chap}
+\\chapter{{Chap}}
 \\label{anchor:Chapter}%
 
 see \\hyperref[anchor:a-in-copying]{[a in copying], 
page~\\pageref*{anchor:a-in-copying}}
diff --git a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
index 87e5886f6f..8a4da0c67f 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_chap.pl
@@ -580,7 +580,7 @@ $result_floats{'anchor_in_copying_insertcopying_chap'} = {};
 $result_converted{'latex'}->{'anchor_in_copying_insertcopying_chap'} = '
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{Chap}
+\\chapter{{Chap}}
 \\label{anchor:Chapter}%
 
 see \\hyperref[anchor:a-in-copying]{[a in copying], 
page~\\pageref*{anchor:a-in-copying}}
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index 58c0e2a89d..f54996da3e 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -749,7 +749,7 @@ Cop. \\label{anchor:a-in-copying}%
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chap}
+\\chapter{{Chap}}
 \\label{anchor:Chapter}%
 
 see \\hyperref[anchor:a-in-copying]{[a in copying], 
page~\\pageref*{anchor:a-in-copying}}.
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
index cdafaedd3f..74916cfc9a 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage_chap.pl
@@ -749,7 +749,7 @@ Cop. \\label{anchor:a-in-copying}%
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chap}
+\\chapter{{Chap}}
 \\label{anchor:Chapter}%
 
 see \\hyperref[anchor:a-in-copying]{[a in copying], 
page~\\pageref*{anchor:a-in-copying}}
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index 2542f3610e..ca7fe15829 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -1201,7 +1201,7 @@ In node before
 in node after
 \\label{anchor:anch_003a-in-node-after}%
 
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:chap}%
 
 in chap
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle/res_latex/anchor_links_xref_xrefautomaticsectiontitle.tex
index ffa9d0061b..5e3ab4de19 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
@@ -69,7 +69,7 @@ In node before
 in node after
 \label{anchor:anch_003a-in-node-after}%
 
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chap}%
 
 in chap
diff --git a/tp/t/results/latex_tests/combined_fonts.pl 
b/tp/t/results/latex_tests/combined_fonts.pl
index 875cebb09c..2eab3dc009 100644
--- a/tp/t/results/latex_tests/combined_fonts.pl
+++ b/tp/t/results/latex_tests/combined_fonts.pl
@@ -1516,7 +1516,7 @@ $result_floats{'combined_fonts'} = {};
 $result_converted{'latex'}->{'combined_fonts'} = '
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{chapter}
+\\chapter{{chapter}}
 \\label{anchor:chapter}%
 
 \\texttt{code}, \\textsl{dfn}, \\textsl{var}, \\textbf{strong}, 
{\\ttfamily\\textsl{kbd}}, `\\texttt{samp}\'.
diff --git 
a/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex 
b/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
index 42470506c4..04f68a9b9a 100644
--- a/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
+++ b/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
@@ -61,7 +61,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chapter}
+\chapter{{chapter}}
 \label{anchor:chapter}%
 
 \texttt{code}, \textsl{dfn}, \textsl{var}, \textbf{strong}, 
{\ttfamily\textsl{kbd}}, `\texttt{samp}'.
diff --git a/tp/t/results/latex_tests/custom_headings.pl 
b/tp/t/results/latex_tests/custom_headings.pl
index 895f72973d..c11c04b1a2 100644
--- a/tp/t/results/latex_tests/custom_headings.pl
+++ b/tp/t/results/latex_tests/custom_headings.pl
@@ -1104,7 +1104,7 @@ $result_converted{'latex'}->{'custom_headings'} = '
 
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{ch--ap}
+\\chapter{{ch--ap}}
 \\label{anchor:chapter}%
 
 \\newpage{}%
@@ -1117,9 +1117,9 @@ after ch--ap first page
 
 after ch--ap second page
 
-\\section{sec1}
+\\section{{sec1}}
 
-\\chapter{chap 2}
+\\chapter{{chap 2}}
 
 \\renewpagestyle{custom}{%
 \\sethead[toto][titi][]%
@@ -1139,7 +1139,7 @@ after everyheading before chap 3 first page
 
 after everyheading before chap 3 second page
 
-\\chapter{chap 3}
+\\chapter{{chap 3}}
 
 \\newpage{}%
 \\phantom{blabla}%
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 8f8a22471f..8b684443cc 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
@@ -71,7 +71,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{ch--ap}
+\chapter{{ch--ap}}
 \label{anchor:chapter}%
 
 \newpage{}%
@@ -84,9 +84,9 @@ after ch--ap first page
 
 after ch--ap second page
 
-\section{sec1}
+\section{{sec1}}
 
-\chapter{chap 2}
+\chapter{{chap 2}}
 
 \renewpagestyle{custom}{%
 \sethead[toto][titi][]%
@@ -106,7 +106,7 @@ after everyheading before chap 3 first page
 
 after everyheading before chap 3 second page
 
-\chapter{chap 3}
+\chapter{{chap 3}}
 
 \newpage{}%
 \phantom{blabla}%
diff --git a/tp/t/results/latex_tests/error_in_sectioning_command.pl 
b/tp/t/results/latex_tests/error_in_sectioning_command.pl
index b553c02f62..6c6045a3c2 100644
--- a/tp/t/results/latex_tests/error_in_sectioning_command.pl
+++ b/tp/t/results/latex_tests/error_in_sectioning_command.pl
@@ -566,7 +566,7 @@ $result_converted{'latex'}->{'error_in_sectioning_command'} 
= '
 \\begin{document}
 \\tableofcontents\\newpage
 \\label{anchor:Top}%
-\\chapter{\\texttt{@error\\{\\}} (\\texorpdfstring{\\fbox{error}}{error}): 
Indicating an Error Message}
+\\chapter{{\\texttt{@error\\{\\}} (\\texorpdfstring{\\fbox{error}}{error}): 
Indicating an Error Message}}
 
\\label{anchor:_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message}%
 
 Describe \\fbox{error}.
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 1d56110009..812d122d5b 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
@@ -60,7 +60,7 @@
 \begin{document}
 \tableofcontents\newpage
 \label{anchor:Top}%
-\chapter{\texttt{@error\{\}} (\texorpdfstring{\fbox{error}}{error}): 
Indicating an Error Message}
+\chapter{{\texttt{@error\{\}} (\texorpdfstring{\fbox{error}}{error}): 
Indicating an Error Message}}
 
\label{anchor:_0040error_007b_007d-_0028error_002d_002d_003e_0029_003a-Indicating-an-Error-Message}%
 
 Describe \fbox{error}.
diff --git a/tp/t/results/latex_tests/float_and_refs.pl 
b/tp/t/results/latex_tests/float_and_refs.pl
index f923f5f812..24f6361d18 100644
--- a/tp/t/results/latex_tests/float_and_refs.pl
+++ b/tp/t/results/latex_tests/float_and_refs.pl
@@ -2471,7 +2471,7 @@ 
$result_floats{'float_and_refs'}{'Thing'}[0]{'extra'}{'shortcaption'}{'extra'}{'
 $result_converted{'latex'}->{'float_and_refs'} = '
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{chapter}
+\\chapter{{chapter}}
 \\label{anchor:chapter}%
 
 \\begin{TexinfoFloat}
@@ -2498,7 +2498,7 @@ In figure
 \\label{anchor:my-figure}%
 \\end{figure}
 
-\\chapter{refs}
+\\chapter{{refs}}
 
 See \\hyperref[anchor:no-type]{\\ref*{anchor:no-type}}.
 See \\hyperref[anchor:no-type]{\\ref*{anchor:no-type}}.
@@ -2518,7 +2518,7 @@ See \\hyperref[anchor:my-figure]{three}.
 See Section ``three\'\' in \\texttt{four}.
 See Section ``three\'\' in \\textsl{five}.
 
-\\chapter{lists}
+\\chapter{{lists}}
 
 \\listof{TexinfoFloat}{}
 \\listoffigures
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 8ea965c402..ca070298dc 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
@@ -64,7 +64,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chapter}
+\chapter{{chapter}}
 \label{anchor:chapter}%
 
 \begin{TexinfoFloat}
@@ -91,7 +91,7 @@ In figure
 \label{anchor:my-figure}%
 \end{figure}
 
-\chapter{refs}
+\chapter{{refs}}
 
 See \hyperref[anchor:no-type]{\ref*{anchor:no-type}}.
 See \hyperref[anchor:no-type]{\ref*{anchor:no-type}}.
@@ -111,7 +111,7 @@ See \hyperref[anchor:my-figure]{three}.
 See Section ``three'' in \texttt{four}.
 See Section ``three'' in \textsl{five}.
 
-\chapter{lists}
+\chapter{{lists}}
 
 \listof{TexinfoFloat}{}
 \listoffigures
diff --git a/tp/t/results/latex_tests/fonttextsize.pl 
b/tp/t/results/latex_tests/fonttextsize.pl
index 1454d63382..caeb2139d6 100644
--- a/tp/t/results/latex_tests/fonttextsize.pl
+++ b/tp/t/results/latex_tests/fonttextsize.pl
@@ -912,24 +912,24 @@ $result_converted{'latex'}->{'fonttextsize'} = '
 
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
-\\section{section}
+\\section{{section}}
 
-\\subsection{Subsection 10pts}
+\\subsection{{Subsection 10pts}}
 In 10pts
 
 \\changefontsize{11}
-\\subsection{Subsection 11pts}
+\\subsection{{Subsection 11pts}}
 
 In 11pts
 
-\\subsection{Subsection 8pts}
+\\subsection{{Subsection 8pts}}
 
 In 8pts
 
-\\subsection{Subsection 15pts}
+\\subsection{{Subsection 15pts}}
 
 In 15pts
 ';
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 551e4588a3..4b600380f7 100644
--- a/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
+++ b/tp/t/results/latex_tests/fonttextsize/res_latex/fonttextsize.tex
@@ -61,24 +61,24 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
-\section{section}
+\section{{section}}
 
-\subsection{Subsection 10pts}
+\subsection{{Subsection 10pts}}
 In 10pts
 
 \changefontsize{11}
-\subsection{Subsection 11pts}
+\subsection{{Subsection 11pts}}
 
 In 11pts
 
-\subsection{Subsection 8pts}
+\subsection{{Subsection 8pts}}
 
 In 8pts
 
-\subsection{Subsection 15pts}
+\subsection{{Subsection 15pts}}
 
 In 15pts
 \end{document}
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 13c46d0640..ec96368a8c 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -1361,7 +1361,7 @@ $result_converted{'latex'}->{'indices'} = '
 
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{Index}
+\\chapter{{Index}}
 \\label{anchor:chapter}%
 
 \\index[cp]{a"!"""@b """!"@ a"" o""@$a"!"""@b$ """!"@ \\"{a} 
\\"{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ \\"{a} \\"{o}|seealso{$a"!"""@b$ 
"""!"@ \\"{a} \\"{o}}}%
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 cef175270f..e8919c1cc3 100644
--- a/tp/t/results/latex_tests/indices/res_latex/indices.tex
+++ b/tp/t/results/latex_tests/indices/res_latex/indices.tex
@@ -63,7 +63,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Index}
+\chapter{{Index}}
 \label{anchor:chapter}%
 
 \index[cp]{a"!"""@b """!"@ a"" o""@$a"!"""@b$ """!"@ \"{a} 
\"{o}!a"!"""@b@sub$a"!"""@b$ sub """!"@ \"{a} \"{o}|seealso{$a"!"""@b$ """!"@ 
\"{a} \"{o}}}%
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 f532e60025..27bbce7a58 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
@@ -568,7 +568,7 @@ 
$result_converted{'latex'}->{'informative_commands_in_top_node'} = '
 }%
 \\pagestyle{custom}%
 \\setlength{\\parindent}{2em}
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:next-node}%
 
 In chapter
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 dd5d4fc390..1dd39bc24d 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
@@ -65,7 +65,7 @@
 }%
 \pagestyle{custom}%
 \setlength{\parindent}{2em}
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:next-node}%
 
 In chapter
diff --git a/tp/t/results/latex_tests/node_before_top.pl 
b/tp/t/results/latex_tests/node_before_top.pl
index 5f7b0e240b..1e475ec125 100644
--- a/tp/t/results/latex_tests/node_before_top.pl
+++ b/tp/t/results/latex_tests/node_before_top.pl
@@ -422,7 +422,7 @@ $result_converted{'latex'}->{'node_before_top'} = 
'\\begin{document}
 \\label{anchor:before-Top}%
 
 \\label{anchor:Top}%
-\\chapter{Chap}
+\\chapter{{Chap}}
 \\label{anchor:Chapter}%
 
 see \\hyperref[anchor:before-Top]{\\chaptername~\\ref*{anchor:before-Top} 
[before Top], page~\\pageref*{anchor:before-Top}}
diff --git a/tp/t/results/latex_tests/pagesizes.pl 
b/tp/t/results/latex_tests/pagesizes.pl
index 2bb59167e0..5f9f71e982 100644
--- a/tp/t/results/latex_tests/pagesizes.pl
+++ b/tp/t/results/latex_tests/pagesizes.pl
@@ -602,12 +602,12 @@ $result_converted{'latex'}->{'pagesizes'} = '
 
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 \\newgeometry{textheight=11.5in}
 
-\\chapter{other pagesizes}
+\\chapter{{other pagesizes}}
 
 \\newgeometry{textwidth=130mm}
 
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 e6ef743b0f..ac5696a2d7 100644
--- a/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
+++ b/tp/t/results/latex_tests/pagesizes/res_latex/pagesizes.tex
@@ -61,12 +61,12 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 \newgeometry{textheight=11.5in}
 
-\chapter{other pagesizes}
+\chapter{{other pagesizes}}
 
 \newgeometry{textwidth=130mm}
 
diff --git a/tp/t/results/latex_tests/pagetype.pl 
b/tp/t/results/latex_tests/pagetype.pl
index 7acbc5aa31..f6bd82bfff 100644
--- a/tp/t/results/latex_tests/pagetype.pl
+++ b/tp/t/results/latex_tests/pagetype.pl
@@ -634,7 +634,7 @@ $result_converted{'latex'}->{'pagetype'} = '
 
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 \\geometry{paperheight=9.25in,paperwidth=7in}%
@@ -646,7 +646,7 @@ In smallbook
 
 After afourpaper
 
-\\chapter{afourpaper reset}
+\\chapter{{afourpaper reset}}
 
 In afourpaper reset
 ';
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 481d37ad44..d28a7e8093 100644
--- a/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
+++ b/tp/t/results/latex_tests/pagetype/res_latex/pagetype.tex
@@ -63,7 +63,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 \geometry{paperheight=9.25in,paperwidth=7in}%
@@ -75,7 +75,7 @@ In smallbook
 
 After afourpaper
 
-\chapter{afourpaper reset}
+\chapter{{afourpaper reset}}
 
 In afourpaper reset
 \end{document}
diff --git a/tp/t/results/latex_tests/settitle_and_headings.pl 
b/tp/t/results/latex_tests/settitle_and_headings.pl
index 152c02c084..95711d69b7 100644
--- a/tp/t/results/latex_tests/settitle_and_headings.pl
+++ b/tp/t/results/latex_tests/settitle_and_headings.pl
@@ -321,7 +321,7 @@ $result_converted{'latex'}->{'settitle_and_headings'} = '
 \\GNUTexinfosetdoubleheader{}%
 
 \\begin{document}
-\\chapter{chap}
+\\chapter{{chap}}
 
 \\newpage{}%
 \\phantom{blabla}%
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 0fa2e125e7..4f18bb144d 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
@@ -59,7 +59,7 @@
 \GNUTexinfosetdoubleheader{}%
 
 \begin{document}
-\chapter{chap}
+\chapter{{chap}}
 
 \newpage{}%
 \phantom{blabla}%
diff --git a/tp/t/results/latex_tests/shorttitlepage.pl 
b/tp/t/results/latex_tests/shorttitlepage.pl
index 946b31da70..250fd4ebba 100644
--- a/tp/t/results/latex_tests/shorttitlepage.pl
+++ b/tp/t/results/latex_tests/shorttitlepage.pl
@@ -432,7 +432,7 @@ $result_converted{'latex'}->{'shorttitlepage'} = '
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 In chapter
diff --git 
a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex 
b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
index 88724f1cc8..74458d34c5 100644
--- a/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
+++ b/tp/t/results/latex_tests/shorttitlepage/res_latex/shorttitlepage.tex
@@ -70,7 +70,7 @@
 \GNUTexinfosetsingleheader{}%
 \GNUTexinfomainmatter
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 In chapter
diff --git a/tp/t/results/latex_tests/titlepage_classical.pl 
b/tp/t/results/latex_tests/titlepage_classical.pl
index 30ba97daaa..1342350f27 100644
--- a/tp/t/results/latex_tests/titlepage_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_classical.pl
@@ -831,7 +831,7 @@ in Copying
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 In chapter
diff --git 
a/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
 
b/tp/t/results/latex_tests/titlepage_classical/res_latex/titlepage_classical.tex
index 2e46ba6135..6e46a2a3fd 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
@@ -91,7 +91,7 @@ in Copying
 \GNUTexinfosetsingleheader{}%
 \GNUTexinfomainmatter
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 In chapter
diff --git a/tp/t/results/latex_tests/titlepage_in_top_node.pl 
b/tp/t/results/latex_tests/titlepage_in_top_node.pl
index f44a30785f..98b8b61055 100644
--- a/tp/t/results/latex_tests/titlepage_in_top_node.pl
+++ b/tp/t/results/latex_tests/titlepage_in_top_node.pl
@@ -515,7 +515,7 @@ $result_converted{'latex'}->{'titlepage_in_top_node'} = '
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:chap}%
 
 in chap
diff --git 
a/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
 
b/tp/t/results/latex_tests/titlepage_in_top_node/res_latex/titlepage_in_top_node.tex
index 8d2b26aa48..d86e4792ae 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
@@ -77,7 +77,7 @@
 \GNUTexinfosetsingleheader{}%
 \GNUTexinfomainmatter
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chap}%
 
 in chap
diff --git a/tp/t/results/latex_tests/titlepage_long_title.pl 
b/tp/t/results/latex_tests/titlepage_long_title.pl
index 3c8a4eacac..3eddd1e06c 100644
--- a/tp/t/results/latex_tests/titlepage_long_title.pl
+++ b/tp/t/results/latex_tests/titlepage_long_title.pl
@@ -501,7 +501,7 @@ $result_converted{'latex'}->{'titlepage_long_title'} = '
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 In chapter
diff --git 
a/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
 
b/tp/t/results/latex_tests/titlepage_long_title/res_latex/titlepage_long_title.tex
index 0a4096a77b..c63234048c 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
@@ -78,7 +78,7 @@
 \GNUTexinfosetsingleheader{}%
 \GNUTexinfomainmatter
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 In chapter
diff --git a/tp/t/results/latex_tests/titlepage_no_author.pl 
b/tp/t/results/latex_tests/titlepage_no_author.pl
index 74c665a0ae..8010ab1662 100644
--- a/tp/t/results/latex_tests/titlepage_no_author.pl
+++ b/tp/t/results/latex_tests/titlepage_no_author.pl
@@ -482,7 +482,7 @@ $result_converted{'latex'}->{'titlepage_no_author'} = '
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 In chapter
diff --git 
a/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
 
b/tp/t/results/latex_tests/titlepage_no_author/res_latex/titlepage_no_author.tex
index 2368c0f200..9ed645a793 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
@@ -77,7 +77,7 @@
 \GNUTexinfosetsingleheader{}%
 \GNUTexinfomainmatter
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 In chapter
diff --git a/tp/t/results/latex_tests/titlepage_no_title.pl 
b/tp/t/results/latex_tests/titlepage_no_title.pl
index fbde1ba029..54bfcfccca 100644
--- a/tp/t/results/latex_tests/titlepage_no_title.pl
+++ b/tp/t/results/latex_tests/titlepage_no_title.pl
@@ -524,7 +524,7 @@ $result_converted{'latex'}->{'titlepage_no_title'} = '
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 In chapter
diff --git 
a/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex 
b/tp/t/results/latex_tests/titlepage_no_title/res_latex/titlepage_no_title.tex
index ee953b293d..d2672998cc 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
@@ -77,7 +77,7 @@
 \GNUTexinfosetsingleheader{}%
 \GNUTexinfomainmatter
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 In chapter
diff --git a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl 
b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
index f463afa549..7df2ae3ac1 100644
--- a/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
+++ b/tp/t/results/latex_tests/titlepage_with_commands_classical.pl
@@ -1060,7 +1060,7 @@ in Copying
 \\GNUTexinfosetsingleheader{}%
 \\GNUTexinfomainmatter
 \\label{anchor:Top}%
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:chapter}%
 
 In chapter
diff --git 
a/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
 
b/tp/t/results/latex_tests/titlepage_with_commands_classical/res_latex/titlepage_with_commands_classical.tex
index 8a0e4a3951..e346e18bd1 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
@@ -97,7 +97,7 @@ in Copying
 \GNUTexinfosetsingleheader{}%
 \GNUTexinfomainmatter
 \label{anchor:Top}%
-\chapter{Chapter}
+\chapter{{Chapter}}
 \label{anchor:chapter}%
 
 In chapter
diff --git a/tp/t/results/latex_tests/top_no_sectioning_command.pl 
b/tp/t/results/latex_tests/top_no_sectioning_command.pl
index 6d4a1afa78..81c9a0ad1a 100644
--- a/tp/t/results/latex_tests/top_no_sectioning_command.pl
+++ b/tp/t/results/latex_tests/top_no_sectioning_command.pl
@@ -298,7 +298,7 @@ $result_floats{'top_no_sectioning_command'} = {};
 
 $result_converted{'latex'}->{'top_no_sectioning_command'} = '\\begin{document}
 \\label{anchor:Top}%
-\\chapter{Chap}
+\\chapter{{Chap}}
 \\label{anchor:Chapter}%
 
 see \\hyperref[anchor:Top]{\\chaptername~\\ref*{anchor:Top} [Top], 
page~\\pageref*{anchor:Top}}
diff --git a/tp/t/results/sectioning/chapter_between_nodes.pl 
b/tp/t/results/sectioning/chapter_between_nodes.pl
index c5c1cb5ec9..530a935bcc 100644
--- a/tp/t/results/sectioning/chapter_between_nodes.pl
+++ b/tp/t/results/sectioning/chapter_between_nodes.pl
@@ -849,7 +849,7 @@ $result_converted{'docbook'}->{'chapter_between_nodes'} = 
'<sect1 label="1.1" id
 $result_converted{'latex'}->{'chapter_between_nodes'} = '
 \\begin{document}
 \\label{anchor:Top}%
-\\section{section}
+\\section{{section}}
 \\label{anchor:section-node}%
 
 section.
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 d47c2a3250..49ea8a85f9 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
@@ -58,7 +58,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\section{section}
+\section{{section}}
 \label{anchor:section-node}%
 
 section.
diff --git a/tp/t/results/sectioning/lone_Top_node.pl 
b/tp/t/results/sectioning/lone_Top_node.pl
index 5958ade816..d08e370ce9 100644
--- a/tp/t/results/sectioning/lone_Top_node.pl
+++ b/tp/t/results/sectioning/lone_Top_node.pl
@@ -574,7 +574,7 @@ $result_directions_text{'lone_Top_node'} = 'element: 
@chapter chap
 $result_converted{'latex'}->{'lone_Top_node'} = '
 \\begin{document}
 \\label{anchor:Top}%
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:First}%
 ';
 
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 bc3ab99df3..7d9f0acf2e 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
@@ -58,6 +58,6 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:First}%
 \end{document}
diff --git a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl 
b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
index 99af251d24..45b7198794 100644
--- a/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
+++ b/tp/t/results/sectioning/node_sectop_before_lone_node_Top.pl
@@ -571,13 +571,13 @@ 
$result_converted{'docbook'}->{'node_sectop_before_lone_node_Top'} = '<chapter l
 
 $result_converted{'latex'}->{'node_sectop_before_lone_node_Top'} = '
 \\begin{document}
-\\part*{top sectionning}
+\\part*{{top sectionning}}
 \\label{anchor:node-before}%
 
 in node before
 
 \\label{anchor:Top}%
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:chap}%
 
 in chap
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 2275662a04..9a94a70fe0 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
@@ -57,13 +57,13 @@
 
 
 \begin{document}
-\part*{top sectionning}
+\part*{{top sectionning}}
 \label{anchor:node-before}%
 
 in node before
 
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chap}%
 
 in chap
diff --git a/tp/t/results/sectioning/nodes_before_after_top.pl 
b/tp/t/results/sectioning/nodes_before_after_top.pl
index 83b744b3a5..126a42561c 100644
--- a/tp/t/results/sectioning/nodes_before_after_top.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top.pl
@@ -584,7 +584,7 @@ In node before
 
 in node after
 
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:chap}%
 
 in chap
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 8b4fe09460..ef5de86b84 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
@@ -66,7 +66,7 @@ In node before
 
 in node after
 
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chap}%
 
 in chap
diff --git a/tp/t/results/sectioning/nodes_before_after_top_xref.pl 
b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
index 6bea05cdad..7ce4264c77 100644
--- a/tp/t/results/sectioning/nodes_before_after_top_xref.pl
+++ b/tp/t/results/sectioning/nodes_before_after_top_xref.pl
@@ -852,7 +852,7 @@ In node before
 
 in node after
 
-\\chapter{chap}
+\\chapter{{chap}}
 \\label{anchor:chap}%
 
 in chap
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 0d70ff9d46..130a877360 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
@@ -66,7 +66,7 @@ In node before
 
 in node after
 
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chap}%
 
 in chap
diff --git a/tp/t/results/sectioning/nodes_before_top.pl 
b/tp/t/results/sectioning/nodes_before_top.pl
index a059d88fff..abec28bc0e 100644
--- a/tp/t/results/sectioning/nodes_before_top.pl
+++ b/tp/t/results/sectioning/nodes_before_top.pl
@@ -917,7 +917,7 @@ $result_converted{'latex'}->{'nodes_before_top'} = '
 \\label{anchor:node-in-menu-before-top}%
 
 \\label{anchor:Top}%
-\\chapter{a chapter}
+\\chapter{{a chapter}}
 \\label{anchor:second-node}%
 ';
 
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 fb76db6ad9..86b256cc34 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
@@ -63,6 +63,6 @@
 \label{anchor:node-in-menu-before-top}%
 
 \label{anchor:Top}%
-\chapter{a chapter}
+\chapter{{a chapter}}
 \label{anchor:second-node}%
 \end{document}
diff --git a/tp/t/results/sectioning/section_before_after_top_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node.pl
index 5bccbc3406..302bc0563a 100644
--- a/tp/t/results/sectioning/section_before_after_top_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node.pl
@@ -437,7 +437,7 @@ 
$result_converted{'docbook'}->{'section_before_after_top_node'} = '<chapter labe
 
 $result_converted{'latex'}->{'section_before_after_top_node'} = '
 \\begin{document}
-\\chapter*{before}
+\\chapter*{{before}}
 
 \\label{anchor:Top}%
 ';
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 dd8f646f8e..7e2a12ed87 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
@@ -57,7 +57,7 @@
 
 
 \begin{document}
-\chapter*{before}
+\chapter*{{before}}
 
 \label{anchor:Top}%
 
diff --git a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl 
b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
index 70373f99b2..60e629ec45 100644
--- a/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
+++ b/tp/t/results/sectioning/section_before_after_top_node_last_node.pl
@@ -524,7 +524,7 @@ 
$result_converted{'docbook'}->{'section_before_after_top_node_last_node'} = '<ch
 
 $result_converted{'latex'}->{'section_before_after_top_node_last_node'} = '
 \\begin{document}
-\\chapter*{before}
+\\chapter*{{before}}
 
 \\label{anchor:Top}%
 \\label{anchor:node-after}%
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 3a7e743c89..b7de05c73c 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
@@ -57,7 +57,7 @@
 
 
 \begin{document}
-\chapter*{before}
+\chapter*{{before}}
 
 \label{anchor:Top}%
 \label{anchor:node-after}%
diff --git a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl 
b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
index a656ff2725..fc64e452ec 100644
--- a/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
+++ b/tp/t/results/sectioning/section_chapter_before_top_nodes.pl
@@ -958,10 +958,10 @@ 
$result_converted{'docbook'}->{'section_chapter_before_top_nodes'} = '<sect1 lab
 
 $result_converted{'latex'}->{'section_chapter_before_top_nodes'} = '
 \\begin{document}
-\\section{section}
+\\section{{section}}
 \\label{anchor:section-node}%
 
-\\chapter{chapter}
+\\chapter{{chapter}}
 \\label{anchor:chapter-node}%
 
 
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 cabfcd6b3b..3514d295cb 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
@@ -57,10 +57,10 @@
 
 
 \begin{document}
-\section{section}
+\section{{section}}
 \label{anchor:section-node}%
 
-\chapter{chapter}
+\chapter{{chapter}}
 \label{anchor:chapter-node}%
 
 
diff --git a/tp/t/results/sectioning/top_node_part_top.pl 
b/tp/t/results/sectioning/top_node_part_top.pl
index 0513dfa290..8e020b3fa5 100644
--- a/tp/t/results/sectioning/top_node_part_top.pl
+++ b/tp/t/results/sectioning/top_node_part_top.pl
@@ -462,9 +462,9 @@ $result_converted{'docbook'}->{'top_node_part_top'} = 
'<part label="">
 
 
 $result_converted{'latex'}->{'top_node_part_top'} = '\\begin{document}
-\\part{part}
+\\part{{part}}
 
-\\part*{top}
+\\part*{{top}}
 \\label{anchor:Top}%
 ';
 
@@ -527,9 +527,9 @@ $result_converted{'file_latex'}->{'top_node_part_top'} = 
'\\documentclass{book}
 \\GNUTexinfosetsingleheader{}%
 
 \\begin{document}
-\\part{part}
+\\part{{part}}
 
-\\part*{top}
+\\part*{{top}}
 \\label{anchor:Top}%
 \\end{document}
 ';
diff --git a/tp/t/results/sectioning/two_nodes_at_the_end.pl 
b/tp/t/results/sectioning/two_nodes_at_the_end.pl
index ac7dd83de9..7141f21168 100644
--- a/tp/t/results/sectioning/two_nodes_at_the_end.pl
+++ b/tp/t/results/sectioning/two_nodes_at_the_end.pl
@@ -1244,7 +1244,7 @@ Previous: <a href="#node-after-chapter-1" accesskey="p" 
rel="prev">node after ch
 
 $result_converted{'latex'}->{'two_nodes_at_the_end'} = '\\begin{document}
 \\label{anchor:Top}%
-\\chapter{chapter c1}
+\\chapter{{chapter c1}}
 \\label{anchor:chapter-1}%
 
 \\label{anchor:node-after-chapter-1}%
diff --git a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl 
b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
index 1d5614c32e..d73852e808 100644
--- a/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
+++ b/tp/t/results/sectioning/unnumbered_top_without_node_sections.pl
@@ -1076,15 +1076,15 @@ Up: <a href="dir.html#Top" accesskey="u" 
rel="up">(dir)</a> &nbsp; </p>
 
 
 $result_converted{'latex'}->{'unnumbered_top_without_node_sections'} = 
'\\begin{document}
-\\chapter*{unnumbered}
+\\chapter*{{unnumbered}}
 \\label{anchor:a-node}%
 
 in unnumbered
 
-\\part*{top section}
+\\part*{{top section}}
 Top section
 
-\\chapter{Chapter}
+\\chapter{{Chapter}}
 \\label{anchor:second}%
 
 Text of chapter
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 40110715ea..4f18b9e69f 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
@@ -70,7 +70,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chapter}%
 
 \begin{description}
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 b5047b4a91..8ec5ba7d59 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
@@ -72,7 +72,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chapter}%
 
 \begin{itemize}[label=-]
@@ -226,7 +226,7 @@ Texte before first item samp.
 \GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
-\chapter{printindex}
+\chapter{{printindex}}
 \label{anchor:printindex}%
 
 \printindex[cp]
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 b5047b4a91..8ec5ba7d59 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
@@ -72,7 +72,7 @@
 
 \begin{document}
 \label{anchor:Top}%
-\chapter{chap}
+\chapter{{chap}}
 \label{anchor:chapter}%
 
 \begin{itemize}[label=-]
@@ -226,7 +226,7 @@ Texte before first item samp.
 \GNUTexinfotablestylesamp{asamp{-}{-}bb2}}}]
 \end{description}
 
-\chapter{printindex}
+\chapter{{printindex}}
 \label{anchor:printindex}%
 
 \printindex[cp]
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex 
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index 1e99bb827d..3cc6ead1b8 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -1311,15 +1311,15 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{majorheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{chapheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
 
-\GNUTexinfonopagebreakheading{\section*}{heading}
+\GNUTexinfonopagebreakheading{\section*}{{heading}}
 
-\GNUTexinfonopagebreakheading{\subsection*}{subheading}
+\GNUTexinfonopagebreakheading{\subsection*}{{subheading}}
 
-\GNUTexinfonopagebreakheading{\subsubsection*}{subsubheading}
+\GNUTexinfonopagebreakheading{\subsubsection*}{{subsubheading}}
 
 
 \texttt{@acronym\{{-}{-}a,an accronym @comma\{\} @enddots\{\}\}} --a (an 
accronym , \dots{})
@@ -2728,15 +2728,15 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{majorheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{chapheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
 
-\GNUTexinfonopagebreakheading{\section*}{heading}
+\GNUTexinfonopagebreakheading{\section*}{{heading}}
 
-\GNUTexinfonopagebreakheading{\subsection*}{subheading}
+\GNUTexinfonopagebreakheading{\subsection*}{{subheading}}
 
-\GNUTexinfonopagebreakheading{\subsubsection*}{subsubheading}
+\GNUTexinfonopagebreakheading{\subsubsection*}{{subsubheading}}
 
 
 \texttt{@acronym\{{-}{-}a,an accronym @comma\{\} @enddots\{\}\}} --a (an 
accronym , \dots{})
@@ -2960,7 +2960,7 @@ g--roupe
 
 
 \label{anchor:Top}%
-\chapter{chapter}
+\chapter{{chapter}}
 \label{anchor:chapter}%
 
 First para
@@ -4166,15 +4166,15 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{majorheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{chapheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
 
-\GNUTexinfonopagebreakheading{\section*}{heading}
+\GNUTexinfonopagebreakheading{\section*}{{heading}}
 
-\GNUTexinfonopagebreakheading{\subsection*}{subheading}
+\GNUTexinfonopagebreakheading{\subsection*}{{subheading}}
 
-\GNUTexinfonopagebreakheading{\subsubsection*}{subsubheading}
+\GNUTexinfonopagebreakheading{\subsubsection*}{{subsubheading}}
 
 
 \texttt{@acronym\{{-}{-}a,an accronym @comma\{\} @enddots\{\}\}} --a (an 
accronym , \dots{})
@@ -5582,15 +5582,15 @@ in verbatim ''
 
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
-\GNUTexinfonopagebreakheading{\chapter*}{majorheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
 
-\GNUTexinfonopagebreakheading{\chapter*}{chapheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
 
-\GNUTexinfonopagebreakheading{\section*}{heading}
+\GNUTexinfonopagebreakheading{\section*}{{heading}}
 
-\GNUTexinfonopagebreakheading{\subsection*}{subheading}
+\GNUTexinfonopagebreakheading{\subsection*}{{subheading}}
 
-\GNUTexinfonopagebreakheading{\subsubsection*}{subsubheading}
+\GNUTexinfonopagebreakheading{\subsubsection*}{{subsubheading}}
 
 
 \texttt{@acronym\{{-}{-}a,an accronym @comma\{\} @enddots\{\}\}} --a (an 
accronym , \dots{})
@@ -7446,23 +7446,23 @@ in verbatim ''
 $\frac{a < b \texttt{tex \hbox{ code }}}{b}$ ``
 
 \endgroup{}%
-\GNUTexinfonopagebreakheading{\chapter*}{majorheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{majorheading}}
 \par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em \parskip=0pt 
\parindent=0pt \ttfamily%
 
 \endgroup{}%
-\GNUTexinfonopagebreakheading{\chapter*}{chapheading}
+\GNUTexinfonopagebreakheading{\chapter*}{{chapheading}}
 \par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em \parskip=0pt 
\parindent=0pt \ttfamily%
 
 \endgroup{}%
-\GNUTexinfonopagebreakheading{\section*}{heading}
+\GNUTexinfonopagebreakheading{\section*}{{heading}}
 \par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em \parskip=0pt 
\parindent=0pt \ttfamily%
 
 \endgroup{}%
-\GNUTexinfonopagebreakheading{\subsection*}{subheading}
+\GNUTexinfonopagebreakheading{\subsection*}{{subheading}}
 \par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em \parskip=0pt 
\parindent=0pt \ttfamily%
 
 \endgroup{}%
-\GNUTexinfonopagebreakheading{\subsubsection*}{subsubheading}
+\GNUTexinfonopagebreakheading{\subsubsection*}{{subsubheading}}
 \par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em \parskip=0pt 
\parindent=0pt \ttfamily%
 
 
@@ -7813,23 +7813,23 @@ tp
 \footnote{in footnote}
 
 
-\section{A section}
+\section{{A section}}
 \label{anchor:s_002d_002dect_002cion}%
 
 
-\subsection{subsection}
+\subsection{{subsection}}
 \label{anchor:subsection}%
 
 
 \label{anchor:anchor}%
 
-\subsubsection{subsubsection ``simple-double--}
+\subsubsection{{subsubsection ``simple-double--}}
 \label{anchor:subsubsection-_0060_0060simple_002ddouble_002d_002d}%
 
-\subsubsection{three---four----''}
+\subsubsection{{three---four----''}}
 
\label{anchor:subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027}%
 
-\chapter*{\centering chapter 2}
+\chapter*{{\centering chapter 2}}
 \label{anchor:chapter2}%
 
 \printindex[cp]



reply via email to

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