cairo 1.5.1 → 1.6.0

data/samples/pac2.rb

@@ -147,19 +147,19 @@ def pac(surface, width, height)
   cr.show_page
 end
 
-width = 841.889763779528
-height = 595.275590551181
+paper = Cairo::Paper.parse(:a4_landscape)
 
-Cairo::ImageSurface.new(width, height) do |surface|
-  cr = pac(surface, width, height)
+size_in_points = paper.size("pt")
+Cairo::ImageSurface.new(*size_in_points) do |surface|
+  cr = pac(surface, *size_in_points)
   cr.target.write_to_png("pac2.png")
 end
 
 scalable_surface_output = Proc.new do |surface_class_name, suffix|
   if Cairo.const_defined?(surface_class_name)
     surface_class = Cairo.const_get(surface_class_name)
-    surface_class.new("pac2.#{suffix}", width, height) do |surface|
-      pac(surface, width, height)
+    surface_class.new("pac2.#{suffix}", paper) do |surface|
+      pac(surface, *size_in_points)
     end
   else
     puts("#{surface_class_name} isn't supported.")

data/samples/png.rb

@@ -40,7 +40,6 @@ Cairo::ImageSurface.new(width, height) do |surface|
   stride = cr.target.stride
 end
 
-Cairo::ImageSurface.new(data, Cairo::FORMAT_ARGB32,
-                        width, height, stride) do |surface|
+Cairo::ImageSurface.new(data, :argb32, width, height, stride) do |surface|
   surface.write_to_png("test-renew.png")
 end

data/samples/text2.rb

@@ -19,14 +19,20 @@ def parse(args=ARGV)
   options.fade_out = false
 
   opts = OptionParser.new do |opts|
-    opts.on("--width=WIDTH", Integer, "paper width") {|options.width|}
-    opts.on("--height=HEIGHT", Integer, "paper height") {|options.height|}
+    opts.on("--width=WIDTH", Integer, "paper width") do |width|
+      options.width = width
+    end
+    opts.on("--height=HEIGHT", Integer, "paper height") do |height|
+      options.height = height
+    end
     opts.on("--font-description=DESCRIPTION",
             "font description (e.g. 'Monospace 14')") do |desc|
       options.font_description = desc
     end
     opts.on("--[no-]fade-out",
-            "fade-out one-third of page") {|options.fade_out|}
+            "fade-out one-third of page") do |fade_out|
+      options.fade_out = fade_out
+    end
   end
 
   opts.parse!(args)

data/src/cairo.def

@@ -27,7 +27,9 @@ EXPORTS
     rb_cCairo_PSSurface       DATA
     rb_cCairo_SVGSurface      DATA
     rb_cCairo_Win32Surface    DATA
+    rb_cCairo_Win32PrintingSurface DATA
     rb_cCairo_QuartzSurface   DATA
+    rb_cCairo_QuartzImageSurface DATA
 
     rb_mCairo_Operator        DATA
     rb_mCairo_Antialias       DATA
@@ -45,9 +47,11 @@ EXPORTS
     rb_mCairo_Extend          DATA
     rb_mCairo_Filter          DATA
     rb_mCairo_SVGVersion      DATA
+    rb_mCairo_PSLevel         DATA
 
     rb_mCairo_Color           DATA
     rb_cCairo_Color_Base      DATA
+    rb_cCairo_Paper           DATA
 
     rb_cairo_context_from_ruby_object
     rb_cairo_context_to_ruby_object
@@ -71,6 +75,7 @@ EXPORTS
     rb_cairo_glyph_to_ruby_object
     rb_cairo_surface_from_ruby_object
     rb_cairo_surface_to_ruby_object
+    rb_cairo_surface_to_ruby_object_with_destroy
     rb_cairo_operator_from_ruby_object
     rb_cairo_antialias_from_ruby_object
     rb_cairo_fill_rule_from_ruby_object
@@ -87,4 +92,5 @@ EXPORTS
     rb_cairo_extend_from_ruby_object
     rb_cairo_filter_from_ruby_object
     rb_cairo_svg_version_from_ruby_object
+    rb_cairo_ps_level_from_ruby_object
     rb_cairo_check_status

data/src/lib/cairo.rb

@@ -27,6 +27,7 @@ module Cairo
 end
 
 require 'cairo/color'
+require 'cairo/paper'
 
 require 'cairo.so'
 require 'cairo/constants'
@@ -53,11 +54,39 @@ module Cairo
     end
   end
 
-  class SVGSurface
-    class << self
-      def versions_as_string
-        versions.collect do |version|
-          version_to_string(version)
+  if const_defined?("PSLevel")
+    module PSLevel
+      class << self
+        def names
+          list.collect {|version| name(version)}
+        end
+      end
+    end
+  end
+
+  if const_defined?("SVGVersion")
+    module SVGVersion
+      class << self
+        def names
+          list.collect {|version| name(version)}
+        end
+      end
+    end
+  end
+
+  if const_defined?("SVGSurface")
+    class SVGSurface
+      class << self
+        def versions_as_string
+          SVGVersion.names
+        end
+
+        def versions
+          SVGVersion.list
+        end
+
+        def version_to_string(version)
+          SVGVersion.name(version)
         end
       end
     end
@@ -91,6 +120,7 @@ end
 
 require 'cairo/point'
 require 'cairo/colors'
+require 'cairo/papers'
 require 'cairo/context'
 require 'cairo/path'
 

data/src/lib/cairo/paper.rb

@@ -0,0 +1,183 @@
+module Cairo
+  class Paper
+    class ParseError < ArgumentError
+    end
+
+    class UnknownPaperName < ParseError
+      attr_reader :name
+      def initialize(name)
+        @name = name
+        super("unknown paper name: #{name}")
+      end
+    end
+
+    class UnknownUnit < ParseError
+      attr_reader :unit
+      def initialize(unit)
+        @unit = unit
+        super("unknown unit: #{unit}")
+      end
+    end
+
+    class UnrecognizedPaperDescription < ParseError
+      attr_reader :description
+      def initialize(description)
+        @description = description
+        super("unrecognized paper description: #{description.inspect}")
+      end
+    end
+
+    class << self
+      def parse(paper_description, robust=false)
+        case paper_description
+        when Paper
+          return paper_description.dup
+        when Symbol
+          paper = resolve_constant(paper_description)
+          return paper.dup if paper
+          raise UnknownPaperName.new(paper_description)
+        when String
+          paper = resolve_constant(paper_description)
+          paper ||= parse_size(paper_description)
+          return paper.dup if paper
+        when Array
+          return new(*paper_description)
+        end
+
+        raise UnrecognizedPaperDescription.new(paper_description) if robust
+        nil
+      end
+
+      @@default_unit = nil
+      def default_unit
+        @@default_unit
+      end
+
+      def default_unit=(unit)
+        @@default_unit = unit
+      end
+
+      @@unit_resolvers = {}
+      def register_unit_resolver(from_units, to_units, &resolver)
+        from_units = [from_units] unless from_units.is_a?(Array)
+        to_units = [to_units] unless to_units.is_a?(Array)
+        from_units.each do |from_unit|
+          @@unit_resolvers[from_unit] ||= []
+          to_units.each do |unit|
+            @@unit_resolvers[from_unit] << [unit, resolver]
+          end
+        end
+      end
+
+      def resolve_unit(size, from_unit, to_unit)
+        from_unit ||= default_unit
+        return size if from_unit == to_unit
+        from_units = @@unit_resolvers[from_unit] || []
+        raise UnknownUnit.new(from_unit) if from_units.empty?
+        from_units.each do |unit, resolver|
+          return resolver.call(size) if to_unit == unit
+        end
+        raise UnknownUnit.new(to_unit)
+      end
+
+      private
+      def resolve_constant(name)
+        name = name.to_s.upcase.gsub(/\s+|-/, '_')
+        if /\A[A-Z]/ =~ name and const_defined?(name)
+          const_get(name)
+        else
+          nil
+        end
+      end
+
+      def parse_size(size)
+        size_re = /(\d+(\.\d*)?)/
+        unit_re = /([a-zA-Z]+?)/
+        if /\A#{size_re}#{unit_re}?x#{size_re}#{unit_re}?(?:#(.*))?\z/ !~ size
+          return nil
+        end
+
+        width = $1
+        width_fractional = $2
+        width_unit = $3
+        height = $4
+        height_fractional = $5
+        height_unit = $6
+        name = $7
+        width = width_fractional ? Float(width) : Integer(width)
+        height = height_fractional ?  Float(height) : Integer(height)
+        new(resolve_unit(width, width_unit, "pt"),
+            resolve_unit(height, height_unit, "pt"),
+            nil, name)
+      end
+    end
+
+    self.default_unit = "pt"
+    register_unit_resolver("pt", ["in", "inch"]) {|size| size / 72.0}
+    register_unit_resolver(["in", "inch"], "pt") {|size| size * 72}
+    register_unit_resolver("pt", "mm") {|size| size * 25.4 / 72.0}
+    register_unit_resolver("mm", "pt") {|size| size / 25.4 * 72}
+    register_unit_resolver("pt", "cm") {|size| size * 2.54 / 72.0}
+    register_unit_resolver("cm", "pt") {|size| size / 2.54 * 72}
+    register_unit_resolver("pt", "m") {|size| size * 0.0254 / 72.0}
+    register_unit_resolver("m", "pt") {|size| size / 0.0254 * 72}
+
+    attr_reader :unit
+    attr_writer :width, :height
+    attr_accessor :name
+    def initialize(width, height, unit=nil, name=nil)
+      @width = width
+      @height = height
+      @unit = unit
+      @name = name
+    end
+
+    def unit=(unit)
+      if @unit != unit
+        @width = self.class.resolve_unit(width, @unit, unit)
+        @height = self.class.resolve_unit(height, @unit, unit)
+      end
+      @unit = unit
+    end
+
+    def width(unit=nil)
+      return @width if unit.nil?
+      self.class.resolve_unit(@width, @unit, unit)
+    end
+
+    def height(unit=nil)
+      return @height if unit.nil?
+      self.class.resolve_unit(@height, @unit, unit)
+    end
+
+    def size(unit=nil)
+      [width(unit), height(unit)]
+    end
+
+    def ==(other)
+      other.is_a?(self.class) and @name == other.name and
+        width_in_delta?(other.width(@unit)) and
+        height_in_delta?(other.height(@unit))
+    end
+
+    def to_s
+      string = "#{@width}#{@unit}x#{@height}#{@unit}"
+      string << "\##{@name}" if @name
+      string
+    end
+
+    private
+    def width_in_delta?(value, delta=nil)
+      in_delta?(@width, delta, value)
+    end
+
+    def height_in_delta?(value, delta=nil)
+      in_delta?(@height, delta, value)
+    end
+
+    def in_delta?(value, delta, other)
+      delta ||= 0.001
+      value - delta < other and other < value + delta
+    end
+  end
+end

data/src/lib/cairo/papers.rb

@@ -0,0 +1,41 @@
+require 'cairo/paper'
+
+module Cairo
+  class Paper
+    [
+     [841, 1189, "A0"],
+     [594, 841, "A1"],
+     [420, 594, "A2"],
+     [297, 420, "A3"],
+     [210, 297, "A4"],
+     [148, 210, "A5"],
+     [105, 148, "A6"],
+     [74, 105, "A7"],
+     [52, 74, "A8"],
+     [37, 52, "A9"],
+     [26, 37, "A10"],
+
+     [1030, 1456, "B0"],
+     [728, 1030, "B1"],
+     [515, 728, "B2"],
+     [364, 515, "B3"],
+     [257, 364, "B4"],
+     [182, 257, "B5"],
+     [128, 182, "B6"],
+     [91, 128, "B7"],
+     [64, 91, "B8"],
+     [45, 64, "B9"],
+     [32, 45, "B10"],
+
+     [215.9, 279.4, "letter"],
+     [215.9, 355.6, "legal"],
+     [279.9, 431.8, "tabloid"],
+     [100, 148, "Japanese postcard"],
+    ].each do |width, height, name|
+      constant_name = name.upcase.gsub(/ +/, '_')
+      const_set(constant_name, new(width, height, "mm", name))
+      const_set("#{constant_name}_LANDSCAPE",
+                new(height, width, "mm", "#{name} (landscape)"))
+    end
+  end
+end

data/src/rb_cairo.c

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2007/05/27 02:46:01 $
+ * $Date: 2008-04-11 03:08:57 $
  *
  * Copyright 2006-2007 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
@@ -17,7 +17,7 @@
 #include "rb_cairo.h"
 #include "rb_cairo_private.h"
 
-VALUE rb_mCairo, rb_mCairo_Color, rb_cCairo_Color_Base;
+VALUE rb_mCairo, rb_mCairo_Color, rb_cCairo_Color_Base, rb_cCairo_Paper;
 
 static ID id__add_one_arg_setter;
 
@@ -58,10 +58,11 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (5), INT2FIX (1), Qnil));
+                                INT2FIX (1), INT2FIX (6), INT2FIX (0), Qnil));
 
   rb_mCairo_Color = rb_const_get (rb_mCairo, rb_intern ("Color"));
   rb_cCairo_Color_Base = rb_const_get (rb_mCairo_Color, rb_intern ("Base"));
+  rb_cCairo_Paper = rb_const_get (rb_mCairo, rb_intern ("Paper"));
 
   Init_cairo_private ();
   Init_cairo_constants ();

data/src/rb_cairo.h

@@ -3,7 +3,7 @@
  * Ruby Cairo Binding
  *
  * $Author: kou $
- * $Date: 2008-01-11 12:18:34 $
+ * $Date: 2008-04-11 03:01:33 $
  *
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
@@ -104,9 +104,11 @@ RB_CAIRO_VAR VALUE rb_cCairo_PDFSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_PSSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_SVGSurface;
 RB_CAIRO_VAR VALUE rb_cCairo_Win32Surface;
+RB_CAIRO_VAR VALUE rb_cCairo_Win32PrintingSurface;
 /* For backward compatibility*/
 #define rb_cCairo_WIN32Surface rb_cCairo_Win32Surface
 RB_CAIRO_VAR VALUE rb_cCairo_QuartzSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_QuartzImageSurface;
 
 RB_CAIRO_VAR VALUE rb_mCairo_Operator;
 RB_CAIRO_VAR VALUE rb_mCairo_Antialias;
@@ -129,6 +131,7 @@ RB_CAIRO_VAR VALUE rb_mCairo_Filter;
 RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
 RB_CAIRO_VAR VALUE rb_mCairo_Color;
 RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
+RB_CAIRO_VAR VALUE rb_cCairo_Paper;
 
 
 #define RVAL2CRCONTEXT(obj)     (rb_cairo_context_from_ruby_object(obj))
@@ -163,6 +166,8 @@ RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
 
 #define RVAL2CRSURFACE(obj)     (rb_cairo_surface_from_ruby_object(obj))
 #define CRSURFACE2RVAL(surface) (rb_cairo_surface_to_ruby_object(surface))
+#define CRSURFACE2RVAL_WITH_DESTROY(surface) \
+  (rb_cairo_surface_to_ruby_object_with_destroy(surface))
 
 cairo_t              *rb_cairo_context_from_ruby_object      (VALUE obj);
 VALUE                 rb_cairo_context_to_ruby_object        (cairo_t *cr);
@@ -196,6 +201,8 @@ VALUE                 rb_cairo_glyph_to_ruby_object          (cairo_glyph_t *gly
 
 cairo_surface_t      *rb_cairo_surface_from_ruby_object      (VALUE obj);
 VALUE                 rb_cairo_surface_to_ruby_object        (cairo_surface_t *surface);
+VALUE                 rb_cairo_surface_to_ruby_object_with_destroy
+                                                             (cairo_surface_t *surface);
 
 
 #define RVAL2CROPERATOR(obj)      (rb_cairo_operator_from_ruby_object(obj))
@@ -216,6 +223,11 @@ VALUE                 rb_cairo_surface_to_ruby_object        (cairo_surface_t *s
 #if CAIRO_HAS_SVG_SURFACE
 #define RVAL2CRSVGVERSION(obj)    (rb_cairo_svg_version_from_ruby_object(obj))
 #endif
+#if CAIRO_HAS_PS_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 5, 2)
+#define RVAL2CRPSLEVEL(obj)       (rb_cairo_ps_level_from_ruby_object(obj))
+#  endif
+#endif
 
 cairo_operator_t       rb_cairo_operator_from_ruby_object       (VALUE obj);
 cairo_antialias_t      rb_cairo_antialias_from_ruby_object      (VALUE obj);
@@ -235,6 +247,11 @@ cairo_filter_t         rb_cairo_filter_from_ruby_object         (VALUE obj);
 #if CAIRO_HAS_SVG_SURFACE
 cairo_svg_version_t    rb_cairo_svg_version_from_ruby_object    (VALUE obj);
 #endif
+#if CAIRO_HAS_PS_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 5, 2)
+cairo_ps_level_t       rb_cairo_ps_level_from_ruby_object       (VALUE obj);
+#  endif
+#endif
 
 void rb_cairo_check_status (cairo_status_t status);