version 1.255, 2005/02/09 19:51:43
|
version 1.277, 2005/07/07 10:09:50
|
Line 39
|
Line 39
|
|
|
package Apache::londefdef; |
package Apache::londefdef; |
|
|
use Apache::lonnet(); |
use Apache::lonnet; |
use strict; |
use strict; |
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::File(); |
use Apache::File(); |
Line 84 sub start_m {
|
Line 84 sub start_m {
|
my $currentstring = ''; |
my $currentstring = ''; |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
if ($target eq 'web' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'analyze') { |
$inside ='\\documentstyle{article}'.$inside; |
|
&Apache::lonxml::debug("M is starting with:$inside:"); |
&Apache::lonxml::debug("M is starting with:$inside:"); |
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); |
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval); |
if ($eval eq 'on') { |
if ($eval eq 'on') { |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
#&Apache::lonxml::debug("M is evaulated to:$inside:"); |
#&Apache::lonxml::debug("M is evaulated to:$inside:"); |
} |
} |
$currentstring = &Apache::lontexconvert::converted(\$inside); |
my $display=&Apache::lonxml::get_param('display',$parstack,$safeeval); |
|
$currentstring = &Apache::lontexconvert::converted(\$inside,$display); |
if ($Apache::lontexconvert::errorstring) { |
if ($Apache::lontexconvert::errorstring) { |
&Apache::lonxml::warning("tth error: ". |
&Apache::lonxml::warning("tth error: ". |
$Apache::lontexconvert::errorstring); |
$Apache::lontexconvert::errorstring); |
Line 106 sub start_m {
|
Line 106 sub start_m {
|
$currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]); |
$currentstring=&Apache::run::evaluate($currentstring,$safeeval,$$parstack[-1]); |
} |
} |
if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} |
if ($currentstring=~/^(\s*\\\\\s*)*$/) {$currentstring = ' \vskip 0 mm ';} |
|
# detect simple math mode entry exits, and convert them |
|
# to use \ensuremath |
|
if ($currentstring=~/^\s*\$[^\$].*[^\$]\$\s*$/) { |
|
$currentstring=~s/^\$//; |
|
$currentstring=~s/\$$//; |
|
$currentstring='\ensuremath{'.$currentstring.'}'; |
|
} |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} |
} |
return $currentstring; |
return $currentstring; |
Line 126 sub start_tthoption {
|
Line 133 sub start_tthoption {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser); |
my $inside = &Apache::lonxml::get_all_text("/tthoption",$parser); |
$inside=~s/^\s*//; |
$inside=~s/^\s*//; |
if ($ENV{'browser.mathml'}) { |
if ($env{'browser.mathml'}) { |
&tth::ttmoptions($inside); |
&tth::ttmoptions($inside); |
} else { |
} else { |
&tth::tthoptions($inside); |
&tth::tthoptions($inside); |
Line 145 sub end_tthoption {
|
Line 152 sub end_tthoption {
|
sub start_html { |
sub start_html { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; |
my $options=$env{'course.'.$env{'request.course.id'}.'.tthoptions'}; |
&Apache::lontexconvert::init_tth(); |
&Apache::lontexconvert::init_tth(); |
if ($target eq 'web' || $target eq 'edit') { |
if ($target eq 'web' || $target eq 'edit' || $target eq 'webgrade' ) { |
$currentstring = &Apache::lonxml::xmlbegin(); |
$currentstring = &Apache::lonxml::xmlbegin(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
@Apache::londefdef::table = (); |
|
$currentstring .= '\documentclass[letterpaper]{article}'; |
$currentstring .= '\documentclass[letterpaper]{article}'; |
if (($ENV{'form.latex_type'}=~'batchmode') || |
if (($env{'form.latex_type'}=~'batchmode') || |
(!$ENV{'request.role.adv'})) {$currentstring .='\batchmode';} |
(!$env{'request.role.adv'})) {$currentstring .='\batchmode';} |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
$currentstring .= '\newcommand{\keephidden}[1]{}'. |
'\renewcommand{\deg}{$^{\circ}$}'. |
'\renewcommand{\deg}{$^{\circ}$}'. |
'\usepackage{longtable}'. |
'\usepackage{longtable}'. |
Line 178 sub end_html {
|
Line 184 sub end_html {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = &Apache::lonxml::xmlend($target,$parser); |
$currentstring = '</html>'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 196 sub start_head {
|
Line 202 sub start_head {
|
sub end_head { |
sub end_head { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' && $ENV{'request.state'} eq 'published') { |
if ($target eq 'web' && $env{'request.state'} eq 'published') { |
$currentstring = &Apache::lonmenu::registerurl(undef,$target). |
$currentstring = &Apache::lonmenu::registerurl(undef,$target). |
$token->[2]; |
$token->[2]; |
} |
} |
Line 484 sub start_body {
|
Line 490 sub start_body {
|
return ''; |
return ''; |
} |
} |
if (!$Apache::lonxml::registered && |
if (!$Apache::lonxml::registered && |
$ENV{'request.state'} eq 'published') { |
$env{'request.state'} eq 'published') { |
$currentstring.='<head>'. |
$currentstring.='<head>'. |
&Apache::lonmenu::registerurl(undef,$target).'</head>'; |
&Apache::lonmenu::registerurl(undef,$target).'</head>'; |
} |
} |
# Accessibility |
# Accessibility |
if ($ENV{'browser.imagesuppress'} eq 'on') { |
if ($env{'browser.imagesuppress'} eq 'on') { |
delete($token->[2]->{'background'}); |
delete($token->[2]->{'background'}); |
} |
} |
if ($ENV{'browser.fontenhance'} eq 'on') { |
if ($env{'browser.fontenhance'} eq 'on') { |
my $style=''; |
my $style=''; |
foreach my $key (keys(%{$token->[2]})) { |
foreach my $key (keys(%{$token->[2]})) { |
if ($key =~ /^style$/i) { |
if ($key =~ /^style$/i) { |
Line 502 sub start_body {
|
Line 508 sub start_body {
|
} |
} |
$token->[2]->{'style'}=$style.'; font-size: x-large;'; |
$token->[2]->{'style'}=$style.'; font-size: x-large;'; |
} |
} |
if ($ENV{'browser.blackwhite'} eq 'on') { |
if ($env{'browser.blackwhite'} eq 'on') { |
delete($token->[2]->{'font'}); |
delete($token->[2]->{'font'}); |
delete($token->[2]->{'link'}); |
delete($token->[2]->{'link'}); |
delete($token->[2]->{'alink'}); |
delete($token->[2]->{'alink'}); |
Line 529 sub start_body {
|
Line 535 sub start_body {
|
$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents(). |
$token->[2]->{'onunload'}=&Apache::lonmenu::unloadevents(). |
';'.$onUnload; |
';'.$onUnload; |
|
|
if ($ENV{'request.state'} ne 'construct') { |
if ($env{'request.state'} ne 'construct') { |
$currentstring .= '<'.$token->[1]; |
$currentstring .= '<'.$token->[1]; |
} |
} |
foreach (keys %{$token->[2]}) { |
foreach (keys %{$token->[2]}) { |
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; |
$currentstring.=' '.$_.'="'.$token->[2]->{$_}.'"'; |
} |
} |
if ($ENV{'request.state'} ne 'construct') { |
if ($env{'request.state'} ne 'construct') { |
$currentstring.='>'; |
$currentstring.='>'; |
} |
} |
if ($ENV{'request.state'} ne 'published') { |
if ($env{'request.state'} ne 'published') { |
my $remote=($ENV{'environment.remote'} ne 'off'); |
my $remote=($env{'environment.remote'} ne 'off'); |
$currentstring=&Apache::loncommon::bodytag(undef,undef, |
$currentstring=&Apache::loncommon::bodytag(undef,undef, |
$currentstring,$remote); |
$currentstring,$remote); |
$currentstring.=(<<EDITBUTTON); |
$currentstring.=(<<EDITBUTTON); |
Line 558 EDITBUTTON
|
Line 564 EDITBUTTON
|
} |
} |
|
|
sub end_body { |
sub end_body { |
my ($target,$token) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off unclosed <p> |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring .= &Apache::lonxml::xmlend($target,$parser); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}'; |
$currentstring .= '\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent \end{document}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 571 sub end_body {
|
Line 577 sub end_body {
|
#-- <center> tag (end tag required) |
#-- <center> tag (end tag required) |
sub start_center { |
sub start_center { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any prior para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\begin{center}'; |
$currentstring .= '\begin{center}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 640 sub end_strong {
|
Line 646 sub end_strong {
|
#-- <h1> tag (end tag required) |
#-- <h1> tag (end tag required) |
sub start_h1 { |
sub start_h1 { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any prior para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 655 sub start_h1 {
|
Line 661 sub start_h1 {
|
} |
} |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
if (not defined $TeXsize) {$TeXsize="large";} |
if (not defined $TeXsize) {$TeXsize="large";} |
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; |
$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$currentstring='<subject>'; |
$currentstring.='<subject>'; |
&start_output($target); |
&start_output($target); |
} |
} |
return $currentstring; |
return $currentstring; |
Line 689 sub end_h1 {
|
Line 695 sub end_h1 {
|
#-- <h2> tag |
#-- <h2> tag |
sub start_h2 { |
sub start_h2 { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any prior para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 704 sub start_h2 {
|
Line 710 sub start_h2 {
|
} |
} |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
if (not defined $TeXsize) {$TeXsize="large";} |
if (not defined $TeXsize) {$TeXsize="large";} |
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; |
$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 732 sub end_h2 {
|
Line 738 sub end_h2 {
|
#-- <h3> tag |
#-- <h3> tag |
sub start_h3 { |
sub start_h3 { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any prior para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 747 sub start_h3 {
|
Line 753 sub start_h3 {
|
} |
} |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
if (not defined $TeXsize) {$TeXsize="large";} |
if (not defined $TeXsize) {$TeXsize="large";} |
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; |
$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 775 sub end_h3 {
|
Line 781 sub end_h3 {
|
#-- <h4> tag |
#-- <h4> tag |
sub start_h4 { |
sub start_h4 { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any prior para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 790 sub start_h4 {
|
Line 796 sub start_h4 {
|
} |
} |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
if (not defined $TeXsize) {$TeXsize="large";} |
if (not defined $TeXsize) {$TeXsize="large";} |
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; |
$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 818 sub end_h4 {
|
Line 824 sub end_h4 {
|
#-- <h5> tag |
#-- <h5> tag |
sub start_h5 { |
sub start_h5 { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any prior paras. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 833 sub start_h5 {
|
Line 839 sub start_h5 {
|
} |
} |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
if (not defined $TeXsize) {$TeXsize="large";} |
if (not defined $TeXsize) {$TeXsize="large";} |
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; |
$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 861 sub end_h5 {
|
Line 867 sub end_h5 {
|
#-- <h6> tag |
#-- <h6> tag |
sub start_h6 { |
sub start_h6 { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any prior paras. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 876 sub start_h6 {
|
Line 882 sub start_h6 {
|
} |
} |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval,undef,0); |
if (not defined $TeXsize) {$TeXsize="large";} |
if (not defined $TeXsize) {$TeXsize="large";} |
$currentstring .= $pre.'{\\'.$TeXsize.' \textbf{'; |
$currentstring .= '\strut\newline '.$pre.'{\\'.$TeXsize.' \textbf{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1108 sub end_q {
|
Line 1114 sub end_q {
|
return $currentstring; |
return $currentstring; |
} |
} |
|
|
|
# <p> is a bit strange since it does not require a closing </p> |
|
# However in latex, we must often output closing stuff to end |
|
# environments and {}'s etc. Therefore we do all the work |
|
# of figuring out the ending strings in the start tag processing, |
|
# and provide a mechanism to output the stop text external |
|
# to tag processing. |
|
# |
|
{ |
|
|
|
my $closing_string = ''; # String required to close <p> |
|
|
#-- <p> tag (end tag optional) |
#-- <p> tag (end tag optional) |
#optional attribute - align="center|left|right" |
#optional attribute - align="center|left|right" |
sub start_p { |
sub start_p { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # close off prior para if in progress. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
|
$closing_string = '</p>'; # Not sure this is correct. |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if ($align eq 'center') { |
if ($align eq 'center') { |
$currentstring='\begin{center}\par'; |
$currentstring .='\begin{center}\par'; |
|
$closing_string = '\end{center}'; |
} elsif ($align eq 'right') { |
} elsif ($align eq 'right') { |
$currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{'; |
$currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{'; |
|
$closing_string= '}}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
$currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{'; |
$currentstring.='\noindent\makebox['.$env{'form.textwidth'}.']{\rlap{'; |
|
$closing_string = '}\hfill}'; |
} else { |
} else { |
$currentstring='\par '; |
$currentstring.='\par '; |
|
$closing_string = '\strut\\\\\strut'; |
} |
} |
my $signal=1;#<p> does not work inside <b>...</b> |
my $signal=1;#<p> does not work inside <b>...</b> |
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;} |
foreach my $tag (@$tagstack) { |
if (!$signal) {$currentstring = '';} |
if (lc($tag) eq 'b') { |
|
$signal=0; |
|
} |
|
} |
|
if (!$signal) { |
|
$currentstring = &end_p; # Just close the prior? Not sure this is correct |
|
$closing_string = ''; # Probably correct? |
} |
} |
} |
|
return $currentstring; |
|
} |
|
|
|
sub end_p { |
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
|
my $currentstring = ''; |
|
if ($target eq 'web') { |
|
$currentstring .= $token->[2]; |
|
} elsif ($target eq 'tex') { |
|
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
|
if (not defined $align) { |
|
$currentstring.='\strut\\\\\strut '; |
|
} elsif ($align eq 'center') { |
|
$currentstring .= '\end{center}'; |
|
} elsif ($align eq 'right') { |
|
$currentstring .= '}}'; |
|
} elsif ($align eq 'left') { |
|
$currentstring .= '}\hfill}'; |
|
} |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
# |
|
# End paragraph processing just requires that we output the |
|
# closing string that was saved and blank it. |
|
sub end_p { |
|
my $current_string = $closing_string; |
|
$closing_string = ''; # Not in a para anymore. |
|
return $current_string; |
|
|
|
} |
|
} |
#-- <br> tag (end tag forbidden) |
#-- <br> tag (end tag forbidden) |
sub start_br { |
sub start_br { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
Line 1271 sub start_font {
|
Line 1289 sub start_font {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); |
my $face=&Apache::lonxml::get_param('face',$parstack,$safeeval); |
if ($face!~/symbol/i) { |
if ($face!~/symbol/i) { |
if (($ENV{'browser.fontenhance'} eq 'on') || |
if (($env{'browser.fontenhance'} eq 'on') || |
($ENV{'browser.blackwhite'} eq 'on')) { return ''; } |
($env{'browser.blackwhite'} eq 'on')) { return ''; } |
} |
} |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 1399 sub end_sup {
|
Line 1417 sub end_sup {
|
#-- <hr> tag (end tag forbidden) |
#-- <hr> tag (end tag forbidden) |
sub start_hr { |
sub start_hr { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # End enclosing para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 1439 sub end_hr {
|
Line 1457 sub end_hr {
|
#-- <div> tag (end tag required) |
#-- <div> tag (end tag required) |
sub start_div { |
sub start_div { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close enclosing para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} |
} |
Line 1521 sub start_li {
|
Line 1539 sub start_li {
|
|
|
sub end_li { |
sub end_li { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # In case there's a <p> in the <li> |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring .= $token->[2]; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1557 sub end_u {
|
Line 1575 sub end_u {
|
#-- <ul> tag (end tag required) |
#-- <ul> tag (end tag required) |
sub start_ul { |
sub start_ul { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off enclosing list. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
$Apache::londefdef::list_index=0; |
$Apache::londefdef::list_index=0; |
Line 1624 sub end_menu {
|
Line 1642 sub end_menu {
|
#-- <dir> tag (end tag required) |
#-- <dir> tag (end tag required) |
sub start_dir { |
sub start_dir { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # In case there's a <p> prior to the list. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = " \\begin{itemize} "; |
$currentstring .= " \\begin{itemize} "; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1647 sub end_dir {
|
Line 1665 sub end_dir {
|
#-- <ol> tag (end tag required) |
#-- <ol> tag (end tag required) |
sub start_ol { |
sub start_ol { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # In case there's a <p> prior to the list. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$Apache::londefdef::list_index=0; |
$Apache::londefdef::list_index=0; |
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0); |
Line 1701 sub end_ol {
|
Line 1719 sub end_ol {
|
#-- <dl> tag (end tag required) |
#-- <dl> tag (end tag required) |
sub start_dl { |
sub start_dl { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # In case there's a <p> unclosed prior to the list. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\begin{description}'; |
$currentstring .= '\begin{description}'; |
$Apache::londefdef::DL++; |
$Apache::londefdef::DL++; |
push(@Apache::londefdef::description,[]); |
push(@Apache::londefdef::description,[]); |
$Apache::londefdef::DD[$Apache::londefdef::DL]=0; |
$Apache::londefdef::DD[$Apache::londefdef::DL]=0; |
Line 1808 sub end_dd {
|
Line 1826 sub end_dd {
|
} |
} |
|
|
#-- <table> tag (end tag required) |
#-- <table> tag (end tag required) |
|
# <table> also ends any prior <p> that is not closed. |
|
# but, unless I allow <p>'s to nest, that's the |
|
# only way I could think of to allow <p> in |
|
# <tr> <th> bodies |
|
# |
#list of supported attributes: border,width,TeXwidth |
#list of supported attributes: border,width,TeXwidth |
sub start_table { |
sub start_table { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($textwidth,$currentstring)=('',''); |
my $textwidth = ''; |
|
my $currentstring = &end_p; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $aa = {}; |
my $aa = {}; |
push @Apache::londefdef::table, $aa; |
push @Apache::londefdef::table, $aa; |
$Apache::londefdef::table[-1]{'row_number'} = -1; |
$Apache::londefdef::table[-1]{'row_number'} = -1; |
#maximum table's width (default coincides with text line length) |
#maximum table's width (default coincides with text line length) |
if ($#Apache::londefdef::table==0) { |
if ($#Apache::londefdef::table==0) { |
$textwidth=&recalc($ENV{'form.textwidth'}); #result is always in mm |
$textwidth=&recalc($env{'form.textwidth'}); #result is always in mm |
$textwidth=~/(\d+\.?\d*)/; |
$textwidth=~/(\d+\.?\d*)/; |
$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame |
$textwidth=0.95*$1; #accounts "internal" LaTeX space for table frame |
} else { |
} else { |
Line 1877 sub start_table {
|
Line 1901 sub start_table {
|
$Apache::londefdef::table[-1]{'minlen'}=[]; |
$Apache::londefdef::table[-1]{'minlen'}=[]; |
$Apache::londefdef::table[-1]{'content'}=[]; |
$Apache::londefdef::table[-1]{'content'}=[]; |
$Apache::londefdef::table[-1]{'align'}=[]; |
$Apache::londefdef::table[-1]{'align'}=[]; |
$currentstring='\keephidden{NEW TABLE ENTRY}'; |
$currentstring.='\keephidden{NEW TABLE ENTRY}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 2131 sub start_tr {
|
Line 2155 sub start_tr {
|
|
|
sub end_tr { |
sub end_tr { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close any pending <p> in the row. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
if ($Apache::londefdef::TD_redirection) { |
if ($Apache::londefdef::TD_redirection) { |
&end_td_tex($parstack,$parser,$safeeval); |
&end_td_tex($parstack,$parser,$safeeval); |
Line 2408 sub end_th_tex {
|
Line 2432 sub end_th_tex {
|
|
|
sub end_th { |
sub end_th { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close any open <p> in the row. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$Apache::londefdef::TD_redirection =0; |
$Apache::londefdef::TD_redirection =0; |
&end_th_tex($parstack,$parser,$safeeval); |
&end_th_tex($parstack,$parser,$safeeval); |
Line 2444 sub start_img {
|
Line 2468 sub start_img {
|
# Render unto browsers that which are the browser's... |
# Render unto browsers that which are the browser's... |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($ENV{'browser.imagesuppress'} ne 'on') { |
if ($env{'browser.imagesuppress'} ne 'on') { |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); |
} else { |
} else { |
my $alttag= &Apache::lonxml::get_param |
my $alttag= &Apache::lonxml::get_param |
Line 2489 sub start_img {
|
Line 2513 sub start_img {
|
if(!$latex_rendering) { |
if(!$latex_rendering) { |
$latex_rendering = "parbox"; |
$latex_rendering = "parbox"; |
} |
} |
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); |
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
|
|
my $oldSRC=$src; |
|
$oldSRC=~s/\.(gif|jpg|png)$/\.eps/; |
|
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
|
#if original gif/jpg/png file exist do following: |
#if original gif/jpg/png file exist do following: |
|
my $origsrc=$src; |
|
my ($path,$file) = &get_eps_image($src); |
|
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
|
&Apache::lonxml::debug("path = $path file = $file src = $src"); |
if (-e $src) { |
if (-e $src) { |
#what is the image size? |
&Apache::lonxml::debug("$src exists"); |
my $width_param=&image_width($src,$scaling,$parstack,$safeeval); |
my ($height_param,$width_param)= |
my $height_param=&image_height($src,$scaling,$parstack,$safeeval); |
&image_size($origsrc,0.3,$parstack,$safeeval); |
my ($file,$path)=&file_path($src); |
my $destpath = $path; |
my $newsrc = $src; |
$destpath =~ s/ /\_/g; # Spaces in path cause LaTex to vomit. |
$newsrc =~ s/\.(gif|jpg|png)$/.eps/i; |
my $destfile = $file; |
&Apache::lonnet::repcopy($oldSRC); |
$destfile =~ s/ /\_/g; |
$file=~s/\.(gif|jpg|png)$/.eps/i; |
my $size; |
#where can we find the picture? |
if ($width_param) { $size.='width='.$width_param.' mm,'; } |
if (-e $newsrc) { |
if ($height_param) { $size.='height='.$height_param.' mm]'; } |
#eps counterpart for image exist |
$size='['.$size; |
if ($path) { |
$size=~s/,$/]/; |
$currentstring .= '\graphicspath{{'.$path.'}}' |
$currentstring .= '\graphicspath{{'.$destpath.'}}' |
.'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} '; |
.'\includegraphics'.$size.'{'.$destfile.'} '; |
} |
|
} else { |
|
#there is no eps counterpart for image - check for ps one |
|
$newsrc =~ s/\.eps$/\.ps/; |
|
if (-e $newsrc) { |
|
#ps counterpart for image exist |
|
$file =~ s/\.eps$/\.ps/; |
|
if ($path) { |
|
$currentstring .= '\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
|
} |
|
} else { |
|
#care about eps dynamical generation |
|
$currentstring.=&eps_generation($src,$file,$width_param); |
|
} |
|
} |
|
# If there's an alignment specification we need to honor it here. |
# If there's an alignment specification we need to honor it here. |
# For the horizontal alignments, we will also honor the |
# For the horizontal alignments, we will also honor the |
# value of the latex specfication. The default is parbox, |
# value of the latex specfication. The default is parbox, |
Line 2556 sub start_img {
|
Line 2567 sub start_img {
|
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
} |
} |
} else { |
} else { |
|
&Apache::lonxml::debug("$src does not exist"); |
#original image file doesn't exist so check the alt attribute |
#original image file doesn't exist so check the alt attribute |
my $alt = |
my $alt = |
&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); |
&Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1); |
Line 2563 sub start_img {
|
Line 2575 sub start_img {
|
$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src); |
$alt=&Apache::lonmeta::alttag($Apache::lonxml::pwd[-1],$src); |
} |
} |
|
|
if ($alt) { |
if ($alt) { $currentstring .= ' '.$alt.' '; } |
$currentstring .= ' '.$alt.' '; |
|
} else { |
|
#<allow> tag will care about replication |
|
} |
|
} |
} |
|
|
# And here's where the semi-quote breaks down: allow the user |
# And here's where the semi-quote breaks down: allow the user |
# to edit the beast as well by rendering the problem for edit: |
# to edit the beast as well by rendering the problem for edit: |
|
|
|
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$currentstring .=&Apache::edit::tag_start($target,$token); |
$currentstring .=&Apache::edit::tag_start($target,$token); |
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). |
$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). |
Line 2640 sub start_img {
|
Line 2646 sub start_img {
|
} |
} |
if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);} |
if ($ctag) {$currentstring=&Apache::edit::rebuild_tag($token);} |
} |
} |
|
|
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 2667 sub start_applet {
|
Line 2674 sub start_applet {
|
|
|
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($ENV{'browser.appletsuppress'} ne 'on') { |
if ($env{'browser.appletsuppress'} ne 'on') { |
$currentstring = &Apache::lonenc::encrypt_ref($token, |
$currentstring = &Apache::lonenc::encrypt_ref($token, |
{'code'=>$code, |
{'code'=>$code, |
'archive'=>$archive} |
'archive'=>$archive} |
Line 2713 sub start_embed {
|
Line 2720 sub start_embed {
|
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($ENV{'browser.embedsuppress'} ne 'on') { |
if ($env{'browser.embedsuppress'} ne 'on') { |
$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); |
$currentstring=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}); |
} else { |
} else { |
my $alttag=&Apache::lonxml::get_param |
my $alttag=&Apache::lonxml::get_param |
Line 2806 sub end_allow {
|
Line 2813 sub end_allow {
|
#-- <frameset> |
#-- <frameset> |
sub start_frameset { |
sub start_frameset { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; # Close any pending para. |
if ($target eq 'web') { |
if ($target eq 'web') { |
if (!$Apache::lonxml::registered && |
if (!$Apache::lonxml::registered && |
$ENV{'request.state'} eq 'published') { |
$env{'request.state'} eq 'published') { |
$currentstring.='<head>'. |
$currentstring.='<head>'. |
&Apache::lonmenu::registerurl(undef,$target).'</head>'; |
&Apache::lonmenu::registerurl(undef,$target).'</head>'; |
} |
} |
Line 2875 sub end_xmp {
|
Line 2882 sub end_xmp {
|
#-- <pre> (end tag required) |
#-- <pre> (end tag required) |
sub start_pre { |
sub start_pre { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # close off pending <p> |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 2938 sub end_externallink {
|
Line 2945 sub end_externallink {
|
#-- <blankspace heigth=""> |
#-- <blankspace heigth=""> |
sub start_blankspace { |
sub start_blankspace { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # closes off any unclosed <p> |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1); |
my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1); |
$currentstring .= '\vskip '.$howmuch.' '; |
$currentstring .= '\vskip '.$howmuch.' '; |
Line 3091 sub end_blink {
|
Line 3098 sub end_blink {
|
#-- <blockquote> tag (end tag required) |
#-- <blockquote> tag (end tag required) |
sub start_blockquote { |
sub start_blockquote { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close any unclosed <p> |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 3414 sub end_marquee {
|
Line 3421 sub end_marquee {
|
#-- <multicol> tag (end tag required) |
#-- <multicol> tag (end tag required) |
sub start_multicol { |
sub start_multicol { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close any pending <p> |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 3612 sub end_server {
|
Line 3619 sub end_server {
|
#-- <spacer> tag (end tag forbidden) |
#-- <spacer> tag (end tag forbidden) |
sub start_spacer { |
sub start_spacer { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = &end_p; # Close off any open <p> tag. |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring = $token->[4]; |
$currentstring .= $token->[4]; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 3774 sub image_replication {
|
Line 3781 sub image_replication {
|
$pssrc =~ s/\.(gif|jpg|jpeg|png)$/.ps/i; |
$pssrc =~ s/\.(gif|jpg|jpeg|png)$/.ps/i; |
if (not -e $epssrc && not -e $pssrc) { |
if (not -e $epssrc && not -e $pssrc) { |
my $result=&Apache::lonnet::repcopy($epssrc); |
my $result=&Apache::lonnet::repcopy($epssrc); |
if ($result ne OK) { &Apache::lonnet::repcopy($pssrc); } |
if ($result ne 'ok') { &Apache::lonnet::repcopy($pssrc); } |
} |
} |
return ''; |
return ''; |
} |
} |
|
# |
|
# Get correct sizing parameter for an image given |
|
# it's initial ht. and wid. This allows sizing of |
|
# images that are generated on-the-fly (e.g. gnuplot) |
|
# as well as serving as a utility for image_size. |
|
# |
|
# Parameter: |
|
# height_param |
|
# width_param - Initial picture dimensions. |
|
# scaling - A scale factor. |
|
# parstack, - the current stack of tag attributes |
|
# from the xml parser |
|
# safeeval, - pointer to the safespace |
|
# depth, - from what level in the stack to look for attributes |
|
# (assumes -1 if unspecified) |
|
# cis - look for attrubutes case insensitively |
|
# (assumes false) |
|
# |
|
# Returns: |
|
# height, width - new dimensions. |
|
# |
|
sub resize_image { |
|
my ($height_param, $width_param, $scaling, |
|
$parstack, $safeeval, $depth, $cis) = @_; |
|
|
|
# First apply the scaling... |
|
|
|
$height_param = $height_param * $scaling; |
|
$width_param = $width_param * $scaling; |
|
|
sub image_size { |
|
my ($src,$scaling,$parstack,$safeeval)=@_; |
|
#size of image from gif/jpg/jpeg/png |
|
my $image = Image::Magick->new; |
|
my $current_figure = $image->Read($src); |
|
my $width_param = $image->Get('width') * $scaling;; |
|
my $height_param = $image->Get('height') * $scaling;; |
|
undef $image; |
|
#do we have any specified LaTeX size of the picture? |
#do we have any specified LaTeX size of the picture? |
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); |
my $toget='TeXwidth'; |
my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); |
if ($cis) { |
|
$toget=lc($toget); |
|
} |
|
my $TeXwidth = &Apache::lonxml::get_param($toget,$parstack, |
|
$safeeval,$depth,$cis); |
|
$toget='TeXheight'; if ($cis) { $toget=lc($toget); } |
|
my $TeXheight = &Apache::lonxml::get_param($toget,$parstack, |
|
$safeeval,$depth,$cis); |
#do we have any specified web size of the picture? |
#do we have any specified web size of the picture? |
my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, |
my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, |
undef,1); |
$depth,1); |
if ($TeXwidth ne '') { |
if ($TeXwidth) { |
my $old_width_param=$width_param; |
my $old_width_param=$width_param; |
if ($TeXwidth=~/(\d+)\s*\%/) { |
if ($TeXwidth=~/(\d+)\s*\%/) { |
$width_param = $1*$ENV{'form.textwidth'}/100; |
$width_param = $1*$env{'form.textwidth'}/100; |
} else { |
} else { |
$width_param = $TeXwidth; |
$width_param = $TeXwidth; |
} |
} |
$height_param=$TeXwidth/$old_width_param*$height_param; |
if ($TeXheight) { |
} elsif ($TeXheight ne '') { |
$height_param = $TeXheight; |
|
} elsif ($old_width_param) { |
|
$height_param=$TeXwidth/$old_width_param*$height_param; |
|
} |
|
} elsif ($TeXheight) { |
$height_param = $TeXheight; |
$height_param = $TeXheight; |
$width_param = $TeXheight/$height_param*$width_param; |
if ($height_param) { |
} elsif ($width ne '') { |
$width_param = $TeXheight/$height_param*$width_param; |
|
} |
|
} elsif ($width) { |
my $old_width_param=$width_param; |
my $old_width_param=$width_param; |
$width_param = $width*$scaling; |
$width_param = $width*$scaling; |
$height_param=$width_param/$old_width_param*$height_param; |
if ($old_width_param) { |
|
$height_param=$width_param/$old_width_param*$height_param; |
|
} |
} |
} |
if ($width_param > $ENV{'form.textwidth'}) { |
if ($width_param > $env{'form.textwidth'}) { |
my $old_width_param=$width_param; |
my $old_width_param=$width_param; |
$width_param =0.95*$ENV{'form.textwidth'}; |
$width_param =0.95*$env{'form.textwidth'}; |
$height_param=$width_param/$old_width_param*$height_param; |
if ($old_width_param) { |
|
$height_param=$width_param/$old_width_param*$height_param; |
|
} |
} |
} |
|
|
|
return ($height_param, $width_param); |
|
} |
|
|
|
sub image_size { |
|
my ($src,$scaling,$parstack,$safeeval,$depth,$cis)=@_; |
|
|
|
#size of image from gif/jpg/jpeg/png |
|
my $ressrc=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
|
if (-e $ressrc) { |
|
$src = $ressrc; |
|
} |
|
my $image = Image::Magick->new; |
|
my $current_figure = $image->Read($src); |
|
my $width_param = $image->Get('width'); |
|
my $height_param = $image->Get('height'); |
|
&Apache::lonxml::debug("Image magick says: $src : Height = $height_param width = $width_param"); |
|
undef($image); |
|
|
|
($height_param, $width_param) = &resize_image($height_param, $width_param, |
|
$scaling, $parstack, $safeeval, |
|
$depth, $cis); |
|
|
return ($height_param, $width_param); |
return ($height_param, $width_param); |
} |
} |
|
|
Line 3829 sub image_height {
|
Line 3897 sub image_height {
|
return $height; |
return $height; |
} |
} |
|
|
|
sub get_eps_image { |
|
my ($src)=@_; |
|
my $orig_src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], $src); |
|
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); |
|
$src=~s/\.(gif|png|jpg|jpeg)$/\.eps/i; |
|
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
|
&Apache::lonxml::debug("Filelocation gives: $src"); |
|
if (! -e $src) { |
|
&Apache::lonxml::debug("$src does not exist"); |
|
if (&Apache::lonnet::repcopy($src) ne 'ok' ) { |
|
&Apache::lonxml::debug("Repcopy of $src failed (1)"); |
|
#if replication failed try to find ps file |
|
$src=~s/\.eps$/\.ps/; |
|
&Apache::lonxml::debug("Now looking for $src"); |
|
#if no ps file try to replicate it. |
|
my $didrepcopy = &Apache::lonnet::repcopy($src); |
|
&Apache::lonxml::debug("repcopy of $src ... $didrepcopy"); |
|
if ( (not -e $src) || |
|
($didrepcopy ne 'ok')) { |
|
&Apache::lonxml::debug("Failed to find or replicate $src"); |
|
|
|
#if replication failed try to produce eps file dynamically |
|
$src=~s/\.ps$/\.eps/; |
|
my $temp_file; |
|
open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat"); |
|
my $newsrc=$orig_src; |
|
$newsrc =~ s|(.*)/res/|/home/httpd/html/res/|; |
|
&Apache::lonxml::debug("queueing $newsrc for dynamic eps production."); |
|
print FILE "$newsrc\n"; |
|
close FILE; |
|
$src=~s|/home/httpd/html/res|/home/httpd/prtspool|; |
|
$src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|; |
|
} |
|
} |
|
} |
|
my ($path,$file)=($src=~m|(.*)/([^/]*)$|); |
|
&Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />"); |
|
return ($path.'/',$file); |
|
} |
|
|
sub eps_generation { |
sub eps_generation { |
my ($src,$file,$width_param) = @_; |
my ($src,$file,$width_param) = @_; |
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; |
my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat"; |
my $temp_file = Apache::File->new('>>'.$filename); |
my $temp_file = Apache::File->new('>>'.$filename); |
print $temp_file "$src\n"; |
print $temp_file "$src\n"; |
my $newsrc = $src; |
my $newsrc = $src; |