===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.22
retrieving revision 1.30
diff -u -p -r1.22 -r1.30
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/04 13:19:11	1.22
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/09 03:14:24	1.30
@@ -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.21 2004/03/04 13:12:27 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.29 2004/03/09 02:51:36 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -74,9 +74,12 @@ 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_subscript(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);
@@ -96,7 +99,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,9 +115,22 @@ void write_tb(char *s,TB tb)
 
 int register_symbol_table(Obj arg);
 int register_conv_rule(Obj arg);
+int register_dp_vars(Obj arg);
+int register_dp_vars_prefix(Obj arg);
+int register_show_lt(Obj arg);
 static struct TeXSymbol *user_texsymbol;
-static char *(*conv_rule)(char *);
+static char **dp_vars;
+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;
 
+#define CONV_SUBSCRIPT (1U<<0)
+#define CONV_DMODE (1U<<1)
+#define CONV_USERFUNC (1U<<31)
+
 static struct {
 	char *name;
 	Obj value;
@@ -122,77 +138,102 @@ static struct {
 } qtot_env[] = {
 	{"symbol_table",0,register_symbol_table},
 	{"conv_rule",0,register_conv_rule},
+	{"dp_vars",0,register_dp_vars},
+	{"dp_vars_prefix",0,register_dp_vars_prefix},
+	{"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;
 
-	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;
-	}
-	for ( ; i < l && name[i] == '_'; i++);
-	for ( ; i < l; ) {
-		if ( !isalpha(name[i]) )
-			break;
-		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++] = ',';
-			}
+	if ( conv_flag & CONV_DMODE ) {
+		if ( *name == 'd' ) {
+			if ( conv_flag & CONV_SUBSCRIPT )
+				body = conv_subscript(name+1);
+			else
+				body = name+1;
+			r = MALLOC_ATOMIC((strlen(PARTIAL)+strlen(body)+5)*sizeof(char));
+			sprintf(r,"{%s}_{%s}",PARTIAL,body);
+			return r;
 		} else {
-			if ( isdigit(name[i]) )
-				b[j++] = name[i++];
-			else {
-				alpha = 1;
-				start = 1;
-				b[j++] = ',';
+			if ( conv_flag & CONV_SUBSCRIPT )
+				body = conv_subscript(name);
+			else
+				body = name;
+		}
+	} else if ( conv_flag & CONV_SUBSCRIPT )
+		return conv_subscript(name);
+	else if ( conv_flag & CONV_USERFUNC && convfunc )
+		return call_convfunc(name);
+	else
+		return name;
+}
+
+char *conv_subscript(char *name)
+{
+	int i,j,k,len,clen,slen,start,level;
+	char *buf,*head,*r,*h;
+	char **subs;
+
+	len = strlen(name);
+	for ( i = 0; i < len && (isalpha(name[i]) || name[i]=='\\'); i++ );
+	if ( i == len ) return symbol_name(name);
+	buf = (char *)ALLOCA((i+1)*sizeof(char));
+	strncpy(buf,name,i); buf[i] = 0;
+	head = symbol_name(buf);
+	subs = (char **)ALLOCA(len*sizeof(char* ));
+	for ( j = 0, start = i; ; j++ ) {
+		while ( (i < len) && (name[i] == '_' || name[i] == ',') ) i++;
+		if ( i == len ) break;
+		start = i;
+		if ( name[i] == '{' ) {
+			for ( level = 1, i++; i < len && level; i++ ) {
+				if ( name[i] == '{' ) level++;
+				else if ( name[i] == '}' ) level--;
 			}
+		} else if ( isdigit(name[i]) )
+			while ( i < len && isdigit(name[i]) ) i++;
+		else
+			while ( i < len && (isalpha(name[i]) || name[i] == '\\') ) i++;
+		slen = i-start;	
+		buf = (char *)ALLOCA((slen+1)*sizeof(char));
+		strncpy(buf,name+start,slen); buf[slen] = 0;
+		subs[j] = symbol_name(buf);
+	}
+	for ( k = 0, clen = strlen(head); k < j; k++ ) clen += strlen(subs[k]);
+	/* {head}_{{subs(0)},...,{subs(j-1)}} => {}:j+2 _:1 ,:j-1 */
+	h = r = MALLOC_ATOMIC((clen+(j+2)*2+1+(j-1)+1)*sizeof(char));
+	if ( !j )
+		sprintf(h,"{%s}",head);
+	else {
+		sprintf(h,"{%s}_{{%s}",head,subs[0]);
+		h += strlen(h);
+		for ( k = 1; k < j; k++ ) {
+			sprintf(h,",{%s}",subs[k]);
+			h += strlen(h);
 		}
+		strcpy(h,"}");
 	}
-	b[j++] = '}';
-END:
-	if ( name[0] == 'd' ) b[j++] = '}';
-	b[j++] = 0;
-	r = (char *)MALLOC_ATOMIC((j+1)*sizeof(char));	
-	strcpy(r,b);
 	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;
@@ -218,10 +259,20 @@ int register_symbol_table(Obj arg)
 		if ( !t || !NEXT(t) ) return 0;
 		a0 = (STRING)BDY(t);
 		a1 = (STRING)BDY(NEXT(t));
-		if ( !a0 || OID(a0) != O_STR ) return 0;
-		if ( !a1 || OID(a1) != O_STR ) return 0;
-		uts[i].text = BDY(a0);	
-		uts[i].symbol = BDY(a1);	
+		if ( !a0 ) return 0;
+		if ( OID(a0) == O_STR )
+			uts[i].text = BDY(a0);	
+		else if ( OID(a0) == O_P )
+			uts[i].text = NAME(VR((P)a0));	
+		else
+			return 0;
+		if ( !a1 ) return 0;
+		if ( OID(a1) == O_STR )
+			uts[i].symbol = BDY(a1);	
+		else if ( OID(a1) == O_P )
+			uts[i].symbol = NAME(VR((P)a1));	
+		else
+			return 0;
 	}
 	uts[i].text = 0;
 	uts[i].symbol = 0;
@@ -229,26 +280,77 @@ int register_symbol_table(Obj arg)
 	return 1;
 }
 
+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:
+		conv_flag = QTOS((Q)arg);
+		convfunc = 0;
+		return 1;
+	} else if ( OID(arg) == O_P && 
+		(int)(VR((P)arg))->attr == V_SR ) {
+		conv_flag = CONV_USERFUNC;
+		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;
+	char **r;
+	NODE n;
+	STRING a;
+
+	if ( !arg ) {
+		dp_vars = 0;
+		dp_vars_len = 0;
+		return 1;
+	} else if ( OID(arg) != O_LIST )
+		return 0;
+	else {
+		n = BDY((LIST)arg);
+		l = length(n);
+		r = (char **)MALLOC_ATOMIC(l*sizeof(char *));
+		for ( i = 0; i < l; i++, n = NEXT(n) ) {
+			a = (STRING)BDY(n);
+			if ( !a ) return 0;
+			if ( OID(a) == O_STR )
+				r[i] = BDY(a);	
+			else if ( OID(a) == O_P )
+				r[i] = NAME(VR((P)a));	
+			else
 				return 0;
-				break;
 		}
+		dp_vars = r;
+		dp_vars_len = l;
+		return 1;
+	}
+}
+
+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_setenv(NODE arg,Obj *rp)
+void Pquotetotex_env(NODE arg,Obj *rp)
 {
 	int ac,i;
 	char *name;
@@ -267,7 +369,7 @@ void Pquotetotex_setenv(NODE arg,Obj *rp)
 		MKLIST(l,n0);
 		*rp = (Obj)l;
 	} 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) ) {
@@ -275,7 +377,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;
@@ -310,6 +412,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);
 }
@@ -320,6 +424,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;	
 }
@@ -634,17 +740,14 @@ 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 name;
 }
 
 void fnodetotex_tb(FNODE f,TB tb)
 {
 	NODE n,t,t0;
 	char vname[BUFSIZ];
-	char *opname;
+	char *opname,*vname_conv;
 	Obj obj;
 	int i,len,allzero;
 	FNODE fi,f2;
@@ -656,177 +759,168 @@ void fnodetotex_tb(FNODE f,TB tb)
 	}
 	switch ( f->id ) {
 		/* unary operators */
-		case I_NOT: case I_PAREN: case I_MINUS:
-			switch ( f->id ) {
-				case I_NOT:
-					write_tb("\\neg (",tb);
-					fnodetotex_tb((FNODE)FA0(f),tb);
-					write_tb(")",tb);
-					break;
-				case I_PAREN:
-					write_tb("(",tb);
-					fnodetotex_tb((FNODE)FA0(f),tb);
-					write_tb(")",tb);
-					break;
-				case I_MINUS:
-					write_tb("-",tb);
-					fnodetotex_tb((FNODE)FA0(f),tb);
-					break;
-			}
+		case I_NOT:
+			write_tb("\\neg (",tb);
+			fnodetotex_tb((FNODE)FA0(f),tb);
+			write_tb(")",tb);
 			break;
+		case I_PAREN:
+			write_tb("(",tb);
+			fnodetotex_tb((FNODE)FA0(f),tb);
+			write_tb(")",tb);
+			break;
+		case I_MINUS:
+			write_tb("-",tb);
+			fnodetotex_tb((FNODE)FA0(f),tb);
+			break;
 
 		/* binary operators */
-		case I_BOP: case I_COP: case I_LOP: case I_AND: case I_OR:
-			/* arg list */
-			/* I_AND, I_OR => FA0(f), FA1(f) */
-			/* otherwise   => FA1(f), FA2(f) */
-
-			/* op */
-			switch ( f->id ) {
-				case I_BOP:
-					opname = ((ARF)FA0(f))->name;
-					if ( !strcmp(opname,"+") ) {
-						fnodetotex_tb((FNODE)FA1(f),tb);
-						write_tb(opname,tb);
-						fnodetotex_tb((FNODE)FA2(f),tb);
-					} else if ( !strcmp(opname,"-") ) {
-						if ( FA1(f) ) fnodetotex_tb((FNODE)FA1(f),tb);
-						write_tb(opname,tb);
-						fnodetotex_tb((FNODE)FA2(f),tb);
-					} else if ( !strcmp(opname,"*") ) {
-						fnodetotex_tb((FNODE)FA1(f),tb);
-						write_tb(" ",tb);
-						/* XXX special care for DP */
-						f2 = (FNODE)FA2(f);
-						if ( f2->id == I_EV ) {
-							n = (NODE)FA0(f2);
-							for ( i = 0; n; n = NEXT(n), i++ ) {
-								fi = (FNODE)BDY(n);
-								if ( fi->id != I_FORMULA || FA0(fi) )
-									break;
-							}
-							if ( n )
-								fnodetotex_tb((FNODE)FA2(f),tb);
-						} else
-							fnodetotex_tb((FNODE)FA2(f),tb);
-					} else if ( !strcmp(opname,"/") ) {
-						write_tb("\\frac{",tb);
-						fnodetotex_tb((FNODE)FA1(f),tb);
-						write_tb("} {",tb);
-						fnodetotex_tb((FNODE)FA2(f),tb);
-						write_tb("}",tb);
-					} else if ( !strcmp(opname,"^") ) {
-						fnodetotex_tb((FNODE)FA1(f),tb);
-						write_tb("^{",tb);
-						fnodetotex_tb((FNODE)FA2(f),tb);
-						write_tb("} ",tb);
-					} else if ( !strcmp(opname,"%") ) {
-						fnodetotex_tb((FNODE)FA1(f),tb);
-						write_tb(" {\\rm mod}\\, ",tb);
-						fnodetotex_tb((FNODE)FA2(f),tb);
-					} else
-						error("invalid binary operator");
-
-				case I_COP:
-					switch( (cid)FA0(f) ) {
-						case C_EQ:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" = ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
+		/* arg list */
+		/* I_AND, I_OR => FA0(f), FA1(f) */
+		/* otherwise   => FA1(f), FA2(f) */
+		case I_BOP:
+			opname = ((ARF)FA0(f))->name;
+			if ( !strcmp(opname,"+") ) {
+				fnodetotex_tb((FNODE)FA1(f),tb);
+				write_tb(opname,tb);
+				fnodetotex_tb((FNODE)FA2(f),tb);
+			} else if ( !strcmp(opname,"-") ) {
+				if ( FA1(f) ) fnodetotex_tb((FNODE)FA1(f),tb);
+				write_tb(opname,tb);
+				fnodetotex_tb((FNODE)FA2(f),tb);
+			} else if ( !strcmp(opname,"*") ) {
+				fnodetotex_tb((FNODE)FA1(f),tb);
+				write_tb(" ",tb);
+				/* XXX special care for DP */
+				f2 = (FNODE)FA2(f);
+				if ( f2->id == I_EV ) {
+					n = (NODE)FA0(f2);
+					for ( i = 0; n; n = NEXT(n), i++ ) {
+						fi = (FNODE)BDY(n);
+						if ( fi->id != I_FORMULA || FA0(fi) )
 							break;
-						case C_NE:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\neq ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case C_GT:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\gt ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case C_LT:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\lt ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case C_GE:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\geq ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case C_LE:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\leq ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
 					}
-					break;
+					if ( n )
+						fnodetotex_tb((FNODE)FA2(f),tb);
+				} else
+					fnodetotex_tb((FNODE)FA2(f),tb);
+			} else if ( !strcmp(opname,"/") ) {
+				write_tb("\\frac{",tb);
+				fnodetotex_tb((FNODE)FA1(f),tb);
+				write_tb("} {",tb);
+				fnodetotex_tb((FNODE)FA2(f),tb);
+				write_tb("}",tb);
+			} else if ( !strcmp(opname,"^") ) {
+				fnodetotex_tb((FNODE)FA1(f),tb);
+				write_tb("^{",tb);
+				fnodetotex_tb((FNODE)FA2(f),tb);
+				write_tb("} ",tb);
+			} else if ( !strcmp(opname,"%") ) {
+				fnodetotex_tb((FNODE)FA1(f),tb);
+				write_tb(" {\\rm mod}\\, ",tb);
+				fnodetotex_tb((FNODE)FA2(f),tb);
+			} else
+				error("invalid binary operator");
+			break;
 
-				case I_LOP:
-					switch( (lid)FA0(f) ) {
-						case L_EQ:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" = ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_NE:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\neq ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_GT:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\gt ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_LT:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\lt ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_GE:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\geq ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_LE:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" \\leq ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_AND:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" {\\rm \\ and\\ } ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_OR:
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(" {\\rm \\ or\\ } ",tb);
-							fnodetotex_tb((FNODE)FA2(f),tb);
-							break;
-						case L_NOT:
-							/* XXX : L_NOT is a unary operator */
-							write_tb("\\neg (",tb);
-							fnodetotex_tb((FNODE)FA1(f),tb);
-							write_tb(")",tb);
-							return;
-					}
+		case I_COP:
+			switch( (cid)FA0(f) ) {
+				case C_EQ:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" = ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
 					break;
-
-				case I_AND:
-					fnodetotex_tb((FNODE)FA0(f),tb);
-					write_tb(" {\\rm \\ and\\ } ",tb);
+				case C_NE:
 					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\neq ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
 					break;
+				case C_GT:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\gt ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case C_LT:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\lt ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case C_GE:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\geq ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case C_LE:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\leq ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+			}
+			break;
 
-				case I_OR:
-					fnodetotex_tb((FNODE)FA0(f),tb);
-					write_tb(" {\\rm \\ or\\ } ",tb);
+		case I_LOP:
+			switch( (lid)FA0(f) ) {
+				case L_EQ:
 					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" = ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
 					break;
+				case L_NE:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\neq ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case L_GT:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\gt ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case L_LT:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\lt ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case L_GE:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\geq ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case L_LE:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" \\leq ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case L_AND:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" {\\rm \\ and\\ } ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case L_OR:
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(" {\\rm \\ or\\ } ",tb);
+					fnodetotex_tb((FNODE)FA2(f),tb);
+					break;
+				case L_NOT:
+					/* XXX : L_NOT is a unary operator */
+					write_tb("\\neg (",tb);
+					fnodetotex_tb((FNODE)FA1(f),tb);
+					write_tb(")",tb);
+					return;
 			}
 			break;
 
+		case I_AND:
+			fnodetotex_tb((FNODE)FA0(f),tb);
+			write_tb(" {\\rm \\ and\\ } ",tb);
+			fnodetotex_tb((FNODE)FA1(f),tb);
+			break;
+
+		case I_OR:
+			fnodetotex_tb((FNODE)FA0(f),tb);
+			write_tb(" {\\rm \\ or\\ } ",tb);
+			fnodetotex_tb((FNODE)FA1(f),tb);
+			break;
+
 		/* ternary operators */
 		case I_CE:
 			error("fnodetotex_tb : not implemented yet");
@@ -841,67 +935,82 @@ void fnodetotex_tb(FNODE f,TB tb)
 			break;
 
 		/* function */
-		case I_FUNC: case I_CAR: case I_CDR: case I_EV:
-			switch ( f->id ) {
-				case I_FUNC:
-					opname = symbol_name(((FUNC)FA0(f))->name);
+		case I_FUNC:
+			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 = conv_rule("car");
+			write_tb(opname,tb);
+			write_tb("(",tb);
+			fargstotex_tb(opname,FA0(f),tb);
+			write_tb(")",tb);
+			break;
+
+		case I_CDR:
+			opname = conv_rule("cdr");
+			write_tb(opname,tb);
+			write_tb("(",tb);
+			fargstotex_tb(opname,FA0(f),tb);
+			write_tb(")",tb);
+			break;
+
+		/* exponent vector */
+		case I_EV:
+			n = (NODE)FA0(f);
+			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 )
+					strcpy(vname,dp_vars[i]);
+				else if ( dp_vars_prefix )
+					sprintf(vname,"%s_{%d}",dp_vars_prefix,i);
+				else
+					sprintf(vname,"x_{%d}",i);
+				vname_conv = conv_rule(vname);
+				if ( fi->id == I_FORMULA && UNIQ(FA0(fi)) ) {
+					len = strlen(vname_conv);
+					opname = MALLOC_ATOMIC(len+2);
+					sprintf(opname,"%s ",vname_conv);
 					write_tb(opname,tb);
-					write_tb("(",tb);
-					fargstotex_tb(opname,FA1(f),tb);
-					write_tb(")",tb);
-					break;
-				case I_CAR:
-					opname = symbol_name("car");
+				} else {
+					len = strlen(vname_conv);
+					/* 2: ^{ */
+					opname = MALLOC_ATOMIC(len+1+2);
+					sprintf(opname,"%s^{",vname_conv);
 					write_tb(opname,tb);
-					write_tb("(",tb);
-					fargstotex_tb(opname,FA0(f),tb);
-					write_tb(")",tb);
-					break;
-				case I_CDR:
-					opname = symbol_name("cdr");
-					write_tb(opname,tb);
-					write_tb("(",tb);
-					fargstotex_tb(opname,FA0(f),tb);
-					write_tb(")",tb);
-					break;
-				case I_EV:
-					n = (NODE)FA0(f);
-					allzero = 1;
-					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 ( fi->id == I_FORMULA && UNIQ(FA0(fi)) ) {
-							sprintf(vname,"x_{%d}",i);
-							len = strlen(vname);
-							opname = MALLOC_ATOMIC(len+1);
-							strcpy(opname,vname);
-							write_tb(opname,tb);
-						} else {
-							sprintf(vname,"x_{%d}^{",i);
-							len = strlen(vname);
-							opname = MALLOC_ATOMIC(len+1);
-							strcpy(opname,vname);
-							write_tb(opname,tb);
-							fnodetotex_tb((FNODE)BDY(n),tb);
-							write_tb("} ",tb);
-						}
-					}
-					/* XXX */
-					if ( allzero )
-						write_tb(" 1 ",tb);
-					break;
+					fnodetotex_tb((FNODE)BDY(n),tb);
+					write_tb("} ",tb);
+				}
 			}
+			/* XXX */
+			if ( allzero )
+				write_tb(" 1 ",tb);
+			if ( show_lt && is_lt ) {
+				write_tb("}",tb);	
+				is_lt = 0;
+			}
 			break;
 
+		/* string */
 		case I_STR:
 			write_tb((char *)FA0(f),tb);
 			break;
 
+		/* internal object */
 		case I_FORMULA:
 			obj = (Obj)FA0(f);
 			if ( obj && OID(obj) == O_P ) {
-				opname = symbol_name(VR((P)obj)->name);
+				opname = conv_rule(VR((P)obj)->name);
 			} else {
 				len = estimate_length(CO,obj);
 				opname = (char *)MALLOC_ATOMIC(len+1);
@@ -911,6 +1020,7 @@ void fnodetotex_tb(FNODE f,TB tb)
 			write_tb(opname,tb);
 			break;
 
+		/* program variable */
 		case I_PVAR:
 			if ( FA1(f) )
 				error("fnodetotex_tb : not implemented yet");
@@ -926,6 +1036,7 @@ void fnodetotex_tb(FNODE f,TB tb)
 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);
 	}