diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_gtk.pm | 14 | ||||
| -rw-r--r-- | perl-install/lang.pm | 38 |
2 files changed, 27 insertions, 25 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index 0174e8a26..499b344cc 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -45,11 +45,10 @@ sub install_theme { load_rc($_) foreach "themes-$o->{theme}", "install", "themes"; - my $pango_font_name_10 = ""; - my $pango_font_name_12 = ""; + my %pango_font_name; if (my $pango_font = lang::lang2pango_font($o->{lang})) { - $pango_font_name_10 = "font_name = \"$pango_font 10\"" - $pango_font_name_12 = "font_name = \"$pango_font 12\"" + $pango_font_name{10} = "font_name = \"$pango_font 10\""; + $pango_font_name{12} = "font_name = \"$pango_font 12\""; } if (my ($font, $font2) = lang::get_x_fontset($o->{lang}, $::rootwidth < 800 ? 10 : 12)) { $font2 ||= $font; @@ -57,12 +56,12 @@ sub install_theme { style "default-font" { fontset = "$font,*" - $pango_font_name_12 + $pango_font_name{12} } style "small-font" { fontset = "$font2,*" - $pango_font_name_10 + $pango_font_name{10} } widget "*" style "default-font" widget "*Steps*" style "small-font" @@ -189,6 +188,9 @@ sub create_logo_window { #------------------------------------------------------------------------------ sub init_gtk() { + symlink("/tmp/stage2/etc/gtk-2.0", "/etc/gtk-2.0"); + symlink("/tmp/stage2/etc/pango", "/etc/pango"); + symlink("/tmp/stage2/etc/fonts", "/etc/fonts"); Gtk2->init(\@ARGV); Gtk2->set_locale; } diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 7fa15b377..4bce6aa7a 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -549,37 +549,37 @@ sub charset2kde_font { # 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 = ( - 'jisx0208' => ["k14.pcf"], [ "" ], - 'ksc5601' => ["baekmuk_gulim_h_14.pcf"], [ "" ], - 'gb2312' => ["gb16fs.pcf"], [ "" ], - 'Big5' => ["taipei16.pcf"], [ "" ], - '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-7' => ["k.pfb"], [ "Kerkis" ], - 'iso-8859-8' => ["cu12.pcf"], [ "ClearlyU" ], - 'iso-8859-6' => ["cu12.pcf"], [ "ClearlyU" ], + 'jisx0208' => [ "k14.pcf" ], + 'ksc5601' => [ "baekmuk_gulim_h_14.pcf" ], + 'gb2312' => [ "gb16fs.pcf" ], + 'Big5' => [ "taipei16.pcf" ], + '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-7' => [ "k.pfb", "Kerkis" ], + 'iso-8859-8' => [ "cu12.pcf", "ClearlyU" ], + 'iso-8859-6' => [ "cu12.pcf", "ClearlyU" ], #- 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' => [ "NimbusSansL-Regu.pfb", "Nimbus Sans L" ] ); sub charset2pango_font { - my ($charset, $type) = @_; + my ($charset) = @_; - my $font = $charset2pango_font{$charset}->[1] || $charset2pango_font{default}->[1]; - "$font"; + $charset2pango_font{$charset}->[1] || $charset2pango_font{default}->[1]; } sub lang2pango_font { my ($lang) = @_; - my $charset = lang2charset($lang) or return; - my $font = $charset2pango_font($charset); - "$font"; + my $charset = lang2charset($lang) or log::l("no charset found for lang $lang!"), return; + my $font = charset2pango_font($charset); + log::l("charset : $charset ; font : $font"); + return $font; } sub set { |