--- loncom/xml/londefdef.pm 2004/04/01 16:11:58 1.206 +++ loncom/xml/londefdef.pm 2004/04/15 17:37:04 1.209 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.206 2004/04/01 16:11:58 sakharuk Exp $ +# $Id: londefdef.pm,v 1.209 2004/04/15 17:37:04 albertel Exp $ # # # Copyright Michigan State University Board of Trustees @@ -1812,7 +1812,7 @@ sub start_table { } #table's border my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); - my $permission=&Apache::lonxml::get_param('DropEmptyColumns',$parstack,$safeeval,undef,0); + my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); unless (defined $border) { $border = 0; } if ($border) { $Apache::londefdef::table[-1]{'hinc'} = '\hline '; @@ -1824,7 +1824,7 @@ sub start_table { $Apache::londefdef::table[-1]{'vvinc'} = ''; } if ($#Apache::londefdef::table==0) { - $Apache::londefdef::table[-1]{'output'}='\setlength{\tabcolsep}{1 mm}'; + $Apache::londefdef::table[-1]{'output'}='\newline\setlength{\tabcolsep}{1 mm}'; } $Apache::londefdef::table[-1]{'output'}.=' \noindent \begin{tabular} '; $Apache::londefdef::table[-1]{'TeXlen'}=[]; @@ -1967,7 +1967,7 @@ sub end_table { } } #removing of empty columns if allowed - my $permission=&Apache::lonxml::get_param('DropEmptyColumns',$parstack,$safeeval,undef,0); + my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0); if ($permission eq 'yes') { my @cleaned_table=(); my @cleaned_header=(); @@ -2343,7 +2343,9 @@ sub start_img { &image_replication($src); if (-e $src) { my $image = Image::Magick->new; - my ($width, $height, $size, $format) = $image->Ping($src); + $image->Read($src); + my ($width, $height) = ($image->Get('width'), + $image->Get('height')); if ($width && $height) { $token->[2]{'width'} =$width; $token->[2]{'height'}=$height;