--- loncom/xml/lontexconvert.pm 2006/05/30 12:47:53 1.75 +++ loncom/xml/lontexconvert.pm 2007/08/14 19:32:35 1.84 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.75 2006/05/30 12:47:53 www Exp $ +# $Id: lontexconvert.pm,v 1.84 2007/08/14 19:32:35 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -151,7 +151,7 @@ ENDCONV sub clean_out_math_mode { my ($texstring)=@_; - $$texstring=~s/(?!\\)\$//g; + $$texstring=~s/(? function NoFontMessage () {} + jsMath = {Parser: {prototype: {environments: {\'eqnarray*\' :[\'Array\',null,null,\'rcl\',[5/18,5/18],3,\'D\']}}}}; '."\n". ''."\n"; } sub jsMath_process { - return '' if !$jsMath_sent_header; - return ''; + my $state = pop(@jsMath_sent_header); + return '' if !$state; + return "\n". + ''."\n"; + } + sub jsMath_state { + my ($level) = @_; + return $jsMath_sent_header[$level]; + } +} + +sub tex_engine { + if (exists($env{'form.texengine'})) { + return $env{'form.texengine'}; + } + if ($env{'request.course.id'} + && exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) { + return $env{'course.'.$env{'request.course.id'}.'.texengine'}; } + if (exists($env{'environment.texengine'})) { + return $env{'environment.texengine'}; + } + return 'tth'; } sub init_math_support { + my ($inherit_jsmath) = @_; &init_tth(); - &Apache::lontexconvert::jsMath_reset(); - if ($env{'environment.texengine'} eq 'jsMath' || - $env{'form.texengine'} eq 'jsMath' ) { + &Apache::lontexconvert::jsMath_push(); + if (lc(&tex_engine()) eq 'jsmath' || + ($inherit_jsmath && &jsMath_state(-2))) { return &Apache::lontexconvert::jsMath_header(); } return; @@ -223,7 +252,7 @@ sub mimetex_converted { sub converted { my ($string,$mode)=@_; - if ($mode eq '') { $mode=$env{'environment.texengine'}; } + if ($mode eq '') { $mode = &tex_engine(); } if ($mode =~ /tth/i) { return &tth_converted($string); } elsif ($mode =~ /jsmath/i) { @@ -262,8 +291,8 @@ sub smiley { '\:\-(X|\#)' => 'lipsrsealed', '\:\-S' => 'huh'); my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'}; - foreach (keys %smileys) { - $expression=~s/$_/\/gs; + foreach my $smiley (keys(%smileys)) { + $expression=~s/$smiley/\/gs; } return $expression; } @@ -274,27 +303,34 @@ sub msgtexconverted { &init_tth(); my $outmessage=''; my $tex=0; - foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { + foreach my $fragment (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) { if ($tex) { if ($email) { - $outmessage.=''.&to_convert($_).'
'; $tex=0; + $outmessage.=''.&to_convert($fragment).'
'; + $tex=0; } else { - $outmessage.=&to_convert($_); $tex=0; + $outmessage.=&to_convert($fragment); + $tex=0; } } else { - $outmessage.=&smiley($_); $tex=1; + $outmessage.=&smiley($fragment); + $tex=1; } } $message=$outmessage; $outmessage=''; $tex=0; - foreach (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,$message)) { + foreach my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i, + $message)) { if ($tex) { if ($email) { - $outmessage.=''.&algebra($_,'web').'
'; $tex=0; + $outmessage.=''.&algebra($fragment,'web').'
'; + $tex=0; } else { - $outmessage.=&algebra($_,'web'); $tex=0; + $outmessage.=&algebra($fragment,'web'); + $tex=0; } } else { - $outmessage.=$_; $tex=1; + $outmessage.=$fragment; + $tex=1; } } if (wantarray) { @@ -348,9 +384,6 @@ sub postprocess_algebra { # moodle had these and I don't know why, ignoring them for now # $string =~s/\\fun/ /g; - # remove the extra () in the denominator of a \frac - $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs; - # sqrt(3,4) means the 4 root of 3 $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;