--- loncom/homework/randomlabel.pm 2002/05/20 20:35:13 1.28
+++ loncom/homework/randomlabel.pm 2002/10/14 20:37:27 1.37
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.28 2002/05/20 20:35:13 albertel Exp $
+# $Id: randomlabel.pm,v 1.37 2002/10/14 20:37:27 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -60,6 +60,7 @@ package Apache::randomlabel;
use Apache::lonnet;
use strict;
use Apache::edit;
+use Apache::File();
BEGIN {
&Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label'));
@@ -91,7 +92,7 @@ sub start_randomlabel {
} elsif ($bgimg =~ m:^/home/.*/public_html:) {
$bgimg =~ s:^/home/(.*)/public_html:/~$1:;
}
- $bgimg="http://".$ENV{'SERVER_NAME'}.$bgimg;
+ $bgimg='http://'.$ENV{'SERVER_NAME'}.$bgimg;
}
my $code = &Apache::lonxml::get_param('code',$parstack,$safeeval);
my $codebase = &Apache::lonxml::get_param('codebase',$parstack,$safeeval);
@@ -106,12 +107,45 @@ sub start_randomlabel {
$result.="\n
";
} elsif ($target eq 'tex') {
- $result='\end{picture}\\\\';
+ $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 ';
} elsif ($target eq 'edit') {
$result.=&Apache::edit::end_table;
}
@@ -158,8 +200,8 @@ sub start_labelgroup {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
$type =~tr/A-Z/a-z/;
- if ($target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
$Apache::randomlabel::groupname=$name;
$Apache::randomlabel::type=$type;
@Apache::randomlabel::xcoord = ();
@@ -207,7 +249,8 @@ sub end_labelgroup {
my $gname = $Apache::randomlabel::groupname;
my $type = $Apache::randomlabel::type;
my $result='';
- if ($target eq 'web' || $target eq 'answer' || $target eq 'grade') {
+ if ($target eq 'web' || $target eq 'answer' || $target eq 'grade' ||
+ $target eq 'analyze') {
my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
&Apache::structuretags::shuffle(\@idx_arr);
for(0 .. $#Apache::randomlabel::label_arr) {
@@ -267,11 +310,11 @@ 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-10)*($texwidth/$wwidth);
-# my $tcY=$TY1-$y*($TY1/$wheight)-2;
- my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
- my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
+ #x latex coordinate
+ my $tcX=($x)*($texwidth/$wwidth);
+ #y latex coordinate
+# my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
+ my $tcY=$TY1-$y*($TY1/$wheight);
$tcX=sprintf('%.2f',$tcX);
$tcY=sprintf('%.2f',$tcY);
$result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";
@@ -331,8 +374,8 @@ sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval,-2);
- if ($target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer') {
+ if ($target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
my $ltext=&Apache::lonxml::get_all_text("/label",$$parser[-1]);
$ltext=&Apache::run::evaluate($ltext,$safeeval,$$parstack[-1]);
if ($type eq 'image') {