[7560] parsetexi update

[gavinsmith0123]

Revision: 7560
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7560
Author:   gavin
Date:     2016-12-23 07:34:08 +0000 (Fri, 23 Dec 2016)
Log Message:
-----------
parsetexi update

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

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-12-20 20:58:09 UTC (rev 7559)
+++ trunk/tp/parsetexi/end_line.c       2016-12-23 07:34:08 UTC (rev 7560)
@@ -1210,8 +1210,12 @@
                     command_error (current, "superfluous argument to @%s",
                                    command_name(current->cmd));
                   g = contents_child_by_index (f, 0);
-                  if (g->text.end == 1
-                      && isalnum (g->text.text[0]))
+                  /* Check if @enumerate specification is either a single
+                     letter or a string of digits. */
+                  if (g->text.end == 1 && isalpha (g->text.text[0])
+                      || (g->text.end > 0
+                          && !*(g->text.text
+                                + strspn (g->text.text, "0123456789"))))
                     {
                       spec = strdup (g->text.text);
                     }

Modified: trunk/tp/parsetexi/separator.c
===================================================================
--- trunk/tp/parsetexi/separator.c      2016-12-20 20:58:09 UTC (rev 7559)
+++ trunk/tp/parsetexi/separator.c      2016-12-23 07:34:08 UTC (rev 7560)
@@ -675,6 +675,8 @@
                 expandp = 1;
               if (current->cmd == CM_inlineifclear)
                 expandp = !expandp;
+              if (expandp)
+                add_extra_string (current, "expand_index", "1");
             }
           else
             expandp = 0;