OBS User unknown 2008-06-03 14:07:54 +00:00 committed by Git OBS Bridge
parent 7cac054bab
commit 7a3732e32c
3 changed files with 66 additions and 61 deletions

View File

@ -205,8 +205,8 @@ use strict;
my $script_start_time = time();
my $cvs_id = '$Id: fonts-config,v 1.71 2008/01/21 17:54:32 mfabian Exp $';
my $cvs_date = '$Date: 2008/01/21 17:54:32 $';
my $cvs_id = '$Id: fonts-config,v 1.72 2008/06/03 13:12:19 mfabian Exp $';
my $cvs_date = '$Date: 2008/06/03 13:12:19 $';
$cvs_date =~ /^\$[[:alpha:]]+: (.*) \$$/;
my $version = $1;
@ -1722,15 +1722,19 @@ sub generate_java_font_setup {
"Sazanami Mincho");
my @sans_simplified_chinese_priority = ("FZSongTi",
"AR PL ShanHeiSun Uni",
"AR PL SungtiL GB");
my @serif_simplified_chinese_priority = ("FZSongTi",
"AR PL ShanHeiSun Uni",
"AR PL SungtiL GB");
my @sans_traditional_chinese_priority = ("FZMingTiB",
my @sans_traditional_chinese_priority = ("AR PL ShanHeiSun Uni",
"FZMingTiB",
"AR PL Mingti2L Big5");
my @serif_traditional_chinese_priority = ("FZMingTiB",
my @serif_traditional_chinese_priority = ("AR PL ShanHeiSun Uni",
"FZMingTiB",
"AR PL Mingti2L Big5");
my @sans_korean_priority = ("UnDotum",
@ -1740,55 +1744,24 @@ sub generate_java_font_setup {
my @serif_korean_priority = ("UnBatang",
"Baekmuk Batang");
my %sans_japanese_xlfds =
(
"MS Gothic" , "-ricoh-ms gothic-",
"HGGothicB" , "-ricoh-hggothicb-",
"IPAGothic" , "-misc-ipagothic-",
"Sazanami Gothic" , "-misc-sazanami gothic-"
);
my %serif_japanese_xlfds =
(
"MS Mincho" , "-ricoh-ms mincho-",
"HGMinchoL" , "-ricoh-hgminchol-",
"IPAMincho" , "-misc-ipamincho-",
"Sazanami Mincho" , "-misc-sazanami mincho-"
);
my %sans_simplified_chinese_xlfds =
(
"FZSongTi" , "-founder-SongTi-",
"AR PL SungtiL GB" , "-arphic-ar pl sungtil gb-"
);
my %serif_simplified_chinese_xlfds =
(
"FZSongTi" , "-founder-SongTi-",
"AR PL SungtiL GB" , "-arphic-ar pl sungtil gb-"
);
my %sans_traditional_chinese_xlfds =
(
"FZMingTiB" , "-founder-MingTiB-",
"AR PL Mingti2L Big5" , "-arphic-ar pl mingti2l big5-"
);
my %serif_traditional_chinese_xlfds =
(
"FZMingTiB" , "-founder-MingTiB-",
"AR PL Mingti2L Big5" , "-arphic-ar pl mingti2l big5-"
);
my %sans_korean_xlfds =
my %cjk_xlfds =
(
"MS Gothic" , "-ricoh-ms gothic-",
"HGGothicB" , "-ricoh-hggothicb-",
"IPAGothic" , "-misc-ipagothic-",
"Sazanami Gothic" , "-misc-sazanami gothic-",
"MS Mincho" , "-ricoh-ms mincho-",
"HGMinchoL" , "-ricoh-hgminchol-",
"IPAMincho" , "-misc-ipamincho-",
"Sazanami Mincho" , "-misc-sazanami mincho-",
"FZSongTi" , "-*-SongTi-",
"FZMingTiB" , "-*-MingTiB-",
"AR PL ShanHeiSun Uni" , "-*-ar pl shanheisun uni-",
"AR PL SungtiL GB" , "-arphic-ar pl sungtil gb-",
"AR PL Mingti2L Big5" , "-arphic-ar pl mingti2l big5-",
"UnDotum" , "-misc-undotum-",
"Baekmuk Gulim" , "-baekmukttf-gulim-",
"Baekmuk Dotum" , "-baekmukttf-dotum-"
);
my %serif_korean_xlfds =
(
"Baekmuk Dotum" , "-baekmukttf-dotum-",
"UnBatang" , "-misc-unbatang-",
"Baekmuk Batang" , "-baekmukttf-batang-"
);
@ -1826,7 +1799,7 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$sans_japanese_file = $ARG;
$sans_japanese_xlfd = $sans_japanese_xlfds{"$font"};
$sans_japanese_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
@ -1847,7 +1820,7 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$serif_japanese_file = $ARG;
$serif_japanese_xlfd = $serif_japanese_xlfds{"$font"};
$serif_japanese_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
@ -1868,7 +1841,7 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$sans_simplified_chinese_file = $ARG;
$sans_simplified_chinese_xlfd = $sans_simplified_chinese_xlfds{"$font"};
$sans_simplified_chinese_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
@ -1889,14 +1862,14 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$serif_simplified_chinese_file = $ARG;
$serif_simplified_chinese_xlfd = $serif_simplified_chinese_xlfds{"$font"};
$serif_simplified_chinese_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
last;
}
}
if ( ! -f $serif_simplified_chinese_file ) {
print "Warning: cannot find a serif simplified Chinese font. Simplified Chinese in Java might not work.\n";
}
@ -1910,7 +1883,7 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$sans_traditional_chinese_file = $ARG;
$sans_traditional_chinese_xlfd = $sans_traditional_chinese_xlfds{"$font"};
$sans_traditional_chinese_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
@ -1931,7 +1904,7 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$serif_traditional_chinese_file = $ARG;
$serif_traditional_chinese_xlfd = $serif_traditional_chinese_xlfds{"$font"};
$serif_traditional_chinese_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
@ -1952,7 +1925,7 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$sans_korean_file = $ARG;
$sans_korean_xlfd = $sans_korean_xlfds{"$font"};
$sans_korean_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
@ -1973,7 +1946,7 @@ sub generate_java_font_setup {
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$serif_korean_file = $ARG;
$serif_korean_xlfd = $serif_korean_xlfds{"$font"};
$serif_korean_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
@ -1997,6 +1970,24 @@ sub generate_java_font_setup {
(my $sans_korean_xlfd_no_space = $sans_korean_xlfd) =~ s/ /_/g;
(my $serif_korean_xlfd_no_space = $serif_korean_xlfd) =~ s/ /_/g;
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
printf ("sans_japanese_file=%s\n", $sans_japanese_file);
printf ("sans_japanese_xlfd=%s\n", $sans_japanese_xlfd);
printf ("sans_japanese_xlfd_no_space=%s\n", $sans_japanese_xlfd_no_space);
printf ("sans_simplified_chinese_file=%s\n", $sans_simplified_chinese_file);
printf ("sans_simplified_chinese_xlfd=%s\n", $sans_simplified_chinese_xlfd);
printf ("sans_simplified_chinese_xlfd_no_space=%s\n", $sans_simplified_chinese_xlfd_no_space);
printf ("sans_traditional_chinese_file=%s\n", $sans_traditional_chinese_file);
printf ("sans_traditional_chinese_xlfd=%s\n", $sans_traditional_chinese_xlfd);
printf ("sans_traditional_chinese_xlfd_no_space=%s\n", $sans_traditional_chinese_xlfd_no_space);
printf ("sans_korean_file=%s\n", $sans_korean_file);
printf ("sans_korean_xlfd=%s\n", $sans_korean_xlfd);
printf ("sans_korean_xlfd_no_space=%s\n", $sans_korean_xlfd_no_space);
}
# setup for Java 1.4 (only for Japanese at the moment):
if (-f "$font_properties_ja_template_file") {
open (TEMPLATE, "$font_properties_ja_template_file") || die "can't open file $font_properties_ja_template_file: $!";

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 03 15:12:56 CEST 2008 - mfabian@suse.de
- bnc#396611: prefer "AR PL ShanHeiSun Uni" (uming.ttf) over
FZMingTiB (/usr/share/fonts/truetype/FZMingTiB.ttf) for
traditional Chinese in Java 1.5 because the former has embedded
bitmaps and the latter has not.
-------------------------------------------------------------------
Mon Jan 21 18:55:57 CET 2008 - mfabian@suse.de

View File

@ -10,6 +10,7 @@
# norootforbuild
Name: fonts-config
License: GPL v2 or later
Group: System/X11/Fonts
@ -21,7 +22,7 @@ Recommends: ft2demos
%endif
PreReq: %fillup_prereq
Version: 20080121
Release: 1
Release: 25
Summary: Configures Fonts for X Windows and other applications
Source: fonts-config
Source1: SuSEconfig.fonts
@ -81,6 +82,11 @@ exit 0
/var/adm/fillup-templates/sysconfig.fonts-config
%changelog
* Tue Jun 03 2008 mfabian@suse.de
- bnc#396611: prefer "AR PL ShanHeiSun Uni" (uming.ttf) over
FZMingTiB (/usr/share/fonts/truetype/FZMingTiB.ttf) for
traditional Chinese in Java 1.5 because the former has embedded
bitmaps and the latter has not.
* Mon Jan 21 2008 mfabian@suse.de
- fix recursive call of opendir() and closedir() to work with
Perl 5.10.
@ -240,7 +246,7 @@ exit 0
files.
* Fri Mar 04 2005 mfabian@suse.de
- add missing %%prep section to .spec file.
* Mon Dec 06 2004 mfabian@suse.de
* Tue Dec 07 2004 mfabian@suse.de
- Bugzilla #48603: don't try to write OpenOffice font-setup if
OpenOffice is not installed.
* Fri Oct 01 2004 mfabian@suse.de