[7191] move novalidate into 'info\

[gavinsmith0123]

Revision: 7191
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7191
Author:   gavin
Date:     2016-05-28 15:30:28 +0000 (Sat, 28 May 2016)
Log Message:
-----------
move novalidate into 'info\

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/Structuring.pm
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-28 15:19:05 UTC (rev 7190)
+++ trunk/ChangeLog     2016-05-28 15:30:28 UTC (rev 7191)
@@ -1,12 +1,22 @@
-2016-05-26  Gavin Smith  <address@hidden>
+2016-05-28  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <@novalidate>,
+       * texi2any.pl <option processing>,
+       * tp/Texinfo/Structuring.pm (nodes_tree)
+       (associate_internal_references),
+       * tp/Texinfo/Common.pm (%default_parser_state_configuration): 
+       Use $self->{'info'}->{'novalidate'} instead of
+       $self->{'novalidate'}.  Delete some commented-out code.
+
+2016-05-28  Gavin Smith  <address@hidden>
+
        * doc/texinfo.tex (\indexnofontsvalue): New definition for a 
        @value when expanded in an index entry sort key.
        (\indexnofonts): Call it.
        (\dummyvalue): If @value is undefined, pass through an 
        unexpanded @value command to the auxiliary file.
 
-2016-05-26  Gavin Smith  <address@hidden>
+2016-05-28  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\commondummies): Move definitions of 
        \definedummyword, \definedummyletter, \definedummyaccent out of 

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2016-05-28 15:19:05 UTC (rev 7190)
+++ trunk/tp/Texinfo/Common.pm  2016-05-28 15:30:28 UTC (rev 7191)
@@ -126,22 +126,16 @@
                               # value is the reference on a macro element 
                               # as obtained by parsing the @macro
   'merged_indices' => {},     # the key is merged in the value
-  'novalidate' => 0,          # same as setting @novalidate.
   'validatemenus' => 0,       # same as setting @validatemenus.
   'sections_level' => 0,      # modified by raise/lowersections
   'values' => {'txicommandconditionals' => 1},
                               # the key is the name, the value the @set name 
                               # argument.  A Texinfo tree may also be used.
+  'info' => {
+    'novalidate' => 0,        # same as setting @novalidate.
+  }
 );
 
-# command-line options
-#my @command_line_settable_at_commands = ('footnotestyle', 'novalidate',
-#  'documentlanguage', 'paragraphindent');
-
-
-# FIXME maybe this should better be set as texinfo passed to texi2any as
-# texi2dvi --command 
-
 # customization options
 our %document_settable_at_commands = (
   'allowcodebreaks' => 'true',

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-05-28 15:19:05 UTC (rev 7190)
+++ trunk/tp/Texinfo/Parser.pm  2016-05-28 15:30:28 UTC (rev 7191)
@@ -4470,7 +4470,7 @@
               } elsif ($command eq 'lowersections') {
                 $self->{'sections_level'}--;
               } elsif ($command eq 'novalidate') {
-                $self->{'novalidate'} = 1;
+                $self->{'info'}->{'novalidate'} = 1;
               }
             }
             _mark_and_warn_invalid($self, $command, $invalid_parent,
@@ -6188,6 +6188,11 @@
 
 An array of menus that are not associated with a node.
 
+=item novalidate
+
+If set, it is as if C<@novalidate> was set in the document.
+
+
 =back
 
 =back
@@ -6435,10 +6440,6 @@
 The associated hash reference holds merged indices information, each key 
 is merged in the value.  Same as setting C<@synindex> or C<syncodeindex>.
 
-=item novalidate
-
-If set, it is as if C<@novalidate> was set in the document.
-
 =item sections_level
 
 Modifier of the sections level.  Same as calling C<@lowersections> or

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2016-05-28 15:19:05 UTC (rev 7190)
+++ trunk/tp/Texinfo/Structuring.pm     2016-05-28 15:30:28 UTC (rev 7191)
@@ -575,7 +575,8 @@
   my $top_node;
   my $top_node_up;
 
-  my $check_menu_entries = (!$self->{'novalidate'} and $self->{'SHOW_MENU'});
+  my $check_menu_entries = (!$self->{'info'}->{'novalidate'}
+                              and $self->{'SHOW_MENU'});
 
   foreach my $node (@{$self->{'nodes'}}) {
     if ($node->{'extra'}->{'normalized'} eq 'Top') {
@@ -777,8 +778,9 @@
                = $self->{'labels'}->{$node_direction->{'normalized'}};
             $node->{'node_'.$direction} = $node_target;
 
-            if (! $self->{'novalidate'} and ! _check_node_same_texinfo_code(
-                $node_target, $node_direction)) {
+            if (!$self->{'info'}->{'novalidate'}
+                and !_check_node_same_texinfo_code($node_target,
+                                                   $node_direction)) {
               $self->line_warn(sprintf($self->
                 __("%s pointer `%s' (for node `%s') different from %s name 
`%s'"),
                   $direction_texts{$direction},
@@ -789,7 +791,7 @@
                                      $node->{'line_nr'});
             }
           } else {
-            if ($self->{'novalidate'}) {
+            if ($self->{'info'}->{'novalidate'}) {
               $node->{'node_'.$direction} = { 'extra' => $node_direction };
             # special case of up for top an internal node and the same
             # as TOP_NODE_UP.  This is not the default case, since in the
@@ -1316,7 +1318,7 @@
   return if (!defined($refs));
   foreach my $ref (@$refs) {
     if (!defined($labels->{$ref->{'extra'}{'node_argument'}{'normalized'}})) {
-      if (!$self->{'novalidate'}) {
+      if (!$self->{'info'}->{'novalidate'}) {
         $self->line_error(sprintf($self->__("address@hidden reference to 
nonexistent node `%s'"),
                 $ref->{'cmdname'}, 
                 node_extra_to_texi($ref->{'extra'}->{'node_argument'})), 
@@ -1326,8 +1328,9 @@
       my $node_target 
         = $labels->{$ref->{'extra'}->{'node_argument'}->{'normalized'}};
       $ref->{'extra'}->{'label'} = $node_target;
-      if (! $self->{'novalidate'} and ! _check_node_same_texinfo_code(
-          $node_target, $ref->{'extra'}->{'node_argument'})) {
+      if (!$self->{'info'}->{'novalidate'}
+          and !_check_node_same_texinfo_code($node_target,
+                                         $ref->{'extra'}->{'node_argument'})) {
         $self->line_warn(sprintf($self->
            __("address@hidden to `%s', different from %s name `%s'"), 
            $ref->{'cmdname'},

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2016-05-28 15:19:05 UTC (rev 7190)
+++ trunk/tp/texi2any.pl        2016-05-28 15:30:28 UTC (rev 7191)
@@ -925,7 +925,7 @@
   },
  'no-validate|no-pointer-validate' => sub {
       set_from_cmdline('novalidate',$_[1]);
-      $parser_default_options->{'novalidate'} = $_[1];
+      $parser_default_options->{'info'}->{'novalidate'} = $_[1];
     },
  'no-warn' => sub { set_from_cmdline('NO_WARN', $_[1]); },
  'verbose|v!' => sub {set_from_cmdline('VERBOSE', $_[1]);