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

Diff for /loncom/homework/randomlabel.pm between versions 1.47 and 1.50

version 1.47, 2003/09/08 19:08:57 version 1.50, 2003/09/25 14:05:44
Line 92  sub start_randomlabel { Line 92  sub start_randomlabel {
     }      }
     my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));      my $w= &check_int(&Apache::lonxml::get_param('width',$parstack,$safeeval));
     my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));      my $h= &check_int(&Apache::lonxml::get_param('height',$parstack,$safeeval));
     my $texwidth= &Apache::lonxml::get_param('texwidth',$parstack,$safeeval);      my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
       if (!$texwidth) { $texwidth=90; }
     $Apache::randomlabel::tlabel_cnt=0;      $Apache::randomlabel::tlabel_cnt=0;
     $Apache::randomlabel::ilabel_cnt=0;      $Apache::randomlabel::ilabel_cnt=0;
     if ($target eq 'web') {      if ($target eq 'web') {
Line 126  sub start_randomlabel { Line 127  sub start_randomlabel {
  }   }
  $bgimg=~s/\/$//;   $bgimg=~s/\/$//;
  my $dirtywidth=$texwidth+5;   my $dirtywidth=$texwidth+5;
  if ($texwidth==90) {   $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.
     $result.='\vspace*{2mm}\noindent \parbox{'.$dirtywidth.' mm}{  \noindent \epsfxsize='.$texwidth.' mm \epsffile{'.      $texwidth.' mm \epsffile{'.$bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.
  $bgimg.'}\setlength{\unitlength}{1mm}  \begin{picture}('.$texwidth.','.$texwidth*$h/$w.')(0,-'.$texwidth*$h/$w.')';      $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') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $Apache::edit::bgimgsrc=   $Apache::edit::bgimgsrc=
Line 178  sub end_randomlabel { Line 175  sub end_randomlabel {
  $result='\end{picture}\\\\';   $result='\end{picture}\\\\';
  my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);   my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);
  my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);   my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
  my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval);   my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1));
           if (!$texwidth) { $texwidth=90; }
  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 187  sub end_randomlabel { Line 185  sub end_randomlabel {
     return $result;      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 {  sub start_labelgroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
     my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);      my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
     $type =~tr/A-Z/a-z/;      $type =~tr/A-Z/a-z/;
       if ($target ne 'modified' && ($name =~ /\W/ || $name =~ /^[0-9]/)) {
    &Apache::lonxml::error("Only _ a-z A-Z and 0-9 are allowed in the name to a labelgroup, and the first character can not be a number.<br />");
       }
     if ($target eq 'web' || $target eq 'tex' ||      if ($target eq 'web' || $target eq 'tex' ||
  $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {   $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') {
  $Apache::randomlabel::groupname=$name;   $Apache::randomlabel::groupname=$name;
Line 282  sub end_labelgroup { Line 291  sub end_labelgroup {
  my $WY1=0; #  Web y-coord. of (ULC)   my $WY1=0; #  Web y-coord. of (ULC)
  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=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2);   my $texwidth=&adjust_textwidth(&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,-2,1));
    if (!$texwidth) { $texwidth=90; }
  my $TX1=0;   my $TX1=0;
  my $TY1=$texwidth*($wheight/$wwidth);   my $TY1=$texwidth*($wheight/$wwidth);
  my $TX2=$texwidth;   my $TX2=$texwidth;
Removed from v.1.47  
changed lines
  Added in v.1.50

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