=================================================================== RCS file: /home/cvs/OpenXM/src/kxx/ox_texmacs.c,v retrieving revision 1.28 retrieving revision 1.35 diff -u -p -r1.28 -r1.35 --- OpenXM/src/kxx/ox_texmacs.c 2006/02/02 07:07:22 1.28 +++ OpenXM/src/kxx/ox_texmacs.c 2009/02/22 16:40:05 1.35 @@ -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.34 2006/03/22 00:52:55 takayama Exp $ */ #include #include @@ -7,6 +7,7 @@ #include #include "ox_kan.h" #include "serversm.h" +#include "ox_pathfinder.h" #if defined(__CYGWIN__) #define JMP_BUF sigjmp_buf @@ -72,7 +73,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 +88,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 +113,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 +134,7 @@ main(int argc,char *argv[]) { int vmode=1; char *openxm_home; char *asir_config; + char *path; int i; @@ -160,6 +173,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 = (char *)sGC_malloc(strlen(argv[i])+80); + sprintf(AsirInitFile,"%s",argv[i]); }else{ /* printv("Unknown option\n"); */ } @@ -190,6 +212,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 +257,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) { @@ -249,8 +274,12 @@ main(int argc,char *argv[]) { } } if (!TM_do_not_print) { - KSexecuteString(" ox.engine oxpopstring "); - r = KSpopString(); + if (Format == 2) { /* png mode */ + r = pngGetResult(); + }else{ + KSexecuteString(" ox.engine oxpopstring "); + r = KSpopString(); + } printv(r); }else{ KSexecuteString(" ox.engine 1 oxpops "); @@ -261,7 +290,7 @@ main(int argc,char *argv[]) { continue; } /* Get the result in string for texmacs */ - if (Format == 1 && (! TM_do_not_print)) { + if ((Format == 1) && (! TM_do_not_print)) { /* translate to latex form */ KSexecuteString(" ox.engine oxpushcmotag ox.engine oxpopcmo "); ob = KSpop(); @@ -312,6 +341,41 @@ main(int argc,char *argv[]) { } } +static char *pngGetResult(void) { + struct object ob; + int vmode; + char *r; + char *path; + + /* translate to latex form */ + KSexecuteString(" ox.engine oxpushcmotag ox.engine oxpopcmo "); + ob = KSpop(); + vmode = 0; + /* printf("id=%d\n",ob.tag); bug: matrix return 17 instead of Sinteger + or error. */ + if (ob.tag == Sinteger) { + /* printf("cmotag=%d\n",ob.lc.ival);*/ + if (ob.lc.ival == CMO_ERROR2) { + vmode = 1; + } + if (ob.lc.ival == CMO_STRING) { + vmode = 1; + } + } + if (vmode) { + KSexecuteString(" ox.engine oxpopstring "); + r = KSpopString(); + }else{ + KSexecuteString(" ox.engine 1 oxpushcmo ox.engine (print_png_form2) oxexec "); + KSexecuteString(" ox.engine oxpopcmo /tmp_ox_texmacs set tmp_ox_texmacs 0 get "); + r = KSpopString(); /* input form */ + KSexecuteString(" tmp_ox_texmacs 1 get "); + path = KSpopString(); /* path name of the png file. */ + pngSendFile(path); + } + return r; +} + #define SB_SIZE 1024 #define INC_BUF if (n >= limit-3) { \ tmp = s; \ @@ -376,7 +440,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 +449,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 +479,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 +562,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 +575,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 +585,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 +610,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 *)GC_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 +648,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 +684,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); +}