loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

version 1.251, 2005/01/19 18:20:12	version 1.252, 2005/02/07 20:15:11
Line 3796 sub image_size {	Line 3796 sub image_size {
my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,	my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
undef,1);	undef,1);
if ($TeXwidth ne '') {	if ($TeXwidth ne '') {
	my $old_width_param=$width_param;
if ($TeXwidth=~/(\d+)\s*\%/) {	if ($TeXwidth=~/(\d+)\s*\%/) {
$width_param = $1*$ENV{'form.textwidth'}/100;	$width_param = $1*$ENV{'form.textwidth'}/100;
} else {	} else {
$width_param = $TeXwidth;	$width_param = $TeXwidth;
}	}
	$height_param=$TeXwidth/$old_width_param*$height_param;
} elsif ($TeXheight ne '') {	} elsif ($TeXheight ne '') {
$height_param = $TeXheight;	$height_param = $TeXheight;
$width_param = $TeXheight/$height_param*$width_param;	$width_param = $TeXheight/$height_param*$width_param;
} elsif ($width ne '') {	} elsif ($width ne '') {
	my $old_width_param=$width_param;
$width_param = $width*$scaling;	$width_param = $width*$scaling;
	$height_param=$width_param/$old_width_param*$height_param;
	}
	if ($width_param > $ENV{'form.textwidth'}) {
	my $old_width_param=$width_param;
	$width_param =0.95*$ENV{'form.textwidth'};
	$height_param=$width_param/$old_width_param*$height_param;
}	}
if ($width_param > $ENV{'form.textwidth'}) {$width_param =0.95*$ENV{'form.textwidth'}}
return ($height_param, $width_param);	return ($height_param, $width_param);
}	}