--- loncom/xml/londefdef.pm	2007/06/26 01:36:48	1.371
+++ loncom/xml/londefdef.pm	2007/12/06 11:22:37	1.380
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.371 2007/06/26 01:36:48 albertel Exp $
+# $Id: londefdef.pm,v 1.380 2007/12/06 11:22:37 foxr 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,29 +481,36 @@ 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);
-    my ($dom,$crs,$sec)=split(/\_/,$realm);
-    $dom = &LONCAPA::clean_domain($dom);
-    my $type=&Apache::lonxml::get_param
-	('type',$parstack,$safeeval,undef,1);
+    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 .= '_'.$crs; }
-    if ($sec =~ /\S/) { $realm .= '_'.$sec; }
+    if ($crs =~ /\S/) { $realm .= $separator.$crs; }
+    if ($sec =~ /\S/) { $realm .= $separator.$sec; }
     $role=~s/\W//g;
 
     if ($target eq 'web') {
@@ -562,12 +579,7 @@ sub start_body {
 
 	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::londefdef::edit_controls();
 	}
 	$currentstring.=&Apache::lonxml::message_location();
     } elsif ($target eq 'tex') {
@@ -576,6 +588,16 @@ EDITBUTTON
     return $currentstring;
 }
 
+sub edit_controls {
+    my $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>
@@ -1251,9 +1273,7 @@ sub start_br {
 		$signal = 1;
 	    }
 	}
-	if ($signal eq 1) {
-	    $currentstring .= ' \vskip 0 mm ';
-	} else {
+	if ($signal != 1) {
 	    $currentstring .= '\strut \\\\ \strut ';
 	}
     
@@ -1565,6 +1585,9 @@ sub start_div {
     } 
     if ($target eq 'tex') {
 	# 4 possible alignments: left, right, center, and -missing-.
+        # If inside a table row, we must let the table logic
+	# do the alignment, however.
+	# 
 
 	my $endstring = '';
 
@@ -1575,6 +1598,7 @@ sub start_div {
 	    $endstring      = '\end{center}';
 	    if (&is_inside_of($tagstack, "table")) {
 		$currentstring = &center_correction().$currentstring;
+		$endstring    .= &center_end_correction(); 
 	    }
 	}
 	elsif ($align eq 'right') {
@@ -2066,6 +2090,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='';
@@ -2313,6 +2338,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++) {
@@ -2322,12 +2351,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 {
@@ -2343,10 +2372,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;
 			}
 		    }
@@ -2383,9 +2412,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.'}{';
 		    }
 		}
 
@@ -4518,6 +4547,12 @@ sub align_latex_image {
     my ($align, $latex_rendering, $image, $width, $height) = @_;
     my $currentstring;        # The 1/2 wrapped image.
     my $closure;              # The closure of the wrappage.
+
+    # if it's none just return it back
+    if ($latex_rendering eq 'none') {
+	return ($image,'');
+    }
+
     #    If there's an alignment specification we need to honor it here.
     #    For the horizontal alignments, we will also honor the
     #    value of the latex specfication.  The default is parbox,