[7136] parsetexi update

[Gavin D. Smith]

Revision: 7136
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7136
Author:   gavin
Date:     2016-04-24 16:02:45 +0000 (Sun, 24 Apr 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/end_line.c
    trunk/tp/parsetexi/separator.c

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-04-24 15:34:51 UTC (rev 7135)
+++ trunk/tp/parsetexi/end_line.c       2016-04-24 16:02:45 UTC (rev 7136)
@@ -1364,18 +1364,20 @@
     {
       int i;
       ELEMENT *arg;
-      ELEMENT *first_arg;
 
       NODE_SPEC_EXTRA **nodes_manuals;
 
-      /* Construct 'nodes_manuals' array.  This is an 'extra' reference to 
-         an array that doesn't exist anywhere else. */
-      nodes_manuals = malloc (sizeof (NODE_SPEC_EXTRA *) * 2);
-      nodes_manuals[1] = 0;
+      /* Construct 'nodes_manuals' array.  Maximum of four elements
+         (node name, up, prev, next). */
+      nodes_manuals = malloc (sizeof (NODE_SPEC_EXTRA *) * 5);
 
-      // TODO: Add the other args to @node as well, if they were given
-      first_arg = current->args.list[0];
-      nodes_manuals[0] = parse_node_manual (first_arg);
+      for (i = 0; i < current->args.number && i < 4; i++)
+        {
+          arg = current->args.list[i];
+          nodes_manuals[i] = parse_node_manual (arg);
+        }
+      nodes_manuals[i] = 0;
+
       add_extra_node_spec_array (current, "nodes_manuals", nodes_manuals);
 
       /* Also set 'normalized' here.  The normalized labels are actually 

Modified: trunk/tp/parsetexi/separator.c
===================================================================
--- trunk/tp/parsetexi/separator.c      2016-04-24 15:34:51 UTC (rev 7135)
+++ trunk/tp/parsetexi/separator.c      2016-04-24 16:02:45 UTC (rev 7136)
@@ -264,7 +264,7 @@
         {
           // 5033
           /* @inline* always have end spaces considered as normal text */
-          if (!command_flags(current->parent) & CF_inline)
+          if (!(command_flags(current->parent) & CF_inline))
             isolate_last_space (current, 0);
           register_command_arg (current, "brace_command_contents");
           remove_empty_content_arguments (current);