[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 conf.d/45-generic.conf |    4 ++++
 conf.d/60-generic.conf |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 65087ac7ce4cc5f2109967c1380b474955dcb590
Author: Jan Tojnar <jtojnar at gmail.com>
Date:   Thu Aug 29 02:11:15 2019 +0200

    conf: Add JoyPixels emoji font
    
    It is a successor of EmojiOne.
    
    https://www.joypixels.com/

diff --git a/conf.d/45-generic.conf b/conf.d/45-generic.conf
index e8d1978..26f2abd 100644
--- a/conf.d/45-generic.conf
+++ b/conf.d/45-generic.conf
@@ -38,6 +38,10 @@
 		<default><family>emoji</family></default>
 	</alias>
 	<alias binding="same">
+		<family>JoyPixels</family>
+		<default><family>emoji</family></default>
+	</alias>
+	<alias binding="same">
 		<family>Emoji One</family>
 		<default><family>emoji</family></default>
 	</alias>
diff --git a/conf.d/60-generic.conf b/conf.d/60-generic.conf
index be7b52b..072dddb 100644
--- a/conf.d/60-generic.conf
+++ b/conf.d/60-generic.conf
@@ -42,6 +42,7 @@
 			<family>EmojiOne Mozilla</family> <!-- Mozilla -->
 			<!-- Third-Party fonts -->
 			<family>Emoji Two</family>
+			<family>JoyPixels</family>
 			<family>Emoji One</family>
 			<!-- Non-color -->
 			<family>Noto Emoji</family> <!-- Google -->