--- loncom/homework/randomlabel.pm	2005/07/14 04:17:44	1.80
+++ 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.80 2005/07/14 04:17:44 albertel Exp $
+# $Id: randomlabel.pm,v 1.87 2007/05/10 10:46:51 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,13 +61,16 @@ use Apache::File();
 use Apache::Constants qw(:common :http);
 use Image::Magick;
 use Apache::lonplot;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 my %args;
 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'));
@@ -138,7 +141,7 @@ sub start_randomlabel {
     if ($target eq 'web') {
 	$cgi_id=&Apache::loncommon::get_cgi_id();
 	%args=();
-	$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
+	$args{"cgi.$cgi_id.BGIMG"}=&escape($bgimg);
 	$height_param = &Apache::lonxml::get_param('height',$parstack, $safeeval);
 	$width_param  = &Apache::lonxml::get_param('width', $parstack, $safeeval);
     } elsif ($target eq 'tex' && defined($bgimg)) {
@@ -223,7 +226,7 @@ sub end_bgimg {
 	    &Apache::lonxml::debug("Image: $bgimg");
 	    $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
 	    &Apache::lonxml::debug("Cleaned image: $bgimg");
-	    $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
+	    $args{"cgi.$cgi_id.BGIMG"}=&escape($bgimg);
 	} elsif ($target eq 'tex') {
 	    #   Some bg images can create latex for us... e.g. gnuplot.
 	    #   If it looks like we have some latex use that, 
@@ -265,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;
 
@@ -293,6 +301,7 @@ sub make_eps_image {
     &Apache::lonxml::debug("Image size: $height_param x $width_param");
 
     my $dirtywidth=$width_param+5;
+
     my $result ="\n".'\vspace*{2mm}\noindent'."\n".
 	'\parbox{'.$dirtywidth.
 	' mm}{  \noindent \epsfxsize='.$width_param.
@@ -422,13 +431,13 @@ sub end_labelgroup {
 	    my $i=$Apache::randomlabel::obj_cnt++;
 	    if( $type eq 'text') {
 		&add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval);
-		$str = join(':',$x,$y,&Apache::lonnet::escape($label));
+		$str = join(':',$x,$y,&escape($label));
 		$args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:';
 	    } elsif ( $type eq 'image') {
 		&add_vars($gname,$_,
 			  $Apache::randomlabel::description[$idx_arr[$_]],
 			  $idx_arr[$_],$value,$label,$safeeval);
-		$str = join(':',$x,$y,&Apache::lonnet::escape($label));
+		$str = join(':',$x,$y,&escape($label));
 		$args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:';
 	    } else {
 		&Apache::lonxml::error('Unknown type of label :'.$type.':');
@@ -479,6 +488,10 @@ sub end_labelgroup {
 	    } elsif ( $type eq 'image') {
 		my ($path,$file) = &Apache::londefdef::get_eps_image($label);
 		my $image_name = $path.$file;
+		#
+		#  Note that spaces in e.. \includegraphics cause problems for Latex
+		# so they get replaced by _'s by lonprintout/printout and us:
+		#
 		my $label_width = &get_label_width($label);
 
 		$result .=  '\includegraphics[width='.$label_width.'mm]{'
@@ -551,7 +564,7 @@ sub start_label {
 	&Apache::lonxml::startredirection; 
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token,"$type Label");
-	my $text=&Apache::lonxml::get_all_text("/label",$parser);
+	my $text=&Apache::lonxml::get_all_text("/label",$parser,$style);
 	if ($type eq 'image') {
 	    $result.=&Apache::edit::end_row().
 		&Apache::edit::start_spanning_row();