texinfo-commits
[Top][All Lists]
Advanced

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

[8123] def_line spaces_at_end


From: gavinsmith0123
Subject: [8123] def_line spaces_at_end
Date: Sat, 25 Aug 2018 16:26:12 -0400 (EDT)

Revision: 8123
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8123
Author:   gavin
Date:     2018-08-25 16:26:11 -0400 (Sat, 25 Aug 2018)
Log Message:
-----------
def_line spaces_at_end

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/TexinfoXML.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/converters_tests/complex_nestings.pl
    trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
    trunk/tp/t/results/coverage/def.pl
    trunk/tp/t/results/def/all_commands.pl
    trunk/tp/t/results/def/all_commands_delimiters.pl
    trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
    trunk/tp/t/results/def/all_commands_printindex.pl
    trunk/tp/t/results/def/def_defx_mismatch.pl
    trunk/tp/t/results/def/defx_after_comment.pl
    trunk/tp/t/results/def/defx_after_comment_in_example.pl
    trunk/tp/t/results/def/defx_after_empty_line.pl
    trunk/tp/t/results/def/defx_after_empty_line_in_example.pl
    trunk/tp/t/results/def/defx_after_paragraph_end.pl
    trunk/tp/t/results/def/defx_after_preformatted_with_text.pl
    trunk/tp/t/results/def/defx_after_text.pl
    trunk/tp/t/results/def/defx_in_example.pl
    trunk/tp/t/results/def/double_command.pl
    trunk/tp/t/results/def/empty_def_arguments.pl
    trunk/tp/t/results/def/empty_def_command.pl
    trunk/tp/t/results/def/empty_deftype.pl
    trunk/tp/t/results/def/empty_deftypeop_name.pl
    trunk/tp/t/results/def/end_of_lines_protected.pl
    trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl
    trunk/tp/t/results/def/inter_item_commands_in_def.pl
    trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl
    trunk/tp/t/results/def/leading_space_in_def_arg.pl
    trunk/tp/t/results/def/no_category_or_no_name.pl
    trunk/tp/t/results/def/not_closed.pl
    trunk/tp/t/results/def/protected_brace.pl
    trunk/tp/t/results/def/ref_in_def.pl
    trunk/tp/t/results/def/space_in_def_for_index.pl
    trunk/tp/t/results/def/wrong_braces_simple.pl
    trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl
    trunk/tp/t/results/indices/empty_index_entry.pl
    trunk/tp/t/results/indices/empty_string_index_entry.pl
    trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
    
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
    trunk/tp/t/results/info_tests/colon_in_index_entry.pl
    trunk/tp/t/results/info_tests/def_in_copying.pl
    trunk/tp/t/results/info_tests/test_index.pl
    trunk/tp/t/results/invalid_nestings/block_not_matching.pl
    trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
    trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
    trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl
    trunk/tp/t/results/languages/multiple.pl
    trunk/tp/t/results/languages/multiple_lang_chapters.pl
    trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
    trunk/tp/t/results/languages/simple.pl
    trunk/tp/t/results/languages/unknown_region.pl
    trunk/tp/t/results/menu/menu_in_deffn.pl
    trunk/tp/t/results/preformatted/def_in_example.pl
    trunk/tp/t/results/xml_tests/commands_and_spaces.pl
    trunk/tp/tests/coverage/res_parser/formatting/formatting.html
    trunk/tp/tests/coverage/res_parser/formatting_fr/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_chm/index.html
    trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
    trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/index.html
    
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_html/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html
    
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/index.html
    
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
    trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/ChangeLog     2018-08-25 20:26:11 UTC (rev 8123)
@@ -1,5 +1,14 @@
 2018-08-25  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (parse_def): Change the type
+       of final spaces elements to 'spaces_at_end'.  This leads to
+       the spaces being ignored in some output formats.
+       (_next_bracketed_or_word): Remove unused.
+       * tp/Texinfo/Convert/TexinfoXML.pm (_convert) <def commands>:
+       Strip off a final newline.
+
+2018-08-25  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_split_delimiters): New function.
        (_parse_def): Do not produce def_args array via an intermediate
        array of a similar format.  Use "map" with _split_delimiters to

Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm      2018-08-25 20:26:11 UTC (rev 
8123)
@@ -1503,6 +1503,7 @@
           my $type = $arg->[0];
           my $content = $self->_convert($arg->[1]);
           if ($type eq 'spaces') {
+            $content =~ s/\n$//;
             $result .= $content;
           } else {
             my $attribute = [];

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/Texinfo/Parser.pm  2018-08-25 20:26:11 UTC (rev 8123)
@@ -2273,24 +2273,6 @@
   return 0;
 }
 
-# Return array, first element spaces, next element non-space.
-sub _next_bracketed_or_word
-{
-  my ($contents) = @_;
-  my ($spaces, $arg);
-
-  my $next = shift @$contents;
-  if (!defined($next->{'type'}) or $next->{'type'} ne 'spaces') {
-    $arg = $next;
-  } else {
-    $spaces = $next;
-    if (@$contents) {
-      $arg = shift @$contents;
-    }
-  }
-  return ($spaces, $arg);
-}
-
 # split non-space text elements into strings without [ ] ( ) , and single
 # character strings with one of them
 sub _split_delimiters
@@ -2448,13 +2430,9 @@
       shift @contents;
       $arg = shift (@args);
     } elsif ($token->{'type'} and $token->{'type'} eq 'spaces') {
-      if ($token->{'text'} and $token->{'text'} ne "\n") {
+      if ($token->{'text'}) {#  and $token->{'text'} ne "\n") {
         if ($token->{'text'} =~ /\n$/) {
-          # copy, in order not to change in the main tree
-          # TODO: be neater either always to have trailing spaces or never
-          # have them included.
-          $token = { %{$token} };
-          $token->{'text'} =~ s/\n$//;
+          $token->{'type'} = 'spaces_at_end';
         }
         push @result, ['spaces', $token];
         shift @contents;
@@ -2486,13 +2464,9 @@
       $spaces = $next_token;
       $next_token = shift @contents;
     }
-    if (defined($spaces) and $spaces->{'text'} ne "\n") {
+    if (defined($spaces)) {
       if ($spaces->{'text'} =~ /\n$/) {
-        # copy, in order not to change in the main tree
-        # TODO: be neater either always to have trailing spaces or never
-        # have them included.
-        $spaces = { %{$spaces} };
-        $spaces->{'text'} =~ s/\n$//;
+        $spaces->{'type'} = 'spaces_at_end';
       }
       push @args_results, ['spaces', $spaces]
     }

Modified: trunk/tp/t/results/converters_tests/complex_nestings.pl
===================================================================
--- trunk/tp/t/results/converters_tests/complex_nestings.pl     2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/converters_tests/complex_nestings.pl     2018-08-25 
20:26:11 UTC (rev 8123)
@@ -206,6 +206,14 @@
                       [
                         'arg',
                         {}
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defun',
@@ -334,6 +342,14 @@
                         {
                           'text' => 'args'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defun',
@@ -514,6 +530,14 @@
                                 {
                                   'text' => 'args'
                                 }
+                              ],
+                              [
+                                'spaces',
+                                {
+                                  'text' => '
+',
+                                  'type' => 'spaces_at_end'
+                                }
                               ]
                             ],
                             'def_command' => 'deffn',
@@ -626,6 +650,14 @@
                                         {
                                           'text' => 'variable-name'
                                         }
+                                      ],
+                                      [
+                                        'spaces',
+                                        {
+                                          'text' => '
+',
+                                          'type' => 'spaces_at_end'
+                                        }
                                       ]
                                     ],
                                     'def_command' => 'defvar',
@@ -752,6 +784,14 @@
                                         {
                                           'text' => 'other-variable'
                                         }
+                                      ],
+                                      [
+                                        'spaces',
+                                        {
+                                          'text' => '
+',
+                                          'type' => 'spaces_at_end'
+                                        }
                                       ]
                                     ],
                                     'def_command' => 'defvar',

Modified: trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
--- trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl        
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl        
2018-08-25 20:26:11 UTC (rev 8123)
@@ -180,6 +180,14 @@
                     {
                       'text' => 'arguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefun',
@@ -334,6 +342,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -570,6 +586,14 @@
                     {
                       'text' => 'arguments2...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefun',
@@ -724,6 +748,14 @@
                     {
                       'text' => 'arg2'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/coverage/def.pl
===================================================================
--- trunk/tp/t/results/coverage/def.pl  2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/coverage/def.pl  2018-08-25 20:26:11 UTC (rev 8123)
@@ -95,6 +95,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -382,6 +390,14 @@
                 {
                   'text' => 'so'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -591,6 +607,14 @@
                 {
                   'text' => 'g'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -700,6 +724,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -810,6 +842,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -927,8 +967,9 @@
               [
                 'spaces',
                 {
-                  'text' => '  ',
-                  'type' => 'spaces'
+                  'text' => '  
+',
+                  'type' => 'spaces_at_end'
                 }
               ]
             ],
@@ -1045,6 +1086,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1161,6 +1210,14 @@
                 {
                   'text' => 'truc'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1299,6 +1356,14 @@
                 {
                   'text' => 'truc'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1378,6 +1443,14 @@
                 {
                   'text' => 'machin'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1462,6 +1535,14 @@
               [
                 'name',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1545,6 +1626,14 @@
                 {
                   'text' => 'machin'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1693,6 +1782,14 @@
                 {
                   'text' => 'comment'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1866,6 +1963,14 @@
                 {
                   'text' => 'item'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -2039,6 +2144,14 @@
                 {
                   'text' => 'deffn'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -2429,7 +2542,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -2621,7 +2734,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>
@@ -2676,7 +2789,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>

Modified: trunk/tp/t/results/def/all_commands.pl
===================================================================
--- trunk/tp/t/results/def/all_commands.pl      2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/all_commands.pl      2018-08-25 20:26:11 UTC (rev 
8123)
@@ -59,6 +59,14 @@
                 {
                   'text' => 'd--efvr_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defvr',
@@ -251,6 +259,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -464,6 +480,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -646,6 +670,14 @@
                 {
                   'text' => 'd--eftypevr_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypevr',
@@ -819,6 +851,14 @@
                 {
                   'text' => 'd--efcv_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defcv',
@@ -1012,6 +1052,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defop',
@@ -1193,6 +1241,14 @@
                 {
                   'text' => 'a--ttributes...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftp',
@@ -1364,6 +1420,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defun',
@@ -1535,6 +1599,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defmac',
@@ -1706,6 +1778,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defspec',
@@ -1857,6 +1937,14 @@
                 {
                   'text' => 'd--efvar_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defvar',
@@ -2008,6 +2096,14 @@
                 {
                   'text' => 'd--efopt_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defopt',
@@ -2199,6 +2295,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefun',
@@ -2371,6 +2475,14 @@
                 {
                   'text' => 'd--eftypevar_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypevar',
@@ -2543,6 +2655,14 @@
                 {
                   'text' => 'd--efivar_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defivar',
@@ -2743,6 +2863,14 @@
                 {
                   'text' => 'd--eftypeivar_name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeivar',
@@ -2944,6 +3072,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defmethod',
@@ -3164,6 +3300,14 @@
                 {
                   'text' => 'a--rguments...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypemethod',

Modified: trunk/tp/t/results/def/all_commands_delimiters.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters.pl   2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/all_commands_delimiters.pl   2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -464,6 +464,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -954,6 +962,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defvr',
@@ -1248,6 +1264,14 @@
                   'text' => ')',
                   'type' => 'delimiter'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -1881,6 +1905,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -2069,6 +2101,14 @@
               [
                 'typearg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -2490,6 +2530,14 @@
                 {
                   'text' => 'end'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -2955,6 +3003,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypevr',
@@ -3440,6 +3496,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftp',
@@ -3904,6 +3968,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defcv',
@@ -4402,6 +4474,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypecv',
@@ -4866,6 +4946,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defop',
@@ -5370,6 +5458,14 @@
                 {
                   'text' => 'last'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -5608,6 +5704,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -5856,6 +5960,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -6104,6 +6216,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -6342,6 +6462,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -6580,6 +6708,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -6828,6 +6964,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -7076,6 +7220,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -7314,6 +7466,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -7552,6 +7712,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -7800,6 +7968,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -8048,6 +8224,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -8286,6 +8470,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -8524,6 +8716,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -8778,6 +8978,14 @@
                 {
                   'text' => 'name'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -8978,6 +9186,14 @@
                 {
                   'text' => 'arguments'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defun',
@@ -9209,6 +9425,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -9436,6 +9660,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -9663,6 +9895,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defvr',
@@ -9890,6 +10130,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defvr',
@@ -10150,6 +10398,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -10411,6 +10667,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -10672,6 +10936,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypevr',
@@ -10933,6 +11205,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypevr',
@@ -11161,6 +11441,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftp',
@@ -11388,6 +11676,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftp',
@@ -11648,6 +11944,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defcv',
@@ -11909,6 +12213,14 @@
               [
                 'typearg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftp',
@@ -12200,6 +12512,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypecv',
@@ -12501,6 +12821,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypecv',
@@ -12769,6 +13097,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defop',
@@ -13036,6 +13372,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defop',
@@ -13336,6 +13680,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -13637,6 +13989,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',
@@ -13952,6 +14312,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',
@@ -14258,6 +14626,14 @@
               [
                 'typearg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefn',

Modified: trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters_printindex.pl        
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/all_commands_delimiters_printindex.pl        
2018-08-25 20:26:11 UTC (rev 8123)
@@ -495,6 +495,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -986,6 +994,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvr',
@@ -1281,6 +1297,14 @@
                       'text' => ')',
                       'type' => 'delimiter'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -1915,6 +1939,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -2104,6 +2136,14 @@
                   [
                     'typearg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -2526,6 +2566,14 @@
                     {
                       'text' => 'end'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -2992,6 +3040,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypevr',
@@ -3478,6 +3534,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftp',
@@ -3943,6 +4007,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defcv',
@@ -4442,6 +4514,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypecv',
@@ -4907,6 +4987,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defop',
@@ -5412,6 +5500,14 @@
                     {
                       'text' => 'last'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -5651,6 +5747,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -5900,6 +6004,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -6149,6 +6261,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -6388,6 +6508,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -6627,6 +6755,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -6876,6 +7012,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -7125,6 +7269,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -7364,6 +7516,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -7603,6 +7763,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -7852,6 +8020,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -8101,6 +8277,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -8340,6 +8524,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -8579,6 +8771,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -8834,6 +9034,14 @@
                     {
                       'text' => 'name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -9035,6 +9243,14 @@
                     {
                       'text' => 'arguments'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defun',
@@ -9267,6 +9483,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -9495,6 +9719,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -9723,6 +9955,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvr',
@@ -9951,6 +10191,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvr',
@@ -10212,6 +10460,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -10474,6 +10730,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -10736,6 +11000,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypevr',
@@ -10998,6 +11270,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypevr',
@@ -11227,6 +11507,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftp',
@@ -11455,6 +11743,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftp',
@@ -11716,6 +12012,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defcv',
@@ -11978,6 +12282,14 @@
                   [
                     'typearg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftp',
@@ -12270,6 +12582,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypecv',
@@ -12572,6 +12892,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypecv',
@@ -12841,6 +13169,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defop',
@@ -13109,6 +13445,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defop',
@@ -13410,6 +13754,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -13712,6 +14064,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -14028,6 +14388,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -14335,6 +14703,14 @@
                   [
                     'typearg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',

Modified: trunk/tp/t/results/def/all_commands_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_printindex.pl   2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/all_commands_printindex.pl   2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -90,6 +90,14 @@
                     {
                       'text' => 'd--efvr_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvr',
@@ -283,6 +291,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefn',
@@ -497,6 +513,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeop',
@@ -680,6 +704,14 @@
                     {
                       'text' => 'd--eftypevr_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypevr',
@@ -854,6 +886,14 @@
                     {
                       'text' => 'd--efcv_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defcv',
@@ -1048,6 +1088,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defop',
@@ -1230,6 +1278,14 @@
                     {
                       'text' => 'a--ttributes...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftp',
@@ -1402,6 +1458,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defun',
@@ -1574,6 +1638,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defmac',
@@ -1746,6 +1818,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defspec',
@@ -1898,6 +1978,14 @@
                     {
                       'text' => 'd--efvar_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvar',
@@ -2050,6 +2138,14 @@
                     {
                       'text' => 'd--efopt_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defopt',
@@ -2242,6 +2338,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypefun',
@@ -2415,6 +2519,14 @@
                     {
                       'text' => 'd--eftypevar_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypevar',
@@ -2588,6 +2700,14 @@
                     {
                       'text' => 'd--efivar_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',
@@ -2789,6 +2909,14 @@
                     {
                       'text' => 'd--eftypeivar_name'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypeivar',
@@ -2991,6 +3119,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defmethod',
@@ -3212,6 +3348,14 @@
                     {
                       'text' => 'a--rguments...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deftypemethod',

Modified: trunk/tp/t/results/def/def_defx_mismatch.pl
===================================================================
--- trunk/tp/t/results/def/def_defx_mismatch.pl 2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/def_defx_mismatch.pl 2018-08-25 20:26:11 UTC (rev 
8123)
@@ -149,6 +149,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defun',
@@ -323,6 +331,14 @@
                 {
                   'text' => 'args'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_after_comment.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_comment.pl        2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/defx_after_comment.pl        2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -116,6 +116,14 @@
                 {
                   'text' => 'g'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -248,6 +256,14 @@
                 {
                   'text' => 'machin...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_after_comment_in_example.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_comment_in_example.pl     2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/defx_after_comment_in_example.pl     2018-08-25 
20:26:11 UTC (rev 8123)
@@ -125,6 +125,14 @@
                     {
                       'text' => 'g'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -263,6 +271,14 @@
                     {
                       'text' => 'machin...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_after_empty_line.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_empty_line.pl     2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/defx_after_empty_line.pl     2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -116,6 +116,14 @@
                 {
                   'text' => 'g'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -236,6 +244,14 @@
                 {
                   'text' => 'machin...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_after_empty_line_in_example.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_empty_line_in_example.pl  2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/defx_after_empty_line_in_example.pl  2018-08-25 
20:26:11 UTC (rev 8123)
@@ -125,6 +125,14 @@
                     {
                       'text' => 'g'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -293,6 +301,14 @@
                     {
                       'text' => 'machin...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_after_paragraph_end.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_paragraph_end.pl  2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/defx_after_paragraph_end.pl  2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -116,6 +116,14 @@
                 {
                   'text' => 'g'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -247,6 +255,14 @@
                 {
                   'text' => 'machin...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_after_preformatted_with_text.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_preformatted_with_text.pl 2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/defx_after_preformatted_with_text.pl 2018-08-25 
20:26:11 UTC (rev 8123)
@@ -125,6 +125,14 @@
                     {
                       'text' => 'g'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -256,6 +264,14 @@
                     {
                       'text' => 'machin...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_after_text.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_text.pl   2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/defx_after_text.pl   2018-08-25 20:26:11 UTC (rev 
8123)
@@ -116,6 +116,14 @@
                 {
                   'text' => 'g'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -241,6 +249,14 @@
                 {
                   'text' => 'machin...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/defx_in_example.pl
===================================================================
--- trunk/tp/t/results/def/defx_in_example.pl   2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/defx_in_example.pl   2018-08-25 20:26:11 UTC (rev 
8123)
@@ -125,6 +125,14 @@
                     {
                       'text' => 'g'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -233,6 +241,14 @@
                     {
                       'text' => 'machin...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/double_command.pl
===================================================================
--- trunk/tp/t/results/def/double_command.pl    2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/double_command.pl    2018-08-25 20:26:11 UTC (rev 
8123)
@@ -253,6 +253,14 @@
                           'text' => ')',
                           'type' => 'delimiter'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'deffn',
@@ -592,6 +600,14 @@
                             {
                               'text' => 'd--efvr_name'
                             }
+                          ],
+                          [
+                            'spaces',
+                            {
+                              'text' => '
+',
+                              'type' => 'spaces_at_end'
+                            }
                           ]
                         ],
                         'def_command' => 'defvr',

Modified: trunk/tp/t/results/def/empty_def_arguments.pl
===================================================================
--- trunk/tp/t/results/def/empty_def_arguments.pl       2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/empty_def_arguments.pl       2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -116,6 +116,14 @@
                 {
                   'text' => 'g'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -217,8 +225,9 @@
               [
                 'spaces',
                 {
-                  'text' => '    ',
-                  'type' => 'spaces'
+                  'text' => '    
+',
+                  'type' => 'spaces_at_end'
                 }
               ]
             ],
@@ -296,6 +305,14 @@
                 {
                   'text' => 'aaa'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -369,6 +386,14 @@
               [
                 'name',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -413,6 +438,14 @@
               [
                 'category',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -484,6 +517,14 @@
               [
                 'name',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -532,6 +573,14 @@
               [
                 'category',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -595,6 +644,14 @@
               [
                 'name',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/empty_def_command.pl
===================================================================
--- trunk/tp/t/results/def/empty_def_command.pl 2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/empty_def_command.pl 2018-08-25 20:26:11 UTC (rev 
8123)
@@ -59,6 +59,14 @@
                 {
                   'text' => 'deffn'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -234,6 +242,14 @@
                 {
                   'text' => 'deffnx'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -316,6 +332,14 @@
                 {
                   'text' => 'deffnx'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/empty_deftype.pl
===================================================================
--- trunk/tp/t/results/def/empty_deftype.pl     2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/empty_deftype.pl     2018-08-25 20:26:11 UTC (rev 
8123)
@@ -157,6 +157,14 @@
                   'text' => ')',
                   'type' => 'delimiter'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypefun',
@@ -379,6 +387,14 @@
                   'text' => ')',
                   'type' => 'delimiter'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defun',
@@ -649,6 +665,14 @@
                   'text' => ')',
                   'type' => 'delimiter'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypemethod',
@@ -900,6 +924,14 @@
                   'text' => ')',
                   'type' => 'delimiter'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defmethod',

Modified: trunk/tp/t/results/def/empty_deftypeop_name.pl
===================================================================
--- trunk/tp/t/results/def/empty_deftypeop_name.pl      2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/empty_deftypeop_name.pl      2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -153,6 +153,14 @@
                     {}
                   ]
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deftypeop',

Modified: trunk/tp/t/results/def/end_of_lines_protected.pl
===================================================================
--- trunk/tp/t/results/def/end_of_lines_protected.pl    2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/end_of_lines_protected.pl    2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -237,6 +237,14 @@
               [
                 'arg',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl
===================================================================
--- trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl        
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl        
2018-08-25 20:26:11 UTC (rev 8123)
@@ -263,6 +263,14 @@
                           [
                             'arg',
                             {}
+                          ],
+                          [
+                            'spaces',
+                            {
+                              'text' => '
+',
+                              'type' => 'spaces_at_end'
+                            }
                           ]
                         ],
                         'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/inter_item_commands_in_def.pl
===================================================================
--- trunk/tp/t/results/def/inter_item_commands_in_def.pl        2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/inter_item_commands_in_def.pl        2018-08-25 
20:26:11 UTC (rev 8123)
@@ -116,6 +116,14 @@
                 {
                   'text' => 'g'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -262,8 +270,9 @@
               [
                 'spaces',
                 {
-                  'text' => '  ',
-                  'type' => 'spaces'
+                  'text' => '  
+',
+                  'type' => 'spaces_at_end'
                 }
               ]
             ],
@@ -459,6 +468,14 @@
                 {
                   'text' => 'truc'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -712,7 +729,7 @@
 
 $result_texts{'inter_item_commands_in_def'} = 'fset: i a g
 
-Command: log trap1   
+Command: log trap1 
 cmde2: id i ule truc
 
 In deff item.

Modified: trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl
===================================================================
--- trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl     
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl     
2018-08-25 20:26:11 UTC (rev 8123)
@@ -125,6 +125,14 @@
                     {
                       'text' => 'g'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -277,8 +285,9 @@
                   [
                     'spaces',
                     {
-                      'text' => '  ',
-                      'type' => 'spaces'
+                      'text' => '  
+',
+                      'type' => 'spaces_at_end'
                     }
                   ]
                 ],
@@ -480,6 +489,14 @@
                     {
                       'text' => 'truc'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -796,7 +813,7 @@
 
 $result_texts{'inter_item_commands_in_def_in_example'} = 'fset: i a g
 
-Command: log trap1   
+Command: log trap1 
 cmde2: id i ule truc
 
 In deff item.

Modified: trunk/tp/t/results/def/leading_space_in_def_arg.pl
===================================================================
--- trunk/tp/t/results/def/leading_space_in_def_arg.pl  2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/leading_space_in_def_arg.pl  2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -92,6 +92,14 @@
                 {
                   'text' => 'arg'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/no_category_or_no_name.pl
===================================================================
--- trunk/tp/t/results/def/no_category_or_no_name.pl    2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/no_category_or_no_name.pl    2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -151,6 +151,14 @@
               [
                 'category',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -327,8 +335,9 @@
               [
                 'spaces',
                 {
-                  'text' => ' ',
-                  'type' => 'spaces'
+                  'text' => ' 
+',
+                  'type' => 'spaces_at_end'
                 }
               ]
             ],
@@ -392,6 +401,14 @@
                 {
                   'text' => 'deffnx_category'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -596,7 +613,7 @@
 only category: 
 no name
 
-a: b c d 
+a: b c d
 deffnx_category: 
 with deffnx missing category or name
 ';

Modified: trunk/tp/t/results/def/not_closed.pl
===================================================================
--- trunk/tp/t/results/def/not_closed.pl        2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/not_closed.pl        2018-08-25 20:26:11 UTC (rev 
8123)
@@ -79,6 +79,14 @@
                 {
                   'text' => 'machin'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -181,6 +189,14 @@
                 {
                   'text' => 'args'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -307,6 +323,14 @@
                         {
                           'text' => 'bidule'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defvar',

Modified: trunk/tp/t/results/def/protected_brace.pl
===================================================================
--- trunk/tp/t/results/def/protected_brace.pl   2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/protected_brace.pl   2018-08-25 20:26:11 UTC (rev 
8123)
@@ -58,6 +58,14 @@
               [
                 'name',
                 {}
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/ref_in_def.pl
===================================================================
--- trunk/tp/t/results/def/ref_in_def.pl        2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/def/ref_in_def.pl        2018-08-25 20:26:11 UTC (rev 
8123)
@@ -311,6 +311,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -571,6 +579,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/space_in_def_for_index.pl
===================================================================
--- trunk/tp/t/results/def/space_in_def_for_index.pl    2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/space_in_def_for_index.pl    2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -182,6 +182,14 @@
                     {
                       'text' => 'argument2...'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -297,6 +305,14 @@
                     {
                       'text' => 'arg3'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/def/wrong_braces_simple.pl
===================================================================
--- trunk/tp/t/results/def/wrong_braces_simple.pl       2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/def/wrong_braces_simple.pl       2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -123,8 +123,9 @@
               [
                 'spaces',
                 {
-                  'text' => ' ',
-                  'type' => 'spaces'
+                  'text' => ' 
+',
+                  'type' => 'spaces_at_end'
                 }
               ]
             ],
@@ -341,6 +342,14 @@
                 {
                   'text' => 'after'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -976,6 +985,14 @@
                 {
                   'text' => 'e'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1122,8 +1139,9 @@
               [
                 'spaces',
                 {
-                  'text' => ' ',
-                  'type' => 'spaces'
+                  'text' => ' 
+',
+                  'type' => 'spaces_at_end'
                 }
               ]
             ],
@@ -1288,6 +1306,14 @@
                 {
                   'text' => 'after'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',
@@ -1873,7 +1899,7 @@
 ';
 
 
-$result_texts{'wrong_braces_simple'} = 'truc: machin bidule chose and 
+$result_texts{'wrong_braces_simple'} = 'truc: machin bidule chose and
 
 truc: machin bidule chose and  after
 
@@ -1882,7 +1908,7 @@
 truc: machin bidule chose and and after
 
 a: b c d e
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl
===================================================================
--- trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl    2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl    2018-08-25 
20:26:11 UTC (rev 8123)
@@ -329,6 +329,14 @@
                 {
                   'text' => 'args'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/indices/empty_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/empty_index_entry.pl     2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/indices/empty_index_entry.pl     2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -105,6 +105,14 @@
                   [
                     'name',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/indices/empty_string_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/empty_string_index_entry.pl      2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/indices/empty_string_index_entry.pl      2018-08-25 
20:26:11 UTC (rev 8123)
@@ -383,6 +383,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defun',
@@ -522,6 +530,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defun',

Modified: trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
===================================================================
--- trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl     
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl     
2018-08-25 20:26:11 UTC (rev 8123)
@@ -152,6 +152,14 @@
                         {
                           'text' => 'arg'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defun',
@@ -254,6 +262,14 @@
                         {
                           'text' => 'arg'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defun',

Modified: 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
===================================================================
--- 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    2018-08-25 20:26:11 UTC (rev 8123)
@@ -152,6 +152,14 @@
                         {
                           'text' => 'arg'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defun',
@@ -254,6 +262,14 @@
                         {
                           'text' => 'arg'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defun',

Modified: trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
===================================================================
--- trunk/tp/t/results/indices/same_index_entry_merged_indices.pl       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/indices/same_index_entry_merged_indices.pl       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -233,6 +233,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -381,6 +389,14 @@
                     {
                       'text' => 'mmm-mode'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvar',

Modified: trunk/tp/t/results/info_tests/colon_in_index_entry.pl
===================================================================
--- trunk/tp/t/results/info_tests/colon_in_index_entry.pl       2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/info_tests/colon_in_index_entry.pl       2018-08-25 
20:26:11 UTC (rev 8123)
@@ -406,6 +406,14 @@
                     {
                       'text' => 'f'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvr',
@@ -561,6 +569,14 @@
                     {
                       'text' => 'o'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defvr',

Modified: trunk/tp/t/results/info_tests/def_in_copying.pl
===================================================================
--- trunk/tp/t/results/info_tests/def_in_copying.pl     2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/info_tests/def_in_copying.pl     2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -246,6 +246,14 @@
                         {
                           'text' => 'cc'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'deffn',
@@ -349,6 +357,14 @@
                         {
                           'text' => 'ccx'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'deffn',
@@ -583,6 +599,14 @@
                     {
                       'text' => 'cc'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -686,6 +710,14 @@
                     {
                       'text' => 'ccx'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/info_tests/test_index.pl
===================================================================
--- trunk/tp/t/results/info_tests/test_index.pl 2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/info_tests/test_index.pl 2018-08-25 20:26:11 UTC (rev 
8123)
@@ -666,6 +666,14 @@
                     {
                       'text' => 'g'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',
@@ -785,6 +793,14 @@
                     {
                       'text' => 'chose'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/t/results/invalid_nestings/block_not_matching.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/block_not_matching.pl   2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/invalid_nestings/block_not_matching.pl   2018-08-25 
20:26:11 UTC (rev 8123)
@@ -126,6 +126,14 @@
                 {
                   'text' => '$filehandle'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'deffn',

Modified: trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2018-08-25 
20:26:11 UTC (rev 8123)
@@ -107,6 +107,14 @@
                 {
                   'text' => 'args...'
                 }
+              ],
+              [
+                'spaces',
+                {
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
               ]
             ],
             'def_command' => 'defun',

Modified: 
trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl   
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl   
2018-08-25 20:26:11 UTC (rev 8123)
@@ -122,6 +122,14 @@
                             {
                               'text' => 'chose'
                             }
+                          ],
+                          [
+                            'spaces',
+                            {
+                              'text' => '
+',
+                              'type' => 'spaces_at_end'
+                            }
                           ]
                         ],
                         'def_command' => 'deffn',

Modified: trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl 2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl 2018-08-25 
20:26:11 UTC (rev 8123)
@@ -105,8 +105,9 @@
                   [
                     'spaces',
                     {
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' 
+',
+                      'type' => 'spaces_at_end'
                     }
                   ]
                 ],
@@ -286,7 +287,7 @@
 ';
 
 
-$result_texts{'section_on_defx_line'} = 'h: j k l 
+$result_texts{'section_on_defx_line'} = 'h: j k l
 1 s
 ===
 

Modified: trunk/tp/t/results/languages/multiple.pl
===================================================================
--- trunk/tp/t/results/languages/multiple.pl    2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/languages/multiple.pl    2018-08-25 20:26:11 UTC (rev 
8123)
@@ -155,6 +155,14 @@
                         {
                           'text' => 'b'
                         }
+                      ],
+                      [
+                        'spaces',
+                        {
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
                       ]
                     ],
                     'def_command' => 'defivar',
@@ -428,6 +436,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',
@@ -678,6 +694,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',

Modified: trunk/tp/t/results/languages/multiple_lang_chapters.pl
===================================================================
--- trunk/tp/t/results/languages/multiple_lang_chapters.pl      2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/languages/multiple_lang_chapters.pl      2018-08-25 
20:26:11 UTC (rev 8123)
@@ -790,6 +790,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',
@@ -1154,6 +1162,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',
@@ -1472,6 +1488,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',

Modified: trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
===================================================================
--- trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl    
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl    
2018-08-25 20:26:11 UTC (rev 8123)
@@ -790,6 +790,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',
@@ -1154,6 +1162,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',
@@ -1472,6 +1488,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',

Modified: trunk/tp/t/results/languages/simple.pl
===================================================================
--- trunk/tp/t/results/languages/simple.pl      2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/languages/simple.pl      2018-08-25 20:26:11 UTC (rev 
8123)
@@ -182,6 +182,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',

Modified: trunk/tp/t/results/languages/unknown_region.pl
===================================================================
--- trunk/tp/t/results/languages/unknown_region.pl      2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/languages/unknown_region.pl      2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -182,6 +182,14 @@
                     {
                       'text' => 'CCC'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defivar',

Modified: trunk/tp/t/results/menu/menu_in_deffn.pl
===================================================================
--- trunk/tp/t/results/menu/menu_in_deffn.pl    2018-08-25 18:57:02 UTC (rev 
8122)
+++ trunk/tp/t/results/menu/menu_in_deffn.pl    2018-08-25 20:26:11 UTC (rev 
8123)
@@ -120,8 +120,9 @@
                   [
                     'spaces',
                     {
-                      'text' => ' ',
-                      'type' => 'spaces'
+                      'text' => ' 
+',
+                      'type' => 'spaces_at_end'
                     }
                   ]
                 ],
@@ -410,7 +411,7 @@
 
 
 $result_texts{'menu_in_deffn'} = '
-a: b c 
+a: b c
 * (mynode)::
 ';
 

Modified: trunk/tp/t/results/preformatted/def_in_example.pl
===================================================================
--- trunk/tp/t/results/preformatted/def_in_example.pl   2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/preformatted/def_in_example.pl   2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -87,6 +87,14 @@
                     {
                       'text' => 'arg'
                     }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'defun',

Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-08-25 18:57:02 UTC 
(rev 8122)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2018-08-25 20:26:11 UTC 
(rev 8123)
@@ -1846,6 +1846,14 @@
                   [
                     'arg',
                     {}
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
                   ]
                 ],
                 'def_command' => 'deffn',

Modified: trunk/tp/tests/coverage/res_parser/formatting/formatting.html
===================================================================
--- trunk/tp/tests/coverage/res_parser/formatting/formatting.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/coverage/res_parser/formatting/formatting.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,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>
@@ -1328,7 +1328,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>
@@ -1743,7 +1743,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>
@@ -2059,7 +2059,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>
@@ -2501,7 +2501,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>
@@ -2817,7 +2817,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>
@@ -3232,7 +3232,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>
@@ -3548,7 +3548,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>
@@ -4005,7 +4005,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>
@@ -4363,7 +4363,7 @@
 
 </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>

Modified: trunk/tp/tests/coverage/res_parser/formatting_fr/formatting.html
===================================================================
--- trunk/tp/tests/coverage/res_parser/formatting_fr/formatting.html    
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/coverage/res_parser/formatting_fr/formatting.html    
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command&nbsp;: <strong>log 
trap</strong> <em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em>  </em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em></em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command&nbsp;: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde&nbsp;: <strong><b>id 
ule</b></strong> <em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1328,7 +1328,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1743,7 +1743,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command&nbsp;: <strong>log 
trap</strong> <em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em>  </em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em></em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command&nbsp;: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde&nbsp;: <strong><b>id 
ule</b></strong> <em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2059,7 +2059,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-copying-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2501,7 +2501,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command&nbsp;: <strong>log 
trap</strong> <em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em>  </em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em></em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command&nbsp;: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde&nbsp;: <strong><b>id 
ule</b></strong> <em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2817,7 +2817,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-copying-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3232,7 +3232,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-log-trap"></a>Command&nbsp;: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em>  </em></dt>
+<dt><a name="index-log-trap1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em></em></dt>
 <dt><a name="index-log-trap2"></a>Command&nbsp;: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde&nbsp;: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3548,7 +3548,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -4005,7 +4005,7 @@
 <dt><a name="index-i-2"></a>fset&nbsp;: <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&nbsp;: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command&nbsp;: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em>  </em></dt>
+<dt><a name="index-log-trap1-1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em></em></dt>
 <dt><a name="index-log-trap2-1"></a>Command&nbsp;: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde&nbsp;: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4363,7 +4363,7 @@
 
 </pre><dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-machin-8"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-machin-9"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html 2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html 2018-08-25 
20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html        
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html        
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html     
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html     
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,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>
@@ -1328,7 +1328,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>
@@ -1743,7 +1743,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>
@@ -2059,7 +2059,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>
@@ -2484,7 +2484,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>
@@ -2800,7 +2800,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>
@@ -3215,7 +3215,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>
@@ -3531,7 +3531,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>
@@ -3988,7 +3988,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>
@@ -4346,7 +4346,7 @@
 
 </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>

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/index.html  2018-08-25 
18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/index.html  2018-08-25 
20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html     
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html     
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
   2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
   2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -307,11 +307,11 @@
 <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>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase>    
</synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase></synopsis>
 <synopsis></synopsis>
 <synopsis><phrase role="category"><emphasis 
role="bold">aaa</emphasis>:</phrase></synopsis>
 <synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> 
<function></function></synopsis>
@@ -807,11 +807,11 @@
 <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>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase>    
</synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase></synopsis>
 <synopsis></synopsis>
 <synopsis><phrase role="category"><emphasis 
role="bold">aaa</emphasis>:</phrase></synopsis>
 <synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> 
<function></function></synopsis>
@@ -1308,11 +1308,11 @@
 <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>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase>    
</synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase></synopsis>
 <synopsis></synopsis>
 <synopsis><phrase role="category"><emphasis 
role="bold">aaa</emphasis>:</phrase></synopsis>
 <synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> 
<function></function></synopsis>
@@ -1810,11 +1810,11 @@
 <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>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase>    
</synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase></synopsis>
 <synopsis></synopsis>
 <synopsis><phrase role="category"><emphasis 
role="bold">aaa</emphasis>:</phrase></synopsis>
 <synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> 
<function></function></synopsis>
@@ -2311,11 +2311,11 @@
 <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>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase>    
</synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase></synopsis>
 <synopsis></synopsis>
 <synopsis><phrase role="category"><emphasis 
role="bold">aaa</emphasis>:</phrase></synopsis>
 <synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> 
<function></function></synopsis>
@@ -2804,11 +2804,11 @@
 </screen><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>
 <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>
-<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase>    
</synopsis>
+<synopsis><phrase role="category"><emphasis role="bold"><emphasis 
role="bold">id &#8216;i&#8217; ule</emphasis></emphasis>:</phrase></synopsis>
 <synopsis></synopsis>
 <synopsis><phrase role="category"><emphasis 
role="bold">aaa</emphasis>:</phrase></synopsis>
 <synopsis><phrase role="category"><emphasis role="bold"></emphasis>:</phrase> 
<function></function></synopsis>

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html      
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html      
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html     
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html     
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html    
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html    
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html      
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html      
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html      
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html      
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html      
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html      
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/index.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/index.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1026,7 +1026,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>
@@ -1342,7 +1342,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>
@@ -1757,7 +1757,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>
@@ -2073,7 +2073,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>
@@ -2530,7 +2530,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>
@@ -2888,7 +2888,7 @@
 
 </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>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html  
    2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html  
    2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
        2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
        2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html        
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html        
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,7 @@
 <dd><a name="index-titlepage-index-entry-within-deffn"></a>
 </dd><dt><a name="index-titlepage-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-titlepage-log-trap"></a>Command&nbsp;: <strong>log 
trap</strong> <em></em></dt>
-<dt><a name="index-titlepage-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em>  </em></dt>
+<dt><a name="index-titlepage-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em></em></dt>
 <dt><a name="index-titlepage-log-trap2"></a>Command&nbsp;: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-titlepage-id-ule"></a>cmde&nbsp;: <strong><b>id 
ule</b></strong> <em>truc</em></dt>
 <dt><a name="index-titlepage-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -1328,7 +1328,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-titlepage-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-titlepage-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-titlepage-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-titlepage-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-titlepage-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -1743,7 +1743,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command&nbsp;: <strong>log 
trap</strong> <em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em>  </em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em></em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command&nbsp;: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde&nbsp;: <strong><b>id 
ule</b></strong> <em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2059,7 +2059,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-copying-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -2501,7 +2501,7 @@
 <dd><a name="index-copying-index-entry-within-deffn"></a>
 </dd><dt><a name="index-copying-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-copying-log-trap"></a>Command&nbsp;: <strong>log 
trap</strong> <em></em></dt>
-<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em>  </em></dt>
+<dt><a name="index-copying-log-trap1"></a>Command&nbsp;: <strong>log 
trap1</strong> <em></em></dt>
 <dt><a name="index-copying-log-trap2"></a>Command&nbsp;: <strong>log 
trap2</strong> <em></em></dt>
 <dt><a name="index-copying-id-ule"></a>cmde&nbsp;: <strong><b>id 
ule</b></strong> <em>truc</em></dt>
 <dt><a name="index-copying-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -2817,7 +2817,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-copying-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-copying-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-copying-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-copying-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -3232,7 +3232,7 @@
 <dd><a name="index-index-entry-within-deffn"></a>
 </dd><dt><a name="index-truc"></a>cmde&nbsp;: <strong>truc</strong> 
<em></em></dt>
 <dt><a name="index-log-trap"></a>Command&nbsp;: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em>  </em></dt>
+<dt><a name="index-log-trap1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em></em></dt>
 <dt><a name="index-log-trap2"></a>Command&nbsp;: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule"></a>cmde&nbsp;: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -3548,7 +3548,7 @@
 
 <dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-machin-2"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-machin-3"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-machin-4"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-machin-5"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>
@@ -4005,7 +4005,7 @@
 <dt><a name="index-i-2"></a>fset&nbsp;: <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&nbsp;: <strong>truc</strong> <em></em></dt>
 <dt><a name="index-log-trap-1"></a>Command&nbsp;: <strong>log trap</strong> 
<em></em></dt>
-<dt><a name="index-log-trap1-1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em>  </em></dt>
+<dt><a name="index-log-trap1-1"></a>Command&nbsp;: <strong>log trap1</strong> 
<em></em></dt>
 <dt><a name="index-log-trap2-1"></a>Command&nbsp;: <strong>log trap2</strong> 
<em></em></dt>
 <dt><a name="index-id-ule-1"></a>cmde&nbsp;: <strong><b>id ule</b></strong> 
<em>truc</em></dt>
 <dt><a name="index-id-i-ule-1"></a>cmde2&nbsp;: <strong><b>id 
&lsquo;<samp>i</samp>&rsquo; ule</b></strong> <em>truc</em></dt>
@@ -4363,7 +4363,7 @@
 
 </pre><dl>
 <dt>fun&nbsp;: <strong></strong></dt>
-<dt><a name="index-machin-8"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
+<dt><a name="index-machin-8"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and</em></dt>
 <dt><a name="index-machin-9"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and  after</em></dt>
 <dt><a name="index-machin-10"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and </em></dt>
 <dt><a name="index-machin-11"></a>truc&nbsp;: <strong>machin</strong> 
<em>bidule chose and and after</em></dt>

Modified: trunk/tp/tests/layout/res_parser/formatting_html/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html/formatting.html    
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html/formatting.html    
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,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>
@@ -1328,7 +1328,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>
@@ -1743,7 +1743,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>
@@ -2059,7 +2059,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>
@@ -2501,7 +2501,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>
@@ -2817,7 +2817,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>
@@ -3232,7 +3232,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>
@@ -3548,7 +3548,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>
@@ -4005,7 +4005,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>
@@ -4363,7 +4363,7 @@
 
 </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>

Modified: trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -977,7 +977,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>
@@ -1293,7 +1293,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>
@@ -1700,7 +1700,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>
@@ -2016,7 +2016,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>
@@ -2450,7 +2450,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>
@@ -2766,7 +2766,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>
@@ -3173,7 +3173,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>
@@ -3489,7 +3489,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>
@@ -3937,7 +3937,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>
@@ -4295,7 +4295,7 @@
 
 </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>

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html        
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html        
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html  
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html  
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html   
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html   
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,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>
@@ -1328,7 +1328,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>
@@ -1743,7 +1743,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>
@@ -2059,7 +2059,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>
@@ -2502,7 +2502,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>
@@ -2818,7 +2818,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>
@@ -3233,7 +3233,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>
@@ -3549,7 +3549,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>
@@ -4006,7 +4006,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>
@@ -4364,7 +4364,7 @@
 
 </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>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
  2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
  2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html      
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html      
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
     2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
     2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html      
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html      
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html     
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html     
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html       
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html       
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/index.html        
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/index.html        
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,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>
@@ -1328,7 +1328,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>
@@ -1743,7 +1743,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>
@@ -2059,7 +2059,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>
@@ -2502,7 +2502,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>
@@ -2818,7 +2818,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>
@@ -3233,7 +3233,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>
@@ -3549,7 +3549,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>
@@ -4006,7 +4006,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>
@@ -4364,7 +4364,7 @@
 
 </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>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html   
    2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html   
    2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html   
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html   
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
  2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
  2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 2018-08-25 18:57:02 UTC (rev 8122)
+++ 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after

Modified: 
trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
2018-08-25 20:26:11 UTC (rev 8123)
@@ -303,7 +303,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -543,7 +543,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -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>
@@ -1310,7 +1310,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>
@@ -1724,7 +1724,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>
@@ -2031,7 +2031,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>
@@ -2491,7 +2491,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>
@@ -2798,7 +2798,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>
@@ -3254,7 +3254,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>
@@ -3603,7 +3603,7 @@
 
 </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>
@@ -4019,7 +4019,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>
@@ -4326,7 +4326,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>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html    
2018-08-25 18:57:02 UTC (rev 8122)
+++ trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html    
2018-08-25 20:26:11 UTC (rev 8123)
@@ -304,7 +304,7 @@
 fset: i a g
 cmde: truc 
 Command: log trap 
-Command: log trap1   
+Command: log trap1 
 Command: log trap2 
 cmde: id ule truc
 cmde2: id i ule truc
@@ -553,7 +553,7 @@
 i-tem 2
 
 fun: 
-truc: machin bidule chose and 
+truc: machin bidule chose and
 truc: machin bidule chose and  after
 truc: machin bidule chose and 
 truc: machin bidule chose and and after
@@ -1012,7 +1012,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>
@@ -1328,7 +1328,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>
@@ -1743,7 +1743,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>
@@ -2059,7 +2059,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>
@@ -2501,7 +2501,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>
@@ -2817,7 +2817,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>
@@ -3232,7 +3232,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>
@@ -3548,7 +3548,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>
@@ -4005,7 +4005,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>
@@ -4363,7 +4363,7 @@
 
 </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>




reply via email to

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