--- loncom/homework/caparesponse/caparesponse.pm	2004/02/05 21:04:24	1.127
+++ loncom/homework/caparesponse/caparesponse.pm	2004/02/19 21:49:33	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.127 2004/02/05 21:04:24 albertel Exp $
+# $Id: caparesponse.pm,v 1.132 2004/02/19 21:49:33 sakharuk 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];
@@ -254,18 +255,18 @@ sub end_numericalresponse {
 		}
 		if ($tag eq 'numericalresponse') {
 		    my ($celllength,$number_of_tables,@table_range)=
-			&get_table_sizes($formats[0],$number_of_bubbles);
+			&get_table_sizes($number_of_bubbles,\@bubble_values);
 		    my $j=0;
 		    my $cou=0;
 		    $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
 		    for (my $i=0;$i<$number_of_tables;$i++) {
 			$result.='\vskip -1 mm \noindent \begin{tabular}{';
 			for (my $ind=0;$ind<$table_range[$j];$ind++) {
-			    $result.='lp{'.$celllength.' mm}';
+			    $result.='p{3 mm}p{'.$celllength.' mm}';
 			}
 			$result.='}';
 			for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
-			    $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$bubble_values[$ind].'} ';
+			    $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_values[$ind].'} ';
 			    if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
 			}
 			$cou += $table_range[$j];
@@ -376,23 +377,40 @@ sub end_numericalresponse {
 }
 
 sub get_table_sizes {
-    my ($format,$number_of_bubbles)=@_;
-    my $max_val = 0;
-    if ($format=~m/^(\d+)E([^\d]*)(\d*)$/) {
-	$max_val=$1+$2+4;
+    my ($number_of_bubbles,$rbubble_values)=@_;
+    my $scale=2; #mm for one digit
+    my $cell_width=0;
+    foreach my $member (@$rbubble_values) {
+	my $cell_width_real=0;
+	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)+3)*$scale;
+	} else {
+	    $cell_width_real=(length($member)+1)*$scale;
+	}
+	if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
+    }
+    $cell_width+=8; 
+    my $textwidth;
+    if ($ENV{'form.textwidth'} ne '') {
+	$ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     } else {
-	$max_val=4;
+	$ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
+	$textwidth=$1.'.'.$2;
     }
-    $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));
-    my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;
+    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 = ();
-    my $number_of_tables = int($number_of_bubbles/$max_val);
-    for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$max_val;}
-    if ($number_of_bubbles % $max_val != 0) {
+    for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
+    if ($number_of_bubbles % $bubbles_per_line) {
 	$number_of_tables++;
-	push @table_range,($number_of_bubbles % $max_val);
+	push @table_range,($number_of_bubbles % $bubbles_per_line);
     }
-    return ($celllength,$number_of_tables,@table_range);
+    $cell_width-=8;
+    return ($cell_width,$number_of_tables,@table_range);
 }
 
 sub format_number {
@@ -514,16 +532,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();
     }
@@ -538,6 +558,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);
@@ -600,7 +621,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 />";
 	    }
 	}