ruby-gr 0.0.16 → 0.0.21

data/lib/gr/ffi.rb

@@ -63,6 +63,7 @@ module GR
     try_extern 'void gr_settextcolorind(int)'
     try_extern 'void gr_inqtextcolorind(int *)'
     try_extern 'void gr_setcharheight(double)'
+    try_extern 'void gr_inqcharheight(double *)'
     try_extern 'void gr_setcharup(double, double)'
     try_extern 'void gr_settextpath(int)'
     try_extern 'void gr_settextalign(int, int)'
@@ -196,6 +197,10 @@ module GR
     try_extern 'void gr_inqwindow3d(double *, double *, double *, double *, double *, double *)'
     try_extern 'void gr_setscalefactors3d(double, double, double)'
     try_extern 'void gr_inqscalefactors3d(double *, double *, double *)'
-    try_extern 'void gr_transformationinterfaceforrepl(double, double, double, double)'
+    try_extern 'void gr_setspace3d(double, double, double, double)'
+    try_extern 'void gr_text3d(double, double, double, char *, int axis)'
+    try_extern 'void gr_inqtext3d(double, double, double, char *, int axis, double *, double *)'
+    try_extern 'void gr_settextencoding(int)'
+    try_extern 'void gr_inqtextencoding(int *)'
   end
 end

data/lib/gr/plot.rb

@@ -37,59 +37,59 @@ module GR
                    volume].freeze # the name might be changed in the future.
 
     # Keyword options conform to GR.jl.
-    KW_ARGS = %i[accelerate algorithm alpha backgroundcolor barwidth baseline
-                 clabels color colormap figsize horizontal isovalue label labels
-                 levels location nbins rotation size tilt title where xflip
-                 xform xlabel xlim xlog yflip ylabel ylim ylog zflip zlabel zlim
-                 zlog clim subplot].freeze
+    KW_ARGS = %i[accelerate algorithm alpha ax backgroundcolor barwidth baseline
+                 clabels clear clim color colormap crange figsize grid horizontal
+                 isovalue kind label labels levels location nbins ratio rotation
+                 scale size spec subplot tilt title update xaxis xflip xform
+                 xlabel xlim xlog xrange xticks yaxis yflip ylabel ylim ylog
+                 zflip yrange yticks viewport vp where window zaxis zlabel zlim
+                 zlog zrange zticks].freeze
 
     @last_plot = nil
     class << self
       attr_accessor :last_plot
     end
 
-    def initialize(*args)
-      @kvs = if args[-1].is_a? Hash
-               args.pop
-             else
-               {}
-             end
+    attr_accessor :args, :kvs, :scheme
+
+    def initialize(*raw_args)
+      @kvs = raw_args.last.is_a?(Hash) ? raw_args.pop : {}
+      @args = plot_args(raw_args) # method name is the same as Julia/Python
+
       # Check keyword options.
-      @kvs.each_key do |k|
-        warn "Unknown keyword: #{k}" unless KW_ARGS.include? k
-      end
+      kvs.each_key { |k| warn "Unknown keyword: #{k}" unless KW_ARGS.include? k }
 
       # label(singular form) is a original keyword arg which GR.jl does not have.
-      @kvs[:labels] = [@kvs[:label]] if @kvs[:label] && @kvs[:labels].nil?
-
-      @args = plot_args(args) # method name is the same as Julia/Python
-      @kvs[:size] ||= [600, 450]
-      @kvs[:ax] = false if @kvs[:ax].nil?
-      @kvs[:subplot] ||= [0, 1, 0, 1]
-      @kvs[:clear] = true if @kvs[:clear].nil?
-      @kvs[:update] = true if @kvs[:update].nil?
-      @scheme = 0
+      kvs[:labels] ||= [kvs[:label]] if kvs.has_key? :label
+
+      # Don't use ||= here, because we need to tell `false` from `nil`
+      kvs[:size]    = [600, 450]   unless kvs.has_key? :size
+      kvs[:ax]      = false        unless kvs.has_key? :ax
+      kvs[:subplot] = [0, 1, 0, 1] unless kvs.has_key? :subplot
+      kvs[:clear]   = true         unless kvs.has_key? :clear
+      kvs[:update]  = true         unless kvs.has_key? :update
+
+      @scheme     = 0
       @background = 0xffffff
-      @handle = nil
+      # @handle     = nil           # This variable will be used in gr_meta
+
       self.class.last_plot = self
     end
-    attr_accessor :args, :kvs, :scheme
 
     def set_viewport(kind, subplot)
       mwidth, mheight, width, height = GR.inqdspsize
-      if kvs[:figsize]
-        w = 0.0254 * width * kvs[:figsize][0] / mwidth
-        h = 0.0254 * height * kvs[:figsize][1] / mheight
-      else
-        dpi = width / mwidth * 0.0254
-        if dpi > 200
-          w, h = kvs[:size].map { |x| x * dpi / 100 }
-        else
-          w, h = kvs[:size]
-        end
-      end
-      viewport = [0, 0, 0, 0]
+      dpi = width / mwidth * 0.0254
+      w, h = if kvs[:figsize]
+               [(0.0254 * width  * kvs[:figsize][0] / mwidth),
+                (0.0254 * height * kvs[:figsize][1] / mheight)]
+             elsif dpi > 200
+               kvs[:size].map { |i| i * dpi / 100 }
+             else
+               kvs[:size]
+             end
+
       vp = subplot.clone
+
       if w > h
         ratio = h / w.to_f
         msize = mwidth * w / width
@@ -105,6 +105,7 @@ module GR
         vp[0] *= ratio
         vp[1] *= ratio
       end
+
       if %i[wireframe surface plot3 scatter3 trisurf volume].include?(kind)
         extent = [vp[1] - vp[0], vp[3] - vp[2]].min
         vp1 = 0.5 * (vp[0] + vp[1] - extent)
@@ -114,10 +115,12 @@ module GR
       else
         vp1, vp2, vp3, vp4 = vp
       end
-      viewport[0] = vp1 + 0.125 * (vp2 - vp1)
-      viewport[1] = vp1 + 0.925 * (vp2 - vp1)
-      viewport[2] = vp3 + 0.125 * (vp4 - vp3)
-      viewport[3] = vp3 + 0.925 * (vp4 - vp3)
+
+      viewport = [vp1 + 0.125 * (vp2 - vp1),
+                  vp1 + 0.925 * (vp2 - vp1),
+                  vp3 + 0.125 * (vp4 - vp3),
+                  vp3 + 0.925 * (vp4 - vp3)]
+
       if %i[contour contourf hexbin heatmap nonuniformheatmap polarheatmap
             surface trisurf volume].include?(kind)
         viewport[1] -= 0.1
@@ -131,11 +134,11 @@ module GR
         end
       end
 
-      GR.setviewport(viewport[0], viewport[1], viewport[2], viewport[3])
+      GR.setviewport(*viewport)
 
       kvs[:viewport] = viewport
-      kvs[:vp] = vp
-      kvs[:ratio] = ratio
+      kvs[:vp]       = vp
+      kvs[:ratio]    = ratio
 
       if kvs[:backgroundcolor]
         GR.savestate
@@ -165,14 +168,15 @@ module GR
     def set_window(kind)
       scale = 0
       unless %i[polar polarhist polarheatmap].include?(kind)
-        scale |= GR::OPTION_X_LOG if kvs[:xlog]
-        scale |= GR::OPTION_Y_LOG if kvs[:ylog]
-        scale |= GR::OPTION_Z_LOG if kvs[:zlog]
+        scale |= GR::OPTION_X_LOG  if kvs[:xlog]
+        scale |= GR::OPTION_Y_LOG  if kvs[:ylog]
+        scale |= GR::OPTION_Z_LOG  if kvs[:zlog]
         scale |= GR::OPTION_FLIP_X if kvs[:xflip]
         scale |= GR::OPTION_FLIP_Y if kvs[:yflip]
         scale |= GR::OPTION_FLIP_Z if kvs[:zflip]
       end
       kvs[:scale] = scale
+
       if kvs.has_key?(:panzoom)
         xmin, xmax, ymin, ymax = GR.panzoom(*kvs[:panzoom])
         kvs[:xrange] = [xmin, xmax]
@@ -188,65 +192,74 @@ module GR
                       5
                     end
 
+      kvs[:xticks] = [kvs[:xticks], major_count] if kvs[:xticks].is_a? Numeric
+      kvs[:yticks] = [kvs[:yticks], major_count] if kvs[:yticks].is_a? Numeric
+      kvs[:zticks] = [kvs[:zticks], major_count] if kvs[:zticks].is_a? Numeric
+
       xmin, xmax = kvs[:xrange]
-      if (scale & GR::OPTION_X_LOG) == 0
-        xmin, xmax = GR.adjustlimits(xmin, xmax) unless kvs.has_key?(:xlim) || kvs.has_key?(:panzoom)
-        if kvs.has_key?(:xticks)
-          xtick, majorx = kvs[:xticks]
-        else
-          majorx = major_count
-          xtick = GR.tick(xmin, xmax) / majorx
-        end
-      else
-        xtick = majorx = 1
+      if %i[heatmap polarheatmap].include?(kind) && kvs.has_key?(:xlim)
+        xmin -= 0.5
+        xmax += 0.5
       end
-      xorg = if (scale & GR::OPTION_FLIP_X) == 0
-               [xmin, xmax]
-             else
-               [xmax, xmin]
-             end
+      xtick, majorx = if (scale & GR::OPTION_X_LOG) == 0
+                        unless %i[heatmap polarheatmap].include?(kind)
+                          unless kvs.has_key?(:xlim)
+                            xmin, xmax = GR.adjustlimits(xmin, xmax) unless kvs[:panzoom]
+                          end
+                        end
+                        if kvs.has_key?(:xticks)
+                          kvs[:xticks]
+                        else
+                          [GR.tick(xmin, xmax) / major_count, major_count]
+                        end
+                      else
+                        [1, 1]
+                      end
+      xorg = (scale & GR::OPTION_FLIP_X) == 0 ? [xmin, xmax] : [xmax, xmin]
       kvs[:xaxis] = xtick, xorg, majorx
 
       ymin, ymax = kvs[:yrange]
-      if kind == :hist && !kvs.has_key?(:ylim)
-        ymin = (scale & GR::OPTION_Y_LOG) == 0 ? 0 : 1
+      if %i[heatmap polarheatmap].include?(kind) && kvs.has_key?(:ylim)
+        ymin -= 0.5
+        ymax += 0.5
       end
-      if (scale & GR::OPTION_Y_LOG) == 0
-        ymin, ymax = GR.adjustlimits(ymin, ymax) unless kvs.has_key?(:ylim) || kvs.has_key?(:panzoom)
-        if kvs.has_key?(:yticks)
-          ytick, majory = kvs[:yticks]
-        else
-          majory = major_count
-          ytick = GR.tick(ymin, ymax) / majory
+      if kind == :hist
+        if kvs[:horizontal] && !kvs.has_key?(:xlim)
+          xmin = (scale & GR::OPTION_X_LOG) == 0 ? 0 : 1
+        elsif !kvs.has_key?(:ylim)
+          ymin = (scale & GR::OPTION_Y_LOG) == 0 ? 0 : 1
         end
-      else
-        ytick = majory = 1
       end
-      yorg = if (scale & GR::OPTION_FLIP_Y) == 0
-               [ymin, ymax]
-             else
-               [ymax, ymin]
-             end
+      ytick, majory = if (scale & GR::OPTION_Y_LOG) == 0
+                        unless %i[heatmap polarheatmap].include?(kind)
+                          unless kvs.has_key?(:ylim)
+                            ymin, ymax = GR.adjustlimits(ymin, ymax) unless kvs[:panzoom]
+                          end
+                        end
+                        if kvs.has_key?(:yticks)
+                          kvs[:yticks]
+                        else
+                          [GR.tick(ymin, ymax) / major_count, major_count]
+                        end
+                      else
+                        [1, 1]
+                      end
+      yorg = (scale & GR::OPTION_FLIP_Y) == 0 ? [ymin, ymax] : [ymax, ymin]
       kvs[:yaxis] = ytick, yorg, majory
 
       if %i[wireframe surface plot3 scatter3 trisurf volume].include?(kind)
         zmin, zmax = kvs[:zrange]
-        if (scale & GR::OPTION_Z_LOG) == 0
-          zmin, zmax = GR.adjustlimits(zmin, zmax) if kvs.has_key?(:zlim)
-          if kvs.has_key?(:zticks)
-            ztick, majorz = kvs[:zticks]
-          else
-            majorz = major_count
-            ztick = GR.tick(zmin, zmax) / majorz
-          end
-        else
-          ztick = majorz = 1
-        end
-        zorg = if (scale & GR::OPTION_FLIP_Z) == 0
-                 [zmin, zmax]
-               else
-                 [zmax, zmin]
-               end
+        ztick, majorz = if (scale & GR::OPTION_Z_LOG) == 0
+                          zmin, zmax = GR.adjustlimits(zmin, zmax) if kvs.has_key?(:zlim)
+                          if kvs.has_key?(:zticks)
+                            kvs[:zticks]
+                          else
+                            [GR.tick(zmin, zmax) / major_count, major_count]
+                          end
+                        else
+                          [1, 1]
+                        end
+        zorg = (scale & GR::OPTION_FLIP_Z) == 0 ? [zmin, zmax] : [zmax, zmin]
         kvs[:zaxis] = ztick, zorg, majorz
       end
 
@@ -258,7 +271,7 @@ module GR
       end
       if %i[wireframe surface plot3 scatter3 trisurf volume].include?(kind)
         rotation = kvs[:rotation] || 40
-        tilt = kvs[:tilt] || 70
+        tilt     = kvs[:tilt]     || 70
         GR.setspace(zmin, zmax, rotation, tilt)
       end
 
@@ -272,7 +285,7 @@ module GR
       ratio = kvs[:ratio]
       xtick, xorg, majorx = kvs[:xaxis]
       ytick, yorg, majory = kvs[:yaxis]
-      drawgrid = kvs[:grid] || true
+      drawgrid = kvs.has_key?(:grid) ? kvs[:grid] : true
       xtick = 10 if kvs[:scale] & GR::OPTION_X_LOG != 0
       ytick = 10 if kvs[:scale] & GR::OPTION_Y_LOG != 0
       GR.setlinecolorind(1)
@@ -293,8 +306,8 @@ module GR
       else
         if %i[heatmap nonuniformheatmap shade].include?(kind)
           ticksize = -ticksize
-        else
-          drawgrid && GR.grid(xtick, ytick, 0, 0, majorx, majory)
+        elsif drawgrid
+          GR.grid(xtick, ytick, 0, 0, majorx, majory)
         end
         if kvs.has_key?(:xticklabels) || kvs.has_key?(:yticklabels)
           fx = if kvs.has_key?(:xticklabels)
@@ -332,7 +345,7 @@ module GR
         GR.axes(xtick, ytick, xorg[1], yorg[1], -majorx, -majory, -ticksize)
       end
 
-      if kvs.has_key?(:title)
+      if kvs[:title]
         GR.savestate
         GR.settextalign(GR::TEXT_HALIGN_CENTER, GR::TEXT_VALIGN_TOP)
         text(0.5 * (viewport[0] + viewport[1]), vp[3], kvs[:title])
@@ -421,7 +434,7 @@ module GR
       if img.is_a? String
         width, height, data = GR.readimage(img)
       else
-        width, height = img.shape
+        height, width = img.shape
         cmin, cmax = kvs[:crange]
         data = img.map { |i| normalize_color(i, cmin, cmax) }
         data = data.map { |i| (1000 + i * 255).round }
@@ -488,7 +501,9 @@ module GR
       end
 
       GR.selntran(0)
-      values = ((v - v.min) / (v.max - v.min) * (2 ^ 16 - 1)).round
+      v = Numo::DFloat.cast(v) if v.is_a? Array
+      values = ((v - v.min) / (v.max - v.min) * (2**16 - 1)).round
+      values = Numo::UInt16.cast(values)
       nx, ny, nz = v.shape
       isovalue = ((kvs[:isovalue] || 0.5) - v.min) / (v.max - v.min)
       rotation = ((kvs[:rotation] || 40) * Math::PI / 180.0)
@@ -497,7 +512,7 @@ module GR
       GR3.clear
       mesh = GR3.createisosurfacemesh(values, [2.0 / (nx - 1), 2.0 / (ny - 1), 2.0 / (nz - 1)],
                                       [-1, -1, -1],
-                                      (isovalue * (2 ^ 16 - 1)).round)
+                                      (isovalue * (2**16 - 1)).round)
       color = kvs[:color] || [0.0, 0.5, 0.8]
       GR3.setbackgroundcolor(1, 1, 1, 0)
       GR3.drawmesh(mesh, 1, [0, 0, 0], [0, 0, 1], [0, 1, 0], color, [1, 1, 1])
@@ -562,7 +577,9 @@ module GR
         # Not yet.
       end
 
-      GR.settextfontprec(232, 3)
+      # The following fonts are the default in GR.jl
+      # Japanese, Chinese, Korean, etc. cannot be displayed.
+      # GR.settextfontprec(232, 3) # CM Serif Roman
 
       set_viewport(kind, kvs[:subplot])
       unless kvs[:ax]
@@ -630,8 +647,7 @@ module GR
           if z || c
             if c
               cmin, cmax = kvs[:crange]
-              c = c.to_a if narray?(c)
-              c.map! { |i| normalize_color(i, cmin, cmax) }
+              c = c.map { |i| normalize_color(i, cmin, cmax) }
               cind = c.map { |i| (1000 + i * 255).round }
             end
             x.length.times do |i|
@@ -656,14 +672,26 @@ module GR
           GR.polymarker(x, y)
 
         when :hist
-          ymin = kvs[:window][2]
-          y.length.times do |i|
-            GR.setfillcolorind(989)
-            GR.setfillintstyle(GR::INTSTYLE_SOLID)
-            GR.fillrect(x[i], x[i + 1], ymin, y[i])
-            GR.setfillcolorind(1)
-            GR.setfillintstyle(GR::INTSTYLE_HOLLOW)
-            GR.fillrect(x[i], x[i + 1], ymin, y[i])
+          if kvs[:horizontal]
+            xmin = kvs[:window][0]
+            x.length.times do |i|
+              GR.setfillcolorind(989)
+              GR.setfillintstyle(GR::INTSTYLE_SOLID)
+              GR.fillrect(xmin, x[i], y[i], y[i + 1])
+              GR.setfillcolorind(1)
+              GR.setfillintstyle(GR::INTSTYLE_HOLLOW)
+              GR.fillrect(xmin, x[i], y[i], y[i + 1])
+            end
+          else
+            ymin = kvs[:window][2]
+            y.length.times do |i|
+              GR.setfillcolorind(989)
+              GR.setfillintstyle(GR::INTSTYLE_SOLID)
+              GR.fillrect(x[i], x[i + 1], ymin, y[i])
+              GR.setfillcolorind(1)
+              GR.setfillintstyle(GR::INTSTYLE_HOLLOW)
+              GR.fillrect(x[i], x[i + 1], ymin, y[i])
+            end
           end
 
         when :polarhist
@@ -684,9 +712,10 @@ module GR
           cmap = colormap
           cmin, cmax = kvs[:zrange]
           data = z.map { |i| normalize_color(i, cmin, cmax) }
-          colors = data.map { |i| 1000 + i * 255 }
-          # if kvs[:xflip]
-          # if kvs[;yflip]
+          data.reverse(axis: 0) if kvs[:xflip]
+          data.reverse(axis: 1) if kvs[:yflip]
+          colors = data * 255 + 1000
+          colors = colors.transpose # Julia is column major
           GR.polarcellarray(0, 0, 0, 360, 0, 1, w, h, colors)
           draw_polar_axes
           kvs[:zrange] = [cmin, cmax]
@@ -698,11 +727,18 @@ module GR
             a, b = z.shape
             x = (1..b).to_a
             y = (1..a).to_a
-            zmin, zmax = kvs[:zlim] || z.minmax
+            zmin, zmax = z.minmax
           elsif equal_length(x, y, z)
             x, y, z = GR.gridit(x, y, z, 200, 200)
-            zmin, zmax = kvs[:zlim] || z.compact.minmax # compact : removed nil
+            zmin, zmax = z.compact.minmax # compact : removed nil
+          end
+
+          # kvs[:zlim] is supposed to be Array or Range
+          if kvs.has_key?(:zlim)
+            zmin = kvs[:zlim].first if kvs[:zlim].first
+            zmax = kvs[:zlim].last if kvs[:zlim].last
           end
+
           GR.setspace(zmin, zmax, 0, 90)
           levels = kvs[:levels] || 0
           clabels = kvs[:clabels] || false
@@ -803,7 +839,7 @@ module GR
           GR.setmarkertype(GR::MARKERTYPE_SOLID_CIRCLE)
           if c
             cmin, cmax = kvs[:crange]
-            c = c.map { |i| normalize_color(i, cmin, cmax) } # NArray -> Array
+            c = c.map { |i| normalize_color(i, cmin, cmax) }
             cind = c.map { |i| (1000 + i * 255).round }
             x.length.times do |i|
               GR.setmarkercolorind(cind[i])
@@ -1009,7 +1045,9 @@ module GR
 
     # Normalize a color c with the range [cmin, cmax]
     #   0 <= normalize_color(c, cmin, cmax) <= 1
+    # Note: narray.map{|i| normalize_color(i)} There's room for speedup.
     def normalize_color(c, cmin, cmax)
+      c = c.to_f # if c is Integer
       c = c.clamp(cmin, cmax) - cmin
       c /= (cmax - cmin) if cmin != cmax
       c
@@ -1050,7 +1088,8 @@ module GR
       args.each do |x, y, z, c|
         if x
           if scale & GR::OPTION_X_LOG != 0
-            x.map! { |v| v > 0 ? v : Float::NAN }
+            # duck typing for NArray
+            x = x.map { |v| v > 0 ? v : Float::NAN }
           end
           x0, x1 = x.minmax
           xmin = [x0, xmin].min
@@ -1061,7 +1100,7 @@ module GR
         end
         if y
           if scale & GR::OPTION_Y_LOG != 0
-            y.map! { |v| v > 0 ? v : Float::NAN }
+            y = y.map { |v| v > 0 ? v : Float::NAN }
           end
           y0, y1 = y.minmax
           ymin = [y0, ymin].min
@@ -1072,7 +1111,7 @@ module GR
         end
         if z
           if scale & GR::OPTION_Z_LOG != 0
-            z.map! { |v| v > 0 ? v : Float::NAN }
+            z = z.map { |v| v > 0 ? v : Float::NAN }
           end
           z0, z1 = z.minmax
           zmin = [z0, zmin].min
@@ -1091,30 +1130,12 @@ module GR
       xmin, xmax = fix_minmax(xmin, xmax)
       ymin, ymax = fix_minmax(ymin, ymax)
       zmin, zmax = fix_minmax(zmin, zmax)
-      if kvs.has_key?(:xlim)
-        x0, x1 = kvs[:xlim]
-        x0 ||= xmin
-        x1 ||= xmax
-        kvs[:xrange] = [x0, x1]
-      else
-        kvs[:xrange] = [xmin, xmax]
-      end
-      if kvs.has_key?(:ylim)
-        y0, y1 = kvs[:ylim]
-        y0 ||= ymin
-        y1 ||= ymax
-        kvs[:yrange] = [y0, y1]
-      else
-        kvs[:yrange] = [ymin, ymax]
-      end
-      if kvs.has_key?(:zlim)
-        z0, z1 = kvs[:zlim]
-        z0 ||= zmin
-        z1 ||= zmax
-        kvs[:zrange] = [z0, z1]
-      else
-        kvs[:zrange] = [zmin, zmax]
-      end
+
+      # kvs[:xlim], kvs[:ylim], kvs[:zlim] is supposed to be Array or Range
+      kvs[:xrange] = [(kvs[:xlim]&.first || xmin), (kvs[:xlim]&.last || xmax)]
+      kvs[:yrange] = [(kvs[:ylim]&.first || ymin), (kvs[:ylim]&.last || ymax)]
+      kvs[:zrange] = [(kvs[:zlim]&.first || zmin), (kvs[:zlim]&.last || zmax)]
+
       if kvs.has_key?(:clim)
         c0, c1 = kvs[:clim]
         c0 ||= cmin
@@ -1290,9 +1311,8 @@ module GR
     def barplot(labels, heights, kv = {})
       labels = labels.map(&:to_s)
       wc, hc = barcoordinates(heights)
-      horizontal = kv[:horizontal] || false
       create_plot(:bar, labels, heights, kv) do |plt|
-        if horizontal
+        if kv[:horizontal]
           plt.args = [[hc, wc, nil, nil, '']]
           plt.kvs[:yticks] = [1, 1]
           plt.kvs[:yticklabels] = labels
@@ -1305,11 +1325,15 @@ module GR
     end
 
     # (Plot) Draw a histogram.
-    def histogram(x, kv = {})
-      create_plot(:hist, x, kv) do |plt|
+    def histogram(series, kv = {})
+      create_plot(:hist, series, kv) do |plt|
         nbins = plt.kvs[:nbins] || 0
-        x, y = hist(x, nbins)
-        plt.args = [[x, y, nil, nil, '']]
+        x, y = hist(series, nbins)
+        plt.args = if kv[:horizontal]
+                     [[y, x, nil, nil, '']]
+                   else
+                     [[x, y, nil, nil, '']]
+                   end
       end
     end
 
@@ -1335,7 +1359,7 @@ module GR
     end
 
     # Set current subplot index.
-    def subplot(nr, nc, p)
+    def subplot(nr, nc, p, kv = {})
       xmin = 1
       xmax = 0
       ymin = 1
@@ -1351,9 +1375,10 @@ module GR
       end
       {
         subplot: [xmin, xmax, ymin, ymax],
+        # The policy of clearing when p[0]==1 is controversial
         clear: p[0] == 1,
         update: p[-1] == nr * nc
-      }
+      }.merge kv
     end
 
     # (Plot) Save the current figure to a file.