--- loncom/homework/default_homework.lcpm	2000/10/30 20:36:18	1.9
+++ loncom/homework/default_homework.lcpm	2000/11/22 00:00:54	1.11
@@ -5,10 +5,10 @@
 $RANDOMINIT=0;
 
 sub caparesponse_check {
-  my $answer='';
-  my $type='';
-  my $tol_type='';
-  my $tolerance='';
+  my $answer='';  #done
+  my $type='';    #done
+  my $tol_type=''; # gets it's value from whether tol has a % or not done
+  my $tol='';     #done
   my $sig_lbound='';
   my $sig_ubound='';
   my $ans_fmt='';
@@ -16,8 +16,8 @@ sub caparesponse_check {
   my $calc='';
   my ($response,$expr)=@_;
   
-  ($answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$ans_fmt,
-   $units,$calc) = eval $expr.'return $answer,$type,$tol_type,$tolerance,$sig_lbound,$sig_ubound,$ans_fmt,$units,$calc';
+  ($answer,$type,$tol,$sig_lbound,$sig_ubound,$ans_fmt,
+   $units,$calc) = eval $expr.'return $answer,$type,$tol,$sig_lbound,$sig_ubound,$ans_fmt,$units,$calc';
 
   #type's definitons come from capaParser.h
   if ($type eq '' ) {
@@ -32,9 +32,19 @@ sub caparesponse_check {
     } else { return "ERROR: Unknown type of answer: $type" }
   }
 
-  
+  if ($tol eq '') {
+    $tol=0.0;
+    $tol_type=1; #TOL_ABSOLUTE
+  } else {
+    if ($tol =~ /%$/) {
+      $tol=chop($tol);
+      $tol_type=2; #TOL_PERCENTAGE
+    } else {
+      $tol_type=1; #TOL_ABSOLUTE
+    }
+  }
   my $result = &caparesponse_capa_check_answer($response,$answer,$type,
-					       $tol_type,$tolerance,
+					       $tol_type,$tol,
 					       $sig_lbound,$sig_ubound,
 					       $ans_fmt, $units,$calc);
 
@@ -52,37 +62,31 @@ sub caparesponse_check {
   elsif ($result =='12') { $result='WANTED_NUMERIC'; }
   else  {$result = "ERROR: Unknown Result: $result";}
 
-  return ":$result:$response:$answer:";
+  return "$result:$tol:$tol_type";
 }
 
 sub tex {
   if ( $external::target eq "tex" ) {
-    #$SCRIPT_RESULT.=@_[0];
     return @_[0];
   } else {
-    #$SCRIPT_RESULT.=@_[1];
     return @_[1];
   }
 }
 
 sub web {
   if ( $external::target eq "tex" ) {
-    #$SCRIPT_RESULT.=@_[1];
     return @_[1];
   } else {
     if ( $external::target eq "web") {
-      #$SCRIPT_RESULT.=@_[0];
       return @_[0];
     } else {
-      #$SCRIPT_RESULT.=@_[2];
       return @_[2];
     }
   }
 }
 
 sub problem {
-  $SCRIPT_RESULT.='1';
-  return '';
+  return '1';
 }
 
 sub hinton {
@@ -103,7 +107,6 @@ sub asin { atan2($_[0], sqrt(1- $_[0] *
 
 sub html {
   if ( $external::target eq "web" ) {
-    #$SCRIPT_RESULT.=@_[0];
     return @_[0];
   }
 }
@@ -115,7 +118,7 @@ sub floor {return int($_[0]);  }
 
 sub format {
   my ($value,$fmt)=@_;
-  $SCRIPT_RESULT.=sprintf('%.'.$fmt,$value);
+  return sprintf('%.'.$fmt,$value);
 }
 
 sub map {