--- loncom/homework/response.pm	2008/03/06 16:28:20	1.188
+++ loncom/homework/response.pm	2008/09/11 14:47:17	1.204
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.188 2008/03/06 16:28:20 www Exp $
+# $Id: response.pm,v 1.204 2008/09/11 14:47:17 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -486,6 +486,7 @@ sub start_mathresponse {
 						   $safeeval);
 	    $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:',
@@ -495,12 +496,16 @@ sub start_mathresponse {
 					   ['maxima'],
 					   $token);
 	$result.=&Apache::edit::text_arg('Argument Array:',
-					 'args',$token);
+					 'args',$token).
+                 &Apache::loncommon::help_open_topic('Maxima_Argument_Array');
+        $result.=&Apache::edit::text_arg('Libraries:',
+                                         'libraries',$token).
+                 &Apache::loncommon::help_open_topic('Maxima_Libraries');
 	$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,'answerdisplay','cas','args');
+						  $safeeval,'answerdisplay','cas','args','libraries');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
 	}
@@ -512,6 +517,23 @@ sub start_mathresponse {
     return $result;
 }
 
+sub edit_mathresponse_button {
+    my ($id,$field)=@_;
+    my $button=&mt('Edit Answer');
+#    my $helplink=&Apache::loncommon::help_open_topic('Formula_Editor');
+    my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
+    return(<<ENDFORMULABUTTON);
+<script language="JavaScript">
+function edit_${id}_${field} (textarea) {
+    thenumber = textarea;
+    thedata = document.forms['lonhomework'].elements[textarea].value;
+    newwin = window.open("/adm/dragmath/applet/MaximaPopup.html","","width=565,height=400,resizable");
+}
+</script>
+<a href="javascript:edit_${id}_${field}('${field}');void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$button' title='$button'/></a>
+ENDFORMULABUTTON
+}
+
 sub end_mathresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
@@ -532,7 +554,8 @@ sub end_mathresponse {
 	    my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
             if ($cas eq 'maxima') {
                 my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
-                $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);
+                $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args,
+                                                      &Apache::lonxml::get_param('libraries',$parstack,$safeeval));
             }
 	    if (!&Apache::inputtags::valid_award($award)) {
 		$error = $award;
@@ -549,6 +572,12 @@ sub end_mathresponse {
     }
     if ($target eq 'web') {
 	&setup_prior_tries_hash(\&format_prior_response_math);
+        my $partid = $Apache::inputtags::part;
+        my $id = $Apache::inputtags::response[-1];
+        if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')
+           && (&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoneditor') ne 'no')) {
+            $result.=&edit_mathresponse_button($id,"HWVAL_$id");
+        }
     }
 
     pop(@Apache::lonxml::namespace);
@@ -790,8 +819,6 @@ sub next_answer {
 
 sub answer_part {
     my ($type,$answer,$args) = @_;
-    &Apache::lonxml::debug("In answerpart :$type:$answer:$args:");
-
     my $result;
     if ($env{'form.answer_output_mode'} eq 'tex') {
 	if (!$args->{'no_verbatim'}) {
@@ -803,12 +830,12 @@ sub answer_part {
 		    last;
 		}
 	    }
-            my $answerelements=$answer;
+            my $fullanswer=$answer;
             $answer='';
-            foreach my $element (split(/[\;\:]/,$answerelements)) {
-	        if ($element ne '') {
-		    $answer.= '\noindent\verb'.$to_use.$element.$to_use.'\newline';
-	        }
+            foreach my $element (split(/[\;]/,$fullanswer)) {
+	       if ($element ne '') {
+	 	  $answer.= '\verb'.$to_use.$element.$to_use.' \newline';
+	       }
             }
 	}
 	if ($answer ne '') {
@@ -819,8 +846,7 @@ sub answer_part {
 	    $result .= '<tr>';
 	    $need_row_start = 0;
 	}
-        $answer=~s/\; /\<\/nobr\>\<br \/\>\<nobr\>/gs;
-	$result .= '<td><nobr>'.$answer.'</nobr></td>';
+	$result .= '<td>'.$answer.'</td>';
     }
     return $result;
 }
@@ -829,10 +855,12 @@ 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 \noindent \begin{tabular}{|p{1.5cm}|'.'p{3cm}|'x$columns.'}\hline ';
-	$result .= join(' & ',@answer_bits);
-	$result .= ' \\\\ \\hline \end{tabular} \vskip 0 mm ';
+	$result  = ' \vskip 0 mm \noindent \begin{tabular}{|p{1.5cm}|p{6.8cm}|}\hline ';
+	$result .= $answer_bits[0].'&\vspace*{-4mm}\begin{itemize}';
+        for (my $i=1;$i<=$#answer_bits;$i++) {
+            $result.='\item '.$answer_bits[$i].'\vspace*{-7mm}';
+        }
+	$result .= ' \end{itemize} \\\\ \hline \end{tabular} \vskip 0 mm ';
     } else {
 	if (!$need_row_start) {
 	    $result .= '</tr>';
@@ -1164,7 +1192,7 @@ sub submitted {
     }
     # Submit All button on a .page was pressed
     if (defined($env{'form.all_submit'})) { return 1; }
-    # otherwise no submission occured
+    # otherwise no submission occurred
     return 0;
 }