--- loncom/xml/londefdef.pm	2003/02/18 21:14:16	1.116
+++ loncom/xml/londefdef.pm	2003/02/19 14:30:10	1.118
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.116 2003/02/18 21:14:16 www Exp $
+# $Id: londefdef.pm,v 1.118 2003/02/19 14:30:10 www Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -44,13 +44,13 @@
 
 package Apache::londefdef; 
 
-use Apache::lonnet;
+use Apache::lonnet();
 use strict;
-use Apache::lonxml;
+use Apache::lonxml();
 use Apache::File();
 use Image::Magick;
-use Apache::lonmenu;
-#use Apache::lonmeta;
+use Apache::lonmenu();
+use Apache::lonmeta();
 
 BEGIN {
 
@@ -1602,15 +1602,18 @@ sub start_table {
               if ($ENV{'browser.imagesuppress'} ne 'on') {
                  $currentstring = $token->[4];
 	      } else {
-		  my $alttag=$token->[2]->{'alt'};
+		  my $alttag= &Apache::lonxml::get_param
+                               ('alt',$parstack,$safeeval,undef,1);
                   unless ($alttag) {
-                     $alttag=&Apache::lonmeta::alttag($token->[2]->{'src'});
+		    $alttag=&Apache::lonmeta::alttag
+                                   ($Apache::lonxml::pwd[-1],$src);
                   }
                   $currentstring='[IMAGE: '.$alttag.']';
 	      }
 	    } elsif ($target eq 'tex') {
-	      &image_replication($src);
-	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+ 	     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+	     &image_replication($src);
+
               #if original gif/jpg/png file exist do following:
               if (-e $src) {          
                   #defines the default size of image
@@ -1705,7 +1708,8 @@ sub start_table {
 	      } else {
 		  my $alttag=$token->[2]->{'alt'};
                   unless ($alttag) {
-                     $alttag=&Apache::lonmeta::alttag($token->[2]->{'code'});
+                     $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'},
+                                                      $token->[2]->{'code'});
                   }
                   $currentstring='[APPLET: '.$alttag.']';
 	      }
@@ -1738,7 +1742,8 @@ sub start_embed {
        } else {
 	  my $alttag=$token->[2]->{'alt'};
           unless ($alttag) {
-             $alttag=&Apache::lonmeta::alttag($token->[2]->{'src'});
+             $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'},
+                                              $token->[2]->{'src'});
           }
           $currentstring='[EMBED: '.$alttag.']';
       }
@@ -1792,6 +1797,7 @@ sub start_allow {
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
 	$token->[2]->{'src'};
     my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+    $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     &image_replication($src);
     my $result;
     if ($target eq 'edit') {
@@ -2607,15 +2613,17 @@ sub end_allow {
 
 sub image_replication {
     my $src = shift;
-    if (not -e '/home/httpd/html'.$src) {
+    if (not -e $src) {
 	#replicates image itself
-	&Apache::lonnet::repcopy('/home/httpd/html'.$src);
+	&Apache::lonnet::repcopy($src);
 	#replicates eps or ps 
 	my $newsrc = $src;
-	$newsrc =~ s/\.(gif|jpg|png)$/.eps/;
-	if (not-e $newsrc && &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc) ne 'OK') {
-	    $newsrc =~ s/\.eps$/\.ps/;
-	    &Apache::lonnet::repcopy('/home/httpd/html'.$newsrc);
+	$newsrc =~ s/\.(gif|jpg|jpeg|png)$/.eps/i;
+	if (not -e $newsrc) {
+           if (&Apache::lonnet::repcopy($newsrc) ne 'OK') {
+	       $newsrc =~ s/\.eps$/\.ps/;
+	       &Apache::lonnet::repcopy($newsrc);
+	   }
 	}
     }
     return '';