--- loncom/interface/lonpreferences.pm	2005/02/25 05:54:01	1.54
+++ loncom/interface/lonpreferences.pm	2005/03/22 17:15:22	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.54 2005/02/25 05:54:01 albertel Exp $
+# $Id: lonpreferences.pm,v 1.58 2005/03/22 17:15:22 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -172,7 +172,6 @@ sub verify_and_change_languages {
         $message='Reset preferred language';
     }
     $r->print(<<ENDVCSCREEN);
-</p>
 $message
 ENDVCSCREEN
 }
@@ -190,9 +189,9 @@ sub texenginechanger {
     my $pref=&mt('Preferred method to display Math');
     my %mathchoices=('' => 'No Preference',
 		     'tth' => 'TeX to HTML',
-		     #'ttm' => 'TeX to MathML',
+		     'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
-		     #'mimetex' => 'Convert to Images'
+		     'mimetex' => 'Convert to Images'
                      );
     my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine',
 						     %mathchoices);
@@ -200,6 +199,8 @@ sub texenginechanger {
     my $jsMath_example=&Apache::lontexconvert::jsMath_converted(\$mathexample);
     $mathexample='$$\int\left(\frac{a+b}{c^6*d}\right)$$';
     my $tth_example=&Apache::lontexconvert::tth_converted(\$mathexample);
+    $mathexample='$$\int\left(\frac{a+b}{c^6*d}\right)$$';
+    my $mimetex_example=&Apache::lontexconvert::mimetex_converted(\$mathexample);
     my $change=&mt('Change');
     $r->print(<<ENDLSCREEN);
 <form name="server" action="/adm/preferences" method="post">
@@ -209,11 +210,11 @@ sub texenginechanger {
 </form>
 Examples:
 <p> TeX to HTML <br /> $tth_example</p>
-<script type"text/javascript">function NoFontMessage () { }</script>
+<script type="text/javascript">function NoFontMessage () { }</script>
 <script src="/adm/jsMath/jsMath.js"></script>
 <p>jsMath <br /> 
 
-<script type"text/javascript">
+<script type="text/javascript">
 if (jsMath.nofonts == 1) {
     document.writeln
         ('<center><div style="padding: 10; border-style: solid; border-width:3;'
@@ -231,8 +232,11 @@ if (jsMath.nofonts == 1) {
 </script>
 
 $jsMath_example</p>
-<script type="text/javascript">jsMath.Process()</script>
+<p> Convert to Images <br /> $mimetex_example</p>
 ENDLSCREEN
+    if ($ENV{'environment.texengine'} ne 'jsMath') {
+	$r->print('<script type="text/javascript">jsMath.Process()</script>');
+    }
 }
 
 
@@ -243,6 +247,13 @@ sub verify_and_change_texengine {
 # Screenname
     my $newtexengine  = $ENV{'form.texengine'};
     $newtexengine=~s/[^\-\w]//g;
+    if ($newtexengine eq 'ttm') {
+	&Apache::lonnet::appenv('browser.mathml' => 1);
+    } else {
+	if ($ENV{'environment.texengine'} eq 'ttm') {
+	    &Apache::lonnet::appenv('browser.mathml' => 0);
+	}
+    }
     my $message='';
     if ($newtexengine) {
         &Apache::lonnet::put('environment',{'texengine' => $newtexengine});
@@ -253,8 +264,9 @@ sub verify_and_change_texengine {
         &Apache::lonnet::delenv('environment\.texengine');
         $message='Reset preferred math display.';
     }
+
+
     $r->print(<<ENDVCSCREEN);
-</p>
 $message
 ENDVCSCREEN
 }
@@ -330,7 +342,6 @@ sub verify_and_change_rolespref {
     }
 
     $r->print(<<ENDRPSCREEN);
-</p>
 $message
 ENDRPSCREEN
 }
@@ -392,7 +403,6 @@ sub verify_and_change_screenname {
     }
 
     $r->print(<<ENDVCSCREEN);
-</p>
 $message
 ENDVCSCREEN
 }
@@ -482,7 +492,6 @@ sub verify_and_change_msgforward {
         $message.='Reset critical message notification<br />';
     }
     $r->print(<<ENDVCMSG);
-</p>
 $message
 ENDVCMSG
 }
@@ -605,7 +614,6 @@ sub verify_and_change_colors {
 	}
     }
     $r->print(<<ENDVCCOL);
-</p>
 $message
 <form name="client" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="changecolors" />
@@ -960,7 +968,6 @@ sub verify_and_change_discussion {
         }
     }
     $r->print(<<ENDVCSCREEN);
-</p>
 $message
 ENDVCSCREEN
 }