--- loncom/xml/londefdef.pm	2003/02/14 20:57:09	1.114
+++ loncom/xml/londefdef.pm	2003/02/18 22:19:30	1.117
@@ -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.117 2003/02/18 22:19:30 www Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -50,6 +50,7 @@ use Apache::lonxml;
 use Apache::File();
 use Image::Magick;
 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} ";  
     }