[7505] parsetexi update

[gavinsmith0123]

Revision: 7505
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7505
Author:   gavin
Date:     2016-11-12 23:24:20 +0000 (Sat, 12 Nov 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/Parsetexi.pm
    trunk/tp/parsetexi/end_line.c
    trunk/tp/parsetexi/parser.c

Modified: trunk/tp/parsetexi/Parsetexi.pm
===================================================================
--- trunk/tp/parsetexi/Parsetexi.pm     2016-11-12 18:46:15 UTC (rev 7504)
+++ trunk/tp/parsetexi/Parsetexi.pm     2016-11-12 23:24:20 UTC (rev 7505)
@@ -26,6 +26,7 @@
 require Exporter;
 
 use Texinfo::Encoding;
+use Texinfo::Convert::NodeNameNormalization;
 
 our @ISA = qw(Exporter DynaLoader Texinfo::Report);
 # Items to export into callers namespace by default. Note: do not export

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-11-12 18:46:15 UTC (rev 7504)
+++ trunk/tp/parsetexi/end_line.c       2016-11-12 23:24:20 UTC (rev 7505)
@@ -1072,7 +1072,8 @@
         add_extra_element (f, "float_section", current_section);
     }
   current = current->parent; //2965
-  //counter_pop (&count_remaining_args);
+  if (counter_value (&count_remaining_args, current) != -1)
+    counter_pop (&count_remaining_args);
 
   /* Don't consider empty argument of block @-command as argument,
      reparent them as contents. */

Modified: trunk/tp/parsetexi/parser.c
===================================================================
--- trunk/tp/parsetexi/parser.c 2016-11-12 18:46:15 UTC (rev 7504)
+++ trunk/tp/parsetexi/parser.c 2016-11-12 23:24:20 UTC (rev 7505)
@@ -403,8 +403,9 @@
           || last_child->type == ET_empty_spaces_before_argument
           || last_child->type == ET_empty_spaces_after_close_brace))
     {
-      debug ("ABORT EMPTY additional text |%s| "
+      debug ("ABORT EMPTY %s additional text |%s| "
              "current |%s|",
+             element_type_name(last_child),
              additional_text,
              last_child->text.text);
       text_append (&last_child->text, additional_text);