===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.16
retrieving revision 1.22
diff -u -p -r1.16 -r1.22
--- OpenXM/src/kxx/ox_texmacs.c	2004/03/09 07:10:46	1.16
+++ OpenXM/src/kxx/ox_texmacs.c	2006/01/19 12:24:15	1.22
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.15 2004/03/09 02:53:05 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.21 2005/06/16 05:07:24 takayama Exp $ */
 
 #include <stdio.h>
 #include <setjmp.h>
@@ -25,18 +25,21 @@
 #define DATA_BEGIN_V  "<S type=verbatim>"     /* "\002verbatim:" */
 #define DATA_BEGIN_L  "<S type=latex>"        /* "\002latex:" */
 #define DATA_BEGIN_P  "<S type=prompt>"        /* "\002channel:prompt " */
+#define DATA_BEGIN_PS  "<S type=postscript>"        /* "\002ps: " */
 #define DATA_END      "</S>"    /* "\005" */
 #else
 #define DATA_BEGIN_V  "\002verbatim:"
 #define DATA_BEGIN_L  "\002latex:"
 #define DATA_BEGIN_P  "\002prompt:"
+#define DATA_BEGIN_PS  "\002ps:"
 #define DATA_END      "\005" 
 #endif
 
 /*
-#define END_OF_INPUT  '#'
+#define TEXMACS_END_OF_INPUT  '#'
 */
-#define END_OF_INPUT '\n'
+#define TEXMACS_END_OF_INPUT '\n'
+#define CFEP_END_OF_INPUT 0x5
 
 /* Table for the engine type. */
 #define ASIR          1
@@ -45,9 +48,16 @@
 
 extern int Quiet;
 extern JMP_BUF EnvOfStackMachine;
+extern int Calling_ctrlC_hook;
+extern int RestrictedMode, RestrictedMode_saved;
 int Format=1;  /* 1 : latex mode */
 int OutputLimit_for_TeXmacs = (1024*10);
 
+/* Type of View part (user interface engine) */
+#define  V_TEXMACS    1
+#define  V_CFEP       2
+int View       = V_TEXMACS ;
+
 int TM_Engine  = ASIR ;
 int TM_asirStarted = 0;
 int TM_sm1Started  = 0;
@@ -65,8 +75,12 @@ static char *readString(FILE *fp,char *prolog, char *e
 static void printv(char *s);
 static void printl(char *s);
 static void printp(char *s);
+static void printps(char *s);
 static void printCopyright(char *s);
 static int startEngine(int type,char *msg);
+static int isPS(char *s);
+static int end_of_input(int c);
+static void setDefaultParameterForCfep();
 
 /* tail -f /tmp/debug-texmacs.txt 
    Debug output to understand the timing problem of pipe interface.
@@ -77,7 +91,7 @@ main(int argc,char *argv[]) {
   char *s;
   char *r;
   char *sys;
-  struct object ob;
+  struct object ob = OINIT;
   int irt=0;
   int vmode=1;
   char *openxm_home;
@@ -99,22 +113,31 @@ main(int argc,char *argv[]) {
   /* Set consts */
   Quiet = 1;
   for (i=1; i<argc; i++) {
-	if (strcmp(argv[i],"--sm1") == 0) {
-	  TM_Engine = SM1;
-	}else if (strcmp(argv[i],"--asir") == 0) {
-	  TM_Engine = ASIR;
-	}else if (strcmp(argv[i],"--k0") == 0) {
-	  TM_Engine = K0;
+    if (strcmp(argv[i],"--view") == 0) {
+      i++;
+      if (strcmp(argv[i],"texmacs") == 0) {
+        View = V_TEXMACS;
+      }else if (strcmp(argv[i],"cfep")==0) {
+        View = V_CFEP; setDefaultParameterForCfep();
+      }else{
+        /* printv("Unknown view type.\n"); */
+      }
+    } else if (strcmp(argv[i],"--sm1") == 0) {
+      TM_Engine = SM1;
+    }else if (strcmp(argv[i],"--asir") == 0) {
+      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 if (strcmp(argv[i],"--noLogWindow") == 0) {
-	  Xm_noX = 1;
+      Xm_noX = 1;
     }else if (strcmp(argv[i],"--noCopyright") == 0) {
-	  NoCopyright = 1;
-	}else{
-	  /* printv("Unknown option\n"); */
-	}
+      NoCopyright = 1;
+    }else{
+      /* printv("Unknown option\n"); */
+    }
   }
 
   /* Initialize kanlib (gc is also initialized) */
@@ -138,7 +161,12 @@ main(int argc,char *argv[]) {
   while(1) {
     /* printp(sys);  no prompt */
     if (SETJMP(EnvOfStackMachine)) {
-      KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+      if (!Calling_ctrlC_hook) {
+        Calling_ctrlC_hook = 1; RestrictedMode = 0;
+        KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+        RestrictedMode = RestrictedMode_saved;
+      }
+      Calling_ctrlC_hook = 0; 
       if (signal(SIGINT,SIG_IGN) != SIG_IGN) {
         signal(SIGINT,ctrlC);
       }
@@ -192,15 +220,21 @@ main(int argc,char *argv[]) {
         KSexecuteString(" ox.engine oxpopstring ");
         r = KSpopString();
       }
-      if (strlen(r) < OutputLimit_for_TeXmacs) {
-        if (vmode) printv(r); else printl(r);
-      } else printv("Output is too large.\n");
+      if (isPS(r)) {
+        printps(r);
+      }else{
+        if (vmode) printv(r);
+        else{
+          if (strlen(r) < OutputLimit_for_TeXmacs) {
+            printl(r);
+          } else printv("Output is too large.\n");
+        }
+      }
     }else{
       if (!TM_do_not_print) {
         KSexecuteString(" ox.engine oxpopstring ");
         r = KSpopString();
-        if (strlen(r) < OutputLimit_for_TeXmacs) printv(r);
-        else printv("Output is too large.\n");
+        printv(r);
       }else{
         KSexecuteString(" ox.engine 1 oxpops "); /* Discard the result. */
         /* Push and pop dummy data to wait until the computation finishes. */
@@ -233,7 +267,7 @@ static char *readString(FILE *fp, char *prolog, char *
   int i;
   int m;
   int start;
-  struct object ob;
+  struct object ob = OINIT;
   if (limit == 0) {
     limit = 1024;
     s = (char *)sGC_malloc(limit);
@@ -252,18 +286,20 @@ static char *readString(FILE *fp, char *prolog, char *
 #ifdef DEBUG2
     fprintf(Dfp,"[%x] ",c); fflush(Dfp); 
 #endif
-    if (c == END_OF_INPUT) {
+    if (end_of_input(c)) {
+      /* If there remains data in the stream,
+         read the remaining data. */
+	  /*
       if (oxSocketSelect0(0,1)) {
-        /* If there remains data in the stream,
-           read the remaining data. */
         if (c == '\n') c=' ';
         s[n++] = c; s[n] = 0;  m++;
         INC_BUF ;
         continue;
       }
+      */
       break;
     }
-    if (c == '\n') c=' ';
+    if ( c == '\v') c=' ';
     s[n++] = c; s[n] = 0;  m++;
     INC_BUF ;
   }
@@ -320,6 +356,25 @@ static char *readString(FILE *fp, char *prolog, char *
   return s;
 }
 
+static int end_of_input(int c) {
+  switch(View) {
+  case V_TEXMACS:
+    if (c == TEXMACS_END_OF_INPUT) return 1;
+    else 0;
+    break;
+  case V_CFEP:
+    if (c == CFEP_END_OF_INPUT) return 1;
+    else 0;
+    break;
+  default:
+    if (c == '\n') return 1;
+    else 0;
+  }
+}
+static void setDefaultParameterForCfep() {
+  Format = 0;
+}
+
 static void printv(char *s) {
   int i;
   printf("%s",DATA_BEGIN_V);
@@ -336,6 +391,20 @@ static void printl(char *s) {
   printf("%s",DATA_END);
   fflush(NULL);
 }
+static int isPS(char *s) {
+  if (s[0] != '%') return 0;
+  if (s[1] != '%') return 0;
+  if (s[2] != '!') return 0;
+  if (s[3] != 'P') return 0;
+  if (s[4] != 'S') return 0;
+  return 1;
+}
+static void printps(char *s) {
+  printf("%s",DATA_BEGIN_PS);
+  printf("%s",s);
+  printf("%s",DATA_END);
+  fflush(NULL);
+}
 static void printp(char *s) {
   printf("%s",DATA_BEGIN_P);
   printf("%s",DATA_END);
@@ -355,7 +424,7 @@ static void printCopyright(char *s) {
 }
 
 static int startEngine(int type,char *msg) {
-  struct object ob;
+  struct object ob = OINIT;
   printf("%s",DATA_BEGIN_V);
   if (type == SM1) {
     if (!TM_sm1Started) KSexecuteString(" sm1connectr ");