--- loncom/xml/londefdef.pm	2003/10/24 21:48:17	1.189
+++ loncom/xml/londefdef.pm	2004/01/28 17:16:27	1.194
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.189 2003/10/24 21:48:17 albertel Exp $
+# $Id: londefdef.pm,v 1.194 2004/01/28 17:16:27 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -82,11 +82,11 @@ sub end_output {
 }
 #-- <m> tag
 sub start_m {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';
-    if ($target eq 'web') {
+    my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+    if ($target eq 'web' || $target eq 'analyze') {
 	$Apache::lonxml::prevent_entity_encode++;
-	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
 	$inside ='\\documentstyle{article}'.$inside;
 	&Apache::lonxml::debug("M is starting with:$inside:");
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
@@ -103,15 +103,13 @@ sub start_m {
 	#&Apache::lonxml::debug("M is ends with:$currentstring:");
 	$Apache::lonxml::post_evaluate=0;
     } elsif ($target eq 'tex') {
-	$currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
+	$currentstring = $inside;
 	my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
 	if ($eval eq 'on') {
 	    $currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]);
 	}
 	if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';}
 	$Apache::lonxml::post_evaluate=0;
-    } else {
-	my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
     }
     return $currentstring;
 }
@@ -153,21 +151,8 @@ sub end_tthoption {
 sub start_html {
     my ($target,$token) = @_;
     my $currentstring = '';
-    if ($ENV{'browser.mathml'}) {
-	&tth::ttminit();
-	if ($ENV{'browser.unicode'}) {
-	    &tth::ttmoptions('-L -u1');
-	} else {
-	    &tth::ttmoptions('-L -u0');
-	}
-    } else {
-	&tth::tthinit();
-	if ($ENV{'browser.unicode'}) {
-	    &tth::tthoptions('-L -u1');
-	} else {
-	    &tth::tthoptions('-L -u0');
-	}
-    }
+    my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};
+    &init_tth();
     if ($target eq 'web' || $target eq 'edit') {
 	$currentstring = &Apache::lonxml::xmlbegin().
 	    &Apache::lonxml::fontsettings();     
@@ -2119,7 +2104,7 @@ sub start_img {
 	$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	&image_replication($src);
 	#if original gif/jpg/png file exist do following:
-	if (-e $src) {          
+	if (-e $src) {
 	    #defines the default size of image
 	    my $image = Image::Magick->new;
 	    my $current_figure = $image->Read($src);
@@ -2174,6 +2159,8 @@ sub start_img {
 		    $temp_file = Apache::File->new('>>'.$filename); 
 		    print $temp_file "$src\n";
 		    $newsrc=~s/\/home\/httpd\/html\/res//;
+		    $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
+		    $newsrc=~s/\/\.\//\//;
 		    $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
 		    $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 		}