EmojiOne: big update (#1)

5 files changed, 168 insertions, 118 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6858c9e4f84..0983e49908c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = ttf-emojione
 	pkgdesc = Official colorful EmojiOne font
-	pkgver = 4.0
+	pkgver = 4.0.1
 	pkgrel = 1
 	url = https://github.com/emojione/emojione-assets
+	install = ttf-emojione.install
 	arch = any
 	license = custom
 	depends = fontconfig
 	provides = ttf-emoji
-	conflicts = ttf-emoji
-	conflicts = noto-fonts-emoji
-	conflicts = ttf-emojione-color
-	conflicts = ttf-twemoji
 	replaces = emojione-fonts
-	source = emojione-android-4.0.ttf::https://github.com/emojione/emojione-assets/releases/download/4.0/emojione-android.ttf
-	source = 70-emojione-color.conf
+	source = emojione-android-4.0.1.ttf::https://github.com/emojione/emojione-assets/releases/download/4.0.1/emojione-android.ttf
+	source = 75-emojione.conf
 	source = license-free.pdf
-	sha256sums = 1d53b160fb9b9bdb5fceea110f4cc2c1e26be7d7184a6f17c81b56527574f8a8
-	sha256sums = 2489d0211cb2c8b119df8d69fdd4b12a5ebc9f28c47853f7af24e646f69e9df6
+	sha256sums = 8955dd64a7d1db5d476392c4bfc70e155c5d2caf74a48539b08a818830ebbafb
+	sha256sums = ed7cc8c8e8adc03adb7f54211376f2a8e230a2aafe153ef7f9c26e2ea7bb0f63
 	sha256sums = 2898feeb41e03acd1a655ba5ddad0072aac83a014ee184fdcdebc7a66d353650
 
 pkgname = ttf-emojione
diff --git a/70-emojione-color.conf b/70-emojione-color.conf
deleted file mode 100644
index d1caed2dfad5..000000000000
--- a/70-emojione-color.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-
-	<!-- Add emoji generic family -->
-	<match target="pattern">
-		<test qual="any" name="family"><string>emoji</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<!-- Append emoji font to the default families -->
-	<match target="pattern">
-		<test name="family"><string>sans</string></test>
-		<edit name="family" mode="append"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test name="family"><string>serif</string></test>
-		<edit name="family" mode="append"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test name="family"><string>sans-serif</string></test>
-		<edit name="family" mode="append"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<!-- Aliases for the other emoji fonts -->
-	<match target="pattern">
-		<test qual="any" name="family"><string>Apple Color Emoji</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>Segoe UI Emoji</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>Segoe UI Symbol</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>EmojiOne</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>Emoji One</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>EmojiOne Color</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>Android Emoji</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>NotoColorEmoji</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>Noto Emoji</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>Twemoji</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>EmojiSymbols</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<match target="pattern">
-		<test qual="any" name="family"><string>Symbola</string></test>
-		<edit name="family" mode="assign" binding="same"><string>Noto Color Emoji</string></edit>
-	</match>
-
-	<!-- Do not allow any app to fallback to Symbola, ever -->
-	<selectfont>
-		<rejectfont>
-			<pattern>
-				<patelt name="family">
-					<string>Symbola</string>
-				</patelt>
-			</pattern>
-		</rejectfont>
-	</selectfont>
-</fontconfig>
diff --git a/75-emojione.conf b/75-emojione.conf
new file mode 100644
index 000000000000..1524c287e23d
--- /dev/null
+++ b/75-emojione.conf
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+    <!--
+    This config attempts to guarantee that colorful emojis from EmojiOne will be displayed,
+    no matter how badly the apps and websites are written.
+
+    It uses a few different tricks, some of which introduce conflicts with other emoji fonts.
+
+    If you wish to simultaneously use multiple emoji fonts, make sure to adapt this config.
+    -->
+
+    <!--
+    This adds a generic family 'emoji',
+    aimed for apps that don't specify specific font family for rendering emojis.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <!--
+    This adds EmojiOne as a final fallback font for the default font families.
+    In this case, EmojiOne will be selected if and only if no other font can provide a given symbol.
+
+    Note, usually other fonts will have some glyphs available (especilly Symbola font),
+    causing some emojis to be black&white and ugly.
+    -->
+    <match target="pattern">
+        <test name="family"><string>sans</string></test>
+        <edit name="family" mode="append"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>serif</string></test>
+        <edit name="family" mode="append"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>sans-serif</string></test>
+        <edit name="family" mode="append"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>monospace</string></test>
+        <edit name="family" mode="append"><string>EmojiOne</string></edit>
+    </match>
+
+    <!--
+    It seems Symbola is often selected as a fallback font before EmojiOne.
+    This will try to remove Symbola from the list of fallback fonts.
+    -->
+    <selectfont>
+        <rejectfont>
+            <pattern>
+                <patelt name="family">
+                    <string>Symbola</string>
+                </patelt>
+            </pattern>
+        </rejectfont>
+    </selectfont>
+
+    <!--
+    Recognize alternative ways of writing EmojiOne family name.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>Emoji One</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiOne Color</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <!--
+    Use EmojiOne when other popular fonts are being specifically requested.
+
+    It is quite common that websites would only request Apple and Google emoji fonts, and then fallback to b&w Symbola.
+    These aliases will make EmojiOne be selected in such cases to provide good-looking emojis.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>Apple Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Segoe UI Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Segoe UI Symbol</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Noto Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>NotoColorEmoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Android Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Noto Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Twemoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiSymbols</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Symbola</string></test>
+        <edit name="family" mode="assign" binding="same"><string>EmojiOne</string></edit>
+    </match>
+</fontconfig>
diff --git a/PKGBUILD b/PKGBUILD
index e542b8a912dc..839fa80b1577 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,27 @@
 # Maintainer: Mohammadreza Abdollahzadeh <morealaz at gmail dot com>
 
 pkgname=ttf-emojione
-pkgver=4.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="Official colorful EmojiOne font"
 url="https://github.com/emojione/emojione-assets"
 arch=(any)
 license=(custom)
 depends=('fontconfig')
-conflicts=('ttf-emoji' 'noto-fonts-emoji' 'ttf-emojione-color' 'ttf-twemoji')
 provides=('ttf-emoji')
 replaces=('emojione-fonts')
+install="${pkgname}.install"
 source=("emojione-android-${pkgver}.ttf::https://github.com/emojione/emojione-assets/releases/download/${pkgver}/emojione-android.ttf"
-        "70-emojione-color.conf"
+        "75-emojione.conf"
         "license-free.pdf")
-sha256sums=('1d53b160fb9b9bdb5fceea110f4cc2c1e26be7d7184a6f17c81b56527574f8a8'
-            '2489d0211cb2c8b119df8d69fdd4b12a5ebc9f28c47853f7af24e646f69e9df6'
+sha256sums=('8955dd64a7d1db5d476392c4bfc70e155c5d2caf74a48539b08a818830ebbafb'
+            'ed7cc8c8e8adc03adb7f54211376f2a8e230a2aafe153ef7f9c26e2ea7bb0f63'
             '2898feeb41e03acd1a655ba5ddad0072aac83a014ee184fdcdebc7a66d353650')
 
 package() {
-  install -d "${pkgdir}/etc/fonts/"{conf.d,conf.avail}
-  install -Dm644 emojione-android-${pkgver}.ttf "${pkgdir}/usr/share/fonts/emojione/emojione.ttf"
-  install -t "${pkgdir}/etc/fonts/conf.avail/" -m644 70-emojione-color.conf
-  ln -sf ../conf.avail/70-emojione-color.conf ${pkgdir}/etc/fonts/conf.d/70-emojione-color.conf
-  install -Dm644 license-free.pdf "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf"
+    install -Dm644 emojione-android-${pkgver}.ttf "${pkgdir}/usr/share/fonts/emojione/emojione.ttf"
+    install -Dm644 75-emojione.conf "${pkgdir}/etc/fonts/conf.avail/75-emojione.conf"
+    install -Dm644 license-free.pdf "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.pdf"
 }
-# vim:set ts=2 sw=2 et:
+
+# vim:set ts=4 sw=4 et:
diff --git a/ttf-emojione.install b/ttf-emojione.install
new file mode 100644
index 000000000000..37bf536abd3e
--- /dev/null
+++ b/ttf-emojione.install
@@ -0,0 +1,20 @@
+post_install() {
+    echo
+    echo "  To prevent conflicts with other emoji fonts, 75-emojione.conf is not being automatically installed in /etc/fonts/conf.d/"
+    echo
+    echo "  If you don't use other emoji fonts, simply make a symlink:"
+    echo "  # ln -sf ../conf.avail/75-emojione.conf /etc/fonts/conf.d/75-emojione.conf"
+    echo
+    echo "  If you do use other emoji fonts, copy 75-emojione.conf to /etc/fonts/conf.d/ and remove corresponding aliases."
+    echo
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    echo
+    echo "  Make sure to remove /etc/fonts/conf.d/75-emojione.conf if you created it earlier."
+    echo
+}