--- capa/capa51/pProj/capaParser.h	2000/02/22 18:19:02	1.4
+++ capa/capa51/pProj/capaParser.h	2000/08/07 20:47:29	1.9
@@ -1,3 +1,27 @@
+/* definitions of all parser constants/structs
+   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.
+*/
+
 /* <==================================================================> */
 /*  by Isaac Tsai @ 1994                                                */
 
@@ -267,6 +291,7 @@ typedef struct _problem {
    int                 show_explain;
    int                 show_br;      /* web only, <BR> on is by default */
    int                 show_ans_box; /* web only, answer box is shown by default */
+   int                 verbatim; /* do verbatim protection around answers */
    int                 ans_op;   /* ANS_AND or ANS_OR */
    char               *id_list;
    struct   _pts_list *pts_list;
@@ -354,7 +379,11 @@ typedef struct _answer_info {
 #define    DO_SHOW              1
 #define    DONOT_SHOW           0
 
+#define    DO_VERBATIM          1
+#define    DONOT_VERBATIM       0
+
 #define    SHOW_BR_DEFAULT      DO_SHOW
+#define    VERBATIM_DEFAULT     DO_VERBATIM
 #define    SHOW_ANSBOX_DEFAULT  DO_SHOW
 
 #define    SIG_LB_DEFAULT       0        /* ---- sig_lbound ------- */
@@ -393,6 +422,7 @@ typedef struct _answer_info {
 #define    ANS_CNT_NOT_MATCH   9
 #define    SUB_RECORDED        10
 #define    BAD_FORMULA         11
+#define    WANTED_NUMERIC      12
 
 
 
@@ -441,6 +471,7 @@ typedef struct _answer_info {
 #define    GAMMA_DIS           14
 #define    CHI_DIS             15
 #define    NONCENTRAL_CHI_DIS  16
+#define    FORMULA_PICK_POINTS 17
 
 #define    GET_GENERATOR     0L
 #define    SET_GENERATOR     1L