--- loncom/xml/londefdef.pm 2007/09/10 20:09:13 1.377
+++ loncom/xml/londefdef.pm 2008/02/14 22:37:46 1.381
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.377 2007/09/10 20:09:13 albertel Exp $
+# $Id: londefdef.pm,v 1.381 2008/02/14 22:37:46 www Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -578,11 +578,10 @@ sub start_body {
'force_register' => 1});
if ($env{'request.state'} ne 'published') {
-
+ $currentstring.=&Apache::lonmenu::constspaceform();
+ $currentstring.=&Apache::londefdef::edit_controls();
}
$currentstring.=&Apache::lonxml::message_location();
- $currentstring.=&Apache::lonmenu::constspaceform();
- $currentstring.=&Apache::londefdef::edit_controls();
} elsif ($target eq 'tex') {
$currentstring = '\begin{document}';
}
@@ -1586,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 = '';
@@ -1596,6 +1598,7 @@ sub start_div {
$endstring = '\end{center}';
if (&is_inside_of($tagstack, "table")) {
$currentstring = ¢er_correction().$currentstring;
+ $endstring .= ¢er_end_correction();
}
}
elsif ($align eq 'right') {
@@ -3060,11 +3063,14 @@ sub start_img {
my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval);
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
-
- $currentstring .= '
[2]{'src'}=~/\$/) {
+ $currentstring.='Variable image source';
+ } else {
+ $currentstring .= '
[2]{'src'},$token->[2]{'width'},$token->[2]{'height'});
@@ -4544,6 +4550,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,