[6812] parsetexi update

[Gavin D. Smith]

Revision: 6812
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6812
Author:   gavin
Date:     2015-11-29 17:20:07 +0000 (Sun, 29 Nov 2015)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/parsetexi/ChangeLog
    trunk/parsetexi/Parsetexi/Parsetexi.xs
    trunk/parsetexi/Parsetexi/lib/Parsetexi.pm
    trunk/parsetexi/api.c
    trunk/parsetexi/separator.c

Modified: trunk/parsetexi/ChangeLog
===================================================================
--- trunk/parsetexi/ChangeLog   2015-11-29 15:21:54 UTC (rev 6811)
+++ trunk/parsetexi/ChangeLog   2015-11-29 17:20:07 UTC (rev 6812)
@@ -1,5 +1,9 @@
 2015-11-29  Gavin Smith  <address@hidden>
 
+       * Parsetexi/lib/Parsetexi.pm (parse_texi_text): Add function.
+
+2015-11-29  Gavin Smith  <address@hidden>
+
        Update so works again.
 
        * texi2any-C.pl, texi2any-C-2.pl: Replaced, to match most

Modified: trunk/parsetexi/Parsetexi/Parsetexi.xs
===================================================================
--- trunk/parsetexi/Parsetexi/Parsetexi.xs      2015-11-29 15:21:54 UTC (rev 
6811)
+++ trunk/parsetexi/Parsetexi/Parsetexi.xs      2015-11-29 17:20:07 UTC (rev 
6812)
@@ -52,6 +52,10 @@
         char * string
 
 void
+parse_text(string)
+        char * string
+
+void
 store_value (name, value)
         char *name
         char *value

Modified: trunk/parsetexi/Parsetexi/lib/Parsetexi.pm
===================================================================
--- trunk/parsetexi/Parsetexi/lib/Parsetexi.pm  2015-11-29 15:21:54 UTC (rev 
6811)
+++ trunk/parsetexi/Parsetexi/lib/Parsetexi.pm  2015-11-29 17:20:07 UTC (rev 
6812)
@@ -371,7 +371,7 @@
     return undef if (!defined($text));
 
     $self = parser() if (!defined($self));
-    parse_string($text);
+    parse_text($text);
     my $tree = build_texinfo_tree ();
     _add_parents ($tree);
     return $tree;

Modified: trunk/parsetexi/api.c
===================================================================
--- trunk/parsetexi/api.c       2015-11-29 15:21:54 UTC (rev 6811)
+++ trunk/parsetexi/api.c       2015-11-29 17:20:07 UTC (rev 6812)
@@ -62,6 +62,17 @@
   Root = parse_texi (root);
 }
 
+/* Used for parse_texi_text. */
+void
+parse_text (char *string)
+{
+  ELEMENT *root;
+  init_index_commands (); /* FIXME - probably not necessary */
+  root = new_element (ET_text_root);
+  input_push_text (strdup (string));
+  Root = parse_texi (root);
+}
+
 
 char *
 element_type_name (ELEMENT *e)

Modified: trunk/parsetexi/separator.c
===================================================================
--- trunk/parsetexi/separator.c 2015-11-29 15:21:54 UTC (rev 6811)
+++ trunk/parsetexi/separator.c 2015-11-29 17:20:07 UTC (rev 6812)
@@ -141,8 +141,8 @@
     }
 
   /* 4967 */
-  else if (current->parent->cmd == CM_multitable
-           || current->parent->type == ET_def_line)
+  else if (current->parent && (current->parent->cmd == CM_multitable
+           || current->parent->type == ET_def_line))
     {
       ELEMENT *b, *e;
       b = new_element (ET_bracketed);