--- loncom/homework/randomlabel.pm 2002/07/18 19:40:15 1.29
+++ loncom/homework/randomlabel.pm 2002/08/07 21:49:35 1.34
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# random labelling tool
#
-# $Id: randomlabel.pm,v 1.29 2002/07/18 19:40:15 sakharuk Exp $
+# $Id: randomlabel.pm,v 1.34 2002/08/07 21:49:35 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,7 +91,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);
@@ -108,10 +108,21 @@ sub start_randomlabel {
} elsif ($target eq 'tex') {
$bgimg=~s/(.gif|.jpg)$/.eps/;
$bgimg= &Apache::lonnet::filelocation($bgimg);
- $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
+ if (not $ENV{'request.role'}=~/^au\./) {
+ $bgimg=~s/http:\/[^\/]*/\/home\/httpd\/html/;
+ } else {
+ $bgimg=~s/http:\/[^\/]*\/~([^\/]+)/\/home\/$1\/public_html/;
+
+ }
$bgimg=~s/\/$//;
- $result.='\vspace*{2mm} \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
- $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')'
+ my $dirtywidth=$texwidth+5;
+ if ($texwidth==90) {
+ $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+ $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
+ } else {
+ $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.
+ $bgimg.'}\setlength{\unitlength}{1mm} \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';
+ }
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token);
$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
@@ -145,7 +156,15 @@ sub end_randomlabel {
if( $count != 0) { $result.= "\n"; }
$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;
}
@@ -267,11 +286,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;
+ #x latex coordinate
my $tcX=($x)*($texwidth/$wwidth);
-# my $tcY=$TY1-$y*($TY1/$wheight)-2;
- my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
- my $tcY=$TY1-$y*($TY1/$wheight)+$texwidth*$ratio;
+ #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";