--- loncom/homework/randomlabel.pm	2001/10/26 18:47:43	1.7
+++ loncom/homework/randomlabel.pm	2002/02/05 16:21:03	1.12
@@ -1,5 +1,30 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
+#
+# $Id: randomlabel.pm,v 1.12 2002/02/05 16:21:03 sakharuk Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 7/20/2001 Isaac Tsai, initial syntax
 # 8/10/2001 Isaac Tsai, 
 # 8/30/2001 Isaac Tsai, 
@@ -69,9 +94,10 @@ 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 />'.
@@ -219,7 +245,7 @@ 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);
+      my $tcX=$x*($texwidth/$wwidth) - $texwidth;
       my $tcY=$TY1-$y*($TY1/$wheight)-2;
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);