texinfo doc/texinfo.txi doc/version.texi tp/tex...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/26 22:53:08

Modified files:
        doc            : texinfo.txi version.texi 
        tp             : texi2any.pl 
        tp/Texinfo     : Common.pm 

Log message:
        Use specific arrays for unused and obsolete customization variables.
        Remove or comment out unused customization variables, uncomment
        WORDS_IN_PAGE which is used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.393&r2=1.394
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version.texi?cvsroot=texinfo&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.78&r2=1.79

Patches:
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -b -r1.393 -r1.394
--- doc/texinfo.txi     22 Oct 2011 17:50:33 -0000      1.393
+++ doc/texinfo.txi     26 Oct 2011 22:53:07 -0000      1.394
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.393 2011/10/22 17:50:33 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.394 2011/10/26 22:53:07 pertusus Exp $
 @c Ordinarily, Texinfo files have the extension .texi.  But texinfo.texi
 @c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
 
@@ -16843,9 +16843,9 @@
 @item CLOSE_QUOTE_SYMBOL
 When a closing quote is needed, use the corresponding character.
 
address@hidden COMPLETE_IMAGE_PATHS
-If set, the image files are computed to be relative from the document
-directory to the source manual directory, and then to the image.
address@hidden @item COMPLETE_IMAGE_PATHS
address@hidden If set, the image files are computed to be relative from the 
document
address@hidden directory to the source manual directory, and then to the image.
 
 @item COMPLEX_FORMAT_IN_TABLE
 For address@hidden  If set, use tables for indentation of complex formats.
@@ -16925,16 +16925,16 @@
 @item ICONS
 For address@hidden  Use icons for the navigation panel.
 
address@hidden IDX_SUMMARY
-If set, for each @code{@@printindex} a file named
address@hidden@address@hidden is created, containing lines of
-the form:
-
address@hidden
address@hidden @var{reference}
address@hidden example
-
address@hidden sorted alphabetically (case matters).
address@hidden @item IDX_SUMMARY
address@hidden If set, for each @code{@@printindex} a file named
address@hidden @address@hidden@var{idxname}.idx} is created, containing lines of
address@hidden the form:
address@hidden 
address@hidden @example
address@hidden @var{key} @var{reference}
address@hidden @end example
address@hidden 
address@hidden @noindent sorted alphabetically (case matters).
 
 @item IGNORE_BEFORE_SETFILENAME
 If set, begin outputting at @code{@@setfilename}, if
@@ -17123,9 +17123,6 @@
 For HTML, XML.  If set, use numeric entities instead of ASCII
 characters when there is no named entity.
 
address@hidden USE_UP_FOR_ADJACENT_NODES
-If set, try Up sections to complete node directions.
-
 @item USE_REL_REV
 For address@hidden  Use @code{rel} in cross references.
 
@@ -17150,10 +17147,10 @@
 @item VERTICAL_HEAD_NAVIGATION
 For address@hidden  If set, a vertical navigation panel is used.
 
address@hidden @item WORDS_IN_PAGE
address@hidden For HTML, with output split at nodes.  Specifies the approximate
address@hidden minimum page length required before a navigation panel is placed 
at
address@hidden the bottom of a page.
address@hidden WORDS_IN_PAGE
+For HTML, with output split at nodes.  Specifies the approximate
+minimum page length required before a navigation panel is placed at
+the bottom of a page.
 
 @end vtable
 
@@ -21102,7 +21099,7 @@
 (@url{http://www.gnu.org/software/rcs}) version control systems, which
 expand it into a string such as:
 @example
-$Id: texinfo.txi,v 1.393 2011/10/22 17:50:33 pertusus Exp $
+$Id: texinfo.txi,v 1.394 2011/10/26 22:53:07 pertusus Exp $
 @end example
 (This is useful in all sources that use version control, not just manuals.)
 You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -21173,7 +21170,7 @@
 
 @verbatim
 \input texinfo   @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.393 2011/10/22 17:50:33 pertusus Exp $
address@hidden $Id: texinfo.txi,v 1.394 2011/10/26 22:53:07 pertusus Exp $
 @comment %**start of header
 @setfilename sample.info
 @include version.texi

Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- doc/version.texi    21 Oct 2011 18:42:35 -0000      1.102
+++ doc/version.texi    26 Oct 2011 22:53:08 -0000      1.103
@@ -1,4 +1,4 @@
address@hidden UPDATED 19 October 2011
address@hidden UPDATED 22 October 2011
 @set UPDATED-MONTH October 2011
 @set EDITION 4.13.90
 @set VERSION 4.13.90

Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- tp/texi2any.pl      21 Oct 2011 22:59:05 -0000      1.76
+++ tp/texi2any.pl      26 Oct 2011 22:53:08 -0000      1.77
@@ -423,7 +423,6 @@
   ['INLINE_CONTENTS', 0],
   ['FORCE', 1],
   ['AVOID_MENU_REDUNDANCY', 1],
-  ['TOP_HEADING_AT_BEGINNING', 1],
   ['TOP_FILE', ''],
   ['USE_ACCESSKEY', 0],
   ['NODE_NAME_IN_MENU', 0],

Index: tp/Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- tp/Texinfo/Common.pm        21 Oct 2011 22:59:05 -0000      1.78
+++ tp/Texinfo/Common.pm        26 Oct 2011 22:53:08 -0000      1.79
@@ -113,20 +113,25 @@
   'ENCODING_NAME', 'PERL_ENCODING', 'INDICES', 'KBDINPUTSTYLE', 'LABELS',
   'MACROS', 'NOVALIDATE', 'SECTIONS_LEVEL', 'VALUES');
 
-# FIXME TOP_HEADING_AT_BEGINNING seems to be a no-op
-# FIXME USE_SECTIONS is now a no-op, there are only two possibilities, 
-# USE_NODES set or not.
+# FIXME warn when those variables are used?
+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',);
+
+my @variable_settables_not_used = ('COMPLETE_IMAGE_PATHS', 'TOC_FILE');
+
 my @variable_settables = (
   'DEBUG', 'FRAMES', 'FRAMESET_DOCTYPE', 'DOCTYPE', 'TEST', 'DUMP_TEXI',
-  'TOP_FILE', 'TOC_FILE', 'SHOW_MENU', 'USE_NODES', 'TOC_LINKS', 'SHORTEXTN',
-  'PREFIX', 'SHORT_REF', 'IDX_SUMMARY', 'DEF_TABLE', 'L2H', 'MONOLITHIC',
+  'TOP_FILE', 'SHOW_MENU', 'USE_NODES', 'TOC_LINKS', 'SHORTEXTN',
+  'PREFIX', 'SHORT_REF', 'DEF_TABLE', 'L2H', 'MONOLITHIC',
   'L2H_L2H', 'L2H_SKIP', 'L2H_TMP', 'L2H_FILE', 'L2H_CLEAN',
   'L2H_HTML_VERSION', 'IGNORE_PREAMBLE_TEXT', 'EXTERNAL_DIR', 'USE_ISO',
-  'SPLIT_INDEX', 'IN_ENCODING', 'USE_NLS',
+  'SPLIT_INDEX', 'IN_ENCODING',
   'VERTICAL_HEAD_NAVIGATION', 'INLINE_CONTENTS', 'NODE_FILE_EXTENSION',
-  'NO_CSS', 'INLINE_CSS_STYLE', 'USE_SECTIONS', 'USE_TITLEPAGE_FOR_TITLE',
+  'NO_CSS', 'INLINE_CSS_STYLE', 'USE_TITLEPAGE_FOR_TITLE',
   'SIMPLE_MENU', 'EXTENSION', 'INLINE_INSERTCOPYING', 'USE_NUMERIC_ENTITY',
-  'I18N_PERL_HASH', 'ENABLE_ENCODING_USE_ENTITY', 'ICONS', 'USE_UNICODE',
+  'ENABLE_ENCODING_USE_ENTITY', 'ICONS',
   'USE_UNIDECODE', 'DATE_IN_HEADER', 'OPEN_QUOTE_SYMBOL',
   'CLOSE_QUOTE_SYMBOL', 'TOP_NODE_UP', 'TOP_NODE_UP_URL', 'TOP_NODE_FILE',
   'TOP_NODE_FILE_TARGET', 'SHOW_TITLE', 'WORDS_IN_PAGE',
@@ -134,9 +139,8 @@
   'OVERVIEW_LINK_TO_TOC', 'AVOID_MENU_REDUNDANCY', 'NODE_NAME_IN_MENU',
   'NODE_NAME_IN_INDEX', 'NO_USE_SETFILENAME', 'USE_SETFILENAME_EXTENSION',
   'COMPLEX_FORMAT_IN_TABLE',
-  'USE_UP_FOR_ADJACENT_NODES', 'TOP_HEADING_AT_BEGINNING',
-  'SEPARATE_DESCRIPTION', 'IGNORE_BEFORE_SETFILENAME',
-  'COMPLETE_IMAGE_PATHS', 'USE_NODE_TARGET', 'NEW_CROSSREF_STYLE',
+  'IGNORE_BEFORE_SETFILENAME',
+  'USE_NODE_TARGET',
   'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES', 'DEFAULT_ENCODING',
   'OUT_ENCODING', 'ENCODING_NAME', 'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
   'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE',
@@ -160,7 +164,8 @@
 
 my %valid_options;
 foreach my $var (@document_settable_at_commands, @document_global_at_commands,
-         @command_line_settables, @variable_settables, @parser_options) {
+         @command_line_settables, @variable_settables, @parser_options,
+         @obsolete_variables, @variable_settables_not_used) {
   $valid_options{$var} = 1;
 }