--- loncom/homework/randomlabel.pm 2004/03/12 21:01:14 1.60 +++ loncom/homework/randomlabel.pm 2005/04/07 06:56:22 1.67 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.60 2004/03/12 21:01:14 albertel Exp $ +# $Id: randomlabel.pm,v 1.67 2005/04/07 06:56:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,9 +25,6 @@ # # http://www.lon-capa.org/ # -# 7/20/2001 Isaac Tsai, initial syntax -# 8/10/2001 Isaac Tsai, -# 8/30/2001 Isaac Tsai, # SYNTAX: # # @@ -82,14 +79,16 @@ sub check_int { return $num; } +my ($height_param,$width_param); sub start_randomlabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; push (@Apache::lonxml::namespace,'randomlabel'); + ($height_param,$width_param)=(0,0); my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval); if ( defined($bgimg) && $bgimg !~ /^http:/ ) { $bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg); - if (&Apache::lonnet::repcopy($bgimg) ne OK) { + if (&Apache::lonnet::repcopy($bgimg) ne 'ok') { $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif'; } } @@ -98,12 +97,8 @@ sub start_randomlabel { $cgi_id=&Apache::loncommon::get_cgi_id(); %args=(); $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg); - } elsif ($target eq 'tex') { - my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval)); - my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval)); - my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1)); - if (!$texwidth) { $texwidth=90; } - $result.=&make_eps_image($bgimg,$texwidth,$h,$w); + } elsif ($target eq 'tex' && defined($bgimg)) { + $result.=&make_eps_image($bgimg,$parstack,$safeeval); } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $Apache::edit::bgimgsrc= @@ -140,12 +135,7 @@ sub end_randomlabel { &Apache::lonnet::appenv(%args); } elsif ($target eq 'tex') { $result='\end{picture}\\\\'; - my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval); - my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval); - my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1)); - if (!$texwidth) { $texwidth=90; } - my $howtoskipback = $texwidth*$height/$width; - $result.= ' \vskip -'.$howtoskipback.' mm } \\\\ '; + $result.= ' \vskip -'.$height_param.' mm } \\\\ '; } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; } @@ -156,7 +146,7 @@ sub start_bgimg { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::startredirection; + &Apache::lonxml::startredirection(); } return $result; } @@ -165,65 +155,32 @@ sub end_bgimg { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { - my $bgimg=&Apache::lonxml::endredirection; + my $bgimg=&Apache::lonxml::endredirection(); if ($target eq 'web') { $bgimg=&Apache::imageresponse::clean_up_image($bgimg); $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg); } elsif ($target eq 'tex') { - my $w=&check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval,-2)); - my $h=&check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval,-2)); - my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,-2)); - if (!$texwidth) { $texwidth=90; } - $result.=&make_eps_image($bgimg,$texwidth,$h,$w); + $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2); } } return $result; } sub make_eps_image { - my ($bgimg,$texwidth,$h,$w)=@_; - my $newbgimg = $bgimg; - $bgimg=~s/\.(gif|jpg|png|jpeg)$/\.eps/i; - $bgimg= &Apache::lonnet::filelocation($bgimg); - $bgimg=~s|http:/[^/]*|/home/httpd/html|; - $bgimg=~s|/$||; - #if no eps file try to replicate it - if (not-e $bgimg) { - if (&Apache::lonnet::repcopy($bgimg) ne OK ) { - #if replication failed try to find ps file - $bgimg=~s/\.eps$/\.ps/; - #if no ps file try to replicate it - if (not -e $bgimg && - &Apache::lonnet::repcopy($bgimg) ne OK) { - #if replication failed try to produce eps file dynamically - $bgimg=~s/\.ps$/\.eps/; - my $temp_file; - my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.dat"; - $temp_file = Apache::File->new('>>'.$filename); - $newbgimg =~ s|(.*)/res/|/home/httpd/html/res/|; - print $temp_file "$newbgimg\n"; - $bgimg=~s|/home/httpd/html/res|/home/httpd/prtspool|; - $bgimg=~s|/home/([^/]*)/public_html/|/home/httpd/prtspool/$1/|; - } - } - } - $bgimg=~s|/$||; - my $dirtywidth=$texwidth+5; + my ($bgimg,$parstack,$safeeval,$depth)=@_; + my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg); + ($height_param,$width_param)= + &Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval, + $depth,1); + my $dirtywidth=$width_param+5; my $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth. - ' mm}{ \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.$bgimg. + ' mm}{ \noindent \epsfxsize='.$width_param. + ' mm \epsffile{'.$path.$file. '}\setlength{\unitlength}{1mm} \begin{picture}('. - $texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')'; + $width_param.','.$height_param.')(0,-'.$height_param.')'; return $result; } -sub adjust_textwidth { - my $texwidth=shift; - my $pagewidth=$ENV{'form.textwidth'}; - $pagewidth=~s/\s*mm\s*$//; - if ($texwidth>$pagewidth) {$texwidth=$pagewidth;} - return $texwidth; -} - sub start_labelgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; @@ -245,11 +202,21 @@ sub start_labelgroup { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Name:','name',$token). - &Apache::edit::select_arg('Type:','type',['text','image'],$token). - &Apache::edit::end_row().&Apache::edit::start_spanning_row(); + &Apache::edit::select_arg('Type:','type',['text','image'],$token); + if (!defined($token->[2]{'TeXsize'})) { + $token->[2]{'TeXsize'}='\normalsize'; + } + $result.=&Apache::edit::select_arg('TeX font size:','TeXsize', + ['\tiny','\scriptsize', + '\footnotesize','\small', + '\normalsize','\large','\Large', + '\LARGE','\huge','\Huge'], + $token); + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'name','type'); + $safeeval,'name','type', + 'TeXsize'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); $result.=&Apache::edit::handle_insert(); @@ -260,6 +227,7 @@ sub start_labelgroup { sub add_vars { my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_; + if (!defined($name) || $name eq '') { return; } my $code = '${'.$name."}{'".($order+1)."'}='".$label."';"; my $out=Apache::run::run($code,$safeeval); if ($value) { @@ -313,19 +281,9 @@ sub end_labelgroup { my $WY1=0; # Web y-coord. of (ULC) my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2); my $wheight=&Apache::lonxml::get_param('height',$parstack,$safeeval,-2); - my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1)); - if (!$texwidth) { $texwidth=90; } - my $TX1=0; - my $TY1=$texwidth*($wheight/$wwidth); - my $TX2=$texwidth; - my $TY2=0; - - - my $slopex=($wwidth-$WX1)/($TX2-$TX1); - my $slopey=($wheight-$WY1)/($TY2-($TY1-1.0)); - my $cstx=$wwidth-$slopex*($TX2); - my $csty=$wheight-$slopey*($TY2); - + my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval); + if (!defined($TeXsize)) { $TeXsize='\\normalsize'; } + my @idx_arr = (0 .. $#Apache::randomlabel::label_arr); &Apache::structuretags::shuffle(\@idx_arr); @@ -333,16 +291,17 @@ sub end_labelgroup { for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) { my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]"; my $x = $Apache::randomlabel::xcoord[$i]; - my $y = $Apache::randomlabel::ycoord[$i]; + # FIXME the 3.5 here is the 'height' of the letter in TeX + my $y = $Apache::randomlabel::ycoord[$i]-3.5; my $value = $Apache::randomlabel::value[$i]; #x latex coordinate - my $tcX=($x)*($texwidth/$wwidth); + my $tcX=($x)*($width_param/$wwidth); #y latex coordinate # my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 ); - my $tcY=$TY1-$y*($TY1/$wheight); + my $tcY=$height_param-$y*($height_param/$wheight); $tcX=sprintf('%.2f',$tcX); $tcY=sprintf('%.2f',$tcY); - $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n"; + $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n"; if( $type eq 'text') { &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval); } elsif ( $type eq 'image') { @@ -451,6 +410,8 @@ sub end_label { my $description = &Apache::lonxml::get_param('description', $parstack,$safeeval); push(@Apache::randomlabel::description,$description); + } else { + $ltext=~s/[\r\n]*//gs } push(@Apache::randomlabel::label_arr,$ltext); }