--- loncom/xml/londefdef.pm	2002/05/16 00:56:46	1.61
+++ loncom/xml/londefdef.pm	2002/07/01 19:58:25	1.67
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.61 2002/05/16 00:56:46 albertel Exp $
+# $Id: londefdef.pm,v 1.67 2002/07/01 19:58:25 sakharuk Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -52,7 +52,7 @@ use Apache::File();
 
 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','th','td'));
+    &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','th','td','blankspace','bubble','bubbles','bubbleline'));
 
 }
 
@@ -122,7 +122,7 @@ sub end_m {
 	      $currentstring .= '\documentclass[letterpaper]{article}
                                  \newcommand{\keephidden}[1]{}           
                                  \usepackage[dvips]{graphicx}
-                                 \usepackage{epsfig}';
+                                 \usepackage{epsfig}\usepackage{calc}';
 	    }
 	   return $currentstring;
 	}
@@ -840,7 +840,7 @@ EDITBUTTON
             if ($target eq 'web') {
 	       $currentstring .= $token->[4];
 	    } elsif ($target eq 'tex') {
-		$currentstring .= '\\\\';
+		$currentstring .= '\vskip 0 mm';
 	    } elsif ($target eq 'latexsource') {
 		$currentstring .= '\\';
 	    } 
@@ -1444,6 +1444,36 @@ EDITBUTTON
 	      }
 	      my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval);
 	      $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
+	      my $epssrc = $src;
+	      $epssrc =~ s/(\.gif|\.jpg|\.GIF|\.JPG)$/\.eps/;
+	      if (not -e $epssrc) {
+		  my $localfile = $epssrc;
+		  $localfile =~ s/.*(\/res)/$1/;	
+		  my $file;
+		  my $path;	
+		  if ($localfile =~ m!(.*)/([^/]*)$!) {
+		      $file = $2;
+		      $path = $1.'/'; 
+		  }	
+		  my $signal_eps = 0;
+		  my @content_directory = &Apache::lonnet::dirlist($path);
+		  for (my $iy=0;$iy<=$#content_directory;$iy++) {
+		      my @tempo_array = split(/&/,$content_directory[$iy]);
+		      $content_directory[$iy] = $tempo_array[0];
+		      if ($file eq $tempo_array[0]) {
+			  $signal_eps = 1;
+			  last;
+		      }
+		  }
+		  if ($signal_eps) {
+		      my $eps_file = &Apache::lonnet::getfile($localfile);
+		  } else {
+		      $localfile = $src;
+		      $localfile =~ s/.*(\/res)/$1/;	
+		      my $as = &Apache::lonnet::getfile($src);
+		      
+		  }
+	      }
 	      my $file;
 	      my $path;	
               if ($src =~ m!(.*)/([^/]*)$!) {
@@ -1451,15 +1481,15 @@ EDITBUTTON
 		  $path = $1.'/'; 
 	      }
 	      my $newsrc = $src;
-	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/;
-		  $file=~s/(\.gif|\.jpg)$/\.eps/;
+	      $newsrc =~ s/(\.gif|\.jpg)$/\.eps/i;
+		  $file=~s/(\.gif|\.jpg)$/\.eps/i;
 	      if (-e $newsrc) {
 		  if ($path) {
-		      $currentstring .= '\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
+		      $currentstring .= '\noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
 		  }
 	      } else {
 		  my $temp_file;
-		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}$ENV{'user.domain'}temp$ENV{'user.login.time'}.dat";
+		  my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
 		  $temp_file = Apache::File->new('>>'.$filename); 
 		  print $temp_file "$src\n";
 		  $currentstring .= '\graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics'.$width_param.'{'.$file.'}}';
@@ -1649,5 +1679,24 @@ sub start_embed {
 	    }
            return $currentstring;
 	}
+#-- <blankspace heigth="">
+        sub start_blankspace {
+	    my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
+            my $currentstring = '';
+            if ($target eq 'tex') {
+		my $howmuch = &Apache::lonxml::get_param('heigth',$parstack,$safeeval);
+		$currentstring .= '\vskip '.$howmuch.' ';
+	    }
+           return $currentstring;
+	}
+        sub end_blankspace {
+	    my ($target,$token) = @_;
+            my $currentstring = '';
+            if ($target eq 'tex') {
+	       $currentstring .= '';
+	    }
+           return $currentstring;
+	}
+
 1;
 __END__