--- loncom/homework/hint.pm	2002/01/24 04:18:54	1.25
+++ loncom/homework/hint.pm	2002/10/14 20:42:57	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.25 2002/01/24 04:18:54 harris41 Exp $
+# $Id: hint.pm,v 1.28 2002/10/14 20:42:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,7 +33,7 @@ use Apache::lonnet;
 use capa;
 
 BEGIN {
-  &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
+  &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint'));
 }
 
 
@@ -59,7 +59,7 @@ sub start_hintgroup {
       &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
     }
   } elsif ($target eq 'tex') {
-    $result .= '\noindent{\it Hint: }'; 
+    $result .= '\keephidden{'; 
   }
   @Apache::hint::which=();
   return $result;
@@ -81,6 +81,8 @@ sub end_hintgroup {
     }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::end_table();
+  } elsif ($target eq 'tex') {
+    $result .= '}'; 
   }
   @Apache::hint::which=();
   return $result;
@@ -95,13 +97,28 @@ sub start_numericalhint {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);
-    $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
-    $result.=&Apache::edit::text_arg('Format:','format',$token,4);
-    $result.='</td></tr><tr><td colspan="3">';
+    if ($token->[1] eq 'numericalhint') {
+      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
+      $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+    } elsif ($token->[1] eq 'stringhint') {
+      $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token);
+    } elsif ($token->[1] eq 'formulahint') {
+      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+    }
+    $result.=&Apache::edit::end_row();
+    $result.=&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
-    my $constructtag=
-      &Apache::edit::get_new_args($token,$parstack,$safeeval,
-				  'name','answer','unit', 'format');
+    my $constructtag;
+    if ($token->[1] eq 'numericalhint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','unit','format');
+    } elsif ($token->[1] eq 'stringhint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','type');
+    } elsif ($token->[1] eq 'formulahint') {
+      $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						'name','answer','samples');
+    }
     if ($constructtag) {
       $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();
@@ -148,6 +165,36 @@ sub end_numericalhint {
   return $result;
 }
 
+sub start_stringhint {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('stringhint');
+  } else {
+    $result.=&start_numericalhint(@_);
+  }
+  return $result;
+}
+
+sub end_stringhint {
+  return end_numericalhint(@_);
+}
+
+sub start_formulahint {
+  my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+  my $result;
+  if ($target eq 'meta') {
+    $result=&Apache::response::meta_package_write('formulahint');
+  } else {
+    $result.=&start_numericalhint(@_);
+  }
+  return $result;
+}
+
+sub end_formulahint {
+  return end_numericalhint(@_);
+}
+
 # a part shows if it is on, if no specific parts are on, then default shows
 sub start_hintpart {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -169,9 +216,10 @@ sub start_hintpart {
   } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
   } elsif ($target eq 'edit') {
-    $result.= &Apache::edit::tag_start($target,$token,
-				       &Apache::lonxml::description($token));
-    $result.= &Apache::edit::text_arg('On:','on',$token).'</td></tr><tr><td colspan="3">';
+    $result.= &Apache::edit::tag_start($target,$token);
+    $result.= &Apache::edit::text_arg('On:','on',$token);
+    $result.= &Apache::edit::end_row();
+    $result.= &Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
 						 'on');