--- loncom/xml/lontexconvert.pm 2002/10/28 20:40:25 1.12 +++ loncom/xml/lontexconvert.pm 2003/06/23 21:28:59 1.24 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.12 2002/10/28 20:40:25 www Exp $ +# $Id: lontexconvert.pm,v 1.24 2003/06/23 21:28:59 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; @@ -45,8 +44,10 @@ package Apache::lontexconvert; use strict; use tth; use vars qw($errorstring); +use Apache(); use Apache::lonmsg; use Apache::lonxml; +use Apache::lonmenu; # ====================================================================== Header @@ -55,24 +56,38 @@ sub header { 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'); + } } return &Apache::lonxml::xmlbegin(). &Apache::lonxml::fontsettings(). "\n\n". - &Apache::lonxml::registerurl(undef,'tex'). + &Apache::lonmenu::registerurl(undef,'tex'). "\n\n"; } # ================================================================== Conversion +$Apache::lontexconvert::messedup=0; sub converted { my $texstring=shift; my $xmlstring='[UNDISPLAYABLE]'; + if ($Apache::lontexconvert::messedup) { + return '[TeX Uncoverted Due To Previous Errors]'; + } eval(<<'ENDCONV'); - { - local $SIG{SEGV}=sub { die; }; + { + local $SIG{SEGV}=sub { $Apache::lontexconvert::messedup=1; die; }; if ($ENV{'browser.mathml'}) { $xmlstring=&tth::ttm($$texstring); $xmlstring=~s/\/\/g; @@ -83,8 +98,16 @@ sub converted { $xmlstring=&tth::tth($$texstring); $errorstring.=&tth::ttherror(); } + $xmlstring=~s/^\s*//; + $xmlstring=~s/\s*$//; } ENDCONV + if ($Apache::lontexconvert::messedup || &tth::tthmessedup()) { + &Apache::lonnet::logthis("Trying to kill myself"); + $Apache::lontexconvert::messedup=1; + my $request=Apache->request(); + $request->child_terminate(); + } return $xmlstring; } @@ -106,28 +129,63 @@ sub footer { sub to_convert { my ($string) = @_; - $string=~s/\/ /g; + $string=~s/\/ /gs; + $string=~s/\s/ /gs; + $string=&HTML::Entities::decode($string); return &converted(\$string); } +sub smiley { + my $expression=shift; + if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; } + my %smileys=('\:\-*\)' => 'smiley', + '8\-*\)' => 'coolsmile', + '8\-*I' => 'coolindiff', + ':\-*\(' => 'frowny', + '\:\-*(o|O|\(\))' => 'shocked', + '\;\-*\)' => 'wink', + '\:\-*P' => 'baeh', + '\:\-(\\\|\\/)' => 'hrrm', + '\:\-*D' => 'bigsmile', + '\:\-*C' => 'angry', + '\:(\'|\`)\-*\(' => 'cry', + '\:\-*(X|\#)' => 'lipsrsealed', + '\:\-*S' => 'huh'); + my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; + foreach (keys %smileys) { + $expression=~s/$_/\/gs; + } + return $expression; +} + 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($1)/gse; + $message=~s/(\$.+?\$)/&to_convert($1)/gse; + $message=~s/(\\\(.+?\\\))/&to_convert($1)/gse; + $message=~s/(\\\[.+?\\\])/&to_convert($1)/gse; + if (wantarray) { + return (&smiley($message),$errorstring); + } else { + return &smiley($message).$errorstring; } - $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; - return $message.$errorstring; } 1;