[7181] parsetexi update

[gavinsmith0123]

Revision: 7181
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7181
Author:   gavin
Date:     2016-05-24 19:24:09 +0000 (Tue, 24 May 2016)
Log Message:
-----------
parsetexi update

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

Modified: trunk/tp/parsetexi/def.c
===================================================================
--- trunk/tp/parsetexi/def.c    2016-05-24 19:15:44 UTC (rev 7180)
+++ trunk/tp/parsetexi/def.c    2016-05-24 19:24:09 UTC (rev 7181)
@@ -137,7 +137,7 @@
   else if (e->contents.list[0]->cmd != CM_NONE) // 2363
     {
       ret = remove_from_contents (e, 0);
-      ret->parent = 0;
+      //ret->parent = 0;
       return ret;
     }
   else

Modified: trunk/tp/parsetexi/parser.c
===================================================================
--- trunk/tp/parsetexi/parser.c 2016-05-24 19:15:44 UTC (rev 7180)
+++ trunk/tp/parsetexi/parser.c 2016-05-24 19:24:09 UTC (rev 7181)
@@ -427,9 +427,17 @@
             }
 
           if (current)
+            k = lookup_extra_key (current, "spaces_after_command");
+          if (k && k->value == last_contents_child(current))
             {
-              k = lookup_extra_key (current, "spaces_after_command");
-              if (k && k->value == last_contents_child(current))
+              k->key = "";
+              k->value = 0;
+              k->type = extra_deleted;
+            }
+          else if (current->parent)
+            {
+              k = lookup_extra_key (current->parent, "spaces_after_command");
+              if (k && k->value == last_contents_child (current))
                 {
                   k->key = "";
                   k->value = 0;
@@ -1249,7 +1257,12 @@
           if (!ok)
             invalid_parent = current->parent->cmd;
         }
-      /* 4258 TODO in def */
+      /* 4274 */
+      if (current_context () == ct_def && cmd == CM_NEWLINE)
+        {
+          retval = GET_A_NEW_LINE;
+          goto funexit;
+        }
 
       /* 4276 check command doesn't start a paragraph */
       /* TODO store this in cmd->flags.  Or better, change the meaning
@@ -1452,7 +1465,8 @@
       if (!((command_flags(current) & CF_block)
              && (command_data(current->cmd).data == BLOCK_raw
                  || command_data(current->cmd).data == BLOCK_conditional)
-            || current->parent && current->parent->cmd == CM_verb))
+            || current->parent && current->parent->cmd == CM_verb)
+          && current_context () != ct_def)
         {
           ELEMENT *e;
           int n;