[PATCH 5/7] xkeyboard-config: Evdev rules for Apple Aluminium Keyboards

[Damien Ciabrini]

Rules to define the geometry and symbols to use for ANSI, ISO and JIS keyboards
Special rules to enable dual layout (us+jp) on JIS keyboard
---
 rules/base.m_g.part  |    1 +
 rules/base.ml_s.part |    4 ++++
 rules/evdev.m_k.part |    1 +
 rules/evdev.m_s.part |    1 +
 4 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index 289a376..a99869b 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -16,6 +16,7 @@
  $tmgeometries	=	typematrix(%m)
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
+ $applealu	=	apple_vndr/alukbd(%m)
  $macbooks      =       macintosh(%m)
  $macs		=	macintosh(macintosh)
   hhk		=	hhk(basic)
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 1c16b6b..fb6727e 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -19,6 +19,10 @@
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
   macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
+  applealu_jis	jp			=	pc+macintosh_vndr/jp(alukbd_romaji)+macintosh_vndr/jp(alukbd_kana):2+macintosh_vndr/apple(alukeys)
+  applealu_jis	*			=	pc+%l%(v)+macintosh_vndr/jp(alukbd_kana):2+macintosh_vndr/apple(alukeys)
+ $applealu	$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)+macintosh_vndr/apple(alukeys)
+ $applealu	*			=	pc+%l%(v)+macintosh_vndr/apple(alukeys)
  $macs		en_US			=	pc+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
   nokiarx44	*			=	nokia_vndr/rx-44(%l)
diff --git a/rules/evdev.m_k.part b/rules/evdev.m_k.part
index 8fa8f8d..8106754 100644
--- a/rules/evdev.m_k.part
+++ b/rules/evdev.m_k.part
@@ -1,2 +1,3 @@
   pc98		=	evdev(pc98)
+  applealu_jis	=	evdev+macintosh(jisevdev)
   *		=	evdev
diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part
index 516c976..5437e31 100644
--- a/rules/evdev.m_s.part
+++ b/rules/evdev.m_s.part
@@ -1,2 +1,3 @@
   $evdevkbds    =   +inet(evdev)+inet(%m)
+  applealu_jis  =   +inet(evdev)+macintosh_vndr/jp(alukey_jis)
   *             =   +inet(evdev)
-- 
1.6.3.3