--- loncom/xml/lontexconvert.pm 2006/05/17 22:08:08 1.73
+++ loncom/xml/lontexconvert.pm 2013/09/15 23:06:46 1.113
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.73 2006/05/17 22:08:08 albertel Exp $
+# $Id: lontexconvert.pm,v 1.113 2013/09/15 23:06:46 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,24 +45,95 @@ use vars qw($errorstring);
#use Apache::lonxml();
use Apache::lonlocal;
use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+use URI::Escape;
+use IO::Socket::INET;
+
+
+#
+# Table of substitutions to unicode characters.
+#
+my %unicode_translations = (
+ '\rightleftharpoons' => 0x21cc,
+
+# Brackets - unicode is commented out with pure 8-bit ascii ugliness while we need it.
+
+# '' => 0x23a1,
+# '' => 0x23a2,
+# '' => 0x23a3, # when unicode catches up with browsers
+# '' => 0x23a4, # use these instead of the cheesey brackets below
+# '' => 0x23a5,
+# '' => 0x23a6
+ '' => 0x5b,
+ '' => 0x5b, # '['
+ '' => 0x5b,
+ '' => 0x5d, # ']'
+ '' => 0x5d,
+ '' => 0x5d,
+
+# Parens..again the unicode is commented out with the 8-bit ascii ugliness
+# turned on until browsers catch up with the unicode world.
+
+# '' => 0x239b,
+# '' => 0x239c,
+# '' => 0x239d,
+# '' => 0x239e,
+# '' => 0x239f,
+# '' => 0x23a0
+
+ '' => 0x28,
+ '' => 0x28, # '('
+ '' => 0x28,
+
+ '' => 0x29,
+ '' => 0x29, # '('
+ '' => 0x29
+
+
+);
+
+##
+# Utility to convert elements of a string to unicode:
+#
+# @param input - Input string
+# @param pattern - Pattern to convert
+# @param unicode - Unicode to substitute for pattern.
+#
+# @return string - resulting string.
+#
+sub unicode_subst {
+ my ($input, $pattern, $unicode) = @_;
+
+ my $char = pack('U', $unicode);
+
+ $input =~ s/$pattern/$char/g;
+
+ return $input;
+}
# ====================================================================== 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);
}
}
}
@@ -71,10 +142,7 @@ sub init_tth {
$Apache::lontexconvert::messedup=0;
-# we need this routine because &converted can get called from inside
-# of the safespace (through &xmlparse('
'; $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) { + my $algebra = &algebra($fragment, 'web', undef, undef, undef, 'tth'); if ($email) { - $outmessage.=''.&algebra($_,'web').'
'; $tex=0; + $outmessage.=''.$algebra.'
'; + $tex=0; } else { - $outmessage.=&algebra($_,'web'); $tex=0; + $outmessage.=$algebra; + $tex=0; } } else { - $outmessage.=$_; $tex=1; + $outmessage.=$fragment; + $tex=1; } } if (wantarray) { @@ -298,9 +517,9 @@ sub msgtexconverted { sub algebra { use AlgParser; - - my ($string,$target,$style)=@_; + 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').']'; @@ -316,7 +535,9 @@ sub algebra { $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; } @@ -340,9 +561,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; @@ -366,8 +584,113 @@ sub postprocess_algebra { __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 jsMath_converted() + +=item MathJax_converted() + - Mimics the jsMath functionality + +=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