--- loncom/xml/londefdef.pm	2007/06/19 20:25:45	1.368
+++ loncom/xml/londefdef.pm	2007/07/04 14:02:14	1.372
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.368 2007/06/19 20:25:45 banghart Exp $
+# $Id: londefdef.pm,v 1.372 2007/07/04 14:02:14 foxr Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -481,13 +481,21 @@ sub start_accessrule {
 	('realm',$parstack,$safeeval,undef,1);
     my $role=&Apache::lonxml::get_param
 	('role',$parstack,$safeeval,undef,1);
-    $realm=~s/\s+//g;
-    $realm=~s/\//\_/g;
-    $realm=~s/^\_//;
-    $realm=~s/\W/\;/g;
-    $role=~s/\s+//g;
-    $role=~s/\//\_/g;
-    $role=~s/\W/\;/g;
+    my ($dom,$crs,$sec)=split(/\_/,$realm);
+    $dom = &LONCAPA::clean_domain($dom);
+    my $type=&Apache::lonxml::get_param
+	('type',$parstack,$safeeval,undef,1);
+    if ($type eq 'user') {
+	$crs = &LONCAPA::clean_username($crs);
+    } else {
+	$crs = &LONCAPA::clean_courseid($crs);
+    }
+    $sec =~s/\W//;
+    $realm = $dom;
+    if ($crs =~ /\S/) { $realm .= '_'.$crs; }
+    if ($sec =~ /\S/) { $realm .= '_'.$sec; }
+    $role=~s/\W//g;
+
     if ($target eq 'web') {
 	my $args='';
 	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
@@ -498,7 +506,7 @@ sub start_accessrule {
 	}
     }
     if ($target eq 'meta') {
-	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';
+	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
     }
     return $currentstring;
 }
@@ -2058,6 +2066,7 @@ sub end_table {
     if ($target eq 'web' || $target eq 'webgrade') {
 	$currentstring = $token->[2];     
     } elsif ($target eq 'tex') {
+	my $border =  &Apache::lonxml::get_param('border',$parstack,$safeeval);
 	my $inmemory = '';
 	my $output = '';
 	my $WARNING='';
@@ -2154,11 +2163,11 @@ sub end_table {
 	my @fwidth=@{$Apache::londefdef::table[-1]{'TeXlen'}[0]};#final width array
 	my @adjust=();
         #step 1. adjustment by maximum value
-	my $space_neeeded=0;
+	my $space_needed=0;
 	for (my $jn=0;$jn<=$#max_len;$jn++) {
-	    $space_neeeded=$space_neeeded+$max_len[$jn];
+	    $space_needed=$space_needed+$max_len[$jn];
 	}
-	if ($space_neeeded<=$available_space) {
+	if ($space_needed<=$available_space) {
 
 	    for (my $jn=0;$jn<=$#max_len;$jn++) {
 		if ($fwidth[$jn]==0) {
@@ -2167,11 +2176,11 @@ sub end_table {
 	    }
 	} else {
         #step 2. adjustment by minimum value (estimation)
-	    $space_neeeded=0;
+	    $space_needed=0;
 	    for (my $jn=0;$jn<=$#min_len;$jn++) {
-		$space_neeeded+=$min_len[$jn];
+		$space_needed+=$min_len[$jn];
 	    }
-	    if ($space_neeeded>$available_space) {
+	    if ($space_needed>$available_space) {
 		$WARNING=' \textbf{NOT ENOUGH SPACE FOR TABLE} ';
 		for (my $jn=0;$jn<=$#max_len;$jn++) {
 		    if ($fwidth[$jn]==0) {
@@ -2188,7 +2197,7 @@ sub end_table {
 		    }
 		}
 		if ($how_many_to_scale>0) {
-		    my $space_to_adjust=($space_neeeded-$available_space)/$how_many_to_scale;
+		    my $space_to_adjust=($space_needed-$available_space)/$how_many_to_scale;
 		    foreach my $jn (@to_scale) {
 			for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
 			    $Apache::londefdef::table[-1]{'content'}[$in][$jn]=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt)*)/;
@@ -2210,7 +2219,7 @@ sub end_table {
 		}
 	    } else {
 	      #step 3. adjustment over minimal + corrections
-		my $enlarge_coef=$available_space/$space_neeeded;
+		my $enlarge_coef=$available_space/$space_needed;
 		my $acsessive=0;
 		for (my $jn=0;$jn<=$#min_len;$jn++) {
 		    $adjust[$jn]=$min_len[$jn]*$enlarge_coef;
@@ -2250,6 +2259,9 @@ sub end_table {
 	for (my $i=0;$i<=$#fwidth;$i++) {  
 	    $current+=$fwidth[$i];
 	}
+	if ($current == 0) {
+            $current = $Apache::londefdef::table[-1]{'width'};
+        }
 	my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
 	for (my $i=0;$i<=$#fwidth;$i++) {  
 	    $fwidth[$i]*=$coef;
@@ -2302,6 +2314,10 @@ sub end_table {
 		#  Do the appropriate magic if this has a colspan
 		# 
 		
+		my $border_char = "";
+		if ($border) {
+		    $border_char = "|";
+		}
 		my $spanwidth = 0;
 		if ($colspan > 1) {
 		    for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
@@ -2311,12 +2327,12 @@ sub end_table {
 			$colspan
 			."}";
 		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-			$output .= '{|c|}{';
+			$output .= '{'.$border_char.'c'.$border_char.'}{';
 		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-			$output .= '{|r|}{';
+			$output .= '{'.$border_char.'r'.$border_char.'}{';
 		    }
 		    else {
-			$output .= "{|p{$spanwidth mm}|}{";
+			$output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{';
 		    }
 		    
 		} else {
@@ -2332,10 +2348,10 @@ sub end_table {
 		if ($rowspan > 1) {
 		    if ($colspan == 1) {
 			if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-			    $output .= '\multicolumn{1}{|c|}{';
+			    $output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
 			    $multirow_aligned = 1;
 			} elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-			    $output .= '\multicolumn{1}{|r|}{';
+			    $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
 			    $multirow_aligned = 1;
 			}
 		    }
@@ -2372,9 +2388,9 @@ sub end_table {
 		#
 		if ($colspan == 1  && $rowspan == 1) {
 		    if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
-			$output .= '\multicolumn{1}{|c|}{';
+			$output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
 		    } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
-			$output .= '\multicolumn{1}{|r|}{';
+			$output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
 		    }
 		}