From 523c04bc9fd09b71ca7a3abbeeee1b9470c27e00 Mon Sep 17 00:00:00 2001
From: rydesun <rydesun@gmail.com>
Date: Wed, 10 Feb 2021 19:09:00 +0800
Subject: [PATCH] Update fontconfig: merge config for source han sans

---
 .../51-language-source-han-sans-hw.conf       | 53 -------------------
 .../conf.d/51-language-source-han-sans.conf   | 48 +++++++++++++++++
 .../53-override-source-han-sans-hw.conf       | 17 ------
 .../conf.d/53-override-source-han-sans.conf   | 12 +++++
 4 files changed, 60 insertions(+), 70 deletions(-)
 delete mode 100644 .config/fontconfig/conf.d/51-language-source-han-sans-hw.conf
 delete mode 100644 .config/fontconfig/conf.d/53-override-source-han-sans-hw.conf

diff --git a/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf b/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf
deleted file mode 100644
index d76c320..0000000
--- a/.config/fontconfig/conf.d/51-language-source-han-sans-hw.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
-
-  <match target="pattern">
-    <test name="lang">
-      <string>zh-HK</string>
-    </test>
-    <test name="family">
-      <string>Source Han Sans HW SC</string>
-    </test>
-    <edit name="family" binding="strong">
-      <string>Source Han Sans HW HC</string>
-    </edit>
-  </match>
-
-  <match target="pattern">
-    <test name="lang">
-      <string>zh-TW</string>
-    </test>
-    <test name="family">
-      <string>Source Han Sans HW SC</string>
-    </test>
-    <edit name="family" binding="strong">
-      <string>Source Han Sans HW TC</string>
-    </edit>
-  </match>
-
-  <match target="pattern">
-    <test name="lang">
-      <string>ja</string>
-    </test>
-    <test name="family">
-      <string>Source Han Sans HW SC</string>
-    </test>
-    <edit name="family" binding="strong">
-      <string>Source Han Sans HW</string>
-    </edit>
-  </match>
-
-  <match target="pattern">
-    <test name="lang">
-      <string>ko</string>
-    </test>
-    <test name="family">
-      <string>Source Han Sans HW SC</string>
-    </test>
-    <edit name="family" binding="strong">
-      <string>Source Han Sans HW K</string>
-    </edit>
-  </match>
-
-</fontconfig>
diff --git a/.config/fontconfig/conf.d/51-language-source-han-sans.conf b/.config/fontconfig/conf.d/51-language-source-han-sans.conf
index aa023de..b82fb4e 100644
--- a/.config/fontconfig/conf.d/51-language-source-han-sans.conf
+++ b/.config/fontconfig/conf.d/51-language-source-han-sans.conf
@@ -51,4 +51,52 @@
     </edit>
   </match>
 
+  <match target="pattern">
+    <test name="lang">
+      <string>zh-HK</string>
+    </test>
+    <test name="family">
+      <string>Source Han Sans HW SC</string>
+    </test>
+    <edit name="family" binding="strong">
+      <string>Source Han Sans HW HC</string>
+    </edit>
+  </match>
+
+  <match target="pattern">
+    <test name="lang">
+      <string>zh-TW</string>
+    </test>
+    <test name="family">
+      <string>Source Han Sans HW SC</string>
+    </test>
+    <edit name="family" binding="strong">
+      <string>Source Han Sans HW TC</string>
+    </edit>
+  </match>
+
+  <match target="pattern">
+    <test name="lang">
+      <string>ja</string>
+    </test>
+    <test name="family">
+      <string>Source Han Sans HW SC</string>
+    </test>
+    <edit name="family" binding="strong">
+      <string>Source Han Sans HW</string>
+    </edit>
+  </match>
+
+  <match target="pattern">
+    <test name="lang">
+      <string>ko</string>
+    </test>
+    <test name="family">
+      <string>Source Han Sans HW SC</string>
+    </test>
+    <edit name="family" binding="strong">
+      <string>Source Han Sans HW K</string>
+    </edit>
+  </match>
+
 </fontconfig>
diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf b/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf
deleted file mode 100644
index 103e213..0000000
--- a/.config/fontconfig/conf.d/53-override-source-han-sans-hw.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
-
-  <match target="pattern">
-    <test name="prgname" compare="not_eq">
-      <string>chrome</string>
-    </test>
-    <test name="family" compare="contains">
-        <string>Source Han Sans HW</string>
-    </test>
-    <edit name="family" mode="prepend" binding="strong">
-      <string>Iosevka Custom</string>
-    </edit>
-  </match>
-
-</fontconfig>
diff --git a/.config/fontconfig/conf.d/53-override-source-han-sans.conf b/.config/fontconfig/conf.d/53-override-source-han-sans.conf
index 10fcce1..7776116 100644
--- a/.config/fontconfig/conf.d/53-override-source-han-sans.conf
+++ b/.config/fontconfig/conf.d/53-override-source-han-sans.conf
@@ -17,4 +17,16 @@
     </edit>
   </match>
 
+  <match target="pattern">
+    <test name="prgname" compare="not_eq">
+      <string>chrome</string>
+    </test>
+    <test name="family" compare="contains">
+        <string>Source Han Sans HW</string>
+    </test>
+    <edit name="family" mode="prepend" binding="strong">
+      <string>Iosevka Custom</string>
+    </edit>
+  </match>
+
 </fontconfig>