===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v
retrieving revision 1.24
retrieving revision 1.31
diff -u -p -r1.24 -r1.31
--- OpenXM/src/kan96xx/Doc/httpd-asir.sm1	2002/10/24 02:30:15	1.24
+++ OpenXM/src/kan96xx/Doc/httpd-asir.sm1	2014/08/28 11:27:34	1.31
@@ -1,4 +1,4 @@
-%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v 1.23 2002/10/24 02:12:34 takayama Exp $
+%% $OpenXM: OpenXM/src/kan96xx/Doc/httpd-asir.sm1,v 1.30 2010/02/08 01:08:39 takayama Exp $
 %% http server by sm1
 
 [(parse) (httpd.sm1) pushfile] extension pop
@@ -24,9 +24,30 @@ def
   oxasir.ccc oxsetmathcap
 } ifelse
 
+/ox-win.start.iconic 1 def
+/ox.win.set.start {
+  [(stat) (c:\windows\system32\cmd.exe)] extension 0 get
+  0 eq {
+    /ox.win.start.0 [(c:\windows\system32\cmd.exe) (/c) (start)] def 
+    /ox.win.start [ox.win.start.0 aload pop
+                   ox-win.start.iconic { (/min) } { } ifelse ] def
+  }{
+   [(stat) (c:\winnt\system32\cmd.exe)] extension 0 get
+   0 eq {
+      /ox.win.start.0 [(c:\winnt\system32\cmd.exe) (/c) (start) ] def
+      /ox.win.start [ox.win.start.0 aload pop
+                     ox-win.start.iconic { (/min) } { } ifelse ] def
+   }{
+     /ox.win.start.0 [ (start) ] def 
+     /ox.win.start [ ox.win.start.0 aload pop
+                     ox-win.start.iconic { (/min) } { } ifelse ] def
+   } ifelse
+  } ifelse
+} def
+
 /webasir { asirweb } def
 /asirweb {
- [/rrr ] pushVariables
+ [/rrr /cmd] pushVariables
  [
   %% This procedure to generate port number might fail.
   [(oxGenPass)] extension . (integer) dc  /rrr set
@@ -34,12 +55,13 @@ def
   /httpd.port 1200 rrr add def
   httpd.port message 
 
-  %%[(sleep 3; netscape -geometry 800x500 http://localhost:)
+  %%[(sleep 3; firefox -geometry 800x500 http://localhost:)
   %%  httpd.port toString
   %% ( &)] cat system
    [(ostype)] extension 0 get
    (windows) eq {
      %% On windows.
+      ox.win.set.start
       [(forkExec)
        [
          %%(c:\windows\command\start)
@@ -51,8 +73,7 @@ def
       3] extension
    }{
       %% On unix.
-      [(sleep 3 ; netscape http://localhost:) httpd.port toString ( & ) ] cat
-      system
+      httpd.port httpd.startBrowserUnix
    } ifelse
 
    httpd ;
@@ -191,10 +212,10 @@ def
 
 
 /httpd.asirman
- ("http://www.math.sci.kobe-u.ac.jp/OpenXM/1.1.3/doc/asir2000/html-jp/man_toc.html")
+ ("http://www.math.sci.kobe-u.ac.jp/OpenXM/Current/doc/asir2000/html-ja/man_toc.html")
 def
-/httpd.asirman.index
-  ("http://www.math.sci.kobe-u.ac.jp/OpenXM/1.1.3/doc/asir2000/html-jp/man_262.html#SEC262")
+/httpd.asirman.contrib
+  ("http://www.math.sci.kobe-u.ac.jp/OpenXM/Current/doc/asir-contrib/ja/cman-html/cman-ja_toc.html")
 def
 /httpd.asir.intro
    ("http://www.math.sci.kobe-u.ac.jp/~taka/asir-book-html/main")
@@ -217,7 +238,7 @@ def
   [(<font color="red"> 
     <a href=) httpd.asirman ( > AsirManual (Ja) </a> </font>, )] cat sendln
   [(<font color="purple"> 
-    <a href=) httpd.asirman.index ( > Index (Ja) </a> </font>, )] cat sendln
+    <a href=) httpd.asirman.contrib ( > AsirContrib (Ja) </a> </font>, )] cat sendln
   [(<font color="blue"> 
     <a href=) httpd.asir.intro ( > Intro (Ja) </a> </font>, )] cat sendln
 } def
@@ -260,7 +281,7 @@ def
       msg2 0 get (httpdAsirMeta) eq 
       msg2 1 get (Pretty) eq and
       {
-        httpd.image.type null eq {
+        httpd.image.type tag 0 eq {
           send-page-warning-image
           /skip-image goto
         } {  } ifelse
@@ -311,4 +332,27 @@ def
   ] pop
   popVariables
   arg1
+} def
+
+/webasir2 {
+ [/rrr /cmd /mypid /lockname] pushVariables
+ [
+  %% This procedure to generate port number might fail.
+  [(oxGenPass)] extension . (integer) dc  /rrr set
+  rrr << rrr 20000 idiv 20000 mul >> sub /rrr set
+  /httpd.port 1200 rrr add def
+  httpd.port message 
+
+  [(getpid)] extension (dollar) dc /mypid set
+  /httpd.textarea.name  randomName def
+  [(/tmp/webasir-) mypid (.txt)] cat /lockname set
+  [(outputObjectToFile) lockname 
+    [httpd.port nl httpd.textarea.name nl ] cat
+  ] extension 
+  lockname message
+  [(cat ) lockname] cat (system) nl message
+  httpd ;
+  [(rm -f ) lockname] cat system
+ ] pop
+ popVariables
 } def