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

Diff for /loncom/homework/matchresponse.pm between versions 1.38 and 1.41

version 1.38, 2004/03/15 22:09:52 version 1.41, 2004/05/27 04:32:19
Line 153  sub end_itemgroup { Line 153  sub end_itemgroup {
  $table.='</table>';   $table.='</table>';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $table=' \begin{description} ';   my $table=' \begin{description}\setlength{\leftmargin}{2em}\setlength{\labelwidth}{1em}\setlength{\itemsep}{0.5pt plus1pt minus2pt}\setlength{\listparindent}{0em} ';
  my $i=0;   my $i=0;
  foreach my $name (@names) {   foreach my $name (@names) {
     $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;      $Apache::response::itemgroup{$name.'.text'}=~s/\$\$/\$/g;
Line 161  sub end_itemgroup { Line 161  sub end_itemgroup {
  $Apache::response::itemgroup{$name.'.text'};   $Apache::response::itemgroup{$name.'.text'};
     $i++;      $i++;
  }   }
  $table.=' \end{description} \strut ';   $table.=' \end{description}  \strut ';
    if ($Apache::lonhomework::type eq 'exam') {$table.='\vskip -13 mm \strut ';}
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     }      }
     return $result;      return $result;
Line 231  sub start_foilgroup { Line 232  sub start_foilgroup {
     my $result;      my $result;
     %Apache::response::foilgroup=();      %Apache::response::foilgroup=();
     $Apache::matchresponse::conceptgroup=0;      $Apache::matchresponse::conceptgroup=0;
     &Apache::response::setrandomnumber();      &Apache::response::pushrandomnumber();
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result.=&Apache::edit::start_table($token)   $result.=&Apache::edit::start_table($token)
     ."<tr><td>Collection Of Foils</td><td>Delete:"      ."<tr><td>Collection Of Foils</td><td>Delete:"
Line 265  sub end_foilgroup { Line 266  sub end_foilgroup {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result=&Apache::edit::end_table();
     }      }
       &Apache::response::poprandomnumber();
     return $result;      return $result;
 }  }
   
Line 469  sub displayfoils { Line 471  sub displayfoils {
     $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 -2 mm\parbox{\textwidth}{\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]\parbox{\textwidth - 5 mm}{'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'}\end{enumerate}} \vskip -10 mm \strut ';      $question.='\vskip -1 mm\noindent\begin{enumerate}\item[\textbf{'.$internal_counter.'}.]'.&Apache::optionresponse::bubbles(\@used_letters,\@emptyItems).'\end{enumerate} \vskip -8 mm \strut ';
     $internal_counter++;      $internal_counter++;
         } else {          } else {
     $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";      $question.=' '.$optionlist.$text.'\strut\\\\\strut '."\n";
Line 487  sub displayfoils { Line 489  sub displayfoils {
     $result='<table><tr><td>'.$question.'</td><td>'.$result.      $result='<table><tr><td>'.$question.'</td><td>'.$result.
  '</td></tr></table>';   '</td></tr></table>';
  } else {   } else {
     $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}\end{tabular}';      my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
       $tabsize=~/(\d+\.?\d*)/;
       $tabsize=$1/2.1;
       $tabsize.=' mm ';
       $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}\end{tabular}';
  }   }
     } elsif ($result=&itemdisplay('left')) {      } elsif ($result=&itemdisplay('left')) {
  if ($target ne 'tex') {   if ($target ne 'tex') {
     $result='<table><tr><td>'.$result.'</td><td>'.$question.      $result='<table><tr><td>'.$result.'</td><td>'.$question.
  '</td></tr></table>';   '</td></tr></table>';
  } else {   } else {
     $result='\begin{tabular}{p{\textwidth/2}p{\textwidth/2}}\begin{minipage}{\textwidth/2}'.$result.'\end{minipage}&\begin{minipage}{\textwidth/2}'.$question.'\end{minipage}\end{tabular}';      my $tabsize=&Apache::londefdef::recalc($ENV{'form.textwidth'});
       $tabsize=~/(\d+\.?\d*)/;
       $tabsize=$1/2.1;
       $tabsize.=' mm ';
       $result='\setlength{\tabcolsep}{1 mm}\begin{tabular}{p{'.$tabsize.'}p{'.$tabsize.'}}\begin{minipage}{'.$tabsize.'}'.$result.'\end{minipage}&\begin{minipage}{'.$tabsize.'}'.$question.'\end{minipage}\end{tabular}';
  }   }
     }      }
     if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}      if ($target ne 'tex') {$result.="<br />";} else {$result.=' \\\\ ';}
Removed from v.1.38  
changed lines
  Added in v.1.41

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