--- loncom/homework/response.pm	2006/07/14 18:40:41	1.143
+++ loncom/homework/response.pm	2006/12/04 21:23:01	1.152
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.143 2006/07/14 18:40:41 albertel Exp $
+# $Id: response.pm,v 1.152 2006/12/04 21:23:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -306,7 +306,7 @@ sub handle_previous {
 }
 
 sub view_or_modify {
-    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+    my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
     my $myself=0;
     if ( ($name eq $env{'user.name'}) && ($domain eq $env{'user.domain'}) ) {
 	$myself=1;
@@ -340,7 +340,7 @@ sub end_dataresponse {
     if ( $target eq 'web' ) {
     } elsif ($target eq 'grade' ) {
 	if ( defined $env{'form.submitted'}) {
-	    my ($symb,$courseid,$domain,$name)=&Apache::lonxml::whichuser();
+	    my ($symb,$courseid,$domain,$name)=&Apache::lonnet::whichuser();
 	    my $allowed=&Apache::lonnet::allowed('mgr',$courseid);
 	    if ($allowed) {
 		&Apache::response::setup_params('dataresponse',$safeeval);
@@ -373,7 +373,7 @@ sub start_customresponse {
   	if (  &Apache::response::show_answer() ) {
 	    my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
 						   $safeeval);
-	    $Apache::inputtags::answertxt{$id}=$answer;
+	    $Apache::inputtags::answertxt{$id}=[$answer];
 	}
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
@@ -403,8 +403,11 @@ sub end_customresponse {
     my $id=$Apache::inputtags::response[-1];
     if ( $target eq 'grade' && &Apache::response::submitted() ) {
 	my $response = &Apache::response::getresponse();
-	if ( $response =~ /[^\s]/ && 
-	     $Apache::response::custom_answer_type eq 'loncapa/perl') {
+	if ($Apache::lonhomework::type eq 'exam' ||
+	    &Apache::response::submitted('scantron')) {
+	    &Apache::response::scored_response($part,$id);
+	} elsif ( $response =~ /[^\s]/ && 
+		  $Apache::response::custom_answer_type eq 'loncapa/perl') {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -429,6 +432,19 @@ sub end_customresponse {
 		    $error;
 	    }
 	}
+    } elsif ( $target eq 'answer') {
+	$result  = &Apache::response::answer_header('customresponse');
+	my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
+						$safeeval);
+	if ($env{'form.answer_output_mode'} ne 'tex') {
+	    $answer = '<b>'.$answer.'</b>';
+	}
+	$result .= &Apache::response::answer_part('customresponse',$answer);
+	$result .= &Apache::response::answer_footer('customresponse');
+    }
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
+	$target eq 'tex' || $target eq 'analyze') {
+	&Apache::lonxml::increment_counter(&Apache::response::repetition());
     }
     pop(@Apache::lonxml::namespace);
     &Apache::lonxml::deregister('Apache::response',('answer'));
@@ -448,12 +464,20 @@ sub start_mathresponse {
   	if (  &Apache::response::show_answer() ) {
 	    my $answer = &Apache::lonxml::get_param('answerdisplay',$parstack,
 						   $safeeval);
-	    $Apache::inputtags::answertxt{$id}=$answer;
+	    $Apache::inputtags::answertxt{$id}=[$answer];
 	}
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
 	$result.=&Apache::edit::text_arg('String to display for answer:',
 					 'answerdisplay',$token);
+	$result.=&Apache::edit::select_arg('Algebra System:',
+					   'cas',
+					   ['maxima'],
+					   $token);
+	$result.=&Apache::edit::text_arg('Algebra System:',
+					 'cas',$token);
+	$result.=&Apache::edit::text_arg('Argument Array:',
+					 'args',$token);
 	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag;
@@ -478,8 +502,7 @@ sub end_mathresponse {
     my $id=$Apache::inputtags::response[-1];
     if ( $target eq 'grade' && &Apache::response::submitted() ) {
 	my $response = &Apache::response::getresponse();
-	if ( $response =~ /[^\s]/ && 
-	     $Apache::response::custom_answer_type eq 'loncapa/perl') {
+	if ( $response =~ /[^\s]/ ) {
 	    if (!$Apache::lonxml::default_homework_loaded) {
 		&Apache::lonxml::default_homework_load($safeeval);
 	    }
@@ -670,9 +693,10 @@ sub setup_params {
 
 {
     my @answer_bits;
+    my $need_row_start;
 
 sub answer_header {
-    my ($type,$increment) = @_;
+    my ($type,$increment,$rows) = @_;
     my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {
 	undef(@answer_bits);
@@ -685,34 +709,58 @@ sub answer_header {
 	}
 	push(@answer_bits,$bit);
     } else {
+	my $td = '<td '.(defined($rows)?'rowspan="'.$rows.'"':'').'>';
 	$result  = '<table border="1"><tr>';
 	if ($Apache::lonhomework::type eq 'exam') {
-	    $result .= '<td>'.($Apache::lonxml::counter+$increment). ')</td>';
+	    $result .= $td.($Apache::lonxml::counter+$increment). ')</td>';
 	} else {
-	    $result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>';
+	    $result .= $td.&mt('Answer for Part: [_1]',
+			       $Apache::inputtags::part).'</td>';
 	}
 	$result .= "\n";
+	$need_row_start = 0;
+    }
+    return $result;
+}
+
+sub next_answer {
+    my ($type) = @_;
+    my $result;
+    if ($env{'form.answer_output_mode'} eq 'tex') {
+	# FIXME ... need to do something with tex mode
+    } else {
+	$result .= "</tr>";
+	$need_row_start = 1;
     }
     return $result;
 }
 
 sub answer_part {
-    my ($type,$answer) = @_;
+    my ($type,$answer,$args) = @_;
     my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {
-	my $to_use='|';
-	foreach my $value (32..126) {
-	    my $char=pack('c',$value);
-	    if ($answer !~ /\Q$char\E/) {
-		$to_use=$char;
-		last;
+	if (!$args->{'no_verbatim'}) {
+	    my $to_use='|';
+	    foreach my $value (32..126) {
+		my $char=pack('c',$value);
+		if ($answer !~ /\Q$char\E/) {
+		    $to_use=$char;
+		    last;
+		}
+	    }
+	    if ($answer ne '') {
+		$answer = '\verb'.$to_use.$answer.$to_use;
 	    }
 	}
 	if ($answer ne '') {
-	    push(@answer_bits,'\verb'.$to_use.$answer.$to_use);
+	    push(@answer_bits,$answer);
 	}
     } else {
-	$result = '<td>'.$answer.'</td>';
+	if ($need_row_start) {
+	    $result .= '<tr>';
+	    $need_row_start = 0;
+	}
+	$result .= '<td>'.$answer.'</td>';
     }
     return $result;
 }
@@ -735,7 +783,7 @@ sub answer_footer {
 
 sub showallfoils {
     if (defined($env{'form.showallfoils'})) {
-	my ($symb)=&Apache::lonxml::whichuser();
+	my ($symb)=&Apache::lonnet::whichuser();
 	if (($env{'request.state'} eq 'construct') || 
 	    ($env{'user.adv'} && $symb eq '')      ||
             ($Apache::lonhomework::viewgrades) ) {
@@ -957,7 +1005,7 @@ sub submitted {
 }
 
 sub add_to_gradingqueue {
-    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+    my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
     if (   $courseid eq ''
 	|| $symb eq ''
 	|| $env{'request.state'} eq 'construct'