=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v retrieving revision 1.24 retrieving revision 1.28 diff -u -p -r1.24 -r1.28 --- OpenXM/src/kxx/ox_texmacs.c 2006/01/21 12:23:15 1.24 +++ OpenXM/src/kxx/ox_texmacs.c 2006/02/02 07:07:22 1.28 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.23 2006/01/21 12:04:47 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.27 2006/02/01 04:16:54 takayama Exp $ */ #include #include @@ -52,15 +52,16 @@ char *Data_begin_ps[] = { char *Data_end[] = { "", "\005", - "\n\005" + "\n\005" /* \n is not a part of the protocol. */ }; +/* todo: start_of_input */ -/* -#define TEXMACS_END_OF_INPUT '#' -*/ -#define TEXMACS_END_OF_INPUT '\n' -#define CFEP_END_OF_INPUT 0x5 +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 */ +}; /* Table for the engine type. */ #define ASIR 1 @@ -83,6 +84,8 @@ int TM_do_not_print = 0; int Xm_noX = 0; int NoCopyright = 0; +int Cpp = 0; /* Use cpp before sending to the engine. */ +int EngineLogToStdout = 0; /* Do not run the ox engine inside xterm. */ void ctrlC(); struct object KpoString(char *s); @@ -99,6 +102,12 @@ 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); + /* tail -f /tmp/debug-texmacs.txt Debug output to understand the timing problem of pipe interface. */ @@ -131,6 +140,7 @@ main(int argc,char *argv[]) { }else if (strcmp(argv[i],"cfep")==0) { View = V_CFEP; setDefaultParameterForCfep(); }else{ + View = GENERIC; /* printv("Unknown view type.\n"); */ } } else if (strcmp(argv[i],"--sm1") == 0) { @@ -146,6 +156,10 @@ main(int argc,char *argv[]) { Xm_noX = 1; }else if (strcmp(argv[i],"--noCopyright") == 0) { NoCopyright = 1; + }else if (strcmp(argv[i],"--cpp") == 0) { + Cpp = 1; + }else if (strcmp(argv[i],"--engineLogToStdout") == 0) { + EngineLogToStdout = 1; }else{ /* printv("Unknown option\n"); */ } @@ -175,6 +189,7 @@ 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 "); startEngine(TM_Engine," "); if (signal(SIGINT,SIG_IGN) != SIG_IGN) { @@ -214,12 +229,38 @@ 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 "); - /* 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 "); @@ -267,6 +308,7 @@ main(int argc,char *argv[]) { printv(""); } } + /* note that there is continue above. */ } } @@ -312,7 +354,7 @@ static char *readString(FILE *fp, char *prolog, char * #endif if (end_of_input(c)) { /* If there remains data in the stream, - read the remaining data. */ + read the remaining data. (for debug) */ /* if (oxSocketSelect0(0,1)) { if (c == '\n') c=' '; @@ -381,20 +423,10 @@ static char *readString(FILE *fp, char *prolog, char * } static int end_of_input(int c) { - switch(View) { - case V_TEXMACS: - if (c == TEXMACS_END_OF_INPUT) return 1; - else 0; - break; - case V_CFEP: - if (c == CFEP_END_OF_INPUT) return 1; - else 0; - break; - default: - if (c == '\n') return 1; - else 0; - } + if (c == End_of_input[View]) return 1; + else return 0; } + static void setDefaultParameterForCfep() { Format = 0; } @@ -514,6 +546,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++; + } +} +