[BACK]Return to londefdef.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/londefdef.pm between versions 1.302.2.2 and 1.302.2.3

version 1.302.2.2, 2006/01/09 22:54:47 version 1.302.2.3, 2006/01/13 21:05:57
Line 620  sub end_center { Line 620  sub end_center {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring = '\end{center}';     $currentstring = '\end{center}';  
  if (&is_inside_of($tagstack, "table")) {   if (&is_inside_of($tagstack, "table")) {
     $currentstring .= &center_correction();      #$currentstring .= &center_correction();
  }   }
     }      }
     return $currentstring;      return $currentstring;
Line 1194  sub start_p { Line 1194  sub start_p {
     $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;
  $closing_string .= &center_correction();   #$closing_string .= &center_correction();
     }      }
  } elsif ($align eq 'right') {   } elsif ($align eq 'right') {
     $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';      $currentstring.='\makebox['.$env{'form.textwidth'}.']{\hfill\llap{';
Line 1539  sub start_div { Line 1539  sub start_div {
     $endstring      = '\end{center}';      $endstring      = '\end{center}';
     if (&is_inside_of($tagstack, "table")) {      if (&is_inside_of($tagstack, "table")) {
  $currentstring = &center_correction().$currentstring;   $currentstring = &center_correction().$currentstring;
  $endstring .= &center_correction();   #$endstring .= &center_correction();
     }      }
  }   }
  elsif ($align eq 'right') {   elsif ($align eq 'right') {
Line 2216  sub end_table { Line 2216  sub end_table {
  }   }
  $output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];   $output.=$Apache::londefdef::table[-1]{'content'}[$in][$jn];
  if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {   if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
     $output.='\end{center}'.&center_correction();      $output.='\end{center}';#.&center_correction();
  } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {   } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
     $output.='} ';      $output.='} ';
  }   }
Line 2654  sub start_img { Line 2654  sub start_img {
   undef,1));    undef,1));
  if(!$align) {   if(!$align) {
     # disabled for now see BUG#4535      # disabled for now see BUG#4535
     if (0 && &is_inside_of($tagstack, "table")) {      if (&is_inside_of($tagstack, "table")) {
  $align = "right";      # Force wraptext use.    $align = "top";      # Force top of image to top of table cell 
     } else {      } 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.
     }      }
Removed from v.1.302.2.2  
changed lines
  Added in v.1.302.2.3

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