Diff for /loncom/homework/matchresponse.pm between versions 1.18 and 1.19

version 1.18, 2003/05/16 20:16:18 version 1.19, 2003/06/30 20:23:33
Line 144  sub end_itemgroup { Line 144  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{tabular}{ll} ';   my $table=' \\\\\\\\ \begin{description} ';
  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;
     $table.=' '.$alphabet[$i].' & '.      $table.='\item['.$alphabet[$i].'] '.
  $Apache::response::itemgroup{$name.'.text'}.   $Apache::response::itemgroup{$name.'.text'}.
     ' \\\\ ';      ' \\\\ ';
     $i++;      $i++;
  }   }
  $table.=' \end{tabular} \\\\ ';   $table.=' \end{description} \strut \\\\ ';
  $Apache::matchresponse::itemtable{'display'}=$table;   $Apache::matchresponse::itemtable{'display'}=$table;
     }      }
     return $result;      return $result;
Line 408  sub displayfoils { Line 408  sub displayfoils {
     if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}      if ($target ne 'tex') {$optionlist.="<option>$option</option>\n";}
  }   }
     }      }
     if ($target ne 'tex') {      if ($target ne 'tex' && $Apache::lonhomework::type ne 'exam') {
         $optionlist='<select name="HWVAL_'.          $optionlist='<select name="HWVAL_'.
     $Apache::inputtags::response[-1].':'.$temp.'">'.      $Apache::inputtags::response[-1].':'.$temp.'">'.
         $optionlist."</select>\n";          $optionlist."</select>\n";
     }      }
     my $text=$Apache::response::foilgroup{$name.'.text'};      my $text=$Apache::response::foilgroup{$name.'.text'};
     if ($target ne 'tex') {      if ($target ne 'tex') {
  $question.='<br />'.$optionlist.$text."\n";   if ($Apache::lonhomework::type ne 'exam') {
       $question.='<br />'.$optionlist.$text."\n";
    } else {
       $question.='<br />'.$text."\n";
    }
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters);      $question.=&Apache::optionresponse::webbubbles(\@used_letters,\@used_letters,$temp);
  }   }
     } else {      } else {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
Line 567  sub end_foil { Line 571  sub end_foil {
  && !&Apache::response::showallfoils() ) {   && !&Apache::response::showallfoils() ) {
  push @{ $Apache::response::conceptgroup{'names'} }, $name;   push @{ $Apache::response::conceptgroup{'names'} }, $name;
  $Apache::response::conceptgroup{"$name.value"} = $value;   $Apache::response::conceptgroup{"$name.value"} = $value;
  if ($target eq 'tex') {   if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
     $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;      $Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
  } else {   } else {
     $Apache::response::conceptgroup{"$name.text"} = $text;      $Apache::response::conceptgroup{"$name.text"} = $text;
Line 577  sub end_foil { Line 581  sub end_foil {
  push @{ $Apache::response::foilgroup{'names'} }, $name;   push @{ $Apache::response::foilgroup{'names'} }, $name;
  $Apache::response::foilgroup{"$name.value"} = $value;   $Apache::response::foilgroup{"$name.value"} = $value;
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;      if ($target eq 'tex') {
    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
       } else {
    $Apache::response::foilgroup{"$name.text"} = $text;
       }
  } else {   } else {
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;   $Apache::response::foilgroup{"$name.text"} = ' $\triangleright$ '.$text;

Removed from v.1.18  
changed lines
  Added in v.1.19


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