From 58239b0a19a2a1a5ac0549d6835bf621c5122dc252bd877d61f26d512144973c Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 14 Jun 2012 09:52:25 +0000 Subject: [PATCH] Accepting request 124899 from home:tiwai:branches:M17N - 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 OBS-URL: https://build.opensuse.org/request/show/124899 OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=20 --- fonts-config | 11 +- fonts-config.changes | 12 ++ fonts-config.spec | 12 +- suse-bitmaps.conf.template | 23 ---- suse-hinting.conf.template | 240 ------------------------------------- 5 files changed, 31 insertions(+), 267 deletions(-) diff --git a/fonts-config b/fonts-config index c4b7128..37a6f37 100644 --- a/fonts-config +++ b/fonts-config @@ -433,7 +433,7 @@ if ($VERBOSITY >= $VERBOSITY_VERBOSE) { # changed in /etc/fonts after calling fc-cache, fontconfig # will think that the cache files are out of date again. #font_dirs_setup (); -#hinting_setup (); +hinting_setup (); embedded_bitmap_setup (); my $fc_cache_exit_status = 256; @@ -1713,6 +1713,7 @@ sub generate_java_font_setup { my @sans_japanese_priority = ("MS Gothic", "HGGothicB", "IPAPGothic", + "IPAexGothic", "Sazanami Gothic"); my @mono_japanese_priority = ("MS Gothic", @@ -1723,6 +1724,7 @@ sub generate_java_font_setup { my @serif_japanese_priority = ("MS Mincho", "HGMinchoL", "IPAPMincho", + "IPAexMincho", "Sazanami Mincho"); my @sans_simplified_chinese_priority = ("FZSongTi", @@ -1766,10 +1768,13 @@ sub generate_java_font_setup { "HGGothicB" , "-ricoh-hggothicb-", "IPAGothic" , "-misc-ipagothic-", "IPAPGothic" , "-misc-ipapgothic-", + "IPAexGothic" , "-misc-ipaexgothic-", "Sazanami Gothic" , "-misc-sazanami gothic-", "MS Mincho" , "-ricoh-ms mincho-", "HGMinchoL" , "-ricoh-hgminchol-", + "IPAMincho" , "-misc-ipamincho-", "IPAPMincho" , "-misc-ipapmincho-", + "IPAexMincho" , "-misc-ipaexmincho-", "Sazanami Mincho" , "-misc-sazanami mincho-", "FZSongTi" , "-*-SongTi-", "FZMingTiB" , "-*-MingTiB-", @@ -2265,7 +2270,7 @@ sub font_dirs_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 = ""; my $suse_hinting_template = ""; @@ -2301,7 +2306,7 @@ sub hinting_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 = ""; my $suse_bitmaps_template = ""; diff --git a/fonts-config.changes b/fonts-config.changes index b60da2b..81d9b28 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -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 diff --git a/fonts-config.spec b/fonts-config.spec index 474334f..af09d99 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -16,7 +16,6 @@ # - Name: fonts-config Provides: xf86tools:/usr/sbin/fonts-config 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 install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \ $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 %{fillup_only -n fonts-config} +%run_suseconfig_fonts exit 0 %files @@ -77,5 +86,6 @@ exit 0 /sbin/conf.d/SuSEconfig.fonts %{_mandir}/man1/fonts-config.1.gz /var/adm/fillup-templates/sysconfig.fonts-config +/etc/fonts %changelog diff --git a/suse-bitmaps.conf.template b/suse-bitmaps.conf.template index 1c0f584..b0d2efd 100644 --- a/suse-bitmaps.conf.template +++ b/suse-bitmaps.conf.template @@ -81,27 +81,4 @@ _USE_EMBEDDED_BITMAPS_PLACEHOLDER_ - - - - IPAMincho - IPAGothic - IPAPMincho - IPAPGothic - IPAUIGothic - - - false - - - false - - - - diff --git a/suse-hinting.conf.template b/suse-hinting.conf.template index c61d781..a583336 100644 --- a/suse-hinting.conf.template +++ b/suse-hinting.conf.template @@ -11,178 +11,6 @@ - - - - - true - - - hintfull - - - true - - - - - - - - true - - - - - - - - Type 1 - CFF - - - false - - - - - - - - - - TrueType - - - false - - - - - - - - TrueType - - - MS Gothic - MS PGothic - MS UI Gothic - MS Mincho - MS PMincho - HGPSoeiKakupoptai - HGSGothicE - HGSGothicM - HGKyokashotai - HGSSoeiKakugothicUB - HGPGothicB - HGPGothicE - HGPGothicM - HGSKyokashotai - HGMaruGothicMPRO - HGPSoeiKakugothicUB - HGMinchoL - HGPMinchoL - HGMinchoB - HGPMinchoB - HGSMinchoB - HGMinchoE - HGPMinchoE - HGSMinchoE - HGSoeiKakugothicUB - HGGyoshotai - HGPGyoshotai - HGSGyoshotai - HGSoeiKakupoptai - HGSSoeiPresenceEB - HGPSoeiPresenceEB - HGGothicB - HGGothicE - HGGothicM - HGSoeiPresenceEB - HGPKyokashotai - HGSSoeiKakupoptai - HGSeikaishotaiPRO - TLKyokashotai - TLMincho - TLPMincho - TLPGothic - TLPKyokashotai - TLMarugothicM - TLGyoshotai - TLPGyoshotai - TLSGyoshotai - TLPMarugothicM - TLSMarugothicM - TLSKyokashotai - TLGothic - - - true - - - - - - - - MingLiU - PMingLiU - - - false - - - - - - - - - - Likhan - - - false - - - -