--- loncom/xml/lontexconvert.pm 2010/04/27 20:29:20 1.103 +++ loncom/xml/lontexconvert.pm 2012/03/04 14:58:23 1.111 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.103 2010/04/27 20:29:20 faziophi Exp $ +# $Id: lontexconvert.pm,v 1.111 2012/03/04 14:58:23 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,7 +49,68 @@ 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_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 @@ -94,12 +155,14 @@ sub convert_real { }; &Apache::lonxml::start_alarm(); if ($env{'browser.mathml'}) { + &Apache::lonnet::logthis("mathml"); $xmlstring=&tth::ttm($$texstring); $xmlstring=~s/\/\/g; $xmlstring=~s/\/\/g; $xmlstring=~s/\/\\<\/p\>/g; $errorstring.=&tth::ttmerror(); } else { + &Apache::lonnet::logthis("tth"); $xmlstring=&tth::tth($$texstring); $errorstring.=&tth::ttherror(); $xmlstring=~s---g; @@ -107,15 +170,20 @@ sub convert_real { $xmlstring=~s/^\s*\
unicode equivalents to render reliably + # in browsers. %unicode_translations is a table of + # string->substitution which we now apply: + + foreach my $pattern (keys(%unicode_translations)) { + my $unicode = $unicode_translations{$pattern}; + $xmlstring = &unicode_subst($xmlstring, $pattern, $unicode); + } + - &Apache::lonxml::end_alarm(); return ($xmlstring,$errorstring); } @@ -166,13 +234,56 @@ 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(). + ''; +} + +{ + #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 + ''."\n"; + } + #sub MathJax_process { + # my $state = pop(@MathJax_sent_header); + # return '' if !$state; + # return "\n". + # ''."\n"; + #} + #sub MathJax_state { + # my ($level) = @_; + # return $MathJax_sent_header[$level]; + #} +} + + sub jsMath_converted { my $texstring=shift; my $tag='span'; @@ -240,27 +351,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 +376,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 +404,7 @@ sub mimetex_converted { my $valign = &mimetex_valign($esc_texstring); my $result=''.$alt_string.''; if ($displaystyle) { - $result='
'.$result.'
'; + $result='
'.$result.'
'; } return $result; } @@ -314,6 +416,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) { @@ -335,7 +439,6 @@ 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', @@ -523,12 +626,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 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()