From f9c4085982f32480df1d953cd1a275155634df06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?=
 <zhangyanghaha0407@outlook.com>
Date: Fri, 28 Aug 2026 23:12:03 -0400
Subject: [PATCH] Make CJK lang rules survive 50-omarchy.conf's generic-family
 assign (fixes #4)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Kb7vDj6PHwymeDeSUUk1eX
---
 cn/fontconfig/64-omarchycn-cjk.conf | 29 +++++++++++++++++++++++++++++
 cn/migrations/1787973074.sh         |  8 ++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 cn/migrations/1787973074.sh

diff --git a/cn/fontconfig/64-omarchycn-cjk.conf b/cn/fontconfig/64-omarchycn-cjk.conf
index 4be5c361..eca02e27 100644
--- a/cn/fontconfig/64-omarchycn-cjk.conf
+++ b/cn/fontconfig/64-omarchycn-cjk.conf
@@ -1,17 +1,31 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
+  <!-- 每条 lang 规则成对出现：50-omarchy.conf 先以 assign 把 generic 名整体替换成
+       Liberation Sans/Serif 与 JetBrainsMono Nerd Font（且先于本文件加载），
+       所以除 generic 名外还必须测试替换后的具体家族，否则规则静默失效（Issue #4） -->
+
   <!-- 日文/韩文标签内容保持原生字形（仅约束 generic 请求，避免波及未标签路径） -->
   <match target="pattern">
     <test name="lang" compare="contains"><string>ja</string></test>
     <test name="family"><string>sans-serif</string></test>
     <edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK JP</string></edit>
   </match>
+  <match target="pattern">
+    <test name="lang" compare="contains"><string>ja</string></test>
+    <test name="family"><string>Liberation Sans</string></test>
+    <edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK JP</string></edit>
+  </match>
   <match target="pattern">
     <test name="lang" compare="contains"><string>ko</string></test>
     <test name="family"><string>sans-serif</string></test>
     <edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK KR</string></edit>
   </match>
+  <match target="pattern">
+    <test name="lang" compare="contains"><string>ko</string></test>
+    <test name="family"><string>Liberation Sans</string></test>
+    <edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK KR</string></edit>
+  </match>
 
   <!-- 简体中文内容强制简体字形 -->
   <match target="pattern">
@@ -19,16 +33,31 @@
     <test name="family"><string>sans-serif</string></test>
     <edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK SC</string></edit>
   </match>
+  <match target="pattern">
+    <test name="lang" compare="contains"><string>zh-cn</string></test>
+    <test name="family"><string>Liberation Sans</string></test>
+    <edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK SC</string></edit>
+  </match>
   <match target="pattern">
     <test name="lang" compare="contains"><string>zh-cn</string></test>
     <test name="family"><string>serif</string></test>
     <edit name="family" mode="prepend" binding="strong"><string>Noto Serif CJK SC</string></edit>
   </match>
+  <match target="pattern">
+    <test name="lang" compare="contains"><string>zh-cn</string></test>
+    <test name="family"><string>Liberation Serif</string></test>
+    <edit name="family" mode="prepend" binding="strong"><string>Noto Serif CJK SC</string></edit>
+  </match>
   <match target="pattern">
     <test name="lang" compare="contains"><string>zh-cn</string></test>
     <test name="family"><string>monospace</string></test>
     <edit name="family" mode="prepend" binding="strong"><string>Noto Sans Mono CJK SC</string></edit>
   </match>
+  <match target="pattern">
+    <test name="lang" compare="contains"><string>zh-cn</string></test>
+    <test name="family"><string>JetBrainsMono Nerd Font</string></test>
+    <edit name="family" mode="prepend" binding="strong"><string>Noto Sans Mono CJK SC</string></edit>
+  </match>
 
   <!-- 无语言标签的任意字体请求：汉字回退到 SC 而非 JP（Chromium/Electron 常见路径） -->
   <match target="pattern">
diff --git a/cn/migrations/1787973074.sh b/cn/migrations/1787973074.sh
new file mode 100644
index 00000000..a7448f26
--- /dev/null
+++ b/cn/migrations/1787973074.sh
@@ -0,0 +1,8 @@
+echo "Refresh the CJK fontconfig priority so zh-cn rules survive 50-omarchy.conf (Issue #4)"
+
+# Only users who applied it before carry the broken copy
+conf="$HOME/.config/fontconfig/conf.d/64-omarchycn-cjk.conf"
+if [[ -f $conf ]]; then
+  cp "$OMARCHY_PATH/cn/fontconfig/64-omarchycn-cjk.conf" "$conf"
+  fc-cache -f > /dev/null
+fi