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

Diff for /loncom/xml/londefdef.pm between versions 1.81 and 1.82

version 1.81, 2002/08/01 18:15:09 version 1.82, 2002/08/01 19:47:29
Line 1039  EDITBUTTON Line 1039  EDITBUTTON
             if ($target eq 'web') {              if ($target eq 'web') {
        $currentstring .= $token->[4];         $currentstring .= $token->[4];
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth - 8 mm][b]{\hrulefill}';   $currentstring .= '\vskip 0 mm \noindent\makebox[\textwidth ][b]{\hrulefill}\vskip 0 mm ';
     }       } 
            return $currentstring;             return $currentstring;
  }   }
Line 1325  EDITBUTTON Line 1325  EDITBUTTON
  my $filled_columns = 0;   my $filled_columns = 0;
  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);
       my $nfilled_columns = 0; 
     for (my $ico=0;$ico<$how_many_columns;$ico++) {      for (my $ico=0;$ico<$how_many_columns;$ico++) {
  if (not $lengthforoutput[$ico]=~m/\s*0\s*/) {$filled_columns++;}   if (not $lengthforoutput[$ico]=~m/\s*0\s*/) {$nfilled_columns++;}
     }      }
       if ($nfilled_columns > $filled_columns) {$filled_columns=$nfilled_columns;}
  }   }
  my $temp_file;   my $temp_file;
  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";   my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.tbl";
Line 1381  EDITBUTTON Line 1383  EDITBUTTON
                 for (my $io=0; $io<=$#lengthforoutput;$io++) {                  for (my $io=0; $io<=$#lengthforoutput;$io++) {
     $parboxlength .= ' - '.$lengthforoutput[$io].' ';      $parboxlength .= ' - '.$lengthforoutput[$io].' ';
  }   }
  $parboxlength .= ')/($GLOBALnumberOFcolumns+1) - 1 mm';   $parboxlength .= ')/($GLOBALnumberOFcolumns+1) - 3 mm';
  $output =~ s/\\parbox{}{}/\\parbox{1 mm}{}/g;   $output =~ s/\\parbox{}{}/\\parbox{1 mm}{}/g;
  $output =~ s/\\parbox{}{(\\textbf{\w?\.?})}/\\parbox{5 mm}{$1}/g; #for stupid tables with empty columns   $output =~ s/\\parbox{}{(\\textbf{\w?\.?})}/\\parbox{5 mm}{$1}/g; #for stupid tables with empty columns
  $output =~ s/\\parbox{}/\\parbox{$parboxlength}/g;   $output =~ s/\\parbox{}/\\parbox{$parboxlength}/g;
Line 1465  EDITBUTTON Line 1467  EDITBUTTON
         sub end_td {          sub end_td {
     my ($target,$token) = @_;      my ($target,$token) = @_;
             my $currentstring = '';              my $currentstring = '';
               my $tempolen = '';
             if ($target eq 'web') {              if ($target eq 'web') {
  $currentstring = $token->[2];        $currentstring = $token->[2];     
     } 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))/) {                    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;         
  } else {   } else {
     $Apache::londefdef::table[-1]{'length'} .= '0 mm,';       if (length($data)<5) {
    $Apache::londefdef::table[-1]{'length'} .= '7 mm,';
    $tempolen = '5 mm';
       } else {
    $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
    $tempolen = '';
       }
                 }                                                          }                                        
  @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};   @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$tempolen.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
     }      }
    return $currentstring;     return $currentstring;
  }   }
Removed from v.1.81  
changed lines
  Added in v.1.82

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