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

Diff for /loncom/xml/londefdef.pm between versions 1.255 and 1.255.2.1

version 1.255, 2005/02/09 19:51:43 version 1.255.2.1, 2005/04/06 06:08:13
Line 2508  sub start_img { Line 2508  sub start_img {
     if (-e $newsrc) {      if (-e $newsrc) {
  #eps counterpart for image exist    #eps counterpart for image exist 
  if ($path) {   if ($path) {
       my $size;
       if ($width_param)  { $size.='width='.$width_param.' mm,'; }
       if ($height_param) { $size.='height='.$height_param.' mm]'; }
       $size='['.$size;
       $size=~s/,$/]/; 
     $currentstring .= '\graphicspath{{'.$path.'}}'      $currentstring .= '\graphicspath{{'.$path.'}}'
              .'\includegraphics[width='.$width_param.' mm,height='.$height_param.'mm]{'.$file.'} ';               .'\includegraphics'.$size.'{'.$file.'} ';
  }   }
     } else {      } else {
  #there is no eps counterpart for image - check for ps one   #there is no eps counterpart for image - check for ps one
Line 3800  sub image_size { Line 3805  sub image_size {
  } else {    } else { 
     $width_param = $TeXwidth;      $width_param = $TeXwidth;
  }   }
  $height_param=$TeXwidth/$old_width_param*$height_param;   if ($TeXheight) {
       $height_param = $TeXheight;
    } elsif ($old_width_param) {
       $height_param=$TeXwidth/$old_width_param*$height_param;
    }
     } elsif ($TeXheight ne '') {      } elsif ($TeXheight ne '') {
  $height_param = $TeXheight;   $height_param = $TeXheight;
  $width_param  = $TeXheight/$height_param*$width_param;   if ($height_param) {
       $width_param  = $TeXheight/$height_param*$width_param;
    }
     } elsif ($width ne '') {      } elsif ($width ne '') {
  my $old_width_param=$width_param;   my $old_width_param=$width_param;
  $width_param = $width*$scaling;         $width_param = $width*$scaling;      
         $height_param=$width_param/$old_width_param*$height_param;   if ($old_width_param) {
               $height_param=$width_param/$old_width_param*$height_param;
    }
     }      }
     if ($width_param > $ENV{'form.textwidth'}) {      if ($width_param > $ENV{'form.textwidth'}) {
         my $old_width_param=$width_param;          my $old_width_param=$width_param;
  $width_param =0.95*$ENV{'form.textwidth'};   $width_param =0.95*$ENV{'form.textwidth'};
         $height_param=$width_param/$old_width_param*$height_param;   if ($old_width_param) {
               $height_param=$width_param/$old_width_param*$height_param;
    }
     }      }
     return ($height_param, $width_param);      return ($height_param, $width_param);
 }  }
Removed from v.1.255  
changed lines
  Added in v.1.255.2.1

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