[7193] parsetexi update

[gavinsmith0123]

Revision: 7193
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7193
Author:   gavin
Date:     2016-05-28 21:23:47 +0000 (Sat, 28 May 2016)
Log Message:
-----------
parsetexi update

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

Modified: trunk/tp/parsetexi/Parsetexi.pm
===================================================================
--- trunk/tp/parsetexi/Parsetexi.pm     2016-05-28 15:35:53 UTC (rev 7192)
+++ trunk/tp/parsetexi/Parsetexi.pm     2016-05-28 21:23:47 UTC (rev 7193)
@@ -293,6 +293,7 @@
   parse_file ($file_name);
   $TREE = build_texinfo_tree ();
 
+
   $LABELS = build_label_list ();
   $FLOATS = build_float_list ();
 
@@ -419,6 +420,9 @@
     my $FLOATS = build_float_list ();
     $self->{'floats'} = $FLOATS;
 
+    my $GLOBAL_INFO = build_global_info ();
+    $self->{'info'} = $GLOBAL_INFO;
+
     my $GLOBAL_INFO2 = build_global_info2 ();
     $self->{'extra'} = $GLOBAL_INFO2;
 

Modified: trunk/tp/parsetexi/api.c
===================================================================
--- trunk/tp/parsetexi/api.c    2016-05-28 15:35:53 UTC (rev 7192)
+++ trunk/tp/parsetexi/api.c    2016-05-28 21:23:47 UTC (rev 7193)
@@ -45,6 +45,7 @@
 void
 reset_parser (void)
 {
+  debug ("!!!!!!!!!!!!!!!! RESETTING THE PARSER !!!!!!!!!!!!!!!!!!!!!");
   wipe_user_commands ();
   wipe_values ();
   wipe_macros ();
@@ -252,6 +253,7 @@
       || e->type == ET_menu_entry_name
       || e->type == ET_brace_command_arg
       || e->cmd == CM_TeX
+      || (command_flags(e) & CF_root)
       || (command_data(e->cmd).flags & CF_brace
           && (command_data(e->cmd).data >= 0
               || command_data(e->cmd).data == BRACE_style
@@ -827,8 +829,10 @@
     hv_store (hv, "input_encoding_name", strlen ("input_encoding_name"),
               newSVpv (global_info.input_encoding_name, 0), 0);
   if (global_info.novalidate)
-    hv_store (hv, "novalidate", strlen ("novalidate"),
-              newSVpv ("1", 0), 0);
+    {
+      hv_store (hv, "novalidate", strlen ("novalidate"),
+                newSVpv ("1", 0), 0);
+    }
   return hv;
 }
 

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-05-28 15:35:53 UTC (rev 7192)
+++ trunk/tp/parsetexi/end_line.c       2016-05-28 21:23:47 UTC (rev 7193)
@@ -261,6 +261,7 @@
           || t == ET_empty_spaces_after_close_brace
           || t == ET_spaces_at_end
           || t == ET_space_at_end_block_command
+          || t == ET_empty_line_after_command
           || contents_child_by_index(arg, i)->cmd == CM_c
           || contents_child_by_index(arg, i)->cmd == CM_comment)
         {
@@ -282,15 +283,18 @@
         }
     }
 
-  if (!argarg || argarg->text.end == 0)
+  if (!argarg)
     {
       command_error (line_command, "@%s missing argument", command_name(cmd));
       add_extra_string (line_command, "missing_argument", "1");
       return 0;
     }
-
   if (argarg->text.end == 0)
-     return 0; // 5519
+    {
+      line_error ("superfluous argument to @%s",
+                   command_name (cmd));
+      return 0;
+    }
 
   line = argarg->text.text;
 
@@ -1669,6 +1673,8 @@
               asprintf (&s, "%d", misc_args->value->contents.number);
               add_extra_string (current, "max_columns", s);
             }
+          else
+              add_extra_string (current, "max_columns", "0");
 
           before_item = new_element (ET_before_item);
           add_to_element_contents (current, before_item);

Modified: trunk/tp/parsetexi/separator.c
===================================================================
--- trunk/tp/parsetexi/separator.c      2016-05-28 15:35:53 UTC (rev 7192)
+++ trunk/tp/parsetexi/separator.c      2016-05-28 21:23:47 UTC (rev 7193)
@@ -325,7 +325,11 @@
                   if (nse)
                     add_extra_node_spec (ref, "node_argument", nse);
                   if (closed_command != CM_inforef
-                      && ref->args.number <= 3
+                      && (args->contents.number <= 3
+                          || args->contents.number <= 4
+                             && !contents_child_by_index(args, 3)
+                          || (!contents_child_by_index(args, 3)
+                               && !contents_child_by_index(args, 4)))
                       && !nse->manual_content)
                     {
                       remember_internal_xref (ref);