texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO Texinfo/Parser.pm t/results/cov...

From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Parser.pm t/results/cov...
Date: Sat, 08 Sep 2012 23:06:38 +0000 
CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/09/08 23:06:38

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 
        tp/t/results/coverage: def.pl 
        tp/t/results/def: end_of_line_protect_at_end.pl 
                          inter_item_commands_in_def.pl 
                          inter_item_commands_in_def_in_example.pl 
                          no_category_or_no_name.pl 
                          wrong_braces_simple.pl 
        tp/t/results/invalid_nestings: section_on_defx_line.pl 
        tp/t/results/menu: menu_in_deffn.pl 
        tp/tests/coverage/res_parser/formatting: formatting.html 
        tp/tests/coverage/res_parser/formatting_fr: formatting.html 
        tp/tests/coverage/res_parser/formatting_utf8_enable_encoding: 
                                                                      
formatting_utf8.html 
        tp/tests/layout/res_parser/formatting_chm: anchor.html 
                                                   chapter.html 
                                                   chapter2.html 
                                                   formatting.html 
                                                   formatting_abt.html 
                                                   formatting_ovr.html 
                                                   formatting_toc.html 
                                                   index.html 
                                                   s_002d_002dect_002cion.html 
                                                   subsection.html 
                                                   
subsubsection-_0060_0060simple_002ddouble_002d_002d.html 
                                                   
subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html 
        tp/tests/layout/res_parser/formatting_docbook: formatting.xml 
        tp/tests/layout/res_parser/formatting_exotic: anchor.html 
                                                      chapter.html 
                                                      chapter2.html 
                                                      formatting_abt.html 
                                                      formatting_ovr.html 
                                                      formatting_toc.html 
                                                      index.html 
                                                      
s_002d_002dect_002cion.html 
                                                      subsection.html 
                                                      
subsubsection-_0060_0060simple_002ddouble_002d_002d.html 
                                                      
subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html 
        tp/tests/layout/res_parser/formatting_fr_icons: formatting.html 
        tp/tests/layout/res_parser/formatting_html: formatting.html 
        tp/tests/layout/res_parser/formatting_html32: formatting.html 
        tp/tests/layout/res_parser/formatting_html_nodes: anchor.html 
                                                          chapter.html 
                                                          chapter2.html 
                                                          formatting_abt.html 
                                                          formatting_fot.html 
                                                          formatting_ovr.html 
                                                          formatting_toc.html 
                                                          index.html 
                                                          
s_002d_002dect_002cion.html 
                                                          subsection.html 
                                                          
subsubsection-_0060_0060simple_002ddouble_002d_002d.html 
                                                          
subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html 
        tp/tests/layout/res_parser/formatting_nodes: anchor.html 
                                                     chapter.html 
                                                     chapter2.html 
                                                     formatting_abt.html 
                                                     formatting_fot.html 
                                                     formatting_ovr.html 
                                                     formatting_toc.html 
                                                     index.html 
                                                     
s_002d_002dect_002cion.html 
                                                     subsection.html 
                                                     
subsubsection-_0060_0060simple_002ddouble_002d_002d.html 
                                                     
subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html 
        tp/tests/layout/res_parser/formatting_regions: 
                                                       formatting_regions.html 
        tp/tests/layout/res_parser/formatting_singular: anchor.html 
                                                        chapter.html 
                                                        chapter2.html 
                                                        index.htm 
                                                        index.html 
                                                        
s_002d_002dect_002cion.html 
                                                        sing_abt.htm 
                                                        sing_fot.htm 
                                                        sing_ovr.htm 
                                                        sing_toc.htm 
                                                        subsection.html 
                                                        
subsubsection-_0060_0060simple_002ddouble_002d_002d.html 
                                                        
subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html 
        tp/tests/layout/res_parser/formatting_weird_quotes: 
                                                            formatting.html 
        tp/tests/layout/res_parser/formatting_xml: formatting.xml 

Log message:
        Keep spaces at end of @def* lines in the parsed line information.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.297&r2=1.298
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.394&r2=1.395
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/no_category_or_no_name.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_simple.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/section_on_defx_line.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_in_deffn.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/anchor.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/index.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/subsection.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/anchor.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsection.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/anchor.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/anchor.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/chapter.html?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/chapter2.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/index.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/s_002d_002dect_002cion.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_abt.htm?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_fot.htm?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_ovr.htm?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_toc.htm?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/subsection.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.13&r2=1.14

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -b -r1.297 -r1.298
--- TODO        8 Sep 2012 21:56:21 -0000       1.297
+++ TODO        8 Sep 2012 23:06:28 -0000       1.298
@@ -9,9 +9,6 @@
 Bugs
 ====
 
-In def in 02coverage.t, space at the end of deffnx not kept in XML:
address@hidden Command { log trap1} {}  
-
 In texi file generated from xml_tests.t node_no_section, translation
 to XML, @bye lost.
 

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -b -r1.394 -r1.395
--- Texinfo/Parser.pm   8 Sep 2012 21:56:21 -0000       1.394
+++ Texinfo/Parser.pm   8 Sep 2012 23:06:28 -0000       1.395
@@ -2249,9 +2249,12 @@
   my $spaces;
   $spaces = shift @{$contents} if (defined($contents->[0]->{'text'}) and 
                                      $contents->[0]->{'text'} !~ /\S/);
-  $spaces = undef if (!$spaces->{'text'});
-  $spaces->{'type'} = 'spaces' if (defined($spaces));
-  return undef if (!scalar(@{$contents}));
+  if (defined($spaces)) {
+    $spaces->{'type'} = 'spaces';
+    chomp $spaces->{'text'};
+    $spaces = undef if ($spaces->{'text'} eq '');
+  }
+  return ($spaces, undef) if (!scalar(@{$contents}));
 
   #print STDERR "BEFORE PROCESSING 
".Texinfo::Convert::Texinfo::convert({'contents' => $contents});
   if ($contents->[0]->{'type'} and $contents->[0]->{'type'} eq 'bracketed') {

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- t/results/coverage/def.pl   8 Sep 2012 21:56:22 -0000       1.69
+++ t/results/coverage/def.pl   8 Sep 2012 23:06:28 -0000       1.70
@@ -893,6 +893,13 @@
                   'parent' => {},
                   'type' => 'bracketed_def_content'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '  ',
+                  'type' => 'spaces'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -2612,7 +2619,7 @@
 <dt><a name="index-i"></a>fset: <strong><var>i</var></strong> <em>a g</em></dt>
 <dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2639,7 +2646,7 @@
 <deffn spaces=" " endspaces=" "><definitionterm><indexterm 
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory> 
<deffunction><var>i</var></deffunction> <defparam>a</defparam> 
<defparam>g</defparam></definitionterm>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2 
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log 
trap2 </deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp> 
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id 
<samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
@@ -2667,7 +2674,7 @@
 <synopsis><indexterm 
role="fn"><primary><replaceable>i</replaceable></primary></indexterm><phrase 
role="category"><emphasis role="bold">fset</emphasis>:</phrase> 
<function><replaceable>i</replaceable></function> <replaceable>a</replaceable> 
<replaceable>g</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde</emphasis>:</phrase> 
<function>truc</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
ule</emphasis></primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id 
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
&#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> 
<function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> 
<replaceable>truc</replaceable></synopsis>

Index: t/results/def/end_of_line_protect_at_end.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/end_of_line_protect_at_end.pl 23 Aug 2012 18:14:41 -0000      
1.31
+++ t/results/def/end_of_line_protect_at_end.pl 8 Sep 2012 23:06:28 -0000       
1.32
@@ -70,6 +70,13 @@
                 {
                   'text' => 'arguments2'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => ' ',
+                  'type' => 'spaces'
+                }
               ]
             ],
             'def_command' => 'deffn',

Index: t/results/def/inter_item_commands_in_def.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/inter_item_commands_in_def.pl 8 Sep 2012 21:56:23 -0000       
1.19
+++ t/results/def/inter_item_commands_in_def.pl 8 Sep 2012 23:06:28 -0000       
1.20
@@ -254,6 +254,13 @@
                   'parent' => {},
                   'type' => 'bracketed_def_content'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '  ',
+                  'type' => 'spaces'
+                }
               ]
             ],
             'def_command' => 'deffn',

Index: t/results/def/inter_item_commands_in_def_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/def/inter_item_commands_in_def_in_example.pl      8 Sep 2012 
21:56:23 -0000       1.7
+++ t/results/def/inter_item_commands_in_def_in_example.pl      8 Sep 2012 
23:06:28 -0000       1.8
@@ -272,6 +272,13 @@
                       'parent' => {},
                       'type' => 'bracketed_def_content'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '  ',
+                      'type' => 'spaces'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Index: t/results/def/no_category_or_no_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/no_category_or_no_name.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/def/no_category_or_no_name.pl     23 Aug 2012 18:14:41 -0000      
1.19
+++ t/results/def/no_category_or_no_name.pl     8 Sep 2012 23:06:28 -0000       
1.20
@@ -316,6 +316,13 @@
                 {
                   'text' => 'd'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => ' ',
+                  'type' => 'spaces'
+                }
               ]
             ],
             'def_command' => 'deffn',

Index: t/results/def/wrong_braces_simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/wrong_braces_simple.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/def/wrong_braces_simple.pl        8 Sep 2012 21:56:23 -0000       
1.32
+++ t/results/def/wrong_braces_simple.pl        8 Sep 2012 23:06:28 -0000       
1.33
@@ -91,6 +91,13 @@
                 {
                   'text' => 'and'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => ' ',
+                  'type' => 'spaces'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -980,6 +987,13 @@
                 {
                   'text' => 'and'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => ' ',
+                  'type' => 'spaces'
+                }
               ]
             ],
             'def_command' => 'deffn',

Index: t/results/invalid_nestings/section_on_defx_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/section_on_defx_line.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/section_on_defx_line.pl  23 Aug 2012 18:14:57 
-0000      1.4
+++ t/results/invalid_nestings/section_on_defx_line.pl  8 Sep 2012 23:06:28 
-0000       1.5
@@ -80,6 +80,13 @@
                     {
                       'text' => 'l'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Index: t/results/menu/menu_in_deffn.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/menu/menu_in_deffn.pl     23 Aug 2012 18:15:08 -0000      1.18
+++ t/results/menu/menu_in_deffn.pl     8 Sep 2012 23:06:28 -0000       1.19
@@ -105,6 +105,13 @@
                     {
                       'text' => 'c'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Index: tests/coverage/res_parser/formatting/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/coverage/res_parser/formatting/formatting.html        26 Aug 2012 
23:01:09 -0000      1.15
+++ tests/coverage/res_parser/formatting/formatting.html        8 Sep 2012 
23:06:29 -0000       1.16
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2476,7 +2476,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2787,7 +2787,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3200,7 +3200,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3511,7 +3511,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3927,7 +3927,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4241,7 +4241,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/coverage/res_parser/formatting_fr/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_fr/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/coverage/res_parser/formatting_fr/formatting.html     26 Aug 2012 
23:01:09 -0000      1.15
+++ tests/coverage/res_parser/formatting_fr/formatting.html     8 Sep 2012 
23:06:29 -0000       1.16
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2476,7 +2476,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2787,7 +2787,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3200,7 +3200,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3511,7 +3511,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3927,7 +3927,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4241,7 +4241,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: 
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- 
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html  
    26 Aug 2012 23:01:09 -0000      1.16
+++ 
tests/coverage/res_parser/formatting_utf8_enable_encoding/formatting_utf8.html  
    8 Sep 2012 23:06:29 -0000       1.17
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2478,7 +2478,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2789,7 +2789,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3202,7 +3202,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3513,7 +3513,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3929,7 +3929,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4243,7 +4243,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_chm/anchor.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/anchor.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_chm/chapter.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_chm/chapter2.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/chapter2.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_chm/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/layout/res_parser/formatting_chm/formatting.html      26 Aug 2012 
23:01:34 -0000      1.15
+++ tests/layout/res_parser/formatting_chm/formatting.html      8 Sep 2012 
23:06:29 -0000       1.16
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2460,7 +2460,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2771,7 +2771,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3184,7 +3184,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3495,7 +3495,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3911,7 +3911,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4225,7 +4225,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_chm/formatting_abt.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_chm/formatting_ovr.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_chm/formatting_toc.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_chm/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/index.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_chm/subsection.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsection.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: 
tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: 
tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_docbook/formatting.xml   13 Aug 2012 
19:05:05 -0000      1.7
+++ tests/layout/res_parser/formatting_docbook/formatting.xml   8 Sep 2012 
23:06:30 -0000       1.8
@@ -304,7 +304,7 @@
 <indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
 <synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde</emphasis>:</phrase> 
<function>truc</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
ule</emphasis></primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id 
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
&#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> 
<function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> 
<replaceable>truc</replaceable></synopsis>
@@ -801,7 +801,7 @@
 <indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
 <synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde</emphasis>:</phrase> 
<function>truc</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
ule</emphasis></primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id 
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
&#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> 
<function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> 
<replaceable>truc</replaceable></synopsis>
@@ -1299,7 +1299,7 @@
 <indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
 <synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde</emphasis>:</phrase> 
<function>truc</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
ule</emphasis></primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id 
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
&#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> 
<function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> 
<replaceable>truc</replaceable></synopsis>
@@ -1798,7 +1798,7 @@
 <indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
 <synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde</emphasis>:</phrase> 
<function>truc</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
ule</emphasis></primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id 
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
&#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> 
<function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> 
<replaceable>truc</replaceable></synopsis>
@@ -2296,7 +2296,7 @@
 <indexterm role="cp"><primary>index entry within deffn</primary></indexterm>
 <synopsis><indexterm role="fn"><primary>truc</primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde</emphasis>:</phrase> 
<function>truc</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
ule</emphasis></primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id 
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
&#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> 
<function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> 
<replaceable>truc</replaceable></synopsis>
@@ -2793,7 +2793,7 @@
 <screen><indexterm role="cp"><primary>index entry within 
deffn</primary></indexterm>
 </screen><synopsis><indexterm 
role="fn"><primary>truc</primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function>truc</function> 
<replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary>log trap</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap</function> <replaceable></replaceable></synopsis>
-<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable></synopsis>
+<synopsis><indexterm role="fn"><primary>log trap1</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap1</function> <replaceable></replaceable>  </synopsis>
 <synopsis><indexterm role="fn"><primary>log trap2</primary></indexterm><phrase 
role="category"><emphasis role="bold">Command</emphasis>:</phrase> 
<function>log trap2</function> <replaceable></replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
ule</emphasis></primary></indexterm><phrase role="category"><emphasis 
role="bold">cmde</emphasis>:</phrase> <function><emphasis role="bold">id 
ule</emphasis></function> <replaceable>truc</replaceable></synopsis>
 <synopsis><indexterm role="fn"><primary><emphasis role="bold">id 
&#8216;<literal>i</literal>&#8217; ule</emphasis></primary></indexterm><phrase 
role="category"><emphasis role="bold">cmde2</emphasis>:</phrase> 
<function><emphasis role="bold">id &#8216;i&#8217; ule</emphasis></function> 
<replaceable>truc</replaceable></synopsis>

Index: tests/layout/res_parser/formatting_exotic/anchor.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/anchor.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_exotic/chapter.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7

Index: tests/layout/res_parser/formatting_exotic/chapter2.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/chapter2.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_exotic/formatting_abt.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_exotic/formatting_ovr.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_exotic/formatting_toc.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_exotic/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/index.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/layout/res_parser/formatting_exotic/index.html        26 Aug 2012 
23:01:35 -0000      1.15
+++ tests/layout/res_parser/formatting_exotic/index.html        8 Sep 2012 
23:06:33 -0000       1.16
@@ -1016,7 +1016,7 @@
 <tr><td colspan="2"><a name="index-copying-index-entry-within-deffn"></a>
 </td></tr><tr><td align="left"> <strong>truc</strong></td><td 
align="right">cmde<a name="index-copying-truc"></a></td></tr>
 <tr><td align="left"> <strong>log trap</strong></td><td 
align="right">Command<a name="index-copying-log-trap"></a></td></tr>
-<tr><td align="left"> <strong>log trap1</strong></td><td 
align="right">Command<a name="index-copying-log-trap1"></a></td></tr>
+<tr><td align="left"> <strong>log trap1</strong>  </td><td 
align="right">Command<a name="index-copying-log-trap1"></a></td></tr>
 <tr><td align="left"> <strong>log trap2</strong></td><td 
align="right">Command<a name="index-copying-log-trap2"></a></td></tr>
 <tr><td align="left"> <strong><b>id ule</b></strong><em> truc</em></td><td 
align="right">cmde<a name="index-copying-id-ule"></a></td></tr>
 <tr><td align="left"> <strong><b>id &lsquo;<samp>i</samp>&rsquo; 
ule</b></strong><em> truc</em></td><td align="right">cmde2<a 
name="index-copying-id-i-ule"></a></td></tr>
@@ -1327,7 +1327,7 @@
 
 <table width="100%">
 <tr><td align="left"></td><td align="right">fun</td></tr>
-<tr><td align="left"> <strong>machin</strong><em> bidule chose 
and</em></td><td align="right">truc<a 
name="index-copying-machin-2"></a></td></tr>
+<tr><td align="left"> <strong>machin</strong><em> bidule chose and 
</em></td><td align="right">truc<a name="index-copying-machin-2"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and  
after</em></td><td align="right">truc<a 
name="index-copying-machin-3"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and 
</em></td><td align="right">truc<a name="index-copying-machin-4"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and and 
after</em></td><td align="right">truc<a 
name="index-copying-machin-5"></a></td></tr>
@@ -1740,7 +1740,7 @@
 <tr><td colspan="2"><a name="index-index-entry-within-deffn"></a>
 </td></tr><tr><td align="left"> <strong>truc</strong></td><td 
align="right">cmde<a name="index-truc"></a></td></tr>
 <tr><td align="left"> <strong>log trap</strong></td><td 
align="right">Command<a name="index-log-trap"></a></td></tr>
-<tr><td align="left"> <strong>log trap1</strong></td><td 
align="right">Command<a name="index-log-trap1"></a></td></tr>
+<tr><td align="left"> <strong>log trap1</strong>  </td><td 
align="right">Command<a name="index-log-trap1"></a></td></tr>
 <tr><td align="left"> <strong>log trap2</strong></td><td 
align="right">Command<a name="index-log-trap2"></a></td></tr>
 <tr><td align="left"> <strong><b>id ule</b></strong><em> truc</em></td><td 
align="right">cmde<a name="index-id-ule"></a></td></tr>
 <tr><td align="left"> <strong><b>id &lsquo;<samp>i</samp>&rsquo; 
ule</b></strong><em> truc</em></td><td align="right">cmde2<a 
name="index-id-i-ule"></a></td></tr>
@@ -2051,7 +2051,7 @@
 
 <table width="100%">
 <tr><td align="left"></td><td align="right">fun</td></tr>
-<tr><td align="left"> <strong>machin</strong><em> bidule chose 
and</em></td><td align="right">truc<a name="index-machin-2"></a></td></tr>
+<tr><td align="left"> <strong>machin</strong><em> bidule chose and 
</em></td><td align="right">truc<a name="index-machin-2"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and  
after</em></td><td align="right">truc<a name="index-machin-3"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and 
</em></td><td align="right">truc<a name="index-machin-4"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and and 
after</em></td><td align="right">truc<a name="index-machin-5"></a></td></tr>
@@ -2467,7 +2467,7 @@
 <tr><td align="left"> <strong><var>i</var></strong><em> a g</em></td><td 
align="right">fset<a name="index-i-2"></a></td></tr>
 <tr><td colspan="2"><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></td></tr><tr><td 
align="left"> <strong>truc</strong></td><td align="right">cmde<a 
name="index-truc-2"></a></td></tr>
 <tr><td align="left"> <strong>log trap</strong></td><td 
align="right">Command<a name="index-log-trap-1"></a></td></tr>
-<tr><td align="left"> <strong>log trap1</strong></td><td 
align="right">Command<a name="index-log-trap1-1"></a></td></tr>
+<tr><td align="left"> <strong>log trap1</strong>  </td><td 
align="right">Command<a name="index-log-trap1-1"></a></td></tr>
 <tr><td align="left"> <strong>log trap2</strong></td><td 
align="right">Command<a name="index-log-trap2-1"></a></td></tr>
 <tr><td align="left"> <strong><b>id ule</b></strong><em> truc</em></td><td 
align="right">cmde<a name="index-id-ule-1"></a></td></tr>
 <tr><td align="left"> <strong><b>id &lsquo;<samp>i</samp>&rsquo; 
ule</b></strong><em> truc</em></td><td align="right">cmde2<a 
name="index-id-i-ule-1"></a></td></tr>
@@ -2781,7 +2781,7 @@
 <pre class="example">
 </pre><table width="100%">
 <tr><td align="left"></td><td align="right">fun</td></tr>
-<tr><td align="left"> <strong>machin</strong><em> bidule chose 
and</em></td><td align="right">truc<a name="index-machin-8"></a></td></tr>
+<tr><td align="left"> <strong>machin</strong><em> bidule chose and 
</em></td><td align="right">truc<a name="index-machin-8"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and  
after</em></td><td align="right">truc<a name="index-machin-9"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and 
</em></td><td align="right">truc<a name="index-machin-10"></a></td></tr>
 <tr><td align="left"> <strong>machin</strong><em> bidule chose and and 
after</em></td><td align="right">truc<a name="index-machin-11"></a></td></tr>

Index: tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_exotic/subsection.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsection.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: 
tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: 
tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_fr_icons/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/layout/res_parser/formatting_fr_icons/formatting.html 26 Aug 2012 
23:01:36 -0000      1.15
+++ tests/layout/res_parser/formatting_fr_icons/formatting.html 8 Sep 2012 
23:06:34 -0000       1.16
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2476,7 +2476,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2787,7 +2787,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3200,7 +3200,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3511,7 +3511,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3927,7 +3927,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4241,7 +4241,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_html/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/layout/res_parser/formatting_html/formatting.html     26 Aug 2012 
23:01:36 -0000      1.15
+++ tests/layout/res_parser/formatting_html/formatting.html     8 Sep 2012 
23:06:34 -0000       1.16
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2476,7 +2476,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2787,7 +2787,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3200,7 +3200,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3511,7 +3511,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3927,7 +3927,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4241,7 +4241,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_html32/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html32/formatting.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- tests/layout/res_parser/formatting_html32/formatting.html   13 Aug 2012 
21:31:06 -0000      1.12
+++ tests/layout/res_parser/formatting_html32/formatting.html   8 Sep 2012 
23:06:34 -0000       1.13
@@ -969,7 +969,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
`<samp>i</samp>' ule</b></strong> <em>truc</em></dt>
@@ -1280,7 +1280,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1685,7 +1685,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id `<samp>i</samp>' 
ule</b></strong> <em>truc</em></dt>
@@ -1996,7 +1996,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2426,7 +2426,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id `<samp>i</samp>' 
ule</b></strong> <em>truc</em></dt>
@@ -2737,7 +2737,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3142,7 +3142,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id `<samp>i</samp>' 
ule</b></strong> <em>truc</em></dt>
@@ -3453,7 +3453,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3860,7 +3860,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre><a name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id `<samp>i</samp>' 
ule</b></strong> <em>truc</em></dt>
@@ -4174,7 +4174,7 @@
 <pre>
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_html_nodes/anchor.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_html_nodes/chapter.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7

Index: tests/layout/res_parser/formatting_html_nodes/chapter2.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_html_nodes/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/index.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- tests/layout/res_parser/formatting_html_nodes/index.html    26 Aug 2012 
23:01:37 -0000      1.16
+++ tests/layout/res_parser/formatting_html_nodes/index.html    8 Sep 2012 
23:06:35 -0000       1.17
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2477,7 +2477,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2788,7 +2788,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3201,7 +3201,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3512,7 +3512,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3928,7 +3928,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4242,7 +4242,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_html_nodes/subsection.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: 
tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: 
tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_nodes/anchor.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/anchor.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_nodes/chapter.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7

Index: tests/layout/res_parser/formatting_nodes/chapter2.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/chapter2.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_nodes/formatting_abt.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_nodes/formatting_fot.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_nodes/formatting_ovr.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_nodes/formatting_toc.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_nodes/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/index.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- tests/layout/res_parser/formatting_nodes/index.html 26 Aug 2012 23:01:37 
-0000      1.16
+++ tests/layout/res_parser/formatting_nodes/index.html 8 Sep 2012 23:06:36 
-0000       1.17
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2477,7 +2477,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2788,7 +2788,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3201,7 +3201,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3512,7 +3512,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3928,7 +3928,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4242,7 +4242,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_nodes/subsection.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsection.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: 
tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: 
tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_regions/formatting_regions.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/layout/res_parser/formatting_regions/formatting_regions.html  26 Aug 
2012 23:01:38 -0000      1.15
+++ tests/layout/res_parser/formatting_regions/formatting_regions.html  8 Sep 
2012 23:06:36 -0000       1.16
@@ -994,7 +994,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1296,7 +1296,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1708,7 +1708,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2010,7 +2010,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2459,7 +2459,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2761,7 +2761,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3176,7 +3176,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3481,7 +3481,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3894,7 +3894,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4196,7 +4196,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_singular/anchor.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/anchor.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/chapter.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/chapter.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: tests/layout/res_parser/formatting_singular/chapter2.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/chapter2.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/index.htm
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/index.htm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tests/layout/res_parser/formatting_singular/index.htm       26 Aug 2012 
23:01:38 -0000      1.14
+++ tests/layout/res_parser/formatting_singular/index.htm       8 Sep 2012 
23:06:37 -0000       1.15
@@ -1048,7 +1048,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1380,7 +1380,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1799,7 +1799,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2131,7 +2131,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -2553,7 +2553,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2888,7 +2888,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_singular/index.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/index.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/s_002d_002dect_002cion.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/s_002d_002dect_002cion.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/sing_abt.htm
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_abt.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/sing_fot.htm
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_fot.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/sing_ovr.htm
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_ovr.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/sing_toc.htm
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/sing_toc.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_singular/subsection.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/subsection.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: 
tests/layout/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/subsubsection-_0060_0060simple_002ddouble_002d_002d.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: 
tests/layout/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_singular/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5

Index: tests/layout/res_parser/formatting_weird_quotes/formatting.html
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- tests/layout/res_parser/formatting_weird_quotes/formatting.html     26 Aug 
2012 23:01:39 -0000      1.15
+++ tests/layout/res_parser/formatting_weird_quotes/formatting.html     8 Sep 
2012 23:06:37 -0000       1.16
@@ -1003,7 +1003,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em></em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command: <strong>log 
trap1</strong> <em>  </em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2: <strong><b>id 
@<samp>i</samp>'&lsquo; ule</b></strong> <em>truc</em></dt>
@@ -1314,7 +1314,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1727,7 +1727,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
@<samp>i</samp>'&lsquo; ule</b></strong> <em>truc</em></dt>
@@ -2038,7 +2038,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2476,7 +2476,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command: <strong>log trap1</strong> 
<em>  </em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2: <strong><b>id 
@<samp>i</samp>'&lsquo; ule</b></strong> <em>truc</em></dt>
@@ -2787,7 +2787,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and</em></dt>
+<dt><a name="index-copying-machin-2"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-3"></a>truc: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3200,7 +3200,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2: <strong><b>id @<samp>i</samp>'&lsquo; 
ule</b></strong> <em>truc</em></dt>
@@ -3511,7 +3511,7 @@
 
 <dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-2"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-3"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>
@@ -3927,7 +3927,7 @@
 <dt><a name="index-i-2"></a>fset: <strong><var>i</var></strong> <em>a 
g</em></dt>
 <dd><pre class="example"><a 
name="index-index-entry-within-deffn-1"></a></pre></dd><dt><a 
name="index-truc-2"></a>cmde: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> 
<em></em></dt>
+<dt><a name="index-log-trap1-1"></a>Command: <strong>log trap1</strong> <em>  
</em></dt>
 <dt><a name="index-log-trap2-1"></a>Command: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2: <strong><b>id 
@<samp>i</samp>'&lsquo; ule</b></strong> <em>truc</em></dt>
@@ -4241,7 +4241,7 @@
 <pre class="example">
 </pre><dl>
 <dt>fun: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and</em></dt>
+<dt><a name="index-machin-8"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-9"></a>truc: <strong>machin</strong> <em>bidule 
chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc: <strong>machin</strong> <em>bidule 
chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc: <strong>machin</strong> <em>bidule 
chose and and after</em></dt>

Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- tests/layout/res_parser/formatting_xml/formatting.xml       8 Sep 2012 
21:56:25 -0000       1.13
+++ tests/layout/res_parser/formatting_xml/formatting.xml       8 Sep 2012 
23:06:37 -0000       1.14
@@ -1092,7 +1092,7 @@
 <cindex index="cp" spaces=" "><indexterm index="cp">index entry within 
deffn</indexterm></cindex>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2 
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log 
trap2 </deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp> 
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id 
<samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
@@ -1693,7 +1693,7 @@
 <cindex index="cp" spaces=" "><indexterm index="cp">index entry within 
deffn</indexterm></cindex>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2 
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log 
trap2 </deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp> 
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id 
<samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
@@ -2294,7 +2294,7 @@
 <cindex index="cp" spaces=" "><indexterm index="cp">index entry within 
deffn</indexterm></cindex>
 <deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2 
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log 
trap2 </deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp> 
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id 
<samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
@@ -2889,7 +2889,7 @@
 <pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm 
index="cp">index entry within deffn</indexterm></cindex>
 </pre><deffnx spaces=" "><definitionterm><indexterm 
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory> 
<deffunction>truc</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap</indexterm><defcategory>Command</defcategory> <deffunction 
bracketed="on">log trap</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log 
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on" 
spaces=" ">log trap1</deffunction> <defparam bracketed="on"></defparam>  
</definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2 
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log 
trap2 </deffunction> <defparam 
bracketed="on"></defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id 
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id 
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
 <deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp> 
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id 
<samp>i</samp> ule</b></deffunction> 
<defparam>truc</defparam></definitionterm></deffnx>
reply via email to
[Prev in Thread] Current Thread [Next in Thread]