[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8431] texi2any do not recognize obsolete customization variables
From: |
gavinsmith0123 |
Subject: |
[8431] texi2any do not recognize obsolete customization variables |
Date: |
Sat, 27 Oct 2018 17:04:03 -0400 (EDT) |
Revision: 8431
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8431
Author: gavin
Date: 2018-10-27 17:04:03 -0400 (Sat, 27 Oct 2018)
Log Message:
-----------
texi2any do not recognize obsolete customization variables
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/tp/Texinfo/Common.pm
trunk/tp/Texinfo/Convert/Converter.pm
trunk/tp/texi2any.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-10-27 20:46:58 UTC (rev 8430)
+++ trunk/ChangeLog 2018-10-27 21:04:03 UTC (rev 8431)
@@ -1,5 +1,22 @@
2018-10-27 Gavin Smith <address@hidden>
+ * tp/Texinfo/Common.pm (@obsolete_variables): Remove.
+ (obsolete_option): Remove.
+ (%customization_variable_classes): Remove 'obsolete_variables'.
+ * tp/texi2any.pl (set_from_init_file, set_from_cmdline),
+ * tp/Texinfo/Convert/Converter.pm (set_conf, force_conf):
+ Do not call Texinfo::Common::obsolete_option.
+ * NEWS: Mention that obsolete customization variables are no
+ longer recognized.
+
+ * tp/Texinfo/Parser.pm (_setup_parser): Do not look at
+ 'INLINE_INSERTCOPYING'.
+
+ If more variables are deprecated, then it may be worth
+ reinstating some of this code.
+
+2018-10-27 Gavin Smith <address@hidden>
+
* tp/Texinfo/Parser.pm (_command_with_command_as_argument):
Remove code checking for a case where the command has two
elements in 'args', the first all whitespace, as this case never
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2018-10-27 20:46:58 UTC (rev 8430)
+++ trunk/NEWS 2018-10-27 21:04:03 UTC (rev 8431)
@@ -28,6 +28,7 @@
to be recognised by makeinfo in macro definitions but were never
implemented in texinfo.tex)
. `FIX_TEXINFO' removed as a customization variable
+ . do not recognise or warn about obsolete customization variables
6.5 (12 September 2017)
Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm 2018-10-27 20:46:58 UTC (rev 8430)
+++ trunk/tp/Texinfo/Common.pm 2018-10-27 21:04:03 UTC (rev 8431)
@@ -204,14 +204,6 @@
# all are lower cased in texi2any.pl
my @parser_options = map {uc($_)} (keys(%default_parser_state_configuration));
-my @obsolete_variables = ('TOP_HEADING_AT_BEGINNING', 'USE_SECTIONS',
- 'IDX_SUMMARY', 'I18N_PERL_HASH', 'USE_UNICODE', 'USE_NLS',
- 'USE_UP_FOR_ADJACENT_NODES', 'SEPARATE_DESCRIPTION',
- 'NEW_CROSSREF_STYLE', 'SHORT_REF', 'IGNORE_PREAMBLE_TEXT',
- 'OUT_ENCODING', 'IN_ENCODING', 'DEFAULT_ENCODING',
- 'MACRO_BODY_IGNORES_LEADING_SPACE', 'INLINE_INSERTCOPYING'
-);
-
my @variable_settables_not_used = ('COMPLETE_IMAGE_PATHS', 'TOC_FILE',
'SPLIT_INDEX');
@@ -285,16 +277,10 @@
keys(%document_settable_unique_at_commands),
@command_line_settables, @variable_string_settables,
@variable_other_settables, @parser_options,
- @formats_settable,
- @obsolete_variables, @variable_settables_not_used) {
+ @formats_settable, @variable_settables_not_used) {
$valid_options{$var} = 1;
}
-my %obsolete_options;
-foreach my $var (@obsolete_variables) {
- $obsolete_options{$var} = 1;
-}
-
sub valid_option($)
{
my $option = shift;
@@ -301,12 +287,6 @@
return $valid_options{$option};
}
-sub obsolete_option($)
-{
- my $option = shift;
- return $obsolete_options{$option};
-}
-
my %customization_variable_classes = (
'document_settable_at_commands' => [
sort(keys(%document_settable_at_commands)) ],
'document_settable_unique_at_commands' => [
sort(keys(%document_settable_unique_at_commands)) ],
@@ -315,7 +295,7 @@
'variable_other_settables' => address@hidden,
'parser_options' => address@hidden,
#'formats_settable' => address@hidden,
- 'obsolete_variables' => address@hidden,
+ #'obsolete_variables' => address@hidden,
'variable_settables_not_used' => address@hidden,
);
Modified: trunk/tp/Texinfo/Convert/Converter.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Converter.pm 2018-10-27 20:46:58 UTC (rev
8430)
+++ trunk/tp/Texinfo/Convert/Converter.pm 2018-10-27 21:04:03 UTC (rev
8431)
@@ -371,8 +371,6 @@
if (!Texinfo::Common::valid_option($conf)) {
die "BBUG: unknown option $conf\n";
return undef;
- } elsif (Texinfo::Common::obsolete_option($conf)) {
- warn(sprintf(main::__("Obsolete variable %s\n"), $conf));
}
if ($self->{'set'}->{$conf}) {
return 0;
@@ -390,8 +388,6 @@
if (!Texinfo::Common::valid_option($conf)) {
die "ABUG: unknown option $conf\n";
return undef;
- } elsif (Texinfo::Common::obsolete_option($conf)) {
- warn(sprintf(main::__("Obsolete variable %s\n"), $conf));
}
$self->{'conf'}->{$conf} = $value;
return 1;
Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl 2018-10-27 20:46:58 UTC (rev 8430)
+++ trunk/tp/texi2any.pl 2018-10-27 21:04:03 UTC (rev 8431)
@@ -386,9 +386,6 @@
main::document_warn(sprintf(main::__("%s: unknown variable %s"),
'set_from_init_file', $var));
return 0;
- } elsif (Texinfo::Common::obsolete_option($var)) {
- main::document_warn(sprintf(main::__("%s: obsolete variable %s\n"),
- 'set_from_init_file', $var));
}
return 0 if (defined($cmdline_options->{$var}));
delete $default_options->{$var};
@@ -405,9 +402,6 @@
main::document_warn(sprintf(main::__("%s: unknown variable %s\n"),
'set_from_cmdline', $var));
return 0;
- } elsif (Texinfo::Common::obsolete_option($var)) {
- main::document_warn(sprintf(main::__("obsolete variable %s\n"),
- 'set_from_cmdline', $var));
}
$cmdline_options->{$var} = $value;
return 1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8431] texi2any do not recognize obsolete customization variables,
gavinsmith0123 <=