Accepting request 87680 from M17N

- changed Japanese fonts setting for Java
  * IPA Gothic for monospaced
  * Propotional IPA fonts for others

OBS-URL: https://build.opensuse.org/request/show/87680
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fonts-config?expand=0&rev=19
This commit is contained in:
Lars Vogdt 2011-10-13 14:16:29 +00:00 committed by Git OBS Bridge
commit 3766ddfc20
4 changed files with 69 additions and 22 deletions

View File

@ -69,26 +69,26 @@ sansserif.bolditalic.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso1
sansserif.bolditalic.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 sansserif.bolditalic.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 sansserif.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
monospaced.plain.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 monospaced.plain.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
monospaced.plain.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.plain.japanese-iso10646=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.plain.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.plain.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.plain.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 monospaced.plain.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 monospaced.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
monospaced.bold.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 monospaced.bold.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
monospaced.bold.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.bold.japanese-iso10646=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.bold.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.bold.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.bold.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 monospaced.bold.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 monospaced.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
monospaced.italic.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 monospaced.italic.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
monospaced.italic.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.italic.japanese-iso10646=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.italic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.italic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.italic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 monospaced.italic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 monospaced.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
monospaced.bolditalic.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 monospaced.bolditalic.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
monospaced.bolditalic.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.bolditalic.japanese-iso10646=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.bolditalic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 monospaced.bolditalic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
monospaced.bolditalic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 monospaced.bolditalic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 monospaced.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
@ -117,26 +117,26 @@ dialog.bolditalic.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso1064
dialog.bolditalic.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 dialog.bolditalic.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 dialog.bolditalic.latin-1=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1
dialoginput.plain.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialoginput.plain.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
dialoginput.plain.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.plain.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.plain.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.plain.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.plain.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 dialoginput.plain.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 dialoginput.plain.latin-1=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1
dialoginput.bold.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialoginput.bold.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
dialoginput.bold.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.bold.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.bold.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.bold.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.bold.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 dialoginput.bold.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 dialoginput.bold.latin-1=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1
dialoginput.italic.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialoginput.italic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
dialoginput.italic.japanese-so10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.italic.japanese-so10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.italic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.italic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.italic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 dialoginput.italic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1 dialoginput.italic.latin-1=-b&h-lucidatypewriter-medium-i-normal-sans-*-%d-*-*-m-*-iso8859-1
dialoginput.bolditalic.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialoginput.bolditalic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0
dialoginput.bolditalic.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.bolditalic.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.bolditalic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialoginput.bolditalic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1
dialoginput.bolditalic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 dialoginput.bolditalic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0
dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1 dialoginput.bolditalic.latin-1=-b&h-lucidatypewriter-bold-i-normal-sans-*-%d-*-*-m-*-iso8859-1
@ -166,6 +166,10 @@ filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0201.197
filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=_SANS_JAPANESE_FILE_ filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=_SANS_JAPANESE_FILE_
filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-iso10646-1=_SANS_JAPANESE_FILE_ filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-iso10646-1=_SANS_JAPANESE_FILE_
filename._MONO_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0=_MONO_JAPANESE_FILE_
filename._MONO_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=_MONO_JAPANESE_FILE_
filename._MONO_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-iso10646-1=_MONO_JAPANESE_FILE_
filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0=_SERIF_JAPANESE_FILE_ filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0=_SERIF_JAPANESE_FILE_
filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=_SERIF_JAPANESE_FILE_ filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0=_SERIF_JAPANESE_FILE_
filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-iso10646-1=_SERIF_JAPANESE_FILE_ filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-c-*-iso10646-1=_SERIF_JAPANESE_FILE_

View File

@ -1712,13 +1712,18 @@ sub generate_java_font_setup {
} }
my @sans_japanese_priority = ("MS Gothic", my @sans_japanese_priority = ("MS Gothic",
"HGGothicB",
"IPAPGothic",
"Sazanami Gothic");
my @mono_japanese_priority = ("MS Gothic",
"HGGothicB", "HGGothicB",
"IPAGothic", "IPAGothic",
"Sazanami Gothic"); "Sazanami Gothic");
my @serif_japanese_priority = ("MS Mincho", my @serif_japanese_priority = ("MS Mincho",
"HGMinchoL", "HGMinchoL",
"IPAMincho", "IPAPMincho",
"Sazanami Mincho"); "Sazanami Mincho");
my @sans_simplified_chinese_priority = ("FZSongTi", my @sans_simplified_chinese_priority = ("FZSongTi",
@ -1749,10 +1754,11 @@ sub generate_java_font_setup {
"MS Gothic" , "-ricoh-ms gothic-", "MS Gothic" , "-ricoh-ms gothic-",
"HGGothicB" , "-ricoh-hggothicb-", "HGGothicB" , "-ricoh-hggothicb-",
"IPAGothic" , "-misc-ipagothic-", "IPAGothic" , "-misc-ipagothic-",
"IPAPGothic" , "-misc-ipapgothic-",
"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-",
"Sazanami Mincho" , "-misc-sazanami mincho-", "Sazanami Mincho" , "-misc-sazanami mincho-",
"FZSongTi" , "-*-SongTi-", "FZSongTi" , "-*-SongTi-",
"FZMingTiB" , "-*-MingTiB-", "FZMingTiB" , "-*-MingTiB-",
@ -1769,6 +1775,9 @@ sub generate_java_font_setup {
my $sans_japanese_xlfd = "-misc-sazanami gothic-"; my $sans_japanese_xlfd = "-misc-sazanami gothic-";
my $sans_japanese_file = "/usr/share/fonts/truetype/sazanami-gothic.ttf"; my $sans_japanese_file = "/usr/share/fonts/truetype/sazanami-gothic.ttf";
my $mono_japanese_xlfd = "-misc-sazanami gothic-";
my $mono_japanese_file = "/usr/share/fonts/truetype/sazanami-gothic.ttf";
my $serif_japanese_xlfd = "-misc-sazanami mincho-"; my $serif_japanese_xlfd = "-misc-sazanami mincho-";
my $serif_japanese_file = "/usr/share/fonts/truetype/sazanami-mincho.ttf"; my $serif_japanese_file = "/usr/share/fonts/truetype/sazanami-mincho.ttf";
@ -1806,10 +1815,31 @@ sub generate_java_font_setup {
last; last;
} }
} }
if ( ! -f $sans_japanese_file ) { if ( ! -f $sans_japanese_file ) {
print "Warning: cannot find a sans serif Japanese font. Japanese in Java might not work.\n"; print "Warning: cannot find a sans serif Japanese font. Japanese in Java might not work.\n";
} }
for my $font (@mono_japanese_priority) {
if (`fc-list "$font"`) {
open (NAMES, "fc-list \"$font\" file |");
binmode NAMES, ":bytes";
while (<NAMES>) {
chomp $ARG;
$ARG =~ s/:.*$//;
if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") {
$mono_japanese_file = $ARG;
$mono_japanese_xlfd = $cjk_xlfds{"$font"};
}
}
close (NAMES);
last;
}
}
if ( ! -f $mono_japanese_file ) {
print "Warning: cannot find a monospaced Japanese font. Japanese in Java might not work.\n";
}
for my $font (@serif_japanese_priority) { for my $font (@serif_japanese_priority) {
if (`fc-list "$font"`) { if (`fc-list "$font"`) {
@ -1959,6 +1989,7 @@ sub generate_java_font_setup {
} }
(my $sans_japanese_xlfd_no_space = $sans_japanese_xlfd) =~ s/ /_/g; (my $sans_japanese_xlfd_no_space = $sans_japanese_xlfd) =~ s/ /_/g;
(my $mono_japanese_xlfd_no_space = $mono_japanese_xlfd) =~ s/ /_/g;
(my $serif_japanese_xlfd_no_space = $serif_japanese_xlfd) =~ s/ /_/g; (my $serif_japanese_xlfd_no_space = $serif_japanese_xlfd) =~ s/ /_/g;
(my $sans_simplified_chinese_xlfd_no_space = $sans_simplified_chinese_xlfd) =~ s/ /_/g; (my $sans_simplified_chinese_xlfd_no_space = $sans_simplified_chinese_xlfd) =~ s/ /_/g;
@ -2031,6 +2062,9 @@ sub generate_java_font_setup {
$ARG =~ s/_SANS_JAPANESE_XLFD_NO_SPACE_/$sans_japanese_xlfd_no_space/g; $ARG =~ s/_SANS_JAPANESE_XLFD_NO_SPACE_/$sans_japanese_xlfd_no_space/g;
$ARG =~ s/_SANS_JAPANESE_FILE_/$sans_japanese_file/g; $ARG =~ s/_SANS_JAPANESE_FILE_/$sans_japanese_file/g;
$ARG =~ s/_SANS_JAPANESE_XLFD_/$sans_japanese_xlfd/g; $ARG =~ s/_SANS_JAPANESE_XLFD_/$sans_japanese_xlfd/g;
$ARG =~ s/_MONO_JAPANESE_XLFD_NO_SPACE_/$mono_japanese_xlfd_no_space/g;
$ARG =~ s/_MONO_JAPANESE_FILE_/$mono_japanese_file/g;
$ARG =~ s/_MONO_JAPANESE_XLFD_/$mono_japanese_xlfd/g;
$ARG =~ s/_SERIF_JAPANESE_XLFD_NO_SPACE_/$serif_japanese_xlfd_no_space/g; $ARG =~ s/_SERIF_JAPANESE_XLFD_NO_SPACE_/$serif_japanese_xlfd_no_space/g;
$ARG =~ s/_SERIF_JAPANESE_FILE_/$serif_japanese_file/g; $ARG =~ s/_SERIF_JAPANESE_FILE_/$serif_japanese_file/g;
$ARG =~ s/_SERIF_JAPANESE_XLFD_/$serif_japanese_xlfd/g; $ARG =~ s/_SERIF_JAPANESE_XLFD_/$serif_japanese_xlfd/g;

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 12 10:31:50 UTC 2011 - ftake@geeko.jp
- changed Japanese fonts setting for Java
* IPA Gothic for monospaced
* Propotional IPA fonts for others
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package fonts-config (Version 20080121) # spec file for package fonts-config
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: fonts-config Name: fonts-config
License: GPLv2+ License: GPLv2+
Group: System/X11/Fonts Group: System/X11/Fonts