version 1.344, 2006/11/07 02:39:39
|
version 1.348, 2006/12/19 22:30:52
|
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 2886 sub start_img {
|
Line 2887 sub start_img {
|
} elsif ($align eq "left") { |
} elsif ($align eq "left") { |
if ($latex_rendering eq "parpic") { |
if ($latex_rendering eq "parpic") { |
$currentstring = '\parpic[l]{'.$currentstring.'}'; |
$currentstring = '\parpic[l]{'.$currentstring.'}'; |
} else { # wrapfig render |
} elsif ($latex_rendering eq "parbox") { |
$currentstring = '\begin{wrapfigure}{l}{'.$width_param.'mm}' |
$currentstring = '\begin{minipage}[l]{'.$width_param.'mm}' |
|
.$currentstring.'\end{minipage}'; |
|
} elsif ($latex_rendering eq "wrapfigure" |
|
|| $latexrendering ne 'none') { # wrapfig render |
|
$currentstring = |
|
'\begin{wrapfigure}{l}{'.$width_param.'mm}' |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
} |
} |
} elsif ($align eq "right") { |
} elsif ($align eq "right") { |
if ($latex_rendering eq "parpic") { |
if ($latex_rendering eq "parpic") { |
$currentstring = '\parpic[r]{'.$currentstring.'}'; |
$currentstring = '\parpic[r]{'.$currentstring.'}'; |
} else { # wrapfig rendering |
} elsif ($latex_rendering eq "parbox") { |
$currentstring = '\begin{wrapfigure}{r}{'.$width_param.'mm}' |
$currentstring = '\begin{minipage}[r]{'.$width_param.'mm}' |
|
.$currentstring.'\end{minipage}'; |
|
} elsif ($latex_rendering eq "wrapfigure" |
|
|| $latexrendering ne 'none') { # wrapfig render |
|
$currentstring = |
|
'\begin{wrapfigure}{r}{'.$width_param.'mm}' |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
.'\scalebox{1.0}{'.$currentstring.'}\end{wrapfigure}'; |
|
|
} |
} |
} else { # Bottom is also default. |
} else { # Bottom is also default. |
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
# $currentstring = '\raisebox{'.$height_param.'mm}{'.$currentstring.'}'; |
Line 2928 sub start_img {
|
Line 2938 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 4308 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.'} '; |