/ /gs;
# $string=~s/\s/ /gs;
$string=&HTML::Entities::decode($string);
@@ -166,24 +428,37 @@ sub to_convert {
sub smiley {
my $expression=shift;
- if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }
- my %smileys=('\:\-\)' => 'smiley',
- '8\-\)' => 'coolsmile',
- '8\-(I|\|)' => 'coolindiff',
- ':\-(I|\|)' => 'neutral',
- '\:\-(o|O|\(\))' => 'shocked',
- ':\-\(' => 'frowny',
- '\;\-\)' => 'wink',
- '\:\-P' => 'baeh',
- '\:\-(\\\|\\/)' => 'hrrm',
- '\:\-D' => 'bigsmile',
- '\:\-C' => 'angry',
- '\:(\'|\`)\-\(' => 'cry',
- '\:\-(X|\#)' => 'lipsrsealed',
- '\:\-S' => 'huh');
+ my %smileys=(
+ '\:\-*\)' => 'face-smile.png',
+ '8\-\)' => 'face-cool.png',
+ '8\-(I|\|)' => 'face-glasses.png',
+ '\:\-(I|\|)' => 'face-plain.png',
+ '\:\-(o|O|\(\))' => 'face-surprise.png',
+ ':\-\(' => 'face-sad.png',
+ '\;\-\)' => 'face-wink.png',
+ '\:\-(P|p)' => 'face-raspberry.png',
+ '\:\-(\\\|\\/)' => 'face-uncertain.png',
+ '\:\-D' => 'face-smile-big.png',
+ '\:\-(C|\@)' => 'face-angry.png',
+ '\:(\'|\`)\-*\(' => 'face-crying.png',
+ '\:\-(X|x|\#)' => 'face-quiet.png',
+ '\:\-(s|S)' => 'face-uncertain.png',
+ '\:\-\$' => 'face-embarrassed.png',
+ '\:\-\*' => 'face-kiss.png',
+ '\+O\(' => 'face-sick.png',
+ '(\<\;3|\(heart\))' => 'heart.png',
+ '\(rose\)' => 'rose.png',
+ '\(pizza\)' => 'food-pizza.png',
+ '\(cake\)' => 'food-cake.png',
+ '\(ninja\)' => 'face-ninja.png',
+ '\(pirate\)' => 'face-pirate.png',
+ '\((agree|yes)\)' => 'opinion-agree.png',
+ '\((disagree|nay)\)' => 'opinion-disagree.png',
+ '(o|O)\-\)' => 'face-angel.png',
+ );
my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
- foreach (keys %smileys) {
- $expression=~s/$_/\
/gs;
+ foreach my $smiley (keys(%smileys)) {
+ $expression=~s/$smiley/\
/gs;
}
return $expression;
}
@@ -191,18 +466,37 @@ sub smiley {
sub msgtexconverted {
my ($message,$email) = @_;
$errorstring='';
- &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 my $fragment (split(/(?:\<\;|\<)\/*algebra\s*(?:\>\;|\>)/i,
+ $message)) {
+ if ($tex) {
+ my $algebra = &algebra($fragment, 'web', undef, undef, undef, 'tth');
+ if ($email) {
+ $outmessage.=''.$algebra.'';
+ $tex=0;
+ } else {
+ $outmessage.=$algebra;
+ $tex=0;
+ }
+ } else {
+ $outmessage.=$fragment;
+ $tex=1;
}
}
if (wantarray) {
@@ -214,9 +508,9 @@ sub msgtexconverted {
sub algebra {
use AlgParser;
-
- my ($string,$target)=@_;
+ 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').']';
@@ -225,9 +519,16 @@ sub algebra {
$parser->normalize();
my $latex=$parser->tolatex();
$latex=&postprocess_algebra($latex);
- $latex='$'.$latex.'$';
+ if ($style eq 'display') {
+ $latex='$$'.$latex.'$$x';
+ } else {
+ # style is 'inline'
+ $latex='\\ensuremath{'.$latex.'}';
+ }
if ($target eq 'web' || $target eq 'analyze') {
- $result = &converted(\$latex);
+ my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
+ $result = &converted(\$latex,$display);
+# $result = &converted(\$latex);
} else {
$result = $latex;
}
@@ -240,7 +541,7 @@ sub prepare_algebra {
my ($string)=@_;
# makes the decision about what is a minus sign easier supposedly
- $string =~ s/([\=\>\<\%\!\#] *)-/$1 zeroplace -/g;
+ $string =~ s/(\<\>|\<\=|\>\=[\=\>\<] *)-/$1 zeroplace -/g;
return $string;
}
@@ -251,12 +552,8 @@ sub postprocess_algebra {
# 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;
+ $string =~s/\\sqrt\{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
# log(3,4) means the log base 4 of 3
$string =~s/\\log\\left\((.+?),(.+?)\\right\)/\\log_{$2}\\left($1\\right)/gs;
@@ -264,19 +561,125 @@ sub postprocess_algebra {
# log(3,4) means the log base 4 of 3
$string =~s/\\((?:sin|cos|tan|sec|csc|cot)(?:h)?)\\left\((.+?),(.+?)\\right\)/\\$1^{$3}\\left($2\\right)/gs;
- # remove the extra () in the denominator of a \frac
- $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;
+ # int(3,a,b) integral from a to b of 3
+ $string =~s/\\int\\left\((.+?),(.+?),(.+?)\\right\)/\\int_{$2}^{$3}\\left($1\\right)/gs;
-
- &Apache::lonnet::logthis($string);
+ # int( ... dx) -> ...
+ $string =~s/\\int\\left\((.+?)d[a-z]\\right\)/$1/gs;
+
+ #
+ $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
return $string;
}
+
+
1;
__END__
+=pod
+
+=head1 NAME
+
+Apache::lontexconvert;
+
+=head1 SYNOPSIS
+
+Access to tth/ttm
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 SUBROUTINES
+
+=over
+
+=item init_tth()
+
+Header
+
+=item convert_real()
+
+ we need this routine because &converted can get called from inside
+ of the safespace (through &xmlparse('stuff') which doesn't
+ allow the opcode for alarm, so we need to compile this before we get
+ into the safe space since opcode checks only occur at compile time
+
+=item tth_converted()
+
+
+=item clean_out_math_mode()
+
+
+=item displaystyle()
+
+
+=item MathJax_converted()
+
+=item tex_engine()
+
+=item init_math_support()
+
+=item mimetex_valign()
+
+ Makes a HEAD call to /cgi-bin/mimetex.cgi via IO:: to retrieve the
+ vertical alignment, before the subsequent call to mimetex_converted()
+ which generates the ![]()
tag and the corresponding image.
+
+ Input: 1. $esc_texstring (escaped TeX to be rendered by mimetex).
+ Output: 1. $valign - number of pixels: positive or negative integer
+ which will be included in ![]()
tag for mimetex image to
+ support vertical alignment of image within a line of text.
+
+ If a server is running SSL, and Apache rewrite rules are in place
+ to rewrite requests for http to https, modification will most likely
+ be needed for pass through for HEAD requests for /cgi-bin/mimetex.cgi.
+
+ Example rewrite rules which rewrite all http traffic to https,
+ except HEAD requests for /cgi-bin/mimetex.cgi are:
+
+
+ RewriteEngine On
+ RewriteLogLevel 0
+
+ RewriteCond %{HTTPS} off
+ RewriteCond %{HTTP:Host} (.*)
+ RewriteCond %{REQUEST_METHOD} !HEAD
+ RewriteRule ^/(.*) https://%1/$1 [R=301,L]
+
+ RewriteCond %{HTTPS} off
+ RewriteCond %{HTTP:Host} (.*)
+ RewriteCond %{REQUEST_METHOD} HEAD
+ RewriteCond %{REQUEST_URI} !^/cgi-bin/mimetex.cgi
+ RewriteRule ^/(.*) https://%1/$1 [R=301,L]
+
+
+=item mimetex_converted()
+
+
+=item converted()
+
+
+=item to_convert()
+
+message display
+
+=item smiley()
+
+???
+
+=item msgtexconverted()
+
+=item algebra()
+
+=item prepare_algebra()
+
+=item postprocess_algebra()
+=back
+=cut