version 1.188, 2003/10/24 21:31:05
|
version 1.203, 2004/03/15 19:19:04
|
Line 82 sub end_output {
|
Line 82 sub end_output {
|
} |
} |
#-- <m> tag |
#-- <m> tag |
sub start_m { |
sub start_m { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
|
if ($target eq 'web' || $target eq 'analyze') { |
$Apache::lonxml::prevent_entity_encode++; |
$Apache::lonxml::prevent_entity_encode++; |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
|
$inside ='\\documentstyle{article}'.$inside; |
$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); |
Line 103 sub start_m {
|
Line 103 sub start_m {
|
#&Apache::lonxml::debug("M is ends with:$currentstring:"); |
#&Apache::lonxml::debug("M is ends with:$currentstring:"); |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
$currentstring = $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') { |
$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 ';} |
$Apache::lonxml::post_evaluate=0; |
$Apache::lonxml::post_evaluate=0; |
} else { |
|
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser); |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 153 sub end_tthoption {
|
Line 151 sub end_tthoption {
|
sub start_html { |
sub start_html { |
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($ENV{'browser.mathml'}) { |
my $options=$ENV{'course.'.$ENV{'request.course.id'}.'.tthoptions'}; |
&tth::ttminit(); |
&Apache::lontexconvert::init_tth(); |
if ($ENV{'browser.unicode'}) { |
|
&tth::ttmoptions('-L -u1'); |
|
} else { |
|
&tth::ttmoptions('-L -u0'); |
|
} |
|
} else { |
|
&tth::tthinit(); |
|
if ($ENV{'browser.unicode'}) { |
|
&tth::tthoptions('-L -u1'); |
|
} else { |
|
&tth::tthoptions('-L -u0'); |
|
} |
|
} |
|
if ($target eq 'web' || $target eq 'edit') { |
if ($target eq 'web' || $target eq 'edit') { |
$currentstring = &Apache::lonxml::xmlbegin(). |
$currentstring = &Apache::lonxml::xmlbegin(). |
&Apache::lonxml::fontsettings(); |
&Apache::lonxml::fontsettings(); |
Line 550 sub start_body {
|
Line 535 sub start_body {
|
if ($ENV{'request.state'} ne 'published') { |
if ($ENV{'request.state'} ne 'published') { |
$currentstring.=(<<EDITBUTTON); |
$currentstring.=(<<EDITBUTTON); |
<form method="post"> |
<form method="post"> |
<input type="submit" name="editmode" value="Edit" /> |
<input type="submit" name="editmode" accesskey="e" value="Edit" /> |
</form> |
</form> |
EDITBUTTON |
EDITBUTTON |
} else { |
} else { |
$currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1); |
$currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1); |
} |
} |
|
$currentstring.=&Apache::lonxml::message_location(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring = '\begin{document}'; |
$currentstring = '\begin{document}'; |
} |
} |
Line 650 sub start_h1 {
|
Line 636 sub start_h1 {
|
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $pre; |
my $pre; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=lc(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1)); |
if (($align eq 'center') || (not defined $align)) { |
if (($align eq 'center') || (not defined $align)) { |
$pre='\begin{center}'; |
$pre='\begin{center}'; |
} elsif ($align eq 'left') { |
} elsif ($align eq 'left') { |
Line 1114 sub end_q {
|
Line 1100 sub end_q {
|
} |
} |
|
|
#-- <p> tag (end tag optional) |
#-- <p> tag (end tag optional) |
|
#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 = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
my $signal=1; |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;}} |
if ($align eq 'center') { |
if ($signal) {$currentstring .= '\par ';} |
$currentstring='\begin{center}\par'; |
|
} elsif ($align eq 'right') { |
|
$currentstring='\makebox['.$ENV{'form.textwidth'}.']{\hfill\llap{'; |
|
} elsif ($align eq 'left') { |
|
$currentstring='\noindent\makebox['.$ENV{'form.textwidth'}.']{\rlap{'; |
|
} |
|
my $signal=1;#<p> does not work inside <b>...</b> |
|
foreach my $tag (@$tagstack) {if (lc($tag) eq 'b') {$signal=0;} |
|
if (!$signal) {$currentstring = '';} |
|
} |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
sub end_p { |
sub end_p { |
my ($target,$token) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
|
} elsif ($target eq 'tex') { |
|
if ($$tagstack[-1] eq 'p') { |
|
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
|
if ($align eq 'center') { |
|
$currentstring .= '\end{center}'; |
|
} elsif ($align eq 'right') { |
|
$currentstring .= '}}'; |
|
} elsif ($align eq 'left') { |
|
$currentstring .= '}\hfill}'; |
|
} |
|
} |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1331 sub start_sub {
|
Line 1338 sub start_sub {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring .= "\$_{"; |
$currentstring .= '\ensuremath{_{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1342 sub end_sub {
|
Line 1349 sub end_sub {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring .= "}\$"; |
$currentstring .= '}}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1354 sub start_sup {
|
Line 1361 sub start_sup {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[4]; |
$currentstring .= $token->[4]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring .= "\$^{"; |
$currentstring .= '\ensuremath{^{'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1365 sub end_sup {
|
Line 1372 sub end_sup {
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$currentstring .= "}\$"; |
$currentstring .= '}}'; |
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1788 sub start_table {
|
Line 1795 sub start_table {
|
if (not defined $TeXwidth) { |
if (not defined $TeXwidth) { |
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); |
my $htmlwidth = &Apache::lonxml::get_param('width',$parstack,$safeeval,undef,1); |
if ($htmlwidth=~/%/) { |
if ($htmlwidth=~/%/) { |
|
$Apache::londefdef::table[-1]{'percent'}=1; |
$htmlwidth=~/(\d+)/; |
$htmlwidth=~/(\d+)/; |
my $value=$1*$textwidth/100; |
$Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;; |
$Apache::londefdef::table[-1]{'width'}=$value; |
|
} else { |
} else { |
$Apache::londefdef::table[-1]{'width'}=$textwidth; |
$Apache::londefdef::table[-1]{'width'}=$textwidth; |
} |
} |
} elsif ($TeXwidth=~/%/) { |
} elsif ($TeXwidth=~/%/) { |
|
$Apache::londefdef::table[-1]{'percent'}=1; |
$TeXwidth=~/(\d+)/; |
$TeXwidth=~/(\d+)/; |
my $value=$1*$textwidth/100; |
my $value=$1*$textwidth/100; |
$Apache::londefdef::table[-1]{'width'}=$value; |
$Apache::londefdef::table[-1]{'width'}=$value; |
Line 1874 sub end_table {
|
Line 1882 sub end_table {
|
$length_row_final[$jn]=0.9*$available_length/$needed; |
$length_row_final[$jn]=0.9*$available_length/$needed; |
} |
} |
} |
} |
|
#recalculation for the use of all available width if width is defined in % |
|
if ($Apache::londefdef::table[-1]{'percent'}==1) { |
|
my $current=0; |
|
for (my $i=0;$i<=$#length_row_final;$i++) { |
|
$current+=$length_row_final[$i]; |
|
} |
|
my $coef=$Apache::londefdef::table[-1]{'width'}/$current; |
|
for (my $i=0;$i<=$#length_row_final;$i++) { |
|
$length_row_final[$i]*=$coef; |
|
} |
|
} |
#fill the table |
#fill the table |
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { |
for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) { |
for (my $jn=0;$jn<=$#length_row_final;$jn++) { |
for (my $jn=0;$jn<=$#length_row_final;$jn++) { |
Line 2093 sub start_img {
|
Line 2112 sub start_img {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_; |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, |
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval, |
undef,1); |
undef,1); |
|
if (not $src and ($target eq 'web' or $target eq 'tex')) { |
|
my $inside = &Apache::lonxml::get_all_text("/img",$parser); |
|
&Apache::lonnet::logthis("inside was $inside"); |
|
return ''; |
|
} |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src; |
my $currentstring = ''; |
my $currentstring = ''; |
my $width_param = ''; |
|
my $height_param = ''; |
|
my $scaling = .3; |
my $scaling = .3; |
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($ENV{'browser.imagesuppress'} ne 'on') { |
if ($ENV{'browser.imagesuppress'} ne 'on') { |
Line 2112 sub start_img {
|
Line 2134 sub start_img {
|
} |
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
&image_replication($src); |
|
#if original gif/jpg/png file exist do following: |
#if original gif/jpg/png file exist do following: |
if (-e $src) { |
if (-e $src) { |
#defines the default size of image |
#what is the image size? |
my $image = Image::Magick->new; |
my $width_param=&image_size($src,$scaling,$parstack,$safeeval); |
my $current_figure = $image->Read($src); |
my ($file,$path)=&file_path($src); |
$width_param = $image->Get('width') * $scaling;; |
|
$height_param = $image->Get('height') * $scaling;; |
|
undef $image; |
|
#do we have any specified size of the picture? |
|
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); |
|
my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); |
|
my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, |
|
undef,1); |
|
if ($TeXwidth ne '') { |
|
if ($TeXwidth=~/(\d+)\s*\%/) { |
|
$width_param = $1*$ENV{'form.textwidth'}/100; |
|
} else { |
|
$width_param = $TeXwidth; |
|
} |
|
} elsif ($TeXheight ne '') { |
|
$width_param = $TeXheight/$height_param*$width_param; |
|
} elsif ($width ne '') { |
|
$width_param = $width*$scaling; |
|
} |
|
if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}} |
|
my $file; |
|
my $path; |
|
if ($src =~ m!(.*)/([^/]*)$!) { |
|
$file = $2; |
|
$path = $1.'/'; |
|
} |
|
my $newsrc = $src; |
my $newsrc = $src; |
$newsrc =~ s/\.(gif|jpg|png)$/.eps/i; |
$newsrc =~ s/\.(gif|jpg|png)$/.eps/i; |
$file=~s/\.(gif|jpg|png)$/.eps/i; |
$file=~s/\.(gif|jpg|png)$/.eps/i; |
Line 2163 sub start_img {
|
Line 2158 sub start_img {
|
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
$currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
} |
} |
} else { |
} else { |
#there aren't eps or ps - so create eps |
#care about eps dynamical generation |
my $temp_file; |
$currentstring.='\vskip 1 mm '.&eps_generation($src,$file,$width_param); |
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; |
|
$temp_file = Apache::File->new('>>'.$filename); |
|
print $temp_file "$src\n"; |
|
$newsrc=~s/\/home\/httpd\/html\/res//; |
|
$newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; |
|
$currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
|
} |
} |
} |
} |
} else { |
} else { |
Line 2211 sub start_img {
|
Line 2200 sub start_img {
|
$safeeval,'src','alt', |
$safeeval,'src','alt', |
'TeXwidth','TeXheight', |
'TeXwidth','TeXheight', |
'width','height'); |
'width','height'); |
|
$src=$token->[2]{'src'}; |
if (!$token->[2]{'width'} && !$token->[2]{'height'}) { |
if (!$token->[2]{'width'} && !$token->[2]{'height'}) { |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
&image_replication($src); |
&image_replication($src); |
Line 3353 sub image_replication {
|
Line 3343 sub image_replication {
|
return ''; |
return ''; |
} |
} |
|
|
|
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? |
|
my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); |
|
my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); |
|
#do we have any specified web size of the picture? |
|
my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval, |
|
undef,1); |
|
if ($TeXwidth ne '') { |
|
if ($TeXwidth=~/(\d+)\s*\%/) { |
|
$width_param = $1*$ENV{'form.textwidth'}/100; |
|
} else { |
|
$width_param = $TeXwidth; |
|
} |
|
} elsif ($TeXheight ne '') { |
|
$width_param = $TeXheight/$height_param*$width_param; |
|
} elsif ($width ne '') { |
|
$width_param = $width*$scaling; |
|
} |
|
if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}} |
|
return $width_param; |
|
} |
|
|
|
sub eps_generation { |
|
my ($src,$file,$width_param) = @_; |
|
my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; |
|
my $temp_file = Apache::File->new('>>'.$filename); |
|
print $temp_file "$src\n"; |
|
my $newsrc = $src; |
|
$newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; |
|
$newsrc=~s/\/home\/httpd\/html\/res//; |
|
$newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//; |
|
$newsrc=~s/\/\.\//\//; |
|
$newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; |
|
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
|
} |
|
|
|
sub file_path { |
|
my $src=shift; |
|
my ($file,$path); |
|
if ($src =~ m!(.*)/([^/]*)$!) { |
|
$file = $2; |
|
$path = $1.'/'; |
|
} |
|
return $file,$path; |
|
} |
|
|
sub recalc { |
sub recalc { |
my $argument = shift; |
my $argument = shift; |
if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';} |
if (not $argument=~/(mm|cm|in|pc|pt)/) {return $argument.' mm';} |