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

Diff for /loncom/xml/lontexconvert.pm between versions 1.86 and 1.93

version 1.86, 2008/01/29 11:18:06 version 1.93, 2008/12/04 19:53:53
Line 47  use Apache::lonlocal; Line 47  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA;  use LONCAPA;
   use LWP::UserAgent;
     
   
 # ====================================================================== Header  # ====================================================================== Header
Line 79  sub init_tth { Line 80  sub init_tth {
   
 $Apache::lontexconvert::messedup=0;  $Apache::lontexconvert::messedup=0;
   
 # we need this routine because &converted can get called from inside  
 # of the safespace (through &xmlparse('<m>stuff</m>') which doesn't  
 # allow the opcode for alarm, so we need to compile this before we get  
 # into the safe space since opcode checks only occur at compile time  
 sub convert_real {  sub convert_real {
     my ($texstring)=@_;      my ($texstring)=@_;
     my ($xmlstring,$errorstring);      my ($xmlstring,$errorstring);
Line 113  sub convert_real { Line 111  sub convert_real {
     # reasonably well to &#8660;.  If we get many more of these,      # reasonably well to &#8660;.  If we get many more of these,
     # we're going to need to have a translation sub.      # we're going to need to have a translation sub.
     #      #
     $xmlstring=~s/\\rightleftharpoons/\&\#8660;/g;      my $lrharpoon = pack("U", 0x21cc);
       $xmlstring=~s/\\rightleftharpoons/$lrharpoon/g;
   
     &Apache::lonxml::end_alarm();      &Apache::lonxml::end_alarm();
     return ($xmlstring,$errorstring);      return ($xmlstring,$errorstring);
Line 218  sub jsMath_converted { Line 217  sub jsMath_converted {
   
 sub tex_engine {  sub tex_engine {
     if (exists($env{'form.texengine'})) {      if (exists($env{'form.texengine'})) {
  return $env{'form.texengine'};   if ($env{'form.texengine'} ne '') {
               return $env{'form.texengine'};
           }
     }          }    
     if ($env{'request.course.id'}      if ($env{'request.course.id'}
  && exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) {   && exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) {
Line 241  sub init_math_support { Line 242  sub init_math_support {
     return;      return;
 }  }
   
   sub mimetex_valign {
       my ($texstring)=@_;
       my $ua = LWP::UserAgent->new; #from the perldoc of LWP::UserAgent
       $ua->timeout(10); 
       $ua->env_proxy;
       #header without imagedata saved to response:
       my $response = $ua->head('http://localhost.localdomain/cgi-bin/mimetex.cgi?'.$texstring);
       if ($response->is_success) {
           #get the valign-value:
           return($response->headers->{'vertical-align'});}
       else {
           return(0); #if (error) than continue without valign
       }
   }
   
 sub mimetex_converted {  sub mimetex_converted {
     my $texstring=shift;      my $texstring=shift;
     my $displaystyle=&displaystyle($texstring);      my $displaystyle=&displaystyle($texstring);
Line 250  sub mimetex_converted { Line 266  sub mimetex_converted {
     if ($displaystyle) {      if ($displaystyle) {
  $$texstring='\\displaystyle \\Large '.$$texstring;   $$texstring='\\displaystyle \\Large '.$$texstring;
     }      }
     my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" />';  
      my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" style="vertical-align:'.&mimetex_valign($$texstring).'px" alt="$'.$$texstring.'$" />';
     if ($displaystyle) {      if ($displaystyle) {
  $result='<center>'.$result.'</center>';   $result='<center>'.$result.'</center>';
     }      }
Line 350  sub msgtexconverted { Line 367  sub msgtexconverted {
 sub algebra {  sub algebra {
     use AlgParser;      use AlgParser;
   
     my ($string,$target,$style)=@_;      my ($string,$target,$style,$parstack,$safeeval)=@_;
     my $parser = new AlgParserWithImplicitExpand;      my $parser = new AlgParserWithImplicitExpand;
     $string=&prepare_algebra($string);      $string=&prepare_algebra($string);
     my $ret = $parser->parse($string);      my $ret = $parser->parse($string);
Line 367  sub algebra { Line 384  sub algebra {
     $latex='\\ensuremath{'.$latex.'}';      $latex='\\ensuremath{'.$latex.'}';
  }   }
  if ($target eq 'web' || $target eq 'analyze') {   if ($target eq 'web' || $target eq 'analyze') {
     $result = &converted(\$latex);              my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval);
               $result = &converted(\$latex,$display);
   #    $result = &converted(\$latex);
  } else {   } else {
     $result = $latex;      $result = $latex;
  }   }
Line 414  sub postprocess_algebra { Line 433  sub postprocess_algebra {
 __END__  __END__
   
   
   =pod
   
   =head1 NAME
   
   Apache::lontexconvert;
   
   =head1 SYNOPSIS
   
   Access to tth/ttm
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   
   =head1 SUBROUTINES
   
   =over
   
   =item init_tth()
   
   Header
   
   =item convert_real()
   
    we need this routine because &converted can get called from inside
    of the safespace (through &xmlparse('<m>stuff</m>') which doesn't
    allow the opcode for alarm, so we need to compile this before we get
    into the safe space since opcode checks only occur at compile time
   
   =item tth_converted()
   
   
   =item clean_out_math_mode()
   
   
   =item displaystyle()
   
   
   =item jsMath_converted()
   
   
   =item tex_engine()
   
   
   =item init_math_support()
   
   
   =item mimetex_converted()
   
   
   =item converted()
   
   
   =item to_convert()
   
   message display
   
   =item smiley()
   
   ???
   
   =item msgtexconverted()
   
   =item algebra()
   
   =item prepare_algebra()
   
   =item postprocess_algebra()
   
   =back
   
   =cut
   
   
   
Removed from v.1.86  
changed lines
  Added in v.1.93

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