===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/gnuplot.sm1,v
retrieving revision 1.5
retrieving revision 1.10
diff -u -p -r1.5 -r1.10
--- OpenXM/src/kan96xx/Doc/gnuplot.sm1	2004/12/17 00:13:08	1.5
+++ OpenXM/src/kan96xx/Doc/gnuplot.sm1	2005/02/09 11:44:05	1.10
@@ -1,9 +1,10 @@
-%$OpenXM: OpenXM/src/kan96xx/Doc/gnuplot.sm1,v 1.4 2004/12/16 11:41:58 takayama Exp $
+%$OpenXM: OpenXM/src/kan96xx/Doc/gnuplot.sm1,v 1.9 2005/02/04 11:54:06 takayama Exp $
 %%% 1999, 6/7 Mon.
 [(parse) (ox.sm1) pushfile] extension
 [(getenv) (OpenXM_HOME)] extension /OpenXM_HOME set
 
-[OpenXM_HOME (/bin/gnuplot)] cat /plot.gnuplotexec set
+[(which) (gnuplot)] oxshell /plot.gnuplotexec set
+%[OpenXM_HOME (/bin/gnuplot)] cat /plot.gnuplotexec set
 %(gnuplot) /plot.gnuplotexec set
 
 (SSkan/lib/plot.sm1 for ox_sm1_gnuplot.  1999/09/03. ) message
@@ -21,6 +22,9 @@
 } def
 
 /plotstart.aux {
+  plot.gnuplotexec tag 0 eq {
+    (No gnuplot is installed in this system.) error
+  } { } ifelse
   {
     gnuplot.callingMethod 0 eq {
       plotstart.aux.0
@@ -58,7 +62,12 @@
 
 /plotstart.aux.1 {
     [(getUniqueFileName) (/tmp/gnuplot.fifo.tmp)] extension /gnuplot.fifo set
-    [(fp2mkfifo) gnuplot.fifo]  extension message
+    [(fp2mkfifo) gnuplot.fifo]  extension /gnuplot.status set
+
+    gnuplot.status -1 eq {
+       (Warning: mkfifo failed.) message
+    } { } ifelse
+
     gnuplot.fifo message
     [(fp2popen) plot.gnuplotexec (w)] extension /gnuplot.pfp set
     (Started gnuplot) message
@@ -71,6 +80,7 @@
 
     [(fp2fopen) gnuplot.fifo (r)] extension /gnuplot.fifoFp set
     % This must be the last. Otherwise, fopen is blocked.
+    % When mkfifo fails, then gnuplot.fifoFp will be null. (old cygwin)
     /gnuplot.pid -2 def  % dummy.
     gnuplot.pid message
 } def
@@ -97,8 +107,12 @@
 /plotstop.aux.0 { } def
 /plotstop.aux.1 {
   [(fp2fclose) gnuplot.pfp] extension pop
-  [(fp2fclose) gnuplot.fifoFp] extension pop
-  [(rm) gnuplot.fifo] oxshell pop
+  gnuplot.fifoFp tag 0 eq { }
+  {
+    [(fp2fclose) gnuplot.fifoFp] extension pop
+  } ifelse
+  % [(rm) gnuplot.fifo] oxshell pop % It  is OS dependent.
+  [(unlink) gnuplot.fifo] extension
 } def
 
 
@@ -126,22 +140,36 @@
 
 /gnuplot.1 {
   /cccc set
+  gnuplot.read.1
   [(fp2fputs) [cccc nl] cat gnuplot.pfp] extension pop
   [(fp2fflush) gnuplot.pfp] extension pop
   gnuplot.read.1
+  gnuplot.sync.1
 } def
 
 %% (plot sin(x);) gnuplot
 
 
 /gnuplot.read.1 {
-  [
+ [
+  gnuplot.fifoFp tag 0 eq { }
+  {
    { 
     [(fp2select) gnuplot.fifoFp 0] extension 1 eq {
       [(fp2fgetc) gnuplot.fifoFp] extension 
     } {  exit } ifelse
    } loop
-  ] { (string) dc } map cat
+  } ifelse
+ ] { (string) dc } map cat
+} def
+
+% It uses "@" to wait for the gnuplot.
+/gnuplot.sync.1 {
+  [(fp2fputs) [(print "@";) nl] cat gnuplot.pfp] extension pop
+  [(fp2fflush) gnuplot.pfp] extension pop
+  {
+    [(fp2fgetc) gnuplot.fifoFp] extension 64 eq { exit} { } ifelse
+  } loop
 } def
 
 /isAlive {