--- loncom/xml/lontexconvert.pm	2009/12/22 05:08:04	1.100
+++ loncom/xml/lontexconvert.pm	2014/06/18 06:48:47	1.112.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # TeX Conversion Module
 #
-# $Id: lontexconvert.pm,v 1.100 2009/12/22 05:08:04 faziophi Exp $
+# $Id: lontexconvert.pm,v 1.112.2.4 2014/06/18 06:48:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,7 +49,78 @@ use lib '/home/httpd/lib/perl/';
 use LONCAPA;
 use URI::Escape;
 use IO::Socket::INET;
-use IO::Socket::SSL;
+
+
+#
+# Table of substitutions to unicode characters.
+#
+
+my %unicode_harpoons = (
+                        '\rightleftharpoons'  => 0x21cc,
+                      );
+
+my %unicode_translations = (
+
+# Brackets - unicode for browsers/OS which support it.
+
+    ''             => 0x23a1,
+    ''             => 0x23a2,
+    ''             => 0x23a3,
+    ''             => 0x23a4,
+    ''             => 0x23a5,
+    ''             => 0x23a6,
+
+#  Parens - unicode for browsers/OS which support it
+
+    ''              => 0x239b,
+    ''              => 0x239c,
+    ''              => 0x239d,
+    ''              => 0x239e,
+    ''              => 0x239f,
+    ''              => 0x23a0,
+
+);
+
+my %ascii_8bit_translations = (
+
+# Brackets - pure 8-bit ascii ugliness for browsers/OS which can't handle unicode
+
+    ''              => 0x5b,
+    ''              => 0x5b,    # '['
+    ''              => 0x5b,
+    ''              => 0x5d,    # ']'
+    ''              => 0x5d,
+    ''              => 0x5d,
+
+# Parens - pure 8-bit ascii ugliness for browsers/OS which can't handle unicode
+
+    ''              => 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
 
@@ -107,15 +178,37 @@ sub convert_real {
     $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
     $xmlstring=~s/^\s*//;
     $xmlstring=~s/\s*$//;
+    &Apache::lonxml::end_alarm();
+
     #
-    # \rightleftharpoons is not converted by tth but maps
-    # reasonably well to &#8660;.  If we get many more of these,
-    # we're going to need to have a translation sub.
-    #
-    my $lrharpoon = pack("U", 0x21cc);
-    $xmlstring=~s/\\rightleftharpoons/$lrharpoon/g;
+    # Several strings produced by tth require
+    # transliteration -> unicode equivalents to render reliably
+    # in browsers. %unicode_translations and %unicode_harpoons are tables of
+    # string->substitution which we now apply. (%ascii_8bit_translations used
+    # instead for Windows XP and mobile devices.
+
+    my $use_ascii;
+    if ($env{'browser.os'} eq 'win') {
+        if (($env{'browser.osversion'}) && ($env{'browser.osversion'} < 6.0)) {
+            $use_ascii = 1;
+        }
+    }
+    if ($env{'browser.mobile'}) {
+        $use_ascii = 1;
+    }
+
+    foreach my $pattern (keys(%unicode_translations)) {
+	my $unicode = $unicode_translations{$pattern};
+	if ($use_ascii) {
+	    $unicode = $ascii_8bit_translations{$pattern};
+	}
+	$xmlstring = &unicode_subst($xmlstring, $pattern, $unicode);
+    }
+
+    foreach my $pattern (keys(%unicode_harpoons)) {
+        $xmlstring = &unicode_subst($xmlstring, $pattern, $unicode_harpoons{$pattern});
+    }
 
-    &Apache::lonxml::end_alarm();
     return ($xmlstring,$errorstring);
 }
 
@@ -166,13 +259,46 @@ sub clean_out_math_mode {
 
 sub displaystyle {
     my ($texstring)=@_;
-    #has a $$ or \[ or \displaystyle in it, guessinng it's display mode
+    #has a $$ or \[ or \displaystyle or eqnarray in it, guessinng it's display mode
     if ($$texstring=~/[^\\]\$\$/ ||
-	$$texstring=~/\\\[/ ||
-	$$texstring=~/\\displaystyle/) { return 1; }
+        $$texstring=~/\\\[/ ||
+        $$texstring=~/\\displaystyle/ ||
+        $$texstring=~/eqnarray/
+       ) { return 1; }
     return 0;
 }
 
+sub MathJax_converted {
+    my $texstring=shift;
+    my $tag='math/tex;';
+    if (&displaystyle($texstring)) { $tag='math/tex; mode=display'; }
+    &clean_out_math_mode($texstring);
+    return &MathJax_header().
+      '<script type="'.$tag.'">'.$$texstring.'</script>';
+}
+
+{
+    #Relies heavily on the previous jsMath installation
+    my @MathJax_sent_header;
+    sub MathJax_reset {
+        undef(@MathJax_sent_header);
+    }
+    sub MathJax_push {
+        push(@MathJax_sent_header,0);
+    }
+    sub MathJax_header {
+        if (!@MathJax_sent_header) {
+            &Apache::lonnet::logthis("mismatched calls of MathJax_header and MathJax_process");
+            return '';
+        }
+        return '' if $MathJax_sent_header[-1];
+        $MathJax_sent_header[-1]=1;
+        return
+          '<script type="text/javascript" src="/adm/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>'."\n";
+    }
+}
+
+
 sub jsMath_converted {
     my $texstring=shift;
     my $tag='span';
@@ -240,27 +366,23 @@ sub init_math_support {
 	($inherit_jsmath && &jsMath_state(-2))) {
 	return &Apache::lontexconvert::jsMath_header();
     }
+    &Apache::lontexconvert::MathJax_push();
+    if (lc(&tex_engine()) eq 'mathjax') { # ||
+        #($inherit_jsmath && &jsMath_state(-2))) {
+        return &Apache::lontexconvert::MathJax_header();
+    }
     return;
 }
 
 sub mimetex_valign {
     my ($esc_texstring)=@_;
     my $valign = 0;
-    my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
-    my $hostname = &Apache::lonnet::hostname($lonhost);
-    my $protocol = $Apache::lonnet::protocol{$lonhost};
     my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring;
     my $socket;
     &Apache::lonxml::start_alarm();
-    if ($protocol eq 'https') {
-        $socket = IO::Socket::SSL->new(PeerAddr => $hostname,
-                                       PeerPort => 'https(443)',
-                                       Proto    => 'tcp');
-    } else {
-        $socket = IO::Socket::INET->new(PeerAddr => $hostname,
-                                        PeerPort => 'http(80)',
-                                        Proto    => 'tcp');
-    }
+    $socket = IO::Socket::INET->new(PeerAddr => 'localhost',
+                                    PeerPort => 'http(80)',
+                                    Proto    => 'tcp');
     if ($socket) {
         my $headreq = "HEAD $path HTTP/1.0\r\n\r\n";
         print $socket $headreq;
@@ -269,12 +391,7 @@ sub mimetex_valign {
                 $valign = $1;
             }
         }
-        if ($protocol eq 'https') {
-            $socket->close(SSL_no_shutdown => 1,
-                           SSL_ctx_free => 1);
-        } else {
-            $socket->close();
-        }
+        $socket->close();
     }
     &Apache::lonxml::end_alarm();
     return $valign;
@@ -302,7 +419,7 @@ sub mimetex_converted {
     my $valign = &mimetex_valign($esc_texstring);
     my $result='<img src="/cgi-bin/mimetex.cgi?'.$esc_texstring.'" style="vertical-align:'.$valign.'px" alt="'.$alt_string.'" />';
     if ($displaystyle) {
-	$result='<center>'.$result.'</center>';
+	$result='<div style="text-align:center">'.$result.'</div>';
     }
     return $result;
 }
@@ -314,6 +431,8 @@ sub converted {
 	return &tth_converted($string);
     } elsif ($mode =~ /jsmath/i) {
 	return &jsMath_converted($string);
+    } elsif ($mode =~ /mathjax/i) {
+        return &MathJax_converted($string);
     } elsif ($mode =~ /mimetex/i) {
 	return &mimetex_converted($string);
     } elsif ($mode =~ /raw/i) {
@@ -326,6 +445,7 @@ sub converted {
 
 sub to_convert {
     my ($string) = @_;
+    &init_tth();
     $string=~s/\<br\s*\/?\>/ /gs;
 #    $string=~s/\s/ /gs;
     $string=&HTML::Entities::decode($string);
@@ -334,24 +454,23 @@ 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',
 		 '8\-(I|\|)'   => 'face-glasses.png',
-		 ':\-*(I|\|)'   => 'face-plain.png',
+		 '\:\-(I|\|)'   => 'face-plain.png',
 		 '\:\-(o|O|\(\))' => 'face-surprise.png',
-		 ':\-*\('  => 'face-sad.png',
-		 '\;\-*\)' => 'face-wink.png',
-		 '\:\-*(P|p)'  => 'face-raspberry.png',
+		 ':\-\('  => 'face-sad.png',
+		 '\;\-\)' => 'face-wink.png',
+		 '\:\-(P|p)'  => 'face-raspberry.png',
 		 '\:\-(\\\|\\/)' => 'face-uncertain.png',
-		 '\:\-*D'  => 'face-smile-big.png',
-		 '\:\-*(C|\@)'  => 'face-angry.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',
+		 '\:\-(X|x|\#)' => 'face-quiet.png',
+		 '\:\-(s|S)' => 'face-uncertain.png',
+		 '\:\-\$' => 'face-embarrassed.png',
+		 '\:\-\*' => 'face-kiss.png',
 		 '\+O\(' => 'face-sick.png',
 		 '(\&lt\;3|\(heart\))' => 'heart.png',
 		 '\(rose\)' => 'rose.png',
@@ -361,7 +480,7 @@ sub smiley {
 		 '\(pirate\)' => 'face-pirate.png',
 		 '\((agree|yes)\)' => 'opinion-agree.png',
 		 '\((disagree|nay)\)' => 'opinion-disagree.png',
-		 '(o|O)\-*\)' => 'face-angel.png',
+		 '(o|O)\-\)' => 'face-angel.png',
 		 );
     my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
     foreach my $smiley (keys(%smileys)) {
@@ -373,7 +492,6 @@ sub smiley {
 sub msgtexconverted {
     my ($message,$email) = @_;
     $errorstring='';
-    &init_tth();
     my $outmessage='';
     my $tex=0;
     foreach my $fragment (split(/(?:\&lt\;|\<)\/*m\s*(?:\&gt\;|\>)/i,$message)) {
@@ -394,15 +512,16 @@ sub msgtexconverted {
     foreach my $fragment (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,
 				$message)) {
 	if ($tex) {
+        my $algebra = &algebra($fragment, 'web', undef, undef, undef, 'tth');
 	    if ($email) {
-		$outmessage.='</pre><tt>'.&algebra($fragment,'web').'</tt><pre>';
+		$outmessage.='</pre><tt>'.$algebra.'</tt><pre>';
 		$tex=0;
 	    } else {
-		$outmessage.=&algebra($fragment,'web');
+		$outmessage.=$algebra;
 		$tex=0;
 	    }
 	} else {
-            $outmessage.=$fragment;
+        $outmessage.=$fragment;
 	    $tex=1;
 	}
     }
@@ -415,9 +534,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').']';
@@ -478,6 +597,8 @@ sub postprocess_algebra {
     $string =~s/\\lim\\left\((.+?),(.+?),(.+?)\\right\)/\\lim_{$2\\to $3}$1/gs;
     return $string;
 }
+
+
 1;
 __END__
 
@@ -522,12 +643,47 @@ Header
 
 =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 <img> 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 <img> 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:
+
+ <IfModule mod_rewrite.c>
+     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]
+ </IfModule>
 
 =item mimetex_converted()