ruby-gr 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51cba5fbff46f2beca8d4343580d583390daa5ae65308af59bc5353385c181ae
-  data.tar.gz: b7a9fed2d87f74dde366032c2589a71aeabafa142d1499cdaacf7b3ba0b150b0
+  metadata.gz: f31069eac6089014b6cbea3453d5c7e42996e02b1b243e0b8d3aa116fb1b3c3f
+  data.tar.gz: 697465b25729e4f7a8b9b8c6252b3ceec4e6614f5760994cb91a2a8ad31d34df
 SHA512:
-  metadata.gz: 1a31d16e878229021a6f02403766b1d7be0d0c161261e92d5f1d2a19b5c4146bade5f17ef4f03784b6212845d0af089a21c41dc258fee194dedf1943fd649303
-  data.tar.gz: 741bb5fbfafd7a0422d5d0b528545112a9e84b2c20baa396d2ef51e6a0692083a0124db0e70cd82763e725e1169f18ce5a2dcc6ec1cec9deadecdff3042f023b
+  metadata.gz: 74496ad16167dfba8725c67f65b20125f00d1969a0c311e1e9312be465e740c303df9482671c61d04c2de77773208ac8cfb6e33c301f33173ce27fe21540d9f0
+  data.tar.gz: 0c5ee85a6944438ea3f0b0ecfc61ef1f188a4c779205d84eb2bce63b83746fe36ee57c94d402235bb020189d526f03e6d9f1828253da181bd95307fcaf8e0b5e

data/LICENSE.txt

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2019 kojix2
+Copyright (c) 2019 Red Data Tools
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,9 +1,10 @@
 # GR module for Ruby
 
-[![The MIT License](https://img.shields.io/badge/license-MIT-orange.svg)](LICENSE.md)
-[![Build Status](https://travis-ci.com/kojix2/GR.rb.svg?&branch=master)](https://travis-ci.org/kojix2/GR.rb)
+[![The MIT License](https://img.shields.io/badge/license-MIT-orange.svg)](LICENSE.txt)
+[![Build Status](https://travis-ci.org/red-data-tools/GR.rb.svg?branch=master)](https://travis-ci.org/red-data-tools/GR.rb)
 [![Gem Version](https://badge.fury.io/rb/ruby-gr.svg)](https://badge.fury.io/rb/ruby-gr)
-[![Gitter chat](https://badges.gitter.im/kojix2/GR.rb.svg)](https://gitter.im/kojix2/GR.rb)
+[![Gitter Chat](https://badges.gitter.im/red-data-tools/en.svg)](https://gitter.im/red-data-tools/en)
+[![Docs Latest](https://img.shields.io/badge/docs-latest-blue.svg)](https://rubydoc.info/gems/ruby-gr)
 
 [GR framework](https://github.com/sciapp/gr) - the graphics library for visualisation - for Ruby
 
@@ -25,20 +26,21 @@ gem 'ruby-gr'
 
 ## Quick Start
 
+<p align="center">
+  <img src="https://user-images.githubusercontent.com/5798442/69689128-74cb1480-110b-11ea-9097-29e878a19e8f.png">
+</p>
+
 ```ruby
-require 'gr'
+require 'gr/plot'
 
 x = [0, 0.2, 0.4, 0.6, 0.8, 1.0]
 y = [0.3, 0.5, 0.4, 0.2, 0.6, 0.7]
 
-GR.polyline(x, y)
-tick = GR.tick(0, 1)
-GR.axes(tick, tick, 0, 0, 1, 1, -0.001)
-GR.updatews
+GR.lineplot(x, y)
 ```
 
 ## Examples
-Have a look in the [`examples`](https://github.com/kojix2/GR.rb/tree/master/examples) directory for some simple examples. 
+Have a look in the [`examples`](https://github.com/red-data-tools/GR.rb/tree/master/examples) directory for some simple examples. 
 
 griddata.rb
 
@@ -115,4 +117,4 @@ GR.updatews
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/kojix2/GR.rb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/red-data-tools/GR.rb.

data/lib/gr.rb

@@ -2,38 +2,43 @@
 
 # OverView of GR.rb
 #
-#                        +--------------------+
-# +-------------------+  | GR3 module         |
-# | GR module         |  | +----------------+ |
-# | +---------------+ |  | | GR3::FFI       | |
-# | | GR::FFI       | |  | | +    libGR3.so | |
-# | | +   libGR.so  | |  | +----------------+ |
-# | +---------------+ |  |   | define_method  |
-# |   | define_method |  | +----------------+ |
-# | +---------------+ |  | | | GR3::GR3Base | |
-# | | | GR::GRBase  | |  | | v  (Private)   | |
-# | | v  (Private)  | |  | +++--------------+ |
-# | +++-------------+ |  |  | Extend          |
-# |  | Extend         |  |  v        +------+ |
-# |  v                |  |           |Check | |
-# |                   |  |        <--+Error | |
-# +-------+-----------+  |           +------+ |
-#         ^              +---------+----------+
-#         |  +------------------+  ^
-#  Extend |  | GRCommons module |  | Extend
-#         |  | +--------------+ |  |
-#         +----+ CommonUtils  +----+
-#         |  | +--------------+ |  |
-#         |  | +--------------+ |  |
-#         +----+    Version   +----+
-#         |  | +--------------+ |
-#         |  | +--------------+ |
-#         +----+JupyterSupport| |
-#            | +--------------+ |
-#            +------------------+
-
-require 'ffi'
+#                            +--------------------+
+#     +-------------------+  | GR3 module         |
+#     | GR module         |  | +----------------+ |
+#     | +---------------+ |  | | GR3::FFI       | |
+#     | | GR::FFI       | |  | | +    libGR3.so | |
+#     | | +   libGR.so  | |  | +----------------+ |
+#     | +---------------+ |  |   | define_method  |
+#     |   | define_method |  | +----------------+ |
+#     | +---------------+ |  | | | GR3::GR3Base | |
+#     | | | GR::GRBase  | |  | | v  (Private)   | |
+#     | | v  (Private)  | |  | +++--------------+ |
+#     | +++-------------+ |  |  | Extend          |
+#     |  | Extend         |  |  v        +------+ |
+#     |  v                |  |           |Check | |
+#     |                   |  |        <--+Error | |
+#     +-------+-----------+  |           +------+ |
+#             ^              +---------+----------+
+#             |  +------------------+  ^
+#      Extend |  | GRCommons module |  | Extend
+#             |  | +--------------+ |  |
+#             |  | |    Fiddley   | |  |
+#             |  | +--------------+ |  |
+#             |  | +--------------+ |  |
+#             +----+ CommonUtils  +----+
+#             |  | +--------------+ |  |
+#             |  | +--------------+ |  |
+#             +----+    Version   +----+
+#             |  | +--------------+ |
+#             |  | +--------------+ |
+#             +----+JupyterSupport| |
+#                | +--------------+ |
+#                +------------------+
+#
+# The GR module works without Numo::Narrray.
 
+# This is a procedural interface to the GR plotting library,
+# https://github.com/sciapp/gr
 module GR
   class Error < StandardError; end
 
@@ -48,13 +53,12 @@ module GR
   raise Error, 'Please set env variable GRDIR' unless ENV['GRDIR']
 
   ENV['GKS_FONTPATH'] ||= ENV['GRDIR']
-  @ffi_lib = case RbConfig::CONFIG['host_os']
-             when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-               File.expand_path('bin/libgr.dll', ENV['GRDIR'])
-                   .gsub('/', '\\') # windows backslash
-             else
-               File.expand_path('lib/libGR.so', ENV['GRDIR'])
-             end
+  if Object.const_defined?(:RubyInstaller)
+    @ffi_lib = File.expand_path('bin/libgr.dll', ENV['GRDIR'])
+    RubyInstaller::Runtime.add_dll_directory(File.dirname(@ffi_lib))
+  else
+    @ffi_lib = File.expand_path('lib/libGR.so', ENV['GRDIR'])
+  end
 
   require_relative 'gr_commons'
   require_relative 'gr/version'
@@ -68,6 +72,9 @@ module GR
   # a FFI::MemoryPointer in the GRBase class.
   extend GRBase
 
+  # Now you can see a lot of methods just calling super here.
+  # Why? Do they really need?
+  # Yes. They are written to help the yard generate the documentation.
   class << self
     def initgr(*)
       super
@@ -272,9 +279,9 @@ module GR
     # The values for `x` and `y` are in world coordinates. The attributes that
     # control the appearance of a spline-fit are linetype, linewidth and color
     # index.
-    def spline(px, py, m, method)
-      n = equal_length(px, py)
-      super(n, px, py, m, method)
+    def spline(x, y, m, method)
+      n = equal_length(x, y)
+      super(n, x, y, m, method)
     end
 
     def gridit(xd, yd, zd, nx, ny)
@@ -640,39 +647,6 @@ module GR
       super
     end
 
-    # `setscale` sets the type of transformation to be used for subsequent GR output
-    # primitives.
-    # @param options [Integer] Scale specification
-    #  * 1 :  OPTION_X_LOG
-    #    *    Logarithmic X-axis
-    #  * 2 :  OPTION_Y_LOG
-    #    *    Logarithmic Y-axis
-    #  * 4 :  OPTION_Z_LOG
-    #    *    Logarithmic Z-axis
-    #  * 8 :  OPTION_FLIP_X
-    #    *    Flip X-axis
-    #  * 16 : OPTION_FLIP_Y
-    #    *    Flip Y-axis
-    #  * 32 : OPTION_FLIP_Z
-    #    *    Flip Z-axis
-    # @return [Integer]
-    # `setscale` defines the current transformation according to the given scale
-    # specification which may be or'ed together using any of the above options. GR uses
-    # these options for all subsequent output primitives until another value is provided.
-    # The scale options are used to transform points from an abstract logarithmic or
-    # semi-logarithmic coordinate system, which may be flipped along each axis, into the
-    # world coordinate system.
-    # Note: When applying a logarithmic transformation to a specific axis, the system
-    # assumes that the axes limits are greater than zero.
-    def setscale(*)
-      super
-    end
-
-    # inqscale
-    def inqscale
-      inquiry_int { |pt| super(pt) }
-    end
-
     # `setwindow` establishes a window, or rectangular subspace, of world coordinates to be
     # plotted. If you desire log scaling or mirror-imaging of axes, use the SETSCALE function.
     # @param xmin [Numeric] The left horizontal coordinate of the window (`xmin` < `xmax`).
@@ -819,6 +793,39 @@ module GR
       end
     end
 
+    # `setscale` sets the type of transformation to be used for subsequent GR output
+    # primitives.
+    # @param options [Integer] Scale specification
+    #  * 1 :  OPTION_X_LOG
+    #    *    Logarithmic X-axis
+    #  * 2 :  OPTION_Y_LOG
+    #    *    Logarithmic Y-axis
+    #  * 4 :  OPTION_Z_LOG
+    #    *    Logarithmic Z-axis
+    #  * 8 :  OPTION_FLIP_X
+    #    *    Flip X-axis
+    #  * 16 : OPTION_FLIP_Y
+    #    *    Flip Y-axis
+    #  * 32 : OPTION_FLIP_Z
+    #    *    Flip Z-axis
+    # @return [Integer]
+    # `setscale` defines the current transformation according to the given scale
+    # specification which may be or'ed together using any of the above options. GR uses
+    # these options for all subsequent output primitives until another value is provided.
+    # The scale options are used to transform points from an abstract logarithmic or
+    # semi-logarithmic coordinate system, which may be flipped along each axis, into the
+    # world coordinate system.
+    # Note: When applying a logarithmic transformation to a specific axis, the system
+    # assumes that the axes limits are greater than zero.
+    def setscale(*)
+      super
+    end
+
+    # inqscale
+    def inqscale
+      inquiry_int { |pt| super(pt) }
+    end
+
     # Draw a text at position `x`, `y` using the current text attributes. Strings can be
     # defined to create basic mathematical expressions and Greek letters.
     # @param x [Numeric] The X coordinate of starting position of the text string
@@ -906,6 +913,10 @@ module GR
 
     alias axes2d axes
 
+    def axeslbl(*)
+      super
+    end
+
     # Draw a linear and/or logarithmic grid.
     # @param x_tick [Numeric] The length in world coordinates of the interval between minor grid lines.
     # @param y_tick [Numeric] The length in world coordinates of the interval between minor grid lines.
@@ -954,9 +965,9 @@ module GR
     # @param y [Array, NArray] A list of length N containing the Y coordinates
     # @param e1 [Array, NArray] The absolute values of the lower error bar data
     # @param e2 [Array, NArray] The absolute values of the lower error bar data
-    def verrorbars(px, py, e1, e2)
-      n = equal_length(px, py, e1, e2)
-      super(n, px, py, e1, e2)
+    def verrorbars(x, y, e1, e2)
+      n = equal_length(x, y, e1, e2)
+      super(n, x, y, e1, e2)
     end
 
     # Draw a standard horizontal error bar graph.
@@ -964,9 +975,9 @@ module GR
     # @param y [Array, NArray] A list of length N containing the Y coordinates
     # @param e1 [Array, NArray] The absolute values of the lower error bar data
     # @param e2 [Array, NArray] The absolute values of the lower error bar data
-    def herrorbars(px, py, e1, e2)
-      n = equal_length(px, py, e1, e2)
-      super(n, px, py, e1, e2)
+    def herrorbars(x, y, e1, e2)
+      n = equal_length(x, y, e1, e2)
+      super(n, x, y, e1, e2)
     end
 
     # Draw a 3D curve using the current line attributes,
@@ -977,9 +988,9 @@ module GR
     # The values for `x`, `y` and `z` are in world coordinates. The attributes that
     # control the appearance of a polyline are linetype, linewidth and color
     # index.
-    def polyline3d(px, py, pz)
-      n = equal_length(px, py, pz)
-      super(n, px, py, pz)
+    def polyline3d(x, y, z)
+      n = equal_length(x, y, z)
+      super(n, x, y, z)
     end
 
     # Draw marker symbols centered at the given 3D data points.
@@ -989,9 +1000,9 @@ module GR
     # The values for `x`, `y` and `z` are in world coordinates. The attributes
     # that control the appearance of a polymarker are marker type, marker size
     # scale factor and color index.
-    def polymarker3d(px, py, pz)
-      n = equal_length(px, py, pz)
-      super(n, px, py, pz)
+    def polymarker3d(x, y, z)
+      n = equal_length(x, y, z)
+      super(n, x, y, z)
     end
 
     # Draw X, Y and Z coordinate axes with linearly and/or logarithmically
@@ -1061,11 +1072,11 @@ module GR
     # `x` and `y` define a grid. `z` is a singly dimensioned array containing at least
     # `nx` * `ny` data points. Z describes the surface height at each point on the grid.
     # Data is ordered as shown in the table:
-    def surface(px, py, pz, option)
+    def surface(x, y, z, option)
       # TODO: check: Arrays have incorrect length or dimension.
-      nx = px.length
-      ny = py.length
-      super(nx, ny, px, py, pz, option)
+      nx = x.length
+      ny = y.length
+      super(nx, ny, x, y, z, option)
     end
 
     # Draw contours of a three-dimensional data set
@@ -1083,12 +1094,12 @@ module GR
     #   every third line. A value of 1 will label every line. A value of 0
     #   produces no labels. To produce colored contour lines, add an offset
     #   of 1000 to `major_h`.
-    def contour(px, py, h, pz, major_h)
+    def contour(x, y, h, z, major_h)
       # TODO: check: Arrays have incorrect length or dimension.
-      nx = px.length
-      ny = py.length
+      nx = x.length
+      ny = y.length
       nh = h.length
-      super(nx, ny, nh, px, py, h, pz, major_h)
+      super(nx, ny, nh, x, y, h, z, major_h)
     end
 
     # Draw filled contours of a three-dimensional data set
@@ -1102,12 +1113,12 @@ module GR
     # @param z [Array, NArray]
     #   A list of length `len(x)` * `len(y)` or an appropriately dimensioned
     #   array containing the Z coordinates
-    def contourf(px, py, h, pz, major_h)
+    def contourf(x, y, h, z, major_h)
       # TODO: check: Arrays have incorrect length or dimension.
-      nx = px.length
-      ny = py.length
+      nx = x.length
+      ny = y.length
       nh = h.length
-      super(nx, ny, nh, px, py, h, pz, major_h)
+      super(nx, ny, nh, x, y, h, z, major_h)
     end
 
     # Draw a contour plot for the given triangle mesh.
@@ -1136,9 +1147,9 @@ module GR
     def setcolormapfromrgb(r, g, b, positions: nil)
       n = equal_length(r, g, b)
       if positions.nil?
-        positions = ::FFI::Pointer::NULL
-      else
-        raise if positions.length != n
+        positions = Fiddle::NULL
+      elsif positions.length != n
+        raise
       end
       super(n, r, g, b, positions)
     end
@@ -1386,11 +1397,13 @@ module GR
 
     # @return [Integer]
     def readimage(path)
-      w, h, d = inquiry [:int, :int, :pointer] do |width, height, data|
+      data = Fiddle::Pointer.malloc(Fiddle::SIZEOF_INTPTR_T)
+      w, h = inquiry [:int, :int] do |width, height|
         # data is a pointer of a pointer
-        super(path, width, height, data)
+        super(path, width, height, data.ref)
       end
-      [w, h, d.read_array_of_uint(w * h)]
+      d = data.to_str(w * h * 8).unpack('L*') # UINT8
+      [w, h, d]
     end
 
     # Draw an image into a given rectangular area.
@@ -1464,7 +1477,7 @@ module GR
 
     # @return [String]
     def getgraphics(*)
-      super
+      super.to_s
     end
 
     # @return [Integer]
@@ -1558,9 +1571,9 @@ module GR
     # @param x [Array, NArray] A list containing the X coordinates
     # @param y [Array, NArray] A list containing the Y coordinates
     # @param z [Array, NArray] A list containing the Z coordinates
-    def trisurface(px, py, pz)
-      n = [px, py, pz].map(&:length).min
-      super(n, px, py, pz)
+    def trisurface(x, y, z)
+      n = [x, y, z].map(&:length).min
+      super(n, x, y, z)
     end
 
     # @deprecated
@@ -1625,7 +1638,11 @@ module GR
     # Returns the combined version strings of the GR runtime.
     # @return [String]
     def version
-      super.read_string
+      super.to_s
+    end
+
+    def shade(*)
+      super
     end
 
     # Display a point set as a aggregated and rasterized image.
@@ -1740,206 +1757,236 @@ module GR
         super(resample_method)
       end
     end
+
+    # Draw paths using given vertices and path codes.
+    # @param x [Array, NArray] A list containing the X coordinates
+    # @param y [Array, NArray] A list containing the Y coordinates
+    # @param codes [String] Path codes
+    #  The following path codes are recognized:
+    #  * M, m
+    #    * moveto           x, y
+    #  * L, l
+    #    * lineto           x, y
+    #  * Q, q
+    #    * quadratic Bézier x1, y1  x2, y2
+    #  * C, c
+    #    * cubic Bézier     x1, y1  x2, y2  x3, y3
+    #  * R, r
+    #    * rectangle        w, h
+    #  * A, a
+    #    * arc              w, h  a1, a2
+    #  * Z
+    #    * closepath        -
+    #  * s
+    #    * stroke           -
+    #  * f
+    #    * fill             -
+    # The values for `x` and `y` are in normalized device coordinates.
+    # The `codes` describe several patch primitives that can be used to create compound paths.
+    def path(x, y, codes)
+      n = equal_length(x, y)
+      super(n, x, y, codes)
+    end
   end
 
-  ASF_BUNDLED = 0
+  ASF_BUNDLED    = 0
   ASF_INDIVIDUAL = 1
 
   NOCLIP = 0
-  CLIP = 1
+  CLIP   = 1
 
-  COORDINATES_WC = 0
+  COORDINATES_WC  = 0
   COORDINATES_NDC = 1
 
-  INTSTYLE_HOLLOW = 0
-  INTSTYLE_SOLID = 1
+  INTSTYLE_HOLLOW  = 0
+  INTSTYLE_SOLID   = 1
   INTSTYLE_PATTERN = 2
-  INTSTYLE_HATCH = 3
+  INTSTYLE_HATCH   = 3
 
   TEXT_HALIGN_NORMAL = 0
-  TEXT_HALIGN_LEFT = 1
+  TEXT_HALIGN_LEFT   = 1
   TEXT_HALIGN_CENTER = 2
-  TEXT_HALIGN_RIGHT = 3
+  TEXT_HALIGN_RIGHT  = 3
   TEXT_VALIGN_NORMAL = 0
-  TEXT_VALIGN_TOP = 1
-  TEXT_VALIGN_CAP = 2
-  TEXT_VALIGN_HALF = 3
-  TEXT_VALIGN_BASE = 4
+  TEXT_VALIGN_TOP    = 1
+  TEXT_VALIGN_CAP    = 2
+  TEXT_VALIGN_HALF   = 3
+  TEXT_VALIGN_BASE   = 4
   TEXT_VALIGN_BOTTOM = 5
 
   TEXT_PATH_RIGHT = 0
-  TEXT_PATH_LEFT = 1
-  TEXT_PATH_UP = 2
-  TEXT_PATH_DOWN = 3
+  TEXT_PATH_LEFT  = 1
+  TEXT_PATH_UP    = 2
+  TEXT_PATH_DOWN  = 3
 
   TEXT_PRECISION_STRING = 0
-  TEXT_PRECISION_CHAR = 1
+  TEXT_PRECISION_CHAR   = 1
   TEXT_PRECISION_STROKE = 2
 
-  LINETYPE_SOLID = 1
-  LINETYPE_DASHED = 2
-  LINETYPE_DOTTED = 3
-  LINETYPE_DASHED_DOTTED = 4
-  LINETYPE_DASH_2_DOT = -1
-  LINETYPE_DASH_3_DOT = -2
-  LINETYPE_LONG_DASH = -3
+  LINETYPE_SOLID           =  1
+  LINETYPE_DASHED          =  2
+  LINETYPE_DOTTED          =  3
+  LINETYPE_DASHED_DOTTED   =  4
+  LINETYPE_DASH_2_DOT      = -1
+  LINETYPE_DASH_3_DOT      = -2
+  LINETYPE_LONG_DASH       = -3
   LINETYPE_LONG_SHORT_DASH = -4
-  LINETYPE_SPACED_DASH = -5
-  LINETYPE_SPACED_DOT = -6
-  LINETYPE_DOUBLE_DOT = -7
-  LINETYPE_TRIPLE_DOT = -8
-
-  MARKERTYPE_DOT = 1
-  MARKERTYPE_PLUS = 2
-  MARKERTYPE_ASTERISK = 3
-  MARKERTYPE_CIRCLE = 4
-  MARKERTYPE_DIAGONAL_CROSS = 5
-  MARKERTYPE_SOLID_CIRCLE = -1
-  MARKERTYPE_TRIANGLE_UP = -2
-  MARKERTYPE_SOLID_TRI_UP = -3
-  MARKERTYPE_TRIANGLE_DOWN = -4
-  MARKERTYPE_SOLID_TRI_DOWN = -5
-  MARKERTYPE_SQUARE = -6
-  MARKERTYPE_SOLID_SQUARE = -7
-  MARKERTYPE_BOWTIE = -8
-  MARKERTYPE_SOLID_BOWTIE = -9
-  MARKERTYPE_HOURGLASS = -10
-  MARKERTYPE_SOLID_HGLASS = -11
-  MARKERTYPE_DIAMOND = -12
-  MARKERTYPE_SOLID_DIAMOND = -13
-  MARKERTYPE_STAR = -14
-  MARKERTYPE_SOLID_STAR = -15
-  MARKERTYPE_TRI_UP_DOWN = -16
+  LINETYPE_SPACED_DASH     = -5
+  LINETYPE_SPACED_DOT      = -6
+  LINETYPE_DOUBLE_DOT      = -7
+  LINETYPE_TRIPLE_DOT      = -8
+
+  MARKERTYPE_DOT             =   1
+  MARKERTYPE_PLUS            =   2
+  MARKERTYPE_ASTERISK        =   3
+  MARKERTYPE_CIRCLE          =   4
+  MARKERTYPE_DIAGONAL_CROSS  =   5
+  MARKERTYPE_SOLID_CIRCLE    =  -1
+  MARKERTYPE_TRIANGLE_UP     =  -2
+  MARKERTYPE_SOLID_TRI_UP    =  -3
+  MARKERTYPE_TRIANGLE_DOWN   =  -4
+  MARKERTYPE_SOLID_TRI_DOWN  =  -5
+  MARKERTYPE_SQUARE          =  -6
+  MARKERTYPE_SOLID_SQUARE    =  -7
+  MARKERTYPE_BOWTIE          =  -8
+  MARKERTYPE_SOLID_BOWTIE    =  -9
+  MARKERTYPE_HOURGLASS       = -10
+  MARKERTYPE_SOLID_HGLASS    = -11
+  MARKERTYPE_DIAMOND         = -12
+  MARKERTYPE_SOLID_DIAMOND   = -13
+  MARKERTYPE_STAR            = -14
+  MARKERTYPE_SOLID_STAR      = -15
+  MARKERTYPE_TRI_UP_DOWN     = -16
   MARKERTYPE_SOLID_TRI_RIGHT = -17
-  MARKERTYPE_SOLID_TRI_LEFT = -18
-  MARKERTYPE_HOLLOW_PLUS = -19
-  MARKERTYPE_SOLID_PLUS = -20
-  MARKERTYPE_PENTAGON = -21
-  MARKERTYPE_HEXAGON = -22
-  MARKERTYPE_HEPTAGON = -23
-  MARKERTYPE_OCTAGON = -24
-  MARKERTYPE_STAR_4 = -25
-  MARKERTYPE_STAR_5 = -26
-  MARKERTYPE_STAR_6 = -27
-  MARKERTYPE_STAR_7 = -28
-  MARKERTYPE_STAR_8 = -29
-  MARKERTYPE_VLINE = -30
-  MARKERTYPE_HLINE = -31
-  MARKERTYPE_OMARK = -32
-
-  OPTION_X_LOG = 1
-  OPTION_Y_LOG = 2
-  OPTION_Z_LOG = 4
-  OPTION_FLIP_X = 8
+  MARKERTYPE_SOLID_TRI_LEFT  = -18
+  MARKERTYPE_HOLLOW_PLUS     = -19
+  MARKERTYPE_SOLID_PLUS      = -20
+  MARKERTYPE_PENTAGON        = -21
+  MARKERTYPE_HEXAGON         = -22
+  MARKERTYPE_HEPTAGON        = -23
+  MARKERTYPE_OCTAGON         = -24
+  MARKERTYPE_STAR_4          = -25
+  MARKERTYPE_STAR_5          = -26
+  MARKERTYPE_STAR_6          = -27
+  MARKERTYPE_STAR_7          = -28
+  MARKERTYPE_STAR_8          = -29
+  MARKERTYPE_VLINE           = -30
+  MARKERTYPE_HLINE           = -31
+  MARKERTYPE_OMARK           = -32
+
+  OPTION_X_LOG  =  1
+  OPTION_Y_LOG  =  2
+  OPTION_Z_LOG  =  4
+  OPTION_FLIP_X =  8
   OPTION_FLIP_Y = 16
   OPTION_FLIP_Z = 32
 
-  OPTION_LINES = 0
-  OPTION_MESH = 1
-  OPTION_FILLED_MESH = 2
+  OPTION_LINES         = 0
+  OPTION_MESH          = 1
+  OPTION_FILLED_MESH   = 2
   OPTION_Z_SHADED_MESH = 3
-  OPTION_COLORED_MESH = 4
-  OPTION_CELL_ARRAY = 5
-  OPTION_SHADED_MESH = 6
+  OPTION_COLORED_MESH  = 4
+  OPTION_CELL_ARRAY    = 5
+  OPTION_SHADED_MESH   = 6
 
   MODEL_RGB = 0
   MODEL_HSV = 1
 
-  COLORMAP_UNIFORM = 0
-  COLORMAP_TEMPERATURE = 1
-  COLORMAP_GRAYSCALE = 2
-  COLORMAP_GLOWING = 3
-  COLORMAP_RAINBOWLIKE = 4
-  COLORMAP_GEOLOGIC = 5
-  COLORMAP_GREENSCALE = 6
-  COLORMAP_CYANSCALE = 7
-  COLORMAP_BLUESCALE = 8
-  COLORMAP_MAGENTASCALE = 9
-  COLORMAP_REDSCALE = 10
-  COLORMAP_FLAME = 11
-  COLORMAP_BROWNSCALE = 12
-  COLORMAP_PILATUS = 13
-  COLORMAP_AUTUMN = 14
-  COLORMAP_BONE = 15
-  COLORMAP_COOL = 16
-  COLORMAP_COPPER = 17
-  COLORMAP_GRAY = 18
-  COLORMAP_HOT = 19
-  COLORMAP_HSV = 20
-  COLORMAP_JET = 21
-  COLORMAP_PINK = 22
-  COLORMAP_SPECTRAL = 23
-  COLORMAP_SPRING = 24
-  COLORMAP_SUMMER = 25
-  COLORMAP_WINTER = 26
-  COLORMAP_GIST_EARTH = 27
-  COLORMAP_GIST_HEAT = 28
-  COLORMAP_GIST_NCAR = 29
+  COLORMAP_UNIFORM      =  0
+  COLORMAP_TEMPERATURE  =  1
+  COLORMAP_GRAYSCALE    =  2
+  COLORMAP_GLOWING      =  3
+  COLORMAP_RAINBOWLIKE  =  4
+  COLORMAP_GEOLOGIC     =  5
+  COLORMAP_GREENSCALE   =  6
+  COLORMAP_CYANSCALE    =  7
+  COLORMAP_BLUESCALE    =  8
+  COLORMAP_MAGENTASCALE =  9
+  COLORMAP_REDSCALE     = 10
+  COLORMAP_FLAME        = 11
+  COLORMAP_BROWNSCALE   = 12
+  COLORMAP_PILATUS      = 13
+  COLORMAP_AUTUMN       = 14
+  COLORMAP_BONE         = 15
+  COLORMAP_COOL         = 16
+  COLORMAP_COPPER       = 17
+  COLORMAP_GRAY         = 18
+  COLORMAP_HOT          = 19
+  COLORMAP_HSV          = 20
+  COLORMAP_JET          = 21
+  COLORMAP_PINK         = 22
+  COLORMAP_SPECTRAL     = 23
+  COLORMAP_SPRING       = 24
+  COLORMAP_SUMMER       = 25
+  COLORMAP_WINTER       = 26
+  COLORMAP_GIST_EARTH   = 27
+  COLORMAP_GIST_HEAT    = 28
+  COLORMAP_GIST_NCAR    = 29
   COLORMAP_GIST_RAINBOW = 30
-  COLORMAP_GIST_STERN = 31
-  COLORMAP_AFMHOT = 32
-  COLORMAP_BRG = 33
-  COLORMAP_BWR = 34
-  COLORMAP_COOLWARM = 35
-  COLORMAP_CMRMAP = 36
-  COLORMAP_CUBEHELIX = 37
-  COLORMAP_GNUPLOT = 38
-  COLORMAP_GNUPLOT2 = 39
-  COLORMAP_OCEAN = 40
-  COLORMAP_RAINBOW = 41
-  COLORMAP_SEISMIC = 42
-  COLORMAP_TERRAIN = 43
-  COLORMAP_VIRIDIS = 44
-  COLORMAP_INFERNO = 45
-  COLORMAP_PLASMA = 46
-  COLORMAP_MAGMA = 47
-
-  FONT_TIMES_ROMAN = 101
-  FONT_TIMES_ITALIC = 102
-  FONT_TIMES_BOLD = 103
-  FONT_TIMES_BOLDITALIC = 104
-  FONT_HELVETICA = 105
-  FONT_HELVETICA_OBLIQUE = 106
-  FONT_HELVETICA_BOLD = 107
-  FONT_HELVETICA_BOLDOBLIQUE = 108
-  FONT_COURIER = 109
-  FONT_COURIER_OBLIQUE = 110
-  FONT_COURIER_BOLD = 111
-  FONT_COURIER_BOLDOBLIQUE = 112
-  FONT_SYMBOL = 113
-  FONT_BOOKMAN_LIGHT = 114
-  FONT_BOOKMAN_LIGHTITALIC = 115
-  FONT_BOOKMAN_DEMI = 116
-  FONT_BOOKMAN_DEMIITALIC = 117
-  FONT_NEWCENTURYSCHLBK_ROMAN = 118
-  FONT_NEWCENTURYSCHLBK_ITALIC = 119
-  FONT_NEWCENTURYSCHLBK_BOLD = 120
+  COLORMAP_GIST_STERN   = 31
+  COLORMAP_AFMHOT       = 32
+  COLORMAP_BRG          = 33
+  COLORMAP_BWR          = 34
+  COLORMAP_COOLWARM     = 35
+  COLORMAP_CMRMAP       = 36
+  COLORMAP_CUBEHELIX    = 37
+  COLORMAP_GNUPLOT      = 38
+  COLORMAP_GNUPLOT2     = 39
+  COLORMAP_OCEAN        = 40
+  COLORMAP_RAINBOW      = 41
+  COLORMAP_SEISMIC      = 42
+  COLORMAP_TERRAIN      = 43
+  COLORMAP_VIRIDIS      = 44
+  COLORMAP_INFERNO      = 45
+  COLORMAP_PLASMA       = 46
+  COLORMAP_MAGMA        = 47
+
+  FONT_TIMES_ROMAN                 = 101
+  FONT_TIMES_ITALIC                = 102
+  FONT_TIMES_BOLD                  = 103
+  FONT_TIMES_BOLDITALIC            = 104
+  FONT_HELVETICA                   = 105
+  FONT_HELVETICA_OBLIQUE           = 106
+  FONT_HELVETICA_BOLD              = 107
+  FONT_HELVETICA_BOLDOBLIQUE       = 108
+  FONT_COURIER                     = 109
+  FONT_COURIER_OBLIQUE             = 110
+  FONT_COURIER_BOLD                = 111
+  FONT_COURIER_BOLDOBLIQUE         = 112
+  FONT_SYMBOL                      = 113
+  FONT_BOOKMAN_LIGHT               = 114
+  FONT_BOOKMAN_LIGHTITALIC         = 115
+  FONT_BOOKMAN_DEMI                = 116
+  FONT_BOOKMAN_DEMIITALIC          = 117
+  FONT_NEWCENTURYSCHLBK_ROMAN      = 118
+  FONT_NEWCENTURYSCHLBK_ITALIC     = 119
+  FONT_NEWCENTURYSCHLBK_BOLD       = 120
   FONT_NEWCENTURYSCHLBK_BOLDITALIC = 121
-  FONT_AVANTGARDE_BOOK = 122
-  FONT_AVANTGARDE_BOOKOBLIQUE = 123
-  FONT_AVANTGARDE_DEMI = 124
-  FONT_AVANTGARDE_DEMIOBLIQUE = 125
-  FONT_PALATINO_ROMAN = 126
-  FONT_PALATINO_ITALIC = 127
-  FONT_PALATINO_BOLD = 128
-  FONT_PALATINO_BOLDITALIC = 129
-  FONT_ZAPFCHANCERY_MEDIUMITALIC = 130
-  FONT_ZAPFDINGBATS = 131
+  FONT_AVANTGARDE_BOOK             = 122
+  FONT_AVANTGARDE_BOOKOBLIQUE      = 123
+  FONT_AVANTGARDE_DEMI             = 124
+  FONT_AVANTGARDE_DEMIOBLIQUE      = 125
+  FONT_PALATINO_ROMAN              = 126
+  FONT_PALATINO_ITALIC             = 127
+  FONT_PALATINO_BOLD               = 128
+  FONT_PALATINO_BOLDITALIC         = 129
+  FONT_ZAPFCHANCERY_MEDIUMITALIC   = 130
+  FONT_ZAPFDINGBATS                = 131
 
   # GR.beginprint types
-  PRINT_PS = 'ps'
-  PRINT_EPS = 'eps'
-  PRINT_PDF = 'pdf'
-  PRINT_PGF = 'pgf'
-  PRINT_BMP = 'bmp'
+  PRINT_PS   = 'ps'
+  PRINT_EPS  = 'eps'
+  PRINT_PDF  = 'pdf'
+  PRINT_PGF  = 'pgf'
+  PRINT_BMP  = 'bmp'
   PRINT_JPEG = 'jpeg'
-  PRINT_JPG = 'jpg'
-  PRINT_PNG = 'png'
+  PRINT_JPG  = 'jpg'
+  PRINT_PNG  = 'png'
   PRINT_TIFF = 'tiff'
-  PRINT_TIF = 'tif'
-  PRINT_FIG = 'fig'
-  PRINT_SVG = 'svg'
-  PRINT_WMF = 'wmf'
+  PRINT_TIF  = 'tif'
+  PRINT_FIG  = 'fig'
+  PRINT_SVG  = 'svg'
+  PRINT_WMF  = 'wmf'
 
   PATH_STOP      = 0x00
   PATH_MOVETO    = 0x01
@@ -1948,30 +1995,30 @@ module GR
   PATH_CURVE4    = 0x04
   PATH_CLOSEPOLY = 0x4f
 
-  MPL_SUPPRESS_CLEAR = 1
+  MPL_SUPPRESS_CLEAR  = 1
   MPL_POSTPONE_UPDATE = 2
 
-  XFORM_BOOLEAN = 0
-  XFORM_LINEAR = 1
-  XFORM_LOG = 2
-  XFORM_LOGLOG = 3
-  XFORM_CUBIC = 4
+  XFORM_BOOLEAN   = 0
+  XFORM_LINEAR    = 1
+  XFORM_LOG       = 2
+  XFORM_LOGLOG    = 3
+  XFORM_CUBIC     = 4
   XFORM_EQUALIZED = 5
 
-  UPSAMPLE_VERTICAL_DEFAULT = 0x00000000
-  UPSAMPLE_HORIZONTAL_DEFAULT = 0x00000000
-  DOWNSAMPLE_VERTICAL_DEFAULT = 0x00000000
+  UPSAMPLE_VERTICAL_DEFAULT     = 0x00000000
+  UPSAMPLE_HORIZONTAL_DEFAULT   = 0x00000000
+  DOWNSAMPLE_VERTICAL_DEFAULT   = 0x00000000
   DOWNSAMPLE_HORIZONTAL_DEFAULT = 0x00000000
-  UPSAMPLE_VERTICAL_NEAREST = 0x00000001
-  UPSAMPLE_HORIZONTAL_NEAREST = 0x00000100
-  DOWNSAMPLE_VERTICAL_NEAREST = 0x00010000
+  UPSAMPLE_VERTICAL_NEAREST     = 0x00000001
+  UPSAMPLE_HORIZONTAL_NEAREST   = 0x00000100
+  DOWNSAMPLE_VERTICAL_NEAREST   = 0x00010000
   DOWNSAMPLE_HORIZONTAL_NEAREST = 0x01000000
-  UPSAMPLE_VERTICAL_LINEAR = 0x00000002
-  UPSAMPLE_HORIZONTAL_LINEAR = 0x00000200
-  DOWNSAMPLE_VERTICAL_LINEAR = 0x00020000
-  DOWNSAMPLE_HORIZONTAL_LINEAR = 0x02000000
-  UPSAMPLE_VERTICAL_LANCZOS = 0x00000003
-  UPSAMPLE_HORIZONTAL_LANCZOS = 0x00000300
-  DOWNSAMPLE_VERTICAL_LANCZOS = 0x00030000
+  UPSAMPLE_VERTICAL_LINEAR      = 0x00000002
+  UPSAMPLE_HORIZONTAL_LINEAR    = 0x00000200
+  DOWNSAMPLE_VERTICAL_LINEAR    = 0x00020000
+  DOWNSAMPLE_HORIZONTAL_LINEAR  = 0x02000000
+  UPSAMPLE_VERTICAL_LANCZOS     = 0x00000003
+  UPSAMPLE_HORIZONTAL_LANCZOS   = 0x00000300
+  DOWNSAMPLE_VERTICAL_LANCZOS   = 0x00030000
   DOWNSAMPLE_HORIZONTAL_LANCZOS = 0x03000000
 end