===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.39
retrieving revision 1.42
diff -u -p -r1.39 -r1.42
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/11 04:52:17	1.39
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/12 02:15:23	1.42
@@ -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.38 2004/03/11 03:39:39 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.41 2004/03/12 02:06:48 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -121,6 +121,7 @@ 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 **dp_vars;
 static int dp_vars_len;
@@ -155,39 +156,51 @@ static struct {
 char *conv_rule(char *name)
 {
 	char *body,*r;
+	int len;
 
 	if ( convfunc )
 		name = call_convfunc(name);
-	if ( conv_flag & CONV_DMODE ) {
-		if ( *name == 'd' ) {
-			body = conv_flag&CONV_SUBS?conv_subs(name+1):symbol_name(name+1);
-			if ( !body ) {
-				r = MALLOC_ATOMIC((strlen(PARTIAL)+1)*sizeof(char));
-				strcpy(r,PARTIAL);
-			} else {
-				r = MALLOC_ATOMIC((strlen(PARTIAL)+strlen(body)+5)
-					*sizeof(char));
-				sprintf(r,strlen(body)==1?"{%s}_%s":"{%s}_{%s}",PARTIAL,body);
-			}
-			return r;
-		} else
-			return conv_flag&CONV_SUBS?conv_subs(name):symbol_name(name);
-	} else 
-		return conv_flag&CONV_SUBS?conv_subs(name):symbol_name(name);
+	if ( conv_flag & CONV_TABLE ) {
+		r = symbol_name(name);
+		if ( r ) return r;
+	}
+	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
+			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;
+	char *buf,*head,*r,*h,*brace,*buf_conv;
 	char **subs;
 
-	len = strlen(name);
-	if ( !len ) return 0;
+	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) && 
-			(name[i] == ' ' || name[i] == '_' || name[i] == ',') ) i++;
+		while ( (i < len) && _is_delimiter(name[i]) ) i++;
 		start = i;
 		if ( i == len ) break;
 		if ( name[i] == '{' ) {
@@ -212,11 +225,12 @@ char *conv_subs(char *name)
 			if ( isdigit(name[i]) )
 				while ( i < len && isdigit(name[i]) ) i++;
 			else
-				while ( i < len && (isalpha(name[i]) || name[i] == '\\') ) i++;
+				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;
-			subs[j] = symbol_name(buf);
+			buf_conv = symbol_name(buf);
+			subs[j] = buf_conv?buf_conv:buf;
 		}
 	}
 	for ( k = 0, clen = 0; k < j; k++ ) clen += strlen(subs[k]);
@@ -764,6 +778,8 @@ char *symbol_name(char *name)
 {
 	int i;
 
+	if ( !name || strlen(name) == 0 )
+		return "";
 	if ( !(conv_flag & CONV_TABLE) )
 		return name;
 
@@ -774,7 +790,7 @@ char *symbol_name(char *name)
 	for ( i = 0; texsymbol[i].text; i++ )
 		if ( !strcmp(texsymbol[i].text,name) )
 			return texsymbol[i].symbol;
-	return name;
+	return 0;
 }
 
 void fnodetotex_tb(FNODE f,TB tb)
@@ -784,6 +800,8 @@ void fnodetotex_tb(FNODE f,TB tb)
 	char *opname,*vname_conv,*prefix_conv;
 	Obj obj;
 	int i,len,allzero,elen,elen2;
+	C cplx;
+	char *r;
 	FNODE fi,f2;
 
 	write_tb(" ",tb);
@@ -970,11 +988,17 @@ void fnodetotex_tb(FNODE f,TB tb)
 
 		/* function */
 		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);
+			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 */
@@ -1061,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 = conv_rule(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 )
+				write_tb("0",tb);
+			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 */
@@ -1083,6 +1124,18 @@ void fnodetotex_tb(FNODE f,TB tb)
 		default:
 			error("fnodetotex_tb : not implemented yet");
 	}
+}
+
+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)