texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: Rename after_description_line type as after_menu_


From: Patrice Dumas
Subject: branch master updated: Rename after_description_line type as after_menu_description_line
Date: Thu, 11 Aug 2022 08:17:22 -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 9d4519dd7c Rename after_description_line type as 
after_menu_description_line
9d4519dd7c is described below

commit 9d4519dd7ce6b08d4ed77c301562b1a49c61f453
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Aug 11 14:17:10 2022 +0200

    Rename after_description_line type as after_menu_description_line
    
    * tp/Texinfo/ParserNonXS.pm (_end_line),
    tp/Texinfo/XS/parsetexi/element_types.txt,
    tp/Texinfo/XS/parsetexi/end_line.c(end_line): rename
    after_description_line as after_menu_description_line.
    
    * tp/Texinfo/Convert/LaTeX.pm (_convert): do not check
    after_menu_description_line, menus are already ignored.
---
 ChangeLog                                                    | 12 ++++++++++++
 tp/Texinfo/Convert/LaTeX.pm                                  |  4 ----
 tp/Texinfo/Convert/Plaintext.pm                              |  2 +-
 tp/Texinfo/ParserNonXS.pm                                    |  4 ++--
 tp/Texinfo/Transformations.pm                                |  2 +-
 tp/Texinfo/XS/parsetexi/element_types.c                      |  2 +-
 tp/Texinfo/XS/parsetexi/element_types.h                      |  2 +-
 tp/Texinfo/XS/parsetexi/element_types.txt                    |  2 +-
 tp/Texinfo/XS/parsetexi/end_line.c                           |  2 +-
 tp/t/results/formatting/direntry_dircategory_info_split.pl   |  2 +-
 tp/t/results/formatting/texi_bib_example.pl                  |  2 +-
 tp/t/results/html_tests/simple_menu.pl                       | 12 ++++++------
 tp/t/results/html_tests/simple_menu_in_example.pl            |  2 +-
 tp/t/results/info_tests/direntry_dircategory_and_commands.pl |  2 +-
 tp/t/results/info_tests/space_at_menu_end.pl                 |  2 +-
 .../invalid_nestings/table_not_closed_in_menu_comment.pl     |  2 +-
 tp/t/results/macro/macro_in_menu.pl                          |  2 +-
 tp/t/results/menu/dash_in_menu.pl                            |  2 +-
 tp/t/results/menu/detailmenu.pl                              |  2 +-
 tp/t/results/menu/detailmenu_on_subnodes.pl                  |  2 +-
 tp/t/results/menu/entry_after_detailmenu.pl                  |  2 +-
 tp/t/results/menu/example_in_menu_comment.pl                 |  2 +-
 tp/t/results/menu/example_in_menu_description.pl             |  2 +-
 tp/t/results/menu/formats_in_menu.pl                         |  4 ++--
 tp/t/results/menu/inlineraw_in_menu_description.pl           |  2 +-
 tp/t/results/menu/menu_in_example.pl                         |  2 +-
 tp/t/results/menu/menu_no_closed_after_empty_line.pl         |  2 +-
 tp/t/results/menu/missing_detailmenu_on_subnodes.pl          |  4 ++--
 tp/t/results/menu/sc_in_menu.pl                              |  4 ++--
 tp/t/results/menu/simple.pl                                  |  2 +-
 tp/t/results/menu/simple_no_menu.pl                          |  2 +-
 tp/t/results/menu/verb_in_menu_description.pl                |  2 +-
 tp/t/results/morecoverage/formatting_fr.pl                   |  6 +++---
 tp/t/results/morecoverage/texi_formatting.pl                 |  6 +++---
 tp/t/results/moresectioning/sectioning_frames.pl             | 10 +++++-----
 tp/t/results/plaintext_tests/quote_node_names.pl             |  2 +-
 tp/t/results/sectioning/complex.pl                           |  2 +-
 tp/t/results/sectioning/complex_split_at_node.pl             |  2 +-
 tp/t/results/xml_tests/image_inline_or_not.pl                |  2 +-
 39 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3df8c4edd6..8dca7ab866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2022-08-11  Patrice Dumas  <pertusus@free.fr>
+
+       Rename after_description_line type as after_menu_description_line
+
+       * tp/Texinfo/ParserNonXS.pm (_end_line),
+       tp/Texinfo/XS/parsetexi/element_types.txt,
+       tp/Texinfo/XS/parsetexi/end_line.c(end_line): rename
+       after_description_line as after_menu_description_line.
+
+       * tp/Texinfo/Convert/LaTeX.pm (_convert): do not check
+       after_menu_description_line, menus are already ignored.
+
 2022-08-11  Patrice Dumas  <pertusus@free.fr>
 
        Avoid empty line in @*table inter item formatting
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 0fc342984c..ed8b0aabb4 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2284,10 +2284,6 @@ sub _convert($$)
       return "\n";
     }
   }
-  # FIXME same as ignoring.  Handle with @def*
-  if ($type and ($type eq 'after_description_line')) {
-    return '';
-  }
 
   # process text
   if (defined($element->{'text'})) {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 517c463cc2..0cdf0bb3b4 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1541,7 +1541,7 @@ sub _convert($$)
   # of text below to be sure that an empty line is always processed
   # especially
   if ($type and ($type eq 'empty_line' 
-                           or $type eq 'after_description_line')) {
+                           or $type eq 'after_menu_description_line')) {
     delete $self->{'text_element_context'}->[-1]->{'counter'};
     $self->{'empty_lines_count'}++;
     if ($self->{'empty_lines_count'} <= 1
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 3876a662ff..52bea058f9 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2820,7 +2820,7 @@ sub _end_line($$$)
                                         'parent' => $current,
                                         'contents' => [] };
       $current = $current->{'contents'}->[-1];
-      push @{$current->{'contents'}}, { 'type' => 'after_description_line',
+      push @{$current->{'contents'}}, { 'type' => 
'after_menu_description_line',
                                         'text' => $empty_line->{'text'},
                                         'parent' => $current };
       print STDERR "MENU: END DESCRIPTION, OPEN COMMENT\n" if 
($self->{'DEBUG'});
@@ -6905,7 +6905,7 @@ at all):
 
 =over
 
-=item after_description_line
+=item after_menu_description_line
 
 =item space_at_end_menu_node
 
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index a69d63af47..7deebf950d 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -677,7 +677,7 @@ sub regenerate_master_menu($$)
     $index++;
     my $preformatted = {'type' => 'preformatted', 'parent' => $menu_comment};
     push @{$menu_comment->{'contents'}}, $preformatted;
-    my $empty_line = {'type' => 'after_description_line', 'text' => "\n",
+    my $empty_line = {'type' => 'after_menu_description_line', 'text' => "\n",
                       'parent' => $preformatted};
     push @{$preformatted->{'contents'}}, $empty_line;
   }
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c 
b/tp/Texinfo/XS/parsetexi/element_types.c
index 248f730625..4f8e815844 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -19,7 +19,7 @@ char *element_type_names[] = {
 "empty_spaces_before_paragraph",
 "text_before_beginning",
 "space_at_end_menu_node",
-"after_description_line",
+"after_menu_description_line",
 "spaces",
 "spaces_inserted",
 "document_root",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h 
b/tp/Texinfo/XS/parsetexi/element_types.h
index 3ba47eed6c..161ec821c2 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -22,7 +22,7 @@ ET_empty_spaces_after_close_brace,
 ET_empty_spaces_before_paragraph,
 ET_text_before_beginning,
 ET_space_at_end_menu_node,
-ET_after_description_line,
+ET_after_menu_description_line,
 ET_spaces,
 ET_spaces_inserted,
 ET_document_root,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt 
b/tp/Texinfo/XS/parsetexi/element_types.txt
index f4ad09c9d7..45c465b74a 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -37,7 +37,7 @@ empty_spaces_after_close_brace
 empty_spaces_before_paragraph
 text_before_beginning
 space_at_end_menu_node
-after_description_line
+after_menu_description_line
 spaces
 spaces_inserted
 
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 1b932ecd23..c7f71cac90 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1972,7 +1972,7 @@ end_line (ELEMENT *current)
           add_to_element_contents (current, e);
 
           current = e;
-          e = new_element (ET_after_description_line);
+          e = new_element (ET_after_menu_description_line);
           text_append (&e->text, empty_line->text.text);
           destroy_element (empty_line);
           add_to_element_contents (current, e);
diff --git a/tp/t/results/formatting/direntry_dircategory_info_split.pl 
b/tp/t/results/formatting/direntry_dircategory_info_split.pl
index b11c1bd6f4..5ed423abd1 100644
--- a/tp/t/results/formatting/direntry_dircategory_info_split.pl
+++ b/tp/t/results/formatting/direntry_dircategory_info_split.pl
@@ -409,7 +409,7 @@ $result_trees{'direntry_dircategory_info_split'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/formatting/texi_bib_example.pl 
b/tp/t/results/formatting/texi_bib_example.pl
index a2182765c9..3f870bc83e 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -3950,7 +3950,7 @@ $result_trees{'texi_bib_example'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/html_tests/simple_menu.pl 
b/tp/t/results/html_tests/simple_menu.pl
index 140673d5db..d65840ccfe 100644
--- a/tp/t/results/html_tests/simple_menu.pl
+++ b/tp/t/results/html_tests/simple_menu.pl
@@ -302,7 +302,7 @@ $result_trees{'simple_menu'} = {
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'after_description_line'
+                              'type' => 'after_menu_description_line'
                             },
                             {
                               'parent' => {},
@@ -683,7 +683,7 @@ $result_trees{'simple_menu'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'after_description_line'
+                  'type' => 'after_menu_description_line'
                 },
                 {
                   'parent' => {},
@@ -834,7 +834,7 @@ $result_trees{'simple_menu'} = {
                   'parent' => {},
                   'text' => '
 ',
-                  'type' => 'after_description_line'
+                  'type' => 'after_menu_description_line'
                 }
               ],
               'parent' => {},
@@ -1062,7 +1062,7 @@ $result_trees{'simple_menu'} = {
                                   'parent' => {},
                                   'text' => '
 ',
-                                  'type' => 'after_description_line'
+                                  'type' => 'after_menu_description_line'
                                 },
                                 {
                                   'parent' => {},
@@ -1443,7 +1443,7 @@ $result_trees{'simple_menu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
@@ -1594,7 +1594,7 @@ $result_trees{'simple_menu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/html_tests/simple_menu_in_example.pl 
b/tp/t/results/html_tests/simple_menu_in_example.pl
index b47c753867..c53e0525df 100644
--- a/tp/t/results/html_tests/simple_menu_in_example.pl
+++ b/tp/t/results/html_tests/simple_menu_in_example.pl
@@ -197,7 +197,7 @@ $result_trees{'simple_menu_in_example'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'after_description_line'
+                          'type' => 'after_menu_description_line'
                         }
                       ],
                       'parent' => {},
diff --git a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl 
b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
index 9d18cbb582..3e4b83c3aa 100644
--- a/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
+++ b/tp/t/results/info_tests/direntry_dircategory_and_commands.pl
@@ -344,7 +344,7 @@ $result_trees{'direntry_dircategory_and_commands'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/info_tests/space_at_menu_end.pl 
b/tp/t/results/info_tests/space_at_menu_end.pl
index b87b1717bb..55a616641f 100644
--- a/tp/t/results/info_tests/space_at_menu_end.pl
+++ b/tp/t/results/info_tests/space_at_menu_end.pl
@@ -121,7 +121,7 @@ $result_trees{'space_at_menu_end'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index d95586e337..5c1cbfbec1 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -93,7 +93,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index 7236020ef8..c70afcbeb7 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -362,7 +362,7 @@ $result_trees{'macro_in_menu'} = {
                       'parent' => {},
                       'text' => '  
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/menu/dash_in_menu.pl 
b/tp/t/results/menu/dash_in_menu.pl
index 9e80127552..150fc5c872 100644
--- a/tp/t/results/menu/dash_in_menu.pl
+++ b/tp/t/results/menu/dash_in_menu.pl
@@ -123,7 +123,7 @@ $result_trees{'dash_in_menu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/menu/detailmenu.pl b/tp/t/results/menu/detailmenu.pl
index 64cf665a20..98623eeaa4 100644
--- a/tp/t/results/menu/detailmenu.pl
+++ b/tp/t/results/menu/detailmenu.pl
@@ -92,7 +92,7 @@ $result_trees{'detailmenu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/menu/detailmenu_on_subnodes.pl 
b/tp/t/results/menu/detailmenu_on_subnodes.pl
index 7c7bfa3b7c..6d1820cf10 100644
--- a/tp/t/results/menu/detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/detailmenu_on_subnodes.pl
@@ -212,7 +212,7 @@ $result_trees{'detailmenu_on_subnodes'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/menu/entry_after_detailmenu.pl 
b/tp/t/results/menu/entry_after_detailmenu.pl
index ad58a23315..f876a3d252 100644
--- a/tp/t/results/menu/entry_after_detailmenu.pl
+++ b/tp/t/results/menu/entry_after_detailmenu.pl
@@ -253,7 +253,7 @@ $result_trees{'entry_after_detailmenu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/menu/example_in_menu_comment.pl 
b/tp/t/results/menu/example_in_menu_comment.pl
index 84f55eafab..828f958506 100644
--- a/tp/t/results/menu/example_in_menu_comment.pl
+++ b/tp/t/results/menu/example_in_menu_comment.pl
@@ -86,7 +86,7 @@ $result_trees{'example_in_menu_comment'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/menu/example_in_menu_description.pl 
b/tp/t/results/menu/example_in_menu_description.pl
index 006fa07022..d3739d9246 100644
--- a/tp/t/results/menu/example_in_menu_description.pl
+++ b/tp/t/results/menu/example_in_menu_description.pl
@@ -237,7 +237,7 @@ $result_trees{'example_in_menu_description'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/menu/formats_in_menu.pl 
b/tp/t/results/menu/formats_in_menu.pl
index 062d230383..528ef820da 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -247,7 +247,7 @@ $result_trees{'formats_in_menu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
@@ -603,7 +603,7 @@ $result_trees{'formats_in_menu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/menu/inlineraw_in_menu_description.pl 
b/tp/t/results/menu/inlineraw_in_menu_description.pl
index e984868492..ec3a6e4571 100644
--- a/tp/t/results/menu/inlineraw_in_menu_description.pl
+++ b/tp/t/results/menu/inlineraw_in_menu_description.pl
@@ -217,7 +217,7 @@ $result_trees{'inlineraw_in_menu_description'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/menu/menu_in_example.pl 
b/tp/t/results/menu/menu_in_example.pl
index 3c12280ada..be4fba3b89 100644
--- a/tp/t/results/menu/menu_in_example.pl
+++ b/tp/t/results/menu/menu_in_example.pl
@@ -197,7 +197,7 @@ $result_trees{'menu_in_example'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'after_description_line'
+                          'type' => 'after_menu_description_line'
                         }
                       ],
                       'parent' => {},
diff --git a/tp/t/results/menu/menu_no_closed_after_empty_line.pl 
b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
index a16924154c..42bcf4bc8a 100644
--- a/tp/t/results/menu/menu_no_closed_after_empty_line.pl
+++ b/tp/t/results/menu/menu_no_closed_after_empty_line.pl
@@ -93,7 +93,7 @@ $result_trees{'menu_no_closed_after_empty_line'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl 
b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
index c4b433cd1b..4221254a63 100644
--- a/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
+++ b/tp/t/results/menu/missing_detailmenu_on_subnodes.pl
@@ -212,7 +212,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
@@ -287,7 +287,7 @@ $result_trees{'missing_detailmenu_on_subnodes'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/menu/sc_in_menu.pl b/tp/t/results/menu/sc_in_menu.pl
index ec4352de07..da92b8b017 100644
--- a/tp/t/results/menu/sc_in_menu.pl
+++ b/tp/t/results/menu/sc_in_menu.pl
@@ -195,7 +195,7 @@ $result_trees{'sc_in_menu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'args' => [
@@ -704,7 +704,7 @@ $result_trees{'sc_in_menu'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'after_description_line'
+                          'type' => 'after_menu_description_line'
                         },
                         {
                           'args' => [
diff --git a/tp/t/results/menu/simple.pl b/tp/t/results/menu/simple.pl
index aeca2baa18..90b861c5d9 100644
--- a/tp/t/results/menu/simple.pl
+++ b/tp/t/results/menu/simple.pl
@@ -339,7 +339,7 @@ $result_trees{'simple'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/menu/simple_no_menu.pl 
b/tp/t/results/menu/simple_no_menu.pl
index c52c47493c..fcfe2a570c 100644
--- a/tp/t/results/menu/simple_no_menu.pl
+++ b/tp/t/results/menu/simple_no_menu.pl
@@ -339,7 +339,7 @@ $result_trees{'simple_no_menu'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
diff --git a/tp/t/results/menu/verb_in_menu_description.pl 
b/tp/t/results/menu/verb_in_menu_description.pl
index 1e5d1b3919..0db379b5cc 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -200,7 +200,7 @@ $result_trees{'verb_in_menu_description'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/morecoverage/formatting_fr.pl 
b/tp/t/results/morecoverage/formatting_fr.pl
index 8324f73fd0..c1d7d2a23e 100644
--- a/tp/t/results/morecoverage/formatting_fr.pl
+++ b/tp/t/results/morecoverage/formatting_fr.pl
@@ -678,7 +678,7 @@ $result_trees{'formatting_fr'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
@@ -2342,7 +2342,7 @@ $result_trees{'formatting_fr'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'after_description_line'
+                          'type' => 'after_menu_description_line'
                         },
                         {
                           'parent' => {},
@@ -2643,7 +2643,7 @@ $result_trees{'formatting_fr'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/morecoverage/texi_formatting.pl 
b/tp/t/results/morecoverage/texi_formatting.pl
index 6f726fdbe5..eeb397ea92 100644
--- a/tp/t/results/morecoverage/texi_formatting.pl
+++ b/tp/t/results/morecoverage/texi_formatting.pl
@@ -678,7 +678,7 @@ $result_trees{'texi_formatting'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
@@ -2342,7 +2342,7 @@ $result_trees{'texi_formatting'} = {
                           'parent' => {},
                           'text' => '
 ',
-                          'type' => 'after_description_line'
+                          'type' => 'after_menu_description_line'
                         },
                         {
                           'parent' => {},
@@ -2643,7 +2643,7 @@ $result_trees{'texi_formatting'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/moresectioning/sectioning_frames.pl 
b/tp/t/results/moresectioning/sectioning_frames.pl
index 33cd0fdef0..4bbac08b8c 100644
--- a/tp/t/results/moresectioning/sectioning_frames.pl
+++ b/tp/t/results/moresectioning/sectioning_frames.pl
@@ -297,7 +297,7 @@ $result_trees{'sectioning_frames'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
@@ -382,7 +382,7 @@ $result_trees{'sectioning_frames'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
@@ -467,7 +467,7 @@ $result_trees{'sectioning_frames'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
@@ -610,7 +610,7 @@ $result_trees{'sectioning_frames'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'parent' => {},
@@ -993,7 +993,7 @@ $result_trees{'sectioning_frames'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/plaintext_tests/quote_node_names.pl 
b/tp/t/results/plaintext_tests/quote_node_names.pl
index abf3e5288b..9179ea2b00 100644
--- a/tp/t/results/plaintext_tests/quote_node_names.pl
+++ b/tp/t/results/plaintext_tests/quote_node_names.pl
@@ -1133,7 +1133,7 @@ $result_trees{'quote_node_names'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     }
                   ],
                   'parent' => {},
diff --git a/tp/t/results/sectioning/complex.pl 
b/tp/t/results/sectioning/complex.pl
index 38d7506c1d..f8bc952f29 100644
--- a/tp/t/results/sectioning/complex.pl
+++ b/tp/t/results/sectioning/complex.pl
@@ -823,7 +823,7 @@ $result_trees{'complex'} = [
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'after_description_line'
+                              'type' => 'after_menu_description_line'
                             }
                           ],
                           'parent' => {},
diff --git a/tp/t/results/sectioning/complex_split_at_node.pl 
b/tp/t/results/sectioning/complex_split_at_node.pl
index 75b6b4e5fc..2edc8d40fe 100644
--- a/tp/t/results/sectioning/complex_split_at_node.pl
+++ b/tp/t/results/sectioning/complex_split_at_node.pl
@@ -823,7 +823,7 @@ $result_trees{'complex_split_at_node'} = [
                               'parent' => {},
                               'text' => '
 ',
-                              'type' => 'after_description_line'
+                              'type' => 'after_menu_description_line'
                             }
                           ],
                           'parent' => {},
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl 
b/tp/t/results/xml_tests/image_inline_or_not.pl
index f624976b19..92869e09d3 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -1016,7 +1016,7 @@ $result_trees{'image_inline_or_not'} = {
                       'parent' => {},
                       'text' => '
 ',
-                      'type' => 'after_description_line'
+                      'type' => 'after_menu_description_line'
                     },
                     {
                       'args' => [



reply via email to

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