--- loncom/homework/randomlabel.pm	2002/03/08 18:31:27	1.18
+++ loncom/homework/randomlabel.pm	2002/03/22 22:06:06	1.22
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.18 2002/03/08 18:31:27 matthew Exp $
+# $Id: randomlabel.pm,v 1.22 2002/03/22 22:06:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,7 @@ sub start_randomlabel {
   my $result='';
   $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
     '/res/adm/includes/GLabel.class';
-
+  push (@Apache::lonxml::namespace,'randomlabel');
   my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
 
   if ( $bgimg !~ /^http:/ ) {
@@ -86,7 +86,6 @@ 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/'; }
@@ -125,8 +124,7 @@ sub end_randomlabel {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result='';
   my $count;
-
-
+  pop @Apache::lonxml::namespace;
   if ($target eq 'web') {
     $count = $Apache::randomlabel::tlabel_cnt;
     if( $count != 0) { $result.= "<param name=\"count\" value=\"$count\">"; }
@@ -252,7 +250,8 @@ sub end_labelgroup {
 #      my $tcX=$x*($texwidth/$wwidth) - $texwidth;
       my $tcX=$x*($texwidth/$wwidth);
 #      my $tcY=$TY1-$y*($TY1/$wheight)-2;
-      my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$Apache::randomlabel::ratio;
+      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
+      my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
       $tcX=sprintf('%.2f',$tcX);
       $tcY=sprintf('%.2f',$tcY);
       $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
@@ -318,7 +317,7 @@ sub start_label {
     $result.=&Apache::edit::tag_start($target,$token);
     my $text=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row().
-      &Apache::edit::editfield('',$text,'',20,1).
+      &Apache::edit::editline('',$text,'',20).
 	&Apache::edit::end_table();
   } elsif ($target eq 'modified') {
     my $text=$$parser[-1]->get_text("/label");