--- loncom/xml/lontexconvert.pm 2011/02/10 20:07:00 1.98.2.1 +++ 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.98.2.1 2011/02/10 20:07:00 raeburn Exp $ +# $Id: lontexconvert.pm,v 1.109 2011/12/06 16:10:53 dseaton Exp $ # # Copyright Michigan State University Board of Trustees # @@ -165,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'; @@ -239,20 +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 $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring; my $socket; &Apache::lonxml::start_alarm(); - my $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; @@ -289,7 +335,7 @@ sub mimetex_converted { my $valign = &mimetex_valign($esc_texstring); my $result=''; if ($displaystyle) { - $result='
'; + $outmessage.=''.$algebra.'
'; $tex=0; } else { - $outmessage.=&algebra($fragment,'web'); + $outmessage.=$algebra; $tex=0; } } else { - $outmessage.=$fragment; + $outmessage.=$fragment; $tex=1; } } @@ -388,9 +450,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').']'; @@ -495,6 +557,8 @@ Header =item jsMath_converted() +=item MathJax_converted() + - Mimics the jsMath functionality =item tex_engine() @@ -503,20 +567,20 @@ Header =item mimetex_valign() - Makes a HEAD call to /cgi-bin/mimetex.cgi via IO:: to retrieve the + 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 + 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. + 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, + Example rewrite rules which rewrite all http traffic to https, except HEAD requests for /cgi-bin/mimetex.cgi are:@@ -525,7 +589,7 @@ Header RewriteCond %{HTTPS} off RewriteCond %{HTTP:Host} (.*) - RewriteCond %{REQUEST_METHOD} !HEAD + RewriteCond %{REQUEST_METHOD} !HEAD RewriteRule ^/(.*) https://%1/$1 [R=301,L] RewriteCond %{HTTPS} off