--- loncom/homework/randomlabel.pm	2005/04/07 06:56:22	1.67
+++ loncom/homework/randomlabel.pm	2005/05/16 21:58:19	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.67 2005/04/07 06:56:22 albertel Exp $
+# $Id: randomlabel.pm,v 1.73 2005/05/16 21:58:19 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,9 +59,12 @@ use strict;
 use Apache::edit;
 use Apache::File();
 use Apache::Constants qw(:common :http);
+use Image::Magick;
+use Apache::lonplot;
 
 my %args;
 my $cgi_id;
+my $scale_factor;		# image scale factor.
 
 BEGIN {
     &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
@@ -160,24 +163,59 @@ sub end_bgimg {
 	    $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
 	    $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
 	} elsif ($target eq 'tex') {
-	    $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
+	    #   Some bg images can create latex for us... e.g. gnuplot.
+	    #   If it looks like we have some latex use that, 
+	    #   otherwise, assume this is a resource name that must
+	    #   be converted into the latex to create an eps insertion.
+	    #
+	    my $src = $bgimg;
+	    $src =~ s/\s+$//s;
+	    $src =~ s/^\s+//s;
+	    
+
+	    if ($src =~ /^\\graphicspath/) {
+	        $height_param = $Apache::lonplot::plot{'height'}*0.3;
+		$width_param  = $Apache::lonplot::plot{'width'}*0.3;
+		&Apache::lonxml::debug("height $height_param");
+		&Apache::lonxml::debug("Width $width_param");
+		$scale_factor=1.0;
+		my $dirty_width = $width_param + 5;
+		$result .= '\parbox{'.$dirty_width.'mm}{';
+		$result  .= $src;
+		$result  .= '\begin{picture}('."$height_param,$width_param)";
+		$result  .= "(0,-$height_param)";
+	    } else {
+		
+		
+		$result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
+	    }
 	}
     }
     return $result;
 }
-
 sub make_eps_image {
     my ($bgimg,$parstack,$safeeval,$depth)=@_;
+    &Apache::lonxml::debug("image prior to get_eps_image: $bgimg");
     my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg);
+    &Apache::lonxml::debug("image after:  $bgimg");
     ($height_param,$width_param)=
 	&Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,
 				       $depth,1);
+
+    &Apache::lonxml::debug("Image size: $height_param x $width_param");
+
     my $dirtywidth=$width_param+5;
-    my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.
+    my $result ="\n".'\vspace*{2mm}\noindent'."\n".
+	'\parbox{'.$dirtywidth.
 	' mm}{  \noindent \epsfxsize='.$width_param.
 	' mm \epsffile{'.$path.$file.
-	'}\setlength{\unitlength}{1mm}  \begin{picture}('.
-	$width_param.','.$height_param.')(0,-'.$height_param.')';
+	'}\setlength{\unitlength}{1mm}'."\n".'  \begin{picture}('.
+	$width_param.','.$height_param.')(0,-'.$height_param.')'."\n";
+    my $magick = Image::Magick->new;
+    $magick->Read($bgimg);
+    my $initial_width = $magick->Get('width');
+    &Apache::lonxml::debug("ImageMagick thinks width is; $initial_width");
+    $scale_factor = $width_param / $initial_width;
     return $result;
 }
 
@@ -198,7 +236,7 @@ sub start_labelgroup {
 	@Apache::randomlabel::ycoord = ();
 	@Apache::randomlabel::value = ();
 	@Apache::randomlabel::label_arr  = ();
-	@Apache::randomlabel::decription  = ();
+	@Apache::randomlabel::description  = ();
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('Name:','name',$token).
@@ -225,6 +263,24 @@ sub start_labelgroup {
     return $result;
 }
 
+#
+#   Utility sub to compute the width of a label.
+#
+sub get_label_width {
+    my $label         = shift;
+    &Apache::lonxml::debug("image label = $label");
+    if (-e $label) {
+	&Apache::lonxml::debug("$label exists");
+    } else {
+	&Apache::lonxml::debug("$label does not exist");
+    }
+    my $magick        = Image::Magick->new;
+    $magick->Read($label);
+    my $pixel_width   = $magick->Get('width');
+    return $pixel_width * $scale_factor;
+    
+	
+}
 sub add_vars {
     my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
     if (!defined($name) || $name eq '') { return; }
@@ -301,10 +357,17 @@ sub end_labelgroup {
 	    my $tcY=$height_param-$y*($height_param/$wheight);
 	    $tcX=sprintf('%.2f',$tcX);
 	    $tcY=sprintf('%.2f',$tcY);
-	    $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n";
+	    $result .= '\put('.$tcX.','.$tcY.'){';
 	    if( $type eq 'text') {
+		$result.= $TeXsize.' \bf '.$label."}\n";
 		&add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
 	    } elsif ( $type eq 'image') {
+		my ($path,$file) = &Apache::londefdef::get_eps_image($label);
+		my $image_name = $path.$file;
+		my $label_width = get_label_width($label);
+
+		$result .=  '\includegraphics[width='.$label_width.'mm]{'
+		            .$image_name."}}\n";
 		&add_vars($gname,$i,
 			  $Apache::randomlabel::description[$idx_arr[$i]],
 			  $idx_arr[$i],$value,$label,$safeeval);
@@ -402,6 +465,15 @@ sub end_label {
 	my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
 	my $ltext=&Apache::lonxml::endredirection; 
 	if ($type eq 'image') {
+	    if ($target eq 'tex') {
+		# For tex targets, our image url has been potentially corrupted
+		# by prepending \'s in front of special latex symbols.
+		# For now we only worry about the _ case (most common?)
+		# There's a whole host of theim in lonxml::latex_special_symbols
+		# that could potentially have to be re-done.
+
+		$ltext =~ s/\\_/_/g;
+	    }
 	    &Apache::lonxml::debug("Turning $ltext, $Apache::lonxml::pwd[-1]");
 	    $ltext=&Apache::imageresponse::clean_up_image($ltext);
 #	    $ltext=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],