texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Rename empty_* types, removing empty and adding i


From: Patrice Dumas
Subject: branch master updated: Rename empty_* types, removing empty and adding if needed
Date: Wed, 14 Sep 2022 17:38:55 -0400

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 08f9b74c2d Rename empty_* types, removing empty and adding if needed
08f9b74c2d is described below

commit 08f9b74c2d7cf96d051ab52fbf7cbb7636a7acd9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Sep 14 23:38:21 2022 +0200

    Rename empty_* types, removing empty and adding if needed
    
    * tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/misc.c,
    tp/Texinfo/XS/parsetexi/close.c,
    tp/Texinfo/XS/parsetexi/element_types.txt,
    tp/Texinfo/XS/parsetexi/indices.c,
    tp/Texinfo/XS/parsetexi/parser.c,
    tp/Texinfo/XS/parsetexi/separator.c,
    tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
    tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
    tp/Texinfo/Convert/NodeNameNormalization.pm,
    tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/Text.pm,
    tp/Texinfo/Convert/TextContent.pm:
    rename empty_line_after_command as ignorable_spaces_after_command,
    empty_spaces_before_paragraph as spaces_before_paragraph and
    empty_spaces_after_close_brace as spaces_after_close_brace.
---
 ChangeLog                                          |  19 +
 tp/Texinfo/Common.pm                               |   6 +-
 tp/Texinfo/Convert/DocBook.pm                      |   6 +-
 tp/Texinfo/Convert/HTML.pm                         |   6 +-
 tp/Texinfo/Convert/LaTeX.pm                        |   6 +-
 tp/Texinfo/Convert/NodeNameNormalization.pm        |   6 +-
 tp/Texinfo/Convert/Plaintext.pm                    |  14 +-
 tp/Texinfo/Convert/Text.pm                         |   6 +-
 tp/Texinfo/Convert/TextContent.pm                  |   6 +-
 tp/Texinfo/ParserNonXS.pm                          |  28 +-
 tp/Texinfo/XS/misc.c                               |  12 +-
 tp/Texinfo/XS/parsetexi/close.c                    |   4 +-
 tp/Texinfo/XS/parsetexi/element_types.c            |   6 +-
 tp/Texinfo/XS/parsetexi/element_types.h            |   6 +-
 tp/Texinfo/XS/parsetexi/element_types.txt          |   6 +-
 tp/Texinfo/XS/parsetexi/handle_commands.c          |   4 +-
 tp/Texinfo/XS/parsetexi/indices.c                  |   2 +-
 tp/Texinfo/XS/parsetexi/parser.c                   |  23 +-
 tp/Texinfo/XS/parsetexi/separator.c                |   2 +-
 .../results/converters_tests/at_commands_in_raw.pl |   2 +-
 .../converters_tests/definition_commands.pl        |   2 +-
 .../converters_tests/enumerate_above_ten.pl        |   2 +-
 tp/t/results/converters_tests/form_feeds.pl        |  10 +-
 .../references_to_top_no_top_output.pl             |   4 +-
 .../converters_tests/things_before_setfilename.pl  |   4 +-
 .../things_before_setfilename_no_element.pl        |   4 +-
 .../coverage/flushleft_flushright_in_quotation.pl  |   4 +-
 tp/t/results/coverage/formats_titles.pl            |   8 +-
 tp/t/results/coverage/hyphenation.pl               |   2 +-
 tp/t/results/coverage/indentedblock.pl             |   2 +-
 tp/t/results/coverage/item_container.pl            |   8 +-
 tp/t/results/coverage/multitable.pl                |  18 +-
 tp/t/results/coverage/symbol_after_block.pl        |  20 +-
 tp/t/results/coverage_braces/end_line_in_anchor.pl |   2 +-
 .../coverage_braces/form_feed_in_brace_commands.pl |   4 +-
 .../one_argument_leading_trailing_spaces.pl        |   2 +-
 tp/t/results/def/ref_in_def.pl                     |   2 +-
 .../docbook_tests/between_node_and_section.pl      |   2 +-
 tp/t/results/float/complex_float.pl                |  26 +-
 tp/t/results/float/empty_caption.pl                |   8 +-
 tp/t/results/float/float_copying.pl                |   6 +-
 tp/t/results/formats_encodings/sample_utf8.pl      |   4 +-
 tp/t/results/formatting/float_copying.pl           |   6 +-
 tp/t/results/formatting/texi_bib_example.pl        |   2 +-
 tp/t/results/formatting/texi_glossary.pl           |   4 +-
 tp/t/results/html_tests/itemize_arguments.pl       |  64 ++--
 .../itemize_arguments_enable_encoding.pl           |  64 ++--
 tp/t/results/html_tests/simple_menu.pl             |  12 +-
 .../verbatim_in_multitable_in_example.pl           |   8 +-
 tp/t/results/indices/double_seeentry_seealso.pl    |   2 +-
 tp/t/results/indices/explicit_sort_key.pl          |   6 +-
 .../multiple_index_text_sortas_seeentry_seealso.pl |   8 +-
 tp/t/results/indices/seeentry.pl                   |   4 +-
 tp/t/results/indices/subentry_and_sortas.pl        |   4 +-
 tp/t/results/info_tests/anchor_and_spaces.pl       |   2 +-
 tp/t/results/info_tests/center_flush.pl            |   6 +-
 .../end_of_line_command_in_node_lines.pl           |   2 +-
 .../multitable_anchor_and_index_entry.pl           |  28 +-
 .../info_tests/nested_multitable_anchor_index.pl   |  18 +-
 .../info_tests/paragraphindent_asis_first.pl       |   4 +-
 .../info_tests/paragraphindent_none_first.pl       |   6 +-
 tp/t/results/info_tests/test_index.pl              |   2 +-
 tp/t/results/invalid_nestings/bad_tab_nesting.pl   |   4 +-
 tp/t/results/invalid_nestings/center.pl            |  20 +-
 .../invalid_nestings/enumerate_in_style_command.pl |   2 +-
 .../formats_not_closed_in_example.pl               |   4 +-
 tp/t/results/invalid_nestings/in_errormsg.pl       |   4 +-
 tp/t/results/invalid_nestings/in_table.pl          |   2 +-
 .../item_tab_outside_of_table_lists.pl             |   4 +-
 .../multitable_in_style_command.pl                 |   4 +-
 .../invalid_nestings/multitable_item_in_index.pl   |   2 +-
 .../invalid_nestings/on_block_command_line.pl      |   4 +-
 .../invalid_nestings/on_index_entry_line.pl        |   2 +-
 tp/t/results/invalid_nestings/on_itemize_line.pl   |   6 +-
 tp/t/results/invalid_nestings/on_section_line.pl   |   2 +-
 .../results/invalid_nestings/on_subheading_line.pl |   2 +-
 tp/t/results/invalid_nestings/ref_in_anchor.pl     |   2 +-
 tp/t/results/invalid_nestings/section_in_table.pl  |   2 +-
 tp/t/results/invalid_nestings/tab_in_index.pl      |   6 +-
 .../results/invalid_nestings/table_on_item_line.pl |   4 +-
 tp/t/results/invalid_nestings/verbatim_in_ref.pl   |   2 +-
 tp/t/results/itemize/accent_argument.pl            |   4 +-
 tp/t/results/itemize/asis_as_itemize_argument.pl   |   2 +-
 .../itemize/comment_first_on_enumerate_line.pl     |   2 +-
 .../itemize/comment_first_on_itemize_line.pl       |   2 +-
 tp/t/results/itemize/empty_accent_argument.pl      |   6 +-
 tp/t/results/itemize/enumerate_and_empty_lines.pl  |  14 +-
 tp/t/results/itemize/enumerate_argument_item.pl    |  12 +-
 tp/t/results/itemize/enumerate_in_example.pl       |   4 +-
 tp/t/results/itemize/enumerate_letters.pl          | 412 ++++++++++-----------
 .../results/itemize/headitem_itemx_in_enumerate.pl |   4 +-
 tp/t/results/itemize/headitem_itemx_in_itemize.pl  |   4 +-
 .../itemize/inter_item_commands_in_enumerate.pl    |  12 +-
 .../itemize/inter_item_commands_in_itemize.pl      |   8 +-
 tp/t/results/itemize/itemize_and_empty_lines.pl    |  34 +-
 tp/t/results/itemize/itemize_in_example.pl         |  10 +-
 .../itemize/itemize_line_commands_with_brace.pl    |   4 +-
 tp/t/results/itemize/itemize_long_item.pl          |  12 +-
 tp/t/results/itemize/not_closed_item.pl            |   2 +-
 tp/t/results/itemize/table_in_itemize.pl           |   6 +-
 tp/t/results/itemize/w_argument.pl                 |   4 +-
 tp/t/results/latex_tests/anchor_before_top.pl      |   2 +-
 .../anchor_in_copying_insertcopying_titlepage.pl   |   2 +-
 .../anchor_links_xref_xrefautomaticsectiontitle.pl |   8 +-
 tp/t/results/latex_tests/enumerate_arguments.pl    |  24 +-
 tp/t/results/latex_tests/indices.pl                |   2 +-
 tp/t/results/latex_tests/nested_enumerate.pl       |  24 +-
 tp/t/results/latex_tests/nested_itemize.pl         |  24 +-
 tp/t/results/macro/empty_macro_in_text_no_arg.pl   |   2 +-
 tp/t/results/macro/form_feeds.pl                   |   2 +-
 tp/t/results/macro/leading_spaces_no_ignore.pl     |   2 +-
 tp/t/results/macro/macro_in_brace_command.pl       |   2 +-
 tp/t/results/macro/macro_in_misc_commands.pl       |  10 +-
 tp/t/results/macro/paragraph_and_macro.pl          |   4 +-
 .../menu/block_commands_in_menu_description.pl     |   2 +-
 tp/t/results/menu/menu_pointing_to_anchor.pl       |   2 +-
 tp/t/results/menu/submenu_in_example.pl            |   2 +-
 tp/t/results/misc_commands/also_not_line.pl        |  10 +-
 tp/t/results/misc_commands/indent_in_quotation.pl  |   2 +-
 .../misc_commands/noindent_after_smallexample.pl   |   2 +-
 tp/t/results/misc_commands/noindent_empty_para.pl  |   2 +-
 .../results/misc_commands/noindent_in_paragraph.pl |   4 +-
 tp/t/results/misc_commands/noindent_indent.pl      |   8 +-
 tp/t/results/morecoverage/formatting_fr.pl         |   2 +-
 tp/t/results/morecoverage/texi_formatting.pl       |   2 +-
 .../moresectioning/placed_things_before_element.pl |   4 +-
 tp/t/results/multitable/empty_headitem.pl          |  12 +-
 tp/t/results/multitable/empty_item_tab.pl          |  34 +-
 .../multitable/empty_multitable_with_cells.pl      |   8 +-
 .../inter_item_commands_in_multitable.pl           |  20 +-
 .../multitable/multitable_begin_with_tab.pl        |   6 +-
 tp/t/results/multitable/multitable_figure_space.pl |  12 +-
 tp/t/results/multitable/multitable_in_example.pl   |   8 +-
 .../multitable/multitable_not_closed_item.pl       |   2 +-
 .../multitable/multitable_not_closed_item_tab.pl   |   4 +-
 .../multitable_one_column_too_much_cells.pl        |  22 +-
 .../multitable_two_columns_too_much_cells.pl       |  18 +-
 .../multitable/multitable_with_empty_item_tab.pl   |   8 +-
 .../results/multitable/not_letters_in_prototype.pl |   4 +-
 tp/t/results/multitable/paragraph_in_cells.pl      |   8 +-
 tp/t/results/multitable/ref_in_multitable.pl       |  12 +-
 tp/t/results/multitable/w_in_multitable.pl         |   4 +-
 tp/t/results/paragraph/commands_in_flushright.pl   |  12 +-
 tp/t/results/paragraph/paragraph_indent_asis.pl    |   4 +-
 tp/t/results/paragraph/text_space_comment.pl       |   2 +-
 .../plaintext_tests/anchor_and_empty_lines.pl      |   2 +-
 .../at_commands_glued_in_example.pl                |   2 +-
 .../at_commands_glued_in_paragraph.pl              |   2 +-
 tp/t/results/plaintext_tests/east_asian_in_w.pl    |   2 +-
 .../plaintext_tests/empty_multitable_in_itemize.pl |   2 +-
 .../itemize_in_headitem_in_example.pl              |  16 +-
 .../plaintext_tests/long_uref_after_item.pl        |   2 +-
 tp/t/results/plaintext_tests/multitable.pl         |  88 ++---
 .../multitable_in_example_extraneous_tab.pl        |   8 +-
 .../plaintext_tests/nested_indentedblock.pl        |   2 +-
 tp/t/results/plaintext_tests/nested_multitable.pl  |  14 +-
 .../plaintext_tests/no_empty_line_after_section.pl |   2 +-
 tp/t/results/plaintext_tests/paragraphindent.pl    |   8 +-
 .../plaintext_tests/tab_in_table_in_example.pl     |   4 +-
 .../results/plaintext_tests/tab_item_in_example.pl |   4 +-
 tp/t/results/regions/anchor_in_copying.pl          |   2 +-
 .../regions/anchor_in_copying_in_footnote.pl       |   2 +-
 tp/t/results/regions/anchor_in_titlepage.pl        |   2 +-
 .../regions/anchor_in_titlepage_titlepage.pl       |   2 +-
 .../results/sectioning/double_node_anchor_float.pl |   4 +-
 tp/t/results/sectioning/no_element.pl              |   4 +-
 .../sectioning/placed_things_before_element.pl     |   4 +-
 .../sectioning/placed_things_before_node.pl        |   4 +-
 .../sectioning/protected_node_parentheses.pl       |   2 +-
 tp/t/results/value/bad_syntax.pl                   |   2 +-
 tp/t/results/value/set_in_item_missing_line.pl     |   2 +-
 tp/t/results/value/value_in_misc_commands.pl       |   6 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      |   6 +-
 tp/t/results/xml_tests/comments_end_lines.pl       |   6 +-
 .../xml_tests/comments_on_block_command_lines.pl   |  20 +-
 .../xml_tests/comments_on_misc_command_line.pl     |   2 +-
 tp/t/results/xtable/headitem_in_table.pl           |   2 +-
 177 files changed, 901 insertions(+), 881 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 588f7e1c84..faa6d2d9f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2022-09-14  Patrice Dumas  <pertusus@free.fr>
+
+       Rename empty_* types, removing empty and adding if needed
+
+       * tp/Texinfo/ParserNonXS.pm, tp/Texinfo/XS/misc.c,
+       tp/Texinfo/XS/parsetexi/close.c,
+       tp/Texinfo/XS/parsetexi/element_types.txt,
+       tp/Texinfo/XS/parsetexi/indices.c,
+       tp/Texinfo/XS/parsetexi/parser.c,
+       tp/Texinfo/XS/parsetexi/separator.c,
+       tp/Texinfo/Common.pm, tp/Texinfo/Convert/DocBook.pm,
+       tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/LaTeX.pm,
+       tp/Texinfo/Convert/NodeNameNormalization.pm,
+       tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/Text.pm,
+       tp/Texinfo/Convert/TextContent.pm:
+       rename empty_line_after_command as ignorable_spaces_after_command,
+       empty_spaces_before_paragraph as spaces_before_paragraph and
+       empty_spaces_after_close_brace as spaces_after_close_brace.
+
 2022-09-14  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm: more consistent export ok.  Do not
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 695c00ed8a..9b04b4c9ff 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1783,8 +1783,8 @@ sub trim_spaces_comment_from_content($)
 
   shift @$contents
     if ($contents->[0] and $contents->[0]->{'type'}
-       and ($contents->[0]->{'type'} eq 'empty_line_after_command'
-            or $contents->[0]->{'type'} eq 'empty_spaces_after_close_brace'));
+       and ($contents->[0]->{'type'} eq 'ignorable_spaces_after_command'
+            or $contents->[0]->{'type'} eq 'spaces_after_close_brace'));
 
   while (@$contents
          and (($contents->[-1]->{'cmdname'}
@@ -2568,7 +2568,7 @@ sub move_index_entries_after_items($)
           if ($item_container->{'contents'}
               and $item_container->{'contents'}->[0]
               and $item_container->{'contents'}->[0]->{'type'}
-              and $item_container->{'contents'}->[0]->{'type'} eq 
'empty_line_after_command') {
+              and $item_container->{'contents'}->[0]->{'type'} eq 
'ignorable_spaces_after_command') {
             $item_container->{'contents'}->[0]->{'text'} .= "\n"
               if ($item_container->{'contents'}->[0]->{'text'} !~ /\n$/);
             unshift @gathered_index_entries, shift 
@{$item_container->{'contents'}};
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 92f5bfb8e3..71bf0a1455 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -209,9 +209,9 @@ foreach my $block_command ('copying', 'titlepage', 
'documentdescription') {
 
 my %ignored_types;
 foreach my $type (
-            'empty_line_after_command',
-            'empty_spaces_after_close_brace', 
-            'empty_spaces_before_paragraph',
+            'ignorable_spaces_after_command',
+            'spaces_after_close_brace',
+            'spaces_before_paragraph',
             'menu_entry_leading_text',
             'menu_entry_separator',
             'preamble_before_beginning',
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1d252a85bf..5d6a47342b 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5363,11 +5363,11 @@ sub default_type_open($$)
 
 
 # Ignored commands
-foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
+foreach my $type ('ignorable_spaces_after_command', 
'preamble_before_beginning',
             'preamble_before_setfilename',
             'spaces_at_end',
-            'empty_spaces_before_paragraph',
-            'empty_spaces_after_close_brace') {
+            'spaces_before_paragraph',
+            'spaces_after_close_brace') {
   $default_types_conversion{$type} = undef;
 }
 
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 7501176951..8a57414fea 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -528,9 +528,9 @@ foreach my $environment_command 
(@LaTeX_same_block_commands) {
 }
 
 my %ignorable_space_types;
-foreach my $type ('empty_line_after_command',
+foreach my $type ('ignorable_spaces_after_command',
             'spaces_at_end',
-            'empty_spaces_after_close_brace') {
+            'spaces_after_close_brace') {
   $ignorable_space_types{$type} = 1;
 }
 
@@ -2221,7 +2221,7 @@ sub _convert($$)
 
   # in ignorable spaces, keep only form feeds.
   if ($type and $self->{'ignorable_space_types'}->{$type}) {
-    if ($type eq 'empty_spaces_after_close_brace') {
+    if ($type eq 'spaces_after_close_brace') {
       if ($element->{'text'} =~ /\f/) {
         $result = '\par{}';
       }
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm 
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index 373da224c2..936b70ed23 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -74,11 +74,11 @@ foreach my $ignored_brace_command ('anchor', 'footnote', 
'shortcaption',
 }
 
 my %ignored_types;
-foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
+foreach my $type ('ignorable_spaces_after_command', 
'preamble_before_beginning',
             'spaces_at_end',
-            'empty_spaces_before_paragraph',
+            'spaces_before_paragraph',
             'space_at_end_menu_node',
-            'empty_spaces_after_close_brace') {
+            'spaces_after_close_brace') {
   $ignored_types{$type} = 1;
 }
 
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index e50028dc59..442718059e 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -260,10 +260,10 @@ my %upper_case_commands = (
 );
 
 my %ignorable_space_types;
-foreach my $type ('empty_line_after_command',
+foreach my $type ('ignorable_spaces_after_command',
             'spaces_at_end',
-            'empty_spaces_before_paragraph',
-            'empty_spaces_after_close_brace') {
+            'spaces_before_paragraph',
+            'spaces_after_close_brace') {
   $ignorable_space_types{$type} = 1;
 }
 
@@ -1576,11 +1576,11 @@ sub _convert($$)
 
   # in ignorable spaces, keep only form feeds.
   if ($type and $self->{'ignorable_space_types'}->{$type}
-      and ($type ne 'empty_spaces_before_paragraph'
+      and ($type ne 'spaces_before_paragraph'
            or $self->get_conf('paragraphindent') ne 'asis')) {
-    if ($type eq 'empty_spaces_after_close_brace'
+    if ($type eq 'spaces_after_close_brace'
         and $element->{'text'} =~ /\f/) {
-      # FIXME also in empty_spaces_before_paragraph?  Does not seems to be
+      # FIXME also in spaces_before_paragraph?  Does not seems to be
       # relevant to keep form feeds in other ignorable spaces.
       $result = _get_form_feeds($element->{'text'});
     }
@@ -1624,7 +1624,7 @@ sub _convert($$)
         }
         return $result;
       # the following is only possible if paragraphindent is set to asis
-      } elsif ($type and $type eq 'empty_spaces_before_paragraph') {
+      } elsif ($type and $type eq 'spaces_before_paragraph') {
         add_text_count($self, $element->{'text'});
         return $element->{'text'};
       # ignore text outside of any format, but warn if ignored text not empty
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 096defab11..358a4e58ba 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -152,10 +152,10 @@ foreach my $command ('verbatiminclude', 'sp') {
 }
 
 my %ignored_types;
-foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
+foreach my $type ('ignorable_spaces_after_command', 
'preamble_before_beginning',
             'spaces_at_end',
-            'empty_spaces_before_paragraph',
-            'empty_spaces_after_close_brace') {
+            'spaces_before_paragraph',
+            'spaces_after_close_brace') {
   $ignored_types{$type} = 1;
 }
 
diff --git a/tp/Texinfo/Convert/TextContent.pm 
b/tp/Texinfo/Convert/TextContent.pm
index f8c38867cf..f0b85cab77 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -45,9 +45,9 @@ foreach my $ignored_command (
 }
 
 my %ignored_types;
-foreach my $type ('empty_line_after_command', 'preamble_before_beginning',
-            'empty_spaces_before_paragraph',
-            'empty_spaces_after_close_brace') {
+foreach my $type ('ignorable_spaces_after_command', 
'preamble_before_beginning',
+            'spaces_before_paragraph',
+            'spaces_after_close_brace') {
   $ignored_types{$type} = 1;
 }
 
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 15c6e09aca..adfdf03242 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1689,7 +1689,7 @@ sub _close_command_cleanup($$) {
       my $leading_spaces = 0;
       my $before_item;
       if ($current->{'contents'}->[0]->{'type'}
-          and $current->{'contents'}->[0]->{'type'} eq 
'empty_line_after_command'
+          and $current->{'contents'}->[0]->{'type'} eq 
'ignorable_spaces_after_command'
           and $current->{'contents'}->[1]
           and $current->{'contents'}->[1]->{'type'}
           and $current->{'contents'}->[1]->{'type'} eq 'before_item') {
@@ -1738,7 +1738,7 @@ sub _close_command_cleanup($$) {
                         and $format_content->{'cmdname'} ne 'comment'
                         and $format_content->{'cmdname'} ne 'end'))
                   or ($format_content->{'type'} and
-                   ($format_content->{'type'} ne 'empty_line_after_command'))) 
{
+                   ($format_content->{'type'} ne 
'ignorable_spaces_after_command'))) {
                 $empty_format = 0;
                 last;
               }
@@ -1926,10 +1926,10 @@ sub _merge_text {
     }
     if ($current->{'contents'} and @{$current->{'contents'}}
       and $current->{'contents'}->[-1]->{'type'}
-      and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line_after_command'
+      and ($current->{'contents'}->[-1]->{'type'} eq 
'ignorable_spaces_after_command'
          or $current->{'contents'}->[-1]->{'type'} eq 
'internal_spaces_after_command'
          or $current->{'contents'}->[-1]->{'type'} eq 
'internal_spaces_before_argument'
-         or $current->{'contents'}->[-1]->{'type'} eq 
'empty_spaces_after_close_brace')) {
+         or $current->{'contents'}->[-1]->{'type'} eq 
'spaces_after_close_brace')) {
       $no_merge_with_following_text = 1;
     }
     if (_abort_empty_line($self, $current, $leading_spaces)) {
@@ -2284,7 +2284,7 @@ sub _set_non_ignored_space_in_index_before_command($)
                        and $in_index_commands{$content->{'cmdname'}}
                        and defined($brace_commands{$content->{'cmdname'}}))
                       or ($content->{'type'}
-                   and $content->{'type'} eq 'empty_spaces_after_close_brace'))
+                   and $content->{'type'} eq 'spaces_after_close_brace'))
              and (! _check_empty_expansion([$content]))) {
       delete $pending_spaces_element->{'type'};
       $pending_spaces_element = 0;
@@ -2303,10 +2303,10 @@ sub _abort_empty_line {
   if ($current->{'contents'} and @{$current->{'contents'}}
        and $current->{'contents'}->[-1]->{'type'}
        and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line'
-           or $current->{'contents'}->[-1]->{'type'} eq 
'empty_line_after_command'
+           or $current->{'contents'}->[-1]->{'type'} eq 
'ignorable_spaces_after_command'
            or $current->{'contents'}->[-1]->{'type'} eq 
'internal_spaces_after_command'
            or $current->{'contents'}->[-1]->{'type'} eq 
'internal_spaces_before_argument'
-           or $current->{'contents'}->[-1]->{'type'} eq 
'empty_spaces_after_close_brace')) {
+           or $current->{'contents'}->[-1]->{'type'} eq 
'spaces_after_close_brace')) {
 
     my $spaces_element = $current->{'contents'}->[-1];
 
@@ -2325,7 +2325,7 @@ sub _abort_empty_line {
       # exactly the same condition as to begin a paragraph
       if ((!$current->{'type'} or $type_with_paragraph{$current->{'type'}})
          and !$no_paragraph_contexts{$self->_top_context()}) {
-        $spaces_element->{'type'} = 'empty_spaces_before_paragraph';
+        $spaces_element->{'type'} = 'spaces_before_paragraph';
       } else {
         delete $spaces_element->{'type'};
       }
@@ -3596,7 +3596,7 @@ sub _start_empty_line_after_command($$$) {
   my ($line, $current, $command) = @_;
 
   $line =~ s/^([^\S\r\n]*)//;
-  push @{$current->{'contents'}}, { 'type' => 'empty_line_after_command',
+  push @{$current->{'contents'}}, { 'type' => 'ignorable_spaces_after_command',
                                     'text' => $1,
                                     'parent' => $current,
                                   };
@@ -5485,7 +5485,7 @@ sub _process_remaining_on_line($$$$)
         _register_global_command($self, $current->{'parent'}, $source_info);
         if ($command_ignore_space_after{$current->{'parent'}->{'cmdname'}}) {
           push @{$current->{'parent'}->{'parent'}->{'contents'}},
-             {'type' => 'empty_spaces_after_close_brace',
+             {'type' => 'spaces_after_close_brace',
               'text' => '',
               'parent' => $current->{'parent'}->{'parent'}
              };
@@ -6829,7 +6829,7 @@ I<brace_command_arg> for the container holding the brace 
@-commands
 contents, I<line_arg> and I<block_line_arg> contain the arguments
 appearing on the line of @-commands.  Text fragments may have a type to
 give an information of the kind of text fragment, for example
-I<empty_spaces_before_paragraph> is associated to spaces appearing
+I<spaces_before_paragraph> is associated to spaces appearing
 before a paragraph beginning.  Most @-commands elements do not have
 a type associated.
 
@@ -6965,18 +6965,18 @@ and space appearing after the description line.
 
 An empty line (possibly containing whitespace characters only).
 
-=item empty_line_after_command
+=item ignorable_spaces_after_command
 
 spaces appearing after an @-command without braces that does not
 take takes argument on the line, but which is followed by ignorable
 spaces, such as C<@item> in C<@itemize> of C<@multitable>, or C<@noindent>.
 
-=item empty_spaces_after_close_brace
+=item spaces_after_close_brace
 
 Spaces appearing after a closing brace, for some rare commands for which
 this space should be ignorable (like C<@caption> or C<@sortas>).
 
-=item empty_spaces_before_paragraph
+=item spaces_before_paragraph
 
 Space appearing before a paragraph beginning.
 
diff --git a/tp/Texinfo/XS/misc.c b/tp/Texinfo/XS/misc.c
index 4a38efbcbc..27b65f4d67 100644
--- a/tp/Texinfo/XS/misc.c
+++ b/tp/Texinfo/XS/misc.c
@@ -96,10 +96,10 @@ xs_abort_empty_line (HV *self, HV *current, SV 
*additional_spaces_in)
 
   /* Must be one of these types to continue. */
   if (strcmp (type, "empty_line")
-       && strcmp (type, "empty_line_after_command")
+       && strcmp (type, "ignorable_spaces_after_command")
        && strcmp (type, "internal_spaces_after_command")
        && strcmp (type, "internal_spaces_before_argument")
-       && strcmp (type, "empty_spaces_after_close_brace"))
+       && strcmp (type, "spaces_after_close_brace"))
     {
       return 0;
     }
@@ -157,7 +157,7 @@ xs_abort_empty_line (HV *self, HV *current, SV 
*additional_spaces_in)
       top_context_sv = *svp;
       top_context = SvPV_nolen (top_context_sv);
 
-      /* Change type to "empty_spaces_before_paragraph" unless we are in
+      /* Change type to "spaces_before_paragraph" unless we are in
          one of these contexts. */
       if (strcmp (top_context, "ct_math")
           && strcmp (top_context, "ct_menu")
@@ -167,7 +167,7 @@ xs_abort_empty_line (HV *self, HV *current, SV 
*additional_spaces_in)
           && strcmp (top_context, "ct_inlineraw"))
         {
           hv_store (spaces_elt, "type", strlen ("type"),
-                    newSVpv ("empty_spaces_before_paragraph", 0), 0);
+                    newSVpv ("spaces_before_paragraph", 0), 0);
         }
       else
         {
@@ -278,10 +278,10 @@ xs_merge_text (HV *self, HV *current, SV *text_in)
               if (svp)
                 type = SvPV_nolen (*svp);
               if (type
-                  && (!strcmp (type, "empty_line_after_command")
+                  && (!strcmp (type, "ignorable_spaces_after_command")
                       || !strcmp (type, "internal_spaces_after_command")
                       || !strcmp (type, "internal_spaces_before_argument")
-                      || !strcmp (type, "empty_spaces_after_close_brace")))
+                      || !strcmp (type, "spaces_after_close_brace")))
                 {
                   no_merge_with_following_text = 1;
                 }
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index f7cf63e3a8..f6736f02ee 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -163,7 +163,7 @@ close_command_cleanup (ELEMENT *current)
       int have_leading_spaces = 0;
       ELEMENT *before_item = 0;
       if (current->contents.number >= 2
-          && current->contents.list[0]->type == ET_empty_line_after_command
+          && current->contents.list[0]->type == 
ET_ignorable_spaces_after_command
           && current->contents.list[1]->type == ET_before_item)
         {
           have_leading_spaces = 1;
@@ -219,7 +219,7 @@ close_command_cleanup (ELEMENT *current)
                           && (e->cmd != CM_c && e->cmd != CM_comment
                               && e->cmd != CM_end)
                           || e->type != ET_NONE
-                          && e->type != ET_empty_line_after_command)
+                          && e->type != ET_ignorable_spaces_after_command)
                         {
                           empty_format = 0;
                           break;
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c 
b/tp/Texinfo/XS/parsetexi/element_types.c
index 32cf7c9800..99d8dab9c2 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -8,10 +8,10 @@ char *element_type_names[] = {
 "definfoenclose_command",
 "empty_line",
 "raw",
-"empty_line_after_command",
+"ignorable_spaces_after_command",
 "spaces_at_end",
-"empty_spaces_after_close_brace",
-"empty_spaces_before_paragraph",
+"spaces_after_close_brace",
+"spaces_before_paragraph",
 "text_before_beginning",
 "space_at_end_menu_node",
 "after_menu_description_line",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h 
b/tp/Texinfo/XS/parsetexi/element_types.h
index 85d68799ea..c18e6c5a6e 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -11,10 +11,10 @@ ET_space_command_arg,
 ET_definfoenclose_command,
 ET_empty_line,
 ET_raw,
-ET_empty_line_after_command,
+ET_ignorable_spaces_after_command,
 ET_spaces_at_end,
-ET_empty_spaces_after_close_brace,
-ET_empty_spaces_before_paragraph,
+ET_spaces_after_close_brace,
+ET_spaces_before_paragraph,
 ET_text_before_beginning,
 ET_space_at_end_menu_node,
 ET_after_menu_description_line,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt 
b/tp/Texinfo/XS/parsetexi/element_types.txt
index 8f250600e0..ee7034193a 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -26,10 +26,10 @@ definfoenclose_command
 # For text elements
 empty_line
 raw
-empty_line_after_command
+ignorable_spaces_after_command
 spaces_at_end
-empty_spaces_after_close_brace
-empty_spaces_before_paragraph
+spaces_after_close_brace
+spaces_before_paragraph
 text_before_beginning
 space_at_end_menu_node
 after_menu_description_line
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c 
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 2533d67ee9..7da6848840 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -956,8 +956,8 @@ handle_block_command (ELEMENT *current, char **line_inout,
           if (!(command_data(cmd).flags & CF_def))
             push_context (ct_line, cmd);
 
-          /* Note that an ET_empty_line_after_command gets reparented in the 
-             contents in 'end_line'. */
+          /* Note that an ET_ignorable_spaces_after_command gets reparented
+             in the contents in 'end_line'. */
 
         }
       block->source_info = current_source_info;
diff --git a/tp/Texinfo/XS/parsetexi/indices.c 
b/tp/Texinfo/XS/parsetexi/indices.c
index 4a19e19cb0..537bb833b8 100644
--- a/tp/Texinfo/XS/parsetexi/indices.c
+++ b/tp/Texinfo/XS/parsetexi/indices.c
@@ -349,7 +349,7 @@ set_non_ignored_space_in_index_before_command (ELEMENT 
*content)
                 && ! (e->cmd == CM_sortas
                        || e->cmd == CM_seeentry
                        || e->cmd == CM_seealso
-                       || e->type == ET_empty_spaces_after_close_brace)
+                       || e->type == ET_spaces_after_close_brace)
                 && (! check_space_element(e)))
         {
           pending_spaces_element->type = ET_NONE;
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 43f6b7342c..048fd83f32 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -540,10 +540,10 @@ merge_text (ELEMENT *current, char *text)
       char *additional = 0;
 
       if (last_child
-          && (last_child->type == ET_empty_line_after_command
+          && (last_child->type == ET_ignorable_spaces_after_command
               || last_child->type == ET_internal_spaces_after_command
               || last_child->type == ET_internal_spaces_before_argument
-              || last_child->type == ET_empty_spaces_after_close_brace))
+              || last_child->type == ET_spaces_after_close_brace))
         {
           no_merge_with_following_text = 1;
         }
@@ -606,10 +606,10 @@ abort_empty_line (ELEMENT **current_inout, char 
*additional_spaces)
 
   if (last_child
       && (last_child->type == ET_empty_line
-          || last_child->type == ET_empty_line_after_command
+          || last_child->type == ET_ignorable_spaces_after_command
           || last_child->type == ET_internal_spaces_after_command
           || last_child->type == ET_internal_spaces_before_argument
-          || last_child->type == ET_empty_spaces_after_close_brace))
+          || last_child->type == ET_spaces_after_close_brace))
     {
       retval = 1;
 
@@ -629,7 +629,7 @@ abort_empty_line (ELEMENT **current_inout, char 
*additional_spaces)
       else if (last_child->type == ET_empty_line)
         {
           last_child->type = begin_paragraph_p (current)
-                             ? ET_empty_spaces_before_paragraph : ET_NONE;
+                             ? ET_spaces_before_paragraph : ET_NONE;
         }
       else if (last_child->type == ET_internal_spaces_after_command
                || last_child->type == ET_internal_spaces_before_argument)
@@ -775,11 +775,12 @@ isolate_last_space (ELEMENT *current)
 }
 
 
-/* Add an "ET_empty_line_after_command" element containing the whitespace at 
-   the beginning of the rest of the line after skipspaces commands,
-   if COMMAND is 0.  Otherwise add an "ET_internal_spaces_after_command",
-   container, after line commands or commands starting
-   a block, that will end up in COMMAND extra spaces value. */
+/* Add an "ET_ignorable_spaces_after_command" element containing the
+   whitespace at the beginning of the rest of the line after skipspaces
+   commands, if COMMAND is 0.  Otherwise add an
+   "ET_internal_spaces_after_command",  container, after line commands
+   or commands starting a block, that will end up in COMMAND extra spaces
+   value. */
 void
 start_empty_line_after_command (ELEMENT *current, char **line_inout,
                                 ELEMENT *command)
@@ -789,7 +790,7 @@ start_empty_line_after_command (ELEMENT *current, char 
**line_inout,
   int len;
 
   len = strspn (line, whitespace_chars_except_newline);
-  e = new_element (ET_empty_line_after_command);
+  e = new_element (ET_ignorable_spaces_after_command);
   add_to_element_contents (current, e);
   text_append_n (&e->text, line, len);
   line += len;
diff --git a/tp/Texinfo/XS/parsetexi/separator.c 
b/tp/Texinfo/XS/parsetexi/separator.c
index 6d611eda13..6f078fed3d 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -500,7 +500,7 @@ handle_close_brace (ELEMENT *current, char **line_inout)
           || current->parent->cmd == CM_seealso)
         {
           ELEMENT *e;
-          e = new_element (ET_empty_spaces_after_close_brace);
+          e = new_element (ET_spaces_after_close_brace);
           text_append (&e->text, "");
           add_to_element_contents (current->parent->parent, e);
         }
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index fbed933f53..f73e9b2af2 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -304,7 +304,7 @@ $result_trees{'at_commands_in_raw'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 }
               ],
               'parent' => {},
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 669ab3e17e..48d4c9aba3 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -10791,7 +10791,7 @@ $result_trees{'definition_commands'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl 
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index a9df197102..c61c47ea4b 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -34,7 +34,7 @@ $result_trees{'enumerate_above_ten'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 34a1c4a038..e9b41e03b1 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -147,7 +147,7 @@ $result_trees{'form_feeds'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -798,7 +798,7 @@ $result_trees{'form_feeds'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_spaces_before_paragraph'
+                      'type' => 'spaces_before_paragraph'
                     },
                     {
                       'contents' => [
@@ -836,7 +836,7 @@ $result_trees{'form_feeds'} = {
             {
               'parent' => {},
               'text' => '  ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'contents' => [
@@ -871,7 +871,7 @@ $result_trees{'form_feeds'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_spaces_before_paragraph'
+                      'type' => 'spaces_before_paragraph'
                     },
                     {
                       'contents' => [
@@ -909,7 +909,7 @@ $result_trees{'form_feeds'} = {
             {
               'parent' => {},
               'text' => '  ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'contents' => [
diff --git a/tp/t/results/converters_tests/references_to_top_no_top_output.pl 
b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
index 8cfc55e191..ccb0ac5269 100644
--- a/tp/t/results/converters_tests/references_to_top_no_top_output.pl
+++ b/tp/t/results/converters_tests/references_to_top_no_top_output.pl
@@ -120,7 +120,7 @@ $result_trees{'references_to_top_no_top_output'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     }
                   ],
                   'parent' => {},
@@ -292,7 +292,7 @@ $result_trees{'references_to_top_no_top_output'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/converters_tests/things_before_setfilename.pl 
b/tp/t/results/converters_tests/things_before_setfilename.pl
index 2ecd16bbfc..ebaa5e715a 100644
--- a/tp/t/results/converters_tests/things_before_setfilename.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename.pl
@@ -61,7 +61,7 @@ $result_trees{'things_before_setfilename'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'parent' => {},
@@ -190,7 +190,7 @@ $result_trees{'things_before_setfilename'} = {
                             'parent' => {},
                             'text' => '
 ',
-                            'type' => 'empty_spaces_after_close_brace'
+                            'type' => 'spaces_after_close_brace'
                           },
                           {
                             'parent' => {},
diff --git 
a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
index 476216a929..e53bc151bc 100644
--- a/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
+++ b/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
@@ -61,7 +61,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'parent' => {},
@@ -190,7 +190,7 @@ $result_trees{'things_before_setfilename_no_element'} = {
                             'parent' => {},
                             'text' => '
 ',
-                            'type' => 'empty_spaces_after_close_brace'
+                            'type' => 'spaces_after_close_brace'
                           },
                           {
                             'parent' => {},
diff --git a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl 
b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
index c2cd71a2d7..74230f1476 100644
--- a/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
+++ b/tp/t/results/coverage/flushleft_flushright_in_quotation.pl
@@ -46,7 +46,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                 {
                   'parent' => {},
                   'text' => '   ',
-                  'type' => 'empty_spaces_before_paragraph'
+                  'type' => 'spaces_before_paragraph'
                 },
                 {
                   'contents' => [
@@ -119,7 +119,7 @@ $result_trees{'flushleft_flushright_in_quotation'} = {
                 {
                   'parent' => {},
                   'text' => '  ',
-                  'type' => 'empty_spaces_before_paragraph'
+                  'type' => 'spaces_before_paragraph'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/formats_titles.pl 
b/tp/t/results/coverage/formats_titles.pl
index cbab359e2a..3397008dc0 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -53,7 +53,7 @@ $result_trees{'formats_titles'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -160,7 +160,7 @@ $result_trees{'formats_titles'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -571,7 +571,7 @@ $result_trees{'formats_titles'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -600,7 +600,7 @@ $result_trees{'formats_titles'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/coverage/hyphenation.pl 
b/tp/t/results/coverage/hyphenation.pl
index 526a458b04..100ed0fab9 100644
--- a/tp/t/results/coverage/hyphenation.pl
+++ b/tp/t/results/coverage/hyphenation.pl
@@ -44,7 +44,7 @@ $result_trees{'hyphenation'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/coverage/indentedblock.pl 
b/tp/t/results/coverage/indentedblock.pl
index e33fba0d72..fb400df296 100644
--- a/tp/t/results/coverage/indentedblock.pl
+++ b/tp/t/results/coverage/indentedblock.pl
@@ -26,7 +26,7 @@ $result_trees{'indentedblock'} = {
             {
               'parent' => {},
               'text' => '  ',
-              'type' => 'empty_spaces_before_paragraph'
+              'type' => 'spaces_before_paragraph'
             },
             {
               'contents' => [
diff --git a/tp/t/results/coverage/item_container.pl 
b/tp/t/results/coverage/item_container.pl
index e4f297112f..e6cc697d90 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -40,7 +40,7 @@ $result_trees{'item_container'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -143,12 +143,12 @@ $result_trees{'item_container'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_before_paragraph'
+                  'type' => 'spaces_before_paragraph'
                 },
                 {
                   'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'item_container'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/coverage/multitable.pl 
b/tp/t/results/coverage/multitable.pl
index 5312247725..7c38ac4c42 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -68,7 +68,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -97,7 +97,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -142,7 +142,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -171,7 +171,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -228,7 +228,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -257,7 +257,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -336,7 +336,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -468,7 +468,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -497,7 +497,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/coverage/symbol_after_block.pl 
b/tp/t/results/coverage/symbol_after_block.pl
index e4a1abaf30..fc51108c2d 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -630,7 +630,7 @@ $result_trees{'symbol_after_block'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -733,7 +733,7 @@ $result_trees{'symbol_after_block'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -878,7 +878,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -907,7 +907,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -952,7 +952,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -981,7 +981,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1117,7 +1117,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1146,7 +1146,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1191,7 +1191,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1220,7 +1220,7 @@ $result_trees{'symbol_after_block'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/coverage_braces/end_line_in_anchor.pl 
b/tp/t/results/coverage_braces/end_line_in_anchor.pl
index 385b7ab79a..eaa962b526 100644
--- a/tp/t/results/coverage_braces/end_line_in_anchor.pl
+++ b/tp/t/results/coverage_braces/end_line_in_anchor.pl
@@ -47,7 +47,7 @@ $result_trees{'end_line_in_anchor'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         }
       ],
       'parent' => {},
diff --git a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl 
b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
index 5f5d6591b6..57d74e86d2 100644
--- a/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
+++ b/tp/t/results/coverage_braces/form_feed_in_brace_commands.pl
@@ -68,7 +68,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
             {
               'parent' => {},
               'text' => '',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             }
           ],
           'parent' => {},
@@ -130,7 +130,7 @@ $result_trees{'form_feed_in_brace_commands'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_spaces_before_paragraph'
+                      'type' => 'spaces_before_paragraph'
                     },
                     {
                       'contents' => [
diff --git 
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl 
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index dae8d717b7..f6b68c7862 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -146,7 +146,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'args' => [
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 4774c684a9..2b5781ec1b 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -654,7 +654,7 @@ $result_trees{'ref_in_def'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/docbook_tests/between_node_and_section.pl 
b/tp/t/results/docbook_tests/between_node_and_section.pl
index da6aad1643..808d25842e 100644
--- a/tp/t/results/docbook_tests/between_node_and_section.pl
+++ b/tp/t/results/docbook_tests/between_node_and_section.pl
@@ -224,7 +224,7 @@ $result_trees{'between_node_and_section'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/float/complex_float.pl 
b/tp/t/results/float/complex_float.pl
index e15a2a86db..503c96f575 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -594,7 +594,7 @@ $result_trees{'complex_float'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_line_after_command'
+                      'type' => 'ignorable_spaces_after_command'
                     },
                     {
                       'contents' => [
@@ -1179,7 +1179,7 @@ $result_trees{'complex_float'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'parent' => {},
@@ -1388,7 +1388,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -1417,7 +1417,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -1456,7 +1456,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -1485,7 +1485,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -1676,7 +1676,7 @@ $result_trees{'complex_float'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'contents' => [
@@ -2934,7 +2934,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -2963,7 +2963,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -3002,7 +3002,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -3031,7 +3031,7 @@ $result_trees{'complex_float'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'contents' => [
@@ -3222,7 +3222,7 @@ $result_trees{'complex_float'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'contents' => [
@@ -3330,7 +3330,7 @@ $result_trees{'complex_float'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/float/empty_caption.pl 
b/tp/t/results/float/empty_caption.pl
index 1f6beab2f9..5c686c10ab 100644
--- a/tp/t/results/float/empty_caption.pl
+++ b/tp/t/results/float/empty_caption.pl
@@ -79,7 +79,7 @@ $result_trees{'empty_caption'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'args' => [
@@ -198,7 +198,7 @@ $result_trees{'empty_caption'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'args' => [
@@ -303,7 +303,7 @@ $result_trees{'empty_caption'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'args' => [
@@ -329,7 +329,7 @@ $result_trees{'empty_caption'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             },
             {
               'args' => [
diff --git a/tp/t/results/float/float_copying.pl 
b/tp/t/results/float/float_copying.pl
index fb90dba225..e59a4114d5 100644
--- a/tp/t/results/float/float_copying.pl
+++ b/tp/t/results/float/float_copying.pl
@@ -145,7 +145,7 @@ $result_trees{'float_copying'} = {
                                               'parent' => {},
                                               'text' => '
 ',
-                                              'type' => 
'empty_spaces_after_close_brace'
+                                              'type' => 
'spaces_after_close_brace'
                                             }
                                           ],
                                           'parent' => {},
@@ -406,7 +406,7 @@ $result_trees{'float_copying'} = {
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'empty_spaces_after_close_brace'
+                              'type' => 'spaces_after_close_brace'
                             },
                             {
                               'args' => [
@@ -511,7 +511,7 @@ $result_trees{'float_copying'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'args' => [
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl 
b/tp/t/results/formats_encodings/sample_utf8.pl
index da1527d79e..7a862deb3d 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -1070,7 +1070,7 @@ $result_trees{'sample_utf8'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1111,7 +1111,7 @@ $result_trees{'sample_utf8'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/formatting/float_copying.pl 
b/tp/t/results/formatting/float_copying.pl
index 13e00b1d5d..dce8768014 100644
--- a/tp/t/results/formatting/float_copying.pl
+++ b/tp/t/results/formatting/float_copying.pl
@@ -204,7 +204,7 @@ $result_trees{'float_copying'} = {
                                               'parent' => {},
                                               'text' => '
 ',
-                                              'type' => 
'empty_spaces_after_close_brace'
+                                              'type' => 
'spaces_after_close_brace'
                                             }
                                           ],
                                           'parent' => {},
@@ -465,7 +465,7 @@ $result_trees{'float_copying'} = {
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'empty_spaces_after_close_brace'
+                              'type' => 'spaces_after_close_brace'
                             },
                             {
                               'args' => [
@@ -570,7 +570,7 @@ $result_trees{'float_copying'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'args' => [
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index c0d51b2e2e..f333a16e23 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -4432,7 +4432,7 @@ $result_trees{'texi_bib_example'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
diff --git a/tp/t/results/formatting/texi_glossary.pl 
b/tp/t/results/formatting/texi_glossary.pl
index 6be569bea9..4b95083d90 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -962,7 +962,7 @@ $result_trees{'texi_glossary'} = {
                         'parent' => {},
                         'text' => '
 ',
-                        'type' => 'empty_spaces_after_close_brace'
+                        'type' => 'spaces_after_close_brace'
                       },
                       {
                         'parent' => {},
@@ -998,7 +998,7 @@ $result_trees{'texi_glossary'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {},
                         {
diff --git a/tp/t/results/html_tests/itemize_arguments.pl 
b/tp/t/results/html_tests/itemize_arguments.pl
index 707ebaf22e..b9f7b1c0ac 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -40,7 +40,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -135,7 +135,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -248,7 +248,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -369,7 +369,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -464,7 +464,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -559,7 +559,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -661,7 +661,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -830,7 +830,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -999,7 +999,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1133,7 +1133,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1256,7 +1256,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1369,7 +1369,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1485,7 +1485,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1588,7 +1588,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1705,7 +1705,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1839,7 +1839,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1969,7 +1969,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2103,7 +2103,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2269,7 +2269,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2484,7 +2484,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2799,7 +2799,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3202,7 +3202,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3593,7 +3593,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3841,7 +3841,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3975,7 +3975,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4115,7 +4115,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4280,7 +4280,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4420,7 +4420,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4553,7 +4553,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4687,7 +4687,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4846,7 +4846,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4980,7 +4980,7 @@ $result_trees{'itemize_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl 
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index 07efb2de9c..1fd094e569 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -40,7 +40,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -135,7 +135,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -248,7 +248,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -369,7 +369,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -464,7 +464,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -559,7 +559,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -661,7 +661,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -830,7 +830,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -999,7 +999,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1133,7 +1133,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1256,7 +1256,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1369,7 +1369,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1485,7 +1485,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1588,7 +1588,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1705,7 +1705,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1839,7 +1839,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1969,7 +1969,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2103,7 +2103,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2269,7 +2269,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2484,7 +2484,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2799,7 +2799,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3202,7 +3202,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3593,7 +3593,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3841,7 +3841,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3975,7 +3975,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4115,7 +4115,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4280,7 +4280,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4420,7 +4420,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4553,7 +4553,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4687,7 +4687,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4846,7 +4846,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4980,7 +4980,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index adf01debf7..7acc69f682 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -170,7 +170,7 @@ $result_trees{'simple_menu'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'parent' => {},
@@ -376,7 +376,7 @@ $result_trees{'simple_menu'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -558,7 +558,7 @@ $result_trees{'simple_menu'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -937,7 +937,7 @@ $result_trees{'simple_menu'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'parent' => {},
@@ -1143,7 +1143,7 @@ $result_trees{'simple_menu'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'parent' => {},
@@ -1325,7 +1325,7 @@ $result_trees{'simple_menu'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'parent' => {},
diff --git a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl 
b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index e19f3a5a76..9e66a43dc2 100644
--- a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -78,7 +78,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -108,7 +108,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -148,7 +148,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                   'parent' => {},
                                   'text' => '
 ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 }
                               ],
                               'parent' => {},
@@ -231,7 +231,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
                                   'parent' => {},
                                   'text' => '
 ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 }
                               ],
                               'parent' => {},
diff --git a/tp/t/results/indices/double_seeentry_seealso.pl 
b/tp/t/results/indices/double_seeentry_seealso.pl
index 5e0c3460e7..3ebba31016 100644
--- a/tp/t/results/indices/double_seeentry_seealso.pl
+++ b/tp/t/results/indices/double_seeentry_seealso.pl
@@ -286,7 +286,7 @@ $result_trees{'double_seeentry_seealso'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/indices/explicit_sort_key.pl 
b/tp/t/results/indices/explicit_sort_key.pl
index 4da7390b5a..af8e9577c7 100644
--- a/tp/t/results/indices/explicit_sort_key.pl
+++ b/tp/t/results/indices/explicit_sort_key.pl
@@ -179,7 +179,7 @@ $result_trees{'explicit_sort_key'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -249,7 +249,7 @@ $result_trees{'explicit_sort_key'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -319,7 +319,7 @@ $result_trees{'explicit_sort_key'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
diff --git 
a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl 
b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
index 4e0ec0320d..537e729bcd 100644
--- a/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
+++ b/tp/t/results/indices/multiple_index_text_sortas_seeentry_seealso.pl
@@ -192,7 +192,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -227,7 +227,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -333,7 +333,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -411,7 +411,7 @@ 
$result_trees{'multiple_index_text_sortas_seeentry_seealso'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/indices/seeentry.pl b/tp/t/results/indices/seeentry.pl
index a7ba0185e8..3178085e98 100644
--- a/tp/t/results/indices/seeentry.pl
+++ b/tp/t/results/indices/seeentry.pl
@@ -252,7 +252,7 @@ $result_trees{'seeentry'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -394,7 +394,7 @@ $result_trees{'seeentry'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/indices/subentry_and_sortas.pl 
b/tp/t/results/indices/subentry_and_sortas.pl
index 3fe8b3d89e..81df08dd21 100644
--- a/tp/t/results/indices/subentry_and_sortas.pl
+++ b/tp/t/results/indices/subentry_and_sortas.pl
@@ -244,7 +244,7 @@ $result_trees{'subentry_and_sortas'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'parent' => {},
@@ -377,7 +377,7 @@ $result_trees{'subentry_and_sortas'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/info_tests/anchor_and_spaces.pl 
b/tp/t/results/info_tests/anchor_and_spaces.pl
index ec3e44b59e..4ed7db0c52 100644
--- a/tp/t/results/info_tests/anchor_and_spaces.pl
+++ b/tp/t/results/info_tests/anchor_and_spaces.pl
@@ -104,7 +104,7 @@ $result_trees{'anchor_and_spaces'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/info_tests/center_flush.pl 
b/tp/t/results/info_tests/center_flush.pl
index 89983175b0..77505673ad 100644
--- a/tp/t/results/info_tests/center_flush.pl
+++ b/tp/t/results/info_tests/center_flush.pl
@@ -163,7 +163,7 @@ $result_trees{'center_flush'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -337,7 +337,7 @@ $result_trees{'center_flush'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
@@ -379,7 +379,7 @@ $result_trees{'center_flush'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl 
b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
index 609d7aca53..41f8fc1f5b 100644
--- a/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
+++ b/tp/t/results/info_tests/end_of_line_command_in_node_lines.pl
@@ -222,7 +222,7 @@ $result_trees{'end_of_line_command_in_node_lines'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl 
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index a96f5a9773..a020123a64 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -90,7 +90,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -119,7 +119,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -164,7 +164,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -193,7 +193,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -250,7 +250,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -279,7 +279,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -361,7 +361,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'empty_spaces_after_close_brace'
+                              'type' => 'spaces_after_close_brace'
                             }
                           ],
                           'parent' => {},
@@ -393,7 +393,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -525,7 +525,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -577,7 +577,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -616,7 +616,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -701,7 +701,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -736,7 +736,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -781,7 +781,7 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'empty_spaces_after_close_brace'
+                              'type' => 'spaces_after_close_brace'
                             }
                           ],
                           'parent' => {},
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl 
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index c0f4dc0ab4..98ba3f4d02 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -87,7 +87,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'args' => [
@@ -138,7 +138,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
@@ -167,7 +167,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
@@ -207,7 +207,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                                               'parent' => {},
                                               'text' => '
 ',
-                                              'type' => 
'empty_spaces_after_close_brace'
+                                              'type' => 
'spaces_after_close_brace'
                                             },
                                             {
                                               'args' => [
@@ -334,7 +334,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_spaces_before_paragraph'
+                          'type' => 'spaces_before_paragraph'
                         }
                       ],
                       'extra' => {
@@ -353,7 +353,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -392,7 +392,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -421,7 +421,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -461,7 +461,7 @@ $result_trees{'nested_multitable_anchor_index'} = {
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'empty_spaces_after_close_brace'
+                              'type' => 'spaces_after_close_brace'
                             },
                             {
                               'args' => [
diff --git a/tp/t/results/info_tests/paragraphindent_asis_first.pl 
b/tp/t/results/info_tests/paragraphindent_asis_first.pl
index 02dd278cee..5b41fc5142 100644
--- a/tp/t/results/info_tests/paragraphindent_asis_first.pl
+++ b/tp/t/results/info_tests/paragraphindent_asis_first.pl
@@ -18,7 +18,7 @@ $result_trees{'paragraphindent_asis_first'} = {
         {
           'parent' => {},
           'text' => '     ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -71,7 +71,7 @@ $result_trees{'paragraphindent_asis_first'} = {
         {
           'parent' => {},
           'text' => '     ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/info_tests/paragraphindent_none_first.pl 
b/tp/t/results/info_tests/paragraphindent_none_first.pl
index 579ded40ec..fd557d99e8 100644
--- a/tp/t/results/info_tests/paragraphindent_none_first.pl
+++ b/tp/t/results/info_tests/paragraphindent_none_first.pl
@@ -18,7 +18,7 @@ $result_trees{'paragraphindent_none_first'} = {
         {
           'parent' => {},
           'text' => '      ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -40,7 +40,7 @@ $result_trees{'paragraphindent_none_first'} = {
         {
           'parent' => {},
           'text' => '      ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -99,7 +99,7 @@ $result_trees{'paragraphindent_none_first'} = {
         {
           'parent' => {},
           'text' => '      ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/info_tests/test_index.pl 
b/tp/t/results/info_tests/test_index.pl
index c0b54a21c0..ba71d47c2b 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -235,7 +235,7 @@ $result_trees{'test_index'} = {
                         'parent' => {},
                         'text' => '
 ',
-                        'type' => 'empty_spaces_after_close_brace'
+                        'type' => 'spaces_after_close_brace'
                       },
                       {
                         'parent' => {},
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl 
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index b080a21ac4..af6f3f73a2 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -58,7 +58,7 @@ $result_trees{'bad_tab_nesting'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -105,7 +105,7 @@ $result_trees{'bad_tab_nesting'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/invalid_nestings/center.pl 
b/tp/t/results/invalid_nestings/center.pl
index 9a49119a81..385cca5856 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -25,7 +25,7 @@ $result_trees{'center'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -563,7 +563,7 @@ $result_trees{'center'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -715,7 +715,7 @@ $result_trees{'center'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'parent' => {},
@@ -1073,7 +1073,7 @@ $result_trees{'center'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1102,7 +1102,7 @@ $result_trees{'center'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1122,7 +1122,7 @@ $result_trees{'center'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -1131,7 +1131,7 @@ $result_trees{'center'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -1164,7 +1164,7 @@ $result_trees{'center'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -1343,7 +1343,7 @@ $result_trees{'center'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -1364,7 +1364,7 @@ $result_trees{'center'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl 
b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
index 8f21bd868a..13f36fb482 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -63,7 +63,7 @@ $result_trees{'enumerate_in_style_command'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl 
b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
index ff0bdb9251..2f751769cd 100644
--- a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
+++ b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
@@ -161,7 +161,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'parent' => {},
@@ -191,7 +191,7 @@ $result_trees{'formats_not_closed_in_example'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'parent' => {},
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl 
b/tp/t/results/invalid_nestings/in_errormsg.pl
index 326104ebd4..17cd7ab880 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -47,7 +47,7 @@ $result_trees{'in_errormsg'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'contents' => [
@@ -90,7 +90,7 @@ $result_trees{'in_errormsg'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'args' => [
diff --git a/tp/t/results/invalid_nestings/in_table.pl 
b/tp/t/results/invalid_nestings/in_table.pl
index 59c8d65c2e..d21075354e 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -163,7 +163,7 @@ $result_trees{'in_table'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'args' => [
diff --git a/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl 
b/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
index b3e6d65888..9898f74229 100644
--- a/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
+++ b/tp/t/results/invalid_nestings/item_tab_outside_of_table_lists.pl
@@ -40,7 +40,7 @@ $result_trees{'item_tab_outside_of_table_lists'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -61,7 +61,7 @@ $result_trees{'item_tab_outside_of_table_lists'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/invalid_nestings/multitable_in_style_command.pl 
b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
index 182b410ea8..c9b3117478 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -92,7 +92,7 @@ $result_trees{'multitable_in_style_command'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -121,7 +121,7 @@ $result_trees{'multitable_in_style_command'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl 
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index 3ed6852b8f..62836a0aab 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -57,7 +57,7 @@ $result_trees{'multitable_item_in_index'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl 
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index dbdf4893db..2cddc80f0d 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -94,7 +94,7 @@ $result_trees{'on_block_command_line'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'args' => [
@@ -216,7 +216,7 @@ $result_trees{'on_block_command_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
diff --git a/tp/t/results/invalid_nestings/on_index_entry_line.pl 
b/tp/t/results/invalid_nestings/on_index_entry_line.pl
index 1cb70d1889..5713abbfc1 100644
--- a/tp/t/results/invalid_nestings/on_index_entry_line.pl
+++ b/tp/t/results/invalid_nestings/on_index_entry_line.pl
@@ -25,7 +25,7 @@ $result_trees{'on_index_entry_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl 
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index de2507ba64..5d597c232a 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -25,7 +25,7 @@ $result_trees{'on_itemize_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -154,7 +154,7 @@ $result_trees{'on_itemize_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -235,7 +235,7 @@ $result_trees{'on_itemize_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/invalid_nestings/on_section_line.pl 
b/tp/t/results/invalid_nestings/on_section_line.pl
index 028d801996..b5c46733a2 100644
--- a/tp/t/results/invalid_nestings/on_section_line.pl
+++ b/tp/t/results/invalid_nestings/on_section_line.pl
@@ -28,7 +28,7 @@ $result_trees{'on_section_line'} = {
             {
               'parent' => {},
               'text' => ' ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
diff --git a/tp/t/results/invalid_nestings/on_subheading_line.pl 
b/tp/t/results/invalid_nestings/on_subheading_line.pl
index 7c19486b66..20570931bc 100644
--- a/tp/t/results/invalid_nestings/on_subheading_line.pl
+++ b/tp/t/results/invalid_nestings/on_subheading_line.pl
@@ -25,7 +25,7 @@ $result_trees{'on_subheading_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/invalid_nestings/ref_in_anchor.pl 
b/tp/t/results/invalid_nestings/ref_in_anchor.pl
index 30b1d38c3d..83d6c03a18 100644
--- a/tp/t/results/invalid_nestings/ref_in_anchor.pl
+++ b/tp/t/results/invalid_nestings/ref_in_anchor.pl
@@ -94,7 +94,7 @@ $result_trees{'ref_in_anchor'} = {
         {
           'parent' => {},
           'text' => '',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         }
       ],
       'extra' => {
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl 
b/tp/t/results/invalid_nestings/section_in_table.pl
index 7ff37c51b4..d9591b3810 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -131,7 +131,7 @@ $result_trees{'section_in_table'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl 
b/tp/t/results/invalid_nestings/tab_in_index.pl
index b4c4dad67b..eec744e12c 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -58,7 +58,7 @@ $result_trees{'tab_in_index'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -87,7 +87,7 @@ $result_trees{'tab_in_index'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -107,7 +107,7 @@ $result_trees{'tab_in_index'} = {
                                     {
                                       'parent' => {},
                                       'text' => ' ',
-                                      'type' => 'empty_line_after_command'
+                                      'type' => 
'ignorable_spaces_after_command'
                                     },
                                     {
                                       'parent' => {},
diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl 
b/tp/t/results/invalid_nestings/table_on_item_line.pl
index 0a633cdbf8..ff154ed830 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -115,7 +115,7 @@ $result_trees{'table_on_item_line'} = {
                     {
                       'parent' => {},
                       'text' => '   ',
-                      'type' => 'empty_spaces_before_paragraph'
+                      'type' => 'spaces_before_paragraph'
                     }
                   ],
                   'parent' => {},
@@ -166,7 +166,7 @@ $result_trees{'table_on_item_line'} = {
                     {
                       'parent' => {},
                       'text' => '   ',
-                      'type' => 'empty_spaces_before_paragraph'
+                      'type' => 'spaces_before_paragraph'
                     },
                     {
                       'contents' => [
diff --git a/tp/t/results/invalid_nestings/verbatim_in_ref.pl 
b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
index 5380b63167..452d783d47 100644
--- a/tp/t/results/invalid_nestings/verbatim_in_ref.pl
+++ b/tp/t/results/invalid_nestings/verbatim_in_ref.pl
@@ -135,7 +135,7 @@ $result_trees{'verbatim_in_ref'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/itemize/accent_argument.pl 
b/tp/t/results/itemize/accent_argument.pl
index d53684a0c4..acf3a25ff3 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -44,7 +44,7 @@ $result_trees{'accent_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -157,7 +157,7 @@ $result_trees{'accent_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl 
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index 9dff58dca2..3ecc156288 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -41,7 +41,7 @@ $result_trees{'asis_as_itemize_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/comment_first_on_enumerate_line.pl 
b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
index 4a9e4bb70e..e46dcf708f 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -45,7 +45,7 @@ $result_trees{'comment_first_on_enumerate_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl 
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 20fe48786e..f172c2c66b 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -52,7 +52,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/empty_accent_argument.pl 
b/tp/t/results/itemize/empty_accent_argument.pl
index bc5945eedd..df8cf8b7a4 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -57,7 +57,7 @@ $result_trees{'empty_accent_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -159,7 +159,7 @@ $result_trees{'empty_accent_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -268,7 +268,7 @@ $result_trees{'empty_accent_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl 
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index 25a6ab0450..87560b256e 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -29,7 +29,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -60,7 +60,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                   'parent' => {},
                   'text' => ' 
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -153,7 +153,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                   'parent' => {},
                   'text' => ' 
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -190,7 +190,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -278,7 +278,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                   'parent' => {},
                   'text' => ' 
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -366,7 +366,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -513,7 +513,7 @@ $result_trees{'enumerate_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl 
b/tp/t/results/itemize/enumerate_argument_item.pl
index c66f85dc79..4086353ac1 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -34,7 +34,7 @@ $result_trees{'enumerate_argument_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -64,7 +64,7 @@ $result_trees{'enumerate_argument_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -176,7 +176,7 @@ $result_trees{'enumerate_argument_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -206,7 +206,7 @@ $result_trees{'enumerate_argument_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -319,7 +319,7 @@ $result_trees{'enumerate_argument_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -349,7 +349,7 @@ $result_trees{'enumerate_argument_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/enumerate_in_example.pl 
b/tp/t/results/itemize/enumerate_in_example.pl
index 7460c38ac7..155947b738 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -51,7 +51,7 @@ $result_trees{'enumerate_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -81,7 +81,7 @@ $result_trees{'enumerate_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
diff --git a/tp/t/results/itemize/enumerate_letters.pl 
b/tp/t/results/itemize/enumerate_letters.pl
index 89ac3d8f25..58ba20f1ba 100644
--- a/tp/t/results/itemize/enumerate_letters.pl
+++ b/tp/t/results/itemize/enumerate_letters.pl
@@ -34,7 +34,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -64,7 +64,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -94,7 +94,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -124,7 +124,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -154,7 +154,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -184,7 +184,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -214,7 +214,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -244,7 +244,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -274,7 +274,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -304,7 +304,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -334,7 +334,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -364,7 +364,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -394,7 +394,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -424,7 +424,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -454,7 +454,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -484,7 +484,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -514,7 +514,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -544,7 +544,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -574,7 +574,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -604,7 +604,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -634,7 +634,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -664,7 +664,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -694,7 +694,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -724,7 +724,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -754,7 +754,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -784,7 +784,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -814,7 +814,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -844,7 +844,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -874,7 +874,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -904,7 +904,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -934,7 +934,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -964,7 +964,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -994,7 +994,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1024,7 +1024,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1054,7 +1054,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1084,7 +1084,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1114,7 +1114,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1144,7 +1144,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1174,7 +1174,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1204,7 +1204,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1234,7 +1234,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1264,7 +1264,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1294,7 +1294,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1324,7 +1324,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1354,7 +1354,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1384,7 +1384,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1414,7 +1414,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1444,7 +1444,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1474,7 +1474,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1504,7 +1504,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1534,7 +1534,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1564,7 +1564,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1594,7 +1594,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1624,7 +1624,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1654,7 +1654,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1684,7 +1684,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1714,7 +1714,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1744,7 +1744,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1774,7 +1774,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1804,7 +1804,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1834,7 +1834,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1864,7 +1864,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1894,7 +1894,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1924,7 +1924,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1954,7 +1954,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1984,7 +1984,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2014,7 +2014,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2044,7 +2044,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2074,7 +2074,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2104,7 +2104,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2134,7 +2134,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2164,7 +2164,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2194,7 +2194,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2224,7 +2224,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2254,7 +2254,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2284,7 +2284,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2314,7 +2314,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2344,7 +2344,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2374,7 +2374,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2404,7 +2404,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2434,7 +2434,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2464,7 +2464,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2494,7 +2494,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2524,7 +2524,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2554,7 +2554,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2584,7 +2584,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2614,7 +2614,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2644,7 +2644,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2674,7 +2674,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2704,7 +2704,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2734,7 +2734,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2764,7 +2764,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2794,7 +2794,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2824,7 +2824,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2854,7 +2854,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2884,7 +2884,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2914,7 +2914,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2944,7 +2944,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -2974,7 +2974,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3004,7 +3004,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3034,7 +3034,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3064,7 +3064,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3094,7 +3094,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3124,7 +3124,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3154,7 +3154,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3184,7 +3184,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3214,7 +3214,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3244,7 +3244,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3274,7 +3274,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3304,7 +3304,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3334,7 +3334,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3364,7 +3364,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3394,7 +3394,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3424,7 +3424,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3454,7 +3454,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3484,7 +3484,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3514,7 +3514,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3544,7 +3544,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3574,7 +3574,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3604,7 +3604,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3634,7 +3634,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3664,7 +3664,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3694,7 +3694,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3724,7 +3724,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3754,7 +3754,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3784,7 +3784,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3814,7 +3814,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3844,7 +3844,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3874,7 +3874,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3904,7 +3904,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3934,7 +3934,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3964,7 +3964,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -3994,7 +3994,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4024,7 +4024,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4054,7 +4054,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4084,7 +4084,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4114,7 +4114,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4144,7 +4144,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4174,7 +4174,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4204,7 +4204,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4234,7 +4234,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4264,7 +4264,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4294,7 +4294,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4324,7 +4324,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4354,7 +4354,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4384,7 +4384,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4414,7 +4414,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4444,7 +4444,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4474,7 +4474,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4504,7 +4504,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4534,7 +4534,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4564,7 +4564,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4594,7 +4594,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4624,7 +4624,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4654,7 +4654,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4684,7 +4684,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4714,7 +4714,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4744,7 +4744,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4774,7 +4774,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4804,7 +4804,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4834,7 +4834,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4864,7 +4864,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4894,7 +4894,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4924,7 +4924,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4954,7 +4954,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -4984,7 +4984,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5014,7 +5014,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5044,7 +5044,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5074,7 +5074,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5104,7 +5104,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5134,7 +5134,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5164,7 +5164,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5194,7 +5194,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5224,7 +5224,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5254,7 +5254,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5284,7 +5284,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5314,7 +5314,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5344,7 +5344,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5374,7 +5374,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5404,7 +5404,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5434,7 +5434,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5464,7 +5464,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5494,7 +5494,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5524,7 +5524,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5554,7 +5554,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5584,7 +5584,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5614,7 +5614,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5644,7 +5644,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5674,7 +5674,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5704,7 +5704,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5734,7 +5734,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5764,7 +5764,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5794,7 +5794,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5824,7 +5824,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5854,7 +5854,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5884,7 +5884,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5914,7 +5914,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5944,7 +5944,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -5974,7 +5974,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -6004,7 +6004,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -6034,7 +6034,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -6064,7 +6064,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -6094,7 +6094,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -6124,7 +6124,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -6154,7 +6154,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -6184,7 +6184,7 @@ $result_trees{'enumerate_letters'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl 
b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
index af5ad73e54..16db962869 100644
--- a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
@@ -29,7 +29,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -73,7 +73,7 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl 
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index 7b8d510a63..ba219ed0ea 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -36,7 +36,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -80,7 +80,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl 
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index 77f4287358..b6ff1d9b21 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -211,7 +211,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -360,7 +360,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -503,7 +503,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -646,7 +646,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -794,7 +794,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1031,7 +1031,7 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl 
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index c3a963f506..04a6de10ef 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -258,7 +258,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -408,7 +408,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -438,7 +438,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -661,7 +661,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl 
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index 9d1c14c7b6..3aaceeb9e4 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -34,7 +34,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -65,7 +65,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -158,7 +158,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -195,7 +195,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -351,7 +351,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -505,7 +505,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -536,7 +536,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -629,7 +629,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -666,7 +666,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -754,7 +754,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -842,7 +842,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -1012,7 +1012,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1148,7 +1148,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1198,7 +1198,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1375,7 +1375,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1405,7 +1405,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1435,7 +1435,7 @@ $result_trees{'itemize_and_empty_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/itemize_in_example.pl 
b/tp/t/results/itemize/itemize_in_example.pl
index 053ebe02bd..e3627d32f8 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -57,7 +57,7 @@ $result_trees{'itemize_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -177,7 +177,7 @@ $result_trees{'itemize_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -279,7 +279,7 @@ $result_trees{'itemize_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -380,7 +380,7 @@ $result_trees{'itemize_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -498,7 +498,7 @@ $result_trees{'itemize_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
diff --git a/tp/t/results/itemize/itemize_line_commands_with_brace.pl 
b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
index 6b6d9e521c..5f1093af69 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -48,7 +48,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -158,7 +158,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/itemize_long_item.pl 
b/tp/t/results/itemize/itemize_long_item.pl
index 945594f056..c882a98933 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -34,7 +34,7 @@ $result_trees{'itemize_long_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -65,7 +65,7 @@ $result_trees{'itemize_long_item'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -158,7 +158,7 @@ $result_trees{'itemize_long_item'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -195,7 +195,7 @@ $result_trees{'itemize_long_item'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -283,7 +283,7 @@ $result_trees{'itemize_long_item'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -371,7 +371,7 @@ $result_trees{'itemize_long_item'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/itemize/not_closed_item.pl 
b/tp/t/results/itemize/not_closed_item.pl
index 353e1acf02..abb3e0e396 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -36,7 +36,7 @@ $result_trees{'not_closed_item'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/table_in_itemize.pl 
b/tp/t/results/itemize/table_in_itemize.pl
index 71da6767ee..3d9c0a6118 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -41,7 +41,7 @@ $result_trees{'table_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -72,7 +72,7 @@ $result_trees{'table_in_itemize'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'args' => [
@@ -306,7 +306,7 @@ $result_trees{'table_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/itemize/w_argument.pl 
b/tp/t/results/itemize/w_argument.pl
index 6ce5de59ec..807425ad79 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -48,7 +48,7 @@ $result_trees{'w_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -100,7 +100,7 @@ $result_trees{'w_argument'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/latex_tests/anchor_before_top.pl 
b/tp/t/results/latex_tests/anchor_before_top.pl
index c22de036ef..6a7bc8c3d2 100644
--- a/tp/t/results/latex_tests/anchor_before_top.pl
+++ b/tp/t/results/latex_tests/anchor_before_top.pl
@@ -58,7 +58,7 @@ $result_trees{'anchor_before_top'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git 
a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl 
b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
index 5cfe85af65..cd0bb34d5f 100644
--- a/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
+++ b/tp/t/results/latex_tests/anchor_in_copying_insertcopying_titlepage.pl
@@ -209,7 +209,7 @@ $result_trees{'anchor_in_copying_insertcopying_titlepage'} 
= {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'args' => [
diff --git 
a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl 
b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
index 17367f7a0f..9904468d21 100644
--- a/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
+++ b/tp/t/results/latex_tests/anchor_links_xref_xrefautomaticsectiontitle.pl
@@ -82,7 +82,7 @@ $result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} 
= {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             }
           ],
           'parent' => {},
@@ -222,7 +222,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             }
           ],
           'parent' => {},
@@ -309,7 +309,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             }
           ],
           'parent' => {},
@@ -449,7 +449,7 @@ 
$result_trees{'anchor_links_xref_xrefautomaticsectiontitle'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_spaces_after_close_brace'
+              'type' => 'spaces_after_close_brace'
             }
           ],
           'parent' => {},
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl 
b/tp/t/results/latex_tests/enumerate_arguments.pl
index eafc697c8f..fad3550494 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -39,7 +39,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -69,7 +69,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -165,7 +165,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -195,7 +195,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -291,7 +291,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -321,7 +321,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -417,7 +417,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -447,7 +447,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -543,7 +543,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -573,7 +573,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -669,7 +669,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -699,7 +699,7 @@ $result_trees{'enumerate_arguments'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/latex_tests/indices.pl 
b/tp/t/results/latex_tests/indices.pl
index 7a1ccae29a..f42e0c329f 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -361,7 +361,7 @@ $result_trees{'indices'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl 
b/tp/t/results/latex_tests/nested_enumerate.pl
index 58f88be653..3abfa08597 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -33,7 +33,7 @@ $result_trees{'nested_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => '   ',
-                  'type' => 'empty_spaces_before_paragraph'
+                  'type' => 'spaces_before_paragraph'
                 }
               ],
               'parent' => {},
@@ -45,7 +45,7 @@ $result_trees{'nested_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -79,7 +79,7 @@ $result_trees{'nested_enumerate'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -111,7 +111,7 @@ $result_trees{'nested_enumerate'} = {
                         {
                           'parent' => {},
                           'text' => '     ',
-                          'type' => 'empty_spaces_before_paragraph'
+                          'type' => 'spaces_before_paragraph'
                         }
                       ],
                       'parent' => {},
@@ -123,7 +123,7 @@ $result_trees{'nested_enumerate'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -157,7 +157,7 @@ $result_trees{'nested_enumerate'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -189,7 +189,7 @@ $result_trees{'nested_enumerate'} = {
                                 {
                                   'parent' => {},
                                   'text' => '       ',
-                                  'type' => 'empty_spaces_before_paragraph'
+                                  'type' => 'spaces_before_paragraph'
                                 }
                               ],
                               'parent' => {},
@@ -201,7 +201,7 @@ $result_trees{'nested_enumerate'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'contents' => [
@@ -235,7 +235,7 @@ $result_trees{'nested_enumerate'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'contents' => [
@@ -267,7 +267,7 @@ $result_trees{'nested_enumerate'} = {
                                         {
                                           'parent' => {},
                                           'text' => '         ',
-                                          'type' => 
'empty_spaces_before_paragraph'
+                                          'type' => 'spaces_before_paragraph'
                                         }
                                       ],
                                       'parent' => {},
@@ -279,7 +279,7 @@ $result_trees{'nested_enumerate'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
@@ -313,7 +313,7 @@ $result_trees{'nested_enumerate'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
diff --git a/tp/t/results/latex_tests/nested_itemize.pl 
b/tp/t/results/latex_tests/nested_itemize.pl
index cebf482f01..db8f041c27 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -40,7 +40,7 @@ $result_trees{'nested_itemize'} = {
                 {
                   'parent' => {},
                   'text' => '   ',
-                  'type' => 'empty_spaces_before_paragraph'
+                  'type' => 'spaces_before_paragraph'
                 }
               ],
               'parent' => {},
@@ -52,7 +52,7 @@ $result_trees{'nested_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -86,7 +86,7 @@ $result_trees{'nested_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -125,7 +125,7 @@ $result_trees{'nested_itemize'} = {
                         {
                           'parent' => {},
                           'text' => '     ',
-                          'type' => 'empty_spaces_before_paragraph'
+                          'type' => 'spaces_before_paragraph'
                         }
                       ],
                       'parent' => {},
@@ -137,7 +137,7 @@ $result_trees{'nested_itemize'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -171,7 +171,7 @@ $result_trees{'nested_itemize'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -210,7 +210,7 @@ $result_trees{'nested_itemize'} = {
                                 {
                                   'parent' => {},
                                   'text' => '       ',
-                                  'type' => 'empty_spaces_before_paragraph'
+                                  'type' => 'spaces_before_paragraph'
                                 }
                               ],
                               'parent' => {},
@@ -222,7 +222,7 @@ $result_trees{'nested_itemize'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'contents' => [
@@ -256,7 +256,7 @@ $result_trees{'nested_itemize'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'contents' => [
@@ -295,7 +295,7 @@ $result_trees{'nested_itemize'} = {
                                         {
                                           'parent' => {},
                                           'text' => '         ',
-                                          'type' => 
'empty_spaces_before_paragraph'
+                                          'type' => 'spaces_before_paragraph'
                                         }
                                       ],
                                       'parent' => {},
@@ -307,7 +307,7 @@ $result_trees{'nested_itemize'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
@@ -341,7 +341,7 @@ $result_trees{'nested_itemize'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
diff --git a/tp/t/results/macro/empty_macro_in_text_no_arg.pl 
b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
index c954c8a1f4..59f8ecfe66 100644
--- a/tp/t/results/macro/empty_macro_in_text_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
@@ -69,7 +69,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 75d8b68697..1dba459647 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -168,7 +168,7 @@ $result_trees{'form_feeds'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl 
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 908cb3d1a7..61cd1a7903 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -81,7 +81,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
         {
           'parent' => {},
           'text' => '  ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index 25403bcb35..9d32673ecc 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -167,7 +167,7 @@ $result_trees{'macro_in_brace_command'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 765cd27790..453ee20c34 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -3122,7 +3122,7 @@ $result_trees{'macro_in_misc_commands'} = {
             {
               'parent' => {},
               'text' => ' ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'cmdname' => '@',
@@ -3163,7 +3163,7 @@ $result_trees{'macro_in_misc_commands'} = {
         {
           'parent' => {},
           'text' => '     ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -3185,7 +3185,7 @@ $result_trees{'macro_in_misc_commands'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
@@ -3208,7 +3208,7 @@ $result_trees{'macro_in_misc_commands'} = {
             {
               'parent' => {},
               'text' => '    ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
@@ -3315,7 +3315,7 @@ $result_trees{'macro_in_misc_commands'} = {
             {
               'parent' => {},
               'text' => '    ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'cmdname' => '@',
diff --git a/tp/t/results/macro/paragraph_and_macro.pl 
b/tp/t/results/macro/paragraph_and_macro.pl
index d967b8ec3d..5623c4fe43 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -219,7 +219,7 @@ $result_trees{'paragraph_and_macro'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -265,7 +265,7 @@ $result_trees{'paragraph_and_macro'} = {
         {
           'parent' => {},
           'text' => '    ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl 
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 9c9e40cbf0..3a8e1923b8 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -182,7 +182,7 @@ $result_trees{'block_commands_in_menu_description'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
diff --git a/tp/t/results/menu/menu_pointing_to_anchor.pl 
b/tp/t/results/menu/menu_pointing_to_anchor.pl
index 50f9cf7549..98a988e4cf 100644
--- a/tp/t/results/menu/menu_pointing_to_anchor.pl
+++ b/tp/t/results/menu/menu_pointing_to_anchor.pl
@@ -127,7 +127,7 @@ $result_trees{'menu_pointing_to_anchor'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/menu/submenu_in_example.pl 
b/tp/t/results/menu/submenu_in_example.pl
index 4f50d0c4a4..7efa72b709 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -461,7 +461,7 @@ $result_trees{'submenu_in_example'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
diff --git a/tp/t/results/misc_commands/also_not_line.pl 
b/tp/t/results/misc_commands/also_not_line.pl
index e9660ac2a5..68af68d0d8 100644
--- a/tp/t/results/misc_commands/also_not_line.pl
+++ b/tp/t/results/misc_commands/also_not_line.pl
@@ -61,7 +61,7 @@ $result_trees{'also_not_line'} = {
             {
               'parent' => {},
               'text' => ' ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
@@ -98,7 +98,7 @@ $result_trees{'also_not_line'} = {
         {
           'parent' => {},
           'text' => '     ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -120,7 +120,7 @@ $result_trees{'also_not_line'} = {
               'parent' => {},
               'text' => '  
 ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
@@ -143,7 +143,7 @@ $result_trees{'also_not_line'} = {
             {
               'parent' => {},
               'text' => '    ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
@@ -238,7 +238,7 @@ $result_trees{'also_not_line'} = {
             {
               'parent' => {},
               'text' => '    ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
diff --git a/tp/t/results/misc_commands/indent_in_quotation.pl 
b/tp/t/results/misc_commands/indent_in_quotation.pl
index 6b55471337..ac18dd060f 100644
--- a/tp/t/results/misc_commands/indent_in_quotation.pl
+++ b/tp/t/results/misc_commands/indent_in_quotation.pl
@@ -36,7 +36,7 @@ $result_trees{'indent_in_quotation'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'contents' => [
diff --git a/tp/t/results/misc_commands/noindent_after_smallexample.pl 
b/tp/t/results/misc_commands/noindent_after_smallexample.pl
index 985a8a2049..1c989ee547 100644
--- a/tp/t/results/misc_commands/noindent_after_smallexample.pl
+++ b/tp/t/results/misc_commands/noindent_after_smallexample.pl
@@ -100,7 +100,7 @@ $result_trees{'noindent_after_smallexample'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/misc_commands/noindent_empty_para.pl 
b/tp/t/results/misc_commands/noindent_empty_para.pl
index 1922766728..bcc7318eec 100644
--- a/tp/t/results/misc_commands/noindent_empty_para.pl
+++ b/tp/t/results/misc_commands/noindent_empty_para.pl
@@ -22,7 +22,7 @@ $result_trees{'noindent_empty_para'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/misc_commands/noindent_in_paragraph.pl 
b/tp/t/results/misc_commands/noindent_in_paragraph.pl
index ba6335f567..3cac410776 100644
--- a/tp/t/results/misc_commands/noindent_in_paragraph.pl
+++ b/tp/t/results/misc_commands/noindent_in_paragraph.pl
@@ -29,7 +29,7 @@ $result_trees{'noindent_in_paragraph'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
@@ -66,7 +66,7 @@ $result_trees{'noindent_in_paragraph'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
diff --git a/tp/t/results/misc_commands/noindent_indent.pl 
b/tp/t/results/misc_commands/noindent_indent.pl
index 33cb01ef97..65b5785d48 100644
--- a/tp/t/results/misc_commands/noindent_indent.pl
+++ b/tp/t/results/misc_commands/noindent_indent.pl
@@ -28,7 +28,7 @@ $result_trees{'noindent_indent'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -63,7 +63,7 @@ $result_trees{'noindent_indent'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -102,7 +102,7 @@ $result_trees{'noindent_indent'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -136,7 +136,7 @@ $result_trees{'noindent_indent'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 7056cd3f12..a6b10aebc1 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -3152,7 +3152,7 @@ $result_trees{'formatting_fr'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index de4bc90bc7..178f5c5774 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -3152,7 +3152,7 @@ $result_trees{'texi_formatting'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/moresectioning/placed_things_before_element.pl 
b/tp/t/results/moresectioning/placed_things_before_element.pl
index 56cca937ed..1cca171586 100644
--- a/tp/t/results/moresectioning/placed_things_before_element.pl
+++ b/tp/t/results/moresectioning/placed_things_before_element.pl
@@ -134,7 +134,7 @@ $result_trees{'placed_things_before_element'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
@@ -263,7 +263,7 @@ $result_trees{'placed_things_before_element'} = {
                         'parent' => {},
                         'text' => '
 ',
-                        'type' => 'empty_spaces_after_close_brace'
+                        'type' => 'spaces_after_close_brace'
                       },
                       {
                         'parent' => {},
diff --git a/tp/t/results/multitable/empty_headitem.pl 
b/tp/t/results/multitable/empty_headitem.pl
index 7a049eb7cd..37de84802e 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -63,7 +63,7 @@ $result_trees{'empty_headitem'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -82,7 +82,7 @@ $result_trees{'empty_headitem'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -111,7 +111,7 @@ $result_trees{'empty_headitem'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -156,7 +156,7 @@ $result_trees{'empty_headitem'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -175,7 +175,7 @@ $result_trees{'empty_headitem'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -226,7 +226,7 @@ $result_trees{'empty_headitem'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/empty_item_tab.pl 
b/tp/t/results/multitable/empty_item_tab.pl
index 0f3dc9b6cd..5deecc427e 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -62,7 +62,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -97,7 +97,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -125,7 +125,7 @@ $result_trees{'empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -165,7 +165,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -291,7 +291,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -326,7 +326,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -354,7 +354,7 @@ $result_trees{'empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -399,7 +399,7 @@ $result_trees{'empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -429,7 +429,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -457,7 +457,7 @@ $result_trees{'empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -488,7 +488,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -522,7 +522,7 @@ $result_trees{'empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -542,7 +542,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -571,7 +571,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         }
                       ],
                       'extra' => {
@@ -591,7 +591,7 @@ $result_trees{'empty_item_tab'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -625,7 +625,7 @@ $result_trees{'empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -654,7 +654,7 @@ $result_trees{'empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/empty_multitable_with_cells.pl 
b/tp/t/results/multitable/empty_multitable_with_cells.pl
index 4d0e5699f8..981fb54ff9 100644
--- a/tp/t/results/multitable/empty_multitable_with_cells.pl
+++ b/tp/t/results/multitable/empty_multitable_with_cells.pl
@@ -28,7 +28,7 @@ $result_trees{'empty_multitable_with_cells'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -43,7 +43,7 @@ $result_trees{'empty_multitable_with_cells'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -58,7 +58,7 @@ $result_trees{'empty_multitable_with_cells'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -74,7 +74,7 @@ $result_trees{'empty_multitable_with_cells'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl 
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index 0c23547a40..686f878413 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -74,7 +74,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -165,7 +165,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -326,7 +326,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -355,7 +355,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -400,7 +400,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -429,7 +429,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -486,7 +486,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -515,7 +515,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -594,7 +594,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -769,7 +769,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl 
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index 93d0a66657..521a35316c 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -53,7 +53,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -175,7 +175,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -202,7 +202,7 @@ $result_trees{'multitable_begin_with_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/multitable_figure_space.pl 
b/tp/t/results/multitable/multitable_figure_space.pl
index 882aaf66b3..d67d9ab411 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -58,7 +58,7 @@ $result_trees{'multitable_figure_space'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -87,7 +87,7 @@ $result_trees{'multitable_figure_space'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -126,7 +126,7 @@ $result_trees{'multitable_figure_space'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -155,7 +155,7 @@ $result_trees{'multitable_figure_space'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -194,7 +194,7 @@ $result_trees{'multitable_figure_space'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -223,7 +223,7 @@ $result_trees{'multitable_figure_space'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/multitable_in_example.pl 
b/tp/t/results/multitable/multitable_in_example.pl
index eeda7bfc07..16d8a1b710 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -74,7 +74,7 @@ $result_trees{'multitable_in_example'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -103,7 +103,7 @@ $result_trees{'multitable_in_example'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -142,7 +142,7 @@ $result_trees{'multitable_in_example'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -189,7 +189,7 @@ $result_trees{'multitable_in_example'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
diff --git a/tp/t/results/multitable/multitable_not_closed_item.pl 
b/tp/t/results/multitable/multitable_not_closed_item.pl
index 54ed73215e..89d58d5cbc 100644
--- a/tp/t/results/multitable/multitable_not_closed_item.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item.pl
@@ -58,7 +58,7 @@ $result_trees{'multitable_not_closed_item'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/multitable_not_closed_item_tab.pl 
b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
index 40c1ade4af..4a539c46cc 100644
--- a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
@@ -58,7 +58,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -87,7 +87,7 @@ $result_trees{'multitable_not_closed_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl 
b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
index edb5c36fb7..b552009789 100644
--- a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
@@ -44,7 +44,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -59,7 +59,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -74,7 +74,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -89,7 +89,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -128,7 +128,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -167,7 +167,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -182,7 +182,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -197,7 +197,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -212,7 +212,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -251,7 +251,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -266,7 +266,7 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl 
b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
index c2c3bf3e7f..b61804d3aa 100644
--- a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
@@ -62,7 +62,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -91,7 +91,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -106,7 +106,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -121,7 +121,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -136,7 +136,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -175,7 +175,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -214,7 +214,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -243,7 +243,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -258,7 +258,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/multitable_with_empty_item_tab.pl 
b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
index d8af728a3c..73e3badd7c 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -62,7 +62,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -91,7 +91,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -164,7 +164,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -193,7 +193,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl 
b/tp/t/results/multitable/not_letters_in_prototype.pl
index d591ca132b..332b8f6425 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -38,7 +38,7 @@ $result_trees{'not_letters_in_prototype'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -67,7 +67,7 @@ $result_trees{'not_letters_in_prototype'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl 
b/tp/t/results/multitable/paragraph_in_cells.pl
index 9d17758be4..c8a82c4f59 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -58,7 +58,7 @@ $result_trees{'paragraph_in_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -87,7 +87,7 @@ $result_trees{'paragraph_in_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -126,7 +126,7 @@ $result_trees{'paragraph_in_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -179,7 +179,7 @@ $result_trees{'paragraph_in_cells'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/ref_in_multitable.pl 
b/tp/t/results/multitable/ref_in_multitable.pl
index 55a454b4e3..01b2d2ad0e 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -138,7 +138,7 @@ $result_trees{'ref_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -168,7 +168,7 @@ $result_trees{'ref_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -241,7 +241,7 @@ $result_trees{'ref_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -271,7 +271,7 @@ $result_trees{'ref_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -344,7 +344,7 @@ $result_trees{'ref_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -438,7 +438,7 @@ $result_trees{'ref_in_multitable'} = {
                           'parent' => {},
                           'text' => ' 
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/multitable/w_in_multitable.pl 
b/tp/t/results/multitable/w_in_multitable.pl
index 13c61fad86..f58da66eae 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -58,7 +58,7 @@ $result_trees{'w_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -115,7 +115,7 @@ $result_trees{'w_in_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl 
b/tp/t/results/paragraph/commands_in_flushright.pl
index aef8064903..84fcf9fad4 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -193,7 +193,7 @@ $result_trees{'commands_in_flushright'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_line_after_command'
+                      'type' => 'ignorable_spaces_after_command'
                     },
                     {
                       'contents' => [
@@ -229,7 +229,7 @@ $result_trees{'commands_in_flushright'} = {
                     {
                       'parent' => {},
                       'text' => ' ',
-                      'type' => 'empty_line_after_command'
+                      'type' => 'ignorable_spaces_after_command'
                     },
                     {
                       'contents' => [
@@ -527,7 +527,7 @@ $result_trees{'commands_in_flushright'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'contents' => [
@@ -556,7 +556,7 @@ $result_trees{'commands_in_flushright'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'contents' => [
@@ -595,7 +595,7 @@ $result_trees{'commands_in_flushright'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'contents' => [
@@ -643,7 +643,7 @@ $result_trees{'commands_in_flushright'} = {
                               'parent' => {},
                               'text' => ' 
 ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'parent' => {},
diff --git a/tp/t/results/paragraph/paragraph_indent_asis.pl 
b/tp/t/results/paragraph/paragraph_indent_asis.pl
index 64644d49bb..f3e7858316 100644
--- a/tp/t/results/paragraph/paragraph_indent_asis.pl
+++ b/tp/t/results/paragraph/paragraph_indent_asis.pl
@@ -49,7 +49,7 @@ $result_trees{'paragraph_indent_asis'} = {
         {
           'parent' => {},
           'text' => '  ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -90,7 +90,7 @@ $result_trees{'paragraph_indent_asis'} = {
             {
               'parent' => {},
               'text' => '  ',
-              'type' => 'empty_spaces_before_paragraph'
+              'type' => 'spaces_before_paragraph'
             },
             {
               'contents' => [
diff --git a/tp/t/results/paragraph/text_space_comment.pl 
b/tp/t/results/paragraph/text_space_comment.pl
index a17a568c96..5f2736423f 100644
--- a/tp/t/results/paragraph/text_space_comment.pl
+++ b/tp/t/results/paragraph/text_space_comment.pl
@@ -12,7 +12,7 @@ $result_trees{'text_space_comment'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl 
b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
index 4cd5fa2ce2..83b2ffbb91 100644
--- a/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
+++ b/tp/t/results/plaintext_tests/anchor_and_empty_lines.pl
@@ -58,7 +58,7 @@ $result_trees{'anchor_and_empty_lines'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
index 5126c45f0c..5dfc8ae6b7 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
@@ -368,7 +368,7 @@ $result_trees{'at_commands_glued_in_example'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 
b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
index d7d774160d..cf729c5209 100644
--- a/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
+++ b/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
@@ -354,7 +354,7 @@ $result_trees{'at_commands_glued_in_paragraph'} = {
             {
               'parent' => {},
               'text' => ' ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
diff --git a/tp/t/results/plaintext_tests/east_asian_in_w.pl 
b/tp/t/results/plaintext_tests/east_asian_in_w.pl
index 7a823b65c4..780091f926 100644
--- a/tp/t/results/plaintext_tests/east_asian_in_w.pl
+++ b/tp/t/results/plaintext_tests/east_asian_in_w.pl
@@ -113,7 +113,7 @@ $result_trees{'east_asian_in_w'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl 
b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
index d9c3fa1bba..12696b5870 100644
--- a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
+++ b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
@@ -34,7 +34,7 @@ $result_trees{'empty_multitable_in_itemize'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl 
b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
index 8056f1dc3b..1c6d6db7be 100644
--- a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
+++ b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
@@ -51,7 +51,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -147,7 +147,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -163,7 +163,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -265,7 +265,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -288,7 +288,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -391,7 +391,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -407,7 +407,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -437,7 +437,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
diff --git a/tp/t/results/plaintext_tests/long_uref_after_item.pl 
b/tp/t/results/plaintext_tests/long_uref_after_item.pl
index b2fe2a0165..0acdd62de9 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -37,7 +37,7 @@ $result_trees{'long_uref_after_item'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
diff --git a/tp/t/results/plaintext_tests/multitable.pl 
b/tp/t/results/plaintext_tests/multitable.pl
index 644b6dde77..2846b723fd 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -58,7 +58,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -87,7 +87,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -126,7 +126,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => '   ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -155,7 +155,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -300,7 +300,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -329,7 +329,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -368,7 +368,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -397,7 +397,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -436,7 +436,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -465,7 +465,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -504,7 +504,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -533,7 +533,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -572,7 +572,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -601,7 +601,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -640,7 +640,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -669,7 +669,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -708,7 +708,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -737,7 +737,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -776,7 +776,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -805,7 +805,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -844,7 +844,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -873,7 +873,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -912,7 +912,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -941,7 +941,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -980,7 +980,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1009,7 +1009,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1048,7 +1048,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1077,7 +1077,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1116,7 +1116,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1145,7 +1145,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1190,7 +1190,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1219,7 +1219,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1364,7 +1364,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1393,7 +1393,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1432,7 +1432,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1461,7 +1461,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1500,7 +1500,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1529,7 +1529,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1660,7 +1660,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1704,7 +1704,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1843,7 +1843,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1878,7 +1878,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1922,7 +1922,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1952,7 +1952,7 @@ $result_trees{'multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git 
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl 
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
index 487b6c3d8f..7c2c693ead 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
@@ -54,7 +54,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -69,7 +69,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -108,7 +108,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                                 {
                                   'parent' => {},
                                   'text' => ' ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 },
                                 {
                                   'parent' => {},
@@ -124,7 +124,7 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
                                   'parent' => {},
                                   'text' => '
 ',
-                                  'type' => 'empty_line_after_command'
+                                  'type' => 'ignorable_spaces_after_command'
                                 }
                               ],
                               'parent' => {},
diff --git a/tp/t/results/plaintext_tests/nested_indentedblock.pl 
b/tp/t/results/plaintext_tests/nested_indentedblock.pl
index 030247a455..a09e588dec 100644
--- a/tp/t/results/plaintext_tests/nested_indentedblock.pl
+++ b/tp/t/results/plaintext_tests/nested_indentedblock.pl
@@ -156,7 +156,7 @@ $result_trees{'nested_indentedblock'} = {
             {
               'parent' => {},
               'text' => '   ',
-              'type' => 'empty_spaces_before_paragraph'
+              'type' => 'spaces_before_paragraph'
             },
             {
               'contents' => [
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl 
b/tp/t/results/plaintext_tests/nested_multitable.pl
index 9bd21e22bb..0fa8963156 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -73,7 +73,7 @@ $result_trees{'nested_multitable'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'args' => [
@@ -124,7 +124,7 @@ $result_trees{'nested_multitable'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
@@ -153,7 +153,7 @@ $result_trees{'nested_multitable'} = {
                                         {
                                           'parent' => {},
                                           'text' => ' ',
-                                          'type' => 'empty_line_after_command'
+                                          'type' => 
'ignorable_spaces_after_command'
                                         },
                                         {
                                           'contents' => [
@@ -246,7 +246,7 @@ $result_trees{'nested_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_spaces_before_paragraph'
+                          'type' => 'spaces_before_paragraph'
                         }
                       ],
                       'extra' => {
@@ -265,7 +265,7 @@ $result_trees{'nested_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -304,7 +304,7 @@ $result_trees{'nested_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -333,7 +333,7 @@ $result_trees{'nested_multitable'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl 
b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
index 72e42fdbdb..c6e5c4a09a 100644
--- a/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
+++ b/tp/t/results/plaintext_tests/no_empty_line_after_section.pl
@@ -286,7 +286,7 @@ $result_trees{'no_empty_line_after_section'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/plaintext_tests/paragraphindent.pl 
b/tp/t/results/plaintext_tests/paragraphindent.pl
index 5d1af27f28..c544b51402 100644
--- a/tp/t/results/plaintext_tests/paragraphindent.pl
+++ b/tp/t/results/plaintext_tests/paragraphindent.pl
@@ -29,7 +29,7 @@ $result_trees{'paragraphindent'} = {
         {
           'parent' => {},
           'text' => '           ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -88,7 +88,7 @@ $result_trees{'paragraphindent'} = {
         {
           'parent' => {},
           'text' => '           ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -147,7 +147,7 @@ $result_trees{'paragraphindent'} = {
         {
           'parent' => {},
           'text' => '           ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
@@ -206,7 +206,7 @@ $result_trees{'paragraphindent'} = {
         {
           'parent' => {},
           'text' => '           ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl 
b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
index e7cc28997b..326b964fa6 100644
--- a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
@@ -56,7 +56,7 @@ $result_trees{'tab_in_table_in_example'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'parent' => {},
@@ -125,7 +125,7 @@ $result_trees{'tab_in_table_in_example'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'parent' => {},
diff --git a/tp/t/results/plaintext_tests/tab_item_in_example.pl 
b/tp/t/results/plaintext_tests/tab_item_in_example.pl
index b5276308fa..e0ff4cff6b 100644
--- a/tp/t/results/plaintext_tests/tab_item_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_item_in_example.pl
@@ -28,7 +28,7 @@ $result_trees{'tab_item_in_example'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
@@ -44,7 +44,7 @@ $result_trees{'tab_item_in_example'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'parent' => {},
diff --git a/tp/t/results/regions/anchor_in_copying.pl 
b/tp/t/results/regions/anchor_in_copying.pl
index 9ea225428e..9d43fe52a5 100644
--- a/tp/t/results/regions/anchor_in_copying.pl
+++ b/tp/t/results/regions/anchor_in_copying.pl
@@ -85,7 +85,7 @@ $result_trees{'anchor_in_copying'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'empty_spaces_after_close_brace'
+                      'type' => 'spaces_after_close_brace'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/regions/anchor_in_copying_in_footnote.pl 
b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
index 9115216798..b0cc94c93e 100644
--- a/tp/t/results/regions/anchor_in_copying_in_footnote.pl
+++ b/tp/t/results/regions/anchor_in_copying_in_footnote.pl
@@ -83,7 +83,7 @@ $result_trees{'anchor_in_copying_in_footnote'} = {
                                   'parent' => {},
                                   'text' => '
 ',
-                                  'type' => 'empty_spaces_after_close_brace'
+                                  'type' => 'spaces_after_close_brace'
                                 }
                               ],
                               'parent' => {},
diff --git a/tp/t/results/regions/anchor_in_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage.pl
index f7bdd31a35..d16f6635c1 100644
--- a/tp/t/results/regions/anchor_in_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage.pl
@@ -66,7 +66,7 @@ $result_trees{'anchor_in_titlepage'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'args' => [
diff --git a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl 
b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
index 828f8be3ca..ca935e6810 100644
--- a/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
+++ b/tp/t/results/regions/anchor_in_titlepage_titlepage.pl
@@ -66,7 +66,7 @@ $result_trees{'anchor_in_titlepage_titlepage'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'empty_spaces_after_close_brace'
+                  'type' => 'spaces_after_close_brace'
                 },
                 {
                   'args' => [
diff --git a/tp/t/results/sectioning/double_node_anchor_float.pl 
b/tp/t/results/sectioning/double_node_anchor_float.pl
index 437e74dd0f..f63a8cf46b 100644
--- a/tp/t/results/sectioning/double_node_anchor_float.pl
+++ b/tp/t/results/sectioning/double_node_anchor_float.pl
@@ -112,7 +112,7 @@ $result_trees{'double_node_anchor_float'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
@@ -152,7 +152,7 @@ $result_trees{'double_node_anchor_float'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/sectioning/no_element.pl 
b/tp/t/results/sectioning/no_element.pl
index cec920d230..6dbf600141 100644
--- a/tp/t/results/sectioning/no_element.pl
+++ b/tp/t/results/sectioning/no_element.pl
@@ -112,7 +112,7 @@ $result_trees{'no_element'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
@@ -241,7 +241,7 @@ $result_trees{'no_element'} = {
                         'parent' => {},
                         'text' => '
 ',
-                        'type' => 'empty_spaces_after_close_brace'
+                        'type' => 'spaces_after_close_brace'
                       },
                       {
                         'parent' => {},
diff --git a/tp/t/results/sectioning/placed_things_before_element.pl 
b/tp/t/results/sectioning/placed_things_before_element.pl
index ef7519b6b9..9c8cd26cdd 100644
--- a/tp/t/results/sectioning/placed_things_before_element.pl
+++ b/tp/t/results/sectioning/placed_things_before_element.pl
@@ -41,7 +41,7 @@ $result_trees{'placed_things_before_element'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
@@ -170,7 +170,7 @@ $result_trees{'placed_things_before_element'} = {
                         'parent' => {},
                         'text' => '
 ',
-                        'type' => 'empty_spaces_after_close_brace'
+                        'type' => 'spaces_after_close_brace'
                       },
                       {
                         'parent' => {},
diff --git a/tp/t/results/sectioning/placed_things_before_node.pl 
b/tp/t/results/sectioning/placed_things_before_node.pl
index 9136cc799d..6cd5120e0f 100644
--- a/tp/t/results/sectioning/placed_things_before_node.pl
+++ b/tp/t/results/sectioning/placed_things_before_node.pl
@@ -41,7 +41,7 @@ $result_trees{'placed_things_before_node'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
@@ -170,7 +170,7 @@ $result_trees{'placed_things_before_node'} = {
                         'parent' => {},
                         'text' => '
 ',
-                        'type' => 'empty_spaces_after_close_brace'
+                        'type' => 'spaces_after_close_brace'
                       },
                       {
                         'parent' => {},
diff --git a/tp/t/results/sectioning/protected_node_parentheses.pl 
b/tp/t/results/sectioning/protected_node_parentheses.pl
index d7bc19d2a7..99520677c6 100644
--- a/tp/t/results/sectioning/protected_node_parentheses.pl
+++ b/tp/t/results/sectioning/protected_node_parentheses.pl
@@ -335,7 +335,7 @@ $result_trees{'protected_node_parentheses'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_after_close_brace'
+          'type' => 'spaces_after_close_brace'
         },
         {
           'parent' => {},
diff --git a/tp/t/results/value/bad_syntax.pl b/tp/t/results/value/bad_syntax.pl
index f241f228c0..301ec1e704 100644
--- a/tp/t/results/value/bad_syntax.pl
+++ b/tp/t/results/value/bad_syntax.pl
@@ -97,7 +97,7 @@ $result_trees{'bad_syntax'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_spaces_before_paragraph'
+          'type' => 'spaces_before_paragraph'
         },
         {
           'contents' => [
diff --git a/tp/t/results/value/set_in_item_missing_line.pl 
b/tp/t/results/value/set_in_item_missing_line.pl
index 1cbfa890f6..1bf8e4a05f 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -247,7 +247,7 @@ $result_trees{'set_in_item_missing_line'} = {
                             {
                               'parent' => {},
                               'text' => ' ',
-                              'type' => 'empty_line_after_command'
+                              'type' => 'ignorable_spaces_after_command'
                             },
                             {
                               'parent' => {},
diff --git a/tp/t/results/value/value_in_misc_commands.pl 
b/tp/t/results/value/value_in_misc_commands.pl
index e8eaa4c000..36673bd7e2 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -2261,7 +2261,7 @@ $result_trees{'value_in_misc_commands'} = {
         {
           'parent' => {},
           'text' => '     ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -2283,7 +2283,7 @@ $result_trees{'value_in_misc_commands'} = {
               'parent' => {},
               'text' => '
 ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
@@ -2306,7 +2306,7 @@ $result_trees{'value_in_misc_commands'} = {
             {
               'parent' => {},
               'text' => '    ',
-              'type' => 'empty_line_after_command'
+              'type' => 'ignorable_spaces_after_command'
             },
             {
               'parent' => {},
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 81abdd95f4..16e078d5d0 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -263,7 +263,7 @@ $result_trees{'commands_and_spaces'} = {
         {
           'parent' => {},
           'text' => '  ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -298,7 +298,7 @@ $result_trees{'commands_and_spaces'} = {
           'parent' => {},
           'text' => '
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
@@ -333,7 +333,7 @@ $result_trees{'commands_and_spaces'} = {
           'parent' => {},
           'text' => '  
 ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'contents' => [
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl 
b/tp/t/results/xml_tests/comments_end_lines.pl
index 97aa5a09d5..95f2086e50 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -36,7 +36,7 @@ $result_trees{'comments_end_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -638,7 +638,7 @@ $result_trees{'comments_end_lines'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -667,7 +667,7 @@ $result_trees{'comments_end_lines'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl 
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index ba7fbb8598..6442dccdde 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -52,7 +52,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -165,7 +165,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -284,7 +284,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -411,7 +411,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -518,7 +518,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -631,7 +631,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [
@@ -1717,7 +1717,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1746,7 +1746,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1895,7 +1895,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
@@ -1924,7 +1924,7 @@ $result_trees{'comments_on_block_command_lines'} = {
                         {
                           'parent' => {},
                           'text' => ' ',
-                          'type' => 'empty_line_after_command'
+                          'type' => 'ignorable_spaces_after_command'
                         },
                         {
                           'contents' => [
diff --git a/tp/t/results/xml_tests/comments_on_misc_command_line.pl 
b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
index f7ddb4db71..06ebeb651e 100644
--- a/tp/t/results/xml_tests/comments_on_misc_command_line.pl
+++ b/tp/t/results/xml_tests/comments_on_misc_command_line.pl
@@ -302,7 +302,7 @@ $result_trees{'comments_on_misc_command_line'} = {
         {
           'parent' => {},
           'text' => ' ',
-          'type' => 'empty_line_after_command'
+          'type' => 'ignorable_spaces_after_command'
         },
         {
           'args' => [
diff --git a/tp/t/results/xtable/headitem_in_table.pl 
b/tp/t/results/xtable/headitem_in_table.pl
index fce366a89a..a292f6025c 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -40,7 +40,7 @@ $result_trees{'headitem_in_table'} = {
                 {
                   'parent' => {},
                   'text' => ' ',
-                  'type' => 'empty_line_after_command'
+                  'type' => 'ignorable_spaces_after_command'
                 },
                 {
                   'contents' => [



reply via email to

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