--- loncom/xml/londefdef.pm 2004/01/08 19:49:59 1.192 +++ 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.192 2004/01/08 19:49:59 sakharuk Exp $ +# $Id: londefdef.pm,v 1.194 2004/01/28 17:16:27 albertel Exp $ # # # Copyright Michigan State University Board of Trustees @@ -84,8 +84,7 @@ sub end_output { sub start_m { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; my $currentstring = ''; - my $inside = &Apache::lonxml::get_all_text("/m",$parser,$style); - $inside=~s---g; + my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); if ($target eq 'web' || $target eq 'analyze') { $Apache::lonxml::prevent_entity_encode++; $inside ='\\documentstyle{article}'.$inside; @@ -152,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();