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

Diff for /loncom/xml/londefdef.pm between versions 1.339 and 1.341

version 1.339, 2006/09/25 10:41:15 version 1.341, 2006/11/06 11:39:02
Line 1991  sub start_table { Line 1991  sub start_table {
         $Apache::londefdef::table[-1]{'minlen'}=[];          $Apache::londefdef::table[-1]{'minlen'}=[];
         $Apache::londefdef::table[-1]{'content'}=[];          $Apache::londefdef::table[-1]{'content'}=[];
         $Apache::londefdef::table[-1]{'align'}=[];          $Apache::londefdef::table[-1]{'align'}=[];
         $currentstring.='\keephidden{NEW TABLE ENTRY}';   if (&is_inside_of($tagstack, 'sup')) {
       $currentstring .= '}} \\\\ \ensuremath{^{ ';
    }
    if (&is_inside_of($tagstack, 'sub')) {
       $currentstring .= '}} \\\\ \ensuremath{_{ ';
    }
           $currentstring.=' \keephidden{NEW TABLE ENTRY}';
   
   
     }      }
Line 2846  sub start_img { Line 2852  sub start_img {
  #if original gif/jpg/png file exist do following:   #if original gif/jpg/png file exist do following:
  my $origsrc=$src;   my $origsrc=$src;
  my ($path,$file) = &get_eps_image($src);   my ($path,$file) = &get_eps_image($src);
    # &Apache::lonnet::logthis("Image source: $src result: $path $file");
  $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);   $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
  &Apache::lonxml::debug("path = $path file = $file src = $src");   &Apache::lonxml::debug("path = $path file = $file src = $src");
  if (-e $src) {   if (-e $src) {
Line 2859  sub start_img { Line 2866  sub start_img {
     my $size;      my $size;
     if ($width_param)  { $size.='width='.$width_param.' mm,'; }      if ($width_param)  { $size.='width='.$width_param.' mm,'; }
     if ($height_param) { $size.='height='.$height_param.' mm]'; }      if ($height_param) { $size.='height='.$height_param.' mm]'; }
       # Default size if not able to extract that (e.g. eps image).
       
       # &Apache::lonnet::logthis("Size = $size");
       if ($size eq "0 mm") {
    $size = "50 mm]";     # Default to 1 column width for 2 column.
       }
       
     $size='['.$size;      $size='['.$size;
     $size=~s/,$/]/;       $size=~s/,$/]/; 
     $currentstring .= '\graphicspath{{'.$destpath.'}}'      $currentstring .= '\graphicspath{{'.$destpath.'}}'
Line 4234  sub get_eps_image { Line 4248  sub get_eps_image {
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     &Apache::lonxml::debug("Filelocation gives: $src");      &Apache::lonxml::debug("Filelocation gives: $src");
     if (! -e $src) {      if (! -e $src) {
    # &Apache::lonnet::logthis("$src does not exist...repcopying");
  &Apache::lonxml::debug("$src does not exist");   &Apache::lonxml::debug("$src does not exist");
  if (&Apache::lonnet::repcopy($src) ne 'ok' ) {   if (&Apache::lonnet::repcopy($src) ne 'ok' ) {
     &Apache::lonxml::debug("Repcopy of $src failed (1)");      &Apache::lonxml::debug("Repcopy of $src failed (1)");
Line 4245  sub get_eps_image { Line 4260  sub get_eps_image {
     &Apache::lonxml::debug("repcopy of $src ... $didrepcopy");      &Apache::lonxml::debug("repcopy of $src ... $didrepcopy");
     if ( (not -e $src) ||      if ( (not -e $src) ||
  ($didrepcopy ne 'ok')) {   ($didrepcopy ne 'ok')) {
    # &Apache::lonnet::logthis("queuing $orig_src for dynamic eps gen");
  &Apache::lonxml::debug("Failed to find or replicate $src");   &Apache::lonxml::debug("Failed to find or replicate $src");
   
  #if replication failed try to produce eps file dynamically   #if replication failed try to produce eps file dynamically
Line 4261  sub get_eps_image { Line 4277  sub get_eps_image {
  if ($sext ne "") { # Put the ext. back in to uniquify.   if ($sext ne "") { # Put the ext. back in to uniquify.
     $src =~ s/\.eps$/$sext.eps/;      $src =~ s/\.eps$/$sext.eps/;
  }   }
   
     }      }
  }   }
       } else {
   # &Apache::lonnet::logthis("$src exists. queueing for copy.");
   # &Apache::lonnet::logthis("Got eps already.. queue for copy");
    # If the postscript file has spaces in its name,
    # LaTeX will gratuitiously vomit.  Therefore
    # queue such files for copy with " " replaced by "_".
    # printout.pm will know them by their .ps  or .eps extensions.
    my $newsrc = $orig_src;
    $newsrc    =~  s|(.*)/res/|/home/httpd/html/res/|;
    open(FILE,">>/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.dat");
   # &Apache::lonnet::logthis("Queueing $newsrc for copy");
    print FILE "$newsrc\n";
    close FILE;
    $src=~s|/home/httpd/html/res|/home/httpd/prtspool|;
    $src=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
     }      }
     my ($path,$file)=($src=~m|(.*)/([^/]*)$|);      my ($path,$file)=($src=~m|(.*)/([^/]*)$|);
     &Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");      &Apache::lonxml::debug("get_eps_image returning: $path / $file<BR />");
Removed from v.1.339  
changed lines
  Added in v.1.341

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