diff --git a/29-liberation-aliases.conf b/29-liberation-aliases.conf
deleted file mode 100644
index 2f25a29..0000000
--- a/29-liberation-aliases.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
- Times New Roman
- Liberation Serif
-
-
- Thorndale AMT
- Liberation Serif
-
-
-
- Arial
- Liberation Sans
-
-
- Albany AMT
- Liberation Sans
-
-
-
- Courier New
- Liberation Mono
-
-
- Cumberland AMT
- Liberation Mono
-
-
-
diff --git a/fontconfig.changes b/fontconfig.changes
index c61cbc7..02f0fcd 100644
--- a/fontconfig.changes
+++ b/fontconfig.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Sun Jun 3 22:18:41 UTC+8 2012 - hillwood@linuxfans.org
+
+- fix Chinese Mono font.
+
+-------------------------------------------------------------------
+Sat Jun 2 20:47:53 UTC+8 2012 - hillwood@linuxfans.org
+
+- set WenQuanYi Micro He as default Chinese font.
+
+-------------------------------------------------------------------
+Fri Jun 1 06:54:41 UTC 2012 - pgajdos@suse.com
+
+- don't install 29-liberation-aliases.conf, because
+ 30-metric-aliases.conf already contains these bindings
+
+-------------------------------------------------------------------
+Mon May 28 11:53:08 UTC 2012 - pgajdos@suse.com
+
+- DejaVu Sans, Droid Sans, Liberation Sans: use
+ hintslight with BCI (instead of hintfull with BCI)
+- DejaVu Serif, Droid Serif, Liberation Serif: use
+ hintslight with BCI (instead of hintfull with BCI)
+- DejaVu Sans Mono, Droid Sans Mono, Liberation Mono: keep
+ hintfull with BCI
+- Cantarell: use hintfull with autohinter
+
+-------------------------------------------------------------------
+Thu May 24 14:24:05 UTC 2012 - pgajdos@suse.com
+
+- turn autohinter for Verdana (BCI off)
+
-------------------------------------------------------------------
Wed Mar 21 14:59:41 UTC 2012 - pgajdos@suse.com
diff --git a/fontconfig.spec b/fontconfig.spec
index d2ad91e..4547ebc 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -66,7 +66,6 @@ Source13: suse-hinting.conf
Source14: suse-bitmaps.conf
Source16: local.conf
Source20: local.conf.instsys
-Source30: 29-liberation-aliases.conf
# fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703
Patch0: simsun-conf.patch
# suse specific because freetype2-bitmap-foundry.patch
@@ -164,10 +163,8 @@ install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d
install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/
install -m 644 $RPM_SOURCE_DIR/local.conf $RPM_BUILD_ROOT/etc/fonts
install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/
-install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail
# tune links in conf.d:
pushd $RPM_BUILD_ROOT/etc/fonts/conf.d
- ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf
rm -f 50-user.conf
rm -f 51-local.conf
ln -s ../suse-pre-user.conf 50-suse-pre-user.conf
diff --git a/suse-hinting.conf b/suse-hinting.conf
index 7b0ba99..de7e53d 100644
--- a/suse-hinting.conf
+++ b/suse-hinting.conf
@@ -85,6 +85,14 @@
even the digits which should be monospaced are not
monospaced at all anymore.
+ For example, for DejaVu Sans: when autohinter used,
+ there is unnatural big space between 'a' and 'z',
+ 'd' and 'o' or 'o' and 'g' in string "lazy dog"
+ for smaller sizes. That doesn't show with BCI.
+ Similarly for Droid Sans, see rendering of 'g' glyph
+ in smaller sizes, or rendering of "dog" word in
+ smaller sizes.
+
Because of this problem, better don't switch on
the autohinter for
@@ -106,7 +114,7 @@
TrueType
- Liberation Sans
+ Verdana
MS Gothic
MS PGothic
MS UI Gothic
@@ -332,6 +340,92 @@ exceptions will follow
exceptions:
-->
-
+
+
+
+
+ Liberation Sans
+
+
+ hintslight
+
+
+
+
+
+ DejaVu Sans
+
+
+ hintslight
+
+
+
+
+
+ Droid Sans
+
+
+ hintslight
+
+
+
+
+
+ Liberation Serif
+
+
+ hintslight
+
+
+
+
+
+ DejaVu Serif
+
+
+ hintslight
+
+
+
+
+
+ Droid Serif
+
+
+ hintslight
+
+
+
+
+
+
+
+ Cantarell
+
+
+ true
+
+
+ hintfull
+
+
diff --git a/suse-post-user.conf b/suse-post-user.conf
index 0fc8db9..f336b82 100644
--- a/suse-post-user.conf
+++ b/suse-post-user.conf
@@ -40,13 +40,14 @@
Kochi Mincho
CMEXSong
FZSongTi
+ WenQuanYi Micro Hei
WenQuanYi WenQuanYi Bitmap Song
WenQuanYi Zen Hei
AR PL ShanHeiSun Uni
FZMingTiB
AR PL SungtiL GB
AR PL Mingti2L Big5
- NanumMyeongjo
+ NanumMyeongjo
UnBatang
Baekmuk Batang
SimSun
@@ -93,13 +94,14 @@
Kochi Gothic
CMEXSong
FZSongTi
+ WenQuanYi Micro Hei
WenQuanYi WenQuanYi Bitmap Song
WenQuanYi Zen Hei
AR PL ShanHeiSun Uni
FZMingTiB
AR PL SungtiL GB
AR PL Mingti2L Big5
- NanumGothic
+ NanumGothic
UnDotum
Baekmuk Gulim
Baekmuk Dotum
@@ -137,13 +139,14 @@
Kochi Gothic
CMEXSong
FZSongTi
+ WenQuanYi Micro Hei Mono
WenQuanYi WenQuanYi Bitmap Song
WenQuanYi Zen Hei Mono
AR PL ShanHeiSun Uni
FZMingTiB
AR PL SungtiL GB
AR PL Mingti2L Big5
- NanumGothicCoding
+ NanumGothicCoding
UnDotum
Baekmuk Gulim
Baekmuk Dotum