--- loncom/xml/lontexconvert.pm 2009/01/12 04:46:48 1.95 +++ loncom/xml/lontexconvert.pm 2011/02/10 20:07:00 1.98.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # TeX Conversion Module # -# $Id: lontexconvert.pm,v 1.95 2009/01/12 04:46:48 raeburn Exp $ +# $Id: lontexconvert.pm,v 1.98.2.1 2011/02/10 20:07:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -49,7 +49,6 @@ use lib '/home/httpd/lib/perl/'; use LONCAPA; use URI::Escape; use IO::Socket::INET; -use IO::Socket::SSL; # ====================================================================== Header @@ -248,33 +247,21 @@ sub mimetex_valign { 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)', + my $socket = IO::Socket::INET->new(PeerAddr => $hostname, + PeerPort => 'http(80)', 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\nUser-Agent: Mozilla/5.0\r\n\r\n"; + 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(); - } + $socket->close(); } &Apache::lonxml::end_alarm(); return $valign; @@ -282,8 +269,17 @@ sub mimetex_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) { @@ -291,7 +287,7 @@ sub mimetex_converted { } my $esc_texstring = &uri_escape($$texstring); my $valign = &mimetex_valign($esc_texstring); - my $result=''; + my $result=''; if ($displaystyle) { $result='