cairo 1.15.3-x86-mingw32 → 1.15.4-x86-mingw32

data/lib/cairo.rb

@@ -17,6 +17,8 @@ if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
   end
 end
 
+require "time"
+
 module Cairo
   class << self
     def __add_one_arg_setter(klass)

data/samples/link.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+$LOAD_PATH.unshift File.join(top, "ext", "cairo")
+$LOAD_PATH.unshift File.join(top, "lib")
+
+require "cairo"
+
+width = 200
+height = 200
+
+Cairo::PDFSurface.new("link.pdf", width, height) do |surface|
+  Cairo::Context.new(surface) do |context|
+    context.move_to(50, 50)
+    context.tag(Cairo::Tag::LINK, "uri='http://rcairo.github.io/'") do
+      context.show_text("rcairo site")
+    end
+  end
+end

data/test/cairo-test-utils.rb

@@ -1,4 +1,5 @@
 require 'cairo'
+#require 'poppler'
 require 'stringio'
 require 'test/unit/notify'
 

data/test/test_context.rb

@@ -102,4 +102,26 @@ class ContextTest < Test::Unit::TestCase
     assert_equal("family name should be nil, String or Symbol: [999]",
                  exception.message)
   end
+
+  sub_test_case("#tag") do
+    setup do
+      only_cairo_version(1, 15, 4)
+      omit("poppler 3.1.1 is required")
+    end
+
+    test("LINK") do
+      Cairo::Context.new(@surface) do |context|
+        context.tag(Cairo::Tag::LINK, "uri='http://localhost/'") do
+          context.show_text("localhost")
+        end
+        @surface.finish
+      end
+      document = Poppler::Document.new(@output.string)
+      uris = document[0].link_mapping.collect do |mapping|
+        mapping.action.uri
+      end
+      assert_equal(["http://localhost/"],
+                   uris)
+    end
+  end
 end

data/test/test_pdf_surface.rb

@@ -1,8 +1,139 @@
 class PDFSurfaceTest < Test::Unit::TestCase
   include CairoTestUtils
 
+  def create_pdf
+    omit("poppler 3.1.1 is required")
+    pdf = StringIO.new
+    surface = Cairo::PDFSurface.new(pdf, 10, 20)
+    yield(surface)
+    surface.finish
+    Poppler::Document.new(pdf.string)
+  end
+
   def test_new_with_nil_target
     surface = Cairo::PDFSurface.new(nil, 10, 20)
     surface.finish
   end
+
+  sub_test_case "#add_outline" do
+    def test_sub_outline
+      only_cairo_version(1, 15, 4)
+      surface = Cairo::PDFSurface.new(nil, 10, 20)
+      context = Cairo::Context.new(surface)
+      context.tag(Cairo::Tag::DEST, "name='destination'") do
+        context.show_text("Destination")
+      end
+      id = surface.add_outline(Cairo::PDFOutline::ROOT,
+                               "top-level",
+                               "destination",
+                               Cairo::PDFOutlineFlags::OPEN)
+      sub_id = surface.add_outline(sub_id,
+                                   "sub",
+                                   "destination",
+                                   Cairo::PDFOutlineFlags::OPEN)
+      assert_equal(2, sub_id)
+    end
+  end
+
+  sub_test_case "#set_metadata" do
+    test "title" do
+      only_cairo_version(1, 15, 4)
+      pdf = create_pdf do |surface|
+        surface.set_metadata(Cairo::PDFMetadata::TITLE, "Hello")
+      end
+      assert_equal("Hello", pdf.title)
+    end
+
+    test "author" do
+      only_cairo_version(1, 15, 4)
+      pdf = create_pdf do |surface|
+        surface.set_metadata(Cairo::PDFMetadata::AUTHOR, "Alice")
+      end
+      assert_equal("Alice", pdf.author)
+    end
+
+    test "subject" do
+      only_cairo_version(1, 15, 4)
+      pdf = create_pdf do |surface|
+        surface.set_metadata(Cairo::PDFMetadata::SUBJECT, "This is world.")
+      end
+      assert_equal("This is world.", pdf.subject)
+    end
+
+    test "keywords" do
+      only_cairo_version(1, 15, 4)
+      pdf = create_pdf do |surface|
+        surface.set_metadata(Cairo::PDFMetadata::KEYWORDS, "hello, alice")
+      end
+      assert_equal("hello, alice", pdf.keywords)
+    end
+
+    test "creator" do
+      only_cairo_version(1, 15, 4)
+      pdf = create_pdf do |surface|
+        surface.set_metadata(Cairo::PDFMetadata::CREATOR, "cairo")
+      end
+      assert_equal("cairo", pdf.creator)
+    end
+
+    sub_test_case "create date" do
+      test "string" do
+        only_cairo_version(1, 15, 4)
+        pdf = create_pdf do |surface|
+          surface.set_metadata(Cairo::PDFMetadata::CREATE_DATE,
+                               "2017-01-04T02:17:01+09:00")
+        end
+        assert_equal(Time.parse("2017-01-04T02:17:01+09:00"),
+                     Time.at(pdf.creation_date))
+      end
+
+      test "time" do
+        only_cairo_version(1, 15, 4)
+        pdf = create_pdf do |surface|
+          surface.set_metadata(Cairo::PDFMetadata::CREATE_DATE,
+                               Time.parse("2017-01-04T02:17:01+09:00"))
+        end
+        assert_equal(Time.parse("2017-01-04T02:17:01+09:00"),
+                     Time.at(pdf.creation_date))
+      end
+    end
+
+    sub_test_case "modified date" do
+      test "string" do
+        only_cairo_version(1, 15, 4)
+        pdf = create_pdf do |surface|
+          surface.set_metadata(Cairo::PDFMetadata::MOD_DATE,
+                               "2017-01-04T02:17:01+09:00")
+        end
+        assert_equal(Time.parse("2017-01-04T02:17:01+09:00"),
+                     Time.at(pdf.mod_date))
+      end
+
+      test "time" do
+        only_cairo_version(1, 15, 4)
+        pdf = create_pdf do |surface|
+          surface.set_metadata(Cairo::PDFMetadata::MOD_DATE,
+                               Time.parse("2017-01-04T02:17:01+09:00"))
+        end
+        assert_equal(Time.parse("2017-01-04T02:17:01+09:00"),
+                     Time.at(pdf.mod_date))
+      end
+    end
+  end
+
+  test "#page_label=" do
+    only_cairo_version(1, 15, 4)
+    pdf = create_pdf do |surface|
+      surface.page_label = "Hello"
+    end
+    assert_equal("Hello", pdf[0].label)
+  end
+
+  test "#set_thumbnail_size" do
+    only_cairo_version(1, 15, 4)
+    pdf = create_pdf do |surface|
+      surface.set_thumbnail_size(5, 10)
+    end
+    assert_equal([5, 10], pdf[0].thumbnail_size)
+  end
 end

data/vendor/local/bin/libpng-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.26"
+version="1.6.27"
 prefix="/home/vagrant/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/bin/libpng16-config

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version="1.6.26"
+version="1.6.27"
 prefix="/home/vagrant/rcairo.win32/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"

data/vendor/local/include/cairo/cairo-pdf.h

@@ -85,6 +85,74 @@ cairo_pdf_surface_set_size (cairo_surface_t	*surface,
 			    double		 width_in_points,
 			    double		 height_in_points);
 
+/**
+ * cairo_pdf_outline_flags_t:
+ * @CAIRO_BOOKMARK_FLAG_OPEN: The outline item defaults to open in the PDF viewer (Since 1.16)
+ * @CAIRO_BOOKMARK_FLAG_BOLD: The outline item is displayed by the viewer in bold text (Since 1.16)
+ * @CAIRO_BOOKMARK_FLAG_ITALIC: The outline item is displayed by the viewer in italic text (Since 1.16)
+ *
+ * #cairo_pdf_outline_flags_t is used by the
+ * cairo_pdf_surface_add_outline() function specify the attributes of
+ * an outline item. These flags may be bitwise-or'd to produce any
+ * combination of flags.
+ *
+ * Since: 1.16
+ **/
+typedef enum _cairo_pdf_outline_flags {
+    CAIRO_BOOKMARK_FLAG_OPEN   = 0x1,
+    CAIRO_BOOKMARK_FLAG_BOLD   = 0x2,
+    CAIRO_BOOKMARK_FLAG_ITALIC = 0x4,
+} cairo_pdf_outline_flags_t;
+
+#define CAIRO_PDF_OUTLINE_ROOT 0
+
+cairo_public int
+cairo_pdf_surface_add_outline (cairo_surface_t	          *surface,
+			       int                         parent_id,
+			       const char                 *utf8,
+			       const char                 *dest,
+			       cairo_pdf_outline_flags_t  flags);
+
+/**
+ * cairo_pdf_metadata_t:
+ * @CAIRO_PDF_METADATA_TITLE: The document title (Since 1.16)
+ * @CAIRO_PDF_METADATA_AUTHOR: The document author (Since 1.16)
+ * @CAIRO_PDF_METADATA_SUBJECT: The document subject (Since 1.16)
+ * @CAIRO_PDF_METADATA_KEYWORDS: The document keywords (Since 1.16)
+ * @CAIRO_PDF_METADATA_CREATOR: The document creator (Since 1.16)
+ * @CAIRO_PDF_METADATA_TITLE: The document title (Since 1.16)
+ * @CAIRO_PDF_METADATA_CREATE_DATE: The document creation date (Since 1.16)
+ * @CAIRO_PDF_METADATA_MOD_DATE: The document modification date (Since 1.16)
+ *
+ * #cairo_pdf_metadata_t is used by the
+ * cairo_pdf_surface_set_metadata() function specify the metadata to set.
+ *
+ * Since: 1.16
+ **/
+typedef enum _cairo_pdf_metadata {
+    CAIRO_PDF_METADATA_TITLE,
+    CAIRO_PDF_METADATA_AUTHOR,
+    CAIRO_PDF_METADATA_SUBJECT,
+    CAIRO_PDF_METADATA_KEYWORDS,
+    CAIRO_PDF_METADATA_CREATOR,
+    CAIRO_PDF_METADATA_CREATE_DATE,
+    CAIRO_PDF_METADATA_MOD_DATE,
+} cairo_pdf_metadata_t;
+
+cairo_public void
+cairo_pdf_surface_set_metadata (cairo_surface_t	     *surface,
+				cairo_pdf_metadata_t  metadata,
+                                const char           *utf8);
+
+cairo_public void
+cairo_pdf_surface_set_page_label (cairo_surface_t *surface,
+                                  const char      *utf8);
+
+cairo_public void
+cairo_pdf_surface_set_thumbnail_size (cairo_surface_t *surface,
+				      int              width,
+				      int              height);
+
 CAIRO_END_DECLS
 
 #else  /* CAIRO_HAS_PDF_SURFACE */

data/vendor/local/include/cairo/cairo-version.h

@@ -3,6 +3,6 @@
 
 #define CAIRO_VERSION_MAJOR 1
 #define CAIRO_VERSION_MINOR 15
-#define CAIRO_VERSION_MICRO 2
+#define CAIRO_VERSION_MICRO 4
 
 #endif

data/vendor/local/include/cairo/cairo.h

@@ -292,6 +292,10 @@ typedef struct _cairo_user_data_key {
  * @CAIRO_STATUS_DEVICE_FINISHED: target device has been finished (Since 1.12)
  * @CAIRO_STATUS_JBIG2_GLOBAL_MISSING: %CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID has been used on at least one image
  *   but no image provided %CAIRO_MIME_TYPE_JBIG2_GLOBAL (Since 1.14)
+ * @CAIRO_STATUS_PNG_ERROR: error occurred in libpng while reading from or writing to a PNG file (Since 1.16)
+ * @CAIRO_STATUS_FREETYPE_ERROR: error occurred in libfreetype (Since 1.16)
+ * @CAIRO_STATUS_WIN32_GDI_ERROR: error occurred in the Windows Graphics Device Interface (Since 1.16)
+ * @CAIRO_STATUS_TAG_ERROR: invalid tag name, attributes, or nesting (Since 1.16)
  * @CAIRO_STATUS_LAST_STATUS: this is a special value indicating the number of
  *   status values defined in this enumeration.  When using this value, note
  *   that the version of cairo at run-time may have additional status values
@@ -348,6 +352,10 @@ typedef enum _cairo_status {
     CAIRO_STATUS_INVALID_MESH_CONSTRUCTION,
     CAIRO_STATUS_DEVICE_FINISHED,
     CAIRO_STATUS_JBIG2_GLOBAL_MISSING,
+    CAIRO_STATUS_PNG_ERROR,
+    CAIRO_STATUS_FREETYPE_ERROR,
+    CAIRO_STATUS_WIN32_GDI_ERROR,
+    CAIRO_STATUS_TAG_ERROR,
 
     CAIRO_STATUS_LAST_STATUS
 } cairo_status_t;
@@ -1018,6 +1026,17 @@ cairo_copy_clip_rectangle_list (cairo_t *cr);
 cairo_public void
 cairo_rectangle_list_destroy (cairo_rectangle_list_t *rectangle_list);
 
+/* Logical structure tagging functions */
+
+#define CAIRO_TAG_DEST "cairo.dest"
+#define CAIRO_TAG_LINK "Link"
+
+cairo_public void
+cairo_tag_begin (cairo_t *cr, const char *tag_name, const char *attributes);
+
+cairo_public void
+cairo_tag_end (cairo_t *cr, const char *tag_name);
+
 /* Font/Text functions */
 
 /**

data/vendor/local/include/libpng16/png.h

@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.26, October 20, 2016
+ * libpng version 1.6.27, December 29, 2016
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -12,7 +12,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.26, October 20, 2016:
+ *   libpng versions 0.97, January 1998, through 1.6.27, December 29, 2016:
  *     Glenn Randers-Pehrson.
  *   See also "Contributing Authors", below.
  */
@@ -29,7 +29,7 @@
  * files that are distributed with libpng have other copyright owners and
  * are released under other open source licenses.
  *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.26, October 20, 2016 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.27, December 29, 2016 are
  * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
  * derived from libpng-1.0.6, and are distributed according to the same
  * disclaimer and license as libpng-1.0.6 with the following individuals
@@ -218,7 +218,7 @@
  *    ...
  *    1.5.27                  15    10527  15.so.15.27[.0]
  *    ...
- *    1.6.26                  16    10626  16.so.16.26[.0]
+ *    1.6.27                  16    10627  16.so.16.27[.0]
  *
  *    Henceforth the source version will match the shared-library major
  *    and minor numbers; the shared-library major version number will be
@@ -246,13 +246,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    October 20, 2016
+ *    December 29, 2016
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.6.26 are Y2K compliant.  It is my belief that
+ *    upward through 1.6.27 are Y2K compliant.  It is my belief that
  *    earlier versions were also Y2K compliant.
  *
  *    Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -314,8 +314,8 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.26"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.26 - October 20, 2016\n"
+#define PNG_LIBPNG_VER_STRING "1.6.27"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.27 - December 29, 2016\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
@@ -323,7 +323,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
 #define PNG_LIBPNG_VER_MAJOR   1
 #define PNG_LIBPNG_VER_MINOR   6
-#define PNG_LIBPNG_VER_RELEASE 26
+#define PNG_LIBPNG_VER_RELEASE 27
 
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -354,7 +354,7 @@
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From
  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release
  */
-#define PNG_LIBPNG_VER 10626 /* 1.6.26 */
+#define PNG_LIBPNG_VER 10627 /* 1.6.27 */
 
 /* Library configuration: these options cannot be changed after
  * the library has been built.
@@ -464,7 +464,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_26;
+typedef char* png_libpng_version_1_6_27;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *
@@ -3230,7 +3230,8 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
 #ifdef PNG_MIPS_MSA_API_SUPPORTED
 #  define PNG_MIPS_MSA   6 /* HARDWARE: MIPS Msa SIMD instructions supported */
 #endif
-#define PNG_OPTION_NEXT  8 /* Next option - numbers must be even */
+#define PNG_IGNORE_ADLER32 8
+#define PNG_OPTION_NEXT  10 /* Next option - numbers must be even */
 
 /* Return values: NOTE: there are four values and 'off' is *not* zero */
 #define PNG_OPTION_UNSET   0 /* Unset - defaults to off */