===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v
retrieving revision 1.33
retrieving revision 1.40
diff -u -p -r1.33 -r1.40
--- OpenXM/src/kxx/ox_texmacs.c	2006/03/06 08:55:31	1.33
+++ OpenXM/src/kxx/ox_texmacs.c	2016/08/24 22:38:12	1.40
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.32 2006/03/03 10:55:33 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.39 2016/03/31 05:27:34 takayama Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,14 +9,14 @@
 #include "serversm.h"
 #include "ox_pathfinder.h"
 
-#if defined(__CYGWIN__)
+#if defined(__CYGWIN__) || defined(__MSYS__)
 #define JMP_BUF sigjmp_buf
-#define SETJMP(env)  sigsetjmp(env,1)
-#define LONGJMP(env,p)  siglongjmp(env,p)
+#define SETJMP(env)  MYSIGSETJMP(env,1)
+#define LONGJMP(env,p)  MYSIGLONGJMP(env,p)
 #else
 #define JMP_BUF jmp_buf
-#define SETJMP(env)  setjmp(env)
-#define LONGJMP(env,p)  longjmp(env,p)
+#define SETJMP(env)  MYSETJMP(env)
+#define LONGJMP(env,p)  MYLONGJMP(env,p)
 #endif
 
 /*
@@ -28,32 +28,38 @@
 #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 */
@@ -61,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. */
@@ -143,6 +150,9 @@ main(int argc,char *argv[]) {
   Dfp = fopen("/tmp/debug-texmacs.txt","w");
 #endif
   
+  /* Initialize kanlib (gc is also initialized) */
+  KSstart();
+
   /* Set consts */
   Quiet = 1;
   for (i=1; i<argc; i++) {
@@ -152,6 +162,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"); */
@@ -194,8 +206,6 @@ main(int argc,char *argv[]) {
     exit(10);
   }
 
-  /* Initialize kanlib (gc is also initialized) */
-  KSstart();
 
   /* Main loop */
   printf("%s",Data_begin_v[View]);
@@ -215,8 +225,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;
@@ -229,8 +239,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;
@@ -612,12 +622,12 @@ static int startEngine(int type,char *msg) {
     /* Initialize the setting of asir. */
     if (AsirInitFile) {  /* cf. asir-contrib/packages/src/cfep-init.rr */
 	  unsigned char *ss;
-	  ss = (unsigned char *)GC_malloc(strlen(AsirInitFile)+256);
+	  ss = (unsigned char *)sGC_malloc(strlen(AsirInitFile)+256);
 	  sprintf((char *)ss," oxasir.ccc (load(\"%s\");) oxsubmit oxasir.ccc oxgeterrors length 0 gt { (Error in loading asirInitFile) message} { } ifelse ",AsirInitFile);
 	  /* printf("Loading --asirInitFile %s\n",AsirInitFile); */
 	  KSexecuteString(ss);
     }
-    KSexecuteString(" oxasir.ccc (if(1) {  Xm_server_mode = 1; Xm_helpdir = \"help-eg\";  } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo ");
+    KSexecuteString(" oxasir.ccc (if(1) {  Xm_server_mode = 1; Xm_helpdir = \"help-en\";  } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo ");
     KSexecuteString(" oxasir.ccc (if(1) {  ctrl(\"message\",0);  } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo ");
     /* bug; if ctrl is written with Xm_helpdir = ... without oxpopcmo, then it does
        not work. */
@@ -698,8 +708,7 @@ static int pngCheck(void) {
   if (checked) return ans;
   checked = 1;
   if (!getCommandPath("latex")) return 0;
-  if (!getCommandPath("dvips")) return 0;
-  if (!getCommandPath("pstoimg")) return 0;
+  if (!getCommandPath("dvipng")) return 0;
   ans = 1;  return 1;
 }
 static void pngNotAvailable(void) {