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

Diff for /loncom/xml/londefdef.pm between versions 1.370 and 1.372

version 1.370, 2007/06/26 01:20:35 version 1.372, 2007/07/04 14:02:14
Line 2066  sub end_table { Line 2066  sub end_table {
     if ($target eq 'web' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'webgrade') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
    my $border =  &Apache::lonxml::get_param('border',$parstack,$safeeval);
  my $inmemory = '';   my $inmemory = '';
  my $output = '';   my $output = '';
  my $WARNING='';   my $WARNING='';
Line 2258  sub end_table { Line 2259  sub end_table {
  for (my $i=0;$i<=$#fwidth;$i++) {     for (my $i=0;$i<=$#fwidth;$i++) {  
     $current+=$fwidth[$i];      $current+=$fwidth[$i];
  }   }
    if ($current == 0) {
               $current = $Apache::londefdef::table[-1]{'width'};
           }
  my $coef=$Apache::londefdef::table[-1]{'width'}/$current;   my $coef=$Apache::londefdef::table[-1]{'width'}/$current;
  for (my $i=0;$i<=$#fwidth;$i++) {     for (my $i=0;$i<=$#fwidth;$i++) {  
     $fwidth[$i]*=$coef;      $fwidth[$i]*=$coef;
Line 2310  sub end_table { Line 2314  sub end_table {
  #  Do the appropriate magic if this has a colspan   #  Do the appropriate magic if this has a colspan
  #    # 
   
    my $border_char = "";
    if ($border) {
       $border_char = "|";
    }
  my $spanwidth = 0;   my $spanwidth = 0;
  if ($colspan > 1) {   if ($colspan > 1) {
     for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {      for (my $spancol = $jn; $spancol < $jn + $colspan; $spancol++) {
Line 2319  sub end_table { Line 2327  sub end_table {
  $colspan   $colspan
  ."}";   ."}";
     if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {      if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
  $output .= '{|c|}{';   $output .= '{'.$border_char.'c'.$border_char.'}{';
     } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {      } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
  $output .= '{|r|}{';   $output .= '{'.$border_char.'r'.$border_char.'}{';
     }      }
     else {      else {
  $output .= "{|p{$spanwidth mm}|}{";   $output .= '{'.$border_char."p{$spanwidth mm}".$border_char.'}{';
     }      }
           
  } else {   } else {
Line 2340  sub end_table { Line 2348  sub end_table {
  if ($rowspan > 1) {   if ($rowspan > 1) {
     if ($colspan == 1) {      if ($colspan == 1) {
  if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {   if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
     $output .= '\multicolumn{1}{|c|}{';      $output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
     $multirow_aligned = 1;      $multirow_aligned = 1;
  } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {   } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
     $output .= '\multicolumn{1}{|r|}{';      $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
     $multirow_aligned = 1;      $multirow_aligned = 1;
  }   }
     }      }
Line 2380  sub end_table { Line 2388  sub end_table {
  #   #
  if ($colspan == 1  && $rowspan == 1) {   if ($colspan == 1  && $rowspan == 1) {
     if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {      if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
  $output .= '\multicolumn{1}{|c|}{';   $output .= '\multicolumn{1}{'.$border_char.'c'.$border_char.'}{';
     } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {      } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
  $output .= '\multicolumn{1}{|r|}{';   $output .= '\multicolumn{1}{'.$border_char.'r'.$border_char.'}{';
     }      }
  }   }
   
Removed from v.1.370  
changed lines
  Added in v.1.372

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