[7179] parsetexi update

[gavinsmith0123]

Revision: 7179
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7179
Author:   gavin
Date:     2016-05-22 19:15:28 +0000 (Sun, 22 May 2016)
Log Message:
-----------
parsetexi update

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

Modified: trunk/tp/parsetexi/dump_perl.c
===================================================================
--- trunk/tp/parsetexi/dump_perl.c      2016-05-22 18:39:00 UTC (rev 7178)
+++ trunk/tp/parsetexi/dump_perl.c      2016-05-22 19:15:28 UTC (rev 7179)
@@ -442,9 +442,20 @@
     }
 
   /* TODO: macro. */
-  dump_indent (text);
-  text_append (text, "'macro' => ''\n");
+  if (line_nr->macro)
+    {
+      dump_indent (text);
+      text_append (text, "'macro' => ");
+      text_printf (text, "'%s'", line_nr->macro);
+      text_append (text, ",\n");
+    }
+  else
+    {
+      dump_indent (text);
+      text_append (text, "'macro' => ''\n");
+    }
 
+
   indent -= 2;
   dump_indent (text);
   text_append_n (text, "},\n", 3);

Modified: trunk/tp/parsetexi/parser.c
===================================================================
--- trunk/tp/parsetexi/parser.c 2016-05-22 18:39:00 UTC (rev 7178)
+++ trunk/tp/parsetexi/parser.c 2016-05-22 19:15:28 UTC (rev 7179)
@@ -1218,6 +1218,7 @@
           int ok = 0;
           enum command_id outer = current->parent->cmd;
           unsigned long outer_flags = command_data(outer).flags;
+          unsigned long cmd_flags = command_data(cmd).flags;
 
           // much TODO here.
 
@@ -1230,6 +1231,16 @@
                   || cmd == CM_shortcaption)
                 ok = 0;
             }
+          else if (outer == CM_table
+                   || outer == CM_vtable
+                   || outer == CM_ftable)
+            {
+              /* FIXME: This nesting should be OK. */
+              if (cmd_flags & CF_INFOENCLOSE)
+                ;
+              else
+                ok = 1;
+            }
           else
             {
               ok = 1;