simplify since we don't use X11 fonts (we can't since GDK_USE_XFT is not switchable once program is launched)

1 files changed, 10 insertions, 16 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index b9fa76135..67bbfe00e 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -546,31 +546,25 @@ sub charset2kde_font {
 # this define pango name fonts (like "NimbusSans L") depending
 # on the "charset" defined by language array. This allows to selecting
 # an appropriate font for each language.
-# the [0] field tells the font filename,
-# if field [1] is empty, that means the X11 fontset mechanism has ot be used.
 my %charset2pango_font = (
-  'ksc5601' =>    [ "baekmuk_gulim_h_14.pcf" ],
-  'gb2312' =>     [ "gb16fs.pcf" ],
-  'Big5' =>       [ "taipei16.pcf" ],
-  'jisx0208' =>   [ "12x13ja.pcf",     "Nimbus Sans L" ],
-  'tis620' =>     [ "norasi_n.ttf",    "Norasi" ],
-  'tscii' =>      [ "tscava.ttf",      "TSC_Avarangal" ],
-  'utf_vi' =>     [ "cu12.pcf",        "ClearlyU" ],
-  'utf_hy' =>     [ "artsnk_m.ttf",    "Artsounk" ],
-  'utf_ka' =>     [ "cu12.pcf",        "ClearlyU" ],
-  'iso-8859-6' => [ "cu12.pcf",        "ClearlyU" ],
-  'iso-8859-7' => [ "k.pfb",           "Kerkis" ],
-  'iso-8859-8' => [ "KacstBook.pcf",   "KacstBook" ],
+  'tis620' =>     "Norasi",
+  'tscii' =>      "TSC_Avarangal",
+  'utf_vi' =>     "ClearlyU",
+  'utf_hy' =>     "Artsounk",
+  'utf_ka' =>     "ClearlyU",
+  'iso-8859-6' => "ClearlyU",
+  'iso-8859-7' => "Kerkis",
+  'iso-8859-8' => "KacstBook",
   #- Nimbus Sans L is missing some chars used by some cyrillic languages,
   #- but tose haven't yet DrakX translations; it also misses vietnamese
   #- latin chars; all other latin and cyrillic are covered.
-  'default' =>    [ "NimbusSansL-Regu.pfb", "Nimbus Sans L" ]
+  'default' =>    "Nimbus Sans L"
 );
 
 sub charset2pango_font {
     my ($charset) = @_;
     
-    $charset2pango_font{exists $charset2pango_font{$charset} ? $charset : 'default'}[1];
+    $charset2pango_font{exists $charset2pango_font{$charset} ? $charset : 'default'};
 }
 
 sub lang2pango_font {