texinfo/tp/init tex4ht.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/11/02 00:41:05

Modified files:
        tp/init        : tex4ht.pm 

Log message:
        Use correctly the API for warning messages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/tex4ht.pm?cvsroot=texinfo&r1=1.5&r2=1.6

Patches:
Index: tex4ht.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/tex4ht.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- tex4ht.pm   21 Oct 2011 22:59:05 -0000      1.5
+++ tex4ht.pm   2 Nov 2011 00:41:05 -0000       1.6
@@ -117,7 +117,8 @@
     if ($self->{'extra'}->{$command}) {
       local *TEX4HT_TEXFILE;
       unless (open (*TEX4HT_TEXFILE, ">$rfile")) {
-        $self->document_warn ("t2h_tex4ht error opening $rfile: $!");
+        $self->document_warn (sprintf($self->__("tex4ht error opening %s: 
%s"), 
+                                      $rfile, $!));
         return;
       }
       $commands{$command}->{'handle'} = *TEX4HT_TEXFILE;
@@ -207,10 +208,11 @@
 {
   my $self = shift;
   unless (chdir $tex4ht_out_dir) {
-    $self->document_warn ("t2h_tex4ht chdir to $tex4ht_out_dir failed");
+    $self->document_warn(sprintf($self->__("chdir to %s failed"),
+                         $tex4ht_out_dir));
     return;
   }
-  print STDERR "cwd($tex4ht_out_dir):" . Cwd::cwd() ."\n" 
+  print STDERR "cwd($tex4ht_out_dir): " . Cwd::cwd() ."\n" 
     if ($self->get_conf('VERBOSE'));
 
   my $errors = 0;
@@ -218,7 +220,7 @@
     $errors += tex4ht_process_command($self, $command);
   }
   unless (chdir $tex4ht_initial_dir) {
-    die "* tex4ht unable to return to the initial dir\n";
+    die "tex4ht unable to return to the initial dir\n";
   }
 }
 
@@ -228,7 +230,8 @@
   
   return 0 unless ($commands{$command}->{'counter'});
 
-  $self->document_warn("tex4ht_process_command 
$commands{$command}->{'basefile'} missing") 
+  $self->document_warn(sprintf($self->__("tex4ht output %s missing"),
+                               $commands{$command}->{'basefile'}))
     unless (-f $commands{$command}->{'basefile'});
   my $style = $commands{$command}->{'style'};
   # now run tex4ht
@@ -279,7 +282,8 @@
     }
   }
   if ($got_count != $commands{$command}->{'counter'}) {
-    $self->document_warn ("t2h_tex4ht: got $got_count for 
$commands{$command}->{'counter'} items entered");
+    $self->document_warn (sprintf($self->__("tex4ht output got %d for %d items 
entered"), 
+                                  $got_count, 
$commands{$command}->{'counter'}));
   }
   close (TEX4HT_HTMLFILE);
   return 0;
@@ -296,7 +300,8 @@
      $commands{$cmdname}->{'output_counter'}++;
      return $commands{$cmdname}->{'results'}->{$command};
   } else {
-    $self->document_warn ("tex4ht_do_tex: no text for address@hidden 
$command");
+    $self->document_warn (sprintf($self->__("tex4ht output no text for 
address@hidden %s"),
+                                  $cmdname, $command));
     return '';
   }
 }