version 1.68, 2005/04/12 09:35:22
|
version 1.71, 2005/04/12 21:41:28
|
Line 302 sub end_labelgroup {
|
Line 302 sub end_labelgroup {
|
my $tcY=$height_param-$y*($height_param/$wheight); |
my $tcY=$height_param-$y*($height_param/$wheight); |
$tcX=sprintf('%.2f',$tcX); |
$tcX=sprintf('%.2f',$tcX); |
$tcY=sprintf('%.2f',$tcY); |
$tcY=sprintf('%.2f',$tcY); |
$result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n"; |
$result .= '\put('.$tcX.','.$tcY.'){'; |
if( $type eq 'text') { |
if( $type eq 'text') { |
|
$result.= $TeXsize.' \bf '.$label."}\n"; |
&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval); |
&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval); |
} elsif ( $type eq 'image') { |
} elsif ( $type eq 'image') { |
|
my ($path,$file) = &Apache::londefdef::get_eps_image($label); |
|
my $image_name = $path.$file; |
|
$result .= '\includegraphics{' |
|
.$image_name."}}\n"; |
&add_vars($gname,$i, |
&add_vars($gname,$i, |
$Apache::randomlabel::description[$idx_arr[$i]], |
$Apache::randomlabel::description[$idx_arr[$i]], |
$idx_arr[$i],$value,$label,$safeeval); |
$idx_arr[$i],$value,$label,$safeeval); |
Line 403 sub end_label {
|
Line 408 sub end_label {
|
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); |
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2); |
my $ltext=&Apache::lonxml::endredirection; |
my $ltext=&Apache::lonxml::endredirection; |
if ($type eq 'image') { |
if ($type eq 'image') { |
|
if ($target eq 'tex') { |
|
# For tex targets, our image url has been potentially corrupted |
|
# by prepending \'s in front of special latex symbols. |
|
# For now we only worry about the _ case (most common?) |
|
# There's a whole host of theim in lonxml::latex_special_symbols |
|
# that could potentially have to be re-done. |
|
|
|
$ltext =~ s/\\_/_/g; |
|
} |
&Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]"); |
&Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]"); |
$ltext=&Apache::imageresponse::clean_up_image($ltext); |
$ltext=&Apache::imageresponse::clean_up_image($ltext); |
# $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], |
# $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1], |