--- loncom/xml/lontexconvert.pm	2006/04/11 18:42:43	1.72
+++ loncom/xml/lontexconvert.pm	2006/09/05 17:33:11	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.72 2006/04/11 18:42:43 albertel Exp $
+# $Id: lontexconvert.pm,v 1.76 2006/09/05 17:33:11 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,29 +42,35 @@ package Apache::lontexconvert;
 use strict;
 use tth();
 use vars qw($errorstring);
-use Apache::lonmsg();
-use Apache::lonxml();
-use Apache::lonmenu();
+#use Apache::lonxml();
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 # ====================================================================== Header
 
 sub init_tth {
     my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
+    if ($options =~ /\S/) {
+	$options = ' '.$options;
+    } else {
+	undef($options);
+    }
     if ($env{'browser.mathml'}) {
 	&tth::ttminit();
 	if ($env{'browser.unicode'}) {
-	    &tth::ttmoptions('-L -u1 '.$options);
+	    &tth::ttmoptions('-L -u1'.$options);
 	} else {
-	    &tth::ttmoptions('-L -u0 '.$options);
+	    &tth::ttmoptions('-L -u0'.$options);
 	}
     } else {
 	&tth::tthinit();
 	if ($env{'browser.unicode'}) {
-	    &tth::tthoptions('-L -u1 '.$options);
+	    &tth::tthoptions('-L -u1'.$options);
 	} else {
-	    &tth::tthoptions('-L -u0 '.$options);
+	    &tth::tthoptions('-L -u0'.$options);
 	}
     }
 }
@@ -170,13 +176,16 @@ sub jsMath_converted {
 }
 
 {
-    my $jsMath_sent_header;
+    my @jsMath_sent_header;
     sub jsMath_reset {
-	$jsMath_sent_header=0;
+	undef(@jsMath_sent_header);
+    }
+    sub jsMath_push {
+	push(@jsMath_sent_header,0);
     }
     sub jsMath_header {
-	return '' if $jsMath_sent_header;
-	$jsMath_sent_header=1;
+	return '' if $jsMath_sent_header[-1];
+	$jsMath_sent_header[-1]=1;
 	return
             '<script type="text/javascript">
                      function NoFontMessage () {}
@@ -184,13 +193,15 @@ sub jsMath_converted {
 	    '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";
     }
     sub jsMath_process {
-	return '' if !$jsMath_sent_header;
+	my $state = pop(@jsMath_sent_header);
+	return '' if !$state;
 	return '<script type="text/javascript">jsMath.Process()</script>';
     }
 }
 
 sub init_math_support {
-    &Apache::lontexconvert::jsMath_reset();
+    &init_tth();
+    &Apache::lontexconvert::jsMath_push();
     if ($env{'environment.texengine'} eq 'jsMath' ||
 	$env{'form.texengine'}        eq 'jsMath' ) {
 	return &Apache::lontexconvert::jsMath_header();
@@ -207,7 +218,7 @@ sub mimetex_converted {
     if ($displaystyle) {
 	$$texstring='\\displaystyle \\Large '.$$texstring;
     }
-    my $result='<img src="/cgi-bin/mimetex.cgi?'.&Apache::lonnet::escape($$texstring).'" />';
+    my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />';
     if ($displaystyle) {
 	$result='<center>'.$result.'</center>';
     }