[8351] _item_line_parent

[gavinsmith0123]

Revision: 8351
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8351
Author:   gavin
Date:     2018-10-20 12:04:03 -0400 (Sat, 20 Oct 2018)
Log Message:
-----------
_item_line_parent

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-20 11:10:55 UTC (rev 8350)
+++ trunk/ChangeLog     2018-10-20 16:04:03 UTC (rev 8351)
@@ -1,5 +1,16 @@
 2018-10-20  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_item_line_parent): If current element 
+       is an @item or @itemx, do not check the parent of the parent of 
+       the current element.  This leads to a false positive for a 
+       @table nested within an @enumerate.  It is possible that this 
+       was intended to account for the parent element being a 
+       'table_term' element, but the condition is not met in the entire
+       test suite.  (The false positive was not hit in practice due to 
+       _item_container_parent being called before _item_line_parent.)
+
+2018-10-20  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Common.pm (%line_commands, %deprecated_commands): 
        Remove @quote-arg and @allow-recursion.
        * NEWS: Mention this change.

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-10-20 11:10:55 UTC (rev 8350)
+++ trunk/tp/Texinfo/Parser.pm  2018-10-20 16:04:03 UTC (rev 8351)
@@ -1,8 +1,7 @@
 # $Id$
 # Parser.pm: parse texinfo code into a tree.
 #
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Free Software 
-# Foundation, Inc.
+# Copyright 2010-2018 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1795,10 +1794,7 @@
 sub _item_line_parent($)
 {
   my $current = shift;
-  if ($current->{'cmdname'} and ($current->{'cmdname'} eq 'item'
-       or $current->{'cmdname'} eq 'itemx')) {
-      $current = $current->{'parent'}->{'parent'};
-  } elsif ($current->{'type'} and $current->{'type'} eq 'before_item'
+  if ($current->{'type'} and $current->{'type'} eq 'before_item'
             and $current->{'parent'}) {
     $current = $current->{'parent'};
   }