===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/quote.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- OpenXM_contrib2/asir2000/parse/quote.c	2004/03/04 03:31:28	1.9
+++ OpenXM_contrib2/asir2000/parse/quote.c	2004/03/10 05:27:03	1.12
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.8 2004/03/04 01:41:32 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.11 2004/03/10 02:41:08 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -158,9 +158,12 @@ void polytoquote(P a,QUOTE *c)
 	int n,i,sgn;
 	QUOTE v,r,s,u;
 
-	if ( !a || (OID(a) == O_N) ) {
+	if ( !a ) {
 		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
 		return;
+	} else if ( OID(a) == O_N ) {
+		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
+		return;
 	}
 	vartoquote(VR((P)a),&v);
 	dc = DC((P)a);
@@ -236,7 +239,7 @@ void dctoquote(DCP dc,QUOTE v,QUOTE *q,int *sgn)
 			objtoquote((Obj)ONE,&r);	
 	} else {
 		objtoquote((Obj)c,&u);
-		if ( !NUM(c) && NEXT(DC(c)) ) {
+		if ( !NUM(c) && NEXT(DC(c)) && d ) {
 			MKQUOTE(t,mkfnode(1,I_PAREN,BDY(u)));
 			u = t;
 		}