texinfo/tp texi2any.pl Texinfo/Convert/Converte...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/08/27 22:57:59

Modified files:
        tp             : texi2any.pl 
        tp/Texinfo/Convert: Converter.pm HTML.pm 

Log message:
        For SPLIT to be unset when outputting a format that do not support 
SPLIT.
        It is useful, because SPLIT is used in Convert::Converter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.138&r2=1.139

Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- texi2any.pl 25 Aug 2011 07:33:32 -0000      1.53
+++ texi2any.pl 27 Aug 2011 22:57:59 -0000      1.54
@@ -818,9 +818,7 @@
 
 if (get_conf('SPLIT') and !$formats_table{$format}->{'split'}) {
   document_warn (sprintf(__('Ignoring splitting for format %s'), $format));
-  # FIXME see if the following is required.  Should not be
-  # since defaults are per format.
-  #set_from_cmdline('SPLIT', ''); 
+  set_from_cmdline('SPLIT', ''); 
   #set_from_cmdline('FRAMES', 0); 
 }
 

Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Texinfo/Convert/Converter.pm        25 Aug 2011 07:33:33 -0000      1.29
+++ Texinfo/Convert/Converter.pm        27 Aug 2011 22:57:59 -0000      1.30
@@ -208,8 +208,8 @@
   }
 }
 
-#Â Notice that set_conf is used, which means that it is not possible to
-#Â customize what is done for those commands.
+# Notice that set_conf is used, which means that it is not possible to
+# customize what is done for those commands.
 sub _unset_global_multiple_commands($)
 {
   my $self = shift;

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- Texinfo/Convert/HTML.pm     21 Aug 2011 14:19:13 -0000      1.138
+++ Texinfo/Convert/HTML.pm     27 Aug 2011 22:57:59 -0000      1.139
@@ -841,7 +841,6 @@
   #'perl_encoding'        => undef,
   'OUTFILE'              => undef,
   'SUBDIR'               => undef,
-  'documentlanguage'     => undef,
   'NUMBER_FOOTNOTES'     => 1,
   'expanded_formats'     => undef,
   'include_directories'  => undef,
@@ -4112,8 +4111,8 @@
     %{$self->{'renamed_nodes'}} = %{$Texinfo::Config::renamed_nodes};
   }
 
-  $self->{'document_context'} = [],
-  $self->{'multiple_pass'} = [],
+  $self->{'document_context'} = [];
+  $self->{'multiple_pass'} = [];
   $self->_new_document_context('_toplevel_context');
 
   #$self->_translate_names();