[Texi2html-cvs] Changes to texi2html/texi2html.pl

[Patrice Dumas]

Index: texi2html/texi2html.pl
diff -u texi2html/texi2html.pl:1.153 texi2html/texi2html.pl:1.154
--- texi2html/texi2html.pl:1.153        Tue Nov 29 19:04:25 2005
+++ texi2html/texi2html.pl      Thu Dec  1 08:38:40 2005
@@ -62,7 +62,7 @@
 
#--##############################################################################
 
 # CVS version:
-# $Id: texi2html.pl,v 1.153 2005/11/29 19:04:25 pertusus Exp $
+# $Id: texi2html.pl,v 1.154 2005/12/01 08:38:40 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -2809,60 +2809,6 @@
     return ($imports, $rules);
 }
 
-my @css_import_lines;
-my @css_rule_lines;
-
-# process css files
-foreach my $file (@Texi2HTML::Config::CSS_FILES)
-{
-    my $css_file_fh;
-    my $css_file;
-    if ($file eq '-')
-    {
-        $css_file_fh = \*STDIN;
-        $css_file = '-';
-    }
-    else
-    {
-         $css_file = locate_init_file ($file);
-         unless (defined($css_file))
-         {
-             warn "css file $file not found\n";
-             next;
-         }
-         unless (open (CSSFILE, "$css_file"))
-         {
-             warn "Cannot open ${css_file}: $!";
-             next;
-        }
-        $css_file_fh = \*CSSFILE;
-    }
-    my ($import_lines, $rules_lines);
-    ($import_lines, $rules_lines) = process_css_file ($css_file_fh, $css_file);
-    push @css_import_lines, @$import_lines;
-    push @css_rule_lines, @$rules_lines;
-}
-
-if ($T2H_DEBUG & $DEBUG_USER)
-{
-    if (@css_import_lines)
-    {
-        print STDERR "# css import lines\n";
-        foreach my $line (@css_import_lines)
-        {
-            print STDERR "$line";
-        }
-    }
-    if (@css_rule_lines)
-    {
-        print STDERR "# css rule lines\n";
-        foreach my $line (@css_rule_lines)
-        {
-            print STDERR "$line";
-        }
-    }
-}
-
 #
 # read texi2html extensions (if any)
 # It is obsolete (obsoleted by -init-file). we keep it for backward
@@ -12053,6 +11999,64 @@
 {
     &$handler;
 }
+
+my @css_import_lines;
+my @css_rule_lines;
+
+# process css files
+foreach my $file (@Texi2HTML::Config::CSS_FILES)
+{
+    my $css_file_fh;
+    my $css_file;
+    if ($file eq '-')
+    {
+        $css_file_fh = \*STDIN;
+        $css_file = '-';
+    }
+    else
+    {
+         $css_file = locate_init_file ($file);
+         unless (defined($css_file))
+         {
+             warn "css file $file not found\n";
+             next;
+         }
+         unless (open (CSSFILE, "$css_file"))
+         {
+             warn "Cannot open ${css_file}: $!";
+             next;
+        }
+        $css_file_fh = \*CSSFILE;
+    }
+    my ($import_lines, $rules_lines);
+    ($import_lines, $rules_lines) = process_css_file ($css_file_fh, $css_file);
+    push @css_import_lines, @$import_lines;
+    push @css_rule_lines, @$rules_lines;
+}
+
+$Texi2HTML::THISDOC{'css_import_lines'} = address@hidden;
+$Texi2HTML::THISDOC{'css_lines'} = address@hidden;
+
+if ($T2H_DEBUG & $DEBUG_USER)
+{
+    if (@css_import_lines)
+    {
+        print STDERR "# css import lines\n";
+        foreach my $line (@css_import_lines)
+        {
+            print STDERR "$line";
+        }
+    }
+    if (@css_rule_lines)
+    {
+        print STDERR "# css rule lines\n";
+        foreach my $line (@css_rule_lines)
+        {
+            print STDERR "$line";
+        }
+    }
+}
+
 pass_texi();
 dump_texi(address@hidden, 'texi', address@hidden) if ($T2H_DEBUG & 
$DEBUG_TEXI);
 if (defined($Texi2HTML::Config::MACRO_EXPAND))
@@ -12098,7 +12102,6 @@
     $copying_comment = 
&$Texi2HTML::Config::copying_comment($region_lines{'copying'});
 }
 &$Texi2HTML::Config::toc_body(address@hidden);
-&$Texi2HTML::Config::css_lines(address@hidden, address@hidden);
 $sec_num = 0;
 
 #Texi2HTML::LaTeX2HTML::latex2html();
@@ -12106,6 +12109,9 @@
 {
     &$handler;
 }
+
+&$Texi2HTML::Config::css_lines(address@hidden, address@hidden);
+
 pass_text();
 foreach my $special (keys(%special_commands))
 {