=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v retrieving revision 1.28 retrieving revision 1.31 diff -u -p -r1.28 -r1.31 --- OpenXM/src/kxx/ox_texmacs.c 2006/02/02 07:07:22 1.28 +++ OpenXM/src/kxx/ox_texmacs.c 2006/03/03 02:47:28 1.31 @@ -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.30 2006/03/03 02:30:09 takayama Exp $ */ #include #include @@ -87,6 +87,8 @@ 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 *LanguageResource = NULL; + void ctrlC(); struct object KpoString(char *s); char *KSpopString(void); @@ -108,6 +110,8 @@ 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 flushSm1(); + /* tail -f /tmp/debug-texmacs.txt Debug output to understand the timing problem of pipe interface. */ @@ -160,6 +164,11 @@ main(int argc,char *argv[]) { Cpp = 1; }else if (strcmp(argv[i],"--engineLogToStdout") == 0) { EngineLogToStdout = 1; + }else if (strcmp(argv[i],"--languageResource") == 0) { + i++; + LanguageResource = (char *)sGC_malloc(strlen(argv[i])+80); + sprintf(LanguageResource, + " /localizedString.file (%s) def localizedString.load ",argv[i]); }else{ /* printv("Unknown option\n"); */ } @@ -190,6 +199,7 @@ main(int argc,char *argv[]) { KSexecuteString(" [(parse) (ox.sm1) pushfile] extension "); if (Xm_noX) KSexecuteString(" /Xm_noX 1 def "); if (EngineLogToStdout) KSexecuteString(" /Xm_engineLogToStdout 1 def "); + if (LanguageResource != NULL) KSexecuteString(LanguageResource); startEngine(TM_Engine," "); if (signal(SIGINT,SIG_IGN) != SIG_IGN) { @@ -234,6 +244,8 @@ main(int argc,char *argv[]) { ob = KpoString(s); KSpush(ob); KSexecuteString(" oxsubmit "); + + if (TM_Engine == SM1) flushSm1(); /* Get the result in string for cfep. */ if (View != V_TEXMACS) { @@ -479,6 +491,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 +504,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 +514,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 ");