cairo 1.8.5 → 1.10.0

data/NEWS

@@ -4,14 +4,14 @@ Release 1.8.5 (2010-08-28) Kouhei Sutou <kou@cozmixng.org>)
 Fixes
 -----
   * Fix build system. (patch by kimura watasu and suggested by OBATA Akio)
-  * Fix Windows gem. (reported by Dominic Sisneros, supported by Masayas TARUI)
+  * Fix Windows gem. (reported by Dominic Sisneros, supported by Masaya TARUI)
 
 Thanks
 ------
   * Dominic Sisneros
   * kimura wataru
   * OBATA Akio
-  * Masayas TARUI
+  * Masaya TARUI
 
 Release 1.8.3 (2010-08-26) Kouhei Sutou <kou@cozmixng.org>)
 ===========================================================

data/Rakefile

@@ -78,6 +78,7 @@ project = Hoe.spec('cairo') do |project|
     :require_paths => ['lib'],
     :has_rdoc => false,
   }
+  project.extra_deps << ['pkg-config', '>= 0']
   platform = ENV["FORCE_PLATFORM"]
   project.spec_extras[:platform] = platform if platform
   news = File.join(base_dir, "NEWS")
@@ -89,19 +90,55 @@ end
 
 project.spec.dependencies.delete_if {|dependency| dependency.name == "hoe"}
 
+binary_dir = File.join("vendor", "local")
 Rake::ExtensionTask.new("cairo", project.spec) do |ext|
   ext.cross_compile = true
+  ext.cross_compiling do |spec|
+    if /mingw|mswin/ =~ spec.platform.to_s
+      binary_files = []
+      Find.find(binary_dir) do |name|
+        next unless File.file?(name)
+        next if /\.zip\z/i =~ name
+        binary_files << name
+      end
+      spec.files += binary_files
+    end
+  end
+end
+
+task 'cross' => "download_windows_binaries"
+
+def download_windows_binaries(binary_dir)
+  base_url = "http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/"
+  dependencies = [
+                  ["cairo", "1.10.0-1"],
+                  ["cairo-dev", "1.10.0-1"],
+                  ["libpng", "1.4.3-1"],
+                  ["zlib", "1.2.5-2"],
+                  ["expat", "2.0.1-1"],
+                  ["fontconfig", "2.8.0-2"],
+                  ["freetype", "2.4.2-1"],
+                 ]
+  dependencies.each do |name, version|
+    file_name = "#{name}_#{version}_win32.zip"
+    full_file_name = File.join(binary_dir, file_name)
+    next if File.exist?(full_file_name)
+    open("#{base_url}#{file_name}", "rb") do |input|
+      File.open(full_file_name, "wb") do |output|
+        output.print(input.read)
+      end
+    end
+    sh("unzip", full_file_name, "-d", binary_dir)
+  end
 end
 
-task :add_win32_binaries do
-  cairo_win32_dir = File.join("vendor", "local")
-  cairo_files = []
-  Find.find(cairo_win32_dir) do |f|
-    cairo_files << f
+task "download_windows_binaries" do
+  require 'open-uri'
+  unless File.exist?(binary_dir)
+    mkdir_p(binary_dir)
+    download_windows_binaries(binary_dir)
   end
-  project.spec.files += cairo_files
 end
-task :cross => :add_win32_binaries
 
 # fix Hoe's incorrect guess.
 project.spec.executables.clear

data/ext/cairo/cairo.def

@@ -9,6 +9,7 @@ EXPORTS
     rb_cCairo_PathCurveTo     DATA
     rb_cCairo_PathClosePath   DATA
     rb_cCairo_Matrix          DATA
+    rb_cCairo_Region          DATA
     rb_cCairo_Pattern         DATA
     rb_cCairo_SolidPattern    DATA
     rb_cCairo_SurfacePattern  DATA
@@ -34,6 +35,24 @@ EXPORTS
     rb_cCairo_Win32PrintingSurface DATA
     rb_cCairo_QuartzSurface   DATA
     rb_cCairo_QuartzImageSurface DATA
+    rb_cCairo_ScriptSurface   DATA
+    rb_cCairo_QtSurface       DATA
+    rb_cCairo_RecordingSurface DATA
+    rb_cCairo_VGSurface       DATA
+    rb_cCairo_GLSurface       DATA
+    rb_cCairo_GLTextureSurface DATA
+    rb_cCairo_DRMSurface      DATA
+    rb_cCairo_TeeSurface      DATA
+    rb_cCairo_XMLSurface      DATA
+    rb_cCairo_SkiaSurface     DATA
+    rb_cCairo_SubSurface      DATA
+    rb_cCairo_Device          DATA
+    rb_cCairo_DRMDevice       DATA
+    rb_cCairo_GLDevice        DATA
+    rb_cCairo_ScriptDevice    DATA
+    rb_cCairo_XCBDevice       DATA
+    rb_cCairo_XlibtDevice     DATA
+    rb_cCairo_XMLDevice       DATA
 
     rb_mCairo_Operator        DATA
     rb_mCairo_Antialias       DATA
@@ -52,7 +71,10 @@ EXPORTS
     rb_mCairo_Filter          DATA
     rb_mCairo_SVGVersion      DATA
     rb_mCairo_PSLevel         DATA
-    rb_mCairo_LCDFilter       DATA
+    rb_mCairo_PDFVersion      DATA
+    rb_mCairo_TextClusterFlag DATA
+    rb_mCairo_ScriptMode      DATA
+    rb_mCairo_MimeType        DATA
 
     rb_mCairo_Color           DATA
     rb_cCairo_Color_Base      DATA
@@ -64,6 +86,8 @@ EXPORTS
     rb_cairo_path_to_ruby_object
     rb_cairo_matrix_from_ruby_object
     rb_cairo_matrix_to_ruby_object
+    rb_cairo_region_from_ruby_object
+    rb_cairo_region_to_ruby_object
     rb_cairo_pattern_from_ruby_object
     rb_cairo_pattern_to_ruby_object
     rb_cairo_font_face_from_ruby_object
@@ -83,6 +107,8 @@ EXPORTS
     rb_cairo_surface_from_ruby_object
     rb_cairo_surface_to_ruby_object
     rb_cairo_surface_to_ruby_object_with_destroy
+    rb_cairo_device_from_ruby_object
+    rb_cairo_device_to_ruby_object
     rb_cairo_operator_from_ruby_object
     rb_cairo_antialias_from_ruby_object
     rb_cairo_fill_rule_from_ruby_object
@@ -100,5 +126,6 @@ EXPORTS
     rb_cairo_filter_from_ruby_object
     rb_cairo_svg_version_from_ruby_object
     rb_cairo_ps_level_from_ruby_object
+    rb_cairo_pdf_version_from_ruby_object
     rb_cairo_text_cluster_flags_from_ruby_object
     rb_cairo_check_status

data/ext/cairo/extconf.rb

@@ -6,10 +6,12 @@ require 'English'
 require 'mkmf'
 require 'fileutils'
 
-base_dir = (Pathname(__FILE__).dirname + ".." + "..").expand_path
-$LOAD_PATH.unshift(base_dir.to_s)
-
-require 'pkg-config'
+begin
+  require 'pkg-config'
+rescue LoadError
+  require 'rubygems'
+  require 'pkg-config'
+end
 
 checking_for(checking_message("GCC")) do
   if macro_defined?("__GNUC__", "")
@@ -24,8 +26,7 @@ package = "cairo"
 module_name = "cairo"
 major, minor, micro = 1, 2, 0
 
-PKGConfig.have_package(package, major, minor, micro) or exit 1
-
+base_dir = Pathname(__FILE__).dirname.parent.parent
 checking_for(checking_message("Win32 OS")) do
   case RUBY_PLATFORM
   when /cygwin|mingw|mswin32/
@@ -33,16 +34,11 @@ checking_for(checking_message("Win32 OS")) do
     import_library_name = "libruby-#{module_name}.a"
     $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
     $cleanfiles << import_library_name
-    local_cairo_install_dir = base_dir + "vendor" + "local"
-    $CFLAGS += " -I#{local_cairo_install_dir}/include"
-    local_cairo_lib_dir = local_cairo_install_dir + "lib"
-    ["cairo.lib", "libcairo.dll.a"].each do |libcairo_base|
-      libcairo = local_cairo_lib_dir + libcairo_base
-      if libcairo.exist?
-        $LDFLAGS += " -L#{local_cairo_lib_dir}"
-        break
-      end
-    end
+    binary_base_dir = base_dir + "vendor" + "local"
+    $CFLAGS += " -I#{binary_base_dir}/include"
+    pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
+    PKGConfig.add_path(pkg_config_dir.to_s)
+    PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
     true
   else
     false
@@ -70,6 +66,8 @@ checking_for(checking_message("Mac OS X")) do
   end
 end
 
+PKGConfig.have_package(package, major, minor, micro) or exit 1
+
 $defs << "-DRB_CAIRO_COMPILATION"
 
 have_header("ruby/st.h") unless have_macro("HAVE_RUBY_ST_H", "ruby.h")

data/ext/cairo/rb_cairo.c

@@ -76,7 +76,7 @@ Init_cairo ()
 
   rb_define_const (rb_mCairo, "BINDINGS_VERSION",
                    rb_ary_new3 (4,
-                                INT2FIX (1), INT2FIX (8), INT2FIX (5), Qnil));
+                                INT2FIX (1), INT2FIX (10), INT2FIX (0), Qnil));
 
   rb_define_module_function (rb_mCairo, "satisfied_version?",
                              rb_cairo_satisfied_version, -1);
@@ -86,11 +86,14 @@ Init_cairo ()
   rb_cCairo_Paper = rb_const_get (rb_mCairo, rb_intern ("Paper"));
 
   Init_cairo_private ();
+  Init_cairo_io ();
   Init_cairo_constants ();
 
   Init_cairo_context ();
   Init_cairo_path ();
   Init_cairo_matrix ();
+  Init_cairo_region ();
+  Init_cairo_device ();
   Init_cairo_surface ();
   Init_cairo_exception ();
   Init_cairo_font ();

data/ext/cairo/rb_cairo.h

@@ -31,6 +31,10 @@
 #  include <cairo-svg.h>
 #endif
 
+#ifdef CAIRO_HAS_SCRIPT_SURFACE
+#  include <cairo-script.h>
+#endif
+
 #define CAIRO_CHECK_VERSION(major, minor, micro)    \
     (CAIRO_VERSION_MAJOR > (major) || \
      (CAIRO_VERSION_MAJOR == (major) && CAIRO_VERSION_MINOR > (minor)) || \
@@ -77,6 +81,7 @@ RB_CAIRO_VAR VALUE rb_cCairo_PathLineTo;
 RB_CAIRO_VAR VALUE rb_cCairo_PathCurveTo;
 RB_CAIRO_VAR VALUE rb_cCairo_PathClosePath;
 RB_CAIRO_VAR VALUE rb_cCairo_Matrix;
+RB_CAIRO_VAR VALUE rb_cCairo_Region;
 RB_CAIRO_VAR VALUE rb_cCairo_Pattern;
 RB_CAIRO_VAR VALUE rb_cCairo_SolidPattern;
 RB_CAIRO_VAR VALUE rb_cCairo_SurfacePattern;
@@ -103,6 +108,24 @@ RB_CAIRO_VAR VALUE rb_cCairo_Win32PrintingSurface;
 #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_cCairo_ScriptSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_QtSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_RecordingSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_VGSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_GLSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_GLTextureSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_DRMSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_TeeSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_XMLSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_SkiaSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_SubSurface;
+RB_CAIRO_VAR VALUE rb_cCairo_Device;
+RB_CAIRO_VAR VALUE rb_cCairo_DRMDevice;
+RB_CAIRO_VAR VALUE rb_cCairo_GLDevice;
+RB_CAIRO_VAR VALUE rb_cCairo_ScriptDevice;
+RB_CAIRO_VAR VALUE rb_cCairo_XCBDevice;
+RB_CAIRO_VAR VALUE rb_cCairo_XlibtDevice;
+RB_CAIRO_VAR VALUE rb_cCairo_XMLDevice;
 
 RB_CAIRO_VAR VALUE rb_mCairo_Operator;
 RB_CAIRO_VAR VALUE rb_mCairo_Antialias;
@@ -124,8 +147,12 @@ RB_CAIRO_VAR VALUE rb_mCairo_Extend;
 RB_CAIRO_VAR VALUE rb_mCairo_Filter;
 RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
 RB_CAIRO_VAR VALUE rb_mCairo_PSLevel;
-RB_CAIRO_VAR VALUE rb_mCairo_LCDFilter;
+RB_CAIRO_VAR VALUE rb_mCairo_PDFVersion;
 RB_CAIRO_VAR VALUE rb_mCairo_SVGVersion;
+RB_CAIRO_VAR VALUE rb_mCairo_TextClusterFlag;
+RB_CAIRO_VAR VALUE rb_mCairo_ScriptMode;
+RB_CAIRO_VAR VALUE rb_mCairo_MimeType;
+RB_CAIRO_VAR VALUE rb_mCairo_RegionOverlap;
 RB_CAIRO_VAR VALUE rb_mCairo_Color;
 RB_CAIRO_VAR VALUE rb_cCairo_Color_Base;
 RB_CAIRO_VAR VALUE rb_cCairo_Paper;
@@ -140,6 +167,9 @@ RB_CAIRO_VAR VALUE rb_cCairo_Paper;
 #define RVAL2CRMATRIX(obj)      (rb_cairo_matrix_from_ruby_object(obj))
 #define CRMATRIX2RVAL(matrix)   (rb_cairo_matrix_to_ruby_object(matrix))
 
+#define RVAL2CRREGION(obj)      (rb_cairo_region_from_ruby_object(obj))
+#define CRREGION2RVAL(region)   (rb_cairo_region_to_ruby_object(region))
+
 #define RVAL2CRPATTERN(obj)     (rb_cairo_pattern_from_ruby_object(obj))
 #define CRPATTERN2RVAL(pattern) (rb_cairo_pattern_to_ruby_object(pattern))
 
@@ -169,6 +199,9 @@ RB_CAIRO_VAR VALUE rb_cCairo_Paper;
 #define CRSURFACE2RVAL_WITH_DESTROY(surface) \
   (rb_cairo_surface_to_ruby_object_with_destroy(surface))
 
+#define RVAL2CRDEVICE(obj)      (rb_cairo_device_from_ruby_object(obj))
+#define CRDEVICE2RVAL(device)   (rb_cairo_device_to_ruby_object(device))
+
 cairo_t              *rb_cairo_context_from_ruby_object      (VALUE obj);
 VALUE                 rb_cairo_context_to_ruby_object        (cairo_t *cr);
 
@@ -178,6 +211,11 @@ VALUE                 rb_cairo_path_to_ruby_object           (cairo_path_t *path
 cairo_matrix_t       *rb_cairo_matrix_from_ruby_object       (VALUE obj);
 VALUE                 rb_cairo_matrix_to_ruby_object         (cairo_matrix_t *matrix);
 
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+cairo_region_t       *rb_cairo_region_from_ruby_object       (VALUE obj);
+VALUE                 rb_cairo_region_to_ruby_object         (cairo_region_t *region);
+#endif
+
 cairo_pattern_t      *rb_cairo_pattern_from_ruby_object      (VALUE obj);
 VALUE                 rb_cairo_pattern_to_ruby_object        (cairo_pattern_t *pat);
 
@@ -209,6 +247,10 @@ VALUE                 rb_cairo_surface_to_ruby_object        (cairo_surface_t *s
 VALUE                 rb_cairo_surface_to_ruby_object_with_destroy
                                                              (cairo_surface_t *surface);
 
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+cairo_device_t       *rb_cairo_device_from_ruby_object       (VALUE obj);
+VALUE                 rb_cairo_device_to_ruby_object         (cairo_device_t *device);
+#endif
 
 #define RVAL2CROPERATOR(obj)      (rb_cairo_operator_from_ruby_object(obj))
 #define RVAL2CRANTIALIAS(obj)     (rb_cairo_antialias_from_ruby_object(obj))
@@ -233,9 +275,20 @@ VALUE                 rb_cairo_surface_to_ruby_object_with_destroy
 #define RVAL2CRPSLEVEL(obj)       (rb_cairo_ps_level_from_ruby_object(obj))
 #  endif
 #endif
+#ifdef CAIRO_HAS_PDF_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 10, 0)
+#define RVAL2CRPDFVERSION(obj)    (rb_cairo_pdf_version_from_ruby_object(obj))
+#  endif
+#endif
 #if CAIRO_CHECK_VERSION(1, 7, 6)
 #define RVAL2CRTEXTCLUSTERFLAGS(obj) (rb_cairo_text_cluster_flags_from_ruby_object(obj))
 #endif
+#ifdef CAIRO_HAS_SCRIPT_SURFACE
+#define RVAL2CRSCRIPTMODE(obj)    (rb_cairo_script_mode_from_ruby_object(obj))
+#endif
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+#define RVAL2CRREGIONOVERLAP(obj) (rb_cairo_region_overalap_from_ruby_object(obj))
+#endif
 
 cairo_operator_t       rb_cairo_operator_from_ruby_object       (VALUE obj);
 cairo_antialias_t      rb_cairo_antialias_from_ruby_object      (VALUE obj);
@@ -260,9 +313,20 @@ cairo_svg_version_t    rb_cairo_svg_version_from_ruby_object    (VALUE obj);
 cairo_ps_level_t       rb_cairo_ps_level_from_ruby_object       (VALUE obj);
 #  endif
 #endif
+#ifdef CAIRO_HAS_PDF_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 10, 0)
+cairo_pdf_version_t     rb_cairo_pdf_version_from_ruby_object   (VALUE obj);
+#  endif
+#endif
 #if CAIRO_CHECK_VERSION(1, 7, 6)
 cairo_text_cluster_flags_t rb_cairo_text_cluster_flags_from_ruby_object (VALUE obj);
 #endif
+#ifdef CAIRO_HAS_SCRIPT_SURFACE
+cairo_script_mode_t     rb_cairo_script_mode_from_ruby_object   (VALUE obj);
+#endif
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+cairo_region_overlap_t  rb_cairo_region_overlap_from_ruby_object(VALUE obj);
+#endif
 
 void rb_cairo_check_status (cairo_status_t status);
 

data/ext/cairo/rb_cairo_constants.c

@@ -5,6 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
+ * Copyright 2005-2010 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -34,6 +35,10 @@ VALUE rb_mCairo_Filter;
 VALUE rb_mCairo_SVGVersion = Qnil;
 VALUE rb_mCairo_PSLevel = Qnil;
 VALUE rb_mCairo_TextClusterFlag = Qnil;
+VALUE rb_mCairo_PDFVersion = Qnil;
+VALUE rb_mCairo_ScriptMode = Qnil;
+VALUE rb_mCairo_MimeType = Qnil;
+VALUE rb_mCairo_RegionOverlap = Qnil;
 
 #define CAIRO_OPERATOR_MIN CAIRO_OPERATOR_CLEAR
 #define CAIRO_OPERATOR_MAX CAIRO_OPERATOR_SATURATE
@@ -72,7 +77,7 @@ VALUE rb_mCairo_TextClusterFlag = Qnil;
 #define CAIRO_CONTENT_MAX CAIRO_CONTENT_COLOR_ALPHA
 
 #define CAIRO_FORMAT_MIN CAIRO_FORMAT_ARGB32
-#define CAIRO_FORMAT_MAX CAIRO_FORMAT_A1
+#define CAIRO_FORMAT_MAX CAIRO_FORMAT_RGB16_565
 
 #define CAIRO_EXTEND_MIN CAIRO_EXTEND_NONE
 #define CAIRO_EXTEND_MAX CAIRO_EXTEND_REFLECT
@@ -86,9 +91,18 @@ VALUE rb_mCairo_TextClusterFlag = Qnil;
 #define CAIRO_PS_LEVEL_MIN CAIRO_PS_LEVEL_2
 #define CAIRO_PS_LEVEL_MAX CAIRO_PS_LEVEL_3
 
+#define CAIRO_PDF_VERSION_MIN CAIRO_PDF_VERSION_1_4
+#define CAIRO_PDF_VERSION_MAX CAIRO_PDF_VERSION_1_5
+
 #define CAIRO_TEXT_CLUSTER_FLAG_MIN 0
 #define CAIRO_TEXT_CLUSTER_FLAG_MAX CAIRO_TEXT_CLUSTER_FLAG_BACKWARD
 
+#define CAIRO_SCRIPT_MODE_MIN CAIRO_SCRIPT_MODE_BINARY
+#define CAIRO_SCRIPT_MODE_MAX CAIRO_SCRIPT_MODE_ASCII
+
+#define CAIRO_REGION_OVERLAP_MIN CAIRO_REGION_OVERLAP_IN
+#define CAIRO_REGION_OVERLAP_MAX CAIRO_REGION_OVERLAP_PART
+
 #define DEFINE_RVAL2ENUM(name, const_name)                      \
 cairo_ ## name ## _t                                            \
 rb_cairo_ ## name ## _from_ruby_object (VALUE rb_ ## name)      \
@@ -139,10 +153,25 @@ DEFINE_RVAL2ENUM(ps_level, PS_LEVEL)
 #  endif
 #endif
 
+#ifdef CAIRO_HAS_PDF_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 10, 0)
+DEFINE_RVAL2ENUM(pdf_version, PDF_VERSION)
+#define PDF_VERSION_ENUM_DEFINED 1
+#  endif
+#endif
+
 #if CAIRO_CHECK_VERSION(1, 7, 6)
 DEFINE_RVAL2ENUM(text_cluster_flags, TEXT_CLUSTER_FLAG)
 #endif
 
+#ifdef CAIRO_HAS_SCRIPT_SURFACE
+DEFINE_RVAL2ENUM(script_mode, SCRIPT_MODE)
+#endif
+
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+DEFINE_RVAL2ENUM(region_overlap, REGION_OVERLAP)
+#endif
+
 #if defined(RB_CAIRO_PLATFORM_WIN32) && !defined(PS_LEVEL_ENUM_DEFINED)
 void
 rb_cairo_ps_level_from_ruby_object (VALUE rb_ps_level)
@@ -236,6 +265,43 @@ cr_ps_level_to_string (int argc, VALUE *argv, VALUE self)
 #  endif
 #endif
 
+#ifdef CAIRO_HAS_PDF_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 10, 0)
+static VALUE
+cr_pdf_get_versions (VALUE self)
+{
+  VALUE rb_versions;
+  const cairo_pdf_version_t *versions;
+  int i, n_versions;
+
+  cairo_pdf_get_versions (&versions, &n_versions);
+
+  rb_versions = rb_ary_new2 (n_versions);
+  for (i = 0; i < n_versions; i++)
+    {
+      rb_ary_push (rb_versions, INT2NUM (versions[i]));
+    }
+
+  return rb_versions;
+}
+
+static VALUE
+cr_pdf_version_to_string (int argc, VALUE *argv, VALUE self)
+{
+  if (argc == 0)
+    {
+      return rb_call_super (argc, argv);
+    }
+  else
+    {
+      VALUE version;
+      rb_scan_args (argc, argv, "1", &version);
+      return rb_str_new2 (cairo_pdf_version_to_string (RVAL2CRPDFVERSION (version)));
+    }
+}
+#  endif
+#endif
+
 void
 Init_cairo_constants (void)
 {
@@ -273,6 +339,38 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_Operator,    "SATURATE",
                    INT2FIX (CAIRO_OPERATOR_SATURATE));
 
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+  rb_define_const (rb_mCairo_Operator,    "MULTIPLY",
+                   INT2FIX (CAIRO_OPERATOR_MULTIPLY));
+  rb_define_const (rb_mCairo_Operator,    "SCREEN",
+                   INT2FIX (CAIRO_OPERATOR_SCREEN));
+  rb_define_const (rb_mCairo_Operator,    "OVERLAY",
+                   INT2FIX (CAIRO_OPERATOR_OVERLAY));
+  rb_define_const (rb_mCairo_Operator,    "DARKEN",
+                   INT2FIX (CAIRO_OPERATOR_DARKEN));
+  rb_define_const (rb_mCairo_Operator,    "LIGHTEN",
+                   INT2FIX (CAIRO_OPERATOR_LIGHTEN));
+  rb_define_const (rb_mCairo_Operator,    "COLOR_DODGE",
+                   INT2FIX (CAIRO_OPERATOR_COLOR_DODGE));
+  rb_define_const (rb_mCairo_Operator,    "COLOR_BURN",
+                   INT2FIX (CAIRO_OPERATOR_COLOR_BURN));
+  rb_define_const (rb_mCairo_Operator,    "HARD_LIGHT",
+                   INT2FIX (CAIRO_OPERATOR_HARD_LIGHT));
+  rb_define_const (rb_mCairo_Operator,    "SOFT_LIGHT",
+                   INT2FIX (CAIRO_OPERATOR_SOFT_LIGHT));
+  rb_define_const (rb_mCairo_Operator,    "DIFFERENCE",
+                   INT2FIX (CAIRO_OPERATOR_DIFFERENCE));
+  rb_define_const (rb_mCairo_Operator,    "EXCLUSION",
+                   INT2FIX (CAIRO_OPERATOR_EXCLUSION));
+  rb_define_const (rb_mCairo_Operator,    "HSL_HUE",
+                   INT2FIX (CAIRO_OPERATOR_HSL_HUE));
+  rb_define_const (rb_mCairo_Operator,    "HSL_SATURATION",
+                   INT2FIX (CAIRO_OPERATOR_HSL_SATURATION));
+  rb_define_const (rb_mCairo_Operator,    "HSL_COLOR",
+                   INT2FIX (CAIRO_OPERATOR_HSL_COLOR));
+  rb_define_const (rb_mCairo_Operator,    "HSL_LUMINOSITY",
+                   INT2FIX (CAIRO_OPERATOR_HSL_LUMINOSITY));
+#endif
 
   /* cairo_antialias_t */
   rb_mCairo_Antialias = rb_define_module_under (rb_mCairo, "Antialias");
@@ -394,6 +492,10 @@ Init_cairo_constants (void)
 
   /* cairo_format_t */
   rb_mCairo_Format = rb_define_module_under (rb_mCairo, "Format");
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+  rb_define_const (rb_mCairo_Format,    "INVALID",
+                   INT2FIX (CAIRO_FORMAT_INVALID));
+#endif
   rb_define_const (rb_mCairo_Format,    "ARGB32",
                    INT2FIX (CAIRO_FORMAT_ARGB32));
   rb_define_const (rb_mCairo_Format,    "RGB24",
@@ -402,10 +504,8 @@ Init_cairo_constants (void)
                    INT2FIX (CAIRO_FORMAT_A8));
   rb_define_const (rb_mCairo_Format,    "A1",
                    INT2FIX (CAIRO_FORMAT_A1));
-#if !CAIRO_CHECK_VERSION(1, 3, 0)
   rb_define_const (rb_mCairo_Format,    "RGB16_565",
                    INT2FIX (CAIRO_FORMAT_RGB16_565));
-#endif
 
 #if CAIRO_CHECK_VERSION(1, 5, 8)
   rb_define_singleton_method (rb_mCairo_Format, "stride_for_width",
@@ -468,6 +568,22 @@ Init_cairo_constants (void)
 #  endif
 #endif
 
+#ifdef CAIRO_HAS_PDF_SURFACE
+#  if CAIRO_CHECK_VERSION(1, 10, 0)
+  /* cairo_pdf_version_t */
+  rb_mCairo_PDFVersion = rb_define_module_under (rb_mCairo, "PDFVersion");
+  rb_define_const (rb_mCairo_PDFVersion, "VERSION_1_4",
+                   INT2FIX (CAIRO_PDF_VERSION_1_4));
+  rb_define_const (rb_mCairo_PDFVersion, "VERSION_1_5",
+                   INT2FIX (CAIRO_PDF_VERSION_1_5));
+
+  rb_define_singleton_method (rb_mCairo_PDFVersion, "list",
+                              cr_pdf_get_versions, 0);
+  rb_define_singleton_method (rb_mCairo_PDFVersion, "name",
+                              cr_pdf_version_to_string, -1);
+#  endif
+#endif
+
 #if CAIRO_CHECK_VERSION(1, 7, 6)
   /* cairo_text_cluster_flags_t */
   rb_mCairo_TextClusterFlag =
@@ -475,4 +591,35 @@ Init_cairo_constants (void)
   rb_define_const (rb_mCairo_TextClusterFlag, "BACKWARD",
                    INT2FIX (CAIRO_TEXT_CLUSTER_FLAG_BACKWARD));
 #endif
+
+#ifdef CAIRO_HAS_SCRIPT_SURFACE
+  /* cairo_script_mode_t */
+  rb_mCairo_ScriptMode = rb_define_module_under (rb_mCairo, "ScriptMode");
+  rb_define_const (rb_mCairo_ScriptMode, "BINARY",
+                   INT2FIX (CAIRO_SCRIPT_MODE_BINARY));
+  rb_define_const (rb_mCairo_ScriptMode, "ASCII",
+                   INT2FIX (CAIRO_SCRIPT_MODE_ASCII));
+#endif
+
+#if CAIRO_CHECK_VERSION(1, 10, 0)
+  rb_mCairo_MimeType = rb_define_module_under (rb_mCairo, "MimeType");
+
+  rb_define_const (rb_mCairo_MimeType, "JPEG",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JPEG));
+  rb_define_const (rb_mCairo_MimeType, "PNG",
+                   rb_str_new2 (CAIRO_MIME_TYPE_PNG));
+  rb_define_const (rb_mCairo_MimeType, "JP2",
+                   rb_str_new2 (CAIRO_MIME_TYPE_JP2));
+  rb_define_const (rb_mCairo_MimeType, "URI",
+                   rb_str_new2 (CAIRO_MIME_TYPE_URI));
+
+  rb_mCairo_RegionOverlap = rb_define_module_under (rb_mCairo, "RegionOverlap");
+
+  rb_define_const (rb_mCairo_RegionOverlap, "IN",
+                   INT2FIX (CAIRO_REGION_OVERLAP_IN));
+  rb_define_const (rb_mCairo_RegionOverlap, "OUT",
+                   INT2FIX (CAIRO_REGION_OVERLAP_OUT));
+  rb_define_const (rb_mCairo_RegionOverlap, "PART",
+                   INT2FIX (CAIRO_REGION_OVERLAP_PART));
+#endif
 }