ruby-dcl 1.6.3.1 → 1.7.0

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/ChangeLog

@@ -1,7 +1,63 @@
+Wed Apr 25  2012  T Koshiro
+	* ruby-dcl-1.7.0 released (cvs tag ruby-dcl-1_7_0)
+Fri Mar 30  2012  T Koshiro
+	* Added new demo programs: demo/grph2/uipack/uipk01.rb
+	* demo/math1/clsplib/cslb01.rb: minor improvement
+Fri Mar  9  2012  T Koshiro
+	* GenWrapper/elim_ary_size.rb: uipack support.
+	* Added new demo programs: demo/grph2/uipack/uipk02.rb,
+	  demo/grph2/umpack/test09_2.rb, and demo/math1/clsplib/cslb01.rb.
+Thu Mar  8  2012  T Koshiro
+	* dcl_rubydcloriginal.c:
+	  correct prototype declarations of math1 functions: doublereal -> real
+	* GenWrapper/Makefile: added the generation of dcl_narrayed_funcs.c.
+	  (I thought dcl_narrayed_funcs.c is generated by the command
+	  "cd GenWrapper && make", but it didn't work.)
+	* init.c.default: to call the initializer in grph2_uipack.c and
+	  math1_clsplib.c.
+	* Removed unused files: GenWrapper/etc/Mk_proto,
+	  GenWrapper/etc/dcl_gen, and GenWrapper/etc/p_init.
+Thu Mar  8  2012  T Koshiro
+	* GenWrapper/proto/grph2_uipack.fp, GenWrapper/proto/math1_clsplib.fp:
+	  debug.
+Thu Mar  8  2012  T Koshiro
+	* GenWrapper/proto/grph2_uipack.fp, GenWrapper/proto/math1_clsplib.fp:
+	  debug.
+Sat Mar  3  2012  T Koshiro
+	* GenWrapper/dcl_rb_heading: added uip(set|stx|get).
+	* GenWrapper/proto/Makefile: minor improvement; added grph2_uipack.fp
+	  and math1_clsplib.fp.
+	* GenWrapper/proto/grph1_sgpack.fp: added prototype definitions
+	  for full-color support (for DCL 5.4.4).
+	* GenWrapper/proto/grph1_stpack.fp: added prototype definitions
+	  for sample map projections (for DCL 5.4.4).
+	* GenWrapper/proto/grph1_swpack.fp: added prototype definitions
+	  for full-color support and color map change (for DCL 5.4.4).
+	* GenWrapper/proto/misc1_randlib.fp: added prototype definitions
+	  of rngu0 (for DCL 5.4.4). rngu3 is used for earlier versions of
+	  DCL.
+	* GenWrapper/proto/grph2_uipack.fp: created (for DCL 5.4.4).
+	* GenWrapper/proto/math1_clsplib.fp: created (for DCL 5.4.4).
+	* Removed GenWrapper/proto/math2_shtlib.fp_old.
+Tue Feb 28  2012  T Koshiro
+	* Removed dcl_narrayed_funcs.c, which is also generated by the
+	  following command when released:
+	  % cd GenWrapper && make
+	* Removed README_old.
+Tue Feb 28  2012  T Koshiro
+	* Moved a change in the previous commit, which was mistakenly
+	  coded directly in lib/dcl.rb, into GenWrapper/dcl_rb_heading.
+	* Removed lib/dcl.rb and C source files (grph[12]_*.c, math[12]_*.c,
+	  misc1_*.c) which are generated by the following command when
+	  released:
+	  % cd GenWrapper && make
+	* Removed an unused file: dummy.c
+Wed Feb  1  2012  S Nishizawa
+	* remove grph1_zgpack not to depend on ruby-gtk2
+	  (The methods are move to a new library RubyDCLExt-Gtk.)
 Thu Aug 11  2011  T Horinouchi
 	* ruby-dcl-1.6.3 released (cvs tag ruby-dcl-1_6_3)
 	* LICENCE.txt: Added (BSD 2-clause licence)
-	
 Thu Feb 24  2011  T Horinouchi
 	* ruby-dcl-1.6.2 released (cvs tag ruby-dcl-1_6_2)
 	  because of a packaging miss of 1.6.1

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in ruby-dcl.gemspec
+gemspec

data/GenWrapper/Makefile

@@ -4,6 +4,7 @@ source:
 	cd proto ; \
 	$(MAKE) ; \
 	cd ../
+	ruby dcl_narrayed_funcs.rb
 
 dcl_rb:
 	ruby elim_ary_size.rb proto/*.fp

data/GenWrapper/dcl_rb_heading

@@ -1,12 +1,6 @@
 require "narray"
-if /cygwin|mingw|darwin/ =~ RUBY_PLATFORM
-  begin
-    require "glib2"
-  rescue LoadError
-  end
-end
-
 require "numru/dcl_raw"
+
 module NumRu
     module DCL
       init_arg($0,ARGV) if DCLVERSION >= "5.3.2"
@@ -25,7 +19,7 @@ module NumRu
 
       #<<< ??p(set|stx|get) >>>
 
-      %w!gl sl sg uc ud ue ug ul um uu uz!.each do |pkg|
+      %w!gl sl sg uc ud ue ug ui ul um uu uz!.each do |pkg|
 	 %w!set stx!.each do |set|
 	    eval <<-EOS
 	       def #{pkg}p#{set}( name, value )

data/GenWrapper/elim_ary_size.rb

@@ -29,7 +29,7 @@ end
 
 def pre_filter(decl)
   case $method_name
-  when /(^ud|^ue)/
+  when /(^ud|^ue|^ui)/
     # replace MX with NX
     decl.gsub!('MX','NX')
   when /^ug/

data/GenWrapper/proto/Makefile

@@ -1,19 +1,20 @@
-SRCS = math1_blklib.c math1_chrlib.c math1_fnclib.c math1_gnmlib.c \
-    math1_ifalib.c math1_indxlib.c math1_intlib.c math1_lrllib.c \
-    math1_oslib.c math1_rfalib.c math1_rfblib.c math1_sublib.c \
-    math1_syslib.c math1_vialib.c math1_viblib.c math1_vralib.c \
-    math1_vrblib.c math1_xfclib.c math1_gt2dlib.c \
-    math2_fftlib.c math2_intrlib.c \
-    math2_rnmlib.c math2_shtlib.c math2_vstlib.c \
-    misc1_chnlib.c misc1_datelib.c misc1_fmtlib.c misc1_misclib.c \
-    misc1_randlib.c misc1_timelib.c grph1_csgi.c grph1_scpack.c \
-    grph1_sgpack.c grph1_slpack.c grph1_stpack.c grph1_swpack.c \
-    grph2_grpack.c grph2_ucpack.c grph2_udpack.c grph2_uepack.c \
-    grph2_ugpack.c grph2_uhpack.c grph2_ulpack.c grph2_umpack.c \
-    grph2_uspack.c grph2_uupack.c grph2_uvpack.c grph2_uwpack.c \
-    grph2_uxpack.c grph2_uypack.c grph2_uzpack.c \
-    math1_maplib.c
-#    math2_odelib.c \
+SRCS = grph1_csgi.c    grph1_scpack.c  grph1_sgpack.c  grph1_slpack.c  \
+       grph1_stpack.c  grph1_swpack.c                                  \
+       grph2_grpack.c  grph2_ucpack.c  grph2_udpack.c  grph2_uepack.c  \
+       grph2_ugpack.c  grph2_uhpack.c  grph2_uipack.c  grph2_ulpack.c  \
+       grph2_umpack.c  grph2_uspack.c  grph2_uupack.c  grph2_uvpack.c  \
+       grph2_uwpack.c  grph2_uxpack.c  grph2_uypack.c  grph2_uzpack.c  \
+       math1_blklib.c  math1_chrlib.c  math1_clsplib.c math1_fnclib.c  \
+       math1_gt2dlib.c math1_gnmlib.c  math1_ifalib.c  math1_indxlib.c \
+       math1_intlib.c  math1_lrllib.c  math1_maplib.c  math1_oslib.c   \
+       math1_rfalib.c  math1_rfblib.c  math1_sublib.c  math1_syslib.c  \
+       math1_vialib.c  math1_viblib.c  math1_vralib.c  math1_vrblib.c  \
+       math1_xfclib.c                                                  \
+       math2_fftlib.c  math2_intrlib.c math2_rnmlib.c  math2_shtlib.c  \
+       math2_vstlib.c                                                  \
+       misc1_chnlib.c  misc1_datelib.c misc1_fmtlib.c  misc1_misclib.c \
+       misc1_randlib.c misc1_timelib.c
+#      math2_odelib.c \
 
 .SUFFIXES: .fp
 .fp.c:

data/GenWrapper/proto/grph1_sgpack.fp

@@ -1,7 +1,7 @@
 /*
  * grph1_sgpack.fp
  *
- * $Id: grph1_sgpack.fp,v 1.1.1.1 2011-02-23 07:21:28 horinout Exp $
+ * $Id: grph1_sgpack.fp,v 1.2 2012-03-02 17:18:53 koshiro Exp $
  */
 
 /*****************************************************
@@ -1404,3 +1404,369 @@
       )
 #endif
 
+/*****************************************************
+ * grph1/sgpack/isgrgb.f
+ ****************************************************/
+/* 
+ *      INTEGER FUNCTION ISGRGB(IR,IG,IB)
+ */   
+#if DCLVER >= 544
+      INTEGER FUNCTION ISGRGB(
+          INTEGER IR
+          INTEGER IG
+          INTEGER IB
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgcl.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGCLST(CCFILE)
+ *      CHARACTER CCFILE*(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGCLST(
+          CHARACTER*(*) CCFILE
+      )
+#endif
+
+/* 
+ *      ENTRY SGQCL(NUM,NR,NG,NB)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGQCL(
+          INTEGER NUM
+          INTEGER o NR
+          INTEGER o NG
+          INTEGER o NB
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgplxu.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGPLXU(N,UPX,UPY,ITYPE,INDEX,ICOLOR)
+ *      REAL      UPX(*),UPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGPLXU(
+          INTEGER N
+          REAL (N) UPX
+          REAL (N) UPY
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgplxv.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGPLXV(N,VPX,VPY,ITYPE,INDEX,ICOLOR)
+ *      REAL      VPX(*),VPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGPLXV(
+          INTEGER N
+          REAL (N) VPX
+          REAL (N) VPY
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgplxr.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGPLXR(N,RPX,RPY,ITYPE,INDEX,ICOLOR)
+ *      REAL      RPX(*),RPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGPLXR(
+          INTEGER N
+          REAL (N) RPX
+          REAL (N) RPY
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgpmxu.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGPMXU(N,UPX,UPY,ITYPE,INDEX,ICOLOR,RSIZE)
+ *      REAL      UPX(*),UPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGPMXU(
+          INTEGER N
+          REAL (N) UPX
+          REAL (N) UPY
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+          REAL RSIZE
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgpmxv.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGPMXV(N,VPX,VPY,ITYPE,INDEX,ICOLOR,RSIZE)
+ *      REAL      VPX(*),VPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGPMXV(
+          INTEGER N
+          REAL (N) VPX
+          REAL (N) VPY
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+          REAL RSIZE
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgpmxr.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGPMXR(N,RPX,RPY,ITYPE,INDEX,ICOLOR,RSIZE)
+ *      REAL      RPX(*),RPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGPMXR(
+          INTEGER N
+          REAL (N) RPX
+          REAL (N) RPY
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+          REAL RSIZE
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgtxxu.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGTXXU(UX,UY,CHARS,RSIZE,IROTA,ICENT,INDEX,ICOLOR)
+ *      CHARACTER CHARS*(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGTXXU(
+          REAL UX
+          REAL UY
+          CHARACTER*(*) CHARS
+          REAL RSIZE
+          INTEGER IROTA
+          INTEGER ICENT
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgtxxv.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGTXXV(VX,VY,CHARS,RSIZE,IROTA,ICENT,INDEX,ICOLOR)
+ *      CHARACTER CHARS*(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGTXXV(
+          REAL VX
+          REAL VY
+          CHARACTER*(*) CHARS
+          REAL RSIZE
+          INTEGER IROTA
+          INTEGER ICENT
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgtxxr.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGTXXR(RX,RY,CHARS,RSIZE,IROTA,ICENT,INDEX,ICOLOR)
+ *      CHARACTER CHARS*(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGTXXR(
+          REAL RX
+          REAL RY
+          CHARACTER*(*) CHARS
+          REAL RSIZE
+          INTEGER IROTA
+          INTEGER ICENT
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgtnxu.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGTNXU(N,UPX,UPY,ITPAT,ICOLOR)
+ *      REAL      UPX(*),UPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGTNXU(
+          INTEGER N
+          REAL (N) UPX
+          REAL (N) UPY
+          INTEGER ITPAT
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgtnxv.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGTNXV(N,VPX,VPY,ITPAT,ICOLOR)
+ *      REAL      VPX(*),VPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGTNXV(
+          INTEGER N
+          REAL (N) VPX
+          REAL (N) VPY
+          INTEGER ITPAT
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sgtnxr.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGTNXR(N,RPX,RPY,ITPAT,ICOLOR)
+ *      REAL      RPX(*),RPY(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGTNXR(
+          INTEGER N
+          REAL (N) RPX
+          REAL (N) RPY
+          INTEGER ITPAT
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sglnxu.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGLNXU(UX1,UY1,UX2,UY2,INDEX,ICOLOR)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGLNXU(
+          REAL UX1
+          REAL UY1
+          REAL UX2
+          REAL UY2
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sglnxv.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGLNXV(VX1,VY1,VX2,VY2,INDEX,ICOLOR)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGLNXV(
+          REAL VX1
+          REAL VY1
+          REAL VX2
+          REAL VY2
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sglnxr.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGLNXR(RX1,RY1,RX2,RY2,INDEX,ICOLOR)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGLNXR(
+          REAL RX1
+          REAL RY1
+          REAL RX2
+          REAL RY2
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sglaxu.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGLAXU(UX1,UY1,UX2,UY2,ITYPE,INDEX,ICOLOR)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGLAXU(
+          REAL UX1
+          REAL UY1
+          REAL UX2
+          REAL UY2
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sglaxv.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGLAXV(VX1,VY1,VX2,VY2,ITYPE,INDEX,ICOLOR)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGLAXV(
+          REAL VX1
+          REAL VY1
+          REAL VX2
+          REAL VY2
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+
+/*****************************************************
+ * grph1/sgpack/sglaxr.f
+ ****************************************************/
+/* 
+ *      SUBROUTINE SGLAXR(RX1,RY1,RX2,RY2,ITYPE,INDEX,ICOLOR)
+ */
+#if DCLVER >= 544
+      SUBROUTINE SGLAXR(
+          REAL RX1
+          REAL RY1
+          REAL RX2
+          REAL RY2
+          INTEGER ITYPE
+          INTEGER INDEX
+          INTEGER ICOLOR
+      )
+#endif
+

data/GenWrapper/proto/grph1_stpack.fp

@@ -1,7 +1,7 @@
 /*
  * grph1_stpack.fp
  *
- * $Id: grph1_stpack.fp,v 1.1.1.1 2011-02-23 07:21:28 horinout Exp $
+ * $Id: grph1_stpack.fp,v 1.2 2012-03-02 17:18:53 koshiro Exp $
  */
 
 /*
@@ -183,6 +183,17 @@
 /*****************************************************
  * grph1/stpack/stfusr.f
  ****************************************************/
+#if DCLVER >= 544
+/* 
+ *      SUBROUTINE STFUSR(XLON, YLAT, X, Y)
+ */
+      SUBROUTINE STFUSR(
+          REAL XLON
+          REAL YLAT
+          REAL o XX
+          REAL o YY
+      )
+#else
 /* 
  *      SUBROUTINE STFUSR(UX, UY, XX, YY)
  */
@@ -192,7 +203,19 @@
           REAL o XX
           REAL o YY
       )
+#endif
 
+#if DCLVER >= 544
+/* 
+ *      ENTRY STIUSR(XX, YY, XLON, YLAT)
+ */
+      SUBROUTINE STIUSR(
+          REAL XX
+          REAL YY
+          REAL o XLON
+          REAL o YLAT
+      )
+#else
 /* 
  *      ENTRY STIUSR(XX, YY, UX, UY)
  */
@@ -202,6 +225,7 @@
           REAL o UX
           REAL o UY
       )
+#endif
 
 /* 
  *      ENTRY STSUSR
@@ -209,6 +233,26 @@
       SUBROUTINE STSUSR(
       )
 
+/* 
+ *      ENTRY STNUSR(KPROJ)
+ */
+#if DCLVER >= 544
+      SUBROUTINE STNUSR(
+          INTEGER KPROJ
+      )
+#endif
+
+/* 
+ *      ENTRY STCUSR(I,CTTL)
+        CHARACTER CTTL*(*)
+ */
+#if DCLVER >= 544
+      SUBROUTINE STCUSR(
+          INTEGER I
+          CHARACTER*(*) o CTTL
+      )
+#endif
+
 /*****************************************************
  * grph1/stpack/stfwtr.f
  ****************************************************/