--- loncom/homework/randomlabel.pm	2006/08/29 10:42:59	1.83
+++ loncom/homework/randomlabel.pm	2007/06/20 17:33:33	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.83 2006/08/29 10:42:59 foxr Exp $
+# $Id: randomlabel.pm,v 1.89 2007/06/20 17:33:33 banghart 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'));
@@ -147,12 +147,13 @@ sub start_randomlabel {
     } elsif ($target eq 'tex' && defined($bgimg)) {
 	$result.=&make_eps_image($bgimg,$parstack,$safeeval);
     } elsif ($target eq 'edit') {
+        my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
 	$result.=&Apache::edit::tag_start($target,$token);
 	$Apache::edit::bgimgsrc=
 	    &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
 	$Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
 	$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
-	$result.=&Apache::edit::browse('bgimg').' ';
+	$result.=&Apache::edit::browse('bgimg',undef,undef,$only).' ';
 	$result.=&Apache::edit::search('bgimg').'<br />'.
 	    &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
 	    &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
@@ -164,7 +165,6 @@ sub start_randomlabel {
 						     'height','texwidth');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -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,20 +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;
-    $safe_path =~ s/ /\_/g;
-    my $safe_file = $file;
-    $safe_file =~ s/ /\_/g;
 
     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;
@@ -358,7 +354,6 @@ sub start_labelgroup {
 						     'TeXsize');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -496,7 +491,6 @@ sub end_labelgroup {
 		#  Note that spaces in e.. \includegraphics cause problems for Latex
 		# so they get replaced by _'s by lonprintout/printout and us:
 		#
-		$image_name =~ s/ /\_/g;
 		my $label_width = &get_label_width($label);
 
 		$result .=  '\includegraphics[width='.$label_width.'mm]{'
@@ -545,7 +539,6 @@ sub start_location {
 						    $safeeval,'x','y','value');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     $Apache::lonxml::debug = 0;