--- loncom/xml/londefdef.pm	2005/02/09 15:56:45	1.254
+++ loncom/xml/londefdef.pm	2005/03/01 03:21:58	1.259
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.254 2005/02/09 15:56:45 www Exp $
+# $Id: londefdef.pm,v 1.259 2005/03/01 03:21:58 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -84,7 +84,6 @@ sub start_m {
     my $currentstring = '';
     my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
     if ($target eq 'web' || $target eq 'analyze') {
-	$inside ='\\documentstyle{article}'.$inside;
 	&Apache::lonxml::debug("M is starting with:$inside:");
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
 	if ($eval eq 'on') {
@@ -106,6 +105,13 @@ sub start_m {
 	    $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
 	}
 	if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
+	# detect simple math mode entry exits, and convert them
+        # to use \ensuremath
+	if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) {
+	    $currentstring=~s/^\$//;
+	    $currentstring=~s/\$$//;
+	    $currentstring='\ensuremath{'.$currentstring.'}';
+	}
 	$Apache::lonxml::post_evaluate=0;
     }
     return $currentstring;
@@ -178,7 +184,7 @@ sub end_html {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
-	$currentstring = &Apache::lonxml::xmlend($target,$parser);
+	$currentstring = '</html>';
     }
     return $currentstring;
 }
@@ -558,10 +564,10 @@ EDITBUTTON
 }
 
 sub end_body {
-    my ($target,$token) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = '';
     if ($target eq 'web') {
-	$currentstring = $token->[2];     
+	$currentstring = &Apache::lonxml::xmlend($target,$parser);
     } elsif ($target eq 'tex') {
 	$currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}';  
     } 
@@ -2491,40 +2497,15 @@ sub start_img {
 	}
 	&Apache::lonxml::debug("LaTeX rendering = $latex_rendering");
 
-	my $oldSRC=$src;
-        $oldSRC=~s/\.(gif|jpg|png)$/\.eps/;
-	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	#if original gif/jpg/png file exist do following:
+	my ($path,$file) = &get_eps_image($src);
+	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	if (-e $src) {
-	    #what is the image size?
-	    my $width_param=&image_width($src,$scaling,$parstack,$safeeval);
-	    my $height_param=&image_height($src,$scaling,$parstack,$safeeval);
-            my ($file,$path)=&file_path($src); 
-	    my $newsrc = $src;
-	    $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;
-	    &Apache::lonnet::repcopy($oldSRC);
-	    $file=~s/\.(gif|jpg|png)$/.eps/i;
-	    #where can we find the picture?
-	    if (-e $newsrc) {
-		#eps counterpart for image exist 
-		if ($path) {
-		    $currentstring .= '\graphicspath{{'.$path.'}}'
-			             .'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} ';
-		}
-	    } else {
-		#there is no eps counterpart for image - check for ps one
-		$newsrc =~ s/\.eps$/\.ps/;
-		if (-e $newsrc) {
-		    #ps counterpart for image exist 
-		    $file =~ s/\.eps$/\.ps/;
-		    if ($path) {
-			$currentstring .= '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
-		    }
-		} else {
-		    #care about eps dynamical generation
-		    $currentstring.=&eps_generation($src,$file,$width_param);
-		}
-	    }
+	    my ($height_param,$width_param)=
+		&image_size($src,0.3,$parstack,$safeeval);
+	    $currentstring .= '\graphicspath{{'.$path.'}}'
+		.'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} ';
+
 	    #    If there's an alignment specification we need to honor it here.
 	    #    For the horizontal alignments, we will also honor the
 	    #    value of the latex specfication.  The default is parbox,
@@ -2542,7 +2523,8 @@ sub start_img {
 		if ($latex_rendering eq "parpic") { 
 		    $currentstring = '\parpic[l]{'.$currentstring.'}';
 		} else {    	                                 # parbox rendering
-		    $currentstring = "\n".'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
+		    $currentstring = "\\strut\\newline\n".
+			'\parbox{'.$width_param.'mm}{'.$currentstring.'}';
 		}
 	    } elsif ($align eq "right")  {   
 		if ($latex_rendering eq "parpic") {
@@ -2562,17 +2544,11 @@ sub start_img {
 		$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src);
 	    }
 
-	    if ($alt) {
-		$currentstring .= ' '.$alt.' ';
-	    } else {
-		#<allow> tag will care about replication 
-	    }
+	    if ($alt) { $currentstring .= ' '.$alt.' '; }
 	}
 
 	# And here's where the semi-quote breaks down: allow the user
         # to edit the beast as well by rendering the problem for edit:
-
-
     } elsif ($target eq 'edit') {
 	$currentstring .=&Apache::edit::tag_start($target,$token);
 	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
@@ -3779,20 +3755,25 @@ sub image_replication {
 }
 
 sub image_size {
-    my ($src,$scaling,$parstack,$safeeval)=@_;
+    my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_;
     #size of image from gif/jpg/jpeg/png 
+    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     my $image = Image::Magick->new;
     my $current_figure = $image->Read($src);
     my $width_param = $image->Get('width') * $scaling;;
     my $height_param = $image->Get('height') * $scaling;;
-    undef $image;
+    undef($image);
     #do we have any specified LaTeX size of the picture?
-    my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
-    my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
+    my $toget='TeXwidth'; if ($cis) { $toget=lc($toget); }
+    my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack,
+					      $safeeval,$depth,$cis);
+    $toget='TeXheight'; if ($cis) { $toget=lc($toget); }
+    my $TeXheight = &Apache::lonxml::get_param($toget,$parstack,
+					       $safeeval,$depth,$cis);
     #do we have any specified web size of the picture?
     my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
-					   undef,1);
-    if ($TeXwidth ne '') {  
+					   $depth,1);
+    if ($TeXwidth) { 
 	my $old_width_param=$width_param;
 	if ($TeXwidth=~/(\d+)\s*\%/) {
 	    $width_param = $1*$ENV{'form.textwidth'}/100;
@@ -3800,12 +3781,12 @@ sub image_size {
 	    $width_param = $TeXwidth;
 	}
 	$height_param=$TeXwidth/$old_width_param*$height_param;
-    } elsif ($TeXheight ne '') {
+    } elsif ($TeXheight) {
 	$height_param = $TeXheight;
 	$width_param  = $TeXheight/$height_param*$width_param;
-    } elsif ($width ne '') {
+    } elsif ($width) {
 	my $old_width_param=$width_param;
-	$width_param = $width*$scaling;      
+	$width_param = $width*$scaling;
         $height_param=$width_param/$old_width_param*$height_param;
     }
     if ($width_param > $ENV{'form.textwidth'}) {
@@ -3828,6 +3809,34 @@ sub image_height {
     return $height;
 }
 
+sub get_eps_image {
+    my ($src)=@_;
+    my $orig_src=$src;
+    $src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i;
+    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+    if (! -e $src) {
+	if (&Apache::lonnet::repcopy($src) ne OK ) {
+	    #if replication failed try to find ps file
+	    $src=~s/\.eps$/\.ps/;
+	    #if no ps file try to replicate it
+	    if (not -e $src &&
+		&Apache::lonnet::repcopy($src) ne OK) {
+		#if replication failed try to produce eps file dynamically
+		$src=~s/\.ps$/\.eps/;
+		my $temp_file;
+		open(FILE,">>/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat");
+		my $newsrc=$orig_src;
+		$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|;
+		print FILE "$newsrc\n";
+		$src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
+		$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
+	    }
+	}
+    }
+    my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
+    return ($path.'/',$file);
+}
+
 sub eps_generation {
     my ($src,$file,$width_param) = @_;	     
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";