loncom/xml/lontexconvert.pm - diff

Return to lontexconvert.pm CVS log

Up to [LON-CAPA] / loncom / xml

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

-version 1.61, 2005/02/27 17:28:56
+version 1.62, 2005/02/28 19:08:11
  Line 142  ENDCONV
      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 {
      my $texstring=shift;
      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';
-     }
-     $$texstring=~s/(?!\\)\$//g;
-     $$texstring=~s/\\ensuremath//g;
      return '<'.$tag.' class="math">'.$$texstring.'</'.$tag.'>';
  }
+ 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?'.&Apache::lonnet::escape($$texstring).'" />';
+     if ($displaystyle) {
+ 	$result='<center>'.$result.'</center>';
+     }
+     return $result;
+ }
  sub converted {
      if ($ENV{'environment.texengine'} eq 'tth') {
  	return &tth_converted;
      } elsif ($ENV{'environment.texengine'} eq 'jsMath') {
  	return &jsMath_converted;
+     } elsif ($ENV{'environment.texengine'} eq 'mimetex') {
+ 	return &mimetex_converted;
      }
      return &tth_converted;
  }

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

Removed from v.1.61
changed lines
	Added in v.1.62