--- loncom/xml/lontexconvert.pm 2010/06/10 15:54:06 1.104 +++ loncom/xml/lontexconvert.pm 2011/12/06 16:10:53 1.109 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.104 2010/06/10 15:54:06 bisitz Exp $ +# $Id: lontexconvert.pm,v 1.109 2011/12/06 16:10:53 dseaton Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,7 +49,6 @@ use lib '/home/httpd/lib/perl/'; use LONCAPA; use URI::Escape; use IO::Socket::INET; -use IO::Socket::SSL; # ====================================================================== Header @@ -166,13 +165,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 +282,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 +307,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 +335,7 @@ sub mimetex_converted { my $valign = &mimetex_valign($esc_texstring); my $result=''; if ($displaystyle) { - $result='