--- loncom/homework/caparesponse/caparesponse.pm	2002/10/14 20:37:27	1.65
+++ loncom/homework/caparesponse/caparesponse.pm	2002/11/07 15:12:23	1.69
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.65 2002/10/14 20:37:27 albertel Exp $
+# $Id: caparesponse.pm,v 1.69 2002/11/07 15:12:23 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -157,7 +157,6 @@ sub end_numericalresponse {
       }
     }
   } elsif ($target eq 'web' || $target eq 'tex') {
-    if ($Apache::lonhomework::type ne 'exam') {
       my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
       my $status = $Apache::inputtags::status['-1'];
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
@@ -199,7 +198,7 @@ sub end_numericalresponse {
 	     $result.="}. \\vskip 0 mm ";
 	   }
        }
-    } else {
+      if ($Apache::lonhomework::type eq 'exam') {
       	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 	my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
 	my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
@@ -249,10 +248,10 @@ sub end_numericalresponse {
 	    if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {
 		$max_val=$1+$2+4;
 	    } else {
-		$max_val=5;
+		$max_val=4;
 	    }
-	    $max_val = int(90/(($max_val+6)*2));
-            my $celllength = 90/$max_val-12;
+	    $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));
+            my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;
 	    my @table_range = ();
 	    my $number_of_tables = int($number_of_bubbles/$max_val);
 	    for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}
@@ -262,17 +261,24 @@ sub end_numericalresponse {
 	    }
 	    my $j=0;
 	    my $cou=0;
-	    $result.='\vskip 2 mm \noindent ';
+	    $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
 	    for (my $i=0;$i<$number_of_tables;$i++) {
-		$result.='\vskip 0 mm \noindent \begin{tabular}{|';
+		$result.='\vskip -1 mm \noindent \begin{tabular}{';
 		for ($ind=0;$ind<$table_range[$j];$ind++) {
-		    $result.='lp{'.$celllength.' mm}|';
+		    $result.='lp{'.$celllength.' mm}';
 		}
-		$result.='}\hline';
+		$result.='}';
 		for ($ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
 		    my $ans;
 		    if ($formats[0] ne '') {
 			$ans = sprintf('%.'.$formats[0],$bubbles_values[$ind]);
+			if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
+			    my $number = $1;
+			    my $power = $2;
+			    $power=~s/^\+//;
+			    $power=~s/^(-?)0+(\d+)//;
+			    $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
+			} 
 		    } else {
 			my $badans = $bubbles_values[$ind];
 			my $format = ''; 
@@ -284,15 +290,24 @@ sub end_numericalresponse {
 			} elsif ($badans=~/^(\d*)$/) {
 			    $format = 'd';
 			}
-			$ans = sprintf('%.'.$format,$bubbles_values[$ind]);
+			$ans = sprintf('%.'.$format,$bubbles_values[$ind]);			
+			if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) {
+			    my $number = $1;
+			    my $power = $2;
+			    $power=~s/^\+//;
+			    $power=~s/^(-?)0+(\d+)//;
+			    $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
+			} 
 		    }
-		    $result.=' '.$alphabet[$ind].': & '.$ans.' ';
+		    $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} ';
 		    if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
 		}
 		$cou += $table_range[$j];
 		$j++;
-		$result.='\\\\\hline\end{tabular}\vskip 0 mm ';
-	    }	    
+		$result.='\\\\\end{tabular}\vskip 0 mm ';    
+	    }
+	    $result.='\end{enumerate}';
+	    &Apache::lonxml::increment_counter();
 	}
     }
   } elsif ($target eq 'edit') {