[Pkg-kbd-commit] r177 - people/zinoviev/console-setup/Keyboard
Anton Zinoviev
zinoviev at costa.debian.org
Tue Jul 18 13:27:40 UTC 2006
Author: zinoviev
Date: 2006-07-18 13:27:38 +0000 (Tue, 18 Jul 2006)
New Revision: 177
Removed:
people/zinoviev/console-setup/Keyboard/ckb/
Modified:
people/zinoviev/console-setup/Keyboard/KeyboardNames.pl
people/zinoviev/console-setup/Keyboard/kbdcompiler
people/zinoviev/console-setup/Keyboard/kbdnames-maker
people/zinoviev/console-setup/Keyboard/xmlreader
Log:
console-setup: remove Keyboard/ckb, will sync with xkb-data
Modified: people/zinoviev/console-setup/Keyboard/KeyboardNames.pl
===================================================================
--- people/zinoviev/console-setup/Keyboard/KeyboardNames.pl 2006-07-18 11:57:38 UTC (rev 176)
+++ people/zinoviev/console-setup/Keyboard/KeyboardNames.pl 2006-07-18 13:27:38 UTC (rev 177)
@@ -7,6 +7,7 @@
'A4Tech KBS-8' => 'a4techKBS8',
'ACPI Standard' => 'acpi',
'Acer AirKey V' => 'airkey',
+ 'Acer Ferrari 4000' => 'acer_ferrari4k',
'Acer TravelMate 800' => 'acer_tm_800',
'Advance Scorpius KI' => 'scorpius',
'Azona RF2300 wireless Internet Keyboard' => 'azonaRF2300',
@@ -82,6 +83,8 @@
'Logitech Ultra-X Keyboard' => 'logiultrax',
'Logitech iTouch' => 'itouch',
'Logitech iTouch Cordless Keyboard (model Y-RB6)' => 'logiitc',
+ 'Logitech iTouch Internet Navigator Keyboard SE' => 'logiinkse',
+ 'Logitech iTouch Internet Navigator Keyboard SE (USB)' => 'logiinkseusb',
'Logitech iTouch keyboard Internet Navigator' => 'itouchin',
'Macintosh' => 'macintosh',
'Macintosh Old' => 'macintosh_old',
@@ -121,6 +124,7 @@
);
%layouts = (
+ 'Afghanistan' => 'af',
'Albania' => 'al',
'Andorra' => 'ad',
'Arabic' => 'ara',
@@ -135,6 +139,7 @@
'Bulgaria' => 'bg',
'Cambodia' => 'kh',
'Canada' => 'ca',
+ 'Congo, Democratic Republic of the' => 'cd',
'Croatia' => 'hr',
'Czechia' => 'cz',
'Denmark' => 'dk',
@@ -156,6 +161,7 @@
'Italy' => 'it',
'Japan' => 'jp',
'Kazakhstan' => 'kz',
+ 'Korea, Republic of' => 'kr',
'Kyrgyzstan' => 'kg',
'Laos' => 'la',
'Latin American' => 'latam',
@@ -186,7 +192,7 @@
'Syria' => 'sy',
'Tajikistan' => 'tj',
'Thailand' => 'th',
- 'Turkish' => 'tr',
+ 'Turkey' => 'tr',
'U.S. English' => 'us',
'Ukraine' => 'ua',
'United Kingdom' => 'gb',
@@ -195,6 +201,10 @@
);
%variants = (
+ 'af' => {
+ 'Pashto' => 'ps',
+ 'Southern Uzbek' => 'uz',
+ },
'am' => {
'Phonetic' => 'phonetic',
},
@@ -221,6 +231,7 @@
'Eliminate dead keys' => 'nodeadkeys',
'ISO Alternate' => 'iso-alternate',
'Sun dead keys' => 'sundeadkeys',
+ 'Wang model 724 azerty' => 'wang',
},
'bg' => {
'Phonetic' => 'phonetic',
@@ -268,6 +279,7 @@
'Eliminate dead keys' => 'nodeadkeys',
'Romanian keyboard with German letters' => 'ro',
'Romanian keyboard with German letters, eliminate dead keys' => 'ro_nodeadkeys',
+ 'Sun dead keys' => 'sundeadkeys',
},
'dk' => {
'Eliminate dead keys' => 'nodeadkeys',
@@ -277,6 +289,7 @@
'Eliminate dead keys' => 'nodeadkeys',
},
'es' => {
+ 'Catalan variant with middle-dot L' => 'cat',
'Dvorak' => 'dvorak',
'Eliminate dead keys' => 'nodeadkeys',
'Sun dead keys' => 'sundeadkeys',
@@ -352,7 +365,6 @@
'il' => {
'Phonetic' => 'phonetic',
'lyx' => 'lyx',
- 'si1452' => 'si1452',
},
'in' => {
'Bengali' => 'ben',
@@ -408,6 +420,9 @@
'mt' => {
'US keyboard with Maltian letters' => 'us',
},
+ 'nl' => {
+ 'Sun dead keys' => 'sundeadkeys',
+ },
'no' => {
'Dvorak' => 'dvorak',
'Eliminate dead keys' => 'nodeadkeys',
@@ -463,6 +478,10 @@
'tr' => {
'(F)' => 'f',
'Alt-Q' => 'alt',
+ 'Kurdish, (F)' => 'ku_f',
+ 'Kurdish, Latin Alt-Q' => 'ku_alt',
+ 'Kurdish, Latin Q' => 'ku',
+ 'Sun dead keys' => 'sundeadkeys',
},
'ua' => {
'Phonetic' => 'phonetic',
@@ -475,6 +494,8 @@
'Alternative international (former us_intl)' => 'alt-intl',
'Dvorak' => 'dvorak',
'International (with dead keys)' => 'intl',
+ 'Left handed Dvorak' => 'dvorak-l',
+ 'Right handed Dvorak' => 'dvorak-r',
'Russian phonetic' => 'rus',
},
);
Modified: people/zinoviev/console-setup/Keyboard/kbdcompiler
===================================================================
--- people/zinoviev/console-setup/Keyboard/kbdcompiler 2006-07-18 11:57:38 UTC (rev 176)
+++ people/zinoviev/console-setup/Keyboard/kbdcompiler 2006-07-18 13:27:38 UTC (rev 177)
@@ -4,11 +4,18 @@
use strict;
BEGIN {
- do 'KeyboardNames.pl';
+ do "$ARGV[0]";
}
-my $keymapsdir = $ARGV[0];
+my $keymapsdir = $ARGV[1];
+my $ckbdir;
+if ($ARGV[2]) {
+ $ckbdir = $ARGV[2];
+} else {
+ $ckbdir = 'ckb';
+}
+
if (! $keymapsdir) {
$keymapsdir = 'keymaps';
}
@@ -19,9 +26,17 @@
}
}
+sub execute {
+ if (0) {
+ printf STDERR "%s\n", $_[0];
+ }
+ return system ($_[0]);
+}
+
sub warning {
print STDERR "WARNING: @_";
}
+
my %legacy_charmaps = (
'ARMSCII-8' => ['am'],
'CP1251' => ['by', 'bg', 'mk', 'ru', 'sr', 'ua'],
@@ -61,7 +76,7 @@
my %generated;
my %model_dir = (
- 'amiga' => 'amiganew',
+ 'amiga' => 'amiga',
'ataritt' => 'ataritt',
'macintosh' => 'macintosh',
'macintosh_old' => 'macintosh_old',
@@ -110,12 +125,16 @@
# my $encoding_suffix = ($encoding eq '' ? '' : ".$encoding");
my $encoding_suffix = '';
my $acm = ($encoding eq 'UTF-8' ? '' : "-charmap $encoding");
+ my $encoding_dir = (($encoding eq 'UTF-8')
+ ? ${keymapsdir}
+ : "${keymapsdir}/$encoding");
my $model_dir = (defined $model_dir{$model}
- ? "${keymapsdir}/$model_dir{$model}"
- : "${keymapsdir}/other");
+ ? "${encoding_dir}/$model_dir{$model}"
+ : "${encoding_dir}/other");
$model_dir =~ s/\/$//;
+ ensuredir $keymapsdir;
+ ensuredir $encoding_dir;
ensuredir $model_dir;
- ensuredir $model_dir ."/$encoding";
my $model_prefix = (defined $model_prefix {$model}
? $model_prefix {$model}
: "$model-");
@@ -127,31 +146,28 @@
my $name = $layout;
$name =~ s/-/_/g;
$name =~ s/\///g;
-# ensuredir "$model_dir/$encoding/$name";
if ($variant) {
my $variantname = $variant;
$variantname =~ s/-/_/g;
$variantname =~ s/\///g;
- my $filename = ("$model_dir/$encoding/$model_prefix"
+ my $filename = ("$model_dir/$model_prefix"
."$name-$variantname$encoding_suffix.kmap");
print " $filename\n";
my $actual_variant = (($actual_layout =~ /,/)
? ",$variant"
: $variant);
- system ("./ckbcomp -I. -Ickb $acm -rules xorg -model $model"
+ execute ("./ckbcomp -I. -I${ckbdir} $acm -rules xorg -model $model"
." -layout $actual_layout -variant $actual_variant"
." >$filename")
- and die "$0: ckbcomp failed\n"
- if (! -f $filename);
+ and warning "$0: ckbcomp failed\n" if (! -f $filename);
$generated{"$encoding*$model*$actual_layout*$variant"} = "$filename";
} else {
- my $filename = ("$model_dir/$encoding/$model_prefix"
+ my $filename = ("$model_dir/$model_prefix"
."$name$encoding_suffix.kmap");
print " $filename\n";
- system ("./ckbcomp -I. -Ickb $acm -rules xorg -model $model"
+ execute ("./ckbcomp -I. -I${ckbdir} $acm -rules xorg -model $model"
." -layout $actual_layout >$filename")
- and die "$0: ckbcomp failed\n"
- if (! -f $filename);
+ and warning "$0: ckbcomp failed\n" if (! -f $filename);
$generated{"$encoding*$model*$actual_layout"} = "$filename";
}
}
@@ -168,7 +184,7 @@
next if ($layout eq 'nec/jp');
next if ($layout eq 'nec_vndr/jp');
for my $variant ('', values %{$KeyboardNames::variants{$layout}}) {
- $variant eq '' or next;
+# $variant eq '' or next;
compile_keymap $encoding, $model, $layout, $variant;
}
}
@@ -258,10 +274,9 @@
$filename =~ s/:/-/g;
print " $filename\n";
- system ("./ckbcomp -I. -Ickb -keycodes '$keycodes' -symbols '$layout' "
+ execute ("./ckbcomp -I. -I${ckbdir} -keycodes '$keycodes' -symbols '$layout' "
.">'$filename'")
- and die "$0: ckbcomp failed\n"
- if (! -f $filename);
+ and warning "$0: ckbcomp failed\n" if (! -f $filename);
}
}
Modified: people/zinoviev/console-setup/Keyboard/kbdnames-maker
===================================================================
--- people/zinoviev/console-setup/Keyboard/kbdnames-maker 2006-07-18 11:57:38 UTC (rev 176)
+++ people/zinoviev/console-setup/Keyboard/kbdnames-maker 2006-07-18 13:27:38 UTC (rev 177)
@@ -4,7 +4,13 @@
use strict;
BEGIN {
- do 'KeyboardNames.pl';
+ my $file;
+ if ($ARGV[0]) {
+ $file = $ARGV[0];
+ } else {
+ $file = 'KeyboardNames.pl';
+ }
+ do "$file";
}
for my $model (keys %KeyboardNames::models) {
Modified: people/zinoviev/console-setup/Keyboard/xmlreader
===================================================================
--- people/zinoviev/console-setup/Keyboard/xmlreader 2006-07-18 11:57:38 UTC (rev 176)
+++ people/zinoviev/console-setup/Keyboard/xmlreader 2006-07-18 13:27:38 UTC (rev 177)
@@ -21,6 +21,13 @@
use strict;
use encoding 'utf8';
+my $file;
+if ($ARGV[0]) {
+ $file = $ARGV[0];
+} else {
+ $file = 'ckb/rules/xorg.xml';
+}
+
sub debug {
if (1) {
print STDERR "@_";
@@ -57,7 +64,7 @@
my $parser = new XML::Parser (Style => 'Tree');
-my $tree = $parser->parsefile ('ckb/rules/xorg.xml');
+my $tree = $parser->parsefile ($file);
my %models;
my %layouts;
More information about the Pkg-kbd-commit
mailing list