[6851] parsetexi update

[Gavin D. Smith]

Revision: 6851
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6851
Author:   gavin
Date:     2015-12-12 11:16:16 +0000 (Sat, 12 Dec 2015)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/parsetexi/api.c
    trunk/parsetexi/command_data.txt
    trunk/parsetexi/command_ids.h
    trunk/parsetexi/handle_commands.c
    trunk/parsetexi/parser.c

Modified: trunk/parsetexi/api.c
===================================================================
--- trunk/parsetexi/api.c       2015-12-12 06:06:45 UTC (rev 6850)
+++ trunk/parsetexi/api.c       2015-12-12 11:16:16 UTC (rev 6851)
@@ -233,6 +233,7 @@
       || e->type == ET_menu_entry_name
       || e->type == ET_brace_command_arg
       || e->cmd == CM_TeX
+      || (command_data(e->cmd).flags & CF_accent)
       || (command_data(e->cmd).flags & CF_brace
           && (command_data(e->cmd).data > 0       // 4838
               || command_data(e->cmd).data == BRACE_style

Modified: trunk/parsetexi/command_data.txt
===================================================================
--- trunk/parsetexi/command_data.txt    2015-12-12 06:06:45 UTC (rev 6850)
+++ trunk/parsetexi/command_data.txt    2015-12-12 11:16:16 UTC (rev 6851)
@@ -293,6 +293,7 @@
 # I intend to use "1" for these commands only, and
 # use a different value for the other commands which
 # are said to take 1 argument in Common.pm.
+U              brace   1
 ctrl           brace   1
 dmn            brace   1
 titlefont      brace,global    1

Modified: trunk/parsetexi/command_ids.h
===================================================================
--- trunk/parsetexi/command_ids.h       2015-12-12 06:06:45 UTC (rev 6850)
+++ trunk/parsetexi/command_ids.h       2015-12-12 11:16:16 UTC (rev 6851)
@@ -52,6 +52,7 @@
 CM_OE,
 CM_TH,
 CM_TeX,
+CM_U,
 CM_hex_5c,
 CM_hex_5e,
 CM_hex_60,

Modified: trunk/parsetexi/handle_commands.c
===================================================================
--- trunk/parsetexi/handle_commands.c   2015-12-12 06:06:45 UTC (rev 6850)
+++ trunk/parsetexi/handle_commands.c   2015-12-12 11:16:16 UTC (rev 6851)
@@ -685,9 +685,9 @@
   // 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 == BRACE_style
-      || command_data(e->cmd).data == BRACE_context)
+      || (command_data(e->cmd).flags & CF_brace
+          && (command_data(e->cmd).data > 1
+              || command_data(e->cmd).data == BRACE_context)))
     {
       e->line_nr = line_nr;
     }

Modified: trunk/parsetexi/parser.c
===================================================================
--- trunk/parsetexi/parser.c    2015-12-12 06:06:45 UTC (rev 6850)
+++ trunk/parsetexi/parser.c    2015-12-12 11:16:16 UTC (rev 6851)
@@ -1148,7 +1148,8 @@
             }
         }
 
-      else if (command_data(cmd).flags & CF_brace) /* line 4835 */
+      else if (command_data(cmd).flags & CF_brace
+               || command_data(cmd).flags & CF_accent) /* line 4835 */
         {
           current = handle_brace_command (current, &line, cmd);
         }