--- loncom/xml/londefdef.pm	2002/10/08 20:09:17	1.92
+++ loncom/xml/londefdef.pm	2002/11/06 16:50:11	1.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.92 2002/10/08 20:09:17 sakharuk Exp $
+# $Id: londefdef.pm,v 1.97 2002/11/06 16:50:11 sakharuk 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) {
@@ -1552,7 +1553,8 @@ sub start_table {
 	    if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+		my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
+		&image_replication($src);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
               #if original gif/jpg file exist do following:
               if (-e $src) {          
@@ -1590,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
@@ -1599,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 
@@ -1607,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 {
@@ -1718,17 +1720,7 @@ sub start_embed {
             $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=   
                                         $token->[2]->{'src'};
 	    my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
-	    if (not -e '/home/httpd/html'.$src) {
-            #replicates image itself
-		&Apache::lonnet::repcopy('/home/httpd/html'.$src);
-	        #replicates eps or ps 
-		my $newsrc = $src;
-		$newsrc =~ s/(.gif|.jpg)$/.eps/;
- 		if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
-		    $newsrc =~ s/\.ps$/\.eps/;
-		    &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
-		}
-	    }
+	    &image_replication($src);
 	    return '';
 	}
         sub end_allow {
@@ -2527,5 +2519,22 @@ sub start_embed {
             } 
 	   return $currentstring;
 	}
+
+sub image_replication {
+    my $src = shift;
+    if (not -e '/home/httpd/html'.$src) {
+	#replicates image itself
+	&Apache::lonnet::repcopy('/home/httpd/html'.$src);
+	#replicates eps or ps 
+	my $newsrc = $src;
+	$newsrc =~ s/(.gif|.jpg)$/.eps/;
+	if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
+	    $newsrc =~ s/\.ps$/\.eps/;
+	    &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
+	}
+    }
+    return '';
+}
+
 1;
 __END__