version 1.311, 2006/01/09 22:53:25
|
version 1.313, 2006/01/12 23:48:00
|
Line 1187 sub start_p {
|
Line 1187 sub start_p {
|
$closing_string = '</p>'; # Deal correctly with <p /> e.g. |
$closing_string = '</p>'; # Deal correctly with <p /> e.g. |
} |
} |
} elsif ($target eq 'tex' && !$para_disabled) { |
} elsif ($target eq 'tex' && !$para_disabled) { |
|
|
$currentstring .= &end_p(); # close off prior para if in progress. |
$currentstring .= &end_p(); # close off prior para if in progress. |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
my $align=&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1); |
if ($align eq 'center') { |
if ($align eq 'center') { |
Line 1204 sub start_p {
|
Line 1205 sub start_p {
|
$closing_string = '}\hfill}'; |
$closing_string = '}\hfill}'; |
} else { |
} else { |
$currentstring.='\par '; |
$currentstring.='\par '; |
$closing_string = '\strut\\\\\strut '; |
if (&is_inside_of($tagstack, 'table')) { |
|
$closing_string = '\vskip 12pt'; # Safer in tables. |
|
} else { |
|
$closing_string = '\strut\\\\\strut '; |
|
} |
} |
} |
|
|
} |
} |
Line 2765 sub start_img {
|
Line 2770 sub start_img {
|
$safeeval, |
$safeeval, |
undef,1)); |
undef,1)); |
if(!$align) { |
if(!$align) { |
# disabled for now see BUG#4535 |
|
if (0 && &is_inside_of($tagstack, "table")) { |
|
$align = "right"; # Force wraptext use. |
|
} else { |
|
$align = "bottom"; # This is html's default so it's ours too. |
$align = "bottom"; # This is html's default so it's ours too. |
} |
|
} |
} |
# |
# |
&Apache::lonxml::debug("Alignemnt = $align"); |
&Apache::lonxml::debug("Alignemnt = $align"); |
Line 2785 sub start_img {
|
Line 2785 sub start_img {
|
$parstack, |
$parstack, |
$safeeval, |
$safeeval, |
undef,0); |
undef,0); |
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); |
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering"); |
if(!$latex_rendering) { |
if(!$latex_rendering) { |
$latex_rendering = "texwrap"; |
$latex_rendering = "texwrap"; |
|
} |
|
# using texwrap inside a table does not work. So, if after all of this, |
|
# texwrap is on, we turn it off if we detect we're in a table: |
|
# |
|
if (($latex_rendering eq 'texwrap') && &is_inside_of($tagstack, "table")) { |
|
$latex_rendering = 'parpic'; |
} |
} |
&Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
|
|
#if original gif/jpg/png file exist do following: |
#if original gif/jpg/png file exist do following: |
my $origsrc=$src; |
my $origsrc=$src; |