[6847] parsetexi update

[Gavin D. Smith]

Revision: 6847
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6847
Author:   gavin
Date:     2015-12-10 22:45:57 +0000 (Thu, 10 Dec 2015)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/parsetexi/api.c
    trunk/parsetexi/command_data.txt
    trunk/parsetexi/handle_commands.c
    trunk/parsetexi/separator.c

Modified: trunk/parsetexi/api.c
===================================================================
--- trunk/parsetexi/api.c       2015-12-10 20:25:56 UTC (rev 6846)
+++ trunk/parsetexi/api.c       2015-12-10 22:45:57 UTC (rev 6847)
@@ -233,6 +233,9 @@
       || e->type == ET_menu_entry_name
       || e->type == ET_brace_command_arg
       || e->cmd == CM_TeX
+      || (command_data(e->cmd).flags & CF_brace
+          && (command_data(e->cmd).data > 0       // 4838
+              || command_data(e->cmd).data == BRACE_style))
       || e->cmd == CM_node) // FIXME special case
     {
       AV *av;

Modified: trunk/parsetexi/command_data.txt
===================================================================
--- trunk/parsetexi/command_data.txt    2015-12-10 20:25:56 UTC (rev 6846)
+++ trunk/parsetexi/command_data.txt    2015-12-10 22:45:57 UTC (rev 6847)
@@ -305,14 +305,15 @@
 errormsg       brace   1
 
 # code style commands
-code           brace   BRACE_other
-command                brace   BRACE_other
-env            brace   BRACE_other
-file           brace   BRACE_other
-kbd            brace   BRACE_other
+# fixme: duplicated from above!!
+#code          brace   BRACE_other
+#command               brace   BRACE_other
+#env           brace   BRACE_other
+#file          brace   BRACE_other
+#kbd           brace   BRACE_other
 key            brace   BRACE_other
-option         brace   BRACE_other
-samp           brace   BRACE_other
+#option                brace   BRACE_other
+#samp          brace   BRACE_other
 indicateurl    brace   1
 verb           brace   BRACE_other
 t              brace   BRACE_other

Modified: trunk/parsetexi/handle_commands.c
===================================================================
--- trunk/parsetexi/handle_commands.c   2015-12-10 20:25:56 UTC (rev 6846)
+++ trunk/parsetexi/handle_commands.c   2015-12-10 22:45:57 UTC (rev 6847)
@@ -111,10 +111,8 @@
       misc = new_element (ET_NONE);
       misc->cmd = cmd;
       add_to_element_contents (current, misc);
-      /*
       if (close_preformatted_command(cmd))
         current = begin_preformatted (current);
-      */
     }
   /* All the cases using the raw line.
      I don't understand what the difference is between these. */
@@ -687,7 +685,8 @@
   // 4841
   // 258 keep_line_nr_brace_commands
   if (e->cmd == CM_titlefont || e->cmd == CM_anchor
-      || command_data(e->cmd).data > 0)
+      || command_data(e->cmd).data > 0
+      || command_data(e->cmd).data == BRACE_style)
     {
       e->line_nr = line_nr;
     }

Modified: trunk/parsetexi/separator.c
===================================================================
--- trunk/parsetexi/separator.c 2015-12-10 20:25:56 UTC (rev 6846)
+++ trunk/parsetexi/separator.c 2015-12-10 22:45:57 UTC (rev 6847)
@@ -287,10 +287,13 @@
       current = current->parent->parent;
       if (close_preformatted_command(closed_command))
         current = begin_preformatted (current);
-      // if close_preformatted begin_preformatted
     } /* CF_brace */
   else if (current->type == ET_rawpreformatted) // 5199
     {
+      /* lone right braces are accepted in a rawpreformatted */
+      ELEMENT *e = new_element (ET_NONE);
+      text_append_n (&e->text, "}", 1);
+      add_to_element_contents (current, e);
       goto funexit;
     }
   // 5203 -- context brace command (e.g. @footnote)