version 1.92, 2008/12/04 09:51:14
|
version 1.94, 2009/01/02 01:22:33
|
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; |
use URI::Escape; |
|
use IO::Socket::INET; |
|
use IO::Socket::SSL; |
|
|
# ====================================================================== Header |
# ====================================================================== Header |
|
|
Line 243 sub init_math_support {
|
Line 244 sub init_math_support {
|
} |
} |
|
|
sub mimetex_valign { |
sub mimetex_valign { |
my ($texstring)=@_; |
my ($esc_texstring)=@_; |
my $ua = LWP::UserAgent->new; #from the perldoc of LWP::UserAgent |
my $valign = 0; |
$ua->timeout(10); |
my $lonhost = $Apache::lonnet::perlvar{'lonHostID'}; |
$ua->env_proxy; |
my $hostname = &Apache::lonnet::hostname($lonhost); |
#header without imagedata saved to response: |
my $protocol = $Apache::lonnet::protocol{$lonhost}; |
my $response = $ua->head('http://lcdevhost.localdomain/cgi-bin/mimetex.cgi?'.$texstring); |
my $path = '/cgi-bin/mimetex.cgi?'.$esc_texstring; |
if ($response->is_success) { |
my $socket; |
#get the valign-value: |
&Apache::lonxml::start_alarm(); |
return($response->headers->{'vertical-align'});} |
if ($protocol eq 'https') { |
else { |
$socket = IO::Socket::SSL->new(PeerAddr => $hostname, |
return(0); #if (error) than continue without valign |
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 User-Agent: Mozilla/5.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 { |
sub mimetex_converted { |
Line 266 sub mimetex_converted {
|
Line 289 sub mimetex_converted {
|
if ($displaystyle) { |
if ($displaystyle) { |
$$texstring='\\displaystyle \\Large '.$$texstring; |
$$texstring='\\displaystyle \\Large '.$$texstring; |
} |
} |
|
my $esc_texstring = &uri_escape($$texstring); |
# FIXME |
my $valign = &mimetex_valign($esc_texstring); |
# this is the line that calls the new function mimetex_valign above: |
my $result='<img src="/cgi-bin/mimetex.cgi?'.$esc_texstring.'" style="vertical-align:'.$valign.'px" alt="$'.$$texstring.'$" />'; |
# my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" style="vertical-align:'.&mimetex_valign($$texstring).'px" alt="$'.$$texstring.'$" />'; |
|
# |
|
# this line is the old implementation without valign of the images: |
|
my $result='<img src="/cgi-bin/mimetex.cgi?'.&escape($$texstring).'" alt="$'.$$texstring.'$" />'; |
|
if ($displaystyle) { |
if ($displaystyle) { |
$result='<center>'.$result.'</center>'; |
$result='<center>'.$result.'</center>'; |
} |
} |