version 1.344, 2006/11/07 02:39:39
|
version 1.353, 2007/01/22 11:28:08
|
Line 48 use Apache::lonmenu();
|
Line 48 use Apache::lonmenu();
|
use Apache::lonmeta(); |
use Apache::lonmeta(); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use File::Basename; |
use File::Basename; |
|
use LONCAPA(); |
# use Data::Dumper; |
# use Data::Dumper; |
|
|
BEGIN { |
BEGIN { |
Line 1558 sub start_a {
|
Line 1559 sub start_a {
|
my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval, |
my $href=&Apache::lonxml::get_param('href',$parstack,$safeeval, |
undef,1); |
undef,1); |
$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href}); |
$currentstring=&Apache::lonenc::encrypt_ref($token,{'href'=>$href}); |
} elsif ($target eq 'tex') { |
|
my $a=&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1); |
|
my $b=&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1); |
|
if ($a=~/\S/) { |
|
$a=~s/([^\\])%/$1\\\%/g; |
|
$currentstring .= '\ref{URI: '.$a.'}'; |
|
} elsif ($b=~/\S/) { |
|
$currentstring .= '\ref{Anchor: '.$b.'}'; |
|
} else { |
|
$currentstring.=''; |
|
} |
|
} |
} |
return $currentstring; |
return $currentstring; |
} |
} |
Line 1579 sub end_a {
|
Line 1569 sub end_a {
|
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring .= $token->[2]; |
$currentstring .= $token->[2]; |
} |
} |
|
if ($target eq 'tex') { |
|
my $href = |
|
&Apache::lonxml::get_param('href',$parstack,$safeeval,undef,1); |
|
my $name = |
|
&Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1); |
|
if ($href =~ /\S/) { |
|
$href =~ s/([^\\])%/$1\\\%/g; |
|
$currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})'; |
|
} elsif ($name =~ /\S/) { |
|
$currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})'; |
|
} else { |
|
$currentstring.=''; |
|
} |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 2250 sub end_table {
|
Line 2254 sub end_table {
|
} |
} |
$have_rowspan++; |
$have_rowspan++; |
$output .= '\multirow{'.$rowspan.'}[0]{*}{'; |
$output .= '\multirow{'.$rowspan.'}[0]{*}{'; |
|
|
|
$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~ |
|
s{^\s*\\par\s*}{}; |
|
$Apache::londefdef::table[-1]{'content'}[$in][$jn] =~ |
|
s{\s*\\vskip\s*0pt\s*$}{}; |
|
|
# |
# |
# If we did not throw in a multicolumn to align, then add |
# If we did not throw in a multicolumn to align, then add |
# an extra { |
# an extra { |
Line 2869 sub start_img {
|
Line 2879 sub start_img {
|
$size=~s/,$/]/; |
$size=~s/,$/]/; |
$currentstring .= '\graphicspath{{'.$path.'}}' |
$currentstring .= '\graphicspath{{'.$path.'}}' |
.'\includegraphics'.$size.'{'.$file.'} '; |
.'\includegraphics'.$size.'{'.$file.'} '; |
|
$currentstring = &align_latex_image($align, $latex_rendering, |
# If there's an alignment specification we need to honor it here. |
$currentstring, |
# For the horizontal alignments, we will also honor the |
$width_param, $height_param); |
# value of the latex specfication. The default is parbox, |
|
# and that's used for illegal values too. |
|
# |
|
# Even though we set a default alignment value, the user |
|
# could have given us an illegal value. In that case we |
|
# just use the default alignment of bottom.. |
|
if ($align eq "top") { |
|
$currentstring = '\raisebox{-'.$height_param.'mm}{'.$currentstring.'}'; |
|
} elsif (($align eq "center") || ($align eq "middle")) { # Being kind |
|
my $offset = $height_param/2; |
|
$currentstring = '\raisebox{-'.$offset.'mm}{'.$currentstring.'}'; |
|
} elsif ($align eq "left") { |
|
if ($latex_rendering eq "parpic") { |
|
$currentstring = '\parpic[l]{'.$currentstring.'}'; |
|
} else { # wrapfig render |
|
$currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}' |
|
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
|
} |
|
} elsif ($align eq "right") { |
|
if ($latex_rendering eq "parpic") { |
|
$currentstring = '\parpic[r]{'.$currentstring.'}'; |
|
} else { # wrapfig rendering |
|
$currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}' |
|
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
|
|
|
} |
|
} else { # Bottom is also default. |
|
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
|
} |
|
} else { |
} else { |
&Apache::lonxml::debug("$src does not exist"); |
&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 |
Line 2928 sub start_img {
|
Line 2910 sub start_img {
|
$currentstring .=&Apache::edit::select_arg('Alignment:','align', |
$currentstring .=&Apache::edit::select_arg('Alignment:','align', |
['','bottom','middle','top','left','right'],$token,5); |
['','bottom','middle','top','left','right'],$token,5); |
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap', |
$currentstring .=&Apache::edit::select_arg('TeXwrap:', 'TeXwrap', |
['', 'parbox', 'parpic'], $token, 2); |
['', 'none','parbox', 'parpic', 'wrapfigure'], $token, 2); |
$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl', |
$currentstring .=&Apache::edit::select_arg('Encrypt URL:','encrypturl', |
['no','yes'], $token, 2); |
['no','yes'], $token, 2); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
Line 4298 sub eps_generation {
|
Line 4280 sub eps_generation {
|
print $temp_file "$src\n"; |
print $temp_file "$src\n"; |
my $newsrc = $src; |
my $newsrc = $src; |
$newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; |
$newsrc =~ s/(\.gif|\.jpg|\.jpeg)$/\.eps/i; |
$newsrc=~s/\/home\/httpd\/html\/res//; |
$newsrc=~s{/home/httpd/html/res}{}; |
$newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//; |
$newsrc=~s{/home/($LONCAPA::username_re)/public_html/}{/$1/}; |
$newsrc=~s/\/\.\//\//; |
$newsrc=~s{/\./}{/}; |
$newsrc=~s/\/([^\/]+)\.(ps|eps)/\//; |
$newsrc=~s{/([^/]+)\.(ps|eps)}{/}; |
if ($newsrc=~/\/home\/httpd\/lonUsers\//) { |
if ($newsrc=~m{/home/httpd/lonUsers/}) { |
$newsrc=~s/\/home\/httpd\/lonUsers//; |
$newsrc=~s{/home/httpd/lonUsers}{}; |
$newsrc=~s/\/([^\/]+)\/(\w)\/(\w)\/(\w)\//\/$1\//; |
$newsrc=~s{/($LONCAPA::domain_re)/./././}{/$1/}; |
} |
} |
if ($newsrc=~/\/userfiles\//) { |
if ($newsrc=~m{/userfiles/}) { |
return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
return ' \graphicspath{{'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
} else { |
} else { |
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
return ' \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} '; |
Line 4370 sub LATEX_length {
|
Line 4352 sub LATEX_length {
|
return $value; |
return $value; |
} |
} |
|
|
|
# Wrap image 'stuff' inside of the LaTeX required to implement |
|
# alignment: |
|
# align_tex_image(align, latex_rendering, image) |
|
# Where: |
|
# align - The HTML alignment specification. |
|
# latex_rendering - rendering hint for latex. |
|
# image - The LaTeX needed to insert the image itsef. |
|
# width,height - dimensions of the image. |
|
# |
|
sub align_latex_image { |
|
my ($align, $latex_rendering, $image, $width, $height) = @_; |
|
my $currentstring; # The result. |
|
|
|
# If there's an alignment specification we need to honor it here. |
|
# For the horizontal alignments, we will also honor the |
|
# value of the latex specfication. The default is parbox, |
|
# and that's used for illegal values too. |
|
# |
|
# Even though we set a default alignment value, the user |
|
# could have given us an illegal value. In that case we |
|
# just use the default alignment of bottom.. |
|
if ($align eq "top") { |
|
$currentstring = '\raisebox{-'.$height.'mm}{'.$image.'}'; |
|
} elsif (($align eq "center") || ($align eq "middle")) { # Being kind |
|
my $offset = $height/2; |
|
$currentstring = '\raisebox{-'.$offset.'mm}{'.$image.'}'; |
|
} elsif ($align eq "left") { |
|
if ($latex_rendering eq "parpic") { |
|
$currentstring = '\parpic[l]{'.$image.'}'; |
|
} elsif ($latex_rendering eq "parbox") { |
|
$currentstring = '\begin{minipage}[l]{'.$width.'mm}' |
|
.$image.'\end{minipage}'; |
|
} elsif ($latex_rendering eq "wrapfigure" |
|
|| $latex_rendering ne 'none') { # wrapfig render |
|
$currentstring = |
|
'\begin{wrapfigure}{l}{'.$width.'mm}' |
|
.'\scalebox{1.0}{'.$image.'}\end{wrapfigure}'; |
|
} |
|
} elsif ($align eq "right") { |
|
if ($latex_rendering eq "parpic") { |
|
$currentstring = '\parpic[r]{'.$image.'}'; |
|
} elsif ($latex_rendering eq "parbox") { |
|
$currentstring = '\begin{minipage}[r]{'.$width.'mm}' |
|
.$image.'\end{minipage}'; |
|
} elsif ($latex_rendering eq "wrapfigure" |
|
|| $latex_rendering ne 'none') { # wrapfig render |
|
$currentstring = |
|
'\begin{wrapfigure}{r}{'.$width.'mm}' |
|
.'\scalebox{1.0}{'.$image.'}\end{wrapfigure}'; |
|
} |
|
} else { # Bottom is also default. |
|
# $currentstring = '\raisebox{'.$height.'mm}{'.$image.'}'; |
|
$currentstring = $image; |
|
} |
|
return $currentstring; |
|
} |
|
|
# is_inside_of $tagstack $tag |
# is_inside_of $tagstack $tag |
# This sub returns true if the current state of Xml processing |
# This sub returns true if the current state of Xml processing |