--- loncom/xml/lontexconvert.pm 2006/11/09 21:31:54 1.81
+++ loncom/xml/lontexconvert.pm 2009/08/12 20:31:08 1.97
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# TeX Conversion Module
#
-# $Id: lontexconvert.pm,v 1.81 2006/11/09 21:31:54 albertel Exp $
+# $Id: lontexconvert.pm,v 1.97 2009/08/12 20:31:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,9 @@ use Apache::lonlocal;
use Apache::lonnet;
use lib '/home/httpd/lib/perl/';
use LONCAPA;
-
+use URI::Escape;
+use IO::Socket::INET;
+use IO::Socket::SSL;
# ====================================================================== Header
@@ -79,10 +81,7 @@ sub init_tth {
$Apache::lontexconvert::messedup=0;
-# we need this routine because &converted can get called from inside
-# of the safespace (through &xmlparse('
jsMath.Process()'."\n";
}
+ sub jsMath_state {
+ my ($level) = @_;
+ return $jsMath_sent_header[$level];
+ }
+}
+
+sub tex_engine {
+ if (exists($env{'form.texengine'})) {
+ if ($env{'form.texengine'} ne '') {
+ return $env{'form.texengine'};
+ }
+ }
+ if ($env{'request.course.id'}
+ && exists($env{'course.'.$env{'request.course.id'}.'.texengine'})) {
+ return $env{'course.'.$env{'request.course.id'}.'.texengine'};
+ }
+ if (exists($env{'environment.texengine'})) {
+ return $env{'environment.texengine'};
+ }
+ return 'tth';
}
sub init_math_support {
+ my ($inherit_jsmath) = @_;
&init_tth();
&Apache::lontexconvert::jsMath_push();
- if ($env{'environment.texengine'} eq 'jsMath' ||
- $env{'form.texengine'} eq 'jsMath' ) {
+ if (lc(&tex_engine()) eq 'jsmath' ||
+ ($inherit_jsmath && &jsMath_state(-2))) {
return &Apache::lontexconvert::jsMath_header();
}
return;
}
+sub mimetex_valign {
+ my ($esc_texstring)=@_;
+ my $valign = 0;
+ my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
+ my $hostname = &Apache::lonnet::hostname($lonhost);
+ my $protocol = $Apache::lonnet::protocol{$lonhost};
+ my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring;
+ my $socket;
+ &Apache::lonxml::start_alarm();
+ if ($protocol eq 'https') {
+ $socket = IO::Socket::SSL->new(PeerAddr => $hostname,
+ PeerPort => 'https(443)',
+ Proto => 'tcp');
+ } else {
+ $socket = IO::Socket::INET->new(PeerAddr => $hostname,
+ PeerPort => 'http(80)',
+ Proto => 'tcp');
+ }
+ if ($socket) {
+ my $headreq = "HEAD $path HTTP/1.0\r\n\r\n";
+ print $socket $headreq;
+ while (<$socket>) {
+ if (/Vertical\-Align\:\s*?([\-\d]+)/) {
+ $valign = $1;
+ }
+ }
+ if ($protocol eq 'https') {
+ $socket->close(SSL_no_shutdown => 1,
+ SSL_ctx_free => 1);
+ } else {
+ $socket->close();
+ }
+ }
+ &Apache::lonxml::end_alarm();
+ return $valign;
+}
+
sub mimetex_converted {
my $texstring=shift;
+
+# Alt-Argument for screen readers
+ my $alt_string=$$texstring;
+ $alt_string=~s/\"/\'\'/g;
+
+# Is this displaystyle?
+
my $displaystyle=&displaystyle($texstring);
+# Remove math environment delimiters
+
&clean_out_math_mode($texstring);
if ($displaystyle) {
$$texstring='\\displaystyle \\Large '.$$texstring;
}
- my $result='';
+ my $esc_texstring = &uri_escape($$texstring);
+ my $valign = &mimetex_valign($esc_texstring);
+ my $result='';
if ($displaystyle) {
$result='