=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v retrieving revision 1.28 retrieving revision 1.36 diff -u -p -r1.28 -r1.36 --- OpenXM/src/kxx/ox_texmacs.c 2006/02/02 07:07:22 1.28 +++ OpenXM/src/kxx/ox_texmacs.c 2015/09/28 07:01:27 1.36 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.27 2006/02/01 04:16:54 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.35 2009/02/22 16:40:05 ohara Exp $ */ #include #include @@ -7,7 +7,9 @@ #include #include "ox_kan.h" #include "serversm.h" +#include "ox_pathfinder.h" +void *sGC_malloc(size_t size); #if defined(__CYGWIN__) #define JMP_BUF sigjmp_buf #define SETJMP(env) sigsetjmp(env,1) @@ -72,7 +74,7 @@ extern int Quiet; extern JMP_BUF EnvOfStackMachine; extern int Calling_ctrlC_hook; extern int RestrictedMode, RestrictedMode_saved; -int Format=1; /* 1 : latex mode */ +int Format=1; /* 1 : latex mode, 2: cfep_png */ int OutputLimit_for_TeXmacs = (1024*10); @@ -87,6 +89,10 @@ int NoCopyright = 0; int Cpp = 0; /* Use cpp before sending to the engine. */ int EngineLogToStdout = 0; /* Do not run the ox engine inside xterm. */ +char *AsirInitFile = NULL; + +char *LanguageResource = NULL; + void ctrlC(); struct object KpoString(char *s); char *KSpopString(void); @@ -108,6 +114,13 @@ static void myEncoderSn(unsigned char *s,int n); static void outputStringToTunnel0(int channel, unsigned char *s, int size, int view); static void outputStringToTunnel(int channel, unsigned char *s, int view); +static void pngSendFile(char *path); +static int pngCheck(void); +static void pngNotAvailable(void); +static char *pngGetResult(); + +static void flushSm1(); + /* tail -f /tmp/debug-texmacs.txt Debug output to understand the timing problem of pipe interface. */ @@ -122,6 +135,7 @@ main(int argc,char *argv[]) { int vmode=1; char *openxm_home; char *asir_config; + char *path; int i; @@ -130,6 +144,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= limit-3) { \ tmp = s; \ @@ -376,7 +442,7 @@ static char *readString(FILE *fp, char *prolog, char * } /* Check the escape sequence to change the global env. */ if (strcmp(&(s[start]),"!verbatim;") == 0) { - printv("Output mode is changed to verbatim mode."); + if (View != V_CFEP) printv("Output mode is changed to verbatim mode."); Format=0; return NULL; } @@ -385,6 +451,13 @@ static char *readString(FILE *fp, char *prolog, char * Format = 1; return NULL; } + if (strcmp(&(s[start]),"!cfep_png;") == 0) { + if (pngCheck()) { + if (View != V_CFEP) printv("Output mode is changed to cfep_png/verbose."); + Format = 2; + } else pngNotAvailable(); + return NULL; + } if (strcmp(&(s[start]),"!asir;") == 0) { Format=1; TM_Engine=ASIR; startEngine(TM_Engine,"Asir"); @@ -408,6 +481,18 @@ static char *readString(FILE *fp, char *prolog, char * return NULL; } + /* remove end$ or end; */ + if (TM_Engine == ASIR) { + for (i=n-1; i>=4; i--) { + if ((s[i-4]=='\n') && (s[i-3]=='e') && (s[i-2]=='n') && (s[i-1]=='d') && (s[i]=='$')) { + s[i-3] = s[i-2] = s[i-1] = s[i] = ' '; break; + } + if ((s[i-4]=='\n') && (s[i-3]=='e') && (s[i-2]=='n') && (s[i-1]=='d') && (s[i]==';')) { + s[i-3] = s[i-2] = s[i-1] = s[i] = ' '; break; + } + } + } + /* Set TM_do_no_print */ if (s[n-1] == '$' && TM_Engine == ASIR) { TM_do_not_print = 1; s[n-1] = ' '; @@ -479,6 +564,9 @@ static void printCopyright(char *s) { fflush(NULL); } +static void flushSm1() { + KSexecuteString(" oxsm1.ccc ( [(flush)] extension pop ) oxsubmit "); +} static int startEngine(int type,char *msg) { struct object ob = OINIT; printf("%s",Data_begin_v[View]); @@ -489,6 +577,7 @@ static int startEngine(int type,char *msg) { KSexecuteString(" oxsm1.ccc ( [(cmoLispLike) 0] extension ) oxsubmit "); KSexecuteString(" oxsm1.ccc ( ox_server_mode ) oxsubmit "); KSexecuteString(" oxsm1.ccc ( ( ) message (------------- Message from sm1 ----------------)message ) oxsubmit "); + flushSm1(); TM_sm1Started = 1; /* Welcome message. BUG. Copyright should be returned by a function. */ if (! NoCopyright) { @@ -498,7 +587,7 @@ static int startEngine(int type,char *msg) { printf("Info: http://www.math.kobe-u.ac.jp/KAN, kan@math.kobe-u.ac.jp.\n"); printf("0 usages to show a list of functions. \n(keyword) usages to see a short description\n"); } - printf("%s\n",msg); + printf("%s\n",msg); fflush(NULL); }else if (type == K0) { if (!TM_k0Started) KSexecuteString(" k0connectr "); KSexecuteString(" /ox.engine oxk0.ccc def "); @@ -523,7 +612,14 @@ static int startEngine(int type,char *msg) { } } /* Initialize the setting of asir. */ - KSexecuteString(" oxasir.ccc (if(1) { Xm_server_mode = 1; Xm_helpdir = \"help-eg\"; } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo "); + if (AsirInitFile) { /* cf. asir-contrib/packages/src/cfep-init.rr */ + unsigned char *ss; + 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-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. */ @@ -554,7 +650,7 @@ static void myEncoder(int c) { } static void myEncoderS(unsigned char *s) { int i,n; - n = strlen(s); + n = strlen((char *)s); for (i = 0; i}",0); }else if (view == V_CFEP) { - sprintf(ts,"{%d<%d ",channel,n+1); + sprintf((char *)ts,"{%d<%d ",channel,n+1); myEncoderS(ts); myEncoderSn(s,n); myEncoder(0); - myEncoderS(">}"); + myEncoderS((unsigned char *)">}"); } fflush(stdout); } @@ -590,5 +686,26 @@ static void outputStringToTunnel(int channel, unsigned } - +static void pngSendFile(char *path) { + char s[1024]; + if (strlen(path) > 1000) return; + sprintf(s,"showFile,%s",path); + outputStringToTunnel0(10,(unsigned char *)s,strlen(s),View); + printf("\n"); + fflush(NULL); +} +static int pngCheck(void) { + static int checked = 0; + static int ans = 0; + if (checked) return ans; + checked = 1; + if (!getCommandPath("latex")) return 0; + if (!getCommandPath("dvipng")) return 0; + ans = 1; return 1; +} +static void pngNotAvailable(void) { + char *s = "notAvailable"; + outputStringToTunnel0(10,(unsigned char *)s,strlen(s),View); + fflush(NULL); +}