--- loncom/xml/londefdef.pm	2003/03/14 21:23:20	1.106.2.1
+++ loncom/xml/londefdef.pm	2003/02/05 23:17:32	1.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.106.2.1 2003/03/14 21:23:20 albertel Exp $
+# $Id: londefdef.pm,v 1.111 2003/02/05 23:17:32 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -121,7 +121,6 @@ sub start_tthoption {
 	  &tth::tthoptions($inside);
       }
   }
-  return $result;
 }
 
 sub end_tthoption {
@@ -375,7 +374,7 @@ sub start_html {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().
+	      $token->[2]->{'onload'}=&Apache::lonxml::loadevents().
 		                       ';'.$onLoad;
 	      my $onUnload='';
 	      foreach my $key (keys(%{$token->[2]})) {
@@ -384,7 +383,7 @@ sub start_html {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+	      $token->[2]->{'onunload'}=&Apache::lonxml::unloadevents().
 		                         ';'.$onUnload;
 
 	      $currentstring .= '<'.$token->[1];
@@ -1456,6 +1455,9 @@ sub start_table {
 		    my $shorthand = ($filled_columns+1)*4;
 		    $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
 		}	
+		if ($how_many_columns==1) {  #start of block with width correction for one column table
+		  $output=~s/^\s*\\parbox{([^}]*)}/\\parbox{\\textwidth - 1 cm}/;
+		}                            #end of block with width correction for one column table
 		$Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
 		if ($#Apache::londefdef::table > 0) {
 		    $inmemory = $Apache::londefdef::table[-1]{'output'};
@@ -1509,7 +1511,7 @@ sub start_table {
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
-    } elsif ($target eq 'tex') {
+	    } elsif ($target eq 'tex') {
 		my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
 		if ($what_to_push eq '') {
 		    $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
@@ -1517,7 +1519,6 @@ sub start_table {
 		    push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
 		$Apache::londefdef::table[-1]{'counter_columns'}++;
 		&Apache::lonxml::startredirection();
-;
 	    } 
 	   return $currentstring;
 	}        
@@ -1634,7 +1635,7 @@ sub start_table {
 		  if (-e $newsrc) {
                       #eps counterpart for image exist 
 		      if ($path) {
-			  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 		      }
 		  } else {
                       #there is no eps counterpart for image - check for ps one
@@ -1643,7 +1644,7 @@ sub start_table {
 			  #ps counterpart for image exist 
 			  $file =~ s/\.eps$/\.ps/;
 			  if ($path) {
-			      $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			      $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 			  }
 		      } else {
 			  #there aren't eps or ps - so create eps 
@@ -1651,7 +1652,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 .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			  $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 		      }
 		  }
 	      } else {
@@ -2584,7 +2585,7 @@ sub image_replication {
 	my $newsrc = $src;
 	$newsrc =~ s/\.(gif|jpg|png)$/.eps/;
 	if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
-	    $newsrc =~ s/\.ps$/\.eps/;
+	    $newsrc =~ s/\.eps$/\.ps/;
 	    &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
 	}
     }