--- loncom/xml/londefdef.pm	2007/10/15 20:00:12	1.375.2.1
+++ 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.375.2.1 2007/10/15 20:00:12 albertel Exp $
+# $Id: londefdef.pm,v 1.376 2007/09/10 19:50:20 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -578,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>
@@ -4538,12 +4544,6 @@ 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,