Diff for /loncom/xml/lontexconvert.pm between versions 1.74 and 1.77

version 1.74, 2006/05/18 22:13:50 version 1.77, 2006/09/06 19:43:22
Line 45  use vars qw($errorstring); Line 45  use vars qw($errorstring);
 #use Apache::lonxml();  #use Apache::lonxml();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 # ====================================================================== Header  # ====================================================================== Header
   
Line 173  sub jsMath_converted { Line 176  sub jsMath_converted {
 }  }
   
 {  {
     my $jsMath_sent_header;      my @jsMath_sent_header;
     sub jsMath_reset {      sub jsMath_reset {
  $jsMath_sent_header=0;   undef(@jsMath_sent_header);
       }
       sub jsMath_push {
    push(@jsMath_sent_header,0);
     }      }
     sub jsMath_header {      sub jsMath_header {
  return '' if $jsMath_sent_header;   return '' if $jsMath_sent_header[-1];
  $jsMath_sent_header=1;   $jsMath_sent_header[-1]=1;
  return   return
             '<script type="text/javascript">              '<script type="text/javascript">
                      function NoFontMessage () {}                       function NoFontMessage () {}
Line 187  sub jsMath_converted { Line 193  sub jsMath_converted {
     '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";      '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";
     }      }
     sub jsMath_process {      sub jsMath_process {
  return '' if !$jsMath_sent_header;   my $state = pop(@jsMath_sent_header);
    return '' if !$state;
  return '<script type="text/javascript">jsMath.Process()</script>';   return '<script type="text/javascript">jsMath.Process()</script>';
     }      }
 }  }
   
 sub init_math_support {  sub init_math_support {
     &init_tth();      &init_tth();
     &Apache::lontexconvert::jsMath_reset();      &Apache::lontexconvert::jsMath_push();
     if ($env{'environment.texengine'} eq 'jsMath' ||      if ($env{'environment.texengine'} eq 'jsMath' ||
  $env{'form.texengine'}        eq 'jsMath' ) {   $env{'form.texengine'}        eq 'jsMath' ) {
  return &Apache::lontexconvert::jsMath_header();   return &Apache::lontexconvert::jsMath_header();
Line 211  sub mimetex_converted { Line 218  sub mimetex_converted {
     if ($displaystyle) {      if ($displaystyle) {
  $$texstring='\\displaystyle \\Large '.$$texstring;   $$texstring='\\displaystyle \\Large '.$$texstring;
     }      }
     my $result='<img src="/cgi-bin/mimetex.cgi?'.&Apache::lonnet::escape($$texstring).'" />';      my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />';
     if ($displaystyle) {      if ($displaystyle) {
  $result='<center>'.$result.'</center>';   $result='<center>'.$result.'</center>';
     }      }
Line 345  sub postprocess_algebra { Line 352  sub postprocess_algebra {
     # moodle had these and I don't know why, ignoring them for now      # moodle had these and I don't know why, ignoring them for now
     # $string =~s/\\fun/ /g;      # $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      # sqrt(3,4) means the 4 root of 3
     $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;      $string =~s/\\sqrt{([^,]+),([^\}]+)}/\\sqrt[$2]{$1}/gs;
   

Removed from v.1.74  
changed lines
  Added in v.1.77


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>