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

Diff for /loncom/xml/londefdef.pm between versions 1.158.4.5 and 1.158.4.6

version 1.158.4.5, 2003/09/02 14:30:31 version 1.158.4.6, 2003/09/02 21:31:11
Line 1894  sub end_td { Line 1894  sub end_td {
     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)*)/) {
  my $current_length=&recalc($1);   my $current_length=&recalc($1);
  $current_length=~/(\d+\.?\d*)/;   $current_length=~/(\d+\.?\d*)/;
      $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';   $Apache::londefdef::table[-1]{'TeXlength'} .= $1.',';
      $Apache::londefdef::table[-1]{'length'} .= '0,';   $Apache::londefdef::table[-1]{'length'} .= '0,';
   } else {        } else {  
      $data=~s/^\s+(\S.*)/$1/;    $data=~s/^\s+(\S.*)/$1/; 
     $data=~s/(.*\S)\s+$/$1/;   $data=~s/(.*\S)\s+$/$1/;
     $data=~s/(\s)+/$1/;   $data=~s/(\s)+/$1/;
     my $current_length=0;   my $current_length=0;
     if ($data=~/\\vskip/) {   if ($data=~/\\vskip/) {
  my $newdata=$data;      my $newdata=$data;
   $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;      $newdata=~s/\\vskip \d*\.?\d*\s*mm/THISISJUSTTEMPORARYSEPARATOR/g;
   my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);      my @newdata=split(/THISISJUSTTEMPORARYSEPARATOR/,$newdata);
   foreach my $elementdata (@newdata) {      foreach my $elementdata (@newdata) {
      $elementdata=~s/^\s+(\S.*)/$1/;    $elementdata=~s/^\s+(\S.*)/$1/; 
      $elementdata=~s/(.*\S)\s+$/$1/;   $elementdata=~s/(.*\S)\s+$/$1/;
      $elementdata=~s/(\s)+/$1/;   $elementdata=~s/(\s)+/$1/;
      my $lengthnewdata=1.8*length($elementdata);   my $lengthnewdata=1.8*length($elementdata);
      if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}   if ($lengthnewdata>$current_length) {$current_length=$lengthnewdata;}
   }      }
      } else {   } else {
   $current_length=1.8*length($data);      $current_length=1.8*length($data);
      }   }
      $Apache::londefdef::table[-1]{'length'} .= $current_length.',';   $Apache::londefdef::table[-1]{'length'} .= $current_length.',';
      $Apache::londefdef::table[-1]{'TeXlength'} .= '0,';   $Apache::londefdef::table[-1]{'TeXlength'} .= '0,';
   }      }
    }
  for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {            for (my $in=0; $in<=$#{$Apache::londefdef::table[-1]{'include'}};$in++) {         
     $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;      $data=~s/\\keephidden\{NEW TABLE ENTRY\}/$Apache::londefdef::table[-1]{'include'}[$in]/;
  }   }
Removed from v.1.158.4.5  
changed lines
  Added in v.1.158.4.6

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