[6063] parsetexi update

[Gavin D. Smith]

Revision: 6063
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6063
Author:   gavin
Date:     2015-01-23 19:36:54 +0000 (Fri, 23 Jan 2015)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/parsetexi/ChangeLog
    trunk/parsetexi/dump_perl.c
    trunk/parsetexi/handle_commands.c
    trunk/parsetexi/indices.c
    trunk/parsetexi/separator.c

Modified: trunk/parsetexi/ChangeLog
===================================================================
--- trunk/parsetexi/ChangeLog   2015-01-23 18:04:06 UTC (rev 6062)
+++ trunk/parsetexi/ChangeLog   2015-01-23 19:36:54 UTC (rev 6063)
@@ -1,5 +1,19 @@
 2015-01-23  Gavin Smith  <address@hidden>
 
+       * indices.c (enter_index_entry): Set 'number' field on index 
+       entry.
+       * dump_perl.c (dump_entries_of_index): Output 'number' key for 
+       index entry.
+
+       * handle_commands.c (handle_misc_command) <item of enumerate>: 
+       Set 'item_number" key (incorrectly).
+
+       * separator.c (handle_open_brace) <brace_command_arg>: Require
+       more than one parameter before adding 
+       ET_empty_spaces_before_argument.
+
+2015-01-23  Gavin Smith  <address@hidden>
+
        * Parsetexi/lib/Parsetexi.pm: Update a comment.
        * end_line.c (end_line): Check return value of lookup_command 
        correctly.

Modified: trunk/parsetexi/dump_perl.c
===================================================================
--- trunk/parsetexi/dump_perl.c 2015-01-23 18:04:06 UTC (rev 6062)
+++ trunk/parsetexi/dump_perl.c 2015-01-23 19:36:54 UTC (rev 6063)
@@ -468,6 +468,8 @@
       dump_route_to_element (e->command, &fixup_dump);
       text_printf (&fixup_dump, ",\n");
 
+      text_printf (&fixup_dump, "'number' => %d,", e->number);
+
       if (e->content)
         {
           text_printf (&fixup_dump, "'content' => ");

Modified: trunk/parsetexi/handle_commands.c
===================================================================
--- trunk/parsetexi/handle_commands.c   2015-01-23 18:04:06 UTC (rev 6062)
+++ trunk/parsetexi/handle_commands.c   2015-01-23 19:36:54 UTC (rev 6063)
@@ -124,6 +124,10 @@
                   debug ("ITEM CONTAINER");
                   misc = new_element (ET_NONE);
                   misc->cmd = CM_item;
+
+                  add_extra_string (misc, "item_number", "1");
+                  /* TODO: Keep count. */
+
                   add_to_element_contents (parent, misc);
                   current = misc;
                   current = begin_preformatted (current);

Modified: trunk/parsetexi/indices.c
===================================================================
--- trunk/parsetexi/indices.c   2015-01-23 18:04:06 UTC (rev 6062)
+++ trunk/parsetexi/indices.c   2015-01-23 19:36:54 UTC (rev 6063)
@@ -119,6 +119,7 @@
   entry->content = content;
   //entry->content_normalized = ... ;
   entry->command = current;
+  entry->number = idx->index_number;
 
   entry->node = current_node;
 

Modified: trunk/parsetexi/separator.c
===================================================================
--- trunk/parsetexi/separator.c 2015-01-23 18:04:06 UTC (rev 6062)
+++ trunk/parsetexi/separator.c 2015-01-23 19:36:54 UTC (rev 6063)
@@ -86,8 +86,9 @@
       else /* not context brace */
         {
           current->type = ET_brace_command_arg;
-          /* If this command takes any arguments. */
-          if (command_data(command).data > 0)
+          /* If this command takes more than one argument (why??) */
+          /* TODO: Also "simple text commands" 425 */
+          if (command_data(command).data > 1)
             {
               ELEMENT *e;
               e = new_element (ET_empty_spaces_before_argument);