--- loncom/homework/caparesponse/caparesponse.pm	2004/08/23 19:34:52	1.152
+++ loncom/homework/caparesponse/caparesponse.pm	2004/10/05 20:18:29	1.153
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.152 2004/08/23 19:34:52 albertel Exp $
+# $Id: caparesponse.pm,v 1.153 2004/10/05 20:18:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,16 +103,9 @@ sub start_numericalresponse {
 		} else {
 		    $format=$formats[0];
 		}
-		my $formatted;
-		if ((defined($format)) && ($format ne '')) {
-		    $format=~s/e/E/g;
-		    &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
-		    $formatted=sprintf('%.'.$format,$answer).',';
-		} else {
-		    &Apache::lonxml::debug("no format answer :$answer:");
-		    $formatted="$answer,";
-		}
-		$answertxt.=$formatted;
+		my $formatted=&format_number($answer,$format,$target,
+					     $safeeval);
+		$answertxt.=$formatted.',';
 	    }
 	    chop $answertxt;
 	    if ($target eq 'web') {
@@ -155,7 +148,7 @@ sub end_numericalresponse {
 		    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
 		    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 		    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
-		    my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);
+		    my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);
 		    $response=$values[$response];
 		}
 		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
@@ -163,7 +156,7 @@ sub end_numericalresponse {
 		$$args_ref{'response'}=$response;
 		my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 
-		foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
+		foreach my $arg ('type','tol','sig','format','unit','calc',
 				 'samples') {
 		    $$args_ref{$arg}=
 			&Apache::lonxml::get_param($arg,$parstack,$safeeval);
@@ -235,7 +228,7 @@ sub end_numericalresponse {
 	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
 	    my @bubble_values=&make_numerical_bubbles($number_of_bubbles,
 						      $target,$answers[0],
-						      $formats[0],\@incorrect);
+						      $formats[0],\@incorrect,$safeeval);
 	    my @alphabet=('A'..'Z');
 	    if ($target eq 'web') {
 		if ($tag eq 'numericalresponse') {
@@ -331,10 +324,10 @@ sub end_numericalresponse {
 	    }
 	    if ($fmt && $tag eq 'numericalresponse') {
 		$fmt=~s/e/E/g;
-		$ans = sprintf('%.'.$fmt,$ans);
+		$ans = &format_number($ans,$fmt,$target,$safeeval);
 		if ($high) {
-		    $high=sprintf('%.'.$fmt,$high);
-		    $low =sprintf('%.'.$fmt,$low);
+		    $high=&format_number($high,$fmt,$target,$safeeval);
+		    $low =&format_number($low,$fmt,$target,$safeeval);
 		}
 	    }
 	    if ($target eq 'answer') {
@@ -428,13 +421,9 @@ sub get_table_sizes {
 }
 
 sub format_number {
-    my ($number,$format,$target)=@_;
+    my ($number,$format,$target,$safeeval)=@_;
     my $ans;
-    if ($format ne '') {
-	$format=~s/e/E/g;
-	$ans = sprintf('%.'.$format,$number);
-    } else {
-	my $format = '';
+    if ($format eq '') {
 	#What is the number? (integer,decimal,floating point)
 	if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
 	    $format = '3e';
@@ -443,22 +432,13 @@ sub format_number {
 	} elsif ($number=~/^(\d*)$/) {
 	    $format = 'd';
 	}
-	$ans = sprintf('%.'.$format,$number);
-    }
-    if ($target eq 'tex') {
-	if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
-	    my $number = $1;
-	    my $power = $2;
-	    $power=~s/^\+//;
-	    $power=~s/^(-?)0+(\d+)/$1$2/;
-	    $ans=$number.'$\times 10^{'.$power.'}$'; #'stupidemacs
-	}
     }
+    $ans=&Apache::run::run("&prettyprint(q\0$number\0,q\0$format\0,q\0$target\0)",$safeeval);
     return $ans;
 }
 
 sub make_numerical_bubbles {
-    my ($number_of_bubbles,$target,$answer,$format,$incorrect) =@_;
+    my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_;
     my @bubble_values = ();
     &Apache::lonxml::debug("answer is $answer incorrect is $incorrect");
     my @oldseed=&Math::Random::random_get_seed();
@@ -475,7 +455,7 @@ sub make_numerical_bubbles {
 	    &Math::Random::random_set_seed(@oldseed);
 	    if (defined($format) && $format ne '') {
 		foreach my $value (@bubble_values) {
-		    $value=&format_number($value,$format,$target);
+		    $value=&format_number($value,$format,$target,$safeeval);
 		}
 	    }
 	    return @bubble_values;
@@ -495,7 +475,7 @@ sub make_numerical_bubbles {
     for ($ind=0;$ind<$number_of_bubbles;$ind++) {
 	$bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind]));
 	$bubble_values[$ind] = &format_number($bubble_values[$ind],
-					       $format,$target);
+					       $format,$target,$safeeval);
 
     }
     &Math::Random::random_set_seed(@oldseed);