no_comment

1 files changed, 32 insertions, 65 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 991eb1c73..d5eb23ec1 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -51,74 +51,42 @@ my %languages = (
 'zh_TW.Big5' => [ 'Chinese (Big5)',     'Big5', 'zh_TW.Big5', 'zh_TW.Big5:zh_TW.big5' ],
 );
 
+sub std2 { "-mdk-helvetica-medium-r-normal-*-*-$_[1]-*-*-*-*-$_[0]" }
+sub std_ { std2($_[0], 100), std2($_[0], 100) }
+sub std  { std2($_[0], 100), std2($_[0],  80) }
+
 my %charsets = (
-  "armscii-8"  => [ "arm8",			"armscii8",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-*helv*-medium-r-normal--14-*-*-*-*-armscii-8" ],
+  "armscii-8"  => [ "arm8",			"armscii8", std_("armscii-8") ],
 #- chinese needs special console driver for text mode
   "Big5"       => [ "?????",                    "????",
-        "*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1," .
-        "-taipei-*-medium-r-normal--16-*-*-*-*-*-big5-0" ],
-  "iso-8859-1" => [ "lat0-sun16",		"iso15",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1" ],
-  "iso-8859-2" => [ "lat2-sun16",		"iso02",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-2" ],
-  "iso-8859-3" => [ "iso03.f16",		"iso03",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-3" ],
-  "iso-8859-4" => [ "lat4u-16",		        "iso04",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-4" ],
-  "iso-8859-5" => [ "iso05.f16",		"iso05",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-5" ],
+	"-*-*-*-*-*-*-*-*-*-*-*-*-big5-0" ],
+  "iso-8859-1" => [ "lat0-sun16",		"iso15", std("iso8859-1") ],
+  "iso-8859-2" => [ "lat2-sun16",		"iso02", std("iso8859-2") ],
+  "iso-8859-3" => [ "iso03.f16",		"iso03", std_("iso8859-3") ],
+  "iso-8859-4" => [ "lat4u-16",		        "iso04", std_("iso8859-4") ],
+  "iso-8859-5" => [ "iso05.f16",		"iso05", std("iso8859-5") ],
 #- arabic needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
-  "iso-8859-6" => [ "iso06.f16",		"iso06",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-6" ],
-  "iso-8859-7" => [ "iso07.f16",		"iso07",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-7" ],
+  "iso-8859-6" => [ "iso06.f16",		"iso06", std_("iso8859-6") ],
+  "iso-8859-7" => [ "iso07.f16",		"iso07", std_("iso8859-7") ],
 #- hebrew needs special console driver for text mode (none yet)
 #- (and gtk support isn't done yet)
-  "iso-8859-8" => [ "iso08.f16",		"iso08",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-8" ],
-  "iso-8859-9" => [ "lat5-16",		        "iso09",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-9" ],
-  "iso-8859-13" => [ "??????",			"?????",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-13" ],
-  "iso-8859-14" => [ "??????",			"?????",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-14" ],
-  "iso-8859-15" => [ "lat0-sun16",		"iso15",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-15" ],
+  "iso-8859-8" => [ "iso08.f16",		"iso08", std_("iso8859-8") ],
+  "iso-8859-9" => [ "lat5-16",		        "iso09", std("iso8859-9") ],
+  "iso-8859-13" => [ "??????",			"?????", std_("iso8859-13") ],
+  "iso-8859-14" => [ "??????",			"?????", std_("iso8859-14") ],
+  "iso-8859-15" => [ "lat0-sun16",		"iso15", std("iso8859-15") ],
 #- japanese needs special console driver for text mode [kon2]
-  "jisx0208"   => [ "????",			"????",
-        "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-        "-*-*-medium-r-normal--14-*-*-*-*-*-jisx0208.*-0," .
-        "-*-*-medium-r-normal--14-*-*-*-*-*-jisx0201.*-0" ],
-  "koi8-r"     => [ "Cyr_a8x16",		"koi2alt",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-koi8-r" ],
-  "koi8-u"     => [ "ruscii_8x16",		"koi2alt",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-koi8-u" ],
+  "jisx0208"   => [ "????",			"????", 
+	"-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
+  "koi8-r"     => [ "Cyr_a8x16",		"koi2alt", std("koi8-r") ],
+  "koi8-u"     => [ "ruscii_8x16",		"koi2alt", std("koi2-u") ],
 #- korean needs special console driver for text mode
   "ksc5601"    => [ "?????",                    "?????",
-        "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-        "-*-*-medium-*-*--14-*-*-*-*-*-ksc5601.1987-*" ],
-  "tcvn"       => [ "tcvn8x16",		        "tcvn",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-tcvn-5712" ],
+	"-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ],
+  "tcvn"       => [ "tcvn8x16",		        "tcvn", std2("tcvn-5712", 130), std2("tcvn-5712", 100) ],
   "viscii"     => [ "viscii10-8x16",	        "viscii",
-	"*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1," .
-	"*-helvetica-medium-r-normal--14-*-*-*-*-viscii1.1-1" ],
+	"-*-*-*-*-*-*-*-*-*-*-*-*-viscii*.*-*" ],
 );
 
 #-######################################################################################
@@ -229,14 +197,13 @@ sub load_po($) {
 #-
 #-}
 
-#-sub get_x_fontset {
-#-    my ($lang) = @_;
-#-    my $def = "*-helvetica-medium-r-normal--14-*-*-*-*-iso8859-1";
-#-
-#-    my $l = $languages{$lang}  or return $def;
-#-    my $c = $charsets{$l->[1]} or return $def;
-#-    $c->[2];
-#-}
+sub get_x_fontset {
+    my ($lang) = @_;
+
+    my $l = $languages{$lang}  or return;
+    my $c = $charsets{$l->[1]} or return;
+    @$c[2..3];
+}
 
 #-######################################################################################
 #- Wonderful perl :(