[arch-commits] Commit in ttf-joypixels/trunk (3 files)

[Maxim Baz]

    Date: Tuesday, February 25, 2020 @ 18:49:25
  Author: maximbaz
Revision: 581837

ttf-joypixels: update install notice and example conf, FS#63815

Modified:
  ttf-joypixels/trunk/75-joypixels.conf
  ttf-joypixels/trunk/PKGBUILD
  ttf-joypixels/trunk/ttf-joypixels.install

-----------------------+
 75-joypixels.conf     |   39 ++++++++++++++++++++++++---------------
 PKGBUILD              |    4 ++--
 ttf-joypixels.install |    3 ++-
 3 files changed, 28 insertions(+), 18 deletions(-)

Modified: 75-joypixels.conf
===================================================================
--- 75-joypixels.conf	2020-02-25 18:48:57 UTC (rev 581836)
+++ 75-joypixels.conf	2020-02-25 18:49:25 UTC (rev 581837)
@@ -26,8 +26,8 @@
     This adds JoyPixels as a final fallback font for the default font families.
     In this case, JoyPixels 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.
+    Note that usually other fonts will have some glyphs available (e.g. Symbola or DejaVu fonts),
+    causing some emojis to be rendered in black-and-white.
     -->
     <match target="pattern">
         <test name="family"><string>sans</string></test>
@@ -50,21 +50,28 @@
     </match>
 
     <!--
-    It seems Symbola is often selected as a fallback font before JoyPixels.
-    This will try to remove Symbola from the list of fallback fonts.
+    If other fonts contain emoji glyphs, they could interfere and make some emojis rendered in wrong font (often in black-and-white).
+    For example, DejaVu Sans contains black-and-white emojis, which we can remove using the following trick:
     -->
-    <selectfont>
-        <rejectfont>
-            <pattern>
-                <patelt name="family">
-                    <string>Symbola</string>
-                </patelt>
-            </pattern>
-        </rejectfont>
-    </selectfont>
+    <match target="scan">
+        <test name="family" compare="contains">
+            <string>DejaVu</string>
+        </test>
+        <edit name="charset" mode="assign" binding="same">
+            <minus>
+                <name>charset</name>
+                <charset>
+                    <range>
+                        <int>0x1f600</int>
+                        <int>0x1f640</int>
+                    </range>
+                </charset>
+            </minus>
+        </edit>
+    </match>
 
     <!--
-    Recognize alternative ways of writing JoyPixels family name.
+    Recognize legacy ways of writing JoyPixels family name.
     -->
     <match target="pattern">
         <test qual="any" name="family"><string>EmojiOne</string></test>
@@ -89,8 +96,10 @@
     <!--
     Use JoyPixels 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.
+    It is quite common that websites would only request Apple and Google emoji fonts.
     These aliases will make JoyPixels be selected in such cases to provide good-looking emojis.
+
+    This obviously conflicts with other emoji fonts if you have them installed.
     -->
     <match target="pattern">
         <test qual="any" name="family"><string>Apple Color Emoji</string></test>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-25 18:48:57 UTC (rev 581836)
+++ PKGBUILD	2020-02-25 18:49:25 UTC (rev 581837)
@@ -2,7 +2,7 @@
 
 pkgname=ttf-joypixels
 pkgver=5.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Emoji as a Service (formerly EmojiOne)'
 url='https://www.joypixels.com/download'
 arch=('any')
@@ -17,7 +17,7 @@
         "license-free-${pkgver}-${pkgrel}.pdf::https://cdn.joypixels.com/arch-linux/license/free-license.pdf"
         "license-appendix-${pkgver}-${pkgrel}.pdf::https://cdn.joypixels.com/arch-linux/appendix/joypixels-license-appendix.pdf")
 sha256sums=('4b463fc80a6cd755baf69a33d9cdf12525fd02e81ec66f366736db0928287970'
-            '3721e8b04edf6653b8c6fa8320b3017741e2404f2ec57b689a6a1e221e01ca30'
+            '99eccc311e014407fbe82b1474533ae48635bb5505e7e06abad845ab62a024ff'
             'c4a17634bfebd5c1b74d9a02a1d981f8fcf6b1737162696cad7bfab161d8dbb3'
             '05084e4ddbbb0c241bb0ff4e307853a9e6236fa1c617b7cba44af31b6bfc5e2d')
 

Modified: ttf-joypixels.install
===================================================================
--- ttf-joypixels.install	2020-02-25 18:48:57 UTC (rev 581836)
+++ ttf-joypixels.install	2020-02-25 18:49:25 UTC (rev 581837)
@@ -1,7 +1,8 @@
 post_install() {
     echo
     echo "  See /etc/fonts/conf.avail/75-joypixels.conf for how to enforce rendering emojis via JoyPixels"
-    echo "  It conflicts with other fonts, so either symlink it to /etc/fonts/conf.d/ or copy and modify as needed."
+    echo "  It contains various techniques, some of which can cause issues like rendering numbers as emojis"
+    echo "  Copy the file to /etc/fonts/conf.d/ and modify as needed to make it work for your own setup."
     echo
 }