===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.37
retrieving revision 1.41
diff -u -p -r1.37 -r1.41
--- OpenXM/src/kxx/ox_texmacs.c	2015/10/08 11:49:38	1.37
+++ OpenXM/src/kxx/ox_texmacs.c	2018/09/07 00:28:53	1.41
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.36 2015/09/28 07:01:27 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.40 2016/08/24 22:38:12 takayama Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,7 +9,6 @@
 #include "serversm.h"
 #include "ox_pathfinder.h"
 
-void *sGC_malloc(size_t size);
 #if defined(__CYGWIN__) || defined(__MSYS__)
 #define JMP_BUF sigjmp_buf
 #define SETJMP(env)  MYSIGSETJMP(env,1)
@@ -29,32 +28,38 @@ void *sGC_malloc(size_t size);
 #define  GENERIC      0   /* DEBUG, xml */
 #define  V_TEXMACS    1
 #define  V_CFEP       2
+#define  V_QFEP       3
 int View       = V_TEXMACS ;
 
 char *Data_begin_v[] = {
   "<S type=verbatim>",
   "\002verbatim:",
   "\002",
+  ""
 };
 char *Data_begin_l[] = {
   "<S type=latex>",
   "\002latex:",
-  "\002latex:"
+  "\002latex:",
+  ""
 };
 char *Data_begin_p[] = {
   "<S type=prompt>",
   "\002prompt:",
-  "\002prompt:"
+  "\002prompt:",
+  ""
 };
 char *Data_begin_ps[] = {
   "<S type=postscript>",
   "\002ps:",
-  "\002ps:"
+  "\002ps:",
+  ""
 };
 char *Data_end[] = {
   "</S>",
   "\005",
-  "\n\005"    /* \n is not a part of the protocol. */
+  "\n\005",    /* \n is not a part of the protocol. */
+  ""
 };
 
 /* todo:  start_of_input */
@@ -62,7 +67,8 @@ char *Data_end[] = {
 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,    /* CFEP_END_OF_INPUT    */
+  0x5
 };
 
 /* Table for the engine type. */
@@ -92,6 +98,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);
@@ -143,10 +150,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++) {
@@ -156,6 +172,8 @@ main(int argc,char *argv[]) {
         View = V_TEXMACS;
       }else if (strcmp(argv[i],"cfep")==0) {
         View = V_CFEP; setDefaultParameterForCfep();
+      }else if (strcmp(argv[i],"qfep")==0) {
+	View = V_QFEP; setDefaultParameterForCfep();
       }else{
         View = GENERIC;
         /* printv("Unknown view type.\n"); */
@@ -186,6 +204,8 @@ 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{
       /* printv("Unknown option\n"); */
     }
@@ -217,8 +237,8 @@ main(int argc,char *argv[]) {
   if (LanguageResource != NULL) KSexecuteString(LanguageResource);
   startEngine(TM_Engine," ");
 
-  if (signal(SIGINT,SIG_IGN) != SIG_IGN) {
-    signal(SIGINT,ctrlC);
+  if (mysignal(SIGINT,SIG_IGN) != SIG_IGN) {
+    mysignal(SIGINT,ctrlC);
   }
 
   irt = 0;
@@ -231,8 +251,8 @@ main(int argc,char *argv[]) {
         RestrictedMode = RestrictedMode_saved;
       }
       Calling_ctrlC_hook = 0; 
-      if (signal(SIGINT,SIG_IGN) != SIG_IGN) {
-        signal(SIGINT,ctrlC);
+      if (mysignal(SIGINT,SIG_IGN) != SIG_IGN) {
+        mysignal(SIGINT,ctrlC);
       }
       irt = 1;
       continue;