diff --git a/49-family-default.conf b/49-family-default.conf index a503ac2..3e15396 100644 --- a/49-family-default.conf +++ b/49-family-default.conf @@ -228,6 +228,10 @@ Cousine monospace + + Oxygen Mono + monospace + diff --git a/59-family-prefer-lang-specific.conf b/59-family-prefer-lang-specific.conf new file mode 100644 index 0000000..9759ea8 --- /dev/null +++ b/59-family-prefer-lang-specific.conf @@ -0,0 +1,263 @@ + + + + + + + + + + sans-serif + + + zh-cn + + + Noto Sans CJK SC + + + + + serif + + + zh-cn + + + AR PL UMing CN + + + + + monospace + + + zh-cn + + + Noto Sans Mono CJK SC + + + + + sans-serif + + + zh-sg + + + Noto Sans CJK SC + + + + + serif + + + zh-sg + + + AR PL UMing CN + + + + + monospace + + + zh-sg + + + Noto Sans Mono CJK SC + + + + + + + sans-serif + + + zh-tw + + + Noto Sans CJK TC + + + + + serif + + + zh-tw + + + AR PL UMing TW + + + + + monospace + + + zh-tw + + + Noto Sans Mono CJK TC + + + + + sans-serif + + + zh-hk + + + Noto Sans CJK TC + + + + + serif + + + zh-hk + + + AR PL UMing HK + + + + + monospace + + + zh-hk + + + Noto Sans Mono CJK TC + + + + + sans-serif + + + zh-mo + + + Noto Sans CJK TC + + + + + serif + + + zh-mo + + + CMEXSong + AR PL UMing HK + + + + + monospace + + + zh-mo + + + Noto Sans Mono CJK TC + + + + + + + sans-serif + + + ko + + + Noto Sans CJK KR + NanumGothic + + + + + serif + + + ko + + + NanumMyeongjo + + + + + monospace + + + ko + + + Noto Sans Mono CJK KR + NanumGothicCoding + + + + + + + sans-serif + + + ja + + + IPAPGothic + IPAexGothic + M+ 1c + M+ 1p + VL PGothic + Noto Sans CJK JP + IPAGothic + + + + + serif + + + ja + + + IPAPMincho + IPAexMincho + IPAMincho + + + + + monospace + + + ja + + + IPAGothic + M+ 1m + VL Gothic + Noto Sans Mono CJK JP + + + + diff --git a/fonts-config.changes b/fonts-config.changes index be6adc5..2ca08de 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -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 diff --git a/fonts-config.spec b/fonts-config.spec index 201dea3..61b894e 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -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