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

Diff for /loncom/xml/londefdef.pm between versions 1.77 and 1.78

version 1.77, 2002/07/24 20:23:21 version 1.78, 2002/07/25 15:28:26
Line 1318  EDITBUTTON Line 1318  EDITBUTTON
     $output .= ' \\\\ ';      $output .= ' \\\\ ';
  }   }
                 my @length = split(/,/,$Apache::londefdef::table[-1]{'length'});                  my @length = split(/,/,$Apache::londefdef::table[-1]{'length'});
                 my $how_many_columns = $#length+1;                  my $how_many_columns = $#length;
                 my $parboxlength = '(\textwidth';                  my $parboxlength = '(\textwidth';
                 for (my $io=0; $io<=$#length;$io++) {                  for (my $io=0; $io<=$#length;$io++) {
     if ($length[$io] ne '') {      if ($length[$io] ne '') {
Line 1356  EDITBUTTON Line 1356  EDITBUTTON
  }   }
  push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});   push ( @{ $Apache::londefdef::table[-1]{'rowdata'} }, $Apache::londefdef::table[-1]{'hinc'});
  $Apache::londefdef::table[-1]{'counter_columns'} = -1;   $Apache::londefdef::table[-1]{'counter_columns'} = -1;
  $Apache::londefdef::table[-1]{'length'} = ''; #just added   $Apache::londefdef::table[-1]{'length'} = ''; 
   
     }       } 
    return $currentstring;     return $currentstring;
Line 1397  EDITBUTTON Line 1397  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))/) {                 #just added   if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {                 
                     $Apache::londefdef::table[-1]{'length'} .= $1.',';             #just added                      $Apache::londefdef::table[-1]{'length'} .= $1.',';             
  }                                                                  #just added   } else {
       $Apache::londefdef::table[-1]{'length'} .= '0 mm,'; 
                   }                                                                 
  @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};   @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{'.$data.'} '.$Apache::londefdef::table[-1]{'vinc'};
     }      }
    return $currentstring;     return $currentstring;
Line 1430  EDITBUTTON Line 1432  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))/) {                 #just added   if ($data=~m/width\s*=\s*(\d+\.*\d*\s*(mm|cm))/) {                 
                     $Apache::londefdef::table[-1]{'length'} .= $1.',';             #just added                      $Apache::londefdef::table[-1]{'length'} .= $1.',';             
  }                                                                  #just added   } else {
       $Apache::londefdef::table[-1]{'length'} .= '0 mm,'; 
                   }                                                           
  @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'};   @{ $Apache::londefdef::table[-1]{'rowdata'} }[$current_row] .= '\parbox{'.$1.'}{\textbf{'.$data.'}} '.$Apache::londefdef::table[-1]{'vinc'};
     }      }
    return $currentstring;     return $currentstring;
Removed from v.1.77  
changed lines
  Added in v.1.78

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