===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -p -r1.10 -r1.14
--- OpenXM/src/kxx/ox_texmacs.c	2004/03/03 06:09:29	1.10
+++ OpenXM/src/kxx/ox_texmacs.c	2004/03/04 12:29:58	1.14
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.9 2004/03/03 02:31:50 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.13 2004/03/04 06:29:16 takayama Exp $ */
 
 #include <stdio.h>
 #include <setjmp.h>
@@ -102,8 +102,11 @@ main(int argc,char *argv[]) {
 	  TM_Engine = ASIR;
 	}else if (strcmp(argv[i],"--k0") == 0) {
 	  TM_Engine = K0;
+    }else if (strcmp(argv[i],"--outputLimit") == 0) {
+      i++;
+      sscanf(argv[i],"%d",&OutputLimit_for_TeXmacs);
 	}else{
-	  printv("Unknown option\n");
+	  /* printv("Unknown option\n"); */
 	}
   }
 
@@ -192,6 +195,9 @@ main(int argc,char *argv[]) {
         else printv("Output is too large.\n");
       }else{
         KSexecuteString(" ox.engine 1 oxpops "); /* Discard the result. */
+        /* Push and pop dummy data to wait until the computation finishes. */
+        KSexecuteString(" ox.engine 0 oxpushcmo ox.engine oxpopcmo ");
+        ob = KSpop();
         printv("");
       }
     }
@@ -219,6 +225,7 @@ static char *readString(FILE *fp, char *prolog, char *
   int i;
   int m;
   int start;
+  struct object ob;
   if (limit == 0) {
     limit = 1024;
     s = (char *)sGC_malloc(limit);
@@ -252,17 +259,12 @@ static char *readString(FILE *fp, char *prolog, char *
     s[n++] = c; s[n] = 0;  m++;
     INC_BUF ;
   }
-  if (s[n-1] == '$' && TM_Engine == ASIR) {
-	TM_do_not_print = 1; s[n-1] = ' ';
-  } else if (s[n-1] == ';' && TM_Engine == SM1) {
-	TM_do_not_print = 1; s[n-1] = ' ';
-  } else TM_do_not_print = 0;
   /* Check the escape sequence */
   if (strcmp(&(s[start]),"!quit;") == 0) {
     printv("Terminated the process ox_texmacs.\n"); 
     exit(0);
   }
-  /* Check the escape sequence to change the globa env. */
+  /* Check the escape sequence to change the global env. */
   if (strcmp(&(s[start]),"!verbatim;") == 0) {
     printv("Output mode is changed to verbatim mode.");
     Format=0;
@@ -288,7 +290,21 @@ static char *readString(FILE *fp, char *prolog, char *
     TM_Engine=K0; startEngine(TM_Engine,"k0");
     return NULL;
   }
+  if (strcmp(&(s[start]),"!reset;") == 0) {
+	printf("%s",DATA_BEGIN_V);
+    KSexecuteString(" ox.engine oxreset ox.engine oxpopcmo ");
+	ob = KSpop();
+	printf("%s",DATA_END); fflush(stdout);
+    return NULL;
+  }
 
+  /* Set TM_do_no_print */
+  if (s[n-1] == '$' && TM_Engine == ASIR) {
+	TM_do_not_print = 1; s[n-1] = ' ';
+  } else if (s[n-1] == ';' && TM_Engine == SM1) {
+	TM_do_not_print = 1; s[n-1] = ' ';
+  } else TM_do_not_print = 0;
+
   for (i=0; i < strlen(epilog); i++) {
     s[n++] = epilog[i];  s[n] = 0;
     INC_BUF ;
@@ -321,7 +337,8 @@ static void printp(char *s) {
 static void printCopyright(char *s) {
   printf("%s",DATA_BEGIN_V);
   printf("OpenXM engine (ox engine) interface for TeXmacs\n2004 (C) openxm.org");
-  printf(" under the BSD licence.  !asir; !sm1; !k0; !verbatim;");
+  printf(" under the BSD licence.  !asir; !sm1; !k0; !verbatim;\n");
+  printf("Type in      !reset;     when the engine gets confused. ");
   printf("%s",s);
   printf("%s",DATA_END);
   fflush(NULL);