Diff for /loncom/homework/response.pm between versions 1.185 and 1.188

version 1.185, 2007/11/13 22:21:46 version 1.188, 2008/03/06 16:28:20
Line 454  sub end_customresponse { Line 454  sub end_customresponse {
  &Apache::lonxml::increment_counter(&Apache::response::repetition(),   &Apache::lonxml::increment_counter(&Apache::response::repetition(),
    "$part.$id");     "$part.$id");
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
     &Apache::lonhomework::set_bubble_lines();      &Apache::lonhomework::set_bubble_lines();
  }   }
     }      }
Line 675  sub start_responseparam { Line 676  sub start_responseparam {
  $Apache::lonnet::packagetab{"$tag&$name&display"};   $Apache::lonnet::packagetab{"$tag&$name&display"};
     $token->[2]->{'default'}=      $token->[2]->{'default'}=
  $Apache::lonnet::packagetab{"$tag&$name&default"};   $Apache::lonnet::packagetab{"$tag&$name&default"};
               $token->[3] = ['name','type','description','default'];
     $constructtag=1;      $constructtag=1;
  }   }
  if ($constructtag) {   if ($constructtag) {
Line 788  sub next_answer { Line 790  sub next_answer {
   
 sub answer_part {  sub answer_part {
     my ($type,$answer,$args) = @_;      my ($type,$answer,$args) = @_;
       &Apache::lonxml::debug("In answerpart :$type:$answer:$args:");
   
     my $result;      my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  if (!$args->{'no_verbatim'}) {   if (!$args->{'no_verbatim'}) {
Line 799  sub answer_part { Line 803  sub answer_part {
     last;      last;
  }   }
     }      }
     if ($answer ne '') {              my $answerelements=$answer;
  $answer = '\verb'.$to_use.$answer.$to_use;              $answer='';
     }              foreach my $element (split(/[\;\:]/,$answerelements)) {
           if ($element ne '') {
       $answer.= '\noindent\verb'.$to_use.$element.$to_use.'\newline';
           }
               }
  }   }
  if ($answer ne '') {   if ($answer ne '') {
     push(@answer_bits,$answer);      push(@answer_bits,$answer);
Line 811  sub answer_part { Line 819  sub answer_part {
     $result .= '<tr>';      $result .= '<tr>';
     $need_row_start = 0;      $need_row_start = 0;
  }   }
  $result .= '<td>'.$answer.'</td>';          $answer=~s/\; /\<\/nobr\>\<br \/\>\<nobr\>/gs;
    $result .= '<td><nobr>'.$answer.'</nobr></td>';
     }      }
     return $result;      return $result;
 }  }
Line 820  sub answer_footer { Line 829  sub answer_footer {
     my ($type) = @_;      my ($type) = @_;
     my $result;      my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
  my $columns = scalar(@answer_bits);   my $columns = scalar(@answer_bits)-1;
  $result  = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline ';   $result  = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|'.'p{3cm}|'x$columns.'}\hline ';
  $result .= join(' & ',@answer_bits);   $result .= join(' & ',@answer_bits);
  $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';   $result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';
     } else {      } else {

Removed from v.1.185  
changed lines
  Added in v.1.188


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