--- loncom/homework/randomlabel.pm	2006/11/06 23:44:42	1.84
+++ loncom/homework/randomlabel.pm	2007/05/10 10:46:51	1.87
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.84 2006/11/06 23:44:42 foxr Exp $
+# $Id: randomlabel.pm,v 1.87 2007/05/10 10:46:51 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,7 +70,7 @@ my $cgi_id;
 my $scale_factor;		# image scale factor.
 my $label_xscale;                # Label scale factor (needed for gnuplot).
 my $label_yscale;
-
+my $dirty_width_adjust = 5;     # Width adjustment for e.g. gnuplot images.
 
 BEGIN {
     &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
@@ -268,12 +268,17 @@ sub end_bgimg {
 		&Apache::lonxml::debug("height $height_param");
 		&Apache::lonxml::debug("Width $width_param");
 		&Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");
-		my $dirty_width = $width_param + 5;
+		my $dirty_width = $width_param + $dirty_width_adjust;
+		my $x_offset    = -$dirty_width_adjust/2.0;
+		#
+		#  Somewhere here it looks like height_param and
+		#  width_param got backwards...
+		#
 		$result .= '\parbox{'.$dirty_width.'mm}{';
 		$result  .= " $src \n";
 		$result  .= '\setlength{\unitlength}{1mm}'."\n";
-		$result  .= '\begin{picture}('."$height_param,$width_param)";
-		$result  .= "(0,-$height_param)";
+		$result  .= '\begin{picture}('."$width_param,$height_param)";
+		$result  .= "($x_offset,-$height_param)";
 		$result  .= "\n";
 		$Apache::lonxml::debug = 0;
 
@@ -296,18 +301,11 @@ sub make_eps_image {
     &Apache::lonxml::debug("Image size: $height_param x $width_param");
 
     my $dirtywidth=$width_param+5;
-    #
-    #  Note that lonprintout/prinout will conspire to replace
-    #  spaces in paths and names with _'s since spacess cause problems
-    #  for latex included filenames.  Therefore:
-    #
-    my $safe_path = $path;
-    my $safe_file = $file;
 
     my $result ="\n".'\vspace*{2mm}\noindent'."\n".
 	'\parbox{'.$dirtywidth.
 	' mm}{  \noindent \epsfxsize='.$width_param.
-	' mm \epsffile{'.$safe_path.$safe_file.
+	' mm \epsffile{'.$path.$file.
 	'}\setlength{\unitlength}{1mm}'."\n".'  \begin{picture}('.
 	$width_param.','.$height_param.')(0,-'.$height_param.')'."\n";
     my $magick = Image::Magick->new;