--- loncom/xml/londefdef.pm	2002/04/26 18:18:37	1.54
+++ loncom/xml/londefdef.pm	2002/05/03 22:32:15	1.56
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.54 2002/04/26 18:18:37 sakharuk Exp $
+# $Id: londefdef.pm,v 1.56 2002/05/03 22:32:15 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -337,7 +337,8 @@ sub end_m {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onLoad'}=$onLoad.&Apache::lonxml::loadevents();
+	      $token->[2]->{'onLoad'}=&Apache::lonxml::loadevents().
+		                       ';'.$onLoad;
 	      my $onUnload='';
 	      foreach my $key (keys(%{$token->[2]})) {
 		if ($key =~ /^onunload$/i) {
@@ -345,8 +346,8 @@ sub end_m {
 		  delete($token->[2]->{$key});
 		}
 	      }
-	      $token->[2]->{'onUnload'}=$onUnload.
-		&Apache::lonxml::unloadevents();
+	      $token->[2]->{'onUnload'}=&Apache::lonxml::unloadevents().
+		                         ';'.$onUnload;
 
 	      $currentstring .= '<'.$token->[1];
 	      foreach (keys %{$token->[2]}) {
@@ -1390,7 +1391,14 @@ EDITBUTTON
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
 	      my $file;
-	      my $path;
+	      my $path;	
+              if ($src =~ m!(.*)/([^/]*)$!) {
+		  $file = $2;
+		  $path = $1; 
+	      } else {
+		  $path = $Apache::lonxml::pwd[-1];
+		  $file = $src;
+	      }
 	      $file=~s/(\.gif|\.jpg)$/\.eps/;
 	      if ($path) {
 		$currentstring .= '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';