Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
deepin-default-settings (2024.11.14) unstable; urgency=medium

* release 2024.11.14

-- zhangkun <zhangkun2@uniontech.com> Thu, 14 Nov 2024 16:03:45 +0800

deepin-default-settings (2024.08.13) unstable; urgency=medium

* Using postinst script to process browser icons
Expand Down
3 changes: 0 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ Depends:
python3,
python3-gi,
${misc:Depends},
Pre-Depends:
deepin-home (>= 1.6.0),
coreutils,
Suggests:
binfmt-support,
Conflicts:
Expand Down
80 changes: 56 additions & 24 deletions usr.share.d/fontconfig/conf.avail/55-deepin-default.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,66 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Default serif font -->
<alias binding="strong">
<family>serif</family>
<prefer>
<family>Noto Serif</family>
</prefer>
</alias>
<match target="pattern">
<test qual="any" name="family">
<string>serif</string>
</test>
<edit name="family" mode="prepend">
<string>Source Han Sans SC</string>
</edit>
</match>

<!-- Default sans-serif font -->
<alias binding="strong">
<family>sans-serif</family>
<prefer>
<family>Noto Sans</family>
</prefer>
</alias>
<match target="pattern">
<test qual="any" name="family">
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend">
<string>Source Han Sans SC</string>
</edit>
</match>

<!-- Default monospace font -->
<alias binding="strong">
<family>monospace</family>
<prefer>
<family>Noto Sans Mono</family>
</prefer>
</alias>
<match target="pattern">
<test qual="any" name="family">
<string>monospace</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono</string>
</edit>
</match>

<!--
If the font still has no system-ui, add system-ui for first choise
-->
<match target="pattern">
<test qual="all" name="family" compare="not_eq">
<string>serif</string>
</test>
<test qual="all" name="family" compare="not_eq">
<string>sans-serif</string>
</test>
<test qual="all" name="family" compare="not_eq">
<string>monospace</string>
</test>
<test qual="all" name="family" compare="not_eq">
<string>system-ui</string>
</test>
<edit name="family" mode="append_last">
<string>system-ui</string>
</edit>
</match>

<!-- Default system-ui font -->
<alias binding="strong">
<family>system-ui</family>
<prefer>
<family>Noto Sans</family>
</prefer>
</alias>
<match target="pattern">
<test qual="any" name="family">
<string>system-ui</string>
</test>
<edit name="family" mode="prepend">
<string>Source Han Sans SC</string>
</edit>
</match>
<match target="font">
<edit name="rgba"><const>rgb</const></edit>
</match>
</fontconfig>
6 changes: 3 additions & 3 deletions usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<string>serif</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Serif CJK JP</string>
<string>Source Han Sans SC</string>
</edit>
</match>

Expand All @@ -27,7 +27,7 @@
<string>sans-serif</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Sans CJK JP</string>
<string>Source Han Sans SC</string>
</edit>
</match>

Expand Down Expand Up @@ -58,7 +58,7 @@
<string>system-ui</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Sans CJK JP</string>
<string>Source Han Sans SC</string>
</edit>
</match>
</fontconfig>
6 changes: 3 additions & 3 deletions usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<string>serif</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Serif CJK KR</string>
<string>Source Han Sans SC</string>
</edit>
</match>

Expand All @@ -27,7 +27,7 @@
<string>sans-serif</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Sans CJK KR</string>
<string>Source Han Sans SC</string>
</edit>
</match>

Expand Down Expand Up @@ -58,7 +58,7 @@
<string>system-ui</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Sans CJK KR</string>
<string>Source Han Sans SC</string>
</edit>
</match>
</fontconfig>
37 changes: 25 additions & 12 deletions usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<string>serif</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Serif CJK SC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-hans" or "lang=zh-hans-*" -->
Expand Down Expand Up @@ -49,7 +49,7 @@
<string>serif</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Serif CJK SC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-tw" or "lang=zh-tw-*" -->
Expand All @@ -61,7 +61,7 @@
<string>serif</string>
</test>
<edit name="family" mode="append" binding="strong">
<string>Noto Serif CJK TC</string>
<string>Source Han Sans SC</string>
</edit>
</match>

Expand All @@ -76,7 +76,7 @@
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK SC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-hans" or "lang=zh-hans-*" -->
Expand Down Expand Up @@ -125,7 +125,7 @@
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK SC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-tw" or "lang=zh-tw-*" -->
Expand All @@ -137,7 +137,7 @@
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK TC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-hk" or "lang=zh-hk-*" -->
Expand All @@ -149,7 +149,7 @@
<string>sans-serif</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK HK</string>
<string>Source Han Sans SC</string>
</edit>
</match>

Expand All @@ -170,6 +170,19 @@
</edit>
</match>

<match target="pattern">
<test name="lang">
<string>zh-hk</string>
</test>
<test qual="any" name="family">
<string>monospace</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Mono</string>
<string>Noto Sans Mono</string>
</edit>
</match>

<!-- System UI -->

<!-- "lang=zh" or "lang=zh-*" -->
Expand All @@ -181,7 +194,7 @@
<string>system-ui</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK SC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-hans" or "lang=zh-hans-*" -->
Expand Down Expand Up @@ -230,7 +243,7 @@
<string>system-ui</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK SC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-tw" or "lang=zh-tw-*" -->
Expand All @@ -242,7 +255,7 @@
<string>system-ui</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK TC</string>
<string>Source Han Sans SC</string>
</edit>
</match>
<!-- "lang=zh-hk" or "lang=zh-hk-*" -->
Expand All @@ -254,7 +267,7 @@
<string>system-ui</string>
</test>
<edit name="family" mode="prepend" binding="strong">
<string>Noto Sans CJK HK</string>
<string>Source Han Sans SC</string>
</edit>
</match>
</fontconfig>
</fontconfig>