--- loncom/homework/inputtags.pm	2004/03/26 20:10:42	1.137
+++ loncom/homework/inputtags.pm	2004/04/27 13:52:45	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.137 2004/03/26 20:10:42 albertel Exp $
+# $Id: inputtags.pm,v 1.140 2004/04/27 13:52:45 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,7 +118,7 @@ sub start_textfield {
 	$Apache::lonxml::evaluate--;
 	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
 	    my $partid=$Apache::inputtags::part;
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"});
+	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$resid.submission"},'<>&"');
 	    my $cols = &Apache::lonxml::get_param('cols',$parstack,$safeeval);
 	    if ( $cols eq '') { $cols = 80; }
 	    my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
@@ -210,7 +210,7 @@ sub start_textline {
 	    if ($size eq '') { $size=20; } else {
 		if ($size < 20) { $maxlength=$size; }
 	    }
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
+	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
 	    if ($Apache::lonhomework::type ne 'exam') {
 		my $addchars=&Apache::lonxml::get_param('addchars',$parstack,$safeeval);
 		$result='';
@@ -257,7 +257,7 @@ sub start_hiddenline {
 	if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
 	    my $partid=$Apache::inputtags::part;
 	    my $id=$Apache::inputtags::response[-1];
-	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
+	    my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"},'<>&"');
 	    if ($Apache::lonhomework::type ne 'exam') {
 		$result= '<input type="hidden" name="HWVAL_'.$id.'" value="'.
 		    $oldresponse.'" />';
@@ -421,19 +421,17 @@ sub decideoutput {
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_INVALID_STUDENT') {
-	$message = &mt('Unable to interpret units. Computer reads units as "[_1]"',
-		       $awardmsg);
+	$message = &mt('Unable to interpret units. Computer reads units as "[_1]"','<tt>'.$awardmsg.'</tt>');
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_FAIL' || $award eq 'UNIT_IRRECONCIBLE') {
-	$message = &mt('Units incorrect. Computer reads units as "[_1]"',
-		       $awardmsg);
+	$message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.','<tt>'.$awardmsg.'</tt>');
 	if ($target ne 'tex') {$message.=&Apache::loncommon::help_open_topic('Physical_Units');} 
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'UNIT_NOTNEEDED') {
-	$message = &mt('Only a number required. Computer reads units of "[_1]"',$awardmsg);
+	$message = &mt('Only a number required. Computer reads units of "[_1]"','<tt>'.$awardmsg.'</tt>');
 	$bgcolor=$possiblecolors{'not_charged_try'};
 	$button=1;
     } elsif ($award eq 'NO_UNIT') {