===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox.c,v
retrieving revision 1.15
retrieving revision 1.20
diff -u -p -r1.15 -r1.20
--- OpenXM_contrib2/asir2000/io/ox.c	2002/08/02 02:28:27	1.15
+++ OpenXM_contrib2/asir2000/io/ox.c	2003/03/07 03:12:28	1.20
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.14 2002/07/25 04:47:41 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox.c,v 1.19 2003/02/14 22:29:15 ohara Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -125,6 +125,17 @@ static int available_cmo[] = {
 	0
 };
 
+static int asir_available_sm[] = {
+	SM_dupErrors, SM_getsp, SM_popSerializedLocalObject,
+	SM_popCMO, SM_popString, SM_pushCMOtag, SM_setName,
+	SM_evalName, SM_executeStringByLocalParser,
+	SM_executeStringByLocalParserInBatchMode,
+	SM_executeFunction, SM_shutdown, SM_pops,
+	SM_mathcap, SM_setMathcap, SM_nop,
+	SM_beginBlock, SM_endBlock,
+	0
+};
+
 static int ox_asir_available_sm[] = {
 	SM_dupErrors, SM_getsp, SM_popSerializedLocalObject,
 	SM_popCMO, SM_popString, SM_pushCMOtag, SM_setName,
@@ -141,7 +152,7 @@ static int ox_plot_available_sm[] = {
 	SM_popCMO, SM_popString, SM_setName,
 	SM_evalName, SM_executeStringByLocalParser,
 	SM_executeFunction, SM_shutdown, SM_pops,
-	SM_mathcap, SM_setMathcap,
+	SM_mathcap, SM_setMathcap, SM_nop,
 	0
 };
 
@@ -175,7 +186,11 @@ void create_my_mathcap(char *system)
 
 	/* sm tag */
 	n0 = 0;
-	if ( !strcmp(system,"ox_asir") ) {
+	if ( !strcmp(system,"asir") ) {
+		for ( i = 0; k = asir_available_sm[i]; i++ ) {
+			NEXTNODE(n0,n); MKUSINT(t,k); BDY(n) = (pointer)t;
+		}
+	} else if ( !strcmp(system,"ox_asir") ) {
 		for ( i = 0; k = ox_asir_available_sm[i]; i++ ) {
 			NEXTNODE(n0,n); MKUSINT(t,k); BDY(n) = (pointer)t;
 		}
@@ -385,6 +400,8 @@ void end_critical() {
 	}
 }
 
+extern FUNC registered_handler;
+
 void ox_usr1_handler(int sig)
 {
 #if !defined(VISUAL)
@@ -395,6 +412,12 @@ void ox_usr1_handler(int sig)
 		ox_usr1_sent = 1;
 	} else {
 		ox_flushing = 1;
+		if ( registered_handler ) {
+			fprintf(stderr,
+				"usr1 : calling the registered exception handler...");
+			bevalf(registered_handler,0);
+			fprintf(stderr, "done.\n");
+		}
 		ox_resetenv("usr1 : return to toplevel by SIGUSR1");
 	}
 }