cairo 1.15.12-x64-mingw32 → 1.15.13-x64-mingw32

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>

data/vendor/local/etc/fonts/conf.d/45-latin.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 Latin fonts</description>
 <!--
   Mark common families with their generics so we'll get
   something reasonable

data/vendor/local/etc/fonts/conf.d/49-sansserif.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>Add sans-serif to the family when no generic name</description>
 <!--
   If the font still has no generic name, add sans-serif
  -->

data/vendor/local/etc/fonts/conf.d/50-user.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>Load per-user customization files</description>
 	<!--
 	    Load per-user customization files where stored on XDG Base Directory
 	    specification compliant places. it should be usually:

data/vendor/local/etc/fonts/conf.d/51-local.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>Load local customization file</description>
 	<!-- Load local system customization file -->
 	<include ignore_missing="yes">local.conf</include>
 </fontconfig>

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

@@ -0,0 +1,67 @@
+<?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 preferable fonts for emoji/math fonts</description>
+<!-- Keep in sync with 45-generic.conf -->
+
+<!-- Emoji -->
+
+	<!-- Prefer to match color emoji font. -->
+	<match>
+		<test name="lang">
+			<string>und-zsye</string>
+		</test>
+		<test qual="all" name="color" compare="not_eq">
+			<bool>true</bool>
+		</test>
+		<test qual="all" name="color" compare="not_eq">
+			<bool>false</bool>
+		</test>
+		<edit name="color" mode="append">
+			<bool>true</bool>
+		</edit>
+	</match>
+
+	<!-- TODO
+	 ! Match on "color" and alias B&W ones first if no color is requested.
+	 ! That's "hard" because <alias> doesn't work in match and needs to be
+	 ! expanded to its non-sugar form.
+	 !-->
+	<alias binding="same">
+		<family>emoji</family>
+		<prefer>
+			<!-- System fonts -->
+			<family>Noto Color Emoji</family> <!-- Google -->
+			<family>Apple Color Emoji</family> <!-- Apple -->
+			<family>Segoe UI Emoji</family> <!-- Microsoft -->
+			<family>Twitter Color Emoji</family> <!-- Twitter -->
+			<family>EmojiOne Mozilla</family> <!-- Mozilla -->
+			<!-- Third-Party fonts -->
+			<family>Emoji Two</family>
+			<family>Emoji One</family>
+			<!-- Non-color -->
+			<family>Noto Emoji</family> <!-- Google -->
+			<family>Android Emoji</family> <!-- Google -->
+		</prefer>
+	</alias>
+
+<!-- Math -->
+	<alias binding="same">
+		<!-- https://en.wikipedia.org/wiki/Category:Mathematical_OpenType_typefaces -->
+		<family>math</family>
+		<prefer>
+			<family>XITS Math</family> <!-- Khaled Hosny -->
+			<family>STIX Two Math</family> <!-- AMS -->
+			<family>Cambria Math</family> <!-- Microsoft -->
+			<family>Latin Modern Math</family> <!-- TeX -->
+			<family>Minion Math</family> <!-- Adobe -->
+			<family>Lucida Math</family> <!-- Adobe -->
+			<family>Asana Math</family>
+		</prefer>
+	</alias>
+
+</fontconfig>

data/vendor/local/etc/fonts/conf.d/60-latin.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 preferable fonts for Latin</description>
 	<alias>
 		<family>serif</family>
 		<prefer>

data/vendor/local/etc/fonts/conf.d/65-fonts-persian.conf

@@ -31,6 +31,10 @@
     2008	Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
   -->
 <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>
+
 
 
 <!-- Deprecated fonts are discouraged -->

data/vendor/local/etc/fonts/conf.d/65-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 preferable fonts for non-Latin</description>
 	<alias>
 		<family>serif</family>
 		<prefer>
@@ -96,9 +101,8 @@
 			<family>Hapax Berbère</family> <!-- tifinagh -->
 			<family>MS Gothic</family> <!-- han (ja) -->
 			<family>UmePlus P Gothic</family> <!-- han (ja) -->
-			<!-- chinese fonts are actually serifed -->
-			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
-			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>Microsoft YaHei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>Microsoft JhengHei</family> <!-- han (zh-tw) -->
 			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
 			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
 			<family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->

data/vendor/local/etc/fonts/conf.d/69-unifont.conf

@@ -1,6 +1,10 @@
 <?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>
+
 	<alias>
 		<family>serif</family>
 		<prefer>

data/vendor/local/etc/fonts/conf.d/80-delicious.conf

@@ -1,6 +1,10 @@
 <?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>
+
 <!-- Fix-ups for Delicious family -->
 
 <!-- Delicious 'heavy' variant says its Medium weight -->

data/vendor/local/etc/fonts/conf.d/90-synthetic.conf

@@ -1,6 +1,10 @@
 <?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>
+
 <!-- 
  Artificial oblique for fonts without an italic or oblique version
  -->
@@ -40,11 +44,11 @@
 	<match target="font">
 		<!-- check to see if the font is just regular -->
 		<test name="weight" compare="less_eq">
-			<const>medium</const>
+			<const>regular</const>
 		</test>
 		<!-- check to see if the pattern requests bold -->
-		<test target="pattern" name="weight" compare="more">
-			<const>medium</const>
+		<test target="pattern" name="weight" compare="more_eq">
+			<const>bold</const>
 		</test>
 		<!--
 		  set the embolden flag

data/vendor/local/etc/fonts/fonts.conf

@@ -2,6 +2,11 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/fonts.conf file to configure system font access -->
 <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>Default configuration file</description>
 
 <!--
 	DO NOT EDIT THIS FILE.

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

@@ -33,7 +33,6 @@
 /*#undef CAIRO_HAS_QUARTZ_FONT */
 /*#undef CAIRO_HAS_QUARTZ_IMAGE_SURFACE */
 /*#undef CAIRO_HAS_QUARTZ_SURFACE */
-/*#undef CAIRO_HAS_SKIA_SURFACE */
 /*#undef CAIRO_HAS_TEE_SURFACE */
 /*#undef CAIRO_HAS_VG_SURFACE */
 /*#undef CAIRO_HAS_WGL_FUNCTIONS */

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

@@ -54,7 +54,7 @@ typedef enum _cairo_svg_version {
 } cairo_svg_version_t;
 
 /**
- * cairo_svg_version_t:
+ * cairo_svg_unit_t:
  *
  * @CAIRO_SVG_UNIT_USER: User unit, a value in the current coordinate system.
  *   If used in the root element for the initial coordinate systems it

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 10
+#define CAIRO_VERSION_MICRO 12
 
 #endif

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

@@ -398,7 +398,7 @@ typedef enum _cairo_content {
  * @CAIRO_FORMAT_A1: each pixel is a 1-bit quantity holding
  *   an alpha value. Pixels are packed together into 32-bit
  *   quantities. The ordering of the bits matches the
- *   endianess of the platform. On a big-endian machine, the
+ *   endianness of the platform. On a big-endian machine, the
  *   first pixel is in the uppermost bit, on a little-endian
  *   machine the first pixel is in the least-significant bit. (Since 1.0)
  * @CAIRO_FORMAT_RGB16_565: each pixel is a 16-bit quantity
@@ -1430,6 +1430,13 @@ cairo_font_options_set_hint_metrics (cairo_font_options_t *options,
 cairo_public cairo_hint_metrics_t
 cairo_font_options_get_hint_metrics (const cairo_font_options_t *options);
 
+cairo_public const char *
+cairo_font_options_get_variations (cairo_font_options_t *options);
+
+cairo_public void
+cairo_font_options_set_variations (cairo_font_options_t *options,
+                                   const char           *variations);
+
 /* This interface is for dealing with text as text, not caring about the
    font object inside the the cairo_t. */
 

data/vendor/local/include/fontconfig/fcfreetype.h

@@ -51,7 +51,7 @@ FcPatternAddFTFace (FcPattern *p, const char *object, const FT_Face f);
 FcPublic FcPattern *
 FcFreeTypeQueryFace (const FT_Face  face,
 		     const FcChar8  *file,
-		     int	    id,
+		     unsigned int   id,
 		     FcBlanks	    *blanks);
 
 _FCFUNCPROTOEND