texinfo ChangeLog util/detexinfo tp/texi2any.pl...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        13/01/26 23:14:03

Modified files:
        .              : ChangeLog 
        util           : detexinfo 
        tp             : texi2any.pl 
        tp/DebugTexinfo: DebugTree.pm 
        tp/Texinfo     : Common.pm 

Log message:
                * tp/texi2any.pl, tp/Texinfo/Common.pm, 
tp/DebugTexinfo/DebugTree.pm,
                util/detexinfo: remove output specific customization variables.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1529&r2=1.1530
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/detexinfo?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.164&r2=1.165
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/DebugTexinfo/DebugTree.pm?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.175&r2=1.176

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1529
retrieving revision 1.1530
diff -u -b -r1.1529 -r1.1530
--- ChangeLog   25 Jan 2013 18:23:09 -0000      1.1529
+++ ChangeLog   26 Jan 2013 23:14:02 -0000      1.1530
@@ -1,3 +1,8 @@
+2013-01-27  Patrice Dumas  <address@hidden>
+
+       * tp/texi2any.pl, tp/Texinfo/Common.pm, tp/DebugTexinfo/DebugTree.pm,
+       util/detexinfo: remove output specific customization variables.
+
 2013-01-25  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Other Customization Variables)

Index: util/detexinfo
===================================================================
RCS file: /sources/texinfo/texinfo/util/detexinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- util/detexinfo      20 Jan 2012 18:11:41 -0000      1.2
+++ util/detexinfo      26 Jan 2013 23:14:02 -0000      1.3
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: detexinfo,v 1.2 2012/01/20 18:11:41 karl Exp $
+# $Id: detexinfo,v 1.3 2013/01/26 23:14:02 pertusus Exp $
 # Copyright 2011, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
@@ -15,4 +15,4 @@
 # Script to strip Texinfo commands.  It is so trivial we don't install
 # it, but it's in the distribution as an example.
 #
-exec texi2any --set-init-variable TEXTCONTENT=1 "$@"
+exec texi2any --set-customization-variable TEXINFO_OUTPUT_FORMAT=textcontent 
"$@"

Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- tp/texi2any.pl      26 Jan 2013 14:48:58 -0000      1.164
+++ tp/texi2any.pl      26 Jan 2013 23:14:02 -0000      1.165
@@ -835,18 +835,6 @@
      } elsif ($var eq 'TEXI2HTML') {
        $format = set_format('html');
        $parser_default_options->{'values'}->{'texi2html'} = 1;
-     } elsif ($var eq 'DEBUGCOUNT') {
-       $format = set_format('debugcount');
-     } elsif ($var eq 'DEBUGTREE') {
-       $format = set_format('debugtree');
-     } elsif ($var eq 'PLAINTEXINFO') {
-       $format = set_format('plaintexinfo');
-     } elsif ($var eq 'RAWTEXT') {
-       $format = set_format('rawtext');
-     } elsif ($var eq 'TEXTCONTENT') {
-       $format = set_format('textcontent');
-     } elsif ($var eq 'TEXINFOSXML') {
-       $format = set_format('texinfosxml');
      }
      set_from_cmdline ($var, $value);
      # FIXME do that here or when all command line options are processed?

Index: tp/DebugTexinfo/DebugTree.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/DebugTexinfo/DebugTree.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tp/DebugTexinfo/DebugTree.pm        5 Jul 2012 17:29:55 -0000       1.10
+++ tp/DebugTexinfo/DebugTree.pm        26 Jan 2013 23:14:02 -0000      1.11
@@ -19,11 +19,11 @@
 
 # Example of calls
 # with creation of elements corresponding to sections:
-# ./texi2any.pl --set DEBUGTREE --set USE_NODES=0 file.texi
+# ./texi2any.pl --set TEXINFO_OUTPUT_FORMAT=debugtree --set USE_NODES=0 
file.texi
 # with creation of elements corresponding to nodes:
-# ./texi2any.pl --set DEBUGTREE --set USE_NODES=1 file.texi
+# ./texi2any.pl --set TEXINFO_OUTPUT_FORMAT=debugtree --set USE_NODES=1 
file.texi
 # no elements
-# ./texi2any.pl --set DEBUGTREE file.texi
+# ./texi2any.pl --set TEXINFO_OUTPUT_FORMAT=debugtree file.texi
 # 
 # Some unofficial info about the --debug command line option ... with
 # --debug=1, the tree is not printed,

Index: tp/Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- tp/Texinfo/Common.pm        26 Jan 2013 14:48:59 -0000      1.175
+++ tp/Texinfo/Common.pm        26 Jan 2013 23:14:03 -0000      1.176
@@ -212,8 +212,6 @@
   'SPLIT_INDEX');
 
 my @formats_settable = (
-  'DEBUGCOUNT', 'DEBUGTREE', 'RAWTEXT', 'TEXTCONTENT', 'PLAINTEXINFO',
-  'TEXINFOSXML',
 );
 
 my @variable_string_settables = (
@@ -310,7 +308,7 @@
   'variable_string_settables' => address@hidden,
   'variable_other_settables' => address@hidden,
   'parser_options' => address@hidden,
-  'formats_settable' => address@hidden,
+  #'formats_settable' => address@hidden,
   'obsolete_variables' => address@hidden,
   'variable_settables_not_used' => address@hidden,
 );