[Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/04/26 15:21:17

Modified files:
        .              : ChangeLog texi2html.init texi2html.pl 
        examples       : info.init 
        test/formatting: tests.txt 
Added files:
        test/formatting: kbdinputstyle.texi 

Log message:
                Fix output to STDOUT for info, and splitting of info output 
when 
                output to STDOUT, or not split.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.374&r2=1.375
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.276&r2=1.277
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/tests.txt?cvsroot=texi2html&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/kbdinputstyle.texi?cvsroot=texi2html&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -b -r1.374 -r1.375
--- ChangeLog   25 Apr 2009 23:05:00 -0000      1.374
+++ ChangeLog   26 Apr 2009 15:21:04 -0000      1.375
@@ -10,6 +10,8 @@
        verbatiminclude is now a $raw command argument distinct from 
        verbatim.
        Don't close out file, to let user code close it without erroring.
+       Fix output to STDOUT for info, and splitting of info output when 
+       output to STDOUT, or not split.
 
 2009-04-23   Patrice Dumas  <address@hidden>
 

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- texi2html.init      25 Apr 2009 14:54:41 -0000      1.187
+++ texi2html.init      26 Apr 2009 15:21:07 -0000      1.188
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.187 2009/04/25 14:54:41 pertusus Exp $
+# $Id: texi2html.init,v 1.188 2009/04/26 15:21:07 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -186,6 +186,10 @@
 # If this is set a monolithic document is outputted into $filename.
 $OUT = '';
 
+# --split-size
+#Â if undef, the info output is not split
+$SPLIT_SIZE = 300000;
+
 # -no-validate
 # suppress node cross-reference validation
 $NOVALIDATE = 0;
@@ -295,9 +299,6 @@
 #
 ##############################################################################
 
-# --split-size
-$SPLIT_SIZE = 300000;
-
 # If true do table of contents even if there is no @content
 $DO_CONTENTS = undef;
 

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -b -r1.276 -r1.277
--- texi2html.pl        25 Apr 2009 23:05:00 -0000      1.276
+++ texi2html.pl        26 Apr 2009 15:21:12 -0000      1.277
@@ -79,7 +79,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.276 2009/04/25 23:05:00 pertusus Exp $
+# $Id: texi2html.pl,v 1.277 2009/04/26 15:21:12 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -2417,7 +2417,7 @@
 $T2H_OPTIONS -> {'no-split'} =
 {
  type => '!',
- linkage => sub {$Texi2HTML::Config::SPLIT = '';},
+ linkage => sub {$Texi2HTML::Config::SPLIT = ''; 
$Texi2HTML::Config::SPLIT_SIZE = undef;},
  verbose => 'no splitting of document',
  noHelp => 1,
 };
@@ -3345,6 +3345,10 @@
 {
    $Texi2HTML::GLOBAL{'DO_SCONTENTS'} = $Texi2HTML::Config::DO_SCONTENTS;
 }
+if (defined($Texi2HTML::Config::SPLIT_SIZE))
+{
+   $Texi2HTML::GLOBAL{'SPLIT_SIZE'} = $Texi2HTML::Config::SPLIT_SIZE;
+}
 
 # FIXME encoding for first file or all files?
 if (defined($Texi2HTML::Config::IN_ENCODING))
@@ -3580,7 +3584,8 @@
       my $out_file;
 # AAAA
    # even if the out file is not set by OUT, in case it is not the first
-   # file, the out directory is still used
+   # file, the out directory is still used. This is only used to determine
+   #Â the directory, the out file itself is set below
       if (defined($Texi2HTML::Config::OUT) and $Texi2HTML::Config::OUT ne '')
       {
          $out_file = $Texi2HTML::Config::OUT;
@@ -3699,6 +3704,7 @@
       if (defined($Texi2HTML::Config::OUT) and ($file_nr == 0))
       {
          my $out_file = $Texi2HTML::Config::OUT;
+         $Texi2HTML::THISDOC{'SPLIT_SIZE'} = undef if ($out_file eq '-');
          $out_file =~ s|.*/||;
          $docu_doc = $out_file if ($out_file !~ /^\s*$/);
       }

Index: examples/info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- examples/info.init  26 Apr 2009 11:43:33 -0000      1.35
+++ examples/info.init  26 Apr 2009 15:21:15 -0000      1.36
@@ -2148,7 +2148,8 @@
     my $state = $Texi2HTML::THISDOC{'state'};
     my $info_state = info_default_get_state ($state);
 
-    if ($info_state->{'offset_in_file'} > ($info_default_out_file_nr) * 
$SPLIT_SIZE)
+    if (defined($Texi2HTML::THISDOC{'SPLIT_SIZE'}) and 
+   $info_state->{'offset_in_file'} > ($info_default_out_file_nr) * 
$Texi2HTML::THISDOC{'SPLIT_SIZE'})
     {
        if ($info_default_out_file_nr == 1)
        {
@@ -2994,7 +2995,7 @@
     my $type = shift;
     my $prefix = shift;
 
-    if ($type eq 'doc' and defined($Texi2HTML::THISDOC{'setfilename'}))
+    if ($type eq 'doc' and defined($Texi2HTML::THISDOC{'setfilename'}) and not 
defined($OUT))
     {
        $Texi2HTML::THISDOC{'extension'} = '';
        return $Texi2HTML::THISDOC{'setfilename'};

Index: test/formatting/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/tests.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- test/formatting/tests.txt   13 Apr 2009 23:06:16 -0000      1.16
+++ test/formatting/tests.txt   26 Apr 2009 15:21:16 -0000      1.17
@@ -40,7 +40,7 @@
 # for makeinfo
 texi ../coverage/formatting.texi -U texi2html
 def_cmds def_cmds.texi
-#def_cmds_info def_cmds.texi -init info.init
+def_cmds_info def_cmds.texi -init info.init
 menus menus.texi
 menus_simple menus.texi -init simple_menu.init
 quotation quotation.texi
@@ -99,4 +99,4 @@
 test_sp_info test_sp.texi -init info.init
 kbdinputstyle_info kbdinputstyle.texi -init info.init
 simple_images_info simple_images.texi -init info.init
-#formatting_info ../coverage/formatting.texi -init info.init
+formatting_info ../coverage/formatting.texi -init info.init -U texi2html

Index: test/formatting/kbdinputstyle.texi
===================================================================
RCS file: test/formatting/kbdinputstyle.texi
diff -N test/formatting/kbdinputstyle.texi
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ test/formatting/kbdinputstyle.texi  26 Apr 2009 15:21:16 -0000      1.1
@@ -0,0 +1,39 @@
+\input texinfo.tex    @c -*-texinfo-*-
+
address@hidden kbdinputstyle.info
+
address@hidden Top
address@hidden Test kbdinputstyle
+
address@hidden codekbdmacro
address@hidden code out of example @code{in nested code}}.
address@hidden out of example}.
address@hidden @kbd{in code}}.
+
+in example
address@hidden
address@hidden code in example @code{in nested code}}.
address@hidden in example}.
address@hidden @kbd{in code} in example}.
address@hidden example
address@hidden macro
+
+@@kbdinputstyle code
+
address@hidden code
+
address@hidden
+
+@@kbdinputstyle example
+
address@hidden example
+
address@hidden
+
+@@kbdinputstyle distinct
+
address@hidden distinct
+
address@hidden
+
address@hidden