--- loncom/xml/londefdef.pm	2007/06/05 22:37:58	1.366
+++ loncom/xml/londefdef.pm	2007/09/10 19:50:20	1.376
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.366 2007/06/05 22:37:58 albertel Exp $
+# $Id: londefdef.pm,v 1.376 2007/09/10 19:50:20 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -448,6 +448,16 @@ sub start_meta {
 	if ((not defined $content) && (not defined $name)) {
 	    &Apache::lonxml::startredirection();
 	}
+    } elsif ($target eq 'edit') {
+	$currentstring .= &Apache::edit::tag_start($target,$token);
+	$currentstring .= &Apache::edit::text_arg('Name:','name',$token,30);
+	$currentstring .= &Apache::edit::text_arg('Content:','content',$token,70);
+	$currentstring .= &Apache::edit::end_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag =
+	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+					'name','content');
+	if ($constructtag) { $currentstring = &Apache::edit::rebuild_tag($token); }
     }
     return $currentstring;
 }
@@ -471,23 +481,38 @@ sub end_meta {
     return $currentstring;
 }
 
+sub insert_meta {
+    return '
+    <meta />';
+}
+
 # accessrule
 sub start_accessrule {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';
-    my $eff=&Apache::lonxml::get_param
-	('effect',$parstack,$safeeval,undef,1);
-    my $realm=&Apache::lonxml::get_param
-	('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 $eff  =&Apache::lonxml::get_param('effect',$parstack,$safeeval,undef,1);
+    my $realm=&Apache::lonxml::get_param('realm', $parstack,$safeeval,undef,1);
+    my $role =&Apache::lonxml::get_param('role',  $parstack,$safeeval,undef,1);
+    my $type =&Apache::lonxml::get_param('type',  $parstack,$safeeval,undef,1);
+
+    my ($dom,$crs,$sec,$separator);
+    if ($type eq 'user') {
+	($dom,$crs,$sec)=split(m{/},$realm);
+	$crs = &LONCAPA::clean_username($crs);
+	$separator = '/';
+    } else {
+	($dom,$crs,$sec)=split(/\_/,$realm);
+	$crs = &LONCAPA::clean_courseid($crs);
+	$separator = '_';
+    }
+    $dom = &LONCAPA::clean_domain($dom);
+
+    $sec =~s/\W//;
+    $realm = $dom;
+    if ($crs =~ /\S/) { $realm .= $separator.$crs; }
+    if ($sec =~ /\S/) { $realm .= $separator.$sec; }
+    $role=~s/\W//g;
+
     if ($target eq 'web') {
 	my $args='';
 	if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
@@ -498,7 +523,7 @@ sub start_accessrule {
 	}
     }
     if ($target eq 'meta') {
-	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';
+	$currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
     }
     return $currentstring;
 }
@@ -553,21 +578,27 @@ sub start_body {
 					    'force_register' => 1});
 
 	if ($env{'request.state'} ne 'published') {
-	    $currentstring.=&Apache::lonmenu::constspaceform();
-	    $currentstring.=(<<EDITBUTTON);
-<form method="post">
-<input type="submit" name="editmode" accesskey="e" value="Edit" />
-</form>
-<br />
-EDITBUTTON
+
 	}
 	$currentstring.=&Apache::lonxml::message_location();
+	$currentstring.=&Apache::londefdef::edit_controls();
     } elsif ($target eq 'tex') {
 	$currentstring = '\begin{document}';  
     } 
     return $currentstring;
 }
 
+sub edit_controls {
+    my $result = &Apache::lonmenu::constspaceform();
+    $result .= (<<EDITBUTTON);
+<form method="post">
+<input type="submit" name="editmode" accesskey="e" value="Edit" />
+</form>
+<br />
+EDITBUTTON
+    return $result;
+}
+
 sub end_body {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
     my $currentstring = &end_p();	# Close off unclosed <p>
@@ -1243,9 +1274,7 @@ sub start_br {
 		$signal = 1;
 	    }
 	}
-	if ($signal eq 1) {
-	    $currentstring .= ' \vskip 0 mm ';
-	} else {
+	if ($signal != 1) {
 	    $currentstring .= '\strut \\\\ \strut ';
 	}
     
@@ -2058,6 +2087,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 +2184,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 +2197,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 +2218,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 +2240,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 +2280,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 +2335,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 +2348,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 +2369,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 +2409,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.'}{';
 		    }
 		}
 
@@ -3001,9 +3038,10 @@ sub start_img {
 	# And here's where the semi-quote breaks down: allow the user
         # to edit the beast as well by rendering the problem for edit:
     } elsif ($target eq 'edit') {
+        my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
 	$currentstring .=&Apache::edit::tag_start($target,$token);
 	$currentstring .=&Apache::edit::text_arg('Image Url:','src',$token,70).
-	    &Apache::edit::browse('src',undef,'alt').' '.
+	    &Apache::edit::browse('src',undef,'alt',$only).' '.
 	    &Apache::edit::search('src',undef,'alt').'<br />';
 	$currentstring .=&Apache::edit::text_arg('Description:','alt',$token,70).'<br />';
 	$currentstring .=&Apache::edit::text_arg('width (pixel):','width',$token,5);