--- loncom/xml/londefdef.pm	2002/05/09 15:44:43	1.57
+++ loncom/xml/londefdef.pm	2002/05/09 18:55:47	1.58
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.57 2002/05/09 15:44:43 sakharuk Exp $
+# $Id: londefdef.pm,v 1.58 2002/05/09 18:55:47 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1384,10 +1384,28 @@ EDITBUTTON
             $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
                                         $token->[2]->{'src'};
             my $currentstring = '';
+	    my $width_param = '';
 
 	    if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
+	      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; 
+	      } else {
+		  if ($width ne '') {
+		      $width_param = $width*.3;
+		      if ($width_param <= 900) {
+			  $width_param = '[width='.$width_param.'mm]';
+		      } else {
+			  $width_param = '[width= 9.0 cm]';
+		      }
+		  }
+	      }
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	      my $file;
@@ -1401,14 +1419,14 @@ EDITBUTTON
 		  $file=~s/(\.gif|\.jpg)$/\.eps/;
 	      if (-e $newsrc) {
 		  if ($path) {
-		      $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics{'.$file.'}}';
+		      $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
 		  }
 	      } else {
 		  my $temp_file;
 		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat";
 		  $temp_file = Apache::File->new('>>'.$filename); 
 		  print $temp_file "$src\n";
-		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics{'.$file.'}}';
+		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
 	      }
 	    }
 	    return $currentstring;