--- loncom/xml/londefdef.pm	2002/11/15 16:51:02	1.104
+++ loncom/xml/londefdef.pm	2003/01/16 02:55:05	1.107
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.104 2002/11/15 16:51:02 sakharuk Exp $
+# $Id: londefdef.pm,v 1.107 2003/01/16 02:55:05 albertel 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';
@@ -1603,7 +1612,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
@@ -1612,7 +1621,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 
@@ -1620,7 +1629,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 {
@@ -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);