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

Diff for /loncom/xml/londefdef.pm between versions 1.107 and 1.109

version 1.107, 2003/01/16 02:55:05 version 1.109, 2003/02/03 19:10:28
Line 353  sub start_html { Line 353  sub start_html {
   delete($token->[2]->{$key});    delete($token->[2]->{$key});
  }   }
       }        }
       $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().        $token->[2]->{'onload'}=&Apache::lonxml::loadevents().
                        ';'.$onLoad;                         ';'.$onLoad;
       my $onUnload='';        my $onUnload='';
       foreach my $key (keys(%{$token->[2]})) {        foreach my $key (keys(%{$token->[2]})) {
Line 362  sub start_html { Line 362  sub start_html {
   delete($token->[2]->{$key});    delete($token->[2]->{$key});
  }   }
       }        }
       $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().        $token->[2]->{'onunload'}=&Apache::lonxml::unloadevents().
                          ';'.$onUnload;                           ';'.$onUnload;
   
       $currentstring .= '<'.$token->[1];        $currentstring .= '<'.$token->[1];
Line 1434  sub start_table { Line 1434  sub start_table {
     my $shorthand = ($filled_columns+1)*4;      my $shorthand = ($filled_columns+1)*4;
     $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;      $output =~ s/\$SpacePerColumn/$SpacePerColumn - $shorthand mm/g;
  }   }
    if ($how_many_columns==1) {  #start of block with width correction for one column table
     $output=~s/^\s*\\parbox{([^}]*)}/\\parbox{\\textwidth - 1 cm}/;
    }                            #end of block with width correction for one column table
  $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';   $Apache::londefdef::table[-1]{'output'} .= $header_of_table.$output.$Apache::londefdef::table[-1]{'hinc'}.'\end{tabular}\vskip 0 mm ';
  if ($#Apache::londefdef::table > 0) {   if ($#Apache::londefdef::table > 0) {
     $inmemory = $Apache::londefdef::table[-1]{'output'};      $inmemory = $Apache::londefdef::table[-1]{'output'};
Line 1487  sub start_table { Line 1490  sub start_table {
             my $currentstring = '';              my $currentstring = '';
             if ($target eq 'web') {              if ($target eq 'web') {
               $currentstring = $token->[4];                     $currentstring = $token->[4];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);   my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval,undef,1),0,1);
  if ($what_to_push eq '') {   if ($what_to_push eq '') {
     $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;      $what_to_push = substr($Apache::londefdef::table[-1]{'rows'}[0],0,1);;
Line 1495  sub start_table { Line 1498  sub start_table {
     push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;      push @{ $Apache::londefdef::table[-1]{'columns'} }, $what_to_push;
  $Apache::londefdef::table[-1]{'counter_columns'}++;   $Apache::londefdef::table[-1]{'counter_columns'}++;
  &Apache::lonxml::startredirection();   &Apache::lonxml::startredirection();
 ;  
     }       } 
    return $currentstring;     return $currentstring;
  }           }        
Removed from v.1.107  
changed lines
  Added in v.1.109

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