From b62b01990d042cb08a5df62007dfe4198d99af299e101d7d7706b06ab412a6dc Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 6 Dec 2011 09:54:40 +0000 Subject: [PATCH] - generates also fonts for latin1 [bnc#732447] - dropped java 1.4 support OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=12 --- font.properties.ja.template | 243 ---------------------------- fontconfig.SuSE.properties.template | 48 +++--- fonts-config | 143 ++++++++++++---- fonts-config.changes | 6 + fonts-config.spec | 1 - 5 files changed, 140 insertions(+), 301 deletions(-) delete mode 100644 font.properties.ja.template diff --git a/font.properties.ja.template b/font.properties.ja.template deleted file mode 100644 index a8a1493..0000000 --- a/font.properties.ja.template +++ /dev/null @@ -1,243 +0,0 @@ -# @(#)font.properties.ja for SuSE Linux 9.2 -# - -serif.0=-b&h-lucidabright-medium-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -serif.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -serif.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -serif.italic.0=-b&h-lucidabright-medium-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.italic.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -serif.italic.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -serif.italic.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -serif.bold.0=-b&h-lucidabright-demibold-r-normal--*-%d-*-*-p-*-iso8859-1 -serif.bold.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -serif.bold.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -serif.bold.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -serif.bolditalic.0=-b&h-lucidabright-demibold-i-normal--*-%d-*-*-p-*-iso8859-1 -serif.bolditalic.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -serif.bolditalic.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -serif.bolditalic.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -sansserif.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -sansserif.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -sansserif.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -sansserif.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.italic.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -sansserif.italic.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -sansserif.italic.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -sansserif.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bold.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -sansserif.bold.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -sansserif.bold.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -sansserif.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -sansserif.bolditalic.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -sansserif.bolditalic.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -sansserif.bolditalic.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -monospaced.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.1=_SERIF_JAPANESE_XLFD_medium-r-normal-sans-*-%d-*-*-*-*-jisx0201.1976-0 -monospaced.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -monospaced.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -monospaced.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.italic.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -monospaced.italic.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -monospaced.italic.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -monospaced.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bold.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -monospaced.bold.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -monospaced.bold.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -monospaced.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -monospaced.bolditalic.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -monospaced.bolditalic.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -monospaced.bolditalic.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialog.0=-b&h-lucidasans-medium-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialog.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialog.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialog.italic.0=-b&h-lucidasans-medium-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.italic.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialog.italic.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialog.italic.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialog.bold.0=-b&h-lucidasans-bold-r-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bold.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialog.bold.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialog.bold.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialog.bolditalic.0=-b&h-lucidasans-bold-i-normal-sans-*-%d-*-*-p-*-iso8859-1 -dialog.bolditalic.1=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialog.bolditalic.2=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialog.bolditalic.3=_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialoginput.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialoginput.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialoginput.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialoginput.italic.0=-b&h-lucidatypewriter-medium-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.italic.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialoginput.italic.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialoginput.italic.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialoginput.bold.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bold.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialoginput.bold.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialoginput.bold.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -dialoginput.bolditalic.0=-b&h-lucidatypewriter-bold-r-normal-sans-*-%d-*-*-m-*-iso8859-1 -dialoginput.bolditalic.1=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0 -dialoginput.bolditalic.2=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 -dialoginput.bolditalic.3=_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1 - -# Missing Glyph Character -# -default.char=274f - -# Component Font Character Encodings -# -fontcharset.serif.0=sun.io.CharToByteISO8859_1 -fontcharset.serif.1=sun.awt.motif.CharToByteX11JIS0201 -fontcharset.serif.2=sun.awt.motif.CharToByteX11JIS0208 - -fontcharset.sansserif.0=sun.io.CharToByteISO8859_1 -fontcharset.sansserif.1=sun.awt.motif.CharToByteX11JIS0201 -fontcharset.sansserif.2=sun.awt.motif.CharToByteX11JIS0208 - -fontcharset.monospaced.0=sun.io.CharToByteISO8859_1 -fontcharset.monospaced.1=sun.awt.motif.CharToByteX11JIS0201 -fontcharset.monospaced.2=sun.awt.motif.CharToByteX11JIS0208 - -fontcharset.dialog.0=sun.io.CharToByteISO8859_1 -fontcharset.dialog.1=sun.awt.motif.CharToByteX11JIS0201 -fontcharset.dialog.2=sun.awt.motif.CharToByteX11JIS0208 - -fontcharset.dialoginput.0=sun.io.CharToByteISO8859_1 -fontcharset.dialoginput.1=sun.awt.motif.CharToByteX11JIS0201 -fontcharset.dialoginput.2=sun.awt.motif.CharToByteX11JIS0208 - -# Exclusion Ranges -# - -# XFontSet Information -# -fontset.serif.plain=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.serif.italic=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.serif.bold=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.serif.bolditalic=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.sansserif.plain=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.sansserif.italic=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.sansserif.bold=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.sansserif.bolditalic=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.monospaced.plain=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.monospaced.italic=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.monospaced.bold=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.monospaced.bolditalic=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialog.italic=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialog.bold=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialog.bolditalic=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialog.plain=\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SANS_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialoginput.italic=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialoginput.bold=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialoginput.bolditalic=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.dialoginput.plain=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -fontset.default=\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-iso10646-1,\ -_SERIF_JAPANESE_XLFD_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0 - -filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0=_SERIF_JAPANESE_FILE_ -filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0=_SERIF_JAPANESE_FILE_ -filename._SERIF_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-iso10646-1=_SERIF_JAPANESE_FILE_ -filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-jisx0201.1976-0=_SANS_JAPANESE_FILE_ -filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-jisx0208.1983-0=_SANS_JAPANESE_FILE_ -filename._SANS_JAPANESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-iso10646-1=_SANS_JAPANESE_FILE_ - -# Exclusion Ranges -# -exclusion.dialog.2=0390-03d6,2200-22ef,2701-27be -exclusion.dialoginput.2=0390-03d6,2200-22ef,2701-27be -exclusion.serif.2=0390-03d6,2200-22ef,2701-27be -exclusion.sansserif.2=0390-03d6,2200-22ef,2701-27be -exclusion.monospaced.2=0390-03d6,2200-22ef,2701-27be - -exclusion.dialog.1=0390-03d6,2200-22ef,2701-27be -exclusion.dialoginput.1=0390-03d6,2200-22ef,2701-27be -exclusion.serif.1=0390-03d6,2200-22ef,2701-27be -exclusion.sansserif.1=0390-03d6,2200-22ef,2701-27be -exclusion.monospaced.1=0390-03d6,2200-22ef,2701-27be - -appendedfontpath=/usr/share/fonts:/usr/X11R6/lib/X11/fonts/truetype - - - diff --git a/fontconfig.SuSE.properties.template b/fontconfig.SuSE.properties.template index a9b9cc9..38d67d8 100644 --- a/fontconfig.SuSE.properties.template +++ b/fontconfig.SuSE.properties.template @@ -18,128 +18,128 @@ allfonts.chinese-gb2312=_SANS_SIMPLIFIED_CHINESE_XLFD_medium-r-normal--*-%d-*-*- 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.x-euc-jp-linux=latin-1,japanese-x0208,japanese-x0201 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._SANS_TRADITIONAL_CHINESE_XLFD_NO_SPACE_medium-r-normal--*-%d-*-*-*-*-i 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_ diff --git a/fonts-config b/fonts-config index 6cec6ea..326da4b 100644 --- a/fonts-config +++ b/fonts-config @@ -1698,11 +1698,10 @@ sub generate_ooo_font_setup { } ######################################################################## +# 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 @@ sub generate_java_font_setup { 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 @@ sub generate_java_font_setup { 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 @@ sub generate_java_font_setup { 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 () { # 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 () { # 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 () { # 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 @@ 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; + (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 @@ sub generate_java_font_setup { 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 (