--- loncom/xml/londefdef.pm	2007/03/22 22:34:23	1.361
+++ loncom/xml/londefdef.pm	2007/05/10 09:50:10	1.365
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.361 2007/03/22 22:34:23 foxr Exp $
+# $Id: londefdef.pm,v 1.365 2007/05/10 09:50:10 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1609,7 +1609,11 @@ sub end_a {
 	    &Apache::lonxml::get_param('name',$parstack,$safeeval,undef,1);
 	if ($href =~ /\S/) {
 	    $href =~ s/([^\\])%/$1\\\%/g;
-	    $currentstring .= ' ({\tt URI:'.&Apache::lonxml::latex_special_symbols($href).'})';
+	    # Substitute special symbols... and allow line breaks at each /
+	    #
+	    $href = &Apache::lonxml::latex_special_symbols($href);
+	    $href =~ s/\//\/\\-/g;              # Map / to /\- to allow hyphenation.
+	    $currentstring .= ' ({\tt URI:'.$href.'})';
 	} elsif ($name =~ /\S/) {
 	    $currentstring .= ' ({\tt Anchor:'.&Apache::lonxml::latex_special_symbols($name).'})';
 	} else {
@@ -1985,11 +1989,11 @@ sub start_table {
 	    } else { 
 		$TeXwidth = $textwidth;
 	    }
-	} else {
-	    $Apache::londefdef::table[-1]{'forcedtablewidth'} = 1;
 	}
+	# if the width is specified as a % it is converted to an absolute width.
+	# otherwise.. just plugged right in the hash
+
 	if ($TeXwidth=~/%/) {
-	    $Apache::londefdef::table[-1]{'percent'}=1;
 	    $TeXwidth=~/(\d+)/;
             $Apache::londefdef::table[-1]{'width'}=$1*$textwidth/100;
 	} else {
@@ -2000,7 +2004,6 @@ sub start_table {
 	if ($Apache::londefdef::table[-1]{'width'} > $textwidth) {
 	    $Apache::londefdef::table[-1]{'width'} = $textwidth;
 	}
-
         #table's border
 	my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval); 
         my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);
@@ -2141,6 +2144,7 @@ sub end_table {
 	    $space_neeeded=$space_neeeded+$max_len[$jn];
 	}
 	if ($space_neeeded<=$available_space) {
+
 	    for (my $jn=0;$jn<=$#max_len;$jn++) {
 		if ($fwidth[$jn]==0) {
 		    $fwidth[$jn]=$max_len[$jn];
@@ -2224,16 +2228,16 @@ sub end_table {
 		}
 	    }
 	}
-        #use all available width if it is defined in % or as TeXwidth
-        if (($Apache::londefdef::table[-1]{'percent'}==1) || ($Apache::londefdef::table[-1]{'forcetablewidth'}==1)) {
-	    my $current=0; 
-	    for (my $i=0;$i<=$#fwidth;$i++) {  
-		$current+=$fwidth[$i];
-	    }
-	    my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
-	    for (my $i=0;$i<=$#fwidth;$i++) {  
-		$fwidth[$i]*=$coef;
-	    }
+        # use all available width or specified width as if not specified,
+	# the specified width gets defaulted to the available width.
+
+	my $current=0; 
+	for (my $i=0;$i<=$#fwidth;$i++) {  
+	    $current+=$fwidth[$i];
+	}
+	my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
+	for (my $i=0;$i<=$#fwidth;$i++) {  
+	    $fwidth[$i]*=$coef;
 	}
         #removing of empty columns if allowed
         my $permission=&Apache::lonxml::get_param('TeXDropEmptyColumns',$parstack,$safeeval,undef,0);