--- capa/capa51/pProj/capaCommon.c	2005/12/01 22:32:10	1.26
+++ capa/capa51/pProj/capaCommon.c	2007/01/23 07:26:09	1.29
@@ -2934,11 +2934,11 @@ capa_check_ans(ai,ans, error) AnswerInfo
   char    *us;    /* ans_unit_str */
   Unit_t  *u_p;   /* ans_unit     */
   int      input_len, all_alphabet = 1, idx, ii, type;
-  int      outcome, result = INCORRECT;
+  int      outcome=-1, result = INCORRECT;
   int      sig, corr_len;
-  int      choice[ANSWER_STRING_LENG];
+  int      choice[MAX_ASCII];
   char     num_str[ANSWER_STRING_LENG], unit_str[ANSWER_STRING_LENG];
-  char     fmted[ANSWER_STRING_LENG], correctans[ANSWER_STRING_LENG], answer[ANSWER_STRING_LENG];
+  char     fmted[ANSWER_STRING_LENG], correctans[MAX_ASCII], answer[ANSWER_STRING_LENG];
   double   n_part;
   double   given, target, ratio, fmted_target, target_u, target_l, scale=1.0;
   double   delta;
@@ -3040,17 +3040,17 @@ capa_check_ans(ai,ans, error) AnswerInfo
           {
             corr_len = strlen(s); input_len = strlen(ans);
             if( corr_len == input_len ) {
-              for(idx=0;idx<ANSWER_STRING_LENG;idx++) {
+              for(idx=0;idx<MAX_ASCII;idx++) {
 		choice[idx] = 0;correctans[idx] = 0;
 	      }
               result = EXACT_ANS;
               for(ii=0;ii<corr_len; ii++) {
-                idx = toupper(s[ii]) - 'A'; choice[idx] =  1;
+                idx = toupper(s[ii]); choice[idx] =  1;
               }
               for(ii=0;ii<input_len;ii++) {
-                idx = toupper(ans[ii]) - 'A'; correctans[idx] = 1;
+                idx = toupper(ans[ii]); correctans[idx] = 1;
 	      }
-	      for(ii=0;ii<ANSWER_STRING_LENG;ii++) {
+	      for(ii=0;ii<MAX_ASCII;ii++) {
 		if(choice[ii] != correctans[ii] )  result = INCORRECT;
               }
             } else { result = INCORRECT; }
@@ -3101,9 +3101,9 @@ capa_check_answer(p, answer, error) Prob
   int     sig_l; 
   int     sig_u;
   char   *fmt;
-  int     choice[ANSWER_STRING_LENG], correctans[ANSWER_STRING_LENG];
+  int     choice[MAX_ASCII], correctans[MAX_ASCII];
   int     ii, idx, corr_len, input_len;
-  int     result = INCORRECT, sig, outcome, all_alphabet;
+  int     result = INCORRECT, sig, outcome=-1, all_alphabet;
   char    fmted[FORMAT_STRING_LENG];
   double  given, target, ratio, fmted_target, target_u, target_l, scale=1.0;
   double  delta;
@@ -3209,18 +3209,18 @@ capa_check_answer(p, answer, error) Prob
           {
             corr_len = strlen(correct); input_len = strlen(answer);
             if( corr_len == input_len ) {
-              for(idx=0;idx<ANSWER_STRING_LENG;idx++) {
+              for(idx=0;idx<MAX_ASCII;idx++) {
 		choice[idx] = 0;correctans[idx] = 0;
 	      }
               result = EXACT_ANS;
               for(ii=0;ii<corr_len; ii++) {
-                idx = toupper(correct[ii]) - 'A'; choice[idx] =  1;
+                idx = toupper(correct[ii]); choice[idx] =  1;
               }
               for(ii=0;ii<input_len;ii++) {
-                idx = toupper(answer[ii]) - 'A'; correctans[idx] = 1;
+                idx = toupper(answer[ii]); correctans[idx] = 1;
 	      }
-	      for(ii=0;ii<ANSWER_STRING_LENG;ii++) {
-		if(choice[ii] != correctans[ii] )  result = INCORRECT;
+	      for(ii=0;ii<MAX_ASCII;ii++) {
+		if(choice[ii] != correctans[ii] ) result = INCORRECT;
               }
             } else { result = INCORRECT; }
             break;
@@ -3311,6 +3311,9 @@ char *fml_str;char *input_str;char *var_
       outcome = BAD_FORMULA;
       break;
     }
+    if (outcome != APPROX_ANS) {
+      break;
+    }
   }
   capa_mfree((char *)check_fml_str);