===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.23
retrieving revision 1.41
diff -u -p -r1.23 -r1.41
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/05 01:15:48	1.23
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/12 02:06:48	1.41
@@ -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/strobj.c,v 1.22 2004/03/04 13:19:11 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.40 2004/03/11 07:40:41 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -74,12 +74,16 @@ void Pclear_tb();
 void Pstring_to_tb();
 void Pquotetotex_tb();
 void Pquotetotex();
-void Pquotetotex_setenv();
+void Pquotetotex_env();
 void fnodetotex_tb(FNODE f,TB tb);
 char *symbol_name(char *name);
+char *conv_rule(char *name);
+char *conv_subs(char *name);
+char *call_convfunc(char *name);
 void tb_to_string(TB tb,STRING *rp);
 void fnodenodetotex_tb(NODE n,TB tb);
 void fargstotex_tb(char *opname,FNODE f,TB tb);
+int top_is_minus(FNODE f);
 
 struct ftab str_tab[] = {
 	{"rtostr",Prtostr,1},
@@ -96,7 +100,7 @@ struct ftab str_tab[] = {
 	{"string_to_tb",Pstring_to_tb,1},
 	{"quotetotex_tb",Pquotetotex_tb,2},
 	{"quotetotex",Pquotetotex,1},
-	{"quotetotex_setenv",Pquotetotex_setenv,-99999999},
+	{"quotetotex_env",Pquotetotex_env,-99999999},
 	{0,0,0},
 };
 
@@ -112,12 +116,26 @@ void write_tb(char *s,TB tb)
 
 int register_symbol_table(Obj arg);
 int register_conv_rule(Obj arg);
+int register_conv_func(Obj arg);
 int register_dp_vars(Obj arg);
+int register_dp_vars_prefix(Obj arg);
+int register_dp_vars_hweyl(Obj arg);
+int register_show_lt(Obj arg);
+char *objtostr(Obj obj);
 static struct TeXSymbol *user_texsymbol;
-static char *(*conv_rule)(char *);
 static char **dp_vars;
-int dp_vars_len;
+static int dp_vars_len;
+static char *dp_vars_prefix;
+static int show_lt;
+static FUNC convfunc;
+static int is_lt;
+static int conv_flag;
+static int dp_vars_hweyl;
 
+#define CONV_TABLE (1U<<0)
+#define CONV_SUBS (1U<<1)
+#define CONV_DMODE (1U<<2)
+
 static struct {
 	char *name;
 	Obj value;
@@ -125,78 +143,126 @@ static struct {
 } qtot_env[] = {
 	{"symbol_table",0,register_symbol_table},
 	{"conv_rule",0,register_conv_rule},
+	{"conv_func",0,register_conv_func},
 	{"dp_vars",0,register_dp_vars},
+	{"dp_vars_prefix",0,register_dp_vars_prefix},
+	{"dp_vars_hweyl",0,register_dp_vars_hweyl},
+	{"show_lt",0,register_show_lt},
 	{0,0,0},
 };
 
 #define PARTIAL "\\partial"
-char *conv_rule_d(char *name)
+
+char *conv_rule(char *name)
 {
-	int l,i,j,alpha,start;
-	char *b,*r;
-	l = strlen(name);
+	char *body,*r;
+	int len;
 
-	if ( name[0] == 'd' ) {
-		/* 3 : _{} */
-		b = (char *)ALLOCA((2*l+1+strlen(PARTIAL)+3)*sizeof(char));
-		sprintf(b,"%s_{",PARTIAL);
-		i = 1;
-		j = strlen(b);
-	} else {
-		b = (char *)ALLOCA((2*l+1)*sizeof(char));
-		i = j = 0;
+	if ( convfunc )
+		name = call_convfunc(name);
+	if ( conv_flag & CONV_TABLE ) {
+		r = symbol_name(name);
+		if ( r ) return r;
 	}
-	for ( ; i < l && name[i] == '_'; i++);
-	for ( ; i < l; ) {
-		if ( !isalpha(name[i]) )
-			break;
+	if ( (conv_flag & CONV_DMODE) && *name == 'd' ) {
+		body = conv_rule(name+1);
+		r = MALLOC_ATOMIC((strlen(PARTIAL)+strlen(body)+5)*sizeof(char));
+		if ( !body || !(len=strlen(body)) )
+			strcpy(r,PARTIAL);
+		else if ( len == 1 )
+			sprintf(r,"%s_%s",PARTIAL,body);
 		else
-			b[j++] = name[i++];
-	}
-	if ( i == l )
-		if ( name[0] == 'd' )
-			goto END;
-		else
-			return name;
-	/* we found a digit or '_' */
-	b[j++] = '_'; b[j++] = '{';
-	if ( name[i] == '_' ) i++;
-	for ( start = 1; i < l; ) {
-		if ( name[i] == '_' ) {
-			i++;
-			start = 1;
-			b[j++] = ',';
-		} else if ( start ) {
-			alpha = isalpha(name[i])?1:0;
-			b[j++] = name[i++];
-			start = 0;
-		} else if ( alpha ) {
-			if ( isalpha(name[i]) )
-				b[j++] = name[i++];
-			else {
-				alpha = 0;
-				start = 1;
-				b[j++] = ',';
+			sprintf(r,"%s_{%s}",PARTIAL,body);
+		return r;
+	} else
+		return conv_subs(name);
+}
+
+int _is_delimiter(char c)
+{
+	if ( (c == ' ' || c == '_' || c == ',') ) return 1;
+	else return 0;
+}
+
+int _is_alpha(char c)
+{
+	if ( isdigit(c) || c == '{' || _is_delimiter(c) ) return 0;
+	else return 1;
+}
+
+char *conv_subs(char *name)
+{
+	int i,j,k,len,clen,slen,start,level;
+	char *buf,*head,*r,*h,*brace,*buf_conv;
+	char **subs;
+
+	if ( !name || !(len=strlen(name)) ) return "";
+	if ( !(conv_flag&CONV_SUBS) ) return name;
+	subs = (char **)ALLOCA(len*sizeof(char* ));
+	for ( i = 0, j = 0, start = i; ; j++ ) {
+		while ( (i < len) && _is_delimiter(name[i]) ) i++;
+		start = i;
+		if ( i == len ) break;
+		if ( name[i] == '{' ) {
+			for ( level = 1, i++; i < len && level; i++ ) {
+				if ( name[i] == '{' ) level++;
+				else if ( name[i] == '}' ) level--;
 			}
+			slen = i-start;	
+			if ( slen >= 3 ) {
+				brace = (char *)ALLOCA((slen+1)*sizeof(char));
+				strncpy(brace,name+start+1,slen-2);
+				brace[slen-2] = 0;
+				buf = conv_subs(brace);
+				subs[j] = (char *)ALLOCA((strlen(buf)+3)*sizeof(char));
+				if ( strlen(buf) == 1 )
+					strcpy(subs[j],buf);
+				else	
+					sprintf(subs[j],"{%s}",buf);
+			} else
+				subs[j] = "{}";
 		} else {
 			if ( isdigit(name[i]) )
-				b[j++] = name[i++];
-			else {
-				alpha = 1;
-				start = 1;
-				b[j++] = ',';
-			}
+				while ( i < len && isdigit(name[i]) ) i++;
+			else
+				while ( i < len && _is_alpha(name[i]) ) i++;
+			slen = i-start;	
+			buf = (char *)ALLOCA((slen+1)*sizeof(char));
+			strncpy(buf,name+start,slen); buf[slen] = 0;
+			buf_conv = symbol_name(buf);
+			subs[j] = buf_conv?buf_conv:buf;
 		}
 	}
-	b[j++] = '}';
-END:
-	if ( name[0] == 'd' ) b[j++] = '}';
-	b[j++] = 0;
-	r = (char *)MALLOC_ATOMIC((j+1)*sizeof(char));	
-	strcpy(r,b);
+	for ( k = 0, clen = 0; k < j; k++ ) clen += strlen(subs[k]);
+	/* {subs(0)}_{{subs(1)},...,{subs(j-1)}} => {}:j+1 _:1 ,:j-2 */
+	h = r = MALLOC_ATOMIC((clen+(j+1)*2+1+(j-2)+1)*sizeof(char));
+	if ( j == 1 )
+		sprintf(h,"{%s}",subs[0]);
+	else {
+		sprintf(h,"{%s}_{%s",subs[0],subs[1]);
+		h += strlen(h);
+		for ( k = 2; k < j; k++ ) {
+			sprintf(h,",%s",subs[k]);
+			h += strlen(h);
+		}
+		strcpy(h,"}");
+	}
 	return r;
 }
 
+char *call_convfunc(char *name)
+{
+	STRING str,r;
+	NODE arg;
+
+	MKSTR(str,name);
+	arg = mknode(1,str);
+	r = (STRING)bevalf(convfunc,arg);
+	if ( !r || OID(r) != O_STR )
+		error("call_convfunc : invalid result");
+	return BDY(r);
+}
+
 int register_symbol_table(Obj arg)
 {
 	NODE n,t;
@@ -243,25 +309,40 @@ int register_symbol_table(Obj arg)
 	return 1;
 }
 
+int register_dp_vars_hweyl(Obj arg)
+{
+	if ( INT(arg) ) {
+		dp_vars_hweyl = QTOS((Q)arg);
+		return 1;
+	} else return 0;
+}
+
+int register_show_lt(Obj arg)
+{
+	if ( INT(arg) ) {
+		show_lt = QTOS((Q)arg);
+		return 1;
+	} else return 0;
+}
+
 int register_conv_rule(Obj arg)
 {
 	if ( INT(arg) ) {
-		switch ( QTOS((Q)arg) ) {
-			case 0:
-				conv_rule = 0;
-				return 1;
-				break;
-			case 1:
-				conv_rule = conv_rule_d;
-				return 1;
-				break;
-			default:
-				return 0;
-				break;
-		}
+		conv_flag = QTOS((Q)arg);
+		convfunc = 0;
+		return 1;
 	} else return 0;
 }
 
+int register_conv_func(Obj arg)
+{
+	if ( OID(arg) == O_P && (int)(VR((P)arg))->attr == V_SR ) {
+		convfunc = (FUNC)(VR((P)arg)->priv);
+		/* f must be a function which takes single argument */
+		return 1;
+	} else return 0;
+}
+
 int register_dp_vars(Obj arg)
 {
 	int l,i;
@@ -272,6 +353,7 @@ int register_dp_vars(Obj arg)
 	if ( !arg ) {
 		dp_vars = 0;
 		dp_vars_len = 0;
+		return 1;
 	} else if ( OID(arg) != O_LIST )
 		return 0;
 	else {
@@ -294,8 +376,22 @@ int register_dp_vars(Obj arg)
 	}
 }
 
-void Pquotetotex_setenv(NODE arg,Obj *rp)
+int register_dp_vars_prefix(Obj arg)
 {
+	if ( !arg ) {
+		dp_vars_prefix = 0;
+		return 1;
+	} else if ( OID(arg) == O_STR ) {
+		dp_vars_prefix = BDY((STRING)arg);
+		return 1;
+	} else if ( OID(arg) == O_P ) {
+		dp_vars_prefix = NAME(VR((P)arg));
+		return 1;
+	} else return 0;
+}
+
+void Pquotetotex_env(NODE arg,Obj *rp)
+{
 	int ac,i;
 	char *name;
 	NODE n,n0;
@@ -312,8 +408,13 @@ void Pquotetotex_setenv(NODE arg,Obj *rp)
 		NEXT(n) = 0;
 		MKLIST(l,n0);
 		*rp = (Obj)l;
+	} else if ( ac == 1 && !ARG0(arg) ) {
+		/* set to default */
+		for ( i = 0; qtot_env[i].name; i++ )
+			qtot_env[i].value = 0;
+		*rp = 0;
 	} else if ( ac == 1 || ac == 2 ) {
-		asir_assert(ARG0(arg),O_STR,"quotetotex_setenv");
+		asir_assert(ARG0(arg),O_STR,"quotetotex_env");
 		name = BDY((STRING)ARG0(arg));
 		for ( i = 0; qtot_env[i].name; i++ )
 			if ( !strcmp(qtot_env[i].name,name) ) {
@@ -321,7 +422,7 @@ void Pquotetotex_setenv(NODE arg,Obj *rp)
 					if ( (qtot_env[i].reg)((Obj)ARG1(arg)) )
 						qtot_env[i].value = (Obj)ARG1(arg);
 					else
-						error("quotetotex_setenv : invalid argument");
+						error("quotetotex_env : invalid argument");
 				}
 				*rp = qtot_env[i].value;
 				return;
@@ -356,6 +457,8 @@ void Pquotetotex(NODE arg,STRING *rp)
 	TB tb;
 
 	NEWTB(tb);
+	/* XXX for DP */
+	is_lt = 1;
 	fnodetotex_tb(BDY((QUOTE)ARG0(arg)),tb);
 	tb_to_string(tb,rp);
 }
@@ -366,6 +469,8 @@ void Pquotetotex_tb(NODE arg,Q *rp)
 	TB tb;
 
 	asir_assert(ARG1(arg),O_TB,"quotetotex_tb");
+	/* XXX for DP */
+	is_lt = 1;
 	fnodetotex_tb(BDY((QUOTE)ARG0(arg)),ARG1(arg));
 	*rp = 0;	
 }
@@ -673,6 +778,11 @@ char *symbol_name(char *name)
 {
 	int i;
 
+	if ( !name || strlen(name) == 0 )
+		return "";
+	if ( !(conv_flag & CONV_TABLE) )
+		return name;
+
 	if ( user_texsymbol )
 		for ( i = 0; user_texsymbol[i].text; i++ )
 			if ( !strcmp(user_texsymbol[i].text,name) )
@@ -680,19 +790,18 @@ char *symbol_name(char *name)
 	for ( i = 0; texsymbol[i].text; i++ )
 		if ( !strcmp(texsymbol[i].text,name) )
 			return texsymbol[i].symbol;
-	if ( conv_rule )
-		return (*conv_rule)(name);
-	else
-		return name;
+	return 0;
 }
 
 void fnodetotex_tb(FNODE f,TB tb)
 {
 	NODE n,t,t0;
-	char vname[BUFSIZ];
-	char *opname,*vname_conv;
+	char vname[BUFSIZ],prefix[BUFSIZ];
+	char *opname,*vname_conv,*prefix_conv;
 	Obj obj;
-	int i,len,allzero;
+	int i,len,allzero,elen,elen2;
+	C cplx;
+	char *r;
 	FNODE fi,f2;
 
 	write_tb(" ",tb);
@@ -725,7 +834,7 @@ void fnodetotex_tb(FNODE f,TB tb)
 			opname = ((ARF)FA0(f))->name;
 			if ( !strcmp(opname,"+") ) {
 				fnodetotex_tb((FNODE)FA1(f),tb);
-				write_tb(opname,tb);
+				if ( !top_is_minus((FNODE)FA2(f)) ) write_tb(opname,tb);
 				fnodetotex_tb((FNODE)FA2(f),tb);
 			} else if ( !strcmp(opname,"-") ) {
 				if ( FA1(f) ) fnodetotex_tb((FNODE)FA1(f),tb);
@@ -879,16 +988,22 @@ void fnodetotex_tb(FNODE f,TB tb)
 
 		/* function */
 		case I_FUNC:
-			opname = symbol_name(((FUNC)FA0(f))->name);
-			write_tb(opname,tb);
-			write_tb("(",tb);
-			fargstotex_tb(opname,FA1(f),tb);
-			write_tb(")",tb);
+			if ( !strcmp(((FUNC)FA0(f))->name,"@pi") )
+				write_tb("\\pi",tb);
+			else if ( !strcmp(((FUNC)FA0(f))->name,"@e") )
+				write_tb("e",tb);
+			else {
+				opname = conv_rule(((FUNC)FA0(f))->name);
+				write_tb(opname,tb);
+				write_tb("(",tb);
+				fargstotex_tb(opname,FA1(f),tb);
+				write_tb(")",tb);
+			}
 			break;
 
 		/* XXX */
 		case I_CAR:
-			opname = symbol_name("car");
+			opname = conv_rule("car");
 			write_tb(opname,tb);
 			write_tb("(",tb);
 			fargstotex_tb(opname,FA0(f),tb);
@@ -896,7 +1011,7 @@ void fnodetotex_tb(FNODE f,TB tb)
 			break;
 
 		case I_CDR:
-			opname = symbol_name("cdr");
+			opname = conv_rule("cdr");
 			write_tb(opname,tb);
 			write_tb("(",tb);
 			fargstotex_tb(opname,FA0(f),tb);
@@ -906,16 +1021,38 @@ void fnodetotex_tb(FNODE f,TB tb)
 		/* exponent vector */
 		case I_EV:
 			n = (NODE)FA0(f);
+			if ( dp_vars_hweyl ) {
+				elen = length(n);
+				elen2 = elen>>1;
+				elen = elen2<<1;
+			}
 			allzero = 1;
+			if ( show_lt && is_lt )
+				write_tb("\\underline{",tb);
 			for ( t0 = 0, i = 0; n; n = NEXT(n), i++ ) {
 				fi = (FNODE)BDY(n);
 				if ( fi->id == I_FORMULA && !FA0(fi) ) continue;
 				allzero = 0;
-				if ( dp_vars && i < dp_vars_len )
+				if ( dp_vars && i < dp_vars_len ) {
 					strcpy(vname,dp_vars[i]);
-				else
-					sprintf(vname,"x_{%d}",i);
-				vname_conv = symbol_name(vname);
+					vname_conv = conv_rule(vname);
+				} else {
+					if ( dp_vars_hweyl ) {
+						if ( i < elen2 )
+							strcpy(prefix,dp_vars_prefix?dp_vars_prefix:"x");
+						else if ( i < elen )
+							strcpy(prefix,"\\partial");
+						else
+							strcpy(prefix,"h");
+					} else
+						strcpy(prefix,dp_vars_prefix?dp_vars_prefix:"x");
+					prefix_conv = conv_rule(prefix);
+					vname_conv = (char *)ALLOCA(strlen(prefix_conv)+50);
+					if ( i < 10 )
+						sprintf(vname_conv,"%s_%d",prefix_conv,i);
+					else
+						sprintf(vname_conv,"%s_{%d}",prefix_conv,i);
+				}
 				if ( fi->id == I_FORMULA && UNIQ(FA0(fi)) ) {
 					len = strlen(vname_conv);
 					opname = MALLOC_ATOMIC(len+2);
@@ -934,6 +1071,10 @@ void fnodetotex_tb(FNODE f,TB tb)
 			/* XXX */
 			if ( allzero )
 				write_tb(" 1 ",tb);
+			if ( show_lt && is_lt ) {
+				write_tb("}",tb);	
+				is_lt = 0;
+			}
 			break;
 
 		/* string */
@@ -944,15 +1085,32 @@ void fnodetotex_tb(FNODE f,TB tb)
 		/* internal object */
 		case I_FORMULA:
 			obj = (Obj)FA0(f);
-			if ( obj && OID(obj) == O_P ) {
-				opname = symbol_name(VR((P)obj)->name);
-			} else {
-				len = estimate_length(CO,obj);
-				opname = (char *)MALLOC_ATOMIC(len+1);
-				soutput_init(opname);
-				sprintexpr(CO,obj);
-			}
-			write_tb(opname,tb);
+			if ( !obj )
+				opname = "0";
+			else if ( OID(obj) == O_N && NID(obj) == N_C ) {
+				cplx = (C)obj;
+				write_tb("(",tb);
+				if ( cplx->r ) {
+					r = objtostr((Obj)cplx->r); write_tb(r,tb);
+				}
+				if ( cplx->i ) {
+					if ( cplx->r && compnum(0,cplx->i,0) > 0 ) {
+						write_tb("+",tb);
+						if ( !UNIQ(cplx->i) ) {
+							r = objtostr((Obj)cplx->i); write_tb(r,tb);
+						}
+					} else if ( MUNIQ(cplx->i) )
+						write_tb("-",tb);
+					else if ( !UNIQ(cplx->i) ) {
+						r = objtostr((Obj)cplx->i); write_tb(r,tb);
+					}
+					write_tb("\\sqrt{-1}",tb);
+				}
+				write_tb(")",tb);
+			} else if ( OID(obj) == O_P )
+				write_tb(conv_rule(VR((P)obj)->name),tb);
+			else
+				write_tb(objtostr(obj),tb);
 			break;
 
 		/* program variable */
@@ -968,9 +1126,22 @@ void fnodetotex_tb(FNODE f,TB tb)
 	}
 }
 
+char *objtostr(Obj obj)
+{
+	int len;
+	char *r;
+
+	len = estimate_length(CO,obj);
+	r = (char *)MALLOC_ATOMIC(len+1);
+	soutput_init(r);
+	sprintexpr(CO,obj);
+	return r;
+}
+
 void fnodenodetotex_tb(NODE n,TB tb)
 {
 	for ( ; n; n = NEXT(n) ) {
+		is_lt = 1;
 		fnodetotex_tb((FNODE)BDY(n),tb);
 		if ( NEXT(n) ) write_tb(", ",tb);
 	}
@@ -990,5 +1161,63 @@ void fargstotex_tb(char *name,FNODE f,TB tb)
 			fnodenodetotex_tb(n,tb);
 		} else
 			fnodetotex_tb(f,tb);
+	}
+}
+
+int top_is_minus(FNODE f)
+{
+	char *opname;
+	int len;
+	Obj obj;
+
+	if ( !f )
+		return 0;
+	switch ( f->id ) {
+		case I_MINUS:
+			return 1;
+		case I_BOP:
+			opname = ((ARF)FA0(f))->name;
+			switch ( opname[0] ) {
+				case '+': case '*': case '/': case '^': case '%': 
+					return top_is_minus((FNODE)FA1(f));
+				case '-':
+					if ( FA1(f) )
+						return top_is_minus((FNODE)FA1(f));
+					else
+						return 1;
+				default:
+					return 0;
+			}
+			break;
+		case I_COP:
+			return top_is_minus((FNODE)FA1(f));
+		case I_LOP:
+			if ( (lid)FA0(f) == L_NOT ) return 0;
+			else return top_is_minus((FNODE)FA1(f));
+		case I_AND: case I_OR:
+			return top_is_minus((FNODE)FA0(f));
+		case I_FORMULA:
+			obj = (Obj)FA0(f);
+			if ( !obj )
+				return 0;
+			else {
+				switch ( OID(obj) ) {
+					case O_N:
+						return mmono((P)obj);
+					case O_P:
+						/* must be a variable */
+						opname = conv_rule(VR((P)obj)->name);
+						return opname[0]=='-';
+					default:
+						/* ??? */
+						len = estimate_length(CO,obj);
+						opname = (char *)MALLOC_ATOMIC(len+1);
+						soutput_init(opname);
+						sprintexpr(CO,obj);
+						return opname[0]=='-';
+				}
+			}
+		default:
+			return 0;
 	}
 }