=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v retrieving revision 1.25 retrieving revision 1.32 diff -u -p -r1.25 -r1.32 --- OpenXM/src/kxx/ox_texmacs.c 2006/01/26 07:38:32 1.25 +++ OpenXM/src/kxx/ox_texmacs.c 2006/03/03 10:55:33 1.32 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.24 2006/01/21 12:23:15 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.31 2006/03/03 02:47:28 takayama Exp $ */ #include #include @@ -87,6 +87,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. */ +unsigned char *AsirInitFile = NULL; + +char *LanguageResource = NULL; + void ctrlC(); struct object KpoString(char *s); char *KSpopString(void); @@ -102,6 +106,14 @@ static int isPS(char *s); static int end_of_input(int c); static void setDefaultParameterForCfep(); +static void myEncoder(int c); +static void myEncoderS(unsigned char *s); +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. */ @@ -154,6 +166,15 @@ 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 if (strcmp(argv[i],"--asirInitFile") == 0) { + i++; + AsirInitFile = (unsigned char *)sGC_malloc(strlen(argv[i])+80); + sprintf(AsirInitFile,"%s",argv[i]); }else{ /* printv("Unknown option\n"); */ } @@ -183,6 +204,8 @@ main(int argc,char *argv[]) { /* engine id should be set to ox.engine */ 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) { @@ -222,12 +245,40 @@ main(int argc,char *argv[]) { if (s == NULL) { irt = 1; continue; } if (!irt) printf("%s",Data_begin_v[View]); /* Evaluate the input on the engine */ + KSexecuteString(" ox.engine oxclearstack "); KSexecuteString(" ox.engine "); ob = KpoString(s); KSpush(ob); KSexecuteString(" oxsubmit "); + + if (TM_Engine == SM1) flushSm1(); - /* Get the result in string. */ + /* Get the result in string for cfep. */ + if (View != V_TEXMACS) { + KSexecuteString(" ox.engine oxgeterrors "); + ob = KSpop(); + if (ob.tag == Sarray) { + if (getoaSize(ob) > 0) { + ob = getoa(ob,0); + KSpush(ob); + KSexecuteString(" translateErrorForCfep "); + r = KSpopString(); + outputStringToTunnel(0,(unsigned char *)r,View); + } + } + if (!TM_do_not_print) { + KSexecuteString(" ox.engine oxpopstring "); + r = KSpopString(); + printv(r); + }else{ + KSexecuteString(" ox.engine 1 oxpops "); + KSexecuteString(" ox.engine 0 oxpushcmo ox.engine oxpopcmo "); + ob = KSpop(); + printv(""); + } + continue; + } + /* Get the result in string for texmacs */ if (Format == 1 && (! TM_do_not_print)) { /* translate to latex form */ KSexecuteString(" ox.engine oxpushcmotag ox.engine oxpopcmo "); @@ -275,6 +326,7 @@ main(int argc,char *argv[]) { printv(""); } } + /* note that there is continue above. */ } } @@ -374,6 +426,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] = ' '; @@ -445,6 +509,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]); @@ -455,6 +522,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) { @@ -464,7 +532,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 "); @@ -489,6 +557,13 @@ 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); + sprintf(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) { ctrl(\"message\",0); } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo "); /* bug; if ctrl is written with Xm_helpdir = ... without oxpopcmo, then it does @@ -512,6 +587,49 @@ static int startEngine(int type,char *msg) { 4. print("hello"); shift+return print("afo"); */ + +static void myEncoder(int c) { + putchar(0xf8 | (0x3 & (c >> 6))); + putchar(0xf0 | (0x7 & (c >> 3))); + putchar(0xf0 | (0x7 & c)); +} +static void myEncoderS(unsigned char *s) { + int i,n; + n = strlen(s); + for (i = 0; i}",0); + }else if (view == V_CFEP) { + sprintf(ts,"{%d<%d ",channel,n+1); + myEncoderS(ts); + myEncoderSn(s,n); myEncoder(0); + myEncoderS(">}"); + } + fflush(stdout); +} +#define LINE_FEED 0xc /* ^L */ +static void outputStringToTunnel(int channel, unsigned char *s, int view) { + int start, i; + start = i = 0; + while (s[i] != 0) { + if (s[i] == LINE_FEED) { + outputStringToTunnel0(channel,&(s[start]),i-start,view); + start = i+1; + } + i++; + } +} +