[7101] parsetexi update

[Gavin D. Smith]

Revision: 7101
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7101
Author:   gavin
Date:     2016-04-09 09:08:13 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/api.c
    trunk/tp/parsetexi/end_line.c
    trunk/tp/parsetexi/handle_commands.c
    trunk/tp/parsetexi/parser.c
    trunk/tp/parsetexi/parser.h

Modified: trunk/tp/parsetexi/api.c
===================================================================
--- trunk/tp/parsetexi/api.c    2016-04-09 08:50:46 UTC (rev 7100)
+++ trunk/tp/parsetexi/api.c    2016-04-09 09:08:13 UTC (rev 7101)
@@ -238,6 +238,7 @@
               || command_data(e->cmd).data == BRACE_style
               || command_data(e->cmd).data == BRACE_context
               || command_data(e->cmd).data == BRACE_other
+              || command_data(e->cmd).data == BRACE_accent
               ))
       || e->cmd == CM_node) // FIXME special case
     // FIXME: Makes no sense to have 'contents' created for glyph commands like

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-04-09 08:50:46 UTC (rev 7100)
+++ trunk/tp/parsetexi/end_line.c       2016-04-09 09:08:13 UTC (rev 7101)
@@ -171,6 +171,15 @@
       if (!value)
         goto clickstyle_invalid;
       ADD_ARG (p - 1, q - p + 1);
+      global_clickstyle = malloc (q - p + 1);
+      {
+        enum command_id c;
+        c = lookup_command (value);
+        if (!c)
+          ; // TODO
+        global_clickstyle = command_name(c);
+      }
+      /* TODO: Check if it is a real command */
       if (memcmp (q, "{}", 2))
         q += 2;
       free (value);

Modified: trunk/tp/parsetexi/handle_commands.c
===================================================================
--- trunk/tp/parsetexi/handle_commands.c        2016-04-09 08:50:46 UTC (rev 
7100)
+++ trunk/tp/parsetexi/handle_commands.c        2016-04-09 09:08:13 UTC (rev 
7101)
@@ -731,6 +731,10 @@
 
   // mark_and_warn_invalid
   // click, kbd, definfoenclose
+  if (cmd == CM_click)
+    {
+      add_extra_string (e, "clickstyle", global_clickstyle);
+    }
 
   *line_inout = line;
   return current;

Modified: trunk/tp/parsetexi/parser.c
===================================================================
--- trunk/tp/parsetexi/parser.c 2016-04-09 08:50:46 UTC (rev 7100)
+++ trunk/tp/parsetexi/parser.c 2016-04-09 09:08:13 UTC (rev 7101)
@@ -115,6 +115,7 @@
 /* Information that is not local to where it is set in the Texinfo input,
    for example document language and encoding. */
 GLOBAL_INFO global_info;
+char *global_clickstyle = "arrow";
 
 
 /* 835 */

Modified: trunk/tp/parsetexi/parser.h
===================================================================
--- trunk/tp/parsetexi/parser.h 2016-04-09 08:50:46 UTC (rev 7100)
+++ trunk/tp/parsetexi/parser.h 2016-04-09 09:08:13 UTC (rev 7101)
@@ -66,6 +66,7 @@
 extern ELEMENT *current_section;
 
 extern GLOBAL_INFO global_info;
+extern char *global_clickstyle;
 
 #include "macro.h"