--- loncom/homework/hint.pm	2005/08/26 18:57:25	1.60
+++ loncom/homework/hint.pm	2006/03/07 22:42:47	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # implements the tags that control the hints
 #
-# $Id: hint.pm,v 1.60 2005/08/26 18:57:25 albertel Exp $
+# $Id: hint.pm,v 1.62 2006/03/07 22:42:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,7 +57,7 @@ sub start_hintgroup {
 	if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) ||
 	     ( $numtries < $hinttries) ) {
 	    &Apache::lonxml::debug("Grabbin all");
-	    &Apache::lonxml::get_all_text("/hintgroup",$parser);
+	    &Apache::lonxml::get_all_text("/hintgroup",$parser,$style);
 	}
 	&Apache::lonxml::startredirection;
     } elsif ($target eq 'tex') {
@@ -94,7 +94,7 @@ sub end_hintgroup {
 		$hinttext.'</td></tr></table>';
 	}
     } elsif ($target eq 'edit') {
-	$result.=&Apache::edit::end_table();
+	$result.=&Apache::edit::end_row().&Apache::edit::end_table();
     } elsif ($target eq 'tex') {
 	$result .= '}';
     }
@@ -201,7 +201,7 @@ sub end_numericalhint {
     } elsif ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write($token->[1]);
     } elsif ($target eq 'edit') {
-	$result.='</td></tr>'.&Apache::edit::end_table;
+	$result.=&Apache::edit::end_row().&Apache::edit::end_table();
     }
     &Apache::response::end_hintresponse();
     return $result;
@@ -300,7 +300,7 @@ sub end_stringhint {
     } elsif ($target eq 'meta') {
 	$result=&Apache::response::meta_package_write($token->[1]);
     } elsif ($target eq 'edit') {
-	$result.='</td></tr>'.&Apache::edit::end_table;
+	$result.=&Apache::edit::end_row().&Apache::edit::end_table();
     }
     &Apache::response::end_hintresponse();
     return $result;
@@ -322,10 +322,10 @@ sub start_hintpart {
 	    foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
 	}
 	if (!$show) {
-	    &Apache::lonxml::get_all_text("/hintpart",$parser);
+	    &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
 	}
     } elsif ($target eq 'grade') {
-	&Apache::lonxml::get_all_text("/hintpart",$parser);
+	&Apache::lonxml::get_all_text("/hintpart",$parser,$style);
     } elsif ($target eq 'edit') {
 	$result.= &Apache::edit::tag_start($target,$token);
 	$result.= &Apache::edit::text_arg('On:','on',$token);
@@ -345,7 +345,9 @@ sub start_hintpart {
 sub end_hintpart {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
-    if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+    if ($target eq 'edit') {
+	$result.=&Apache::edit::end_row().&Apache::edit::end_table();
+    }
     return $result;
 }
 
@@ -386,6 +388,7 @@ sub end_optionhint {
 	my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
 	if ($answer) {
 	    eval('%answer ='.$answer);
+	    &Apache::lonxml::debug("answwer hash");
 	    &Apache::lonhomework::showhash(%answer);
 	    my $response = $Apache::lonhomework::history{
 				            "resource.$part_id.submission"};
@@ -421,8 +424,9 @@ sub end_optionhint {
 	     ($foilmatch    eq '-1' || $foilmatch    eq '1') ) {
 	    push(@Apache::hint::which,$name);
 	}
-    } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
-    if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+    } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::end_row().&Apache::edit::end_table();
+    }
     &Apache::response::end_hintresponse();
     return $result;
 }
@@ -486,7 +490,9 @@ sub end_radiobuttonhint {
 		}
 	    }
 	}
-    } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }
+    } elsif ($target eq 'edit') {
+	$result.=&Apache::edit::end_row().&Apache::edit::end_table();
+    }
     &Apache::response::end_hintresponse();
     return $result;
 }