--- loncom/xml/lontexconvert.pm 2003/02/27 21:01:39 1.19 +++ loncom/xml/lontexconvert.pm 2004/01/28 17:16:27 1.29 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.19 2003/02/27 21:01:39 albertel Exp $ +# $Id: lontexconvert.pm,v 1.29 2004/01/28 17:16:27 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,24 +51,32 @@ use Apache::lonmenu; # ====================================================================== Header +sub init_tth { + my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; + if ($ENV{'browser.mathml'}) { + &tth::ttminit(); + if ($ENV{'browser.unicode'}) { + &tth::ttmoptions('-L -u1 '.$options); + } else { + &tth::ttmoptions('-L -u0 '.$options); + } + } else { + &tth::tthinit(); + if ($ENV{'browser.unicode'}) { + &tth::tthoptions('-L -u1 '.$options); + } else { + &tth::tthoptions('-L -u0 '.$options); + } + } + &Apache::lonnet::logthis("caled and use $options"); + &Apache::lonnet::logthis("caller ".join(':',caller(0))); + +} + sub header { $errorstring=''; my $time=time; - 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'); - } - } + &init_tth(); return &Apache::lonxml::xmlbegin(). &Apache::lonxml::fontsettings(). "\n
\n". @@ -83,7 +91,7 @@ sub converted { my $texstring=shift; my $xmlstring='[UNDISPLAYABLE]'; if ($Apache::lontexconvert::messedup) { - return '[Uncoverted Due To Previous Errors]'; + return '[TeX Unconverted Due To Previous Errors]'; } eval(<<'ENDCONV'); { @@ -97,7 +105,10 @@ sub converted { } else { $xmlstring=&tth::tth($$texstring); $errorstring.=&tth::ttherror(); + $xmlstring=~s---g; } + $xmlstring=~s/^\s*//; + $xmlstring=~s/\s*$//; } ENDCONV if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) { @@ -127,35 +138,55 @@ sub footer { sub to_convert { my ($string) = @_; - $string=~s/\