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

Diff for /loncom/xml/londefdef.pm between versions 1.303 and 1.304

version 1.303, 2005/12/19 23:27:33 version 1.304, 2005/12/20 23:12:03
Line 2187  sub end_table { Line 2187  sub end_table {
  #fill the table   #fill the table
  for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {   for (my $in=0;$in<=$Apache::londefdef::table[-1]{'row_number'};$in++) {
     for (my $jn=0;$jn<=$#fwidth;$jn++) {      for (my $jn=0;$jn<=$#fwidth;$jn++) {
    #
    #  Do the appropriate magic if this has a colspan
    # 
    my $colspan = $Apache::londefdef::table[-1]{'colspan'}[$in][$jn];
    if ($colspan > 1) {
       $output .= '\multicolumn{'.
    $colspan
    .'}{|l|}{';
    }
  if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {   if ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'c') {
     # $output.='\vspace*{-6 mm}\begin{center}';      # $output.='\vspace*{-6 mm}\begin{center}';
     $output.='\begin{center}';      $output.='\begin{center}';
Line 2200  sub end_table { Line 2209  sub end_table {
  } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {   } elsif ($Apache::londefdef::table[-1]{'align'}[$in][$jn] eq 'r') {
     $output.='} ';      $output.='} ';
  }   }
    #  Close off the colspan...
    #
    if ($colspan > 1)  {
       $output .= '}';
       $jn += $colspan-1; # Adjust for number of rows really left.
    }
                 if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}                  if ($jn!=$#fwidth) {$output.=' '.$Apache::londefdef::table[-1]{'vinc'};}
     }      }
     $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';      $output.=' \\\\ '.$Apache::londefdef::table[-1]{'hinc'}.' ';
Line 2346  sub start_td_tex { Line 2361  sub start_td_tex {
   
 sub end_td_tex {  sub end_td_tex {
     my ($parstack,$parser,$safeeval) = @_;      my ($parstack,$parser,$safeeval) = @_;
     my $current_row = $Apache::londefdef::table[-1]{'row_number'};      my $current_row    = $Apache::londefdef::table[-1]{'row_number'};
       my $current_column = $Apache::londefdef::table[-1]{'counter_columns'}; 
     my $data = &Apache::lonxml::endredirection();      my $data = &Apache::lonxml::endredirection();
   
     # Get the column and row spans.  
     # Colspan can be done via \multicolumn if I can figure out the data structs.  
     # Rowspan, can be done using the multirow package which adds similar stuff to rowspanning.  
   
     my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 0);  
     my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 0);  
           
   
     my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);      my $TeXwidth=&Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,undef,0);
     if (defined $TeXwidth) {      if (defined $TeXwidth) {
  push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';   push @ {$Apache::londefdef::table[-1]{'objectlen'}[$Apache::londefdef::table[-1]{'row_number'}] },'0';
Line 2445  sub end_td_tex { Line 2457  sub end_td_tex {
     }      }
     # Should be be killing off the 'include' elements as they're used up?      # Should be be killing off the 'include' elements as they're used up?
     push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;      push @ {$Apache::londefdef::table[-1]{'content'}[-1] },$data;
       # Get the column and row spans.
       # Colspan can be done via \multicolumn if I can figure out the data structs.
       # Rowspan, can be done using the multirow package which adds similar stuff to rowspanning.
   
       my $colspan = &Apache::lonxml::get_param('colspan', $parstack, $safeeval, undef, 0);
       if (!$colspan) {
    $colspan = 1;
       }
       my $rowspan = &Apache::lonxml::get_param('rowspan', $parstack, $safeeval, undef, 0);
   
   
       #  the colspan array will indicate how many columns will be spanned by this
       #  cell..this requires that counter_columns also be adjusted accordingly
       #  so that the next bunch of text goes in the right cell.  Note that since
       #  counter_columns is incremented in the start_td_tex, we adjust by colspan-1.
       #
   
       $Apache::londefdef::table[-1]{'colspan'}[$current_row][$current_column] = $colspan;
       $Apache::londefdef::table[-1]{'counter_columns'} += $colspan -1;
   
       # Put empty text in spanned cols.
   
       for (my $i = 0; $i < ($colspan -1); $i++) {
    push @ {$Apache::londefdef::table[-1]{'content'}[-1] },'';
       }
   
   
     return '';      return '';
 }  }
   
Removed from v.1.303  
changed lines
  Added in v.1.304

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