===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/oxasir.sm1,v
retrieving revision 1.1.1.1
retrieving revision 1.5
diff -u -p -r1.1.1.1 -r1.5
--- OpenXM/src/kan96xx/Doc/oxasir.sm1	1999/10/08 02:12:02	1.1.1.1
+++ OpenXM/src/kan96xx/Doc/oxasir.sm1	2002/02/05 07:24:28	1.5
@@ -1,3 +1,4 @@
+% $OpenXM: OpenXM/src/kan96xx/Doc/oxasir.sm1,v 1.4 2002/01/06 08:47:36 takayama Exp $
 %% kxx/oxasir.sm1   1998, 2/12 (this version is at Old/oxasir.sm1.19980212
 %%   3/1, 1995, 11/5, 11/21
 %% This file is error clean.
@@ -73,7 +74,15 @@ oxasir.verbose {
 /asirinit {
  %% gr and primdec are loaded by .asirrc
  /asirinit.peer set
- [asirinit.peer  oxasirpath.asirlib] loadAsirFile
+ [(ostype)] extension  0 get (windows) eq {
+   [(getenv) (OSTYPE)] extension (cygwin) eq {
+     [asirinit.peer  oxasirpath.asirlib] loadAsirFile
+   }{
+     [asirinit.peer  (oxasir-win.rr)] oxasirParseFile
+   } ifelse
+ }{
+   [asirinit.peer  oxasirpath.asirlib] loadAsirFile
+ } ifelse 
 } def
 /asirconnect {
  [(localhost) 1300 1200] oxconnect /oxasir.ccc set
@@ -83,16 +92,16 @@ oxasir.verbose {
 /asirconnect2 {
 [oxpath.oxlog.xterm oxpath.ox ( -ox ) oxasirpath.oxasir
  oxpath.null
- ( & )] cat system
-% (xterm -e /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir &) system
-% (kterm -iconic -e /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir &) system
+ ( & )] cat system-csh
+% (xterm -e /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir &) system-csh
+% (kterm -iconic -e /home/nobuki/kxx/ox -ox /home/nobuki/kxx/ox_asir &) system-csh
 % For MSRI
 % Eterm is also nice (including kanji). rxvt is also nice.
-%(xterm -icon -e /u/nobuki/tmp/kxx/ox -ox /u/nobuki/tmp/Ox/ox_asir2 &) system
-%(kterm2 -e /u/nobuki/tmp/kxx/ox -ox /u/nobuki/tmp/Ox/ox_asir2 &) system
+%(xterm -icon -e /u/nobuki/tmp/kxx/ox -ox /u/nobuki/tmp/Ox/ox_asir2 &) system-csh
+%(kterm2 -e /u/nobuki/tmp/kxx/ox -ox /u/nobuki/tmp/Ox/ox_asir2 &) system-csh
 % (If you start the server automatically, you may have a trouble to) message
 % (oxreset. In order to avoid this trouble, start the server by hand.) message
- (sleep 5) system
+ (sleep 5) system-csh
  [(localhost) 1300 1200] oxconnect /oxasir.ccc set
  /ccc oxasir.ccc def   %% for compatibility.
  oxasir.ccc asirinit
@@ -108,10 +117,10 @@ oxasir.verbose {
 /asirconnect3 {
 [oxpath.oxlog.xterm oxpath.ox ( -ox ) oxasirpath.oxasir
  ( -data 2300 -control 2200) oxpath.null
- ( & )] cat system
+ ( & )] cat system-csh
 % (If you start the server automatically, you may have a trouble to) message
 % (oxreset. In order to avoid this trouble, start the server by hand.) message
- (sleep 5) system
+ (sleep 5) system-csh
  [(localhost) 2300 2200] oxconnect /oxasir.ccc2 set
  /ccc2 oxasir.ccc2 def   %% for compatibility.
  oxasir.ccc2  asirinit
@@ -401,7 +410,7 @@ oxasir.verbose {
  [oxpath.oxlog.xterm  oxpath.ox ( -reverse -ox ) oxasirpath.oxasir
   ( -data ) data ( -control ) control  ( -pass ) pass 
   oxpath.null
-  ( &)] cat system
+  ( &)] cat system-csh
  [(oxCreateClient2) peer 0 pass] extension /oxasir set
                      %% 0 means connect from only localhost. 
  oxasir asirinit
@@ -577,5 +586,32 @@ oxasir.verbose {
  (Note that there may be a gcd that is more than 1 among the coefficients.)
 ]] putUsages
 
+%% File should be preprocessed by OpenXM/misc/packages/Windows/oxpp 
+%% and ./oxapp --removeSharp 
+[(oxasirParseFile)
+[$[peer filename] oxasirParseFile $
+ $File should be preprocessed by OpenXM/misc/packages/Windows/oxpp$ 
+ $and ./oxapp --removeSharp $
+]] putUsages
+
+/oxasirParseFile {
+  /arg1 set
+  [/in-oxasirParseFile /fname /sss] pushVariables
+  [
+    /fname arg1 1 get def
+    /peer  arg1 0 get def 
+    fname pushfile /sss set
+    peer
+    [$if (1) { ; $ sss (}$)] cat
+    oxsubmit
+  ] pop
+  popVariables
+} def
+
+
 /oxasir.sm1.loaded 1 def
-initializePathNamesForOxAsir   %% This should be the last.
+[(ostype)] extension  0 get (windows) eq {
+  [(parse) (oxasir-win.sm1) pushfile ] extension 
+}{
+  initializePathNamesForOxAsir   %% This should be the last.
+} ifelse