cairo 1.15.12-x86-mingw32 → 1.15.13-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db8b125e6ac8b39b5ab834f9939b10d19fdbf6d7
-  data.tar.gz: e2c0901abaf6a57dbec377d862d91f36cf054631
+SHA256:
+  metadata.gz: 576a2b90551ac295a957ca6ac41a15ba6d221f169fce91e371b6b070a3391da3
+  data.tar.gz: 02e0c8ff46322f9155ea8dd91ecc7d83358e07ec38ef44cff8de6ef6905c9833
 SHA512:
-  metadata.gz: 55925628e1dd13fe9476744664d8fcbd5ad6207957ffd900a57273d5f188c955b9f0a55fc9ff766908763a552e29e3a80208315d1ed5e5bd282d361da4ef7d44
-  data.tar.gz: 10b94eda01a66ba3c5ee3aa75a1a3e3aa0f500398cc5b622075198835956887b43c0ae96826590d76a8671c5bc8d4f5dce1b0ce07741342f649eed8d7ee08c7a
+  metadata.gz: 00e9bc905e4168f1c1ae5a5deae28e94fc819fb7ea9d664c0f72fa895062fefd0335e5d010ed65c056840962c8c2b7f0b2d4ea1f8b8024e25af43c88f09cbd05
+  data.tar.gz: 17425c93106d5faba1beabefc24aa76ccac4cb6e8f920b6e062cdcbade5c86ff7dade7e3b079bda5051b2fb9b1bbd7990008a1db2b35a8830dc441255fd82483

data/NEWS

@@ -1,3 +1,15 @@
+Release 1.15.13 (2018-05-01) Kouhei Sutou <kou@cozmixng.org>
+============================================================
+
+Improvements
+------------
+
+  * Added cairo 1.15.12 support.
+
+    * Added Cairo::FontOptions#variations
+
+    * Added Cairo::FontOptions#variations=
+
 Release 1.15.12 (2018-03-14) Kouhei Sutou <kou@cozmixng.org>
 ============================================================
 

data/Rakefile

@@ -404,11 +404,7 @@ class WindowsTask
   end
 
   def ruby_gnome2_dir
-    if RCairoBuild.for_64bit?
-      @base_dir.parent + "ruby-gnome2.win64"
-    else
-      @base_dir.parent + "ruby-gnome2.win32"
-    end
+    @base_dir.parent + "ruby-gnome2"
   end
 
   def ruby_glib2_pkg_config_path
@@ -489,7 +485,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "fontconfig",
-      :version => "2.12.4",
+      :version => "2.13.0",
       :download_base_url => "https://www.freedesktop.org/software/fontconfig/release",
       :compression_method => "bz2",
       :windows => {
@@ -511,7 +507,7 @@ windows_task = WindowsTask.new(spec) do |task|
     },
     {
       :name => "cairo",
-      :version => "1.15.10",
+      :version => "1.15.12",
       :download_site => :cairo_snapshots,
       :windows => {
         :built_file => "bin/libcairo-2.dll",

data/ext/cairo/rb_cairo.h

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2006-2017 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2006-2018 Kouhei Sutou <kou@cozmixng.org>
  * Copyright 2005 Øyvind Kolås <pippin@freedesktop.org>
  * Copyright 2004-2005 MenTaLguY <mental@rydia.com>
  *
@@ -73,7 +73,7 @@ RB_CAIRO_BEGIN_DECLS
 
 #define RB_CAIRO_VERSION_MAJOR 1
 #define RB_CAIRO_VERSION_MINOR 15
-#define RB_CAIRO_VERSION_MICRO 12
+#define RB_CAIRO_VERSION_MICRO 13
 
 RB_CAIRO_VAR VALUE rb_mCairo;
 RB_CAIRO_VAR VALUE rb_cCairo_Context;

data/ext/cairo/rb_cairo_font_options.c

@@ -5,7 +5,7 @@
  * $Author: kou $
  * $Date: 2008-09-19 12:56:27 $
  *
- * Copyright 2005-2008 Kouhei Sutou <kou@cozmixng.org>
+ * Copyright 2005-2018 Kouhei Sutou <kou@cozmixng.org>
  *
  * This file is made available under the same terms as Ruby
  *
@@ -163,6 +163,27 @@ cr_options_get_hint_metrics (VALUE self)
   return INT2NUM (cairo_font_options_get_hint_metrics (_SELF (self)));
 }
 
+#if CAIRO_CHECK_VERSION(1, 15, 12)
+static VALUE
+cr_options_set_variations (VALUE self, VALUE variations)
+{
+  cairo_font_options_set_variations (_SELF (self),
+                                     RVAL2CSTR (variations));
+  return self;
+}
+
+static VALUE
+cr_options_get_variations (VALUE self)
+{
+  const char *variations;
+
+  variations = cairo_font_options_get_variations (_SELF (self));
+  if (!variations)
+    return Qnil;
+
+  return CSTR2RVAL (variations);
+}
+#endif
 
 void
 Init_cairo_font_options (void)
@@ -196,6 +217,12 @@ Init_cairo_font_options (void)
                     cr_options_set_hint_metrics, 1);
   rb_define_method (rb_cCairo_FontOptions, "hint_metrics",
                     cr_options_get_hint_metrics, 0);
+#if CAIRO_CHECK_VERSION(1, 15, 12)
+  rb_define_method (rb_cCairo_FontOptions, "set_variations",
+                    cr_options_set_variations, 1);
+  rb_define_method (rb_cCairo_FontOptions, "variations",
+                    cr_options_get_variations, 0);
+#endif
 
   RB_CAIRO_DEF_SETTERS (rb_cCairo_FontOptions);
 }

data/test/test_font_options.rb

@@ -55,4 +55,11 @@ class FontOptionsTest < Test::Unit::TestCase
       assert_equal(:value, hash[@options.dup])
     end
   end
+
+  test "variations" do
+    only_cairo_version(1, 15, 12)
+    assert_nil(@options.variations)
+    @options.variations = "wdth=200"
+    assert_equal("wdth=200", @options.variations)
+  end
 end

data/vendor/local/bin/freetype-config

@@ -35,17 +35,17 @@ if test $? -eq 0 ; then
   dynamic_libs=`/usr/bin/pkg-config --libs freetype2`
   static_libs=`/usr/bin/pkg-config --static --libs freetype2`
 else
-  prefix="/home/vagrant/rcairo.win32/vendor/local"
-  exec_prefix="/home/vagrant/rcairo.win32/vendor/local"
+  prefix="/home/vagrant/rcairo/vendor/local"
+  exec_prefix="/home/vagrant/rcairo/vendor/local"
 
-  includedir="/home/vagrant/rcairo.win32/vendor/local/include"
-  libdir="/home/vagrant/rcairo.win32/vendor/local/lib"
+  includedir="/home/vagrant/rcairo/vendor/local/include"
+  libdir="/home/vagrant/rcairo/vendor/local/lib"
 
   version=21.0.15
 
   cflags="-I${SYSROOT}$includedir/freetype2"
   dynamic_libs="-lfreetype"
-  static_libs="-lfreetype -L/home/vagrant/rcairo.win32/vendor/local/lib -lz -L/home/vagrant/rcairo.win32/vendor/local/lib -lpng16 -lz"
+  static_libs="-lfreetype -L/home/vagrant/rcairo/vendor/local/lib -lz -L/home/vagrant/rcairo/vendor/local/lib -lpng16 -lz"
   if test "${SYSROOT}$libdir" != "/usr/lib"   &&
      test "${SYSROOT}$libdir" != "/usr/lib64" ; then
     libs_L="-L${SYSROOT}$libdir"

data/vendor/local/bin/libpng-config

@@ -12,7 +12,7 @@
 # Modeled after libxml-config.
 
 version="1.6.34"
-prefix="/home/vagrant/rcairo.win32/vendor/local"
+prefix="/home/vagrant/rcairo/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"
 includedir="${prefix}/include/libpng16"

data/vendor/local/bin/libpng16-config

@@ -12,7 +12,7 @@
 # Modeled after libxml-config.
 
 version="1.6.34"
-prefix="/home/vagrant/rcairo.win32/vendor/local"
+prefix="/home/vagrant/rcairo/vendor/local"
 exec_prefix="${prefix}"
 libdir="${exec_prefix}/lib"
 includedir="${prefix}/include/libpng16"

data/vendor/local/bin/xml2-config

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-prefix=/home/vagrant/rcairo.win32/vendor/local
+prefix=/home/vagrant/rcairo/vendor/local
 exec_prefix=${prefix}
 includedir=${prefix}/include
 libdir=${exec_prefix}/lib
@@ -86,12 +86,12 @@ while test $# -gt 0; do
 	then
 	    if [ "-L${libdir}" = "-L/usr/lib" -o "-L${libdir}" = "-L/usr/lib64" ]
 	    then
-		echo -lxml2 -L/home/vagrant/rcairo.win32/vendor/local/lib -lz       
+		echo -lxml2 -L/home/vagrant/rcairo/vendor/local/lib -lz       
 	    else
-		echo -L${libdir} -lxml2 -L/home/vagrant/rcairo.win32/vendor/local/lib -lz       
+		echo -L${libdir} -lxml2 -L/home/vagrant/rcairo/vendor/local/lib -lz       
 	    fi
 	else
-	    echo -L${libdir} -lxml2 -L/home/vagrant/rcairo.win32/vendor/local/lib -lz        -lws2_32
+	    echo -L${libdir} -lxml2 -L/home/vagrant/rcairo/vendor/local/lib -lz        -lws2_32
 	fi
        	;;
 

data/vendor/local/etc/fonts/conf.d/10-hinting-slight.conf

@@ -1,6 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set hintslight to hintstyle</description>
+
   <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.

data/vendor/local/etc/fonts/conf.d/10-scale-bitmap-fonts.conf

@@ -1,7 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
 
+  <description>Bitmap scaling</description>
 <!--
   If font is bitmap, calculate scale factor.
   Note that color bitmap fonts have scalable=true, while

data/vendor/local/etc/fonts/conf.d/20-unhint-small-vera.conf

@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Disable hinting for Bitstream Vera fonts when the size is less than 8ppem</description>
 <!-- 
 	The Bitstream Vera fonts have GASP entries suggesting that hinting be
 	disabled below 8 ppem, but FreeType ignores those, preferring to use

data/vendor/local/etc/fonts/conf.d/30-metric-aliases.conf

@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for similar/metric-compatible families</description>
 
 <!--
 
@@ -44,6 +49,9 @@ but in an order preferring similar designs first.  We do this in three steps:
 3) Alias each generic to its specifics.
    e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
 
+NOTE: The (URW)++ fonts mappings of generics to specifics were removed, because
+      upstream now includes them in their release of (URW)++ Core Font Set here:
+      https://github.com/ArtifexSoftware/urw-base35-fonts/tree/master/fontconfig
 -->
 
 <!-- Map specifics to generics -->
@@ -308,7 +316,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
-
 	<!-- Microsoft -->
 	<alias binding="same">
 	  <family>Arimo</family>
@@ -460,7 +467,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
-
 	<!-- Microsoft -->
 	<alias>
 	  <family>Arial</family>
@@ -490,8 +496,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  </default>
 	</alias>
 
-
-
 <!-- Map generics to specifics -->
 
 	<!-- PostScript -->
@@ -499,8 +503,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>Helvetica</family>
 	  <accept>
 	  <family>TeX Gyre Heros</family>
-	  <family>Nimbus Sans</family>
-	  <family>Nimbus Sans L</family>
 	  </accept>
 	</alias>
 
@@ -508,7 +510,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>Helvetica Narrow</family>
 	  <accept>
 	  <family>TeX Gyre Heros Cn</family>
-	  <family>Nimbus Sans Narrow</family>
 	  </accept>
 	</alias>
 
@@ -516,8 +517,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>Times</family>
 	  <accept>
 	  <family>TeX Gyre Termes</family>
-	  <family>Nimbus Roman</family>
-	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
 
@@ -525,9 +524,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>Courier</family>
 	  <accept>
 	  <family>TeX Gyre Cursor</family>
-	  <family>Nimbus Mono PS</family>
-	  <family>Nimbus Mono</family>
-	  <family>Nimbus Mono L</family>
 	  </accept>
 	</alias>
 
@@ -535,8 +531,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>ITC Avant Garde Gothic</family>
 	  <accept>
 	  <family>TeX Gyre Adventor</family>
-	  <family>URW Gothic</family>
-	  <family>URW Gothic L</family>
 	  </accept>
 	</alias>
 
@@ -545,9 +539,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <accept>
 	  <family>Bookman Old Style</family>
 	  <family>TeX Gyre Bonum</family>
-	  <family>URW Bookman</family>
-	  <family>Bookman URW</family>
-	  <family>URW Bookman L</family>
 	  </accept>
 	</alias>
 
@@ -555,9 +546,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <family>ITC Zapf Chancery</family>
 	  <accept>
 	  <family>TeX Gyre Chorus</family>
-	  <family>Z003</family>
-	  <family>Chancery URW</family>
-	  <family>URW Chancery L</family>
 	  </accept>
 	</alias>
 
@@ -566,9 +554,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <accept>
 	  <family>Palatino Linotype</family>
 	  <family>TeX Gyre Pagella</family>
-	  <family>P052</family>
-	  <family>Palladio URW</family>
-	  <family>URW Palladio L</family>
 	  </accept>
 	</alias>
 
@@ -577,9 +562,6 @@ but in an order preferring similar designs first.  We do this in three steps:
 	  <accept>
 	  <family>Century Schoolbook</family>
 	  <family>TeX Gyre Schola</family>
-	  <family>C059</family>
-	  <family>Century SchoolBook URW</family>
-	  <family>Century Schoolbook L</family>
 	  </accept>
 	</alias>
 

data/vendor/local/etc/fonts/conf.d/40-nonlatin.conf

@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for non-Latin fonts</description>
 <!--
   Mark common families with their generics so we'll get
   something reasonable

data/vendor/local/etc/fonts/conf.d/45-generic.conf

@@ -0,0 +1,136 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Set substitutions for emoji/math fonts</description>
+
+<!-- Keep in sync with 60-generic.conf -->
+
+<!-- Emoji -->
+
+	<!-- System emoji -->
+	<alias binding="same">
+		<family>Noto Color Emoji</family> <!-- Google -->
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Apple Color Emoji</family> <!-- Apple -->
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Segoe UI Emoji</family> <!-- Microsoft -->
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Twitter Color Emoji</family> <!-- Twitter -->
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>EmojiOne Mozilla</family> <!-- Mozilla -->
+		<default><family>emoji</family></default>
+	</alias>
+	<!-- Third-party emoji -->
+	<alias binding="same">
+		<family>Emoji Two</family>
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Emoji One</family>
+		<default><family>emoji</family></default>
+	</alias>
+	<!-- B&W -->
+	<alias binding="same">
+		<family>Noto Emoji</family> <!-- Google -->
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Android Emoji</family> <!-- Google -->
+		<default><family>emoji</family></default>
+	</alias>
+
+	<!-- Add language for emoji, to match other emoji fonts. -->
+	<match>
+		<test name="family">
+			<string>emoji</string>
+		</test>
+		<edit name="lang" mode="prepend">
+			<string>und-zsye</string>
+		</edit>
+	</match>
+
+	<match>
+		<test name="lang">
+			<string>und-zsye</string>
+		</test>
+		<test qual="all" name="family" compare="not_eq">
+			<string>emoji</string>
+		</test>
+
+		<!-- Add generic family. -->
+		<edit name="family" mode="append" binding="strong">
+			<string>emoji</string>
+		</edit>
+	</match>
+
+
+<!-- Math -->
+
+	<!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
+	<alias binding="same">
+		<family>XITS Math</family> <!-- Khaled Hosny -->
+		<default><family>math</family></default>
+	</alias>
+	<alias binding="same">
+		<family>STIX Two Math</family> <!-- AMS -->
+		<default><family>math</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Cambria Math</family> <!-- Microsoft -->
+		<default><family>math</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Latin Modern Math</family> <!-- TeX -->
+		<default><family>math</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Minion Math</family> <!-- Adobe -->
+		<default><family>math</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Lucida Math</family> <!-- Adobe -->
+		<default><family>math</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Asana Math</family>
+		<default><family>math</family></default>
+	</alias>
+
+	<!-- Add language for math, to match other math fonts. -->
+	<match>
+		<test name="family">
+			<string>math</string>
+		</test>
+		<edit name="lang" mode="prepend">
+			<string>und-zmth</string>
+		</edit>
+	</match>
+
+	<match>
+		<test name="lang">
+			<string>und-zmth</string>
+		</test>
+		<test qual="all" name="family" compare="not_eq">
+			<string>math</string>
+		</test>
+
+		<!-- Add generic family -->
+		<edit name="family" mode="append" binding="strong">
+			<string>math</string>
+		</edit>
+	</match>
+
+
+</fontconfig>