Diff for /loncom/xml/londefdef.pm between versions 1.332 and 1.336

version 1.332, 2006/08/02 19:26:54 version 1.336, 2006/09/05 21:57:57
Line 1154  sub start_p { Line 1154  sub start_p {
  $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') {
     $currentstring .='\begin{center}\par';      $currentstring .='\begin{center}\par ';
     $closing_string = '\end{center}';      $closing_string = '\end{center}';
     if (&is_inside_of($tagstack, "table")) {      if (&is_inside_of($tagstack, "table")) {
  $currentstring = &center_correction().$currentstring;   $currentstring = &center_correction().$currentstring;
Line 1210  sub start_br { Line 1210  sub start_br {
  #   #
  for (my $i=$#tempo;$i>=0;$i--) {   for (my $i=$#tempo;$i>=0;$i--) {
     if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||      if (($tempo[$i] eq 'b') || ($tempo[$i] eq 'strong') ||
                 ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul') ||                  ($tempo[$i] eq 'ol') || ($tempo[$i] eq 'ul'))  {
                 ($tempo[$i] eq 'td') || ($tempo[$i] eq 'th'))  {  
  $signal=1;   $signal=1;
  last;      }
       if (($tempo[$i] eq 'td') || ($tempo[$i] eq 'th')) {
    $signal = 1;
     }      }
  }   }
  if ($signal) {   if ($signal eq 1) {
     $currentstring .= ' \vskip 0 mm ';      $currentstring .= ' \vskip 0 mm ';
  } elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {   } elsif ($$tagstack[-2] ne 'sub' && $$tagstack[-2] ne 'sup') {
     $currentstring .= '\strut \\\\ \strut ';      $currentstring .= '\strut \\\\ \strut ';
Line 2199  sub end_table { Line 2200  sub end_table {
  #    # 
   
  if ($colspan > 1) {   if ($colspan > 1) {
       my $spanwidth = 0;
       for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
    $spanwidth += $fwidth[$spancol];
       }
     $output .= '\multicolumn{'.      $output .= '\multicolumn{'.
  $colspan   $colspan
  .'}{|l|}{';   ."}{|p{$spanwidth mm}|}{";
  }   }
   
  if ($rowspan > 1) {   if ($rowspan > 1) {

Removed from v.1.332  
changed lines
  Added in v.1.336


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>