--- loncom/xml/lontexconvert.pm 2004/07/22 23:18:00 1.38
+++ loncom/xml/lontexconvert.pm 2005/02/24 09:28:54 1.51
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.38 2004/07/22 23:18:00 raeburn Exp $
+# $Id: lontexconvert.pm,v 1.51 2005/02/24 09:28:54 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,8 +36,6 @@
# The C source of the Code may not be distributed by the Licensee
# to any other parties under any circumstances.
#
-# 05/29/00,05/30,10/11,10/20 Gerd Kortemeyer
-# 5/4 Gerd Kortemeyer
package Apache::lontexconvert;
@@ -76,8 +74,8 @@ sub header {
my $time=time;
&init_tth();
return &Apache::lonxml::xmlbegin().
- &Apache::lonxml::fontsettings().
"\n
\n".
+ &Apache::lonxml::fontsettings().
&Apache::lonmenu::registerurl(undef,'tex').
"\n\n";
}
@@ -112,6 +110,7 @@ sub convert_real {
$errorstring.=&tth::ttherror();
$xmlstring=~s---g;
}
+ $xmlstring=~s/^\s*\
0) {
- if ($message =~ /::::\d+::::(.+)$/) {
- $message = $1;
- }
- }
foreach (split(/(?:\<\;|\<)\/*m\s*(?:\>\;|\>)/i,$message)) {
if ($tex) {
if ($email) {
@@ -218,6 +212,55 @@ sub msgtexconverted {
}
}
+sub algebra {
+ use AlgParser;
+
+ my ($string,$target)=@_;
+ my $parser = new AlgParserWithImplicitExpand;
+ $string=&prepare_algebra($string);
+ my $ret = $parser->parse($string);
+ my $result='['.&mt('Algebra unconverted due to previous errors').']';
+ if ( ref($ret) ) {
+ #$parser->tostring();
+ $parser->normalize();
+ my $latex=$parser->tolatex();
+ $latex=&postprocess_algebra($latex);
+ $latex='$'.$latex.'$';
+ if ($target eq 'web' || $target eq 'analyze') {
+ $result = &converted(\$latex);
+ } else {
+ $result = $latex;
+ }
+ } else {
+ &Apache::lonxml::error($parser->{'htmlerror'});
+ }
+}
+
+sub prepare_algebra {
+ my ($string)=@_;
+
+ # makes the decision about what is a minus sign easier supposedly
+ $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
+
+ return $string;
+}
+
+sub postprocess_algebra {
+ my ($string)=@_;
+
+ # moodle had these and I don't know why, ignoring them for now
+ # $string =~s/\\fun/ /g;
+
+ # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying
+ $string =~s/\\left\{/\{/g;
+ $string =~s/\\right\}/\}/g;
+
+ # sqrt(3,4) means the 4 root of 3
+ $string =~s/\\sqrt{([^,]+),([^}]+)}/\\sqrt[$2]{$1}/gs;
+
+ &Apache::lonnet::logthis($string);
+ return $string;
+}
1;
__END__