[BACK]Return to randomlabel.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/randomlabel.pm between versions 1.60 and 1.63

version 1.60, 2004/03/12 21:01:14 version 1.63, 2004/12/04 01:15:41
Line 144  sub end_randomlabel { Line 144  sub end_randomlabel {
  my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);   my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
  my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));   my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
         if (!$texwidth) { $texwidth=90; }          if (!$texwidth) { $texwidth=90; }
    # what if width is undefined?
  my $howtoskipback = $texwidth*$height/$width;   my $howtoskipback = $texwidth*$height/$width;
  $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';   $result.= ' \vskip -'.$howtoskipback.' mm }  \\\\ ';
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
Line 245  sub start_labelgroup { Line 246  sub start_labelgroup {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Name:','name',$token).   $result.=&Apache::edit::text_arg('Name:','name',$token).
     &Apache::edit::select_arg('Type:','type',['text','image'],$token).      &Apache::edit::select_arg('Type:','type',['text','image'],$token);
     &Apache::edit::end_row().&Apache::edit::start_spanning_row();   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') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'name','type');       $safeeval,'name','type',
        'TeXsize');
  if ($constructtag) {   if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
Line 260  sub start_labelgroup { Line 271  sub start_labelgroup {
   
 sub add_vars {  sub add_vars {
     my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;      my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_;
       if (!defined($name) || $name eq '') { return; }
     my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";      my $code = '${'.$name."}{'".($order+1)."'}='".$label."';";
     my $out=Apache::run::run($code,$safeeval);      my $out=Apache::run::run($code,$safeeval);
     if ($value) {      if ($value) {
Line 314  sub end_labelgroup { Line 326  sub end_labelgroup {
  my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);   my $wwidth=&Apache::lonxml::get_param('width',$parstack,$safeeval,-2);
  my $wheight=&Apache::lonxml::get_param('height',$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));   my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
    my $TeXsize=&Apache::lonxml::get_param('TeXsize',$parstack,$safeeval);
    if (!defined($TeXsize)) { $TeXsize='\\normalsize'; }
  if (!$texwidth) { $texwidth=90; }   if (!$texwidth) { $texwidth=90; }
  my $TX1=0;   my $texheight=$texwidth*($wheight/$wwidth);
  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 @idx_arr = (0 .. $#Apache::randomlabel::label_arr);   my @idx_arr = (0 .. $#Apache::randomlabel::label_arr);
  &Apache::structuretags::shuffle(\@idx_arr);   &Apache::structuretags::shuffle(\@idx_arr);
   
Line 333  sub end_labelgroup { Line 338  sub end_labelgroup {
  for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {   for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) {
     my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";      my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]";
     my $x = $Apache::randomlabel::xcoord[$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];      my $value = $Apache::randomlabel::value[$i];
     #x latex coordinate      #x latex coordinate
     my $tcX=($x)*($texwidth/$wwidth);      my $tcX=($x)*($texwidth/$wwidth);
     #y latex coordinate      #y latex coordinate
             #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );              #      my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 );
     my $tcY=$TY1-$y*($TY1/$wheight);      my $tcY=$texheight-$y*($texheight/$wheight);
     $tcX=sprintf('%.2f',$tcX);      $tcX=sprintf('%.2f',$tcX);
     $tcY=sprintf('%.2f',$tcY);      $tcY=sprintf('%.2f',$tcY);
     $result.='\put('.$tcX.','.$tcY.'){\normalsize \bf '.$label.'}'."\n";      $result.='\put('.$tcX.','.$tcY.'){'.$TeXsize.' \bf '.$label.'}'."\n";
     if( $type eq 'text') {      if( $type eq 'text') {
  &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);   &add_vars($gname,$i,$label,$idx_arr[$i],$value,'',$safeeval);
     } elsif ( $type eq 'image') {      } elsif ( $type eq 'image') {
Line 451  sub end_label { Line 457  sub end_label {
     my $description = &Apache::lonxml::get_param('description',      my $description = &Apache::lonxml::get_param('description',
  $parstack,$safeeval);   $parstack,$safeeval);
     push(@Apache::randomlabel::description,$description);      push(@Apache::randomlabel::description,$description);
    } else {
       $ltext=~s/[\r\n]*//gs
  }   }
  push(@Apache::randomlabel::label_arr,$ltext);   push(@Apache::randomlabel::label_arr,$ltext);
     }      }
Removed from v.1.60  
changed lines
  Added in v.1.63

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>