--- loncom/homework/hint.pm	2007/05/23 22:36:21	1.68
+++ loncom/homework/hint.pm	2009/04/17 01:00:15	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.68 2007/05/23 22:36:21 albertel Exp $
+# $Id: hint.pm,v 1.75 2009/04/17 01:00:15 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,8 @@
 # http://www.lon-capa.org/
 #
 
+
+
 package Apache::hinttags; 
 
 use strict;
@@ -33,6 +35,7 @@ use Apache::lonnet();
 use capa;
 use Apache::caparesponse();
 use Apache::lonmaxima();
+use Apache::lonr();
 use Apache::response();
 use Apache::lonlocal;
 use Storable qw(dclone);
@@ -68,7 +71,7 @@ sub start_hintgroup {
 	$result .= '\keephidden{';
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
-	$result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]],$token);
+	$result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',['no','yes'],$token);
 	$result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'showoncorrect');
@@ -160,7 +163,7 @@ sub end_numericalhint {
 
 	my $partid=$Apache::inputtags::part;
 	my $id=$Apache::inputtags::hint[-1];
-	#id submissions occured under
+	#id submissions occurred under
 	my $submitid=$Apache::inputtags::response[-1];
 
 	my $response = $Apache::lonhomework::history{
@@ -242,7 +245,7 @@ sub start_mathhint {
         $result.=&Apache::edit::text_arg('Name:','name',$token);
         $result.=&Apache::edit::select_arg('Algebra System:',
                                            'cas',
-                                           ['maxima'],
+                                           ['maxima','R'],
                                            $token);
         $result.=&Apache::edit::text_arg('Argument Array:',
                                          'args',$token);
@@ -280,6 +283,10 @@ sub end_mathhint {
 	    my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
 	    $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);
 	}
+        if ($cas eq 'R') {
+            my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
+            $award=&Apache::lonr::r_run($Apache::response::custom_answer[-1],$response,$args);
+        }
         if ($award eq 'EXACT_ANS' || $award eq 'APPROX_ANS') {
             push (@Apache::hint::which,$name);
         }
@@ -395,7 +402,7 @@ sub end_stringhint {
 	&Apache::response::setup_params('stringhint',$safeeval);
 	my $partid=$Apache::inputtags::part;
 	my $id=$Apache::inputtags::hint[-1];
-	#id submissions occured under
+	#id submissions occurred under
 	my $submitid=$Apache::inputtags::response[-1];
 	my $response = $Apache::lonhomework::history{
 			    "resource.$partid.$submitid.submission"};
@@ -422,6 +429,9 @@ sub end_stringhint {
 	    my $args_ref = 
 		&Apache::caparesponse::setup_capa_args($safeeval,$parstack,
 						       \@args,$response);
+            if ($$args_ref{'type'} eq '') {
+                $$args_ref{'type'} = 'ci';
+            }
 	    &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);
 	    my (@final_awards,@final_msgs,@ans_names);
 	    my %answer = &Apache::caparesponse::get_answer();
@@ -530,7 +540,7 @@ sub end_optionhint {
 	my ($foilmatch,$conceptmatch)=(-1,-1);
 	my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
 	my $partid=$Apache::inputtags::part;
-	#id submissions occured under
+	#id submissions occurred under
 	my $submitid=$Apache::inputtags::response[-1];
 	my $part_id="$partid.$submitid";
 	my %answer;
@@ -610,7 +620,7 @@ sub end_radiobuttonhint {
 	my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
 	eval('@answer ='.$answer);
 	my $partid=$Apache::inputtags::part;
-	#id submissions occured under
+	#id submissions occurred under
 	my $submitid=$Apache::inputtags::response[-1];
 	my $part_id="$partid.$submitid";
 	my $response = $Apache::lonhomework::history{
@@ -646,3 +656,59 @@ sub end_radiobuttonhint {
 }
 1;
 __END__
+
+
+=head1 NAME
+
+Apache::hinttags
+
+=head1 SYNOPSIS
+
+This handler coordinates the delivery of hints to students working on LON-CAPA problems and assignments.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 SUBROUTINES
+
+=over
+
+=item start_hintgroup()
+
+=item end_hintgroup()
+
+=item start_numericalhint()
+
+=item end_numericalhint()
+
+=item start_formulahint()
+
+=item end_formulahint()
+
+=item start_mathhint()
+
+=item end_mathhint()
+
+=item start_customhint()
+
+=item end_customhint()
+
+=item start_stringhint()
+
+=item end_stringhint()
+
+=item start_hintpart()
+
+=item end_hintpart()
+
+=item start_optionhint()
+
+=item end_optionhint()
+
+=item start_radiobuttonhint()
+
+=item end_radiobuttonhint()
+
+=back
+
+=cut