--- loncom/xml/lontexconvert.pm 2005/07/05 18:59:03 1.67
+++ 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.67 2005/07/05 18:59:03 albertel Exp $
+# $Id: lontexconvert.pm,v 1.84 2007/08/14 19:32:35 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -42,45 +42,39 @@ package Apache::lontexconvert;
use strict;
use tth();
use vars qw($errorstring);
-use Apache();
-use Apache::lonmsg();
-use Apache::lonxml();
-use Apache::lonmenu();
+#use Apache::lonxml();
use Apache::lonlocal;
use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
# ====================================================================== Header
sub init_tth {
my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
+ if ($options =~ /\S/) {
+ $options = ' '.$options;
+ } else {
+ undef($options);
+ }
if ($env{'browser.mathml'}) {
&tth::ttminit();
if ($env{'browser.unicode'}) {
- &tth::ttmoptions('-L -u1 '.$options);
+ &tth::ttmoptions('-L -u1'.$options);
} else {
- &tth::ttmoptions('-L -u0 '.$options);
+ &tth::ttmoptions('-L -u0'.$options);
}
} else {
&tth::tthinit();
if ($env{'browser.unicode'}) {
- &tth::tthoptions('-L -u1 '.$options);
+ &tth::tthoptions('-L -u1'.$options);
} else {
- &tth::tthoptions('-L -u0 '.$options);
+ &tth::tthoptions('-L -u0'.$options);
}
}
}
-sub header {
- $errorstring='';
- my $time=time;
- &init_tth();
- return &Apache::lonxml::xmlbegin().
- "\n\n".
- &Apache::lonxml::fontsettings().
- &Apache::lonmenu::registerurl(undef,'tex').
- "\n\n";
-}
-
# ================================================================== Conversion
$Apache::lontexconvert::messedup=0;
@@ -137,15 +131,27 @@ ENDCONV
$errorstring) {
&Apache::lonnet::logthis("Trying to kill myself");
$Apache::lontexconvert::messedup=1;
- my $request=Apache->request();
- $request->child_terminate();
+ if (ref($Apache::lonxml::request)) {
+ $Apache::lonxml::request->child_terminate();
+ } else {
+ my $request;
+ eval { $request=Apache->request; };
+ if (!$request) {
+ eval { $request=Apache2::RequestUtil->request; };
+ }
+ if ($request) {
+ $request->child_terminate();
+ } else {
+ &Apache::lonnet::logthis("Unable to find a request to do child_terminate on");
+ }
+ }
}
return $xmlstring;
}
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";
+ ''."\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_push();
+ if (lc(&tex_engine()) eq 'jsmath' ||
+ ($inherit_jsmath && &jsMath_state(-2))) {
+ return &Apache::lontexconvert::jsMath_header();
+ }
+ return;
+}
+
sub mimetex_converted {
my $texstring=shift;
my $displaystyle=&displaystyle($texstring);
@@ -198,7 +243,7 @@ sub mimetex_converted {
if ($displaystyle) {
$$texstring='\\displaystyle \\Large '.$$texstring;
}
- my $result='.')
';
+ my $result='.')
';
if ($displaystyle) {
$result=''.$result.'';
}
@@ -207,31 +252,17 @@ sub mimetex_converted {
sub converted {
my ($string,$mode)=@_;
- if ($mode eq '') { $mode=$env{'environment.texengine'}; }
- if ($mode eq 'tth') {
+ if ($mode eq '') { $mode = &tex_engine(); }
+ if ($mode =~ /tth/i) {
return &tth_converted($string);
- } elsif ($mode eq 'jsMath') {
+ } elsif ($mode =~ /jsmath/i) {
return &jsMath_converted($string);
- } elsif ($mode eq 'mimetex') {
+ } elsif ($mode =~ /mimetex/i) {
return &mimetex_converted($string);
}
return &tth_converted($string);
}
-# ====================================================================== Footer
-
-sub footer {
- my $xmlstring='';
- if ($env{'request.state'} eq 'construct') {
- $xmlstring.=''.$errorstring.'';
- } else {
- &Apache::lonmsg::author_res_msg($env{'request.filename'},$errorstring);
- }
-# -------------------------------------------------------------------- End Body
- $xmlstring.=&Apache::lonxml::xmlend();
- return $xmlstring;
-}
-
# ------------------------------------------------------------ Message display
sub to_convert {
@@ -260,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;
}
@@ -272,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) {
@@ -346,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;