=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v retrieving revision 1.22 retrieving revision 1.25 diff -u -p -r1.22 -r1.25 --- OpenXM/src/kxx/ox_texmacs.c 2006/01/19 12:24:15 1.22 +++ OpenXM/src/kxx/ox_texmacs.c 2006/01/26 07:38:32 1.25 @@ -1,6 +1,8 @@ -/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.21 2005/06/16 05:07:24 takayama Exp $ */ +/* $OpenXM: OpenXM/src/kxx/ox_texmacs.c,v 1.24 2006/01/21 12:23:15 takayama Exp $ */ #include +#include +#include #include #include #include "ox_kan.h" @@ -21,26 +23,46 @@ */ /* #define DEBUG2 */ -#ifdef DEBUG -#define DATA_BEGIN_V "" /* "\002verbatim:" */ -#define DATA_BEGIN_L "" /* "\002latex:" */ -#define DATA_BEGIN_P "" /* "\002channel:prompt " */ -#define DATA_BEGIN_PS "" /* "\002ps: " */ -#define DATA_END "" /* "\005" */ -#else -#define DATA_BEGIN_V "\002verbatim:" -#define DATA_BEGIN_L "\002latex:" -#define DATA_BEGIN_P "\002prompt:" -#define DATA_BEGIN_PS "\002ps:" -#define DATA_END "\005" -#endif +/* Type of View part (user interface engine) */ +#define GENERIC 0 /* DEBUG, xml */ +#define V_TEXMACS 1 +#define V_CFEP 2 +int View = V_TEXMACS ; -/* -#define TEXMACS_END_OF_INPUT '#' -*/ -#define TEXMACS_END_OF_INPUT '\n' -#define CFEP_END_OF_INPUT 0x5 +char *Data_begin_v[] = { + "", + "\002verbatim:", + "\002", +}; +char *Data_begin_l[] = { + "", + "\002latex:", + "\002latex:" +}; +char *Data_begin_p[] = { + "", + "\002prompt:", + "\002prompt:" +}; +char *Data_begin_ps[] = { + "", + "\002ps:", + "\002ps:" +}; +char *Data_end[] = { + "", + "\005", + "\n\005" /* \n is not a part of the protocol. */ +}; +/* todo: start_of_input */ + +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 #define SM1 2 @@ -53,10 +75,6 @@ extern int RestrictedMode, RestrictedMode_saved; int Format=1; /* 1 : latex mode */ int OutputLimit_for_TeXmacs = (1024*10); -/* Type of View part (user interface engine) */ -#define V_TEXMACS 1 -#define V_CFEP 2 -int View = V_TEXMACS ; int TM_Engine = ASIR ; int TM_asirStarted = 0; @@ -66,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); @@ -98,12 +118,6 @@ main(int argc,char *argv[]) { char *asir_config; int i; - openxm_home = (char *) getenv("OpenXM_HOME"); - asir_config = (char *) getenv("ASIR_CONFIG"); - if (openxm_home == NULL || asir_config == NULL) { - printv("The environmental variables OpenXM_HOME/ASIR_CONFIG are not set.\nStart the texmacs with openxm texmacs or ox_texmacs by openxm ox_texmacs\nBye..."); - exit(10); - } #ifdef DEBUG2 @@ -120,6 +134,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) { @@ -135,18 +150,35 @@ 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"); */ } } + openxm_home = (char *) getenv("OpenXM_HOME"); + asir_config = (char *) getenv("ASIR_CONFIG"); + if (openxm_home == NULL) { + printv("Error. The environmental variable OpenXM_HOME is not set.\nStart the texmacs with openxm texmacs or ox_texmacs by openxm ox_texmacs\nBye..."); + exit(10); + } + /* Initialize kanlib (gc is also initialized) */ KSstart(); /* Main loop */ - printf("%s",DATA_BEGIN_V); + printf("%s",Data_begin_v[View]); + if ((asir_config == NULL) && (View == V_TEXMACS)) { + printf("Warning. The environmental variable ASIR_CONFIG is not set.\nStart the texmacs with openxm texmacs or ox_texmacs by openxm ox_texmacs.\nOtherwise, tex translation will not be performed\n"); + + } + printCopyright(""); + /* Load ox engine here */ /* engine id should be set to ox.engine */ KSexecuteString(" [(parse) (ox.sm1) pushfile] extension "); @@ -174,7 +206,7 @@ main(int argc,char *argv[]) { continue; } else { } if (!irt) { - printf("%s",DATA_END); fflush(stdout); + printf("%s",Data_end[View]); fflush(stdout); } irt = 0; @@ -188,7 +220,7 @@ main(int argc,char *argv[]) { } if (s == NULL) { irt = 1; continue; } - if (!irt) printf("%s",DATA_BEGIN_V); + if (!irt) printf("%s",Data_begin_v[View]); /* Evaluate the input on the engine */ KSexecuteString(" ox.engine "); ob = KpoString(s); @@ -288,7 +320,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=' '; @@ -335,10 +367,10 @@ static char *readString(FILE *fp, char *prolog, char * return NULL; } if (strcmp(&(s[start]),"!reset;") == 0) { - printf("%s",DATA_BEGIN_V); + printf("%s",Data_begin_v[View]); KSexecuteString(" ox.engine oxreset ox.engine oxpopcmo "); ob = KSpop(); - printf("%s",DATA_END); fflush(stdout); + printf("%s",Data_end[View]); fflush(stdout); return NULL; } @@ -357,38 +389,28 @@ 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; } static void printv(char *s) { int i; - printf("%s",DATA_BEGIN_V); + printf("%s",Data_begin_v[View]); printf("%s",s); - printf("%s",DATA_END); + printf("%s",Data_end[View]); #ifdef DEBUG2 fprintf(Dfp,"<%s>",s); fflush(Dfp); #endif fflush(NULL); } static void printl(char *s) { - printf("%s",DATA_BEGIN_L); + printf("%s",Data_begin_l[View]); printf(" $ %s $ ",s); - printf("%s",DATA_END); + printf("%s",Data_end[View]); fflush(NULL); } static int isPS(char *s) { @@ -400,32 +422,32 @@ static int isPS(char *s) { return 1; } static void printps(char *s) { - printf("%s",DATA_BEGIN_PS); + printf("%s",Data_begin_ps[View]); printf("%s",s); - printf("%s",DATA_END); + printf("%s",Data_end[View]); fflush(NULL); } static void printp(char *s) { - printf("%s",DATA_BEGIN_P); - printf("%s",DATA_END); + printf("%s",Data_begin_p[View]); + printf("%s",Data_end[View]); printf("%s] ",s); fflush(NULL); } static void printCopyright(char *s) { - printf("%s",DATA_BEGIN_V); + printf("%s",Data_begin_v[View]); if (! NoCopyright) { - printf("OpenXM engine (ox engine) interface for TeXmacs\n2004 (C) openxm.org"); - printf(" under the BSD license. !asir; !sm1; !k0; !verbatim;\n"); + printf("OpenXM engine (ox engine) interface with TeXmacs protocol.\n2004 (C) openxm.org"); + printf(" under the BSD license. !asir; !sm1; !k0; !verbatim; !quit;\n"); printf("Type in !reset; when the engine gets confused. "); printf("%s",s); } - printf("%s",DATA_END); + printf("%s",Data_end[View]); fflush(NULL); } static int startEngine(int type,char *msg) { struct object ob = OINIT; - printf("%s",DATA_BEGIN_V); + printf("%s",Data_begin_v[View]); if (type == SM1) { if (!TM_sm1Started) KSexecuteString(" sm1connectr "); KSexecuteString(" /ox.engine oxsm1.ccc def "); @@ -453,12 +475,18 @@ static int startEngine(int type,char *msg) { KSexecuteString(" /ox.engine oxasir.ccc def "); TM_asirStarted = 1; printf("%s\n",msg); - if ( ! NoCopyright) { + if ((!NoCopyright) && ((char *)getenv("ASIR_CONFIG") != NULL)) { KSexecuteString(" oxasir.ccc (copyright()+asir_contrib_copyright();) oxsubmit oxasir.ccc oxpopstring "); ob = KSpop(); if (ob.tag == Sdollar) { printf("%s",ob.lc.str); } + }else if ((!NoCopyright) && ((char *)getenv("ASIR_CONFIG") == NULL)) { + KSexecuteString(" oxasir.ccc (copyright();) oxsubmit oxasir.ccc oxpopstring "); + ob = KSpop(); + if (ob.tag == Sdollar) { + printf("%s",ob.lc.str); + } } /* Initialize the setting of asir. */ KSexecuteString(" oxasir.ccc (if(1) { Xm_server_mode = 1; Xm_helpdir = \"help-eg\"; } else { ; } ;) oxsubmit oxasir.ccc oxpopcmo "); @@ -467,7 +495,7 @@ static int startEngine(int type,char *msg) { not work. */ KSexecuteString(" oxasir.ccc (print(\"----------- Messages from asir ------------------------------\")$ ) oxsubmit oxasir.ccc oxpopcmo "); } - printf("%s",DATA_END); + printf("%s",Data_end[View]); fflush(NULL); }