pool/fontconfig
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 124918 from M17N

Browse Source 
- Revisit SUSE-specific config (bnc#766319):
  * Split suse-hinting.conf to a part defining the default
    autohint and a part defining the default hintstyle depending on
    autohint.  These are now put in conf.d/11-suse-hinting.conf and
    16-suse-hintstyle.conf, so that extra packages may put their
    own autohint value between them.
  * Move suse-bitmaps.conf to conf.d, too
  * Move optional configs modified by fonts-config to fonts-config
    package itself
- Set autohint=true for IPA* fonts as well as MS fonts;
  hintslight will be chosen automatically (bnc#766319)
- Add missing IPAex* fonts to suse-generic-names.conf lists.
- Obsolete ipa-fonts-config package as the default configs are now
  included in this package (forwarded request 124898 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/124918
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=56
This commit is contained in:
Stephan Kulow 2012-06-25 11:51:39 +00:00 committed by Git OBS Bridge
commit 3c21883ff7
9 changed files with 195 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
suse-hinting.conf → 11-suse-hinting.conf
View File

@ -2,10 +2,6 @@
<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig> <fontconfig>
<!-- Generated by SuSEconfig.fonts, don't edit, your changes will get lost. -->
<!-- Edit /etc/sysconfig/fonts-config instead. -->
<!-- Or put rules into your personal config file ~/.fonts.conf. -->
<!-- ************************************************************ --> <!-- ************************************************************ -->
<!-- Hinting and antialiasing --> <!-- Hinting and antialiasing -->
<!-- ************************************************************ --> <!-- ************************************************************ -->
@ -153,6 +149,13 @@
<string>HGPKyokashotai</string> <string>HGPKyokashotai</string>
<string>HGSSoeiKakupoptai</string> <string>HGSSoeiKakupoptai</string>
<string>HGSeikaishotaiPRO</string> <string>HGSeikaishotaiPRO</string>
<string>IPAexMincho</string>
<string>IPAexGothic</string>
<string>IPAMincho</string>
<string>IPAGothic</string>
<string>IPAPMincho</string>
<string>IPAPGothic</string>
<string>IPAUIGothic</string>
<string>TLKyokashotai</string> <string>TLKyokashotai</string>
<string>TLMincho</string> <string>TLMincho</string>
<string>TLPMincho</string> <string>TLPMincho</string>
@ -313,119 +316,4 @@ off the autohinter for the "Likhan" font:
</edit> </edit>
</match> </match>
<!--
bug#722427
general advice: use hintfull for BCI, hintlight for autohinter
exceptions will follow
-->
<match target="font">
<test name="autohint">
<bool>false</bool>
</test>
<edit name="hintstyle">
<const>hintfull</const>
</edit>
</match>
<match target="font">
<test name="autohint">
<bool>true</bool>
</test>
<edit name="hintstyle">
<const>hintslight</const>
</edit>
</match>
<!--
exceptions:
-->
<!-- Following fonts seems to be nicer (thicker) with hintslight instead
of hintfull:
Liberation Sans
DejaVu Sans
Droid Sans
Liberation Serif
DejaVu Serif
Droid Serif
Following are better to render with hintfull, because they are too
blurred with hintslight:
Liberation Mono
DejaVu Sans Mono
Droid Sans Mono
-->
<match target="font">
<test name="family">
<string>Liberation Sans</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Sans</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>Droid Sans</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>Liberation Serif</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Serif</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>Droid Serif</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<!-- Cantarell: according to coauthor, cantarell doesn't have
any byte code, so following should give the best results
on most monitors -->
<match target="font">
<test name="family">
<string>Cantarell</string>
</test>
<edit name="autohint" mode="assign">
<bool>true</bool>
</edit>
<edit name="hintstyle" mode="assign">
<const>hintfull</const>
</edit>
</match>
</fontconfig> </fontconfig>

122
16-suse-hintstyle.conf Normal file
View File

@ -0,0 +1,122 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Default setup of hintstyle -->
<!--
bug#722427
general advice: use hintfull for BCI, hintlight for autohinter
exceptions will follow
-->
<match target="font">
<test name="autohint">
<bool>false</bool>
</test>
<edit name="hintstyle">
<const>hintfull</const>
</edit>
</match>
<match target="font">
<test name="autohint">
<bool>true</bool>
</test>
<edit name="hintstyle">
<const>hintslight</const>
</edit>
</match>
<!--
exceptions:
-->
<!-- Following fonts seems to be nicer (thicker) with hintslight instead
of hintfull:
Liberation Sans
DejaVu Sans
Droid Sans
Liberation Serif
DejaVu Serif
Droid Serif
Following are better to render with hintfull, because they are too
blurred with hintslight:
Liberation Mono
DejaVu Sans Mono
Droid Sans Mono
-->
<match target="font">
<test name="family">
<string>Liberation Sans</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Sans</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>Droid Sans</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>Liberation Serif</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>DejaVu Serif</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<match target="font">
<test name="family">
<string>Droid Serif</string>
</test>
<edit name="hintstyle" mode="assign">
<const>hintslight</const>
</edit>
</match>
<!-- Cantarell: according to coauthor, cantarell doesn't have
any byte code, so following should give the best results
on most monitors -->
<match target="font">
<test name="family">
<string>Cantarell</string>
</test>
<edit name="autohint" mode="assign">
<bool>true</bool>
</edit>
<edit name="hintstyle" mode="assign">
<const>hintfull</const>
</edit>
</match>
</fontconfig>

30
18-suse-bitmaps-misc.conf Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- ************************************************************ -->
<!-- Bitmap related stuff -->
<!-- ************************************************************ -->
<!--
The IPA fonts have bitmaps only in 12, 14, and 16 pixels.
That is rather useless, it is not nice to see a bitmaps at 12
pixels, antialiased glyphs at 13 pixels and bitmaps at 14
pixels again.
-->
<match target="font">
<test name="family">
<string>IPAMincho</string>
<string>IPAGothic</string>
<string>IPAPMincho</string>
<string>IPAPGothic</string>
<string>IPAUIGothic</string>
<string>IPAexMincho</string>
<string>IPAexGothic</string>
</test>
<edit name="embeddedbitmap">
<bool>false</bool>
</edit>
</match>
</fontconfig>

18
fontconfig.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Tue Jun 12 10:41:54 CEST 2012 - tiwai@suse.de
- Revisit SUSE-specific config (bnc#766319):
* Split suse-hinting.conf to a part defining the default
autohint and a part defining the default hintstyle depending on
autohint. These are now put in conf.d/11-suse-hinting.conf and
16-suse-hintstyle.conf, so that extra packages may put their
own autohint value between them.
* Move suse-bitmaps.conf to conf.d, too
* Move optional configs modified by fonts-config to fonts-config
package itself
- Set autohint=true for IPA* fonts as well as MS fonts;
hintslight will be chosen automatically (bnc#766319)
- Add missing IPAex* fonts to suse-generic-names.conf lists.
- Obsolete ipa-fonts-config package as the default configs are now
included in this package
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 3 22:18:41 UTC+8 2012 - hillwood@linuxfans.org Sun Jun 3 22:18:41 UTC+8 2012 - hillwood@linuxfans.org

21
fontconfig.spec
View File

@ -16,7 +16,6 @@
# #
Name: fontconfig Name: fontconfig
%define build_docs 0 %define build_docs 0
BuildRequires: automake BuildRequires: automake
@ -62,8 +61,9 @@ Source4: baselibs.conf
Source10: suse-generic-names.conf Source10: suse-generic-names.conf
Source11: suse-pre-user.conf Source11: suse-pre-user.conf
Source12: suse-post-user.conf Source12: suse-post-user.conf
Source13: suse-hinting.conf Source13: 11-suse-hinting.conf
Source14: suse-bitmaps.conf Source14: 16-suse-hintstyle.conf
Source15: 18-suse-bitmaps-misc.conf
Source16: local.conf Source16: local.conf
Source20: local.conf.instsys Source20: local.conf.instsys
# fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703 # fixed in next release https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47703
@ -76,6 +76,10 @@ Patch2: usr-share-doc-packages.patch
# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705 # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705
Patch3: cloexec.patch Patch3: cloexec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: ipa-fonts-config = 003.02
Obsoletes: ipa-fonts-config <= 003.02
Provides: IPA-fonts-config = 003.02
Obsoletes: IPA-fonts-config <= 003.02
%description %description
Fontconfig is a library for configuring and customizing font access. It Fontconfig is a library for configuring and customizing font access. It
@ -85,10 +89,10 @@ which accepts font patterns and returns the nearest matching font.
%package devel %package devel
Requires: %{name} = %version Requires: %{name} = %version
Requires: freetype2-devel glibc-devel Requires: freetype2-devel
Requires: glibc-devel
Provides: XFree86-devel:%_libdir/pkgconfig/fontconfig.pc Provides: XFree86-devel:%_libdir/pkgconfig/fontconfig.pc
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
License: MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -161,6 +165,11 @@ done
# install the conf.d README as well, I think it's helpful: # install the conf.d README as well, I think it's helpful:
install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d 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/suse*.conf $RPM_BUILD_ROOT/etc/fonts/
for i in $RPM_SOURCE_DIR/[0-9]*.conf; do
j=${i##*/}
install -m 644 $i $RPM_BUILD_ROOT/etc/fonts/conf.avail/
ln -s ../conf.avail/$j $RPM_BUILD_ROOT/etc/fonts/conf.d/$j
done
install -m 644 $RPM_SOURCE_DIR/local.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/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/
# tune links in conf.d: # tune links in conf.d:
@ -190,8 +199,6 @@ rm -f %{buildroot}%{_libdir}/*.la
%config /etc/fonts/suse-generic-names.conf %config /etc/fonts/suse-generic-names.conf
%config /etc/fonts/suse-pre-user.conf %config /etc/fonts/suse-pre-user.conf
%config /etc/fonts/suse-post-user.conf %config /etc/fonts/suse-post-user.conf
%config %verify(not md5 size mtime) /etc/fonts/suse-hinting.conf
%config %verify(not md5 size mtime) /etc/fonts/suse-bitmaps.conf
%dir /etc/fonts/conf.avail/ %dir /etc/fonts/conf.avail/
/etc/fonts/conf.avail/* /etc/fonts/conf.avail/*
%dir /etc/fonts/conf.d/ %dir /etc/fonts/conf.d/

121
suse-bitmaps.conf
View File

@ -1,121 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Generated by SuSEconfig.fonts, don't edit, your changes will get lost. -->
<!-- Edit /etc/sysconfig/fonts-config instead. -->
<!-- Or put rules into your personal config file ~/.fonts.conf. -->
<!-- ************************************************************ -->
<!-- Bitmap related stuff -->
<!-- ************************************************************ -->
<!--
As rendering of outlines is often not perfect at small sizes, some
TrueType or OpenType fonts contain "embedded" bitmaps for small sizes.
This is very common in CJK fonts.
(By the way, apparently there are some western fonts which have
embedded bitmaps as well. Recently I found that "Courier New"
also has embedded bitmaps. But, for reasons unknown to me,
the embedded bitmaps in "Courier New" are not used, even when
embedded bitmaps are unconditionally enabled for all fonts.
On top of that, the embedded bitmaps in "Courier New" appear
to be of far lower quality than the results achieved when rendering
"Courier New" with the byte code interpreter enabled and the
antialiasing turned off. I.e. the existance of these low quality
embedded bitmaps in "Courier New" is quite mysterious).
Using embedded bitmaps usually gives clearly readable results as the bitmaps
are handtuned for good readability and do not suffer from imperfections
of the rendering algorithms.
On the other hand, anti-aliasing is only possible when the outlines
are used.
Often, using the outlines with anti-aliasing looks more "beautiful".
But using the embedded bitmaps is often better readable.
It is a matter of taste, decide by yourself which style you prefer.
To use embedded bitmaps in TrueType fonts always when available
put the following rule in your personal ~/.fonts.conf file:
<match target="font">
<edit name="embeddedbitmap">
<bool>true</bool>
</edit>
</match>
To avoid using the embedded bitmaps and always use the outlines,
put the following rule in your personal ~/.fonts.conf file:
<match target="font">
<edit name="embeddedbitmap">
<bool>false</bool>
</edit>
</match>
It is also possible to enable embedded bitmaps only for fonts
which support certain languages. For example, if you want to
enable embedded bitmaps only for Japanese, Chinese, and Korean
fonts, put the following rule in your personal ~/.fonts.conf file:
<match target="font">
<edit name="embeddedbitmap">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="lang" compare="contains">
<string>ja</string>
<string>zh</string>
<string>ko</string>
</test>
<edit name="embeddedbitmap" mode="assign">
<bool>true</bool>
</edit>
</match>
-->
<match target="font">
<edit name="embeddedbitmap" mode="assign">
<bool>false</bool>
</edit>
</match>
<match target="font">
<test name="lang" compare="contains">
<string>ja</string>
<string>ko</string>
<string>zh</string>
</test>
<edit name="embeddedbitmap" mode="assign">
<bool>true</bool>
</edit>
</match>
<!--
The IPA fonts have bitmaps only in 12, 14, and 16 pixels.
That is rather useless, it is not nice to see a bitmaps at 12
pixels, antialiased glyphs at 13 pixels and bitmaps at 14
pixels again.
-->
<match target="font">
<test name="family">
<string>IPAMincho</string>
<string>IPAGothic</string>
<string>IPAPMincho</string>
<string>IPAPGothic</string>
<string>IPAUIGothic</string>
</test>
<edit name="autohint">
<bool>false</bool>
</edit>
<edit name="embeddedbitmap">
<bool>false</bool>
</edit>
</match>
</fontconfig>

2
suse-generic-names.conf
View File

@ -26,6 +26,7 @@
<family>HGSMinchoE</family> <family>HGSMinchoE</family>
<family>IPAMincho</family> <family>IPAMincho</family>
<family>IPAPMincho</family> <family>IPAPMincho</family>
<family>IPAexMincho</family>
<family>Sazanami Mincho</family> <family>Sazanami Mincho</family>
<family>STIXGeneral</family> <family>STIXGeneral</family>
<default><family>serif</family></default> <default><family>serif</family></default>
@ -52,6 +53,7 @@
<family>HGSGothicM</family> <family>HGSGothicM</family>
<family>IPAGothic</family> <family>IPAGothic</family>
<family>IPAPGothic</family> <family>IPAPGothic</family>
<family>IPAexGothic</family>
<family>Sazanami Gothic</family> <family>Sazanami Gothic</family>
<family>Baekmuk Gulim</family> <family>Baekmuk Gulim</family>
<default><family>sans-serif</family></default> <default><family>sans-serif</family></default>

2
suse-post-user.conf
View File

@ -36,6 +36,7 @@
<family>HGMinchoL</family> <family>HGMinchoL</family>
<family>IPAPMincho</family> <family>IPAPMincho</family>
<family>IPAMincho</family> <family>IPAMincho</family>
<family>IPAexMincho</family>
<family>Sazanami Mincho</family> <family>Sazanami Mincho</family>
<family>Kochi Mincho</family> <family>Kochi Mincho</family>
<family>CMEXSong</family> <family>CMEXSong</family>
@ -88,6 +89,7 @@
<family>HGGothicB</family> <family>HGGothicB</family>
<family>IPAPGothic</family> <family>IPAPGothic</family>
<family>IPAGothic</family> <family>IPAGothic</family>
<family>IPAexGothic</family>
<family>VL PGothic</family> <family>VL PGothic</family>
<family>VL Gothic</family> <family>VL Gothic</family>
<family>Sazanami Gothic</family> <family>Sazanami Gothic</family>

12
suse-pre-user.conf
View File

@ -316,18 +316,6 @@
</acceptfont> </acceptfont>
</selectfont> </selectfont>
<!-- ************************************************************ -->
<!-- Hinting and antialiasing -->
<!-- ************************************************************ -->
<include ignore_missing="yes">/etc/fonts/suse-hinting.conf</include>
<!-- ************************************************************ -->
<!-- Bitmap related stuff -->
<!-- ************************************************************ -->
<include ignore_missing="yes">/etc/fonts/suse-bitmaps.conf</include>
<!-- ************************************************************ --> <!-- ************************************************************ -->
<!-- assigning families to generic names --> <!-- assigning families to generic names -->
<!-- ************************************************************ --> <!-- ************************************************************ -->