--- loncom/homework/randomlabel.pm	2002/01/21 16:40:57	1.11
+++ loncom/homework/randomlabel.pm	2002/03/08 18:31:27	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.11 2002/01/21 16:40:57 matthew Exp $
+# $Id: randomlabel.pm,v 1.18 2002/03/08 18:31:27 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -86,6 +86,7 @@ sub start_randomlabel {
   my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
   my $w= &Apache::lonxml::get_param('width',$parstack,$safeeval);
   my $h= &Apache::lonxml::get_param('height',$parstack,$safeeval);
+  $Apache::randomlabel::ratio = ($w > 0 ? $h/$w : 1 );
   my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
   if (!$code) { $code='GLabel.class'; }
   if (!$codebase) { $codebase='/res/adm/includes/'; }
@@ -95,16 +96,19 @@ sub start_randomlabel {
     $result.="<applet code=\"$code\" codebase=\"$codebase\" width=\"$w\" height=\"$h\">";
     $result.="<param name=\"bgimg\" value=\"$bgimg\">";
   } elsif ($target eq 'tex') {
-    $bgimg=~s/(.gif|.jpg)$/.ps/;
-    $result.='\vspace*{2mm} \\ \noindent \epsfxsize='.$texwidth.' \epsffile{'.
-      $bgimg.'}\setlength{\unitlength}{1mm} \\ \begin{picture}(0,0)(0,-5)';
+    $bgimg=~s/(.gif|.jpg)$/.eps/;
+    $bgimg=~s/http:\/\/[^\/]*/\/home\/httpd\/html/;
+    $result.='\vspace*{2mm}  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+    $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
-    $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).'<br />'.
-      &Apache::edit::text_arg('Width(pixel):','width',$token,4).
-	&Apache::edit::text_arg('Height(pixel):','height',$token,4).
-	  &Apache::edit::text_arg('TeXWidth(mm):','texwidth',$token,4).
-	     &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+    $result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
+    $result.=&Apache::edit::browse('bgimg').' ';
+    $result.=&Apache::edit::search('bgimg').'<br />'.
+        &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
+        &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
+        &Apache::edit::text_arg('TeXWidth(mm):' ,'texwidth',$token,6).
+        &Apache::edit::end_row().&Apache::edit::start_spanning_row();     
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'bgimg','width','height',
@@ -245,8 +249,10 @@ sub end_labelgroup {
       my $x = $Apache::randomlabel::xcoord[$i];
       my $y = $Apache::randomlabel::ycoord[$i];
       my $value = $Apache::randomlabel::value[$i];
+#      my $tcX=$x*($texwidth/$wwidth) - $texwidth;
       my $tcX=$x*($texwidth/$wwidth);
-      my $tcY=$TY1-$y*($TY1/$wheight)-2;
+#      my $tcY=$TY1-$y*($TY1/$wheight)-2;
+      my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$Apache::randomlabel::ratio;
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
@@ -306,6 +312,7 @@ sub start_label {
   if ($target eq 'web' || $target eq 'tex' || 
       $target eq 'grade' || $target eq 'answer') {
     my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
+    $ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
     push(@Apache::randomlabel::label_arr,$ltext);
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);