[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl
|
From: |
Patrice Dumas |
|
Subject: |
[Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl |
|
Date: |
Wed, 03 Oct 2007 08:44:01 +0000 |
CVSROOT: /cvsroot/texi2html
Module name: texi2html
Changes by: Patrice Dumas <pertusus> 07/10/03 08:44:01
Modified files:
. : ChangeLog texi2html.init texi2html.pl
Log message:
* texi2html.pl, texi2html.init: use relative file names for
frame
file names (report from Graham Percival).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.274&r2=1.275
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.189&r2=1.190
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -b -r1.274 -r1.275
--- ChangeLog 3 Oct 2007 07:39:29 -0000 1.274
+++ ChangeLog 3 Oct 2007 08:44:00 -0000 1.275
@@ -1,3 +1,8 @@
+2007-10-03 Patrice Dumas <address@hidden>
+
+ * texi2html.pl, texi2html.init: use relative file names for frame
+ file names (report from Graham Percival).
+
2007-10-02 Patrice Dumas <address@hidden>
* texi2html.pl, T2h_i18n.pm: keep the state in the global hash
Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- texi2html.init 3 Oct 2007 07:39:29 -0000 1.123
+++ texi2html.init 3 Oct 2007 08:44:00 -0000 1.124
@@ -12,7 +12,7 @@
# Afterwards, load the file with command-line
# option -init-file <your_init_file>
#
-# $Id: texi2html.init,v 1.123 2007/10/03 07:39:29 pertusus Exp $
+# $Id: texi2html.init,v 1.124 2007/10/03 08:44:00 pertusus Exp $
######################################################################
# The following variables can also be set by command-line options
@@ -1306,13 +1306,16 @@
######################################################################
# Frames: this is from "Richard Y. Kim" <address@hidden>
# Should be improved to be more conforming to other _print* functions
-# FIXME pass toc_file and main_file as args or in $Texi2HTML::THISDOC ?
+# toc_file and main_file passed as args are relative to the texinfo manual
+# location, and therefore are not used.
sub T2H_DEFAULT_print_frame
{
my $fh = shift;
my $toc_file = shift;
my $main_file = shift;
+ $main_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
+ $toc_file = $Texi2HTML::THISDOC{'filename'}->{'toc_frame'};
print $fh <<EOT;
$FRAMESET_DOCTYPE
<html>
Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- texi2html.pl 3 Oct 2007 07:39:29 -0000 1.189
+++ texi2html.pl 3 Oct 2007 08:44:01 -0000 1.190
@@ -60,7 +60,7 @@
#--##########################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.189 2007/10/03 07:39:29 pertusus Exp $
+# $Id: texi2html.pl,v 1.190 2007/10/03 08:44:01 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -2928,6 +2928,21 @@
# Note that file extension has already been added here.
+
+my $docu_doc_file = "$docu_rdir$docu_doc";
+my $docu_toc_file = "$docu_rdir$docu_toc";
+my $docu_stoc_file = "$docu_rdir$docu_stoc";
+my $docu_foot_file = "$docu_rdir$docu_foot";
+my $docu_about_file = "$docu_rdir$docu_about";
+my $docu_top_file = "$docu_rdir$docu_top";
+
+my $docu_frame = "${docu_name}_frame";
+$docu_frame .= ".$docu_ext" if $docu_ext;
+my $docu_frame_file = "$docu_rdir$docu_frame";
+my $docu_toc_frame = "${docu_name}_toc_frame";
+$docu_toc_frame .= ".$docu_ext" if $docu_ext;
+my $docu_toc_frame_file = "$docu_rdir$docu_toc_frame";
+
# For use in init files
$Texi2HTML::THISDOC{'filename'}->{'top'} = $docu_top;
$Texi2HTML::THISDOC{'filename'}->{'foot'} = $docu_foot;
@@ -2936,22 +2951,11 @@
$Texi2HTML::THISDOC{'filename'}->{'toc'} = $docu_toc;
$Texi2HTML::THISDOC{'extension'} = $docu_ext;
# FIXME document that
+$Texi2HTML::THISDOC{'filename'}->{'toc_frame'} = $docu_toc_frame;
+$Texi2HTML::THISDOC{'filename'}->{'frame'} = $docu_frame;
$Texi2HTML::THISDOC{'out_dir'} = $docu_rdir;
$Texi2HTML::THISDOC{'file_base_name'} = $docu_name;
-
-my $docu_doc_file = "$docu_rdir$docu_doc";
-my $docu_toc_file = "$docu_rdir$docu_toc";
-my $docu_stoc_file = "$docu_rdir$docu_stoc";
-my $docu_foot_file = "$docu_rdir$docu_foot";
-my $docu_about_file = "$docu_rdir$docu_about";
-my $docu_top_file = "$docu_rdir$docu_top";
-
-my $docu_frame_file = "$docu_rdir${docu_name}_frame";
-$docu_frame_file .= ".$docu_ext" if $docu_ext;
-my $docu_toc_frame_file = "$docu_rdir${docu_name}_toc_frame";
-$docu_toc_frame_file .= ".$docu_ext" if $docu_ext;
-
#
# _foo: internal variables to track @foo
#
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Texi2html-cvs] texi2html ChangeLog texi2html.init texi2html.pl,
Patrice Dumas <=