[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 conf.d/45-generic.conf |   67 +++++++++++++++++++++++++++++++++++++++++++++++++
 conf.d/60-generic.conf |   37 +++++++++++++++++++++++++++
 conf.d/Makefile.am     |    4 ++
 3 files changed, 108 insertions(+)

New commits:
commit d7f3437ade668c60a7e31f93669b73680be6512a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 31 17:17:16 2017 +0100

    Add generic family matching for "emoji" and "math"
    
    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=94551

diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf
new file mode 100644
index 0000000..d3f6277
--- /dev/null
+++ b/conf.d/45-generic.conf
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Keep in sync with 60-generic.conf -->
+
+<!-- Emoji -->
+	<alias binding="same">
+		<family>EmojiTwo</family>
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>EmojiOne</family>
+		<default><family>emoji</family></default>
+	</alias>
+	<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>Noto Emoji</family> <!-- Google -->
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
+		<family>Android Emoji</family> <!-- Google -->
+		<default><family>emoji</family></default>
+	</alias>
+
+<!-- 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>
+
+</fontconfig>
diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf
new file mode 100644
index 0000000..24b7466
--- /dev/null
+++ b/conf.d/60-generic.conf
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Keep in sync with 45-generic.conf -->
+
+<!-- Emoji -->
+	<alias binding="same">
+		<family>emoji</family>
+		<prefer>
+			<family>EmojiTwo</family>
+			<family>EmojiOne</family>
+			<!-- System fonts -->
+			<family>Noto Color Emoji</family> <!-- Google -->
+			<family>Apple Color Emoji</family> <!-- Apple -->
+			<family>Segoe UI Emoji</family> <!-- Microsoft -->
+			<!-- 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>
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index ac68cd1..fd50a5d 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -32,10 +32,12 @@ CONF_LINKS = \
 	30-urw-aliases.conf \
 	30-metric-aliases.conf \
 	40-nonlatin.conf \
+	45-generic.conf \
 	45-latin.conf \
 	49-sansserif.conf \
 	50-user.conf \
 	51-local.conf \
+	60-generic.conf \
 	60-latin.conf \
 	65-fonts-persian.conf \
 	65-nonlatin.conf \
@@ -71,10 +73,12 @@ template_DATA =				\
 	30-urw-aliases.conf		\
 	30-metric-aliases.conf		\
 	40-nonlatin.conf		\
+	45-generic.conf			\
 	45-latin.conf			\
 	49-sansserif.conf		\
 	50-user.conf			\
 	51-local.conf			\
+	60-generic.conf			\
 	60-latin.conf			\
 	65-fonts-persian.conf		\
 	65-khmer.conf			\