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

Diff for /loncom/homework/matchresponse.pm between versions 1.61 and 1.62

version 1.61, 2007/03/27 19:20:49 version 1.62, 2007/04/05 10:29:58
Line 428  sub itemdisplay { Line 428  sub itemdisplay {
 }  }
 sub displayfoils {  sub displayfoils {
     my ($target,$max,$randomize)=@_;      my ($target,$max,$randomize)=@_;
       my ($tabsize, $lefttabsize, $righttabsize);
   
     my $result;      my $result;
     my $question;      my $question;
     my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),      my (@whichfoils)=&Apache::response::whichorder(&getfoilcounts($max),
Line 493  sub displayfoils { Line 495  sub displayfoils {
         $optionlist."</select>\n";          $optionlist."</select>\n";
     }      }
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
       #
               #  Factor out the tex computations of the left/right 1/2 minipage
       #  widths for left or right positioning.  This allows us
       #  to, if necessary constrain the bubble widths:
       #
       if ($target eq 'tex'   &&
    (&itemdisplay('left') || &itemdisplay('right'))) {
    $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});
    ($lefttabsize,$righttabsize)=(0,0);
    if ($Apache::matchresponse::TeXitemgroupwidth ne '') {
       $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;
       $lefttabsize=$tabsize*$1/100;
       $righttabsize=0.95*($tabsize-$lefttabsize);
    } else {
       $tabsize=~/(\d+\.?\d*)/;
       $lefttabsize=$1/2.1;
       $righttabsize=0.95*($1-$lefttabsize);
    }
       }
     if ($target ne 'tex') {      if ($target ne 'tex') {
  if ($Apache::lonhomework::type ne 'exam') {   if ($Apache::lonhomework::type ne 'exam') {
     $question.="<br />\n".$optionlist.$text;      $question.="<br />\n".$optionlist.$text;
Line 504  sub displayfoils { Line 525  sub displayfoils {
     $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);      $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@blank,$temp,$last_letter);
  }   }
     } else {      } else {
    # Note that if left or right positioned, we must
    # confine the bubbles to righttabsize:
    #
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $question.=' '.$optionlist.$text."\n";      $question.=' '.$optionlist.$text."\n";
     my @emptyItems = ();      my @emptyItems = ();
     for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}      for (my $i=0;$i<=$#used_letters;$i++) {push @emptyItems, ' ';}
     $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';      $question.='\vskip -1 mm\noindent\begin{list}{}{\setlength{\listparindent}{0mm}\setlength{\leftmargin}{2mm}}'
    .'\item \hskip -3mm \textbf{'.$internal_counter.'}';
       if (&itemdisplay('left') || &itemdisplay('right')) {
    &Apache::lonnet::logthis("Constraining bubbles to $righttabsize - 10");
    $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems, "", $righttabsize);
       }
       else {
    &Apache::lonnet::logthis("Not constraining bubbles");
    $question .= &Apache::optionresponse::bubbles(\@used_letters,\@emptyItems);
       }
       $question .= '\end{list} \vskip -8 mm \strut ';
     $internal_counter++;      $internal_counter++;
         } else {          } else {
     $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";      $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
Line 528  sub displayfoils { Line 562  sub displayfoils {
     $result='<table><tr><td valign="top">'.$question.      $result='<table><tr><td valign="top">'.$question.
  '</td><td valign="top">'.$result.'</td></tr></table>';   '</td><td valign="top">'.$result.'</td></tr></table>';
  } else {   } else {
     my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});  
     my ($lefttabsize,$righttabsize)=(0,0);  
     if ($Apache::matchresponse::TeXitemgroupwidth ne '') {  
  $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;  
  $lefttabsize=$tabsize*$1/100;  
  $righttabsize=0.95*($tabsize-$lefttabsize);  
     } else {  
  $tabsize=~/(\d+\.?\d*)/;  
  $lefttabsize=$1/2.1;  
  $righttabsize=0.95*($1-$lefttabsize);  
     }  
     $lefttabsize.=' mm ';      $lefttabsize.=' mm ';
     $righttabsize.=' mm ';      $righttabsize.=' mm ';
     $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';      $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$righttabsize.'}p{'.$lefttabsize.'}}\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}\end{tabular}';
Line 550  sub displayfoils { Line 573  sub displayfoils {
     $result='<table><tr><td valign="top">'.$result.      $result='<table><tr><td valign="top">'.$result.
  '</td><td valign="top">'.$question.'</td></tr></table>';   '</td><td valign="top">'.$question.'</td></tr></table>';
  } else {   } else {
     my $tabsize=&Apache::londefdef::recalc($env{'form.textwidth'});  
     my ($lefttabsize,$righttabsize)=(0,0);  
     if ($Apache::matchresponse::TeXitemgroupwidth ne '') {  
  $Apache::matchresponse::TeXitemgroupwidth=~/(\d*.?\d*)/;  
  $lefttabsize=$tabsize*$1/100;  
  $righttabsize=0.95*($tabsize-$lefttabsize);  
     } else {  
  $tabsize=~/(\d+\.?\d*)/;  
  $lefttabsize=$1/2.1;  
  $righttabsize=0.95*($1-$lefttabsize);  
     }  
     $lefttabsize.=' mm ';      $lefttabsize.=' mm ';
     $righttabsize.=' mm ';      $righttabsize.=' mm ';
     $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';      $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$lefttabsize.'}p{'.$righttabsize.'}}\begin{minipage}{'.$lefttabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$righttabsize.'}'.$question.'\end{minipage}\end{tabular}';
Removed from v.1.61  
changed lines
  Added in v.1.62

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