[7218] NodeNameNormalization.pm remove commented-out code

[gavinsmith0123]

Revision: 7218
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7218
Author:   gavin
Date:     2016-06-12 13:23:21 +0000 (Sun, 12 Jun 2016)
Log Message:
-----------
NodeNameNormalization.pm remove commented-out code

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/Converter.pm
    trunk/tp/Texinfo/Convert/NodeNameNormalization.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-06-12 12:56:54 UTC (rev 7217)
+++ trunk/ChangeLog     2016-06-12 13:23:21 UTC (rev 7218)
@@ -1,3 +1,8 @@
+2016-06-12  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Convert/NodeNameNormalization.pm: Remove 
+       commented-out code.
+
 2016-06-11  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_end_line) <@end, @include>

Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm       2016-06-12 12:56:54 UTC (rev 
7217)
+++ trunk/tp/Texinfo/Convert/Converter.pm       2016-06-12 13:23:21 UTC (rev 
7218)
@@ -1134,6 +1134,8 @@
   return @result;
 }
 
+use Parsetexi;
+
 sub _table_item_content_tree($$$)
 {
   my $self = shift;
@@ -1158,7 +1160,8 @@
                'contents' => $contents,
                'parent' => $command,};
     $command->{'args'} = [$arg];
-    $self->Texinfo::Parser::_register_command_arg($arg, 
'brace_command_contents');
+    #$self->Parsetexi::_register_command_arg($arg, 'brace_command_contents');
+    #$self->Texinfo::Parser::_register_command_arg($arg, 
'brace_command_contents');
     $contents = [$command];
   }
   $converted_tree->{'contents'} = $contents;

Modified: trunk/tp/Texinfo/Convert/NodeNameNormalization.pm
===================================================================
--- trunk/tp/Texinfo/Convert/NodeNameNormalization.pm   2016-06-12 12:56:54 UTC 
(rev 7217)
+++ trunk/tp/Texinfo/Convert/NodeNameNormalization.pm   2016-06-12 13:23:21 UTC 
(rev 7218)
@@ -1,6 +1,6 @@
 # NodeNameNormalization.pm: output tree as normalized node name.
 #
-# Copyright 2010, 2011, 2012 Free Software Foundation, Inc.
+# Copyright 2010, 2011, 2012, 2016 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
@@ -69,8 +69,8 @@
 my %accent_commands = %Texinfo::Common::accent_commands;
 
 my %ignored_brace_commands;
-foreach my $ignored_brace_command (#'xref','ref', 'pxref', 'inforef', 
-   'anchor', 'footnote', 'shortcaption', 'caption', 'hyphenation') {
+foreach my $ignored_brace_command ('anchor', 'footnote', 'shortcaption',
+                                   'caption', 'hyphenation') {
   $ignored_brace_commands{$ignored_brace_command} = 1;
 }
 
@@ -202,15 +202,6 @@
   my $root = shift;
   my $in_sc = shift;
 
-  if (0) {
-    print STDERR "root\n";
-    print STDERR "  Command: $root->{'cmdname'}\n" if ($root->{'cmdname'});
-    print STDERR "  Type: $root->{'type'}\n" if ($root->{'type'});
-    print STDERR "  Text: $root->{'text'}\n" if (defined($root->{'text'}));
-    #print STDERR "  Special def_command: $root->{'extra'}->{'def_command'}\n"
-    #  if (defined($root->{'extra'}) and $root->{'extra'}->{'def_command'});
-  }
-
   return '' if (($root->{'type'} and $ignored_types{$root->{'type'}})
           or ($root->{'cmdname'} 
              and ($ignored_brace_commands{$root->{'cmdname'}} 
@@ -273,15 +264,6 @@
         }
       }
       return '';
-    #} elsif ($root->{'cmdname'} eq 'email') {
-    #  my $mail = _convert($root->{'args'}->[0]);
-    #  return $mail if (defined($mail) and $mail ne '');
-    #  my $text;
-    #  $text = _convert($root->{'args'}->[1])
-    #     if (defined($root->{'args'}->[1]));
-    #  return $text if (defined($text) and ($text ne ''));
-    #  #return $mail;
-    #  return '';
     # Here all the commands with args are processed, if they have
     # more than one arg the first one is used.
     } elsif ($root->{'args'} and $root->{'args'}->[0]