ruby-dcl 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c18bb775677102c8c9e25f79d69766b5bb8a334
-  data.tar.gz: 05da4fb56559848addc0e536d3e262ba89b92a1d
+SHA256:
+  metadata.gz: 402649ddd30fb068a288654b41937e8cecd18be88cae88309fd52784a274f880
+  data.tar.gz: dcc1022d878e821b296ae57857896ad23b877e0573239c2ec3c48b40b6ce850d
 SHA512:
-  metadata.gz: 2644e1621f8bb307b97af66f554c8e6c8877fdb4636c8cac1624f59d27b19d0de9efbebb2bd6081de864c36f2d0231c6871f9eaf90f62fb675cc4e880a5db0e7
-  data.tar.gz: 08ddbcaf98b21426bd456d1d46383bcbdf61b1aa71b342d30c5c134d9c75f9de876c5e26286f9ec8cd75b5dc9c9fc5e87e5492c91cf7393f84ab6d3499b03bbf
+  metadata.gz: 49cb7bfbd8b444280dd899baa5687081c93a5742d4c6a17651491a86d711ad82e8c85758d25c2083a8968ba88ad79d286a0210c81594eb585c10efd6640c62c0
+  data.tar.gz: bf94400a1f4d6933d245a83f61643e98504c9e9a3a0d9c7f7b5c4f6c87eacf5c62da73e1137b28461023a57a18ebd2724dd569f5147d51a111b916bbd697d41c

data/ChangeLog

@@ -1,4 +1,93 @@
-2016-07-16  Takeshi Horinouchi  (HEAD, master)
+2022-03-21  Takeshi Horinouchi  (HEAD -> master, origin/master, origin/HEAD)
+years updated.
+
+M	LICENSE.txt
+
+2022-03-20  OTOBE, Naohito  (tag: v1.8.2)
+Ver 1.8.2
+
+M	lib/numru/dcl/version.rb
+
+2022-02-03  Tsuyoshi Koshiro  (origin/bindc)
+Supported misc2/tmpack.
+
+M	GenWrapper/dcl_rb_heading
+M	GenWrapper/proto/Makefile
+A	GenWrapper/proto/misc2_tmpack.fp
+A	demo/misc2/tmpack/tmpk01.rb
+A	demo/misc2/tmpack/tmpk02.rb
+A	demo/misc2/tmpack/tmpk03.rb
+M	ext/numru/init.c.default
+
+2021-03-30  OTOBE, Naohito 
+[BUGFIX] merge header file libf2cdcl.h to cdcl.h : Demo upate
+
+M	GenWrapper/dcl_narrayed_funcs.rb
+M	GenWrapper/etc/p_header
+M	demo/gokuraku/jump/jump2.rb
+M	demo/grph2/uspack/uspk06.rb
+M	demo/rakuraku/kihon/kihon7.rb
+M	ext/numru/dcl_cary2obj.c
+M	ext/numru/dcl_obj2cary.c
+M	ext/numru/dcl_rubydcloriginal.c
+M	ext/numru/init.c.default
+
+2021-03-21  OTOBE, Naohito 
+[BUGFIX] + [demo modify] reported Koshir
+
+M	GenWrapper/dcl_narrayed_funcs.rb
+M	demo/grph1/sgpack/sgpk07.rb
+M	demo/grph2/udegpk/u2df03.rb
+M	demo/grph2/umpack/test04.rb
+M	demo/grph2/ximage/ximg01.rb
+M	demo/rakuraku/uspack/uspac1.rb
+M	demo/rakuraku/uspack/uspac3.rb
+
+2021-01-22  OTOBE, Naohito 
+BUGFIX narray.a -> libnatrray.a
+
+M	ext/numru/extconf.rb
+
+2021-01-22  OTOBE, Naohito 
+Add code for mingw wnvironment
+
+M	ext/numru/extconf.rb
+
+2021-01-21  OTOBE, Naohito 
+nul-separated glob pattern is deprecated
+
+M	ruby-dcl.gemspec
+
+2021-01-04  OTOBE, Naohito 
+Add USGI
+
+M	GenWrapper/proto/grph1_csgi.fp
+M	demo/grph1/sgpack/sgfont.rb
+M	demo/grph1/sgpack/sgfonz.rb
+M	demo/grph1/sgpack/sgpk07.rb
+M	demo/grph1/slpack/slpk04.rb
+M	demo/grph2/uspack/uspk08.rb
+M	demo/rakuraku/color/color2.rb
+M	demo/rakuraku/kihon/kihonb.rb
+
+2020-08-18  OTOBE, Naohito 
+Direct Call Fortran Function
+
+M	GenWrapper/dcl_narrayed_funcs.rb
+M	GenWrapper/etc/p_header
+M	GenWrapper/prototype.rb
+M	ext/numru/dcl_cary2obj.c
+M	ext/numru/dcl_obj2cary.c
+M	ext/numru/dcl_rubydcloriginal.c
+M	ext/numru/extconf.rb
+M	ext/numru/init.c.default
+
+2016-07-16  Takeshi Horinouchi  (tag: v1.8.1)
+To release ver. 1.8.1
+
+A	ChangeLog
+
+2016-07-16  Takeshi Horinouchi 
 deleted explicit require statement for narray
 
 M	demo/gokuraku/hop/hop.rb
@@ -225,7 +314,7 @@ To support numru-narray
 
 M	ext/numru/extconf.rb
 
-2016-06-22  Takeshi Horinouchi  (tag: v1.8.0, origin/master, origin/HEAD)
+2016-06-22  Takeshi Horinouchi  (tag: v1.8.0)
 To update to version 1.8.0
 
 M	lib/numru/dcl/version.rb
@@ -400,16 +489,11 @@ A	lib/numru/.keepme
 2015-03-30  Eriko Nishimoto 
 Moved extension files to ext/numru
 
-D	dcl_cary2obj.c
-D	dcl_obj2cary.c
-D	dcl_rubydcloriginal.c
-A	ext/numru/dcl_cary2obj.c
-A	ext/numru/dcl_obj2cary.c
-A	ext/numru/dcl_rubydcloriginal.c
-A	ext/numru/extconf.rb
-A	ext/numru/init.c.default
-D	extconf.rb
-D	init.c.default
+R100	dcl_cary2obj.c	ext/numru/dcl_cary2obj.c
+R100	dcl_obj2cary.c	ext/numru/dcl_obj2cary.c
+R100	dcl_rubydcloriginal.c	ext/numru/dcl_rubydcloriginal.c
+R100	extconf.rb	ext/numru/extconf.rb
+R100	init.c.default	ext/numru/init.c.default
 
 2015-03-30  Eriko Nishimoto 
 Added setting files for rubygems
@@ -421,8 +505,7 @@ A	ruby-dcl.gemspec
 2015-03-30  Takeshi Horinouchi 
 Renamed the current ChangeLog to back up.
 
-A	.ChangeLog.until20150318
-D	ChangeLog
+R100	ChangeLog	.ChangeLog.until20150318
 
 2015-03-30  Takeshi Horinouchi 
 Registered files (patterns) to ignore in the repository

data/LICENSE.txt

@@ -1,7 +1,7 @@
 RubyDCL is copyrighted free software by Takeshi Horinouchi and
 GFD Dennou Club (http://www.gfd-dennou.org/).
 
-Copyright 2003-2016 (C) GFD Dennou Club
+Copyright 2003-2022 (C) GFD Dennou Club
 (http://www.gfd-dennou.org/) All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/demo/gokuraku/jump/jump2.rb

@@ -40,7 +40,7 @@ DCL::grsvpt(0.2,  0.8,   0.2,  0.8)
 DCL::grstrn(4)
 DCL::grstrf
 
-DCL::ussttl('FREQUENCY', '/s', 'POWER', 'm|2"/s|2"')
+DCL::ussttl('FREQUENCY', '/s', 'POWER', 'm\^2/s\^2')
 DCL::usdaxs
 
 DCL::uulin(x, y)

data/demo/grph1/sgpack/sgfont.rb

@@ -40,7 +40,7 @@ DCL::sgtxzv(0.5, 0.95, cttl, 0.03, 0, 0, 3)
 for i in 0..255
   ux=i/16+0.5
   uy=16-(i.divmod(16))[1]-0.5
-  DCL::sgtxzu(ux, uy, DCL::csgi(i), 0.035, 0, 0, 3)
+  DCL::sgtxzu(ux, uy, DCL::usgi(i), 0.035, 0, 0, 3)
   ux=ux+0.48
   uy=uy+0.38
   ch = format("%3d", i)

data/demo/grph1/sgpack/sgfonz.rb

@@ -39,7 +39,7 @@ for n in 1..2
     ux=i/16+0.5
     uy=16-(i.divmod(16))[1]-0.5
     if (!(i == 30 || i == 31))
-      DCL::sgtxzu(ux, uy, DCL::csgi(i), 0.035, 0, 0, 3)
+      DCL::sgtxzu(ux, uy, DCL::usgi(i), 0.035, 0, 0, 3)
     end
     ux=ux+0.48
     uy=uy+0.38

data/demo/grph1/sgpack/sgpk07.rb

@@ -30,15 +30,17 @@ end
 DCL::sglnv(xc, 0.05, xc, 0.95)
 
 #----------------------- SUPER/SUB SCRIPT ------------------------------
-DCL::sgtxv(xc, y[0], 'SGTXV|SUP"RST_SUB"')
+DCL::sgtxv(xc, y[0], 'SGTXV\^{SUP}RST\_{SUB}')
 
 DCL::sgstxi(2)
 DCL::sglset('LCNTL', true)                 # <-- ź������ȥ�����ON
-DCL::sgtxv(xc, y[1], 'SGTXV|SUP"RST_SUB"')
+DCL::sgtxv(xc, y[1], 'SGTXV\^{SUP}RST\_{SUB}')
 
 DCL::sgrset('SHIFT', 0.5)                  # <-- ���ե�������
 DCL::sgrset('SMALL', 0.5)                  # <-- ź�����礭������
-DCL::sgtxv(xc, y[2], 'SGTXV|SUP"RST_SUB"')
+DCL::swlset('LSYSFNT', true)
+DCL::sgtxv(xc, y[2], 'S\o-G\o~T\u-X\o~\u-V\^{SUP}RST\_{SUB}')
+DCL::swlset('LSYSFNT', false)
 
 #------------------------ FONT SELECTION -------------------------------
 DCL::sgstxi(1)
@@ -52,13 +54,13 @@ DCL::sgstxi(3)
 DCL::sgtxv(xc, y[5], 'ABCDEFG abcdefg')
 
 #------------------------- GREEK LETTERS -------------------------------
-greek1 = [152,153,154,155,156,157,158,159,160,161].collect{|i| DCL::csgi(i)}.join
-greek2 = [130,131,135,138,141,143,145,148,150,151].collect{|i| DCL::csgi(i)}.join
+greek1 = [152,153,154,155,156,157,158,159,160,161].collect{|i| DCL::usgi(i)}.join
+greek2 = [130,131,135,138,141,143,145,148,150,151].collect{|i| DCL::usgi(i)}.join
 DCL::sgtxv(xc, y[6], greek1)
 DCL::sgtxv(xc, y[7], greek2)
 
 #----------------------------- SYMBOLS ---------------------------------
-symbol = [189,190,191,192,193,210,211,212,217,218].collect{|i| DCL::csgi(i)}.join
+symbol = [189,190,191,192,193,210,211,212,217,218].collect{|i| DCL::usgi(i)}.join
 DCL::sgtxv(xc, y[8], symbol)
 
 DCL::sgcls

data/demo/grph1/slpack/slpk04.rb

@@ -29,7 +29,7 @@ DCL::sgfrm
 DCL::sgswnd(-xmaxf/2.0, xmaxf/2.0, -ymaxf/2.0, ymaxf/2.0)
 DCL::sgstrf
 DCL::sgplu(x, y)
-DCL::sgtxzu(0.0, 0.0, "15cm #{DCL::csgi(194)} 15cm", 0.05, 0, 0, 3)
+DCL::sgtxzu(0.0, 0.0, "15cm #{DCL::usgi(194)} 15cm", 0.05, 0, 0, 3)
 
 DCL::sgcls
 

data/demo/grph2/udegpk/u2df03.rb

@@ -71,9 +71,9 @@ DCL::uyaxlb('R', uy1, uy2, ch, nc)
 DCL::uysttl('L', 'LATITUDE', 0.0)
 
 DCL::uwsgxb(XMNZ, XMXZ, NXZ)
-DCL::uwsgya(uy1[(IYZ1-1)..-1])
+DCL::uwsgya(uy1[(IYZ1-1)..(IYZ1-1+NYZ-1)])
 
-DCL::udcntr(p[(IXZ1-1)..-1,(IYZ1-1)..-1])
+DCL::udcntr(p[(IXZ1-1)..(IXZ1-1+NXZ-1),(IYZ1-1)..(IYZ1-1+NYZ-1)])
 
 DCL::grcls
 

data/demo/grph2/umpack/test04.rb

@@ -42,7 +42,7 @@ for i in 0..np-1
   DCL::sglset('LCLIP', true)
   DCL::slpwwr(1)
   DCL::slpvpr(1)
-  cttl = DCL::sgtrnl(DCL::isgtrc(ctr[i]))
+  cttl=DCL::sgtrnl(DCL::isgtrc(ctr[i]))
   DCL::sgtxzr(0.5, 0.95, cttl, 0.03, 0, 0, 3)
 
   DCL::umpmap('coast_world')

data/demo/grph2/umpack/test05r.rb

@@ -0,0 +1,86 @@
+#
+# test05.rb
+#
+# $Id$
+#
+
+require "numru/dcl"
+
+include NumRu
+include Math
+
+
+np = 14
+nx = 73
+ny = 37
+xmin = 0
+xmax = 360
+ymin = -90
+ymax = 90
+p = NArray.new(Float, nx*ny)
+
+#-- data ---
+ctr = ['cyl','mer','mwd','hmr','ek6','ktd','con',
+       'coa','coc','bon','otg','pst','azm','aza']
+fct = NArray[0.12, 0.12, 0.14, 0.14, 0.14, 0.14, 0.11,
+               0.16, 0.12, 0.12, 0.40, 0.12, 0.12, 0.17]
+
+i = 0
+File.foreach('t811231.dat') do |line|
+  line.split(" ").each do |data|
+    p[i] = data.to_f
+    i += 1
+  end
+end
+p.reshape!(nx, ny)
+
+190.step(245, 5) do |r|
+  amin=r
+  amax=r+5
+#       IDX=(R-180)*1.4*1000+999
+  idx=((r-170)*1.25).to_i*1000+999
+  DCL::uestlv(amin, amax, idx)
+end
+
+#-- graph ---
+DCL::swpset('IWIDTH', 4000)
+DCL::swpset('IHEIGHT', 2800)
+iws = (ARGV[0] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+DCL::sgopn iws
+
+DCL::sglset('LSOFTF', false)
+DCL::sgrset('STLAT1', 75.0)
+DCL::sgrset('STLAT2', 60.0)
+DCL::umlset('LGRIDMJ', false)
+DCL::umrset('DGRIDMN', 30.0)
+
+for i in 0..np-1
+  DCL::sgfrm
+  DCL::sgssim(fct[i], 0.0, 0.0)
+  DCL::sgsmpl(165.0, 60.0, 0.0)
+  DCL::sgsvpt(0.1, 0.9, 0.1, 0.9)
+  DCL::sgswnd(xmin, xmax, ymin, ymax)
+
+  if (ctr[i] == 'otg')
+    DCL::sgstxy(-180.0, 180.0, 0.0, 90.0)
+  else
+    DCL::sgstxy(-180.0, 180.0, -90.0, 90.0)
+  end
+  DCL::sgstrn(DCL::isgtrc(ctr[i]))
+  DCL::sgstrf
+
+  DCL::sglset('LCLIP', true)
+  DCL::slpwwr(1)
+  DCL::slpvpr(1)
+  cttl = DCL::sgtrnl(DCL::isgtrc(ctr[i]))
+  DCL::sgtxzr(0.5, 0.95, cttl, 0.03, 0, 0, 3)
+
+  DCL::uetone(p)
+  DCL::udcntr(p)
+  DCL::umpmap('coast_world')
+  DCL::umpglb
+  DCL::slpvpr(1)
+end
+
+DCL::sgcls
+

data/demo/grph2/uspack/uspk06.rb

@@ -35,7 +35,7 @@ DCL::gropn iws
 
 DCL::grfrm
 
-DCL::ussttl('TIME', 'SEC', 'HEAT FLUX', 'W/m|2"')
+DCL::ussttl('TIME', 'SEC', 'HEAT FLUX', 'W/m\^2')
 DCL::usgrph(t, a)
 
 DCL::grcls

data/demo/grph2/uspack/uspk08.rb

@@ -38,7 +38,7 @@ DCL::uscset('CYSPOS', 'B')
 DCL::uscset('CXSIDE', 'T')
 DCL::uscset('CYSIDE', 'L')
 
-DCL::ussttl('TEMPERATURE', 'C|'+ DCL::csgi(4) + '"', 'DEPTH', 'm')
+DCL::ussttl('TEMPERATURE', '\^'+ DCL::usgi(228) + 'C', 'DEPTH', 'm')
 DCL::usgrph(t, z)
 
 DCL::grcls

data/demo/grph2/ximage/ximg01.rb

@@ -80,7 +80,7 @@ tlevn.indgen(203.0, 3.0)
 cdsn = 'tomsclm.dat'
 file = open(cdsn, "r")
 
-DCL::swlstx('LWAIT', false)
+DCL::swlstx('LWAIT', true)
 DCL::swlstx('LWAIT0', false)
 DCL::swlstx('LDUMP', false)
 DCL::swistx('IPOSX', 200)

data/demo/misc2/tmpack/tmpk01.rb

@@ -0,0 +1,46 @@
+#
+# tmpk01.rb
+#
+
+require "numru/dcl"
+
+include NumRu
+include Math
+
+nx = 101
+ny = 101
+thres = 1
+
+dx = 6.2832/(nx - 1).to_f
+dy = 6.2832/(ny - 1).to_f
+arrow_thres = 1.0
+
+skip = (ARGV[0] || (puts ' SKIP NUM (I)  ? ;'; gets)).to_i
+
+x = NArray.sfloat(nx).indgen*dx
+y = NArray.sfloat(ny).indgen*dy
+
+u = NArray.sfloat(nx,ny)
+v = NArray.sfloat(nx,ny)
+
+ny.times do |j|
+  nx.times do |i|
+    u[i,j] = -cos(y[j])
+    v[i,j] =  cos(x[i])
+  end
+end
+
+iws = (ARGV[1] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+DCL::gropn iws
+
+DCL::grfrm
+DCL::grswnd(x[0], x[nx-1], y[0], y[ny-1])
+DCL::uspfit
+DCL::grstrf
+DCL::usdaxs
+
+DCL::tmiset('SKIPINTV', skip)
+DCL::tmstlc(x, y, u, v)
+
+DCL::grcls
+

data/demo/misc2/tmpack/tmpk02.rb

@@ -0,0 +1,58 @@
+#
+# tmpk02.rb
+#
+
+require "numru/dcl"
+
+include NumRu
+include Math
+
+nx = 101
+ny = 101
+thres = 1
+
+dx = 6.2832/(nx - 1).to_f
+dy = 6.2832/(ny - 1).to_f
+dyt = 360.0/(ny - 1).to_f
+arrow_thres = 1.0
+
+skip = (ARGV[0] || (puts ' SKIP NUM (I)  ? ;'; gets)).to_i
+
+x = NArray.sfloat(nx).indgen*dx
+y = (NArray.sfloat(ny).indgen - ny/2)*dy
+yt = (NArray.sfloat(ny).indgen - ny/2)*dyt
+xt = NArray.sfloat(ny).fill(x[nx-1])
+
+u = NArray.sfloat(nx,ny)
+v = NArray.sfloat(nx,ny)
+
+ny.times do |j|
+  nx.times do |i|
+    u[i,j] = -cos(y[j])
+    v[i,j] =  cos(x[i])
+  end
+end
+
+iws = (ARGV[1] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+DCL::gropn iws
+
+DCL::grfrm
+DCL::grswnd(x[0], x[nx-1], yt[0], yt[ny-1])
+DCL::grsvpt(0.2, 0.8, 0.2, 0.8)
+DCL::grssim(0.5*0.6/x[nx-1], 0.0, 0.0)
+DCL::grstrn(5)
+DCL::grstrf
+DCL::uzrset('UYUSER', 0.0)
+DCL::uxpaxs('U', 1)
+DCL::uzrset('UYUSER', -180.0)
+DCL::uxpaxs('U', 1)
+
+DCL::tmiset('SKIPINTV', skip)
+DCL::tmlset('PERIODY', true)
+DCL::tmlset('NODRSHRT', true)
+DCL::tmstla(x, yt, u, v)
+
+DCL::uulin(xt, yt)
+
+DCL::grcls
+

data/demo/misc2/tmpack/tmpk03.rb

@@ -0,0 +1,56 @@
+#
+# tmpk03.rb
+#
+
+require "numru/dcl"
+
+include NumRu
+include Math
+
+nx = 101
+ny = 101
+thres = 1
+
+dx = 6.2832/(nx - 1).to_f
+dy = 1.57079/(ny - 1).to_f
+dxt = 360.0/(ny - 1).to_f
+dyt = 90.0/(ny - 1).to_f
+arrow_thres = 1.0
+
+skip = (ARGV[0] || (puts ' SKIP NUM (I)  ? ;'; gets)).to_i
+
+x = NArray.sfloat(nx).indgen*dx
+y = (NArray.sfloat(ny).indgen - ny/2)*dy
+xt = NArray.sfloat(nx).indgen*dxt
+yt = (NArray.sfloat(ny).indgen - ny/2)*dyt
+
+puts("Y, YT #{y[0]}  #{y[ny-1]}  #{yt[0]}  #{yt[ny-1]}")
+
+u = NArray.sfloat(nx,ny)
+v = NArray.sfloat(nx,ny)
+
+ny.times do |j|
+  nx.times do |i|
+    u[i,j] = -cos(y[j])
+    v[i,j] =  cos(x[i])
+  end
+end
+
+iws = (ARGV[1] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
+DCL::gropn iws
+
+DCL::grfrm
+DCL::grswnd(xt[0], xt[nx-1], yt[0], yt[ny-1])
+DCL::grsvpt(0.05, 0.95, 0.1, 0.9)
+DCL::sgstrn(10)
+DCL::umpfit
+DCL::grstrf
+
+DCL::umpmap('coast_world')
+DCL::umpglb
+
+DCL::tmlset('PERIODX', true)
+DCL::tmiset('SKIPINTV', skip)
+DCL::tmstls(xt, yt, u, v)
+
+DCL::grcls

data/demo/rakuraku/color/color2.rb

@@ -20,8 +20,9 @@ y[0] = 0.5
 for n in 0..nmax-1
   y[n+1] = r*y[n]*(1.0-y[n])
 end
-yave = DCL::rave(y, nmax+1, 1)
-y = -4 * (y - yave)
+
+yave=DCL::rave(y,nmax+1,1)
+y =  -4 * (y - yave)
 
 #-- graph ---
 iws = (ARGV[0] || (puts ' WORKSTATION ID (I)  ? ;'; DCL::sgpwsn; gets)).to_i
@@ -45,7 +46,7 @@ DCL::uxsttl('B', 'YEAR', 0.0)
 
 DCL::uyaxdv('L', 0.1, 0.5)
 DCL::uyaxdv('R', 0.1, 0.5)
-cttl = DCL::csgi(131) + 'T [K]'
+cttl = DCL::usgi(131) + 'T [K]'
 DCL::uysttl('L', cttl, 0.0)
 
 DCL::uxmttl('T', 'INTERANNUAL VARIATION', 0.0)

data/demo/rakuraku/kihon/kihon7.rb

@@ -12,6 +12,8 @@ def aplot
   nmax = 40
   x = NArray.sfloat(nmax+1)
   y = NArray.sfloat(nmax+1)
+  xx = NArray.sfloat(4)
+  yy = NArray.sfloat(4)
 
   DCL::slpvpr(1)
 
@@ -27,11 +29,15 @@ def aplot
   #-- triangle ----
   dt = 2.0*PI/3
   for n in 0..3
-    x[n] = 40.0*sin(n*dt)
-    y[n] = 40.0*cos(n*dt)
+    xx[n] = 40.0*sin(n*dt)
+    yy[n] = 40.0*cos(n*dt)
   end
 
-  DCL::sgplu(x, y)
+  DCL::sgplu(xx, yy)
+
+p "OTB:"
+p xx
+p yy
 
   #-- string ----
   DCL::sgtxu(0.0, 0.0, 'SGTXU')

data/demo/rakuraku/kihon/kihonb.rb

@@ -31,15 +31,17 @@ end
 DCL::sglnv(xc, 0.05, xc, 0.95)
 
 #-- �ǥե���� ----
-DCL::sgtxv(xc, y[0], 'SGTXV|SUP"RST_SUB"')
+DCL::sgtxv(xc, y[0], 'SGTXV\^{SUP}RST\_{SUB}')
 
 #-- ź�� ----
 DCL::sglset('LCNTL', true)
-DCL::sgtxv(xc, y[1], 'SGTXV|SUP"RST_SUB"')
+DCL::sgtxv(xc, y[1], 'SSGTXV\^{SUP}RST\_{SUB}')
 
 DCL::sgrset('SMALL', 0.5)
 DCL::sgrset('SHIFT', 0.5)
-DCL::sgtxv(xc, y[2], 'SGTXV|SUP"RST_SUB"')
+DCL::swlset('LSYSFNT', true)
+DCL::sgtxv(xc, y[2], 'S\o-G\o~T\u-X\o~\u-V\^{SUP}RST\_{SUB}')
+DCL::swlset('LSYSFNT', false)
 
 #-- �ե���� ----
 DCL::sgtxv(xc, y[3], 'ABCDEFG abcdefg')
@@ -54,17 +56,17 @@ DCL::sgiset('IFONT', 1)
 DCL::sgstxi(1)
 
 #-- ���ꥷ��ʸ�� ----
-greek1 = DCL::csgi(128) + DCL::csgi(129) + DCL::csgi(130) + DCL::csgi(131) + DCL::csgi(132) +
-         DCL::csgi(133) + DCL::csgi(134) + DCL::csgi(135) + DCL::csgi(136) + DCL::csgi(137)
-greek2 = DCL::csgi(152) + DCL::csgi(153) + DCL::csgi(154) + DCL::csgi(155) + DCL::csgi(156) +
-         DCL::csgi(157) + DCL::csgi(158) + DCL::csgi(159) + DCL::csgi(160) + DCL::csgi(161)
+greek1 = DCL::usgi(128) + DCL::usgi(129) + DCL::usgi(130) + DCL::usgi(131) + DCL::usgi(132) +
+         DCL::usgi(133) + DCL::usgi(134) + DCL::usgi(135) + DCL::usgi(136) + DCL::usgi(137)
+greek2 = DCL::usgi(152) + DCL::usgi(153) + DCL::usgi(154) + DCL::usgi(155) + DCL::usgi(156) +
+         DCL::usgi(157) + DCL::usgi(158) + DCL::usgi(159) + DCL::usgi(160) + DCL::usgi(161)
 
 DCL::sgtxv(xc, y[6], greek1)
 DCL::sgtxv(xc, y[7], greek2)
 
 #-- �ü쵭�� ----
-symbol = DCL::csgi(189) + DCL::csgi(190) + DCL::csgi(191) + DCL::csgi(192) + DCL::csgi(193) +
-         DCL::csgi(210) + DCL::csgi(211) + DCL::csgi(212) + DCL::csgi(217) + DCL::csgi(218)
+symbol = DCL::usgi(189) + DCL::usgi(190) + DCL::usgi(191) + DCL::usgi(192) + DCL::usgi(193) +
+         DCL::usgi(210) + DCL::usgi(211) + DCL::usgi(212) + DCL::usgi(217) + DCL::usgi(218)
 
 DCL::sgtxv(xc, y[8], symbol)
 

data/demo/rakuraku/uspack/uspac1.rb

@@ -27,7 +27,7 @@ DCL::gropn iws
 
 DCL::grfrm
 
-DCL::ussttl('TIME', 'YEAR', 'HEAT FLUX', 'W/m|2"')
+DCL::ussttl('TIME', 'YEAR', 'HEAT FLUX', 'W/m\^2')
 DCL::usgrph(x, y)
 
 DCL::grcls

data/demo/rakuraku/uspack/uspac3.rb

@@ -29,7 +29,7 @@ DCL::grfrm
 
 rundef = DCL::glrget('RUNDEF')
 DCL::grswnd(xmin, xmax, rundef, rundef)
-DCL::ussttl('TIME', 'YEAR', 'HEAT FLUX', 'W/m|2"')
+DCL::ussttl('TIME', 'YEAR', 'HEAT FLUX', 'W/m\^2')
 DCL::usgrph(rundef, y)
 
 DCL::grcls

data/ext/numru/dcl_cary2obj.c

@@ -5,7 +5,7 @@
 
 #include <math.h>
 #include "ruby.h"
-#include "libtinyf2c.h"
+#include "cdcl.h"
 #include "narray.h"  /* kuro: depend on numarray.so */
 
 #ifndef NARRAY_BIGMEM