===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.40
retrieving revision 1.47
diff -u -p -r1.40 -r1.47
--- OpenXM/src/kxx/ox_texmacs.c	2016/08/24 22:38:12	1.40
+++ OpenXM/src/kxx/ox_texmacs.c	2019/09/25 06:30:37	1.47
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.39 2016/03/31 05:27:34 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.46 2019/09/25 06:29:10 takayama Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,44 +22,58 @@
 /*
 #define DEBUG 
 */
-/* #define DEBUG2 */
+/*
+#define DEBUG2
+*/
 
 /* Type of View part (user interface engine) */
 #define  GENERIC      0   /* DEBUG, xml */
 #define  V_TEXMACS    1
 #define  V_CFEP       2
 #define  V_QFEP       3
+#define  V_SAGE       4
+#define  V_JUPYTER       5
 int View       = V_TEXMACS ;
 
 char *Data_begin_v[] = {
   "<S type=verbatim>",
   "\002verbatim:",
   "\002",
+  "",
+  "",
   ""
 };
 char *Data_begin_l[] = {
   "<S type=latex>",
   "\002latex:",
   "\002latex:",
+  "",
+  "",
   ""
 };
 char *Data_begin_p[] = {
   "<S type=prompt>",
   "\002prompt:",
   "\002prompt:",
+  "",
+  "",
   ""
 };
 char *Data_begin_ps[] = {
   "<S type=postscript>",
   "\002ps:",
   "\002ps:",
+  "",
+  "",
   ""
 };
 char *Data_end[] = {
   "</S>",
   "\005",
   "\n\005",    /* \n is not a part of the protocol. */
-  ""
+  "",
+  "",          /* SAGE */
+  "\n"
 };
 
 /* todo:  start_of_input */
@@ -68,9 +82,24 @@ 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    */
-  0x5
+  0x5,
+  '\n',   /* SAGE cf. __init__ */
+  '\n'
 };
 
+/* Note! if you give more than 10 Views, increase the number 10  below. 
+   See the option --prompt which should be given after --view is set.
+*/
+char *Prompt[10]={
+  "generic>", /* generic */
+  "", /* texmacs */
+  "",    /* cfep */
+  "",   /* qfep */
+  "\nasir>",    /* SAGE */
+  "\nPEXPECT_PROMPT>"
+};
+
+
 /* Table for the engine type. */
 #define ASIR          1
 #define SM1           2
@@ -98,6 +127,7 @@ int EngineLogToStdout = 0;   /* Do not run the ox engi
 char *AsirInitFile = NULL;
 
 char *LanguageResource = NULL;
+int TM_quiet = 0;
 
 void ctrlC();
 struct object KpoString(char *s);
@@ -113,6 +143,8 @@ static int startEngine(int type,char *msg);
 static int isPS(char *s);
 static int end_of_input(int c);
 static void setDefaultParameterForCfep();
+static void setDefaultParameterForSage();
+static void setDefaultParameterForJupyter();
 
 static void myEncoder(int c);
 static void myEncoderS(unsigned char *s);
@@ -126,7 +158,11 @@ static void pngNotAvailable(void);
 static char *pngGetResult();
 
 static void flushSm1();
+static int is_substr_of(char a[],char s[]);
+static void hexout(FILE *fp,char s[]);
+static int mystrncmp(char a[],char s[]);
 
+
 /* tail -f /tmp/debug-texmacs.txt 
    Debug output to understand the timing problem of pipe interface.
 */
@@ -149,10 +185,19 @@ main(int argc,char *argv[]) {
 #ifdef DEBUG2
   Dfp = fopen("/tmp/debug-texmacs.txt","w");
 #endif
-  
-  /* Initialize kanlib (gc is also initialized) */
-  KSstart();
 
+  TM_quiet=0;
+  for (i=1; i<argc; i++) {
+    if (strcmp(argv[i],"--quiet")==0) {
+      TM_quiet=1;
+    }
+  }
+  /* Initialize kanlib (gc is also initialized) */
+  if (TM_quiet) {
+    KSstart_quiet();
+  }else{
+    KSstart();
+  }
   /* Set consts */
   Quiet = 1;
   for (i=1; i<argc; i++) {
@@ -164,6 +209,10 @@ main(int argc,char *argv[]) {
         View = V_CFEP; setDefaultParameterForCfep();
       }else if (strcmp(argv[i],"qfep")==0) {
 	View = V_QFEP; setDefaultParameterForCfep();
+      }else if (strcmp(argv[i],"sage")==0) {
+	View = V_SAGE; setDefaultParameterForSage();
+      }else if (strcmp(argv[i],"jupyter")==0) {
+	View = V_JUPYTER; setDefaultParameterForJupyter();
       }else{
         View = GENERIC;
         /* printv("Unknown view type.\n"); */
@@ -194,6 +243,12 @@ main(int argc,char *argv[]) {
       i++;
       AsirInitFile = (char *)sGC_malloc(strlen(argv[i])+80);
       sprintf(AsirInitFile,"%s",argv[i]);
+    }else if (strcmp(argv[i],"--quiet") == 0) {
+      /* it is already set. Ignore. */
+    }else if (strcmp(argv[i],"--prompt")==0) {
+      i++;
+      Prompt[View] = (char *)sGC_malloc(strlen(argv[i])+2);
+      strcpy(Prompt[View],argv[i]);
     }else{
       /* printv("Unknown option\n"); */
     }
@@ -246,11 +301,17 @@ main(int argc,char *argv[]) {
       continue;
     } else {  }
     if (!irt) {
-      printf("%s",Data_end[View]); fflush(stdout);
+      if (View != V_SAGE) printf("%s",Data_end[View]); fflush(stdout);
     }
     irt = 0;
 
     /* Reading the input. */
+    if ((View == V_SAGE) || (View == V_JUPYTER)) {
+      if (s != NULL) {printf("%s",Prompt[View]); fflush(stdout);}
+      else {printf("%s",&(Prompt[View][1])); fflush(stdout);}
+    }else{
+      printf("%s",Prompt[View]); fflush(stdout);
+    }
     if (TM_Engine == K0) {
       s=readString(stdin, " ", " "); /* see test data */
     }else if (TM_Engine == SM1) {
@@ -398,6 +459,9 @@ static char *pngGetResult(void) {
       strcpy(s,tmp); \
     } 
 /*   */
+static char *Sss=NULL;
+static int Sss_size=10240;
+
 static char *readString(FILE *fp, char *prolog, char *epilog) {
   int n = 0;
   static int limit = 0;
@@ -424,30 +488,51 @@ static char *readString(FILE *fp, char *prolog, char *
   start = n;
   while ((c = fgetc(fp)) != EOF) {
 #ifdef DEBUG2
-    fprintf(Dfp,"[%x] ",c); fflush(Dfp); 
+    fprintf(Dfp,"[%x]%c ",c,c); fflush(Dfp); 
 #endif
     if (end_of_input(c)) {
       /* If there remains data in the stream,
          read the remaining data. (for debug) */
-	  /*
-      if (oxSocketSelect0(0,1)) {
-        if (c == '\n') c=' ';
+      /*
+      if ((View == V_JUPYTER) || (View == V_SAGE)) {
+        if (oxSocketSelect0(0,1)) {
+#ifdef DEBUG2
+          fprintf(Dfp,"<%x>%c ",c,c); fflush(Dfp); 
+#endif
+          if (c == '\n') c=' ';
+          s[n++] = c; s[n] = 0;  m++;
+          INC_BUF ;
+          continue;
+        }
+      }
+      */
+      if (View == V_JUPYTER) {
         s[n++] = c; s[n] = 0;  m++;
         INC_BUF ;
-        continue;
       }
-      */
       break;
     }
     if ( c == '\v') c=' ';
     s[n++] = c; s[n] = 0;  m++;
     INC_BUF ;
   }
+  if ((c == EOF) && (start == n)) exit(0); 
   /* Check the escape sequence */
-  if (strcmp(&(s[start]),"!quit;") == 0) {
+  if (mystrncmp(&(s[start]),"!quit;") == 0) {
     printv("Terminated the process ox_texmacs.\n"); 
     exit(0);
   }
+  if (((View == V_JUPYTER) || (View == V_SAGE)) && 
+      ((mystrncmp(&(s[start]),"quit")==0) || (mystrncmp(&(s[start]),"quit()")==0))) {
+    printv("Terminated the process ox_texmacs.\n"); 
+    exit(0);
+  }
+  if ((View == V_JUPYTER) && 
+      (mystrncmp(&(s[start]),"version")==0)) {
+    strcpy(&(s[start]),"version");
+    s[n=strlen(s)]='('; s[++n]=0; INC_BUF;
+    s[n++]=')'; s[n]=0; INC_BUF;
+  }
   /* Check the escape sequence to change the global env. */
   if (strcmp(&(s[start]),"!verbatim;") == 0) {
     if (View != V_CFEP) printv("Output mode is changed to verbatim mode.");
@@ -499,7 +584,44 @@ static char *readString(FILE *fp, char *prolog, char *
         s[i-3] = s[i-2] = s[i-1] = s[i] = ' '; break;
       }
     }
+
+    /* 2019.03.28 for jupyter */
+    if ((View == V_JUPYTER) && (mystrncmp(&(s[start]),"base_prompt") != 0)
+        &&(mystrncmp(&(s[start]),"version()") != 0)) {
+      if (Sss == NULL) {
+          Sss = (char *)sGC_malloc(Sss_size);
+          Sss[0] = 0;
+      }
+      if (Sss_size < strlen(Sss)+strlen(s)+strlen(epilog)-10) {
+        Sss_size = 2*Sss_size;
+        if (Sss_size < 0) { fprintf(stderr,"Fatal error: too big string\n"); exit(-1); }	
+        char *sss_tmp = (char *)sGC_malloc(Sss_size);
+	strcpy(sss_tmp,Sss);
+        Sss=sss_tmp;
+      }
+      strcpy(&(Sss[strlen(Sss)]),&(s[start]));
+      for (i=strlen(Sss); i>=0; i--) {
+	if (Sss[i] < 0x20) continue;
+        if ((Sss[i] == ';') && (Sss[i-1] == ';')) {
+          /* construct s and return s */
+          Sss[i] = ' ';
+          s = (char *) sGC_malloc(strlen(Sss)+strlen(prolog)+strlen(epilog)+10);
+          sprintf(s,"%s%s%s",prolog,Sss,epilog);
+          Sss[0]=0;
+#ifdef DEBUG2
+          fprintf(Dfp,"#By Sss: %s#\n",s); fflush(Dfp);
+#endif
+          return s;
+        }else break;
+      }
+      return NULL;
+    }
+  }else{
+#ifdef DEBUG2
+    fprintf(Dfp,"#base_prompt or version()#\n",s); fflush(Dfp);
+#endif
   }
+  /* end 2019.03.28 for jupyter. */
 
   /* Set TM_do_no_print */
   if (s[n-1] == '$' && TM_Engine == ASIR) {
@@ -512,6 +634,9 @@ static char *readString(FILE *fp, char *prolog, char *
     s[n++] = epilog[i];  s[n] = 0;
     INC_BUF ;
   }
+#ifdef DEBUG2
+  fprintf(Dfp,"#By normal readString:%s\n",s); hexout(Dfp,s); fprintf(Dfp,"\n"); fflush(Dfp);
+#endif
   return s;
 }
 
@@ -523,6 +648,12 @@ static int end_of_input(int c) {
 static void setDefaultParameterForCfep() {
   Format = 0;
 }
+static void setDefaultParameterForSage() {
+  Format = 0;
+}
+static void setDefaultParameterForJupyter() {
+  Format = 0;
+}
 
 static void printv(char *s) {
   int i;
@@ -530,7 +661,7 @@ static void printv(char *s) {
   printf("%s",s);
   printf("%s",Data_end[View]);
 #ifdef DEBUG2
-  fprintf(Dfp,"<%s>",s); fflush(Dfp);
+  fprintf(Dfp,"printv:<%s>",s); fflush(Dfp);
 #endif
   fflush(NULL);
 }
@@ -561,14 +692,14 @@ static void printp(char *s) {
   fflush(NULL);
 }
 static void printCopyright(char *s) {
-  printf("%s",Data_begin_v[View]);
   if (! NoCopyright) {
+    printf("%s",Data_begin_v[View]);
     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);
+    printf("%s",Data_end[View]);
   }
-  printf("%s",Data_end[View]);
   fflush(NULL);
 }
 
@@ -577,7 +708,7 @@ static void flushSm1() {
 }
 static int startEngine(int type,char *msg) {
   struct object ob = OINIT;
-  printf("%s",Data_begin_v[View]);
+  if (!TM_quiet) printf("%s",Data_begin_v[View]);
   if (type == SM1) {
     if (!TM_sm1Started) KSexecuteString(" sm1connectr ");
     KSexecuteString(" /ox.engine oxsm1.ccc def ");
@@ -633,7 +764,7 @@ static int startEngine(int type,char *msg) {
        not work. */
     KSexecuteString(" oxasir.ccc (print(\"----------- Messages from asir ------------------------------\")$ ) oxsubmit oxasir.ccc oxpopcmo ");
   }
-  printf("%s",Data_end[View]);
+  if (!TM_quiet) printf("%s",Data_end[View]);
   fflush(NULL);
 }
 
@@ -717,3 +848,30 @@ static void pngNotAvailable(void) {
   fflush(NULL);
 }
   
+/* Check if a is a substring of s */
+static int is_substr_of(char a[],char s[]) {
+  int n,m,i,j;
+  n = strlen(s);
+  m = strlen(a);
+  for (i=0; i<n-m; i++) {
+        for (j=0; j<m; j++) {
+          if (s[i+j] != a[j]) break;
+          if (j == m-1) return 1;
+        }
+  }
+  return 0;
+}
+
+static void hexout(FILE *fp,char s[]) {
+  int i;
+  for (i=0; i<strlen(s); i++) fprintf(fp,"%2x ",(unsigned char)s[i]);
+}
+static int mystrncmp(char a[],char s[]) {
+  int r;
+  r=strncmp(a,s,strlen(s));
+#ifdef DEBUG2
+  fprintf(Dfp,"mystrncmp(%s,%s)=%d\n",a,s,r); fflush(Dfp); 
+#endif
+  return r;
+}
+