===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.33
retrieving revision 1.36
diff -u -p -r1.33 -r1.36
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/09 07:25:35	1.33
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/10 05:37:24	1.36
@@ -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.32 2004/03/09 07:18:26 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.35 2004/03/10 05:27:03 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -83,6 +83,7 @@ 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},
@@ -384,6 +385,11 @@ void Pquotetotex_env(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_env");
 		name = BDY((STRING)ARG0(arg));
@@ -798,7 +804,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);
@@ -1087,5 +1093,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;
 	}
 }