[Texi2html-cvs] texi2html ChangeLog doc/texi2html.html examples...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        07/09/11 08:41:24

Modified files:
        .              : ChangeLog 
        doc            : texi2html.html 
        examples       : tex4ht.init 

Log message:
                * examples/tex4ht.init: chdir to the out dir only once.
                Add the texinfo comment at a better place.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.268&r2=1.269
http://cvs.savannah.gnu.org/viewcvs/texi2html/doc/texi2html.html?cvsroot=texi2html&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/tex4ht.init?cvsroot=texi2html&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -b -r1.268 -r1.269
--- ChangeLog   10 Sep 2007 20:53:50 -0000      1.268
+++ ChangeLog   11 Sep 2007 08:41:23 -0000      1.269
@@ -1,3 +1,8 @@
+2007-09-11  Patrice Dumas  <address@hidden>
+
+       * examples/tex4ht.init: chdir to the out dir only once.
+       Add the texinfo comment at a better place.
+
 2007-09-10  Patrice Dumas  <address@hidden>
 
        * texi2html.pl, texi2html.init: avoid content elements being defined

Index: doc/texi2html.html
===================================================================
RCS file: /cvsroot/texi2html/texi2html/doc/texi2html.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- doc/texi2html.html  10 Sep 2007 20:53:55 -0000      1.51
+++ doc/texi2html.html  11 Sep 2007 08:41:23 -0000      1.52
@@ -31,7 +31,7 @@
 permission notice may be stated in a translation approved
 by the Free Software Foundation.
  -->
-<!-- Created on September, 10 2007 by texi2html @PACKAGE_VERSION@ -->
+<!-- Created on September, 11 2007 by texi2html 1.79 -->
 <!--
 Written by: Lionel Cons <address@hidden> (original author)
             Karl Berry  <address@hidden>
@@ -48,7 +48,7 @@
 <meta name="keywords" content="Texi2HTML &ndash; Texinfo to HTML v1.79">
 <meta name="resource-type" content="document">
 <meta name="distribution" content="global">
-<meta name="Generator" content="texi2html @PACKAGE_VERSION@">
+<meta name="Generator" content="texi2html 1.79">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <style type="text/css">
 <!--
@@ -7050,7 +7050,7 @@
 </tr></table>
 <h1>About This Document</h1>
 <p>
-  This document was generated by <em>Patrice Dumas</em> on <em>September, 10 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
@PACKAGE_VERSION@</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>September, 11 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
 </p>
 <p>
   The buttons in the navigation panels have the following meaning:
@@ -7152,7 +7152,7 @@
 <hr size="1">
 <p>
  <font size="-1">
-  This document was generated by <em>Patrice Dumas</em> on <em>September, 10 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
@PACKAGE_VERSION@</em></a>.
+  This document was generated by <em>Patrice Dumas</em> on <em>September, 11 
2007</em> using <a href="http://www.nongnu.org/texi2html/";><em>texi2html 
1.79</em></a>.
  </font>
  <br>
 

Index: examples/tex4ht.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/tex4ht.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- examples/tex4ht.init        9 Sep 2007 20:19:13 -0000       1.3
+++ examples/tex4ht.init        11 Sep 2007 08:41:24 -0000      1.4
@@ -95,7 +95,16 @@
     my $fh = $commands{$command}->{'handle'};
     my $comment = '@c';
     $comment = '%' if ($style ne 'texi');
-    print $fh "$comment Automatically generated\n";
+    $comment .= " Automatically generated\n";
+    if ($style eq 'texi')
+    {
+      print $fh "\\input texinfo
address@hidden $commands{$command}->{'basename'}.info\n";
+      print $fh "$comment";
+    }
+    else
+    {
+      print $fh "$comment";
     if ($style eq 'latex')
     {
       print $fh "\\documentstyle{article}\n\\begin{document}\n";
@@ -104,10 +113,6 @@
     {
       print $fh "\\csname tex4ht\\endcsname\n";
     }
-    elsif ($style eq 'texi')
-    {
-      print $fh "\\input texinfo
address@hidden $commands{$command}->{'basename'}.info\n";
     }
   }
 }
@@ -155,12 +160,24 @@
 {
   foreach my $command ('math', 'tex')
   {
+     tex4ht_finish_latex($command);
+  }
+  unless (chdir $tex4ht_out_dir)
+  {
+     warn "chdir to $tex4ht_out_dir failed\n";
+     $tex4ht_latex_failed = 1;
+     return;
+  }
+  print STDERR "cwd($tex4ht_out_dir):" . Cwd::cwd() ."\n" if 
($Texi2HTML::Config::VERBOSE);
+
+  foreach my $command ('math', 'tex')
+  {
      tex4ht_process_command($command);
   }
   tex4ht_return_to_dir();
 }
 
-sub tex4ht_process_command
+sub tex4ht_finish_latex
 {
 #print STDERR "$style $tex4ht_latex_failed $tex4ht_counter\n";
   my $command = shift;
@@ -181,20 +198,18 @@
      print $fh "address@hidden";
   }
   close ($fh);
+}
 
+sub tex4ht_process_command
+{
+  my $command = shift;
+  my $style = $commands{$command}->{'style'};
   # now run tex4ht
-  unless (chdir $tex4ht_out_dir)
-  {
-     warn "chdir to $tex4ht_out_dir failed\n";
-     $tex4ht_latex_failed = 1;
-     return;
-  }
-  print STDERR "cwd($tex4ht_out_dir):" . cwd() ."\n" if ($VERBOSE);
   my $options = '';
   $options = $tex4ht_options_math if (($style eq 'math') and 
defined($tex4ht_options_math));
   $options = $tex4ht_options_tex if (($style eq 'tex') and 
defined($tex4ht_options_tex));
   my $cmd = "$commands{$command}->{'exec'} $commands{$command}->{'basefile'} 
$options";
-  print STDERR "$cmd" if ($VERBOSE);
+  print STDERR "tex4ht command: $cmd\n" if ($Texi2HTML::Config::VERBOSE);
   if (system($cmd))
   {
      warn "* tex4ht command: $cmd failed";