rmagick 2.8.0 → 2.9.0

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.76 2008/10/27 22:17:54 rmagick Exp $
+# $Id: RMagick.rb,v 1.80 2009/01/02 21:08:14 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2008 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -364,6 +364,30 @@ class Draw
         primitive "gravity #{GRAVITY_NAMES[grav.to_i]}"
     end
 
+    # IM 6.4.8-3 and later
+    def interword_spacing(space)
+        begin
+            Float(space)
+        rescue ArgumentError
+            Kernel.raise ArgumentError, "invalid value for interword_spacing"
+        rescue TypeError
+            Kernel.raise TypeError, "can't convert #{space.class} into Float"
+        end
+        primitive "interword-spacing #{space}"
+    end
+
+    # IM 6.4.8-3 and later
+    def kerning(space)
+        begin
+            Float(space)
+        rescue ArgumentError
+            Kernel.raise ArgumentError, "invalid value for kerning"
+        rescue TypeError
+            Kernel.raise TypeError, "can't convert #{space.class} into Float"
+        end
+        primitive "kerning #{space}"
+    end
+
     # Draw a line
     def line(startX, startY, endX, endY)
         primitive "line " + sprintf("%g,%g %g,%g", startX, startY, endX, endY)
@@ -1411,7 +1435,7 @@ public
     end
 
     [:at, :each, :each_index, :empty?, :fetch,
-     :first, :hash, :include?, :index, :length, :nitems, :rindex, :sort!].each do |mth|
+     :first, :hash, :include?, :index, :length, :rindex, :sort!].each do |mth|
         module_eval <<-END_SIMPLE_DELEGATES
             def #{mth}(*args, &block)
                 @images.#{mth}(*args, &block)
@@ -1420,6 +1444,13 @@ public
     end
     alias_method :size, :length
 
+    # Array#nitems is not available in 1.9
+    if Array.instance_methods.include?("nitems")
+       def nitems()
+          @images.nitems()
+       end
+    end
+
     def clear
         @scene = nil
         @images.clear
@@ -1626,6 +1657,19 @@ public
         return a
     end
 
+    # Custom marshal/unmarshal for Ruby 1.8.
+    def marshal_dump()
+       ary = [@scene]
+       @images.each {|i| ary << Marshal.dump(i)}
+       ary
+    end
+
+    def marshal_load(ary)
+       @scene = ary.shift
+       @images = []
+       ary.each {|a| @images << Marshal.load(a)}
+    end
+
     # The ImageList class supports the Magick::Image class methods by simply sending
     # the method to the current image. If the method isn't explicitly supported,
     # send it to the current image in the array. If there are no images, send

data/lib/rvg/misc.rb

@@ -1,4 +1,4 @@
-# $Id: misc.rb,v 1.12 2008/02/24 18:26:36 rmagick Exp $
+# $Id: misc.rb,v 1.14 2008/12/14 21:14:12 rmagick Exp $
 # Copyright (C) 2008 Timothy P. Hunter
 module Magick
     class RVG
@@ -104,9 +104,10 @@ module Magick
                 end
 
                 def glyph_metrics(glyph_orientation, glyph)
-                    glyph_metrics = @ctx.shadow.get_type_metrics(glyph)
-                    h = glyph_metrics.ascent - glyph_metrics.descent
-                    w = glyph_metrics.width
+                    gm = @ctx.shadow.get_type_metrics("a" + glyph + "a")
+                    gm2 = @ctx.shadow.get_type_metrics("aa")
+                    h = (gm.ascent - gm.descent + 0.5 ).to_i
+                    w = gm.width - gm2.width
                     if glyph_orientation == 0 || glyph_orientation == 180
                         [w, h]
                     else

data/lib/rvg/stylable.rb

@@ -1,5 +1,5 @@
 #--
-# $Id: stylable.rb,v 1.5 2008/02/24 18:26:37 rmagick Exp $
+# $Id: stylable.rb,v 1.6 2008/12/30 00:21:06 rmagick Exp $
 # Copyright (C) 2008 Timothy P. Hunter
 #++
 
@@ -80,6 +80,7 @@ module Magick
             # This method can be used with any RVG, Group, Use, Text, or
             # shape object. The argument is a hash. The style names are
             # the hash keys. The style names and values are:
+            # [:baseline_shift] modify the text baseline
             # [:clip_path] clipping path defined by clip_path
             # [:clip_rule] 'evenodd' or 'nozero'
             # [:fill] color name
@@ -94,6 +95,9 @@ module Magick
             # [:font_style] 'normal','italic','oblique'
             # [:font_weight] 'normal','bold','bolder','lighter', or
             #                a multiple of 100 between 100 and 900.
+            # [:glyph_orientation_horizontal] 0, 90, 180, 270
+            # [:glyph_orientation_vertical] 0, 90, 180, 270
+            # [:letter_spacing] modify the spacing between letters
             # [:opacity] both fill and stroke opacity, 0.0<=N<=1.0
             # [:stroke] color name
             # [:stroke_dasharray] dash pattern (Array)
@@ -105,6 +109,8 @@ module Magick
             # [:stroke_width] stroke width
             # [:text_anchor] 'start','middle','end'
             # [:text_decoration] 'none','underline','overline','line_through'
+            # [:word_spacing] modify the spacing between words
+            # [:writing_mode] 'lr-tb', 'lr', 'rt-tb', 'rl', 'tb-rl', 'tb'
             def styles(styles)
                 @styles.set(styles)
                 yield(self) if block_given?

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "2.8.0"
+  s.version = "2.9.0"
   s.date = Date.today.to_s
   s.summary = %q{Ruby binding to ImageMagick}
   s.description = %q{RMagick is an interface between Ruby and ImageMagick.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rmagick
 version: !ruby/object:Gem::Version 
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors: 
 - Tim Hunter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-04 00:00:00 -05:00
+date: 2009-01-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -67,10 +67,15 @@ files:
 - post-setup.rb
 - ext
 - ext/RMagick
+- ext/RMagick/rmenum.c
+- ext/RMagick/rmstruct.c
 - ext/RMagick/rmagick.h
 - ext/RMagick/rmutil.c
 - ext/RMagick/MANIFEST
+- ext/RMagick/rmmontage.c
+- ext/RMagick/rmpixel.c
 - ext/RMagick/rmilist.c
+- ext/RMagick/rmagick.c
 - ext/RMagick/rmdraw.c
 - ext/RMagick/rmimage.c
 - ext/RMagick/rmfill.c