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

Diff for /loncom/xml/londefdef.pm between versions 1.299 and 1.300

version 1.299, 2005/12/01 18:46:17 version 1.300, 2005/12/05 23:22:49
Line 2218  sub end_table { Line 2218  sub end_table {
     my $min_nested_width = 0;      my $min_nested_width = 0;
     my $max_nested_width = 0;      my $max_nested_width = 0;
     for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) {      for (my $col = 0; $col <= $Apache::londefdef::table[-1]{'counter_columns'}; $col++) {
   
  $min_nested_width +=  $min_len[$col];   $min_nested_width +=  $min_len[$col];
  $max_nested_width +=  $max_len[$col];   $max_nested_width +=  $max_len[$col];
   
     }      }
     # Fudge in an extra 5 mm for borders etc:      # Fudge in an extra 5 mm for borders etc:
           
Line 2262  sub start_tr { Line 2262  sub start_tr {
     push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';      push @ {$Apache::londefdef::table[-1]{'rows'} }, 'l';
  }   }
  push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});   push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
    #
    #  Need to save the number of table columns to preserve the max # columns.
    #
    $Apache::londefdef::table[-1]{'prior_columns'}   = $Apache::londefdef::table[-1]{'counter_columns'};
  $Apache::londefdef::table[-1]{'counter_columns'} = -1;   $Apache::londefdef::table[-1]{'counter_columns'} = -1;
  push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];   push @ {$Apache::londefdef::table[-1]{'TeXlen'}}, [];
  push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];   push @ {$Apache::londefdef::table[-1]{'objectlen'}}, [];
Line 2281  sub end_tr { Line 2285  sub end_tr {
  if ($Apache::londefdef::TD_redirection) {   if ($Apache::londefdef::TD_redirection) {
     &end_td_tex($parstack,$parser,$safeeval);          &end_td_tex($parstack,$parser,$safeeval);    
  }   }
    # Counter columns must be the maximum number of columns seen
    # in the table so far so:
    if ($Apache::londefdef::table[-1]{'prior_columns'} > $Apache::londefdef::table[-1]{'counter_columns'}) {
       $Apache::londefdef::table[-1]{'counter_columns'} = $Apache::londefdef::table[-1]{'prior_columns'};
    }
   
   
   
Line 2418  sub end_td_tex { Line 2427  sub end_td_tex {
     }      }
  for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {       for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {    
     my $nested = $Apache::londefdef::table[-1]{'include'}[$in];      my $nested = $Apache::londefdef::table[-1]{'include'}[$in];
     &Apache::lonnet::logthis("Nested: $nested");  
     $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;      $nested =~ s/\\end\{tabular\}\\strut\\\\/\\end\{tabular\}/;
     &Apache::lonnet::logthis("After sub: $nested");  
    # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;     # $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
     $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;      $data =~ s/\\keephidden\{NEW TABLE ENTRY\}/$nested/;
  }   }
Removed from v.1.299  
changed lines
  Added in v.1.300

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