--- loncom/xml/lontexconvert.pm 2012/02/28 10:38:14 1.110 +++ loncom/xml/lontexconvert.pm 2012/05/10 19:19:30 1.112.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.110 2012/02/28 10:38:14 foxr Exp $ +# $Id: lontexconvert.pm,v 1.112.2.1 2012/05/10 19:19:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,12 +56,41 @@ use IO::Socket::INET; # my %unicode_translations = ( '\rightleftharpoons' => 0x21cc, - '' => 0x23a1, - '' => 0x23a2, - '' => 0x23a3, - '' => 0x23a4, - '' => 0x23a5, - '' => 0x23a6 + +# 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 + + ); ## @@ -126,14 +155,12 @@ 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; @@ -214,47 +241,6 @@ sub displaystyle { 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'; @@ -322,11 +308,6 @@ 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; } @@ -387,8 +368,6 @@ 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) { @@ -597,9 +576,6 @@ Header =item jsMath_converted() -=item MathJax_converted() - - Mimics the jsMath functionality - =item tex_engine()