--- loncom/xml/lontexconvert.pm 2010/01/26 01:16:30 1.101
+++ loncom/xml/lontexconvert.pm 2010/06/10 15:54:06 1.104
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.101 2010/01/26 01:16:30 faziophi Exp $
+# $Id: lontexconvert.pm,v 1.104 2010/06/10 15:54:06 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -326,6 +326,7 @@ sub converted {
sub to_convert {
my ($string) = @_;
+ &init_tth();
$string=~s/\
/ /gs;
# $string=~s/\s/ /gs;
$string=&HTML::Entities::decode($string);
@@ -334,7 +335,6 @@ sub to_convert {
sub smiley {
my $expression=shift;
- if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
my %smileys=(
'\:\-*\)' => 'face-smile.png',
'8\-\)' => 'face-cool.png',
@@ -373,7 +373,6 @@ sub smiley {
sub msgtexconverted {
my ($message,$email) = @_;
$errorstring='';
- &init_tth();
my $outmessage='';
my $tex=0;
foreach my $fragment (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) {
@@ -394,15 +393,16 @@ sub msgtexconverted {
foreach my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,
$message)) {
if ($tex) {
+ my $algebra = &algebra($fragment, 'web', undef, undef, undef, undef, 'tth');
if ($email) {
- $outmessage.=''.&algebra($fragment,'web').'
'; + $outmessage.=''.$algebra.'
'; $tex=0; } else { - $outmessage.=&algebra($fragment,'web'); + $outmessage.=$algebra; $tex=0; } } else { - $outmessage.=$fragment; + $outmessage.=$fragment; $tex=1; } } @@ -415,9 +415,9 @@ sub msgtexconverted { sub algebra { use AlgParser; - - my ($string,$target,$style,$parstack,$safeeval)=@_; + my ($string,$target,$style,$parstack,$safeeval,$tth)=@_; my $parser = new AlgParserWithImplicitExpand; + if ($tth eq 'tth') {&init_tth();} $string=&prepare_algebra($string); my $ret = $parser->parse($string); my $result='['.&mt('Algebra unconverted due to previous errors').']';