--- loncom/xml/londefdef.pm	2002/07/30 14:10:51	1.79
+++ loncom/xml/londefdef.pm	2002/07/31 14:55:56	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.79 2002/07/30 14:10:51 sakharuk Exp $
+# $Id: londefdef.pm,v 1.80 2002/07/31 14:55:56 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1526,71 +1526,80 @@ EDITBUTTON
 	    } elsif ($target eq 'tex') {
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-              my $image = Image::Magick->new;
-              my $current_figure = $image->Read($src);
-              $width_param = $image->Get('width') * $scaling;;
-	      $height_param = $image->Get('height') * $scaling;;
-	      undef $image;
-	      my $epssrc = $src;
-	      $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-	      if (not -e $epssrc) {
-		  my $localfile = $epssrc;
-		  $localfile =~ s/.*(\/res)/$1/;	
+              if (-e $src) {          #new one
+		  my $image = Image::Magick->new;
+		  my $current_figure = $image->Read($src);
+		  $width_param = $image->Get('width') * $scaling;;
+		  $height_param = $image->Get('height') * $scaling;;
+		  undef $image;
+		  my $epssrc = $src;
+		  $epssrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+		  if (not -e $epssrc) {
+		      my $localfile = $epssrc;
+		      $localfile =~ s/.*(\/res)/$1/;	
+		      my $file;
+		      my $path;	
+		      if ($localfile =~ m!(.*)/([^/]*)$!) {
+			  $file = $2;
+			  $path = $1.'/'; 
+		      }	
+		      my $signal_eps = 0;
+		      my @content_directory = &Apache::lonnet::dirlist($path);
+		      for (my $iy=0;$iy<=$#content_directory;$iy++) {
+			  my @tempo_array = split(/&/,$content_directory[$iy]);
+			  $content_directory[$iy] = $tempo_array[0];
+			  if ($file eq $tempo_array[0]) {
+			      $signal_eps = 1;
+			      last;
+			  }
+		      }
+		      if ($signal_eps) {
+			  my $eps_file = &Apache::lonnet::getfile($localfile);
+		      } else {
+			  $localfile = $src;
+			  $localfile =~ s/.*(\/res)/$1/;	
+			  my $as = &Apache::lonnet::getfile($src);		      
+		      }
+		  }
 		  my $file;
 		  my $path;	
-		  if ($localfile =~ m!(.*)/([^/]*)$!) {
-		      $file = $2;
-		      $path = $1.'/'; 
-		  }	
-		  my $signal_eps = 0;
-		  my @content_directory = &Apache::lonnet::dirlist($path);
-		  for (my $iy=0;$iy<=$#content_directory;$iy++) {
-		      my @tempo_array = split(/&/,$content_directory[$iy]);
-		      $content_directory[$iy] = $tempo_array[0];
-		      if ($file eq $tempo_array[0]) {
-			  $signal_eps = 1;
-			  last;
-		      }
+		  if ($src =~ m!(.*)/([^/]*)$!) {
+		      $file = $2; 
+		      $path = $1.' /'; 
+		  } 
+		  my $newsrc = $src;
+		  $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+		  $file=~s/(\.gif|\.jpg)$/\.eps/i;
+		  #do we have any specified size of the picture?
+		  my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
+		  my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
+		  my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
+		  if ($TeXwidth ne '') { 
+		      $width_param = $TeXwidth; 
+		  } elsif ($TeXheight ne '') { 
+		      $width_param = $TeXheight/$height_param*$width_param;
+		  } elsif ($width ne '') {
+		      $width_param = $width*$scaling;      
 		  }
-		  if ($signal_eps) {
-		      my $eps_file = &Apache::lonnet::getfile($localfile);
+		  #where can we find the picture?
+		  if (-e $newsrc) {
+		      if ($path) {
+			  $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+		      }
 		  } else {
-		      $localfile = $src;
-		      $localfile =~ s/.*(\/res)/$1/;	
-		      my $as = &Apache::lonnet::getfile($src);		      
-		  }
-	      }
-	      my $file;
-	      my $path;	
-              if ($src =~ m!(.*)/([^/]*)$!) {
-		  $file = $2;
-		  $path = $1.'/'; 
-	      }
-	      my $newsrc = $src;
-	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-	      $file=~s/(\.gif|\.jpg)$/\.eps/i;
-              #do we have any specified size of the picture?
-	      my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
-              my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
-	      my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
-	      if ($TeXwidth ne '') { 
-		  $width_param = $TeXwidth; 
-	      } elsif ($TeXheight ne '') { 
-		  $width_param = $TeXheight/$height_param*$width_param;
-	      } elsif ($width ne '') {
-		  $width_param = $width*$scaling;      
-	      }
-              #where can we find the picture?
-	      if (-e $newsrc) {
-		  if ($path) {
-		      $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+		      my $temp_file;
+		      my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
+		      $temp_file = Apache::File->new('>>'.$filename); 
+		      print $temp_file "$src\n";
+		      $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
 		  }
 	      } else {
-		  my $temp_file;
-		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
-		  $temp_file = Apache::File->new('>>'.$filename); 
-		  print $temp_file "$src\n";
-		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+		  my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+                  if ($alt) {
+		      $currentstring .= ' '.$alt.' ';
+		  } else {
+                      $currentstring .= ' THE ORIGINAL PROBLEM CONTAINS EMPTY IMG TAG WITHOUT IMAGE ';
+		  }
 	      }
 	    }
 	    return $currentstring;