--- loncom/homework/inputtags.pm 2004/11/06 01:11:38 1.154
+++ loncom/homework/inputtags.pm 2005/01/31 22:00:40 1.156
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.154 2004/11/06 01:11:38 albertel Exp $
+# $Id: inputtags.pm,v 1.156 2005/01/31 22:00:40 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -439,17 +439,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]".',&markup_unit($awardmsg,$target));
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('Incompatible units. No conversion found between "[_1]" and the required units.',''.$awardmsg.'');
+ $message = &mt('Incompatible units. No conversion found between "[_1]" and the required units.',&markup_unit($awardmsg,$target));
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]".',&markup_unit($awardmsg,$target));
$bgcolor=$possiblecolors{'not_charged_try'};
$button=1;
} elsif ($award eq 'NO_UNIT') {
@@ -502,6 +502,15 @@ sub decideoutput {
return ($button,$bgcolor,$message,$previousmsg);
}
+sub markup_unit {
+ my ($unit,$target)=@_;
+ if ($target eq 'tex') {
+ return '\texttt{'.&Apache::lonxml::latex_special_symbols($unit).'}';
+ } else {
+ return "".$unit."";
+ }
+}
+
sub removealldata {
my ($id)=@_;
foreach my $key (keys(%Apache::lonhomework::results)) {
@@ -751,7 +760,7 @@ sub gradestatus {
if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {$showbutton = 0;}
if ( $showbutton ) {
if ($target ne 'tex') {
- $button = '';
+ $button = '';
}
}
if ($Apache::lonhomework::history{"resource.$id.afterduedate"}) {