[6122] parsetexi update

[Gavin D. Smith]

Revision: 6122
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6122
Author:   gavin
Date:     2015-02-13 17:40:49 +0000 (Fri, 13 Feb 2015)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/parsetexi/ChangeLog
    trunk/parsetexi/dump_perl.c
    trunk/parsetexi/parser.c

Added Paths:
-----------
    trunk/parsetexi/test-files/indented_menu_comment.texi

Modified: trunk/parsetexi/ChangeLog
===================================================================
--- trunk/parsetexi/ChangeLog   2015-02-12 22:35:56 UTC (rev 6121)
+++ trunk/parsetexi/ChangeLog   2015-02-13 17:40:49 UTC (rev 6122)
@@ -1,3 +1,8 @@
+2015-02-13  Gavin Smith  <address@hidden>
+
+       * parser.c (abort_empty_line) <ET_empty_line>: Clear type of
+       ET_empty_line element as intended, instead of deleting it.
+
 2015-02-12  Gavin Smith  <address@hidden>
 
        * separator.c (register_command_arg): New function.

Modified: trunk/parsetexi/dump_perl.c
===================================================================
--- trunk/parsetexi/dump_perl.c 2015-02-12 22:35:56 UTC (rev 6121)
+++ trunk/parsetexi/dump_perl.c 2015-02-13 17:40:49 UTC (rev 6122)
@@ -334,7 +334,8 @@
                                      text);
                     }
                   indent -= 2;
-                  text_append (text, "],");
+                  dump_indent (text);
+                  text_append (text, "],\n");
                   break;
                 default:
                   abort ();

Modified: trunk/parsetexi/parser.c
===================================================================
--- trunk/parsetexi/parser.c    2015-02-12 22:35:56 UTC (rev 6121)
+++ trunk/parsetexi/parser.c    2015-02-13 17:40:49 UTC (rev 6122)
@@ -361,10 +361,8 @@
         }
       else if (last_child->type == ET_empty_line) //2132
         {
-          if (begin_paragraph_p (current))
-            last_child->type = ET_empty_spaces_before_paragraph;
-          else
-            destroy_element (pop_element_from_contents (current));
+          last_child->type = begin_paragraph_p (current)
+                             ? ET_empty_spaces_before_paragraph : ET_NONE;
         }
       else if (last_child->type == ET_empty_line_after_command)
         {

Added: trunk/parsetexi/test-files/indented_menu_comment.texi
===================================================================
--- trunk/parsetexi/test-files/indented_menu_comment.texi                       
        (rev 0)
+++ trunk/parsetexi/test-files/indented_menu_comment.texi       2015-02-13 
17:40:49 UTC (rev 6122)
@@ -0,0 +1,16 @@
address@hidden Top
+
address@hidden
+* Marking Text::                AAAAAAA AAAAAAAA AA AAAAA AAAAA AAA
+                                YYY YYYYYY YYYYYYY YYYYYY YYYYY YYY
+                                XXXXX XXXXXXXXXX XXXXXXXX XXXXX.
+* Another::
address@hidden menu
+
address@hidden Marking Text
+
+ferjosgjseo
+
address@hidden Another
+
+gsergser