[BACK]Return to lontexconvert.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lontexconvert.pm between versions 1.61 and 1.76

version 1.61, 2005/02/27 17:28:56 version 1.76, 2006/09/05 17:33:11
Line 42  package Apache::lontexconvert; Line 42  package Apache::lontexconvert;
 use strict;  use strict;
 use tth();  use tth();
 use vars qw($errorstring);  use vars qw($errorstring);
 use Apache();  #use Apache::lonxml();
 use Apache::lonmsg();  
 use Apache::lonxml();  
 use Apache::lonmenu();  
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 # ====================================================================== Header  # ====================================================================== Header
   
 sub init_tth {  sub init_tth {
     my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'};      my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'};
     if ($ENV{'browser.mathml'}) {      if ($options =~ /\S/) {
    $options = ' '.$options;
       } else {
    undef($options);
       }
       if ($env{'browser.mathml'}) {
  &tth::ttminit();   &tth::ttminit();
  if ($ENV{'browser.unicode'}) {   if ($env{'browser.unicode'}) {
     &tth::ttmoptions('-L -u1 '.$options);      &tth::ttmoptions('-L -u1'.$options);
  } else {   } else {
     &tth::ttmoptions('-L -u0 '.$options);      &tth::ttmoptions('-L -u0'.$options);
  }   }
     } else {      } else {
  &tth::tthinit();   &tth::tthinit();
  if ($ENV{'browser.unicode'}) {   if ($env{'browser.unicode'}) {
     &tth::tthoptions('-L -u1 '.$options);      &tth::tthoptions('-L -u1'.$options);
  } else {   } else {
     &tth::tthoptions('-L -u0 '.$options);      &tth::tthoptions('-L -u0'.$options);
  }   }
     }      }
 }  }
   
 sub header {  
     $errorstring='';  
     my $time=time;  
     &init_tth();  
     return &Apache::lonxml::xmlbegin().  
  "\n<head>\n".  
  &Apache::lonxml::fontsettings().  
  &Apache::lonmenu::registerurl(undef,'tex').  
  "\n</head>\n";  
 }  
   
 # ================================================================== Conversion  # ================================================================== Conversion
   
 $Apache::lontexconvert::messedup=0;  $Apache::lontexconvert::messedup=0;
Line 98  sub convert_real { Line 93  sub convert_real {
  $Apache::lontexconvert::messedup=1;   $Apache::lontexconvert::messedup=1;
  die &mt("TeX unconverted due to errors");   die &mt("TeX unconverted due to errors");
     };      };
     alarm($Apache::lonnet::perlvar{'lonScriptTimeout'});      &Apache::lonxml::start_alarm();
     if ($ENV{'browser.mathml'}) {      if ($env{'browser.mathml'}) {
  $xmlstring=&tth::ttm($$texstring);   $xmlstring=&tth::ttm($$texstring);
  $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;   $xmlstring=~s/\<math\>/\<math xmlns=\"\&mathns\;\"\>/g;
  $xmlstring=~s/\<br\>/\<br\/\>/g;   $xmlstring=~s/\<br\>/\<br\/\>/g;
Line 113  sub convert_real { Line 108  sub convert_real {
     $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;      $xmlstring=~s/^\s*\<br clear\=\"all\"/\<br/s;
     $xmlstring=~s/^\s*//;      $xmlstring=~s/^\s*//;
     $xmlstring=~s/\s*$//;      $xmlstring=~s/\s*$//;
     alarm(0);      &Apache::lonxml::end_alarm();
     return ($xmlstring,$errorstring);      return ($xmlstring,$errorstring);
 }  }
   
Line 136  ENDCONV Line 131  ENDCONV
  $errorstring) {   $errorstring) {
  &Apache::lonnet::logthis("Trying to kill myself");   &Apache::lonnet::logthis("Trying to kill myself");
  $Apache::lontexconvert::messedup=1;   $Apache::lontexconvert::messedup=1;
  my $request=Apache->request();   if (ref($Apache::lonxml::request)) {
  $request->child_terminate();      $Apache::lonxml::request->child_terminate();
    } else {
       my $request;
       eval { $request=Apache->request; };
       if (!$request) {
    eval { $request=Apache2::RequestUtil->request; };
       }
       if ($request) {
    $request->child_terminate();
       } else {
    &Apache::lonnet::logthis("Unable to find a request to do child_terminate on");
       }
    }
     }      }
     return $xmlstring;      return $xmlstring;
 }  }
   
   sub clean_out_math_mode {
       my ($texstring)=@_;
       $$texstring=~s/(?!\\)\$//g;
       $$texstring=~s/\\[\)\(\]\[]//g;
       $$texstring=~s/\\ensuremath//g;
       return '';
   }
   
   sub displaystyle {
       my ($texstring)=@_;
       #has a $$ or \[ or \displaystyle in it, guessinng it's display mode
       if ($$texstring=~/[^\\]\$\$/ ||
    $$texstring=~/\\\[/ ||
    $$texstring=~/\\displaystyle/) { return 1; }
       return 0;
   }
   
 sub jsMath_converted {  sub jsMath_converted {
     my $texstring=shift;      my $texstring=shift;
     my $tag='span';      my $tag='span';
     if ($$texstring=~/[^\\]\$\$/) {      if (&displaystyle($texstring)) { $tag='div'; }
  #has a $$ in it, guessinng it's display mode      &clean_out_math_mode($texstring);
  $tag='div';      return &jsMath_header().
    '<'.$tag.' class="math">'.$$texstring.'</'.$tag.'>';
   }
   
   {
       my @jsMath_sent_header;
       sub jsMath_reset {
    undef(@jsMath_sent_header);
     }      }
     $$texstring=~s/(?!\\)\$//g;      sub jsMath_push {
     $$texstring=~s/\\ensuremath//g;   push(@jsMath_sent_header,0);
     return '<'.$tag.' class="math">'.$$texstring.'</'.$tag.'>';      }
       sub jsMath_header {
    return '' if $jsMath_sent_header[-1];
    $jsMath_sent_header[-1]=1;
    return
               '<script type="text/javascript">
                        function NoFontMessage () {}
                      </script>'."\n".
       '<script type="text/javascript" src="/adm/jsMath/jsMath.js"></script>'."\n";
       }
       sub jsMath_process {
    my $state = pop(@jsMath_sent_header);
    return '' if !$state;
    return '<script type="text/javascript">jsMath.Process()</script>';
       }
   }
   
   sub init_math_support {
       &init_tth();
       &Apache::lontexconvert::jsMath_push();
       if ($env{'environment.texengine'} eq 'jsMath' ||
    $env{'form.texengine'}        eq 'jsMath' ) {
    return &Apache::lontexconvert::jsMath_header();
       }
       return;
   }
   
   sub mimetex_converted {
       my $texstring=shift;
       my $displaystyle=&displaystyle($texstring);
   
       &clean_out_math_mode($texstring);
   
       if ($displaystyle) {
    $$texstring='\\displaystyle \\Large '.$$texstring;
       }
       my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />';
       if ($displaystyle) {
    $result='<center>'.$result.'</center>';
       }
       return $result;
 }  }
   
 sub converted {  sub converted {
     if ($ENV{'environment.texengine'} eq 'tth') {      my ($string,$mode)=@_;
  return &tth_converted;      if ($mode eq '') { $mode=$env{'environment.texengine'}; }
     } elsif ($ENV{'environment.texengine'} eq 'jsMath') {      if ($mode =~ /tth/i) {
  return &jsMath_converted;   return &tth_converted($string);
     }      } elsif ($mode =~ /jsmath/i) {
     return &tth_converted;   return &jsMath_converted($string);
 }      } elsif ($mode =~ /mimetex/i) {
    return &mimetex_converted($string);
 # ====================================================================== Footer      }
       return &tth_converted($string);
 sub footer {  
   my $xmlstring='';  
   if ($ENV{'request.state'} eq 'construct') {  
       $xmlstring.='<address>'.$errorstring.'</address>';  
   } else {  
       &Apache::lonmsg::author_res_msg($ENV{'request.filename'},$errorstring);  
   }  
 # -------------------------------------------------------------------- End Body  
   $xmlstring.=&Apache::lonxml::xmlend();  
   return $xmlstring;  
 }  }
   
 # ------------------------------------------------------------ Message display  # ------------------------------------------------------------ Message display
Line 189  sub to_convert { Line 250  sub to_convert {
   
 sub smiley {  sub smiley {
     my $expression=shift;      my $expression=shift;
     if ($ENV{'browser.imagesuppress'} eq 'on') { return $expression; }      if ($env{'browser.imagesuppress'} eq 'on') { return $expression; }
     my %smileys=('\:\-\)' => 'smiley',      my %smileys=('\:\-\)' => 'smiley',
  '8\-\)'  => 'coolsmile',   '8\-\)'  => 'coolsmile',
  '8\-(I|\|)'   => 'coolindiff',   '8\-(I|\|)'   => 'coolindiff',
Line 228  sub msgtexconverted { Line 289  sub msgtexconverted {
             $outmessage.=&smiley($_); $tex=1;              $outmessage.=&smiley($_); $tex=1;
  }   }
     }      }
       $message=$outmessage; $outmessage=''; $tex=0;
       foreach (split(/(?:\&lt\;|\<)\/*algebra\s*(?:\&gt\;|\>)/i,$message)) {
    if ($tex) {
       if ($email) {
    $outmessage.='</pre><tt>'.&algebra($_,'web').'</tt><pre>'; $tex=0;
       } else {
    $outmessage.=&algebra($_,'web'); $tex=0;
       }
    } else {
               $outmessage.=$_; $tex=1;
    }
       }
     if (wantarray) {      if (wantarray) {
  return ($outmessage,$errorstring);   return ($outmessage,$errorstring);
     } else {      } else {
Line 279  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;
   
     # sqrt(3,4) -> \sqrt\let{3,4\right}, which is annoying  
     $string =~s/\\left\{/\{/g;  
     $string =~s/\\right\}/\}/g;  
   
     # remove the extra () in the denominator of a \frac      # remove the extra () in the denominator of a \frac
     $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;      $string =~s/\\frac{(.+?)}{\\left\((.+?)\\right\)}/\\frac{$1}{$2}/gs;
           
Removed from v.1.61  
changed lines
  Added in v.1.76

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