===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.24
retrieving revision 1.27
diff -u -p -r1.24 -r1.27
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/05 01:19:09	1.24
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2004/03/05 05:15:47	1.27
@@ -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.23 2004/03/05 01:15:48 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.26 2004/03/05 01:47:19 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -113,10 +113,16 @@ 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;
-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 struct {
 	char *name;
@@ -126,6 +132,8 @@ static struct {
 	{"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},
 };
 
@@ -162,7 +170,9 @@ char *conv_rule_d(char *name)
 	b[j++] = '_'; b[j++] = '{';
 	if ( name[i] == '_' ) i++;
 	for ( start = 1; i < l; ) {
-		if ( name[i] == '_' ) {
+		if ( name[i] == '{' || name[i] == '}' || name[i] == ' ' )
+			b[j++] = name[i++];
+		else if ( name[i] == '_' ) {
 			i++;
 			start = 1;
 			b[j++] = ',';
@@ -197,6 +207,19 @@ END:
 	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,6 +266,14 @@ 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) ) {
@@ -259,6 +290,12 @@ int register_conv_rule(Obj arg)
 				return 0;
 				break;
 		}
+	} 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 */
+		conv_rule = call_convfunc;
+		return 1;
 	} else return 0;
 }
 
@@ -272,6 +309,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,6 +332,20 @@ int register_dp_vars(Obj arg)
 	}
 }
 
+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;
@@ -356,6 +408,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 +420,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;	
 }
@@ -907,12 +963,16 @@ void fnodetotex_tb(FNODE f,TB tb)
 		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 = symbol_name(vname);
@@ -934,6 +994,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 */
@@ -971,6 +1035,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);
 	}