--- loncom/xml/lontexconvert.pm 2002/11/09 22:05:33 1.13 +++ loncom/xml/lontexconvert.pm 2003/02/26 20:22:11 1.18 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.13 2002/11/09 22:05:33 albertel Exp $ +# $Id: lontexconvert.pm,v 1.18 2003/02/26 20:22:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,7 +37,6 @@ # to any other parties under any circumstances. # # 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer -# 05/03/2001 Scott Harrison # 5/4 Gerd Kortemeyer package Apache::lontexconvert; @@ -47,6 +46,7 @@ use tth; use vars qw($errorstring); use Apache::lonmsg; use Apache::lonxml; +use Apache::lonmenu; # ====================================================================== Header @@ -71,7 +71,7 @@ sub header { return &Apache::lonxml::xmlbegin(). &Apache::lonxml::fontsettings(). "\n\n". - &Apache::lonxml::registerurl(undef,'tex'). + &Apache::lonmenu::registerurl(undef,'tex'). "\n\n"; } @@ -117,26 +117,33 @@ sub footer { sub to_convert { my ($string) = @_; $string=~s/\/ /g; + $string=&HTML::Entities::decode($string); return &converted(\$string); } sub msgtexconverted { my $message=shift; - #FIXME this crap needs to go but right now the -L option might be - #ignored if this isn;t the first time the tth engine is used - #thus the \\document class crap, it makes sure we init the LaTeX stuff + $errorstring=''; if ($ENV{'browser.mathml'}) { - &tth::ttminit(); - &tth::ttmoptions("-L"); + &tth::ttminit(); + if ($ENV{'browser.unicode'}) { + &tth::ttmoptions('-L -u1'); + } else { + &tth::ttmoptions('-L -u0'); + } } else { - &tth::tthinit(); - &tth::tthoptions("-L"); + &tth::tthinit(); + if ($ENV{'browser.unicode'}) { + &tth::tthoptions('-L -u1'); + } else { + &tth::tthoptions('-L -u0'); + } } - $message=~s/(\$\$.+?\$\$)/&to_convert("\\documentclass{article}".$1)/ge; - $message=~s/(\$.+?\$)/&to_convert("\\documentclass{article}".$1)/ge; - $message=~s/(\\\(.+?\\\))/&to_convert("\\documentclass{article}".$1)/ge; - $message=~s/(\\\[.+?\\\])/&to_convert("\\documentclass{article}".$1)/ge; + $message=~s/(\$\$.+?\$\$)/&to_convert($1)/ge; + $message=~s/(\$.+?\$)/&to_convert($1)/ge; + $message=~s/(\\\(.+?\\\))/&to_convert($1)/ge; + $message=~s/(\\\[.+?\\\])/&to_convert($1)/ge; return $message.$errorstring; }