[LON-CAPA-cvs] cvs: loncom /homework imageresponse.pm /xml londefdef.pm lonplot.pm

[albertel]

albertel		Wed Jan 15 21:55:05 2003 EDT

  Modified files:              
    /loncom/homework	imageresponse.pm 
    /loncom/xml	londefdef.pm lonplot.pm 
  Log:
  - removing extraneous \fbox
  
  
Index: loncom/homework/imageresponse.pm
diff -u loncom/homework/imageresponse.pm:1.22 loncom/homework/imageresponse.pm:1.23
--- loncom/homework/imageresponse.pm:1.22	Thu Sep 26 16:45:00 2002
+++ loncom/homework/imageresponse.pm	Wed Jan 15 21:55:05 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # image click response style
 #
-# $Id: imageresponse.pm,v 1.22 2002/09/26 20:45:00 albertel Exp $
+# $Id: imageresponse.pm,v 1.23 2003/01/16 02:55:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -324,14 +324,14 @@
     #where can we find the picture?
     if (-e $newsrc) {
 	if ($path) {
-	    $currentstring .= '\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+	    $currentstring .= '\vskip 0 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 	}
     } else {
 	my $temp_file;
 	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 .= '\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+	$currentstring .= '\vskip 0 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
     }
  } 
   return $currentstring;
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.106 loncom/xml/londefdef.pm:1.107
--- loncom/xml/londefdef.pm:1.106	Tue Nov 19 10:13:37 2002
+++ loncom/xml/londefdef.pm	Wed Jan 15 21:55:05 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.106 2002/11/19 15:13:37 sakharuk Exp $
+# $Id: londefdef.pm,v 1.107 2003/01/16 02:55:05 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -1612,7 +1612,7 @@
 		  if (-e $newsrc) {
                       #eps counterpart for image exist 
 		      if ($path) {
-			  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			  $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 		      }
 		  } else {
                       #there is no eps counterpart for image - check for ps one
@@ -1621,7 +1621,7 @@
 			  #ps counterpart for image exist 
 			  $file =~ s/\.eps$/\.ps/;
 			  if ($path) {
-			      $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			      $currentstring .= '\vskip 1 mm \noindent\graphicspath{{'.$path.'}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 			  }
 		      } else {
 			  #there aren't eps or ps - so create eps 
@@ -1629,7 +1629,7 @@
 			  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 .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\fbox{\includegraphics[width='.$width_param.' mm]{'.$file.'}} ';
+			  $currentstring .= '\vskip 1 mm \graphicspath{{/home/httpd/prtspool/}}\includegraphics[width='.$width_param.' mm]{'.$file.'} ';
 		      }
 		  }
 	      } else {
Index: loncom/xml/lonplot.pm
diff -u loncom/xml/lonplot.pm:1.79 loncom/xml/lonplot.pm:1.80
--- loncom/xml/lonplot.pm:1.79	Tue Oct 15 14:42:41 2002
+++ loncom/xml/lonplot.pm	Wed Jan 15 21:55:05 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.79 2002/10/15 18:42:41 matthew Exp $
+# $Id: lonplot.pm,v 1.80 2003/01/16 02:55:05 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -506,7 +506,7 @@
 ENDIMAGE
         } elsif ($target eq 'tex') {
 	    &Apache::lonnet::ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
-	    $result = '\graphicspath{{/home/httpd/perl/tmp/}}\fbox{\includegraphics{'.&Apache::lonnet::unescape($filename).'.eps}}';
+	    $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics{'.&Apache::lonnet::unescape($filename).'.eps}';
 	}
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_end($target,$token);