--- loncom/homework/response.pm	2005/12/06 09:29:34	1.132
+++ loncom/homework/response.pm	2006/06/19 16:15:53	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.132 2005/12/06 09:29:34 albertel Exp $
+# $Id: response.pm,v 1.139 2006/06/19 16:15:53 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -32,13 +32,12 @@ use Apache::lonlocal;
 use Apache::lonnet;
 
 BEGIN {
-    &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse'));
+    &Apache::lonxml::register('Apache::response',('responseparam','parameter','dataresponse','customresponse','mathresponse'));
 }
 
 sub start_response {
     my ($parstack,$safeeval)=@_;
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+    my $id = &Apache::lonxml::get_id($parstack,$safeeval);
     if ($#Apache::inputtags::import > -1) {
 	&Apache::lonxml::debug("Turning :$id: into");
 	$id = join('_',@Apache::inputtags::import).'_'.$id;
@@ -69,8 +68,7 @@ sub end_response {
 
 sub start_hintresponse {
     my ($parstack,$safeeval)=@_;
-    my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if ($id eq '') { $id = $Apache::lonxml::curdepth; }
+    my $id = &Apache::lonxml::get_id($parstack,$safeeval);
     push (@Apache::inputtags::hint,$id);
     push (@Apache::inputtags::hintlist,$id);
     push (@Apache::inputtags::paramstack,[%Apache::inputtags::params]);
@@ -436,6 +434,23 @@ sub end_customresponse {
     return $result;
 }
 
+sub start_mathresponse {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ($target eq 'meta') {
+        &Apache::response::start_response($parstack,$safeeval);
+        $result=&Apache::response::meta_package_write('mathresponse');
+        &Apache::response::end_response();
+    } else {
+#       $result.=&start_numericalresponse(@_);
+    }
+    return $result;
+}
+
+sub end_mathresponse {
+#    return end_numericalresponse(@_);
+}
+
 sub start_answer {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
@@ -596,14 +611,22 @@ sub setup_params {
     my @answer_bits;
 
 sub answer_header {
-    my ($type) = @_;
+    my ($type,$increment) = @_;
     my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {
 	undef(@answer_bits);
+	my $bit;
+	if ($Apache::lonhomework::type eq 'exam') {
+	    $bit = ($Apache::lonxml::counter+$increment).') ';
+	} else {
+	    $bit .= ' Answer for Part: \verb|'.
+		$Apache::inputtags::part.'| ';
+	}
+	push(@answer_bits,$bit);
     } else {
 	$result  = '<table border="1"><tr>';
 	if ($Apache::lonhomework::type eq 'exam') {
-	    $result .= '<td>'.$Apache::lonxml::counter. ')</td>';
+	    $result .= '<td>'.($Apache::lonxml::counter+$increment). ')</td>';
 	} else {
 	    $result .= '<td>Answer for Part:'.$Apache::inputtags::part.'</td>';
 	}
@@ -637,17 +660,9 @@ sub answer_footer {
     my ($type) = @_;
     my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {
-	my $columns = scalar(@answer_bits)+1;
-	$result = ' \vskip 0 mm \begin{tabular}{|'.'c|'x$columns.'}\hline ';
-	if ($Apache::lonhomework::type eq 'exam') {
-	    $result .= 	$Apache::lonxml::counter.') ';
-	} else {
-	    $result .= ' Answer for Part: \verb|'.
-		$Apache::inputtags::part.'| ';
-	}
-	foreach my $bit (@answer_bits) {
-	    $result.=' & '.$bit;
-	}
+	my $columns = scalar(@answer_bits);
+	$result  = ' \vskip 0 mm \noindent \begin{tabular}{|'.'c|'x$columns.'}\hline ';
+	$result .= join(' & ',@answer_bits);
 	$result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';
     } else {
 	$result = '</tr></table>';
@@ -884,7 +899,8 @@ sub add_to_gradingqueue {
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     if (   $courseid eq ''
 	|| $symb eq ''
-	|| $env{'request.state'} eq 'construct') {
+	|| $env{'request.state'} eq 'construct'
+	|| $Apache::lonhomework::type ne 'problem') {
 	return;
     }