[7157] parsetexi update

[gavinsmith0123]

Revision: 7157
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7157
Author:   gavin
Date:     2016-05-08 16:10:00 +0000 (Sun, 08 May 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/close.c
    trunk/tp/parsetexi/parser.c

Modified: trunk/tp/parsetexi/close.c
===================================================================
--- trunk/tp/parsetexi/close.c  2016-05-08 15:23:50 UTC (rev 7156)
+++ trunk/tp/parsetexi/close.c  2016-05-08 16:10:00 UTC (rev 7157)
@@ -93,6 +93,9 @@
         {
           ELEMENT *row = old_contents.list[i];
 
+          if (counter_value (&count_cells, row) != -1)
+            counter_pop (&count_cells);
+
           if (row->type == ET_row)
             {
               /* Check if we need to open a new container. */
@@ -125,8 +128,6 @@
         }
       free (old_contents.list);
 
-      if (counter_value (&count_cells, current) != -1)
-        counter_pop (&count_cells);
     }
   else if (current->cmd == CM_itemize || current->cmd == CM_enumerate)
     {

Modified: trunk/tp/parsetexi/parser.c
===================================================================
--- trunk/tp/parsetexi/parser.c 2016-05-08 15:23:50 UTC (rev 7156)
+++ trunk/tp/parsetexi/parser.c 2016-05-08 16:10:00 UTC (rev 7157)
@@ -952,7 +952,7 @@
   /* This condition is only checked immediately after the command opening, 
      otherwise the current element is in the 'args' and not right in the 
      command container. */
-  else if (!cmd && command_flags(current) & CF_brace && *line != '{')
+  else if (command_flags(current) & CF_brace && *line != '{')
     {
       if (command_with_command_as_argument (current->parent)) // 3988
         {