Dominique Leuenberger 2016-09-26 10:34:46 +00:00 committed by Git OBS Bridge
commit 66f85aaf76
4 changed files with 280 additions and 2 deletions

View File

@ -228,6 +228,10 @@
<family>Cousine</family>
<default><family>monospace</family></default>
</alias>
<alias>
<family>Oxygen Mono</family>
<default><family>monospace</family></default>
</alias>
<!-- ************************************************************ -->
<!-- Font replacements and fallbacks -->

View File

@ -0,0 +1,263 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!--
Set language-specific fonts to be preferred when the standard aliases
"serif", "sans-serif" and "monospace" are used.
-->
<!-- Simplified Chinese -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test qual="any" name="lang" compare="eq">
<string>zh-cn</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-cn</string>
</test>
<edit name="family" mode="prepend">
<string>AR PL UMing CN</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-cn</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-sg</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK SC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-sg</string>
</test>
<edit name="family" mode="prepend">
<string>AR PL UMing CN</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-sg</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK SC</string>
</edit>
</match>
<!-- Traditional Chinese -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-tw</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-tw</string>
</test>
<edit name="family" mode="prepend">
<string>AR PL UMing TW</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-tw</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-hk</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-hk</string>
</test>
<edit name="family" mode="prepend">
<string>AR PL UMing HK</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-hk</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-mo</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK TC</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>zh-mo</string>
</test>
<edit name="family" mode="prepend">
<string>CMEXSong</string>
<string>AR PL UMing HK</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>zh-mo</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK TC</string>
</edit>
</match>
<!-- Korean -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>ko</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans CJK KR</string>
<string>NanumGothic</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>ko</string>
</test>
<edit name="family" mode="prepend">
<string>NanumMyeongjo</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>ko</string>
</test>
<edit name="family" mode="prepend">
<string>Noto Sans Mono CJK KR</string>
<string>NanumGothicCoding</string>
</edit>
</match>
<!-- Japanese -->
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>sans-serif</string>
</test>
<test name="lang" compare="eq">
<string>ja</string>
</test>
<edit name="family" mode="prepend">
<string>IPAPGothic</string>
<string>IPAexGothic</string>
<string>M+ 1c</string>
<string>M+ 1p</string>
<string>VL PGothic</string>
<string>Noto Sans CJK JP</string>
<string>IPAGothic</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>serif</string>
</test>
<test name="lang" compare="eq">
<string>ja</string>
</test>
<edit name="family" mode="prepend">
<string>IPAPMincho</string>
<string>IPAexMincho</string>
<string>IPAMincho</string>
</edit>
</match>
<match target="pattern">
<test qual="any" name="family" compare="eq">
<string>monospace</string>
</test>
<test name="lang" compare="eq">
<string>ja</string>
</test>
<edit name="family" mode="prepend">
<string>IPAGothic</string>
<string>M+ 1m</string>
<string>VL Gothic</string>
<string>Noto Sans Mono CJK JP</string>
</edit>
</match>
</fontconfig>

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Sep 21 13:35:53 UTC 2016 - ftake@geeko.jp
- version 20160921
* add 59-family-prefer-lang-specific.conf to specify prefered
family for each language
* fix Noto Sans CJK is used for serif alias (boo#998301)
* assign monospace to default of Oxygen Mono
-------------------------------------------------------------------
Wed Sep 14 15:15:11 UTC 2016 - pgajdos@suse.com

View File

@ -19,7 +19,7 @@
%define infinality_srcver 1-20130104_1
%define infinality_name fontconfig-infinality
Name: fonts-config
Version: 20160914
Version: 20160921
Release: 0
Summary: Configures Fonts for X Windows and other applications
License: GPL-2.0+ and MIT
@ -38,6 +38,7 @@ Source9: 49-family-default.conf
Source10: 60-family-prefer.conf
Source11: 70-reject.conf
Source12: 31-metric-aliases-bw.conf
Source13: 59-family-prefer-lang-specific.conf
Patch0: fontconfig-infinality-generate-tt-groups.patch
BuildRequires: fontconfig
BuildRequires: fontpackages-devel
@ -75,7 +76,7 @@ cp %{SOURCE6} 10-rendering-options.conf
cp %{SOURCE6} 58-family-prefer-local.conf
mv infinality/conf.src/80-selective-rendering-inf-win-lin.conf 13-selective-rendering.conf
mv infinality/conf.src/21-aliases-wine-linux.conf 61-wine-aliases.conf
cp -a %{SOURCE5} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} .
cp -a %{SOURCE5} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
%install
mkdir -p %{buildroot}/sbin/conf.d
@ -112,6 +113,7 @@ for conf in 10-group-tt-hinted-fonts.conf \
13-selective-rendering-ipa.conf \
31-metric-aliases-bw.conf \
49-family-default.conf \
59-family-prefer-lang-specific.conf \
60-family-prefer.conf \
61-wine-aliases.conf \
70-reject.conf; do