--- loncom/xml/londefdef.pm	2002/11/15 16:35:23	1.103
+++ loncom/xml/londefdef.pm	2002/11/19 15:13:37	1.106
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.103 2002/11/15 16:35:23 sakharuk Exp $
+# $Id: londefdef.pm,v 1.106 2002/11/19 15:13:37 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -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;
 	}
@@ -1505,7 +1514,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';
@@ -1575,8 +1584,8 @@ 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 $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 '') {  
@@ -2551,7 +2560,7 @@ sub image_replication {
 	&Apache::lonnet::repcopy('/home/httpd/html'.$src);
 	#replicates eps or ps 
 	my $newsrc = $src;
-	$newsrc =~ s/(.gif|.jpg|.png)$/.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);