[LON-CAPA-cvs] cvs: loncom /xml londefdef.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Mon, 28 Oct 2002 18:20:08 -0000


sakharuk		Mon Oct 28 13:20:08 2002 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  Corrections were done to improve the printing of tables
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.94 loncom/xml/londefdef.pm:1.95
--- loncom/xml/londefdef.pm:1.94	Tue Oct  8 16:35:19 2002
+++ loncom/xml/londefdef.pm	Mon Oct 28 13:20:08 2002
@@ -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.95 2002/10/28 18:20:08 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1412,7 +1412,7 @@
 		if ($signature) {
 		    my $NumberEmptyLength = $how_many_columns - $filled_columns;		
 		    my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
-		    $output =~ s/\$SpacePerColumn/$SpacePerColumn/g;
+		    $output =~ s/\$SpacePerColumn/$SpacePerColumn - 4 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) {
@@ -1591,7 +1591,7 @@
 		  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.'}}\vskip 1 mm ';
 		      }
 		  } else {
                       #there is no eps counterpart for image - check for ps one
@@ -1600,7 +1600,7 @@
 			  #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.'}}\vskip 1 mm ';
 			  }
 		      } else {
 			  #there aren't eps or ps - so create eps 
@@ -1608,7 +1608,7 @@
 			  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.'}}\vskip 1 mm ';
 		      }
 		  }
 	      } else {