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

Diff for /loncom/xml/londefdef.pm between versions 1.101 and 1.105

version 1.101, 2002/11/15 15:01:16 version 1.105, 2002/11/18 20:47:51
Line 1505  sub start_table { Line 1505  sub start_table {
  } else {   } else {
     if (length($data)<5) {      if (length($data)<5) {
  $Apache::londefdef::table[-1]{'length'} .= '0 mm,';   $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
  $tempolen = '5 mm';   $tempolen = '6 mm';
     } else {      } else {
  $Apache::londefdef::table[-1]{'length'} .= '0 mm,';   $Apache::londefdef::table[-1]{'length'} .= '0 mm,';
  $tempolen = 'TOBECHANGEDONNUMBER';   $tempolen = 'TOBECHANGEDONNUMBER';
Line 1566  sub start_table { Line 1566  sub start_table {
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
       &image_replication($src);        &image_replication($src);
       $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);        $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
               #if original gif/jpg file exist do following:                #if original gif/jpg/png file exist do following:
               if (-e $src) {                          if (-e $src) {          
                   #defines the default size of image                    #defines the default size of image
   my $image = Image::Magick->new;    my $image = Image::Magick->new;
Line 1575  sub start_table { Line 1575  sub start_table {
   $height_param = $image->Get('height') * $scaling;;    $height_param = $image->Get('height') * $scaling;;
   undef $image;    undef $image;
   #do we have any specified size of the picture?    #do we have any specified size of the picture?
   my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval,    my $TeXwidth = &Apache::lonxml::get_param('TeXwidth',$parstack,$safeeval);
                                                             undef,1);     my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval);
   my $TeXheight = &Apache::lonxml::get_param('TeXheight',$parstack,$safeeval,  
                                                              undef,1);   
   my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,    my $width = &Apache::lonxml::get_param('width',$parstack,$safeeval,
                                                          undef,1);                                                           undef,1);
   if ($TeXwidth ne '') {      if ($TeXwidth ne '') {  
Line 1599  sub start_table { Line 1597  sub start_table {
       $path = $1.'/';         $path = $1.'/'; 
   }     } 
   my $newsrc = $src;    my $newsrc = $src;
   $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;    $newsrc =~ s/\.(gif|jpg|png)$/.eps/i;
   $file=~s/(\.gif|\.jpg)$/\.eps/i;    $file=~s/\.(gif|jpg|png)$/.eps/i;
   #where can we find the picture?    #where can we find the picture?
   if (-e $newsrc) {    if (-e $newsrc) {
                       #eps counterpart for image exist                         #eps counterpart for image exist 
Line 2553  sub image_replication { Line 2551  sub image_replication {
  &Apache::lonnet::repcopy('/home/httpd/html'.$src);   &Apache::lonnet::repcopy('/home/httpd/html'.$src);
  #replicates eps or ps    #replicates eps or ps 
  my $newsrc = $src;   my $newsrc = $src;
  $newsrc =~ s/(.gif|.jpg)$/.eps/;   $newsrc =~ s/\.(gif|jpg|png)$/.eps/;
  if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {   if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
     $newsrc =~ s/\.ps$/\.eps/;      $newsrc =~ s/\.ps$/\.eps/;
     &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);      &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
Removed from v.1.101  
changed lines
  Added in v.1.105

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