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

Accepting request 124917 from M17N

Browse Source 
- Add the support for IPAex fonts

- Move hinting and bitmap config files to own config files
  instead of changing the main suse-*.conf (bnc#766319)
- Enable hinting_setup() again (forwarded request 124899 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/124917
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fonts-config?expand=0&rev=26
This commit is contained in:
Stephan Kulow 2012-06-25 11:53:55 +00:00 committed by Git OBS Bridge
commit b2f4170741
5 changed files with 31 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fonts-config
View File

@ -433,7 +433,7 @@ if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
# changed in /etc/fonts after calling fc-cache, fontconfig # changed in /etc/fonts after calling fc-cache, fontconfig
# will think that the cache files are out of date again. # will think that the cache files are out of date again.
#font_dirs_setup (); #font_dirs_setup ();
#hinting_setup (); hinting_setup ();
embedded_bitmap_setup (); embedded_bitmap_setup ();
my $fc_cache_exit_status = 256; my $fc_cache_exit_status = 256;
@ -1713,6 +1713,7 @@ sub generate_java_font_setup {
my @sans_japanese_priority = ("MS Gothic", my @sans_japanese_priority = ("MS Gothic",
"HGGothicB", "HGGothicB",
"IPAPGothic", "IPAPGothic",
"IPAexGothic",
"Sazanami Gothic"); "Sazanami Gothic");
my @mono_japanese_priority = ("MS Gothic", my @mono_japanese_priority = ("MS Gothic",
@ -1723,6 +1724,7 @@ sub generate_java_font_setup {
my @serif_japanese_priority = ("MS Mincho", my @serif_japanese_priority = ("MS Mincho",
"HGMinchoL", "HGMinchoL",
"IPAPMincho", "IPAPMincho",
"IPAexMincho",
"Sazanami Mincho"); "Sazanami Mincho");
my @sans_simplified_chinese_priority = ("FZSongTi", my @sans_simplified_chinese_priority = ("FZSongTi",
@ -1766,10 +1768,13 @@ sub generate_java_font_setup {
"HGGothicB" , "-ricoh-hggothicb-", "HGGothicB" , "-ricoh-hggothicb-",
"IPAGothic" , "-misc-ipagothic-", "IPAGothic" , "-misc-ipagothic-",
"IPAPGothic" , "-misc-ipapgothic-", "IPAPGothic" , "-misc-ipapgothic-",
"IPAexGothic" , "-misc-ipaexgothic-",
"Sazanami Gothic" , "-misc-sazanami gothic-", "Sazanami Gothic" , "-misc-sazanami gothic-",
"MS Mincho" , "-ricoh-ms mincho-", "MS Mincho" , "-ricoh-ms mincho-",
"HGMinchoL" , "-ricoh-hgminchol-", "HGMinchoL" , "-ricoh-hgminchol-",
"IPAMincho" , "-misc-ipamincho-",
"IPAPMincho" , "-misc-ipapmincho-", "IPAPMincho" , "-misc-ipapmincho-",
"IPAexMincho" , "-misc-ipaexmincho-",
"Sazanami Mincho" , "-misc-sazanami mincho-", "Sazanami Mincho" , "-misc-sazanami mincho-",
"FZSongTi" , "-*-SongTi-", "FZSongTi" , "-*-SongTi-",
"FZMingTiB" , "-*-MingTiB-", "FZMingTiB" , "-*-MingTiB-",
@ -2265,7 +2270,7 @@ sub font_dirs_setup {
} }
######################################################################## ########################################################################
sub hinting_setup { sub hinting_setup {
my $suse_hinting_file = "/etc/fonts/suse-hinting.conf"; my $suse_hinting_file = "/etc/fonts/conf.avail/12-suse-hinting-bc.conf";
my $suse_hinting_template_file = "/usr/share/fonts-config/suse-hinting.conf.template"; my $suse_hinting_template_file = "/usr/share/fonts-config/suse-hinting.conf.template";
my $suse_hinting = ""; my $suse_hinting = "";
my $suse_hinting_template = ""; my $suse_hinting_template = "";
@ -2301,7 +2306,7 @@ sub hinting_setup {
######################################################################## ########################################################################
sub embedded_bitmap_setup { sub embedded_bitmap_setup {
my $suse_bitmaps_file = "/etc/fonts/suse-bitmaps.conf"; my $suse_bitmaps_file = "/etc/fonts/conf.avail/17-suse-bitmaps.conf";
my $suse_bitmaps_template_file = "/usr/share/fonts-config/suse-bitmaps.conf.template"; my $suse_bitmaps_template_file = "/usr/share/fonts-config/suse-bitmaps.conf.template";
my $suse_bitmaps = ""; my $suse_bitmaps = "";
my $suse_bitmaps_template = ""; my $suse_bitmaps_template = "";

12
fonts-config.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Jun 13 11:25:43 CEST 2012 - tiwai@suse.de
- Add the support for IPAex fonts
-------------------------------------------------------------------
Tue Jun 12 12:45:17 CEST 2012 - tiwai@suse.de
- Move hinting and bitmap config files to own config files
instead of changing the main suse-*.conf (bnc#766319)
- Enable hinting_setup() again
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 26 12:36:46 UTC 2012 - pgajdos@suse.com Mon Mar 26 12:36:46 UTC 2012 - pgajdos@suse.com

12
fonts-config.spec
View File

@ -16,7 +16,6 @@
# #
Name: fonts-config Name: fonts-config
Provides: xf86tools:/usr/sbin/fonts-config Provides: xf86tools:/usr/sbin/fonts-config
Requires: fontconfig >= 2.3.93.20060103 Requires: fontconfig >= 2.3.93.20060103
@ -64,9 +63,19 @@ pod2man --section 1 --center=" " $RPM_SOURCE_DIR/fonts-config > \
$RPM_BUILD_ROOT/%{_mandir}/man1/fonts-config.1 $RPM_BUILD_ROOT/%{_mandir}/man1/fonts-config.1
install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \ install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \
$RPM_BUILD_ROOT/var/adm/fillup-templates/ $RPM_BUILD_ROOT/var/adm/fillup-templates/
#
mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.d
mkdir -p $RPM_BUILD_ROOT/etc/fonts/conf.avail
touch $RPM_BUILD_ROOT/etc/fonts/conf.avail/12-suse-hinting-bc.conf
touch $RPM_BUILD_ROOT/etc/fonts/conf.avail/17-suse-bitmaps.conf
ln -s ../conf.avail/12-suse-hinting-bc.conf \
$RPM_BUILD_ROOT/etc/fonts/conf.d/12-suse-hinting-bc.conf
ln -s ../conf.avail/17-suse-bitmaps.conf \
$RPM_BUILD_ROOT/etc/fonts/conf.d/17-suse-bitmaps.conf
%post %post
%{fillup_only -n fonts-config} %{fillup_only -n fonts-config}
%run_suseconfig_fonts
exit 0 exit 0
%files %files
@ -77,5 +86,6 @@ exit 0
/sbin/conf.d/SuSEconfig.fonts /sbin/conf.d/SuSEconfig.fonts
%{_mandir}/man1/fonts-config.1.gz %{_mandir}/man1/fonts-config.1.gz
/var/adm/fillup-templates/sysconfig.fonts-config /var/adm/fillup-templates/sysconfig.fonts-config
/etc/fonts
%changelog %changelog

23
suse-bitmaps.conf.template
View File

@ -81,27 +81,4 @@
_USE_EMBEDDED_BITMAPS_PLACEHOLDER_ _USE_EMBEDDED_BITMAPS_PLACEHOLDER_
<!--
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> </fontconfig>

240
suse-hinting.conf.template
View File

@ -11,178 +11,6 @@
<!-- ************************************************************ --> <!-- ************************************************************ -->
<!--
Using hinting=true, hintstyle=hintfull and antialias=true
is a good default for most fonts.
Match on "pattern" for the default, not on "font" to make
it easier to override the default using FcPatternDel()
and FcPatternAdd...() (see bugzilla #104365).
-->
<match target="pattern">
<edit name="hinting">
<bool>true</bool>
</edit>
<edit name="hintstyle">
<const>hintfull</const>
</edit>
<edit name="antialias">
<bool>true</bool>
</edit>
</match>
<!--
Set autohinter=true as the default, then add exceptions for certain fonts.
Match on "font" here, not on "pattern" because of bug #118131 comment #93.
(If an autohint value is set in pattern, OpenOffice 2.1 will use that even
if there are fontconfig rules matching on "font" which should override it
again). This doesn't cause any problems for Cairo/Gnome (see bug #104365)
because Cairo/Gnome don't try to change the autohint value anyway.
-->
<match target="font">
<edit name="autohint">
<bool>true</bool>
</edit>
</match>
<!--
Switch off the autohinter for PostScript fonts (Type 1 and OpenType CFF)
because using the PostScript hinting usually looks better than using
the autohinter.
-->
<match target="font">
<test name="fontformat">
<string>Type 1</string>
<string>CFF</string>
</test>
<edit name="autohint">
<bool>false</bool>
</edit>
</match>
<!--
TrueType Fonts which have high quality byte code interpreter
instructions can look very good in even in small sizes when using
the byte code interpreter (autohint=false). This is true
both with and without anti-aliasing.
In black and white (antialias=false) the results when rendering
with the byte code interpreter may even look as good as high quality
bitmap fonts.
On the other hand, some low quality TrueType Fonts do not have
byte code interpreter instructions at all or only very bad byte
code and may look better when the autohinter is used.
(See "FreeSans" for example, it looks better with the
autohinter which is especially obvious if anti-aliasing is off).
-->
<!--
Switch off the autohinter for TrueType fonts in order
to use the byte code interpreter.
-->
<match target="font">
<test name="fontformat">
<string>TrueType</string>
</test>
<edit name="autohint">
<bool>false</bool>
</edit>
</match>
<!--
Switch on the autohinter for a few TrueType fonts which
have no byte code or very bad byte code and look better
with the autohinter:
But see also bug #215602 for many fonts the autohinter
seriously distorts the metrics so badly that
even the digits which should be monospaced are not
monospaced at all anymore.
Because of this problem, better don't switch on
the autohinter for
Sazanami
IPA
DejaVu Sans Light
DejaVu Sans Condensed
DejaVu Serif Condensed
FreeSans
FreeSerif
FreeMono
and other fonts with similar problems until this is solved
in the autohinter.
-->
<match target="font">
<test name="fontformat">
<string>TrueType</string>
</test>
<test name="family">
<string>MS Gothic</string>
<string>MS PGothic</string>
<string>MS UI Gothic</string>
<string>MS Mincho</string>
<string>MS PMincho</string>
<string>HGPSoeiKakupoptai</string>
<string>HGSGothicE</string>
<string>HGSGothicM</string>
<string>HGKyokashotai</string>
<string>HGSSoeiKakugothicUB</string>
<string>HGPGothicB</string>
<string>HGPGothicE</string>
<string>HGPGothicM</string>
<string>HGSKyokashotai</string>
<string>HGMaruGothicMPRO</string>
<string>HGPSoeiKakugothicUB</string>
<string>HGMinchoL</string>
<string>HGPMinchoL</string>
<string>HGMinchoB</string>
<string>HGPMinchoB</string>
<string>HGSMinchoB</string>
<string>HGMinchoE</string>
<string>HGPMinchoE</string>
<string>HGSMinchoE</string>
<string>HGSoeiKakugothicUB</string>
<string>HGGyoshotai</string>
<string>HGPGyoshotai</string>
<string>HGSGyoshotai</string>
<string>HGSoeiKakupoptai</string>
<string>HGSSoeiPresenceEB</string>
<string>HGPSoeiPresenceEB</string>
<string>HGGothicB</string>
<string>HGGothicE</string>
<string>HGGothicM</string>
<string>HGSoeiPresenceEB</string>
<string>HGPKyokashotai</string>
<string>HGSSoeiKakupoptai</string>
<string>HGSeikaishotaiPRO</string>
<string>TLKyokashotai</string>
<string>TLMincho</string>
<string>TLPMincho</string>
<string>TLPGothic</string>
<string>TLPKyokashotai</string>
<string>TLMarugothicM</string>
<string>TLGyoshotai</string>
<string>TLPGyoshotai</string>
<string>TLSGyoshotai</string>
<string>TLPMarugothicM</string>
<string>TLSMarugothicM</string>
<string>TLSKyokashotai</string>
<string>TLGothic</string>
</test>
<edit name="autohint">
<bool>true</bool>
</edit>
</match>
<!-- <!--
The following rule sets up black and white rendering with The following rule sets up black and white rendering with
the byte code interpreter for a small list of fonts which the byte code interpreter for a small list of fonts which
@ -232,72 +60,4 @@
</edit> </edit>
</match> </match>
<!--
Some CJK fonts require the byte code interpreter to be rendered correctly.
These are composite fonts which store components and composing information
and compose the glyphs on the fly using the hinting instructions.
For all such fonts we switch off the autohinter here.
When "autohint" is set to "false", the byte code interpreter will
be used if it has been enabled at all when compiling freetype2.
The Chinese fonts "MingLiu" and "PMingLiU" used to belong to the fonts
which absolutely require the byte code interpreter to be rendered
correctly.
But apparently the new versions of "MingLiU" and "PMingLiU" from Windows
Vista are rendered correctly without the byte code interpreter.
-->
<match target="font">
<test name="family">
<string>MingLiU</string>
<string>PMingLiU</string>
</test>
<edit name="autohint">
<bool>false</bool>
</edit>
</match>
<!--
Hinting for CJK fonts in freetype doesn't yet work as well as for Latin fonts.
Recently the autohinter in in freetype has been improved for CJK fonts
a lot but it is still not perfect. Therefore one might want to switch
off the autohinter for CJK fonts.
This can be achieved by using the following rule:
<match target="font">
<test name="lang" compare="contains">
<string>ja</string>
<string>zh</string>
<string>ko</string>
</test>
<edit name="autohint">
<bool>false</bool>
</edit>
</match>
-->
<!--
for some Bengali fonts (e.g. "Mukti Narrow"), the autohinter works well
with the patch from http://www.kde.gr.jp/~akito/patch/freetype2/2.1.7
applied. But for "Likhan" it still doesn't work that well
(look how the "matra" lines at the top line up). Therefore, switch
off the autohinter for the "Likhan" font:
-->
<match target="font">
<test name="family">
<string>Likhan</string>
</test>
<edit name="autohint">
<bool>false</bool>
</edit>
</match>
</fontconfig> </fontconfig>