--- loncom/xml/londefdef.pm	2003/02/14 20:57:09	1.114
+++ 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.114 2003/02/14 20:57:09 sakharuk Exp $
+# $Id: londefdef.pm,v 1.118 2003/02/19 14:30:10 www Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -44,12 +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::lonmenu();
+use Apache::lonmeta();
 
 BEGIN {
 
@@ -400,7 +401,7 @@ sub start_html {
 		</form>
 EDITBUTTON
               } else {
-		$currentstring.=&Apache::lonmenu::menubuttons(undef,$target);
+		$currentstring.=&Apache::lonmenu::menubuttons(undef,$target,1);
               }
        	    } elsif ($target eq 'tex') {
               $currentstring = '\begin{document}';  
@@ -1598,10 +1599,21 @@ sub start_table {
 	    my $scaling = .3;
 
 	    if ($target eq 'web') {
-              $currentstring = $token->[4];
+              if ($ENV{'browser.imagesuppress'} ne 'on') {
+                 $currentstring = $token->[4];
+	      } else {
+		  my $alttag= &Apache::lonxml::get_param
+                               ('alt',$parstack,$safeeval,undef,1);
+                  unless ($alttag) {
+		    $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
@@ -1691,7 +1703,16 @@ sub start_table {
                                         $token->[2]->{'archive'};
             my $currentstring = '';
             if ($target eq 'web') {
-              $currentstring = $token->[4];
+              if ($ENV{'browser.appletsuppress'} ne 'on') {
+                 $currentstring = $token->[4];
+	      } else {
+		  my $alttag=$token->[2]->{'alt'};
+                  unless ($alttag) {
+                     $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'},
+                                                      $token->[2]->{'code'});
+                  }
+                  $currentstring='[APPLET: '.$alttag.']';
+	      }
 	    } elsif ($target eq 'tex') {
               $currentstring = " \\begin{figure} ";
 	    } 
@@ -1716,7 +1737,16 @@ sub start_embed {
 	$token->[2]->{'src'};
     my $currentstring = '';
     if ($target eq 'web') {
-	$currentstring = $token->[4];
+       if ($ENV{'browser.embedsuppress'} ne 'on') {
+          $currentstring = $token->[4];
+       } else {
+	  my $alttag=$token->[2]->{'alt'};
+          unless ($alttag) {
+             $alttag=&Apache::lonmeta::alttag($ENV{'REQUEST_URI'},
+                                              $token->[2]->{'src'});
+          }
+          $currentstring='[EMBED: '.$alttag.']';
+      }
     } elsif ($target eq 'tex') {
 	$currentstring = " \\begin{figure} ";  
     } 
@@ -1767,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') {
@@ -2582,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 '';