Diff for /loncom/xml/londefdef.pm between versions 1.190 and 1.193

version 1.190, 2003/11/09 01:19:47 version 1.193, 2004/01/12 15:44:30
Line 84  sub end_output { Line 84  sub end_output {
 sub start_m {  sub start_m {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $currentstring = '';      my $currentstring = '';
     my $inside = &Apache::lonxml::get_all_text("/m",$parser,$style);      my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
     $inside=~s-<LONCAPA_INTERNAL_TURN_STYLE_ON />--g;      if ($target eq 'web' || $target eq 'analyze') {
     if ($target eq 'web') {  
  $Apache::lonxml::prevent_entity_encode++;   $Apache::lonxml::prevent_entity_encode++;
  $inside ='\\documentstyle{article}'.$inside;   $inside ='\\documentstyle{article}'.$inside;
  &Apache::lonxml::debug("M is starting with:$inside:");   &Apache::lonxml::debug("M is starting with:$inside:");
Line 2118  sub start_img { Line 2117  sub start_img {
  $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
  &image_replication($src);   &image_replication($src);
  #if original gif/jpg/png 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;
     my $current_figure = $image->Read($src);      my $current_figure = $image->Read($src);
Line 2173  sub start_img { Line 2172  sub start_img {
     $temp_file = Apache::File->new('>>'.$filename);       $temp_file = Apache::File->new('>>'.$filename); 
     print $temp_file "$src\n";      print $temp_file "$src\n";
     $newsrc=~s/\/home\/httpd\/html\/res//;      $newsrc=~s/\/home\/httpd\/html\/res//;
       $newsrc=~s/\/home\/([^\/]*)\/public_html\//\/$1\//;
       $newsrc=~s/\/\.\//\//;
     $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;      $newsrc=~s/\/([^\/]+)\.(ps|eps)/\//;
     $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';      $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool'.$newsrc.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
  }   }

Removed from v.1.190  
changed lines
  Added in v.1.193


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