--- loncom/homework/randomlabel.pm	2004/12/04 01:15:41	1.63
+++ loncom/homework/randomlabel.pm	2005/02/10 23:00:10	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.63 2004/12/04 01:15:41 albertel Exp $
+# $Id: randomlabel.pm,v 1.64 2005/02/10 23:00:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,10 +82,12 @@ sub check_int {
     return $num;
 }
 
+my ($height_param,$width_param);
 sub start_randomlabel {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     push (@Apache::lonxml::namespace,'randomlabel');
+    ($height_param,$width_param)=(0,0);
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
     if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
 	$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
@@ -98,12 +100,8 @@ sub start_randomlabel {
 	$cgi_id=&Apache::loncommon::get_cgi_id();
 	%args=();
 	$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
-    } elsif ($target eq 'tex') {
-	my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
-	my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
-	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
-	if (!$texwidth) { $texwidth=90; }
-	$result.=&make_eps_image($bgimg,$texwidth,$h,$w);
+    } elsif ($target eq 'tex' && defined($bgimg)) {
+	$result.=&make_eps_image($bgimg,$parstack,$safeeval);
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$Apache::edit::bgimgsrc=
@@ -140,13 +138,7 @@ sub end_randomlabel {
 	&Apache::lonnet::appenv(%args);
     } elsif ($target eq 'tex') {
 	$result='\end{picture}\\\\';
-	my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
-	my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
-	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
-        if (!$texwidth) { $texwidth=90; }
-	# what if width is undefined?
-	my $howtoskipback = $texwidth*$height/$width;
-	$result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
+	$result.= ' \vskip -'.$height_param.' mm }  \\\\ ';
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::end_table;
     }
@@ -157,7 +149,7 @@ sub start_bgimg {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
-	&Apache::lonxml::startredirection; 
+	&Apache::lonxml::startredirection(); 
     }
     return $result;
 }
@@ -166,65 +158,32 @@ sub end_bgimg {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
-	my $bgimg=&Apache::lonxml::endredirection; 
+	my $bgimg=&Apache::lonxml::endredirection(); 
 	if ($target eq 'web') {
 	    $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
 	    $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
 	} elsif ($target eq 'tex') {
-	    my $w=&check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval,-2));
-	    my $h=&check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval,-2));
-	    my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,-2));
-	    if (!$texwidth) { $texwidth=90; }
-	    $result.=&make_eps_image($bgimg,$texwidth,$h,$w);
+	    $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
 	}
     }
     return $result;
 }
 
 sub make_eps_image {
-    my ($bgimg,$texwidth,$h,$w)=@_;
-    my $newbgimg = $bgimg;
-    $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i;
-    $bgimg= &Apache::lonnet::filelocation($bgimg);
-    $bgimg=~s|http:/[^/]*|/home/httpd/html|;
-    $bgimg=~s|/$||;
-    #if no eps file try to replicate it
-    if (not-e $bgimg) {
-	if (&Apache::lonnet::repcopy($bgimg) ne OK ) {
-	    #if replication failed try to find ps file
-	    $bgimg=~s/\.eps$/\.ps/;
-	    #if no ps file try to replicate it
-	    if (not -e $bgimg &&
-		&Apache::lonnet::repcopy($bgimg) ne OK) {
-		#if replication failed try to produce eps file dynamically
-		$bgimg=~s/\.ps$/\.eps/;
-		my $temp_file;
-		my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat";
-		$temp_file = Apache::File->new('>>'.$filename);
-		$newbgimg =~ s|(.*)/res/|/home/httpd/html/res/|;
-		print $temp_file "$newbgimg\n";
-		$bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|;
-		$bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|;
-	    }
-	}
-    }
-    $bgimg=~s|/$||;
-    my $dirtywidth=$texwidth+5;
+    my ($bgimg,$parstack,$safeeval,$depth)=@_;
+    my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg);
+    ($height_param,$width_param)=
+	&Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,
+				       $depth,1);
+    my $dirtywidth=$width_param+5;
     my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.
-	' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.$bgimg.
+	' mm}{  \noindent \epsfxsize='.$width_param.
+	' mm \epsffile{'.$path.$file.
 	'}\setlength{\unitlength}{1mm}  \begin{picture}('.
-	$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
+	$width_param.','.$height_param.')(0,-'.$height_param.')';
     return $result;
 }
 
-sub adjust_textwidth {
-    my $texwidth=shift; 
-    my $pagewidth=$ENV{'form.textwidth'};
-    $pagewidth=~s/\s*mm\s*$//;
-    if ($texwidth>$pagewidth) {$texwidth=$pagewidth;}
-    return $texwidth;
-}
-
 sub start_labelgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
@@ -325,11 +284,8 @@ sub end_labelgroup {
 	my $WY1=0; #  Web y-coord. of (ULC)
 	my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
 	my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2);
-	my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
 	my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
 	if (!defined($TeXsize)) { $TeXsize='\\normalsize'; }
-	if (!$texwidth) { $texwidth=90; }
-	my $texheight=$texwidth*($wheight/$wwidth);
 	
 	my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
 	&Apache::structuretags::shuffle(\@idx_arr);
@@ -342,10 +298,10 @@ sub end_labelgroup {
 	    my $y = $Apache::randomlabel::ycoord[$i]-3.5;
 	    my $value = $Apache::randomlabel::value[$i];
 	    #x latex coordinate
-	    my $tcX=($x)*($texwidth/$wwidth);
+	    my $tcX=($x)*($width_param/$wwidth);
 	    #y latex coordinate
             #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
-	    my $tcY=$texheight-$y*($texheight/$wheight);
+	    my $tcY=$height_param-$y*($height_param/$wheight);
 	    $tcX=sprintf('%.2f',$tcX);
 	    $tcY=sprintf('%.2f',$tcY);
 	    $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n";