--- loncom/xml/londefdef.pm	2002/10/08 20:35:19	1.94
+++ loncom/xml/londefdef.pm	2002/11/07 19:33:52	1.99
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.94 2002/10/08 20:35:19 sakharuk Exp $
+# $Id: londefdef.pm,v 1.99 2002/11/07 19:33:52 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -845,7 +845,7 @@ EDITBUTTON
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
 		if ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
-		    $currentstring .= '\vskip 0 mm';
+		    $currentstring .= '\vskip 0.2 mm';
 		}
 	    } elsif ($target eq 'latexsource') {
 		$currentstring .= '\\';
@@ -1412,7 +1412,8 @@ sub start_table {
 		if ($signature) {
 		    my $NumberEmptyLength = $how_many_columns - $filled_columns;		
 		    my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
-		    $output =~ s/\$SpacePerColumn/$SpacePerColumn/g;
+		    my $shorthand = ($NumberEmptyLength+1)*4;
+		    $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
 		}	
 		$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
 		if ($#Apache::londefdef::table > 0) {
@@ -1542,18 +1543,18 @@ sub start_table {
 #-- <img> tag
         sub start_img {
 	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
-            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
-                                        $token->[2]->{'src'};
+	    my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,
+						 undef,1);
+            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=$src;
             my $currentstring = '';
 	    my $width_param = '';
 	    my $height_param = '';
 	    my $scaling = .3;
 
 	    if ($target eq 'web') {
-              $currentstring = $token->[4];     
+              $currentstring = $token->[4];
 	    } elsif ($target eq 'tex') {
-		my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
-		&image_replication($src);
+	      &image_replication($src);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
               #if original gif/jpg file exist do following:
               if (-e $src) {          
@@ -1591,7 +1592,7 @@ sub start_table {
 		  if (-e $newsrc) {
                       #eps counterpart for image exist 
 		      if ($path) {
-			  $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
 		      }
 		  } else {
                       #there is no eps counterpart for image - check for ps one
@@ -1600,7 +1601,7 @@ sub start_table {
 			  #ps counterpart for image exist 
 			  $file =~ s/\.eps$/\.ps/;
 			  if ($path) {
-			      $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			      $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
 			  }
 		      } else {
 			  #there aren't eps or ps - so create eps 
@@ -1608,7 +1609,7 @@ sub start_table {
 			  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
 			  $temp_file = Apache::File->new('>>'.$filename); 
 			  print $temp_file "$src\n";
-			  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			  $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
 		      }
 		  }
 	      } else {
@@ -1714,17 +1715,30 @@ sub start_embed {
 	   return $currentstring;
 	}
 #-- <allow> tag
-        sub start_allow {
-	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;	  
-            $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
-                                        $token->[2]->{'src'};
-	    my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
-	    &image_replication($src);
-	    return '';
-	}
-        sub end_allow {
-	   return '';
-	}
+sub start_allow {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
+	$token->[2]->{'src'};
+    my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+    &image_replication($src);
+    my $result;
+    if ($target eq 'edit') {
+	$result .=&Apache::edit::tag_start($target,$token);
+	$result .=&Apache::edit::text_arg('File Spec:','src',$token,70);
+	$result .=&Apache::edit::end_row();#.&Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+						     $safeeval,'src');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
+    }
+    return $result;
+}
+
+sub end_allow {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+    if ( $target eq 'edit') { return (&Apache::edit::end_table()); }
+    return '';
+}
 #-- Frames
 	sub start_frameset {
 	  my ($target,$token) = @_;