--- loncom/xml/lontexconvert.pm 2006/05/18 22:13:50 1.74 +++ loncom/xml/lontexconvert.pm 2006/09/06 19:43:22 1.77 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.74 2006/05/18 22:13:50 albertel Exp $ +# $Id: lontexconvert.pm,v 1.77 2006/09/06 19:43:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -45,6 +45,9 @@ use vars qw($errorstring); #use Apache::lonxml(); use Apache::lonlocal; use Apache::lonnet; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # ====================================================================== Header @@ -173,13 +176,16 @@ sub jsMath_converted { } { - my $jsMath_sent_header; + my @jsMath_sent_header; sub jsMath_reset { - $jsMath_sent_header=0; + undef(@jsMath_sent_header); + } + sub jsMath_push { + push(@jsMath_sent_header,0); } sub jsMath_header { - return '' if $jsMath_sent_header; - $jsMath_sent_header=1; + return '' if $jsMath_sent_header[-1]; + $jsMath_sent_header[-1]=1; return ''."\n"; } sub jsMath_process { - return '' if !$jsMath_sent_header; + my $state = pop(@jsMath_sent_header); + return '' if !$state; return ''; } } sub init_math_support { &init_tth(); - &Apache::lontexconvert::jsMath_reset(); + &Apache::lontexconvert::jsMath_push(); if ($env{'environment.texengine'} eq 'jsMath' || $env{'form.texengine'} eq 'jsMath' ) { return &Apache::lontexconvert::jsMath_header(); @@ -211,7 +218,7 @@ sub mimetex_converted { if ($displaystyle) { $$texstring='\\displaystyle \\Large '.$$texstring; } - my $result=''; + my $result=''; if ($displaystyle) { $result='
'.$result.'
'; } @@ -345,9 +352,6 @@ sub postprocess_algebra { # moodle had these and I don't know why, ignoring them for now # $string =~s/\\fun/ /g; - # remove the extra () in the denominator of a \frac - $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs; - # sqrt(3,4) means the 4 root of 3 $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;