[PATCH 3/7] xkeyboard-config: Symbols for Apple Aluminium keyboards

[Damien Ciabrini]

Symbols common to ANSI, ISO and JIS keyboards
New jp file for JIS keyboard to override traditional jp mapping (including EISU and KANA keys)
---
 symbols/macintosh_vndr/apple |   17 +++++++++++++++++
 symbols/macintosh_vndr/jp    |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 symbols/macintosh_vndr/jp

diff --git a/symbols/macintosh_vndr/apple b/symbols/macintosh_vndr/apple
index 3887caf..2597dbf 100644
--- a/symbols/macintosh_vndr/apple
+++ b/symbols/macintosh_vndr/apple
@@ -52,3 +52,20 @@ xkb_symbols "laptop_bad_switch" {
     // Kept for backward compatibility
     include "macintosh_vndr/apple(laptop)"
 };
+
+// Keys found on Aluminium Keyboards
+partial function_keys
+xkb_symbols "alukeys" {
+    // Additional Fxx keys
+    key <FK13> { [ F13 ] };
+    key <FK14> { [ F14 ] };
+    key <FK15> { [ F15 ] };
+    key <FK16> { [ F16 ] };
+    key <FK17> { [ F17 ] };
+    key <FK18> { [ F18 ] };
+    key <FK19> { [ F19 ] };
+    // On aluminium keyboards, Num_Lock is replace by Clear
+    replace key <NMLK> { [ XF86Clear ] };
+    // CAPS key is always Caps_Lock, even for JIS keyboards
+    replace key <CAPS> { [ Caps_Lock ] };
+};
diff --git a/symbols/macintosh_vndr/jp b/symbols/macintosh_vndr/jp
new file mode 100644
index 0000000..4e3ad59
--- /dev/null
+++ b/symbols/macintosh_vndr/jp
@@ -0,0 +1,32 @@
+// JIS keymap for Apple keyboards
+// Aluminium Keyboard (c) Damien Ciabrini (damien.ciabrini at gmail.com)
+
+partial default alphanumeric_keys
+xkb_symbols "alukbd_romaji" {
+    name[Group1]	= "Japan";
+    include "jp(common)"
+
+    key <JPCM> { [ KP_Separator ] };
+    key <AE13> { [ yen, bar 	] };
+    replace key <AE10> { [ 0		] };
+    replace key <AB11> { [ underscore	] };
+    replace key <CAPS> { [ Caps_Lock ] };
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "alukbd_kana" {
+    name[Group1]	= "Japan - Kana";
+    include "jp(kana)"
+
+    replace key <CAPS> { [ Caps_Lock ] };
+};
+
+// Apple Aluminium Keyboard JIS
+partial alphanumeric_keys
+xkb_symbols "alukey_jis" {
+    // On JIS USB keyboard, EISU and KANA replace Hangul and Hanja
+    // see keycodes macintosh(jisevdev)
+    replace key <HJCV> { [ Hiragana_Katakana ] };
+    replace key <HNGL> { [ Eisu_toggle ] };
+};
-- 
1.6.3.3