===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/quote.c,v
retrieving revision 1.11
retrieving revision 1.13
diff -u -p -r1.11 -r1.13
--- OpenXM_contrib2/asir2000/parse/quote.c	2004/03/10 02:41:08	1.11
+++ OpenXM_contrib2/asir2000/parse/quote.c	2004/03/11 09:52:56	1.13
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.10 2004/03/09 08:02:01 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.12 2004/03/10 05:27:03 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -239,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;
 		}
@@ -298,7 +298,7 @@ void vartoquote(V v,QUOTE *c)
 	P x;
 	PF pf;
 	PFAD ad;
-	QUOTE a,b;
+	QUOTE a,b,u;
 	int i;
 	FUNC f;
 	NODE t,t1;
@@ -312,8 +312,19 @@ void vartoquote(V v,QUOTE *c)
 		ad = ((PFINS)v->priv)->ad;
 		if ( !strcmp(NAME(pf),"pow") ) {
 			/* pow(a,b) = a^b */
-			objtoquote(ad[0].arg,&a); objtoquote(ad[1].arg,&b);
-			pwrquote(CO,a,b,c);
+			objtoquote(ad[0].arg,&a);
+			x = (P)ad[0].arg;
+			/* check whether x is a variable */
+			if ( x && OID(x)==O_P && !NEXT(DC(x))
+				&& UNIQ(DEG(DC(x))) && UNIQ(COEF(DC(x))) ) {
+				/* use a as is */
+				u = a;
+			} else {
+				/* a => (a) */
+				MKQUOTE(u,mkfnode(1,I_PAREN,BDY(a)));
+			}
+			objtoquote(ad[1].arg,&b);
+			pwrquote(CO,u,b,c);
 		} else {
 			for ( i = 0; i < pf->argc; i++ )
 				if ( ad[i].d )