===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.42
retrieving revision 1.46
diff -u -p -r1.42 -r1.46
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/12 02:15:23	1.42
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/25 01:56:00	1.46
@@ -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.41 2004/03/12 02:06:48 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.45 2004/03/25 01:31:03 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -118,6 +118,9 @@ 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_origin(Obj arg);
+int register_dp_dvars_origin(Obj arg);
+int register_dp_dvars_prefix(Obj arg);
 int register_dp_vars_prefix(Obj arg);
 int register_dp_vars_hweyl(Obj arg);
 int register_show_lt(Obj arg);
@@ -126,6 +129,9 @@ static struct TeXSymbol *user_texsymbol;
 static char **dp_vars;
 static int dp_vars_len;
 static char *dp_vars_prefix;
+static char *dp_dvars_prefix;
+static int dp_vars_origin;
+static int dp_dvars_origin;
 static int show_lt;
 static FUNC convfunc;
 static int is_lt;
@@ -146,6 +152,9 @@ static struct {
 	{"conv_func",0,register_conv_func},
 	{"dp_vars",0,register_dp_vars},
 	{"dp_vars_prefix",0,register_dp_vars_prefix},
+	{"dp_dvars_prefix",0,register_dp_dvars_prefix},
+	{"dp_vars_origin",0,register_dp_vars_origin},
+	{"dp_dvars_origin",0,register_dp_dvars_origin},
 	{"dp_vars_hweyl",0,register_dp_vars_hweyl},
 	{"show_lt",0,register_show_lt},
 	{0,0,0},
@@ -309,6 +318,22 @@ int register_symbol_table(Obj arg)
 	return 1;
 }
 
+int register_dp_vars_origin(Obj arg)
+{
+	if ( INT(arg) ) {
+		dp_vars_origin = QTOS((Q)arg);
+		return 1;
+	} else return 0;
+}
+
+int register_dp_dvars_origin(Obj arg)
+{
+	if ( INT(arg) ) {
+		dp_dvars_origin = QTOS((Q)arg);
+		return 1;
+	} else return 0;
+}
+
 int register_dp_vars_hweyl(Obj arg)
 {
 	if ( INT(arg) ) {
@@ -336,7 +361,10 @@ int register_conv_rule(Obj arg)
 
 int register_conv_func(Obj arg)
 {
-	if ( OID(arg) == O_P && (int)(VR((P)arg))->attr == V_SR ) {
+	if ( !arg ) {
+		convfunc = 0;
+		return 1;
+	} else 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;
@@ -390,6 +418,20 @@ int register_dp_vars_prefix(Obj arg)
 	} else return 0;
 }
 
+int register_dp_dvars_prefix(Obj arg)
+{
+	if ( !arg ) {
+		dp_dvars_prefix = 0;
+		return 1;
+	} else if ( OID(arg) == O_STR ) {
+		dp_dvars_prefix = BDY((STRING)arg);
+		return 1;
+	} else if ( OID(arg) == O_P ) {
+		dp_dvars_prefix = NAME(VR((P)arg));
+		return 1;
+	} else return 0;
+}
+
 void Pquotetotex_env(NODE arg,Obj *rp)
 {
 	int ac,i;
@@ -410,8 +452,10 @@ void Pquotetotex_env(NODE arg,Obj *rp)
 		*rp = (Obj)l;
 	} else if ( ac == 1 && !ARG0(arg) ) {
 		/* set to default */
-		for ( i = 0; qtot_env[i].name; i++ )
+		for ( i = 0; qtot_env[i].name; i++ ) {
+			(qtot_env[i].reg)(0);
 			qtot_env[i].value = 0;
+		}
 		*rp = 0;
 	} else if ( ac == 1 || ac == 2 ) {
 		asir_assert(ARG0(arg),O_STR,"quotetotex_env");
@@ -799,7 +843,7 @@ void fnodetotex_tb(FNODE f,TB tb)
 	char vname[BUFSIZ],prefix[BUFSIZ];
 	char *opname,*vname_conv,*prefix_conv;
 	Obj obj;
-	int i,len,allzero,elen,elen2;
+	int i,len,allzero,elen,elen2,si;
 	C cplx;
 	char *r;
 	FNODE fi,f2;
@@ -889,12 +933,12 @@ void fnodetotex_tb(FNODE f,TB tb)
 					break;
 				case C_GT:
 					fnodetotex_tb((FNODE)FA1(f),tb);
-					write_tb(" \\gt ",tb);
+					write_tb(" > ",tb);
 					fnodetotex_tb((FNODE)FA2(f),tb);
 					break;
 				case C_LT:
 					fnodetotex_tb((FNODE)FA1(f),tb);
-					write_tb(" \\lt ",tb);
+					write_tb(" < ",tb);
 					fnodetotex_tb((FNODE)FA2(f),tb);
 					break;
 				case C_GE:
@@ -924,12 +968,12 @@ void fnodetotex_tb(FNODE f,TB tb)
 					break;
 				case L_GT:
 					fnodetotex_tb((FNODE)FA1(f),tb);
-					write_tb(" \\gt ",tb);
+					write_tb(" > ",tb);
 					fnodetotex_tb((FNODE)FA2(f),tb);
 					break;
 				case L_LT:
 					fnodetotex_tb((FNODE)FA1(f),tb);
-					write_tb(" \\lt ",tb);
+					write_tb(" < ",tb);
 					fnodetotex_tb((FNODE)FA2(f),tb);
 					break;
 				case L_GE:
@@ -1038,20 +1082,33 @@ void fnodetotex_tb(FNODE f,TB tb)
 					vname_conv = conv_rule(vname);
 				} else {
 					if ( dp_vars_hweyl ) {
-						if ( i < elen2 )
+						if ( i < elen2 ) {
 							strcpy(prefix,dp_vars_prefix?dp_vars_prefix:"x");
-						else if ( i < elen )
-							strcpy(prefix,"\\partial");
-						else
+							prefix_conv = conv_rule(prefix);
+							vname_conv = (char *)ALLOCA(strlen(prefix_conv)+50);
+							si = i+dp_vars_origin;
+							sprintf(vname_conv,(si>=0&&si<10)?"%s_%d":"%s_{%d}",
+								prefix_conv,si);
+						} else if ( i < elen ) {
+							strcpy(prefix,
+								dp_dvars_prefix?dp_dvars_prefix:"\\partial");
+							prefix_conv = conv_rule(prefix);
+							vname_conv = (char *)ALLOCA(strlen(prefix_conv)+50);
+							si = i+dp_dvars_origin-elen2;
+							sprintf(vname_conv,(si>=0&&si<10)?"%s_%d":"%s_{%d}",
+								prefix_conv,si);
+						} else {
 							strcpy(prefix,"h");
-					} else
+							vname_conv = conv_rule(prefix);
+						}
+					} 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);
+						prefix_conv = conv_rule(prefix);
+						vname_conv = (char *)ALLOCA(strlen(prefix_conv)+50);
+						si = i+dp_vars_origin;
+						sprintf(vname_conv,(si>=0&&si<10)?"%s_%d":"%s_{%d}",
+							prefix_conv,si);
+					}
 				}
 				if ( fi->id == I_FORMULA && UNIQ(FA0(fi)) ) {
 					len = strlen(vname_conv);