loncom/xml/londefdef.pm - diff

Return to londefdef.pm CVS log

Up to [LON-CAPA] / loncom / xml

version 1.131, 2003/05/07 16:59:01	version 1.132, 2003/05/07 17:24:16
Line 1894 sub end_td {	Line 1894 sub end_td {
} else {	} else {
if ($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/) {	if ($data=~m/width\s=\s(\d+\.?\d\s(mm\|cm\|in\|pc\|pt)*)/) {
my $current_length=&recalc($1);	my $current_length=&recalc($1);
$current_length=~/(\d+)/;	$current_length=~/(\d+\.?\d*)/;
$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';	$Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
$Apache::londefdef::table[-1]{'length'} .= '0,';	$Apache::londefdef::table[-1]{'length'} .= '0,';
} else {	} else {
Line 3123 sub image_replication {	Line 3123 sub image_replication {
sub recalc {	sub recalc {
my $argument = shift;	my $argument = shift;
if (not $argument=~/(mm\|cm\|in\|pc\|pt)/) {return $argument.' mm';}	if (not $argument=~/(mm\|cm\|in\|pc\|pt)/) {return $argument.' mm';}
$argument=~/\s(\d+)\s(mm\|cm\|in\|pc\|pt)/;	$argument=~/\s(\d+\.?\d)\s*(mm\|cm\|in\|pc\|pt)/;
my $value=$1;	my $value=$1;
my $units=$2;	my $units=$2;
if ($units eq 'cm') {	if ($units eq 'cm') {