--- loncom/xml/londefdef.pm	2002/04/16 14:37:24	1.53
+++ 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.53 2002/04/16 14:37:24 sakharuk Exp $
+# $Id: londefdef.pm,v 1.56 2002/05/03 22:32:15 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -45,9 +45,11 @@
 
 package Apache::londefdef; 
 
+use Apache::lonnet;
 use strict;
 use Apache::lonxml;
 
+
 BEGIN {
 
     &Apache::lonxml::register('Apache::londefdef',('m','html','head','map','select','option','input','textarea','form','meta','title','body','center','b','strong','dt','h1','h2','h3','h4','h5','h6','cite','i','address','dd','dl','dir','ol','ul','menu','dfn','kbd','tt','code','em','q','p','br','big','small','basefont','font','s','sub','strike','sup','hr','a','li','u','output','param','applet','img','embed','allow','frameset','pre','insert','externallink','table','tr','td'));
@@ -335,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) {
@@ -343,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]}) {
@@ -1386,28 +1389,21 @@ EDITBUTTON
               $currentstring = $token->[4];     
 	    } elsif ($target eq 'tex') {
 	      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;
-		if ($path=~m:^/:) {
-		  $path = '/home/httpd/html'.$path;
-		} elsif ($path =~ /^\./) {
-		  $path = $Apache::lonxml::pwd[-1].'/'.$path;
-		} else {
-		  #else it is a full url don't print
-		  $path = undef;
-		}
+		  $file = $2;
+		  $path = $1; 
 	      } else {
-		$path = $Apache::lonxml::pwd[-1];
-		$file = $src;
+		  $path = $Apache::lonxml::pwd[-1];
+		  $file = $src;
 	      }
 	      $file=~s/(\.gif|\.jpg)$/\.eps/;
 	      if ($path) {
-		$currentstring = '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
+		$currentstring .= '\graphicspath{{'.$path.'/}}\fbox{\includegraphics{'.$file.'}}';
 	      } else {
-		$currentstring = 'See the image at \tt{'.$src.'}';
+		$currentstring .= 'See the image at \tt{'.$src.'}';
 	      }
 	    }
 	    return $currentstring;