version 1.83, 2006/08/29 10:42:59
|
version 1.86, 2007/05/10 10:27:22
|
Line 269 sub end_bgimg {
|
Line 269 sub end_bgimg {
|
&Apache::lonxml::debug("Width $width_param"); |
&Apache::lonxml::debug("Width $width_param"); |
&Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale"); |
&Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale"); |
my $dirty_width = $width_param + 5; |
my $dirty_width = $width_param + 5; |
|
# |
|
# Somewhere here it looks like height_param and |
|
# width_param got backwards... |
|
# |
$result .= '\parbox{'.$dirty_width.'mm}{'; |
$result .= '\parbox{'.$dirty_width.'mm}{'; |
$result .= " $src \n"; |
$result .= " $src \n"; |
$result .= '\setlength{\unitlength}{1mm}'."\n"; |
$result .= '\setlength{\unitlength}{1mm}'."\n"; |
$result .= '\begin{picture}('."$height_param,$width_param)"; |
$result .= '\begin{picture}('."$height_param,$width_param)"; |
$result .= "(0,-$height_param)"; |
$result .= "(0,-$width_param)"; |
$result .= "\n"; |
$result .= "\n"; |
$Apache::lonxml::debug = 0; |
$Apache::lonxml::debug = 0; |
|
|
Line 296 sub make_eps_image {
|
Line 300 sub make_eps_image {
|
&Apache::lonxml::debug("Image size: $height_param x $width_param"); |
&Apache::lonxml::debug("Image size: $height_param x $width_param"); |
|
|
my $dirtywidth=$width_param+5; |
my $dirtywidth=$width_param+5; |
# |
|
# Note that lonprintout/prinout will conspire to replace |
|
# spaces in paths and names with _'s since spacess cause problems |
|
# for latex included filenames. Therefore: |
|
# |
|
my $safe_path = $path; |
|
$safe_path =~ s/ /\_/g; |
|
my $safe_file = $file; |
|
$safe_file =~ s/ /\_/g; |
|
|
|
my $result ="\n".'\vspace*{2mm}\noindent'."\n". |
my $result ="\n".'\vspace*{2mm}\noindent'."\n". |
'\parbox{'.$dirtywidth. |
'\parbox{'.$dirtywidth. |
' mm}{ \noindent \epsfxsize='.$width_param. |
' mm}{ \noindent \epsfxsize='.$width_param. |
' mm \epsffile{'.$safe_path.$safe_file. |
' mm \epsffile{'.$path.$file. |
'}\setlength{\unitlength}{1mm}'."\n".' \begin{picture}('. |
'}\setlength{\unitlength}{1mm}'."\n".' \begin{picture}('. |
$width_param.','.$height_param.')(0,-'.$height_param.')'."\n"; |
$width_param.','.$height_param.')(0,-'.$height_param.')'."\n"; |
my $magick = Image::Magick->new; |
my $magick = Image::Magick->new; |
Line 496 sub end_labelgroup {
|
Line 491 sub end_labelgroup {
|
# Note that spaces in e.. \includegraphics cause problems for Latex |
# Note that spaces in e.. \includegraphics cause problems for Latex |
# so they get replaced by _'s by lonprintout/printout and us: |
# so they get replaced by _'s by lonprintout/printout and us: |
# |
# |
$image_name =~ s/ /\_/g; |
|
my $label_width = &get_label_width($label); |
my $label_width = &get_label_width($label); |
|
|
$result .= '\includegraphics[width='.$label_width.'mm]{' |
$result .= '\includegraphics[width='.$label_width.'mm]{' |