[LON-CAPA-cvs] cvs: loncom /homework randomlabel.pm

[albertel]

albertel		Thu Jun 19 18:23:11 2003 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  - this was never committed (BUG#1855)
  - start on next line after randomlabel image (just like on web)
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.45 loncom/homework/randomlabel.pm:1.46
--- loncom/homework/randomlabel.pm:1.45	Mon May 19 13:10:12 2003
+++ loncom/homework/randomlabel.pm	Thu Jun 19 18:23:10 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.45 2003/05/19 17:10:12 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.46 2003/06/19 22:23:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,14 +176,11 @@
       &Apache::lonnet::appenv(("imagerequest.$token"=>&Apache::lonnet::escape($args)));
   } elsif ($target eq 'tex') {
       $result='\end{picture}\\\\';
-	  @$parstack[-1]=~/\$height\s*=\s*?"(.+)?"/;
-      my $one=$1;
-	  @$parstack[-1]=~/\$width\s*=\s*?"(.+)?"/;
-      my $two=$1;
-	  @$parstack[-1]=~/\$texwidth\s*=\s*?"(.+)?"/;
-      my $three=$1;
-      my $howtoskipback = $three*$one/$two;
-      $result.=' \vskip -'.$howtoskipback.' mm }';
+      my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
+      my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
+      my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval);
+      my $howtoskipback = $texwidth*$height/$width;
+      $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table;
   }