--- loncom/xml/londefdef.pm	2002/11/09 22:05:33	1.100
+++ loncom/xml/londefdef.pm	2003/02/03 19:10:28	1.109
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.100 2002/11/09 22:05:33 albertel Exp $
+# $Id: londefdef.pm,v 1.109 2003/02/03 19:10:28 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -353,7 +353,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]})) {
@@ -362,7 +362,7 @@ sub start_html {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+	      $token->[2]->{'onunload'}=&Apache::lonxml::unloadevents().
 		                         ';'.$onUnload;
 
 	      $currentstring .= '<'.$token->[1];
@@ -965,7 +965,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\underline{';
+	       &Apache::lonxml::startredirection();
 	    } 
            return $currentstring;
 	}
@@ -975,7 +975,10 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= '}';
+	       $currentstring=&Apache::lonxml::endredirection();
+	       $currentstring=~s/(\S)(\s+)(\S)/$1}$2\\underline{$3/g;
+	       $currentstring=~s/^\s*(\S)/\\underline{$1/;
+	       $currentstring=~s/(\S)\s*$/$1}/;	 	       
             }
            return $currentstring;
 	}
@@ -986,7 +989,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\underline{';
+	       &Apache::lonxml::startredirection();
 	    } 
            return $currentstring;
 	}
@@ -996,7 +999,10 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= '}';
+	       $currentstring=&Apache::lonxml::endredirection();
+	       $currentstring=~s/(\S)(\s+)(\S)/$1}$2\\underline{$3/g;
+	       $currentstring=~s/^\s*(\S)/\\underline{$1/;
+	       $currentstring=~s/(\S)\s*$/$1}/;	
             }
            return $currentstring;
 	}
@@ -1142,7 +1148,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\underline{';
+	       &Apache::lonxml::startredirection();
 	    } 
            return $currentstring;
 	}
@@ -1152,7 +1158,10 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[2];
 	    } elsif ($target eq 'tex') {
-	        $currentstring .= '}';
+	       $currentstring=&Apache::lonxml::endredirection();
+	       $currentstring=~s/(\S)(\s+)(\S)/$1}$2\\underline{$3/g;
+	       $currentstring=~s/^\s*(\S)/\\underline{$1/;
+	       $currentstring=~s/(\S)\s*$/$1}/;		
             }
            return $currentstring;
 	}
@@ -1310,7 +1319,7 @@ sub start_table {
 	push @Apache::londefdef::table, $aa; 
 	$Apache::londefdef::table[-1]{'row_number'} = -1;
 	$Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
-	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
+	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval,undef,1); 
 	unless (defined $border) { $border = 0; }
 	if ($border) { 
 	    $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
@@ -1324,7 +1333,7 @@ sub start_table {
 	my $width;
 	foreach my $key (keys(%{$token->[2]})) {
 	    if ($key =~ /^width$/i) {
-		$width = &Apache::lonxml::get_param($key,$parstack,$safeeval);
+		$width = &Apache::lonxml::get_param($key,$parstack,$safeeval,undef,1);
 	    }
 	}
 	if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }
@@ -1422,9 +1431,12 @@ sub start_table {
 		if ($signature) {
 		    my $NumberEmptyLength = $how_many_columns - $filled_columns;		
 		    my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
-		    my $shorthand = ($NumberEmptyLength+1)*4;
+		    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'};
@@ -1449,7 +1461,7 @@ sub start_table {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
 		$Apache::londefdef::table[-1]{'row_number'}++;
-		my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+		my $alignchar = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
 		if ($alignchar ne '') {
 		    push @ {$Apache::londefdef::table[-1]{'rows'} }, $alignchar;
 		} else {
@@ -1478,15 +1490,14 @@ sub start_table {
             my $currentstring = '';
             if ($target eq 'web') {
               $currentstring = $token->[4];     
-    } elsif ($target eq 'tex') {
-		my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+	    } 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);;
 		}
 		    push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
 		$Apache::londefdef::table[-1]{'counter_columns'}++;
 		&Apache::lonxml::startredirection();
-;
 	    } 
 	   return $currentstring;
 	}        
@@ -1505,7 +1516,7 @@ sub start_table {
 		} else {
 		    if (length($data)<5) {
 			$Apache::londefdef::table[-1]{'length'} .= '0 mm,';
-			$tempolen = '5 mm';
+			$tempolen = '6 mm';
 		    } else {
 			$Apache::londefdef::table[-1]{'length'} .= '0 mm,';
 			$tempolen = 'TOBECHANGEDONNUMBER';
@@ -1522,7 +1533,7 @@ sub start_table {
             if ($target eq 'web') {
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
-		my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),0,1);
+		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);;
 		}
@@ -1566,7 +1577,7 @@ sub start_table {
 	    } elsif ($target eq 'tex') {
 	      &image_replication($src);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
-              #if original gif/jpg file exist do following:
+              #if original gif/jpg/png file exist do following:
               if (-e $src) {          
                   #defines the default size of image
 		  my $image = Image::Magick->new;
@@ -1575,9 +1586,10 @@ sub start_table {
 		  $height_param = $image->Get('height') * $scaling;;
 		  undef $image;
 		  #do we have any specified size of the picture?
-		  my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval); 
-		  my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval); 
-		  my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval);
+		  my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
+		  my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
+		  my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
+                                                         undef,1);
 		  if ($TeXwidth ne '') {  
 		      if ($TeXwidth=~/(\d+)\s*\%/) {
 			  $width_param = $1*$ENV{'form.textwidth'}/100;
@@ -1596,13 +1608,13 @@ sub start_table {
 		      $path = $1.'/'; 
 		  } 
 		  my $newsrc = $src;
-		  $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
-		  $file=~s/(\.gif|\.jpg)$/\.eps/i;
+		  $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;
+		  $file=~s/\.(gif|jpg|png)$/.eps/i;
 		  #where can we find the picture?
 		  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
@@ -1611,7 +1623,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 
@@ -1619,12 +1631,12 @@ 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 {
 		  #original image file doesn't exist so check the alt attribute
-		  my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval);
+		  my $alt = &Apache::lonxml::get_param('alt',$parstack,$safeeval,undef,1);
                   if ($alt) {
 		      $currentstring .= ' '.$alt.' ';
 		  } else {
@@ -1729,7 +1741,7 @@ 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);
+    my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
     &image_replication($src);
     my $result;
     if ($target eq 'edit') {
@@ -1796,7 +1808,7 @@ sub end_allow {
 	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
 	       $currentstring .= '<b>'.$display.'</b>';;
 	    }
            return $currentstring;
@@ -1814,7 +1826,7 @@ sub end_allow {
 	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'web') {
-		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval);
+		my $display = &Apache::lonxml::get_param('display',$parstack,$safeeval,undef,1);
 	       $currentstring .= '<b>'.$display.'</b>';;
 	    }
            return $currentstring;
@@ -1832,7 +1844,7 @@ sub end_allow {
 	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';
             if ($target eq 'tex') {
-		my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval);
+		my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval,undef,1);
 		$currentstring .= '\vskip '.$howmuch.' ';
 	    }
            return $currentstring;
@@ -2550,7 +2562,7 @@ sub image_replication {
 	&Apache::lonnet::repcopy('/home/httpd/html'.$src);
 	#replicates eps or ps 
 	my $newsrc = $src;
-	$newsrc =~ s/(.gif|.jpg)$/.eps/;
+	$newsrc =~ s/\.(gif|jpg|png)$/.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);