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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.129 and 1.133

version 1.129, 2004/02/13 15:09:52 version 1.133, 2004/02/20 18:04:43
Line 385  sub get_table_sizes { Line 385  sub get_table_sizes {
  if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {   if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
     $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;      $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
  } elsif ($member=~/(\d*)\.?(\d*)/) {   } elsif ($member=~/(\d*)\.?(\d*)/) {
     $cell_width_real=(length($1)+length($2)+2)*$scale;      $cell_width_real=(length($1)+length($2)+3)*$scale;
  } else {   } else {
     $cell_width_real=(length($member)+1)*$scale;      $cell_width_real=(length($member)+1)*$scale;
  }   }
  if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}   if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
     }      }
     $cell_width+=8;      $cell_width+=8; 
     $ENV{'form.textwidth'}=~/(\d+)/;      my $textwidth;
     my $textwidth=$1;      if ($ENV{'form.textwidth'} ne '') {
    $ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
    $textwidth=$1.'.'.$2;
       } else {
    $ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
    $textwidth=$1.'.'.$2;
       }
     my $bubbles_per_line=int($textwidth/$cell_width);      my $bubbles_per_line=int($textwidth/$cell_width);
       if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==2)) {$bubbles_per_line=$number_of_bubbles/2;}
     my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);      my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
     my @table_range = ();      my @table_range = ();
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}      for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
Line 507  sub get_sigrange { Line 514  sub get_sigrange {
  }   }
  if (!$sig_ubound) { $sig_ubound=$sig_lbound; }   if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
     }      }
       if (($sig_ubound<$sig_lbound) ||
    ($sig_lbound > 15) ||
    ($sig =~/(\+|-)/ ) ) {
    my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
    if ($ENV{'request.state'} eq 'construct') {
       $errormsg.=
    &Apache::loncommon::help_open_topic('Significant_Figures');
    }
    &Apache::lonxml::error($errormsg);
       }
     return ($sig_ubound,$sig_lbound);      return ($sig_ubound,$sig_lbound);
 }  }
   
Line 529  sub start_stringresponse { Line 546  sub start_stringresponse {
     [['inline','Inline']],$token);      [['inline','Inline']],$token);
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  &Apache::edit::get_new_args($token,$parstack,         my $constructtag;
     $safeeval,'answer','type');         $constructtag=&Apache::edit::get_new_args($token,$parstack,
  my $answerdisplay=$ENV{'form.'.&Apache::edit::html_element_name('answerdisplay')};                                                   $safeeval,'answer',
  if ($answerdisplay) {                                                   'type','answerdisplay');
     $token->[2]->{'answerdisplay'}=$answerdisplay;         if ($constructtag) {
  } else {             $result = &Apache::edit::rebuild_tag($token);
     delete $token->[2]->{'answerdisplay'};             $result.=&Apache::edit::handle_insert();
  }         }
  $result = &Apache::edit::rebuild_tag($token);  
  $result.=&Apache::edit::handle_insert();  
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
     }      }
Removed from v.1.129  
changed lines
  Added in v.1.133

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