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

Diff for /loncom/xml/londefdef.pm between versions 1.90 and 1.91

version 1.90, 2002/10/07 17:57:37 version 1.91, 2002/10/08 15:35:22
Line 1291  EDITBUTTON Line 1291  EDITBUTTON
    return $currentstring;     return $currentstring;
  }   }
 #-- <table> tag  #-- <table> tag
         sub start_table {  sub start_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             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 $aa = {};   my $aa = {};
  push @Apache::londefdef::table, $aa;    push @Apache::londefdef::table, $aa; 
  $Apache::londefdef::table[-1]{'row_number'} = -1;   $Apache::londefdef::table[-1]{'row_number'} = -1;
  $Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';   $Apache::londefdef::table[-1]{'output'} = ' \noindent \begin{tabular} ';
  my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);   my $border = &Apache::lonxml::get_param('border',$parstack,$safeeval);
  unless (defined $border) { $border = 0; }   unless (defined $border) { $border = 0; }
  if ($border) {    if ($border) { 
     $Apache::londefdef::table[-1]{'hinc'} = '\hline ';       $Apache::londefdef::table[-1]{'hinc'} = '\hline '; 
     $Apache::londefdef::table[-1]{'vinc'} = '&';       $Apache::londefdef::table[-1]{'vinc'} = '&'; 
     $Apache::londefdef::table[-1]{'vvinc'} = '|';      $Apache::londefdef::table[-1]{'vvinc'} = '|';
  } else {   } else {
     $Apache::londefdef::table[-1]{'hinc'} = '';       $Apache::londefdef::table[-1]{'hinc'} = ''; 
     $Apache::londefdef::table[-1]{'vinc'} = '&';       $Apache::londefdef::table[-1]{'vinc'} = '&'; 
     $Apache::londefdef::table[-1]{'vvinc'} = '';      $Apache::londefdef::table[-1]{'vvinc'} = '';
  }  
     }   
    return $currentstring;  
  }   }
    my $width;
    foreach my $key (keys(%{$token->[2]})) {
       if ($key =~ /^width$/i) {
    $width = &Apache::lonxml::get_param($key,$parstack,$safeeval);
       }
    }
    if (defined($width)) { $Apache::londefdef::table[-1]{'width'}=$width; }
       }
       return $currentstring;
   }
         sub end_table {          sub end_table {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
             my $currentstring = '';              my $currentstring = '';
Line 1338  EDITBUTTON Line 1345  EDITBUTTON
  }   }
                 #define the length of the table cells                  #define the length of the table cells
  my @lengthforoutput = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);   my @lengthforoutput = split(/,/,$Apache::londefdef::table[-1]{'lengthrow'}[0]);
  my $how_many_columns = $#lengthforoutput + 1;   my $how_many_columns = $#lengthforoutput + 1; #total number of columns in the table 
  my $filled_columns = 0;   my $filled_columns = 0; #number of columns with information about width
  foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {   my $available_space = ' ';
     my @length = split(/,/,$tempo_length);  
     my $nfilled_columns = 0;   
     for (my $ico=0;$ico<$how_many_columns;$ico++) {  
  if (not $lengthforoutput[$ico]=~m/\s*0\s*/) {$nfilled_columns++;}  
     }  
     if ($nfilled_columns > $filled_columns) {$filled_columns=$nfilled_columns;}  
  }  
  my $temp_file;  
  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";  
  if (-e $filename) {  
     $temp_file = Apache::File->new($filename);   
     my @tbl_file_content = <$temp_file>;  
     my ($one,$two) = split(/,/,$tbl_file_content[0]);  
  $how_many_columns+=$one-1;  
  $filled_columns+=$two;  
  } else {  
     $temp_file = Apache::File->new('>>'.$filename);   
  }  
  print $temp_file "$how_many_columns,$filled_columns\n";  
  foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {   foreach my $tempo_length (@{ $Apache::londefdef::table[-1]{'lengthrow'} }) {
     my @length = split(/,/,$tempo_length);      my @length = split(/,/,$tempo_length);
     for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {      for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {
Line 1396  EDITBUTTON Line 1384  EDITBUTTON
  }     }  
     }      }
  }   }
                 my $parboxlength = '(\textwidth';   for (my $ico=0;$ico<=$#lengthforoutput;$ico++) {
                 for (my $io=0; $io<=$#lengthforoutput;$io++) {      if (not $lengthforoutput[$ico]=~m/^\s*0\s*\w*\s*$/) {
     $parboxlength .= ' - '.$lengthforoutput[$io].' ';   $filled_columns++;
  }   $available_space = $available_space.' - '.$lengthforoutput[$ico];
  $parboxlength .= ')/($GLOBALnumberOFcolumns+1) - 3 mm';      }
  $output =~ s/\\parbox{}{}/\\parbox{1 mm}{}/g;   }
  $output =~ s/\\parbox{}{(\\textbf{\w?\.?})}/\\parbox{5 mm}{$1}/g; #for stupid tables with empty columns   my $temp_file;
  $output =~ s/\\parbox{}/\\parbox{$parboxlength}/g;   my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";
                 my ($howmanyatall,$howmanyfilled) = (0,0);   if (-e $filename) {
            $temp_file = Apache::File->new($filename); 
       my @tbl_file_content = <$temp_file>;
       my ($one,$two,$three) = split(/,/,$tbl_file_content[0]);
           $how_many_columns+=$one-1;
           $filled_columns+=$two;
       if($three=~/\S/) {$available_space = $available_space.' - '.$three;}
    } else {
       $temp_file = Apache::File->new('>>'.$filename); 
    }
    print $temp_file "$how_many_columns,$filled_columns,$available_space\n";
    $output =~ s/\\parbox{TOBECHANGEDONNUMBER}{}/\\parbox{1 mm}{}/g;
    $output =~ s/\\parbox{TOBECHANGEDONNUMBER}/\\parbox{\$SpacePerColumn}/g;
  my @tagar = @$tagstack;   my @tagar = @$tagstack;
  my $signature = 1;   my $signature = 1;
  for (my $ico=0;$ico<$#tagar;$ico++) {   for (my $ico=0;$ico<$#tagar;$ico++) {
      if ($tagar[$ico] eq 'table') { $signature = 0; }       if ($tagar[$ico] eq 'table') { $signature = 0; }
  }   }
  if ($signature) {   if ($signature) {
     my $totalnumber = $how_many_columns-$filled_columns-1;      my $NumberEmptyLength = $how_many_columns - $filled_columns;
     $output =~ s/\$GLOBALnumberOFcolumns/$totalnumber/g;      my $SpacePerColumn = '(\textwidth '.$available_space.')/'.$NumberEmptyLength;
  }      $output =~ s/\$SpacePerColumn/$SpacePerColumn/g;
    }
  $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'};
     pop @Apache::londefdef::table;      pop @Apache::londefdef::table;
     $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory;      $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}] .= $inmemory
  } else {   } else {
     $currentstring = $Apache::londefdef::table[-1]{'output'};      $currentstring = $Apache::londefdef::table[-1]{'output'};
     $currentstring =~ s/\\\\\s+\\\\/\\\\/g;       $currentstring =~ s/\\\\\s+\\\\/\\\\/g; 
Line 1457  EDITBUTTON Line 1457  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
 # $currentstring .= ' START ROW '. $Apache::londefdef::table[-1]{'rowdata'}[$Apache::londefdef::table[-1]{'row_number'}].' END ROW ';  
  push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};   push @{ $Apache::londefdef::table[-1]{'lengthrow'} },$Apache::londefdef::table[-1]{'length'};
   
     }      }
Line 1469  EDITBUTTON Line 1468  EDITBUTTON
             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),0,1);   my $what_to_push = substr(&Apache::lonxml::get_param('align',$parstack,$safeeval),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 1490  EDITBUTTON Line 1489  EDITBUTTON
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $current_row = $Apache::londefdef::table[-1]{'row_number'};   my $current_row = $Apache::londefdef::table[-1]{'row_number'};
  my $data=&Apache::lonxml::endredirection();   my $data=&Apache::lonxml::endredirection();
  if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm|in|pc|pt))/) {                    if ($data=~m/width\s*=\s*(\d+\.?\d*\s*(mm|cm|in|pc|pt))/) {                 
                     $Apache::londefdef::table[-1]{'length'} .= $1.',';                      $Apache::londefdef::table[-1]{'length'} .= $1.',';
     $tempolen = $1;               $tempolen = $1;         
  } else {   } else {
     if (length($data)<5) {      if (length($data)<5) {
  $Apache::londefdef::table[-1]{'length'} .= '7 mm,';   $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
  $tempolen = '5 mm';   $tempolen = '5 mm';
     } else {      } else {
  $Apache::londefdef::table[-1]{'length'} .= '0 mm,';   $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
  $tempolen = '';   $tempolen = 'TOBECHANGEDONNUMBER';
     }      }
                 }                                                          }                                        
  @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};   @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
Removed from v.1.90  
changed lines
  Added in v.1.91

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