--- loncom/homework/caparesponse/caparesponse.pm	2004/02/19 19:24:38	1.126.2.1
+++ loncom/homework/caparesponse/caparesponse.pm	2004/02/20 18:04:43	1.133
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.126.2.1 2004/02/19 19:24:38 albertel Exp $
+# $Id: caparesponse.pm,v 1.133 2004/02/20 18:04:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@
 package Apache::caparesponse;
 use strict;
 use capa;
+use Apache::lonlocal;
 
 BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
@@ -179,7 +180,7 @@ sub end_numericalresponse {
 	    my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
 						    $safeeval);
 	    if ($target eq 'web') {
-		$result="<br />The correct answer is ";
+		$result="<br />".&mt('The correct answer is')." ";
 	    }
 	    for (my $i=0; $i <= $#answers; $i++) {
 		my $answer=$answers[$i];
@@ -384,22 +385,23 @@ sub get_table_sizes {
 	if ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
 	    $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
 	} elsif ($member=~/(\d*)\.?(\d*)/) {
-	    $cell_width_real=(length($1)+length($2)+2)*$scale;
+	    $cell_width_real=(length($1)+length($2)+3)*$scale;
 	} else {
 	    $cell_width_real=(length($member)+1)*$scale;
 	}
 	if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
     }
-    $cell_width+=8;
+    $cell_width+=8; 
     my $textwidth;
     if ($ENV{'form.textwidth'} ne '') {
-	$ENV{'form.textwidth'}=~/(\d+)/;
-	$textwidth=$1;
+	$ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     } else {
-	$ENV{'textwidth'}=~/(\d+)/;
-	$textwidth=$1;
+	$ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     }
     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 @table_range = ();
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
@@ -459,7 +461,10 @@ sub make_numerical_bubbles {
 	    &Math::Random::random_set_seed(@oldseed);
 	    return @bubble_values;
 	}
-	#FIXME what to do when not enough incorrects specified?
+	if (defined($$incorrect[0]) &&
+	    scalar(@$incorrect)+1 < $number_of_bubbles) {
+	    &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them.");
+	}
     }
     my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
     my @powers = (1..$number_of_bubbles);
@@ -509,6 +514,16 @@ sub get_sigrange {
 	}
 	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);
 }
 
@@ -527,16 +542,18 @@ sub start_stringresponse {
 			 [['cs','Case Sensitive'],['ci','Case Insensitive'],
 			  ['mc','Case Insensitive, Any Order'],
 			  ['re','Regular Expression']],$token);
+	$result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',
+					    [['inline','Inline']],$token);
 	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
-	my $constructtag;
-	$constructtag=&Apache::edit::get_new_args($token,$parstack,
-						  $safeeval,'answer',
-						  'type');
-	if ($constructtag) {
-	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
-	}
+       my $constructtag;
+       $constructtag=&Apache::edit::get_new_args($token,$parstack,
+                                                 $safeeval,'answer',
+                                                 'type','answerdisplay');
+       if ($constructtag) {
+           $result = &Apache::edit::rebuild_tag($token);
+           $result.=&Apache::edit::handle_insert();
+       }
     } elsif ($target eq 'answer' || $target eq 'grade') {
 	&Apache::response::reset_params();
     }
@@ -551,6 +568,7 @@ sub end_stringresponse {
     my $id=$Apache::inputtags::response[-1];
     my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
     my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
+    my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);
     &Apache::lonxml::debug("current $answer ".$token->[2]);
     if (!$Apache::lonxml::default_homework_loaded) {
 	&Apache::lonxml::default_homework_load($safeeval);
@@ -613,7 +631,8 @@ sub end_stringresponse {
 	my $status = $Apache::inputtags::status['-1'];
 	if (  &Apache::response::show_answer() ) {
 	    if ($target eq 'web') {
-		$result="<br />The correct answer is ".$answer;
+		$result=($answerdisplay eq 'inline'?'':"<br />".&mt('The correct answer is')." ")
+		    .$answer;
 #		    join(', ',@answers).".<br />";
 	    }
 	}