Hello community, here is the log from the commit of package fonts-config for openSUSE:Factory checked in at 2011-12-06 17:58:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fonts-config (Old) and /work/SRC/openSUSE:Factory/.fonts-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fonts-config", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/fonts-config/fonts-config.changes 2011-11-07 15:51:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config.changes 2011-12-06 17:59:14.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 5 15:54:34 UTC 2011 - [email protected] + +- generates also fonts for latin1 [bnc#732447] +- dropped java 1.4 support + +------------------------------------------------------------------- Old: ---- font.properties.ja.template ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fonts-config.spec ++++++ --- /var/tmp/diff_new_pack.wWRKrL/_old 2011-12-06 17:59:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wWRKrL/_new 2011-12-06 17:59:15.000000000 +0100 @@ -32,7 +32,6 @@ Source1: SuSEconfig.fonts Source2: sysconfig.fonts-config Source3: Common.xcu.template -Source4: font.properties.ja.template Source5: fontconfig.SuSE.properties.template Source6: suse-hinting.conf.template Source7: suse-bitmaps.conf.template ++++++ fontconfig.SuSE.properties.template ++++++ --- /var/tmp/diff_new_pack.wWRKrL/_old 2011-12-06 17:59:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wWRKrL/_new 2011-12-06 17:59:15.000000000 +0100 @@ -18,128 +18,128 @@ allfonts.chinese-big5=_SANS_TRADITIONAL_CHINESE_XLFD_medium-r-normal--*-%d-*-*-*-*-big5-0 allfonts.chinese-iso10646=_SANS_SIMPLIFIED_CHINESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 -allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +#allfonts.lucida=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 allfonts.japanese-x0201=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0201.1976-0 serif.plain.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 serif.plain.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.plain.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.plain.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.plain.latin-1=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 +serif.plain.latin-1=_SERIF_LATIN1_XLFD_medium-r-normal--*-%d-*-*-p-*-iso8859-1 serif.bold.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 serif.bold.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.bold.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.bold.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.bold.latin-1=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 +serif.bold.latin-1=_SERIF_LATIN1_XLFD_bold-r-normal--*-%d-*-*-p-*-iso8859-1 serif.italic.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 serif.italic.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.italic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.italic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.italic.latin-1=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 +serif.italic.latin-1=_SERIF_LATIN1_XLFD_medium-i-normal--*-%d-*-*-p-*-iso8859-1 serif.bolditalic.japanese-x0208=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 serif.bolditalic.japanese-iso10646=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.bolditalic.korean=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 serif.bolditalic.korean.motif=_SERIF_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -serif.bolditalic.latin-1=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 +serif.bolditalic.latin-1=_SERIF_LATIN1_XLFD_bold-i-normal--*-%d-*-*-p-*-iso8859-1 sansserif.plain.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 sansserif.plain.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 sansserif.plain.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 sansserif.plain.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.plain.latin-1=_SANS_LATIN1_XLFD_medium-r-normal--*-%d-*-*-p-*-iso8859-1 sansserif.bold.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 sansserif.bold.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 sansserif.bold.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 sansserif.bold.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.bold.latin-1=_SANS_LATIN1_XLFD_bold-r-normal--*-%d-*-*-p-*-iso8859-1 sansserif.italic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 sansserif.italic.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 sansserif.italic.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 sansserif.italic.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -sansserif.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +sansserif.italic.latin-1=_SANS_LATIN1_XLFD_medium-i-normal--*-%d-*-*-p-*-iso8859-1 sansserif.bolditalic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 sansserif.bolditalic.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 sansserif.bolditalic.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 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=_SANS_LATIN1_XLFD_bold-i-normal--*-%d-*-*-p-*-iso8859-1 monospaced.plain.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_medium-r-normal--*-%d-*-*-m-*-iso8859-1 monospaced.bold.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_bold-r-normal--*-%d-*-*-m-*-iso8859-1 monospaced.italic.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_medium-i-normal--*-%d-*-*-m-*-iso8859-1 monospaced.bolditalic.japanese-x0208=_MONO_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_bold-i-normal--*-%d-*-*-m-*-iso8859-1 dialog.plain.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialog.plain.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialog.plain.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialog.plain.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.plain.latin-1=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.plain.latin-1=_SANS_LATIN1_XLFD_medium-r-normal--*-%d-*-*-p-*-iso8859-1 dialog.bold.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialog.bold.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialog.bold.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialog.bold.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.bold.latin-1=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.bold.latin-1=_SANS_LATIN1_XLFD_bold-r-normal--*-%d-*-*-p-*-iso8859-1 dialog.italic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialog.italic.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialog.italic.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialog.italic.korean.motif=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-ksc5601.1987-0 -dialog.italic.latin-1=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 +dialog.italic.latin-1=_SANS_LATIN1_XLFD_medium-i-normal--*-%d-*-*-p-*-iso8859-1 dialog.bolditalic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 dialog.bolditalic.japanese-iso10646=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 dialog.bolditalic.korean=_SANS_KOREAN_XLFD_medium-r-normal--*-%d-*-*-c-*-iso10646-1 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=_SANS_LATIN1_XLFD_bold-i-normal--*-%d-*-*-p-*-iso8859-1 dialoginput.plain.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_medium-r-normal--*-%d-*-*-m-*-iso8859-1 dialoginput.bold.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_bold-r-normal--*-%d-*-*-m-*-iso8859-1 dialoginput.italic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_medium-i-normal--*-%d-*-*-m-*-iso8859-1 dialoginput.bolditalic.japanese-x0208=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-c-*-jisx0208.1983-0 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.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=_MONO_LATIN1_XLFD_bold-i-normal--*-%d-*-*-m-*-iso8859-1 # Search Sequences @@ -154,7 +154,7 @@ sequence.allfonts.UTF-8.ja.JP=latin-1,japanese-x0208,japanese-x0201,chinese-iso10646 sequence.allfonts.UTF-8.zh=latin-1,chinese-iso10646,japanese-x0208,japanese-x0201 sequence.allfonts.EUC-KR=latin-1,korean -sequence.fallback=lucida,chinese-gbk,chinese-big5,japanese-x0208,japanese-x0201,korean +sequence.fallback=chinese-gbk,chinese-big5,japanese-x0208,japanese-x0201,korean # Exclusion Ranges exclusion.japanese-x0201=0390-03d6,2200-22ef,2701-27be @@ -196,6 +196,10 @@ filename._SERIF_TRADITIONAL_CHINESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-big5-0=_SERIF_TRADITIONAL_CHINESE_FILE_ filename._SERIF_TRADITIONAL_CHINESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-iso10646-1=_SERIF_TRADITIONAL_CHINESE_FILE_ +filename._SANS_LATIN1_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-iso8859-1=_SANS_LATIN1_FILE_ +filename._MONO_LATIN1_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-iso8859-1=_MONO_LATIN1_FILE_ +filename._SERIF_LATIN1_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-iso8859-1=_SERIF_LATIN1_FILE_ + # AWT X11 font paths awtfontpath.chinese-big5=_X11FONTDIR_ ++++++ fonts-config ++++++ --- /var/tmp/diff_new_pack.wWRKrL/_old 2011-12-06 17:59:15.000000000 +0100 +++ /var/tmp/diff_new_pack.wWRKrL/_new 2011-12-06 17:59:15.000000000 +0100 @@ -1698,11 +1698,10 @@ } ######################################################################## +# setup for Java 1.6 (for Latin1, Japanese, Chinese, and Korean): + sub generate_java_font_setup { - my @font_properties_ja_globs = ("/usr/lib*/jvm/java-1[._]4[._]?-sun-*/jre/lib/font.properties.ja"); - my $font_properties_ja_template_file = "/usr/share/fonts-config/font.properties.ja.template"; - my $font_properties_ja_template = ""; my @fontconfig_SuSE_properties_globs = "/usr/lib*/jvm/jre/lib/fontconfig.SuSE.properties"; my $fontconfig_SuSE_properties_template_file = "/usr/share/fonts-config/fontconfig.SuSE.properties.template"; my $fontconfig_SuSE_properties_template = ""; @@ -1748,7 +1747,19 @@ my @serif_korean_priority = ("UnBatang", "Baekmuk Batang"); - + + my @sans_latin1_priority = ("DejaVu Sans:style=Book:width=100", # fc-list $font file should return only one result + "Liberation Sans:style=Regular", # otherwise last one is taken in present + "Droid Sans:style=Regular"); # generate_java_font_setup() structure + + my @mono_latin1_priority = ("DejaVu Sans Mono:style=Book", + "Liberation Mono:style=Regular", + "Droid Sans Mono:style=Regular"); + + my @serif_latin1_priority = ("DejaVu Serif:style=Book:width=100", + "Liberation Serif:style=Regular", + "Droid Serif:style=Regular"); + my %cjk_xlfds = ( "MS Gothic" , "-ricoh-ms gothic-", @@ -1798,6 +1809,15 @@ my $serif_korean_xlfd = "-baekmukttf-batang-"; my $serif_korean_file = "/usr/share/fonts/truetype/batang.ttf"; + + my $sans_latin1_xlfd = ""; + my $sans_latin1_file = ""; + + my $mono_latin1_xlfd = ""; + my $mono_latin1_file = ""; + + my $serif_latin1_xlfd = ""; + my $serif_latin1_file = ""; for my $font (@sans_japanese_priority) { if (`fc-list "$font"`) { @@ -1987,6 +2007,72 @@ if ( ! -f $serif_korean_file ) { print "Warning: cannot find a serif Korean font. Korean in Java might not work.\n"; } + + for my $font (@sans_latin1_priority) { + if (`fc-list "$font"`) { + open (NAMES, "fc-list \"$font\" file |"); + binmode NAMES, ":bytes"; + while (<NAMES>) { # should be only one line, see @sans_latin1_priority definition + chomp $ARG; # TODO: rewrite this to reflect it + $ARG =~ s/:.*$//; + if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") { + $sans_latin1_file = $ARG; + $font =~ s/:.*$//; + ($sans_latin1_xlfd = "-misc-$font-") =~ tr/[A-Z]/[a-z]/; + last; + } + } + close (NAMES); + } + } + + if ( -z $sans_latin1_file ) { + print "Warning: cannot find a serif font. Java font setup failed.\n"; + } + + for my $font (@mono_latin1_priority) { + if (`fc-list "$font"`) { + open (NAMES, "fc-list \"$font\" file |"); + binmode NAMES, ":bytes"; + while (<NAMES>) { # should be only one line, see @sans_latin1_priority definition + chomp $ARG; # TODO: rewrite this to reflect it + $ARG =~ s/:.*$//; + if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") { + $mono_latin1_file = $ARG; + $font =~ s/:.*$//; + ($mono_latin1_xlfd = "-misc-$font-") =~ tr/[A-Z]/[a-z]/; + } + } + close (NAMES); + last; + } + } + + if ( -z $mono_latin1_file ) { + print "Warning: cannot find a mono font. Java font setup failed.\n"; + } + + for my $font (@serif_latin1_priority) { + if (`fc-list "$font"`) { + open (NAMES, "fc-list \"$font\" file |"); + binmode NAMES, ":bytes"; + while (<NAMES>) { # should be only one line, see @sans_latin1_priority definition + chomp $ARG; # TODO: rewrite this to reflect it + $ARG =~ s/:.*$//; + if ($ARG =~ /\.ttf|\.ttc/ && -f "$ARG" && ! -l "$ARG") { + $serif_latin1_file = $ARG; + $font =~ s/:.*$//; + ($serif_latin1_xlfd = "-misc-$font-") =~ tr/[A-Z]/[a-z]/; + } + } + close (NAMES); + last; + } + } + + if ( -z $serif_latin1_file ) { + print "Warning: cannot find a serif font. Java font setup failed.\n"; + } (my $sans_japanese_xlfd_no_space = $sans_japanese_xlfd) =~ s/ /_/g; (my $mono_japanese_xlfd_no_space = $mono_japanese_xlfd) =~ s/ /_/g; @@ -2001,6 +2087,10 @@ (my $sans_korean_xlfd_no_space = $sans_korean_xlfd) =~ s/ /_/g; (my $serif_korean_xlfd_no_space = $serif_korean_xlfd) =~ s/ /_/g; + (my $sans_latin1_xlfd_no_space = $sans_latin1_xlfd) =~ s/ /_/g; + (my $mono_latin1_xlfd_no_space = $mono_latin1_xlfd) =~ s/ /_/g; + (my $serif_latin1_xlfd_no_space = $serif_latin1_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); @@ -2017,39 +2107,12 @@ 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); + + printf ("sans_latin1_file=%s\n", $sans_latin1_file); + printf ("sans_latin1_xlfd=%s\n", $sans_latin1_xlfd); + printf ("sans_latin1_xlfd_no_space=%s\n", $sans_latin1_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: $!"; - binmode TEMPLATE, ":utf8"; - while (<TEMPLATE>) { - $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_XLFD_/$sans_japanese_xlfd/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_XLFD_/$serif_japanese_xlfd/g; - $font_properties_ja_template .= $ARG; - } - close (TEMPLATE); - for my $globpattern (@font_properties_ja_globs) { - for my $file (glob ("$globpattern")) { - if (-f "$file") { - if ($VERBOSITY >= $VERBOSITY_QUIET) { - printf "writing $file\n"; - } - open (FONTPROP, ">$file") || die "can't open file $file: $!"; - binmode FONTPROP, ":utf8"; - print FONTPROP $font_properties_ja_template; - close (FONTPROP); - } - } - } - } - - # setup for Java 1.5 (for Japanese, Chinese, and Korean): - # I hope it is good enough to get the font directory from the full # path of the Japanese sans serif file. # Probably all fonts are in the same directory: @@ -2090,6 +2153,16 @@ $ARG =~ s/_SERIF_KOREAN_FILE_/$serif_korean_file/g; $ARG =~ s/_SERIF_KOREAN_XLFD_/$serif_korean_xlfd/g; + $ARG =~ s/_SANS_LATIN1_XLFD_NO_SPACE_/$sans_latin1_xlfd_no_space/g; + $ARG =~ s/_SANS_LATIN1_FILE_/$sans_latin1_file/g; + $ARG =~ s/_SANS_LATIN1_XLFD_/$sans_latin1_xlfd/g; + $ARG =~ s/_MONO_LATIN1_XLFD_NO_SPACE_/$mono_latin1_xlfd_no_space/g; + $ARG =~ s/_MONO_LATIN1_FILE_/$mono_latin1_file/g; + $ARG =~ s/_MONO_LATIN1_XLFD_/$mono_latin1_xlfd/g; + $ARG =~ s/_SERIF_LATIN1_XLFD_NO_SPACE_/$serif_latin1_xlfd_no_space/g; + $ARG =~ s/_SERIF_LATIN1_FILE_/$serif_latin1_file/g; + $ARG =~ s/_SERIF_LATIN1_XLFD_/$serif_latin1_xlfd/g; + $ARG =~ s/_X11FONTDIR_/$x11fontdir/; $fontconfig_SuSE_properties_template .= $ARG; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
