===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.23
retrieving revision 1.26
diff -u -p -r1.23 -r1.26
--- OpenXM/src/kxx/ox_texmacs.c	2006/01/21 12:04:47	1.23
+++ OpenXM/src/kxx/ox_texmacs.c	2006/01/26 10:24:55	1.26
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.22 2006/01/19 12:24:15 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.25 2006/01/26 07:38:32 takayama Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -52,15 +52,16 @@ char *Data_begin_ps[] = {
 char *Data_end[] = {
   "</S>",
   "\005",
-  "\n\005"
+  "\n\005"    /* \n is not a part of the protocol. */
 };
 
+/* todo:  start_of_input */
 
-/*
-#define TEXMACS_END_OF_INPUT  '#'
-*/
-#define TEXMACS_END_OF_INPUT '\n'
-#define CFEP_END_OF_INPUT 0x5
+char End_of_input[] = {
+  0x5,              /* Use ^E and Return to end the input. */
+  '\n',  /* TEXMACS_END_OF_INPUT. 0xd should be used for multiple lines. */
+  0x5    /* CFEP_END_OF_INPUT    */
+};
 
 /* Table for the engine type. */
 #define ASIR          1
@@ -83,6 +84,8 @@ int TM_do_not_print = 0;
 
 int Xm_noX = 0;
 int NoCopyright = 0;
+int Cpp = 0;                 /* Use cpp before sending to the engine. */ 
+int EngineLogToStdout = 0;   /* Do not run the ox engine inside xterm. */
 
 void ctrlC();
 struct object KpoString(char *s);
@@ -131,6 +134,7 @@ main(int argc,char *argv[]) {
       }else if (strcmp(argv[i],"cfep")==0) {
         View = V_CFEP; setDefaultParameterForCfep();
       }else{
+        View = GENERIC;
         /* printv("Unknown view type.\n"); */
       }
     } else if (strcmp(argv[i],"--sm1") == 0) {
@@ -146,6 +150,10 @@ main(int argc,char *argv[]) {
       Xm_noX = 1;
     }else if (strcmp(argv[i],"--noCopyright") == 0) {
       NoCopyright = 1;
+    }else if (strcmp(argv[i],"--cpp") == 0) {
+      Cpp = 1;
+    }else if (strcmp(argv[i],"--engineLogToStdout") == 0) {
+      EngineLogToStdout = 1;
     }else{
       /* printv("Unknown option\n"); */
     }
@@ -175,6 +183,7 @@ main(int argc,char *argv[]) {
   /* engine id should be set to ox.engine */
   KSexecuteString(" [(parse) (ox.sm1) pushfile] extension ");
   if (Xm_noX) KSexecuteString(" /Xm_noX 1 def ");
+  if (EngineLogToStdout) KSexecuteString(" /Xm_engineLogToStdout 1 def ");
   startEngine(TM_Engine," ");
 
   if (signal(SIGINT,SIG_IGN) != SIG_IGN) {
@@ -312,7 +321,7 @@ static char *readString(FILE *fp, char *prolog, char *
 #endif
     if (end_of_input(c)) {
       /* If there remains data in the stream,
-         read the remaining data. */
+         read the remaining data. (for debug) */
 	  /*
       if (oxSocketSelect0(0,1)) {
         if (c == '\n') c=' ';
@@ -381,23 +390,12 @@ static char *readString(FILE *fp, char *prolog, char *
 }
 
 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;
-  }
+  if (c == End_of_input[View]) return 1;
+  else return 0;
 }
+
 static void setDefaultParameterForCfep() {
   Format = 0;
-  NoCopyright = 1;
 }
 
 static void printv(char *s) {
@@ -439,8 +437,8 @@ static void printp(char *s) {
 static void printCopyright(char *s) {
   printf("%s",Data_begin_v[View]);
   if (! NoCopyright) {
-    printf("OpenXM engine (ox engine) interface for TeXmacs\n2004 (C) openxm.org");
-    printf(" under the BSD license.  !asir; !sm1; !k0; !verbatim;\n");
+    printf("OpenXM engine (ox engine) interface with TeXmacs protocol.\n2004 (C) openxm.org");
+    printf(" under the BSD license.  !asir; !sm1; !k0; !verbatim; !quit;\n");
     printf("Type in      !reset;     when the engine gets confused. ");
     printf("%s",s);
   }
@@ -478,8 +476,14 @@ static int startEngine(int type,char *msg) {
     KSexecuteString(" /ox.engine oxasir.ccc def ");
     TM_asirStarted = 1;
     printf("%s\n",msg);
-    if ( ! NoCopyright) {
+    if ((!NoCopyright) && ((char *)getenv("ASIR_CONFIG") != NULL)) {
       KSexecuteString(" oxasir.ccc (copyright()+asir_contrib_copyright();) oxsubmit oxasir.ccc oxpopstring ");
+      ob = KSpop();
+      if (ob.tag == Sdollar) {
+        printf("%s",ob.lc.str);
+      }
+    }else if ((!NoCopyright) && ((char *)getenv("ASIR_CONFIG") == NULL)) {
+      KSexecuteString(" oxasir.ccc (copyright();) oxsubmit oxasir.ccc oxpopstring ");
       ob = KSpop();
       if (ob.tag == Sdollar) {
         printf("%s",ob.lc.str);