[8365] do not check invalid_nesting

[gavinsmith0123]

Revision: 8365
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8365
Author:   gavin
Date:     2018-10-21 12:16:21 -0400 (Sun, 21 Oct 2018)
Log Message:
-----------
do not check invalid_nesting

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/t/accents.t
    trunk/tp/t/results/invalid_nestings/accents.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-21 14:02:40 UTC (rev 8364)
+++ trunk/ChangeLog     2018-10-21 16:16:21 UTC (rev 8365)
@@ -1,5 +1,13 @@
 2018-10-21  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Common.pm (find_innermost_accent_command):
+       Do not check for invalid nesting.
+       * tp/Texinfo/Convert/HTML.pm (_convert): Remove some 
+       commented-out code.
+       * tp/t/accents.t (command in accent): Remove test.
+
+2018-10-21  Gavin Smith  <address@hidden>
+
        * NEWS: @ctrl removed.
 
        * tp/Texinfo/Common.pm (%brace_commands, %deprecated_commands):

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2018-10-21 14:02:40 UTC (rev 8364)
+++ trunk/tp/Texinfo/Common.pm  2018-10-21 16:16:21 UTC (rev 8365)
@@ -1358,8 +1358,7 @@
     # inside the argument of an accent
     my $text_contents = [];
     foreach my $content (@{$arg->{'contents'}}) {
-      if (!($content->{'extra'} and $content->{'extra'}->{'invalid_nesting'})
-         and !($content->{'cmdname'} and ($content->{'cmdname'} eq 'c'
+      if (!($content->{'cmdname'} and ($content->{'cmdname'} eq 'c'
                                   or $content->{'cmdname'} eq 'comment'))) {
         if ($content->{'cmdname'} and $accent_commands{$content->{'cmdname'}}) 
{
           $current = $content;

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2018-10-21 14:02:40 UTC (rev 8364)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2018-10-21 16:16:21 UTC (rev 8365)
@@ -7427,16 +7427,10 @@
     return $result;
   }
 
-  if ($root->{'extra'}) {
-    #if ($root->{'extra'}->{'invalid_nesting'}) {
-    #  print STDERR "INVALID_NESTING\n" if ($self->get_conf('DEBUG'));
-    #  return '';
-    #} elsif ($root->{'extra'}->{'missing_argument'} 
-    if ($root->{'extra'}->{'missing_argument'} 
+  if ($root->{'extra'} and $root->{'extra'}->{'missing_argument'} 
              and (!$root->{'contents'} or address@hidden>{'contents'}})) {
-      print STDERR "MISSING_ARGUMENT\n" if ($self->get_conf('DEBUG'));
-      return '';
-    }
+    print STDERR "MISSING_ARGUMENT\n" if ($self->get_conf('DEBUG'));
+    return '';
   }
 
   # commands like @deffnx have both a cmdname and a def_line type.  It is

Modified: trunk/tp/t/accents.t
===================================================================
--- trunk/tp/t/accents.t        2018-10-21 14:02:40 UTC (rev 8364)
+++ trunk/tp/t/accents.t        2018-10-21 16:16:21 UTC (rev 8365)
@@ -5,7 +5,7 @@
 
 use Test::More;
 
-BEGIN { plan tests => 63; }
+BEGIN { plan tests => 59; }
 
 use Texinfo::Convert::Text;
 use Texinfo::Convert::Converter;
@@ -166,7 +166,6 @@
   ['@address@hidden'{r}}',            'utf8 possible inside', 'r\'<', 
'r\'&lt;', 
                                                     '&#341;&lt;', 
                                                     chrx('0155','030c')],
-  ['@address@hidden@\'address@hidden', 'command in accent',   '=', '=', '=', 
chrx('0304')]
             ) {
   test_enable_encoding($test);
 }

Modified: trunk/tp/t/results/invalid_nestings/accents.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/accents.pl      2018-10-21 14:02:40 UTC 
(rev 8364)
+++ trunk/tp/t/results/invalid_nestings/accents.pl      2018-10-21 16:16:21 UTC 
(rev 8365)
@@ -228,7 +228,7 @@
 TeX~. @~.
 
 Invalid
-~.  ^.
+a~.  ^.
 ';
 
 $result_errors{'accents'} = [