--- loncom/xml/londefdef.pm 2003/10/21 19:40:32 1.185 +++ loncom/xml/londefdef.pm 2003/10/24 21:11:46 1.186 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Tags Default Definition Module # -# $Id: londefdef.pm,v 1.185 2003/10/21 19:40:32 albertel Exp $ +# $Id: londefdef.pm,v 1.186 2003/10/24 21:11:46 albertel Exp $ # # # Copyright Michigan State University Board of Trustees @@ -159,7 +159,7 @@ sub start_html { &tth::tthoptions('-L -u0'); } } - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'edit') { $currentstring = &Apache::lonxml::xmlbegin(). &Apache::lonxml::fontsettings(); } elsif ($target eq 'tex') { @@ -2178,6 +2178,44 @@ sub start_img { # tag will care about replication } } + } elsif ($target eq 'edit') { + $currentstring .=&Apache::edit::tag_start($target,$token); + $currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70). + &Apache::edit::browse('src',undef,'alt').' '. + &Apache::edit::search('src',undef,'alt').'
'; + $currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'
'; + $currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5); + $currentstring .=&Apache::edit::text_arg('height (pixel):','height',$token,5).'
'; + $currentstring .=&Apache::edit::text_arg('TeXwidth (mm):','TeXwidth',$token,5); + $currentstring .=&Apache::edit::text_arg('TeXheight (mm):','TeXheight',$token,5); + $currentstring .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval); + my $alt=&Apache::lonxml::get_param('alt',$parstack,$safeeval); + my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); + my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval); + $currentstring .= ''.$alt.'[2]{'width'} && !$token->[2]{'height'}) { + $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); + &image_replication($src); + if (-e $src) { + my $image = Image::Magick->new; + my ($width, $height, $size, $format) = $image->Ping($src); + if ($width && $height) { + $token->[2]{'width'} =$width; + $token->[2]{'height'}=$height; + $constructtag=1; + } + } + } + if ($constructtag) {$currentstring=&Apache::edit::rebuild_tag($token);} } return $currentstring; }