--- capa/capa51/pProj/capaCommon.c	2000/03/22 21:08:03	1.10
+++ capa/capa51/pProj/capaCommon.c	2000/08/22 13:19:56	1.15
@@ -1,6 +1,29 @@
+/* Library of useful functions
+   Copyright (C) 1992-2000 Michigan State University
+
+   The CAPA system is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The CAPA system is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public
+   License along with the CAPA system; see the file COPYING.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   As a special exception, you have permission to link this program
+   with the TtH/TtM library and distribute executables, as long as you
+   follow the requirements of the GNU GPL in regard to all of the
+   software in the executable aside from TtH/TtM.
+*/
+
 /* =||>|===================== capaCommon.c =====================|<||= */
 /* created 1994 by Isaac Tsai                                         */
-/* 1994, 1995, 1996, 1997, 1998, 1999  copyrighted by Isaac Tsai      */
 /* TODO: restructure capa_check_ans*() calls into one                 */
 /* =||>|===================== capaCommon.c =====================|<||= */
 #include <ctype.h>
@@ -2124,6 +2147,10 @@ extern  int        Symb_count;
 extern  int        first_run;
 extern  int        Stop_Parser;
 extern  void       (*Status_Func)();
+#ifdef TTH
+extern void tth_restart();
+extern char* tth_err;
+#endif /*TTH*/
   long  seed1,     seed2;
   T_student        a_student;
   char            *class, *classname, warn_msg[WARN_MSG_LENGTH];
@@ -2152,6 +2179,10 @@ extern  void       (*Status_Func)();
   }
   u_getunit(fp);
   fclose(fp);
+#ifdef TTH
+  if(tth_err) { free(tth_err); tth_err=NULL; }
+  tth_restart();
+#endif /*TTH*/
   strncpy(Parse_name,a_student.s_nm,MAX_NAME_CHAR+1);
   strncpy(Parse_student_number,student_number,MAX_STUDENT_NUMBER+1);
   Parse_section = a_student.s_sec;
@@ -3352,10 +3383,12 @@ Problem_t *p; char **answers; int cnt; c
       ii++;
       if(ii==cnt) done = 1;
     }
-    if( result == 0 ) { /* check if any of the outcome has failed to be a numeric */
+    if( result == 0 ) { 
+    /* check if any of the outcome has failed to be a numeric 
+       or was a malformed equation */
       done = ii = 0;
       while( !done ) {
-        if( outcomes[ii] == WANTED_NUMERIC ) {
+        if( outcomes[ii] == WANTED_NUMERIC || outcomes[ii] == BAD_FORMULA ) {
           result = outcomes[ii];
           done = 1;
         }
@@ -3363,7 +3396,7 @@ Problem_t *p; char **answers; int cnt; c
         if(ii==cnt) done = 1;
       }
     }
-    if( result == 0 ) { /* check if any of the outcome has failed on sig figs */
+    if( result == 0 ) {/*check if any of the outcome has failed on sig figs*/
       done = ii = 0;
       while( !done ) {
         if( outcomes[ii] == SIG_FAIL ) {