===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v
retrieving revision 1.17
retrieving revision 1.20
diff -u -p -r1.17 -r1.20
--- OpenXM_contrib2/asir2000/builtin/gr.c	2000/12/11 02:00:40	1.17
+++ OpenXM_contrib2/asir2000/builtin/gr.c	2001/07/23 05:03:22	1.20
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.16 2000/12/08 06:43:09 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.19 2001/06/07 04:54:38 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -296,7 +296,7 @@ LIST *rp;
 		modular = -modular; nochk = 1;
 	}
 	if ( modular )
-		m = modular > 1 ? modular : lprime[mindex];
+		m = modular > 1 ? modular : get_lprime(mindex);
 	else
 		m = 0;
 	makesubst(vc,&subst);
@@ -326,7 +326,7 @@ LIST *rp;
 			if ( modular > 1 ) {
 				*rp = 0; return;
 			} else
-				m = lprime[++mindex];
+				m = get_lprime(++mindex);
 		makesubst(vc,&subst);
 		psn = length(s);
 		for ( i = psn; i < pslen; i++ ) {
@@ -1416,7 +1416,7 @@ NODE subst;
 				new_sugar = h->sugar;
 			get_eg(&tnf0);
 			t_0 = get_rtime();
-			if ( PCoeffs )
+			if ( PCoeffs || dp_fcoeffs )
 				_dp_nf(gall,h,ps,!Top,&nf);
 			else
 				_dp_nf_ptozp(gall,h,ps,!Top,DP_Multiple,&nf);
@@ -1930,6 +1930,7 @@ LIST *list;
 	STOQ(Reverse,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Reverse"); MKNODE(n1,name,n); n = n1;
 	STOQ(Stat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Stat"); MKNODE(n1,name,n); n = n1;
 	STOQ(DP_Print,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Print"); MKNODE(n1,name,n); n = n1;
+	STOQ(DP_PrintShort,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"PrintShort"); MKNODE(n1,name,n); n = n1;
 	STOQ(DP_NFStat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"NFStat"); MKNODE(n1,name,n); n = n1;
 	STOQ(OXCheck,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OXCheck"); MKNODE(n1,name,n); n = n1;
 	STOQ(GenTrace,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenTrace"); MKNODE(n1,name,n); n = n1;