merge heads
authorasano
Fri, 08 Jan 2010 10:51:10 +0900
changeset 454 af51d915bbd3
parent 453 8c53a018137a (current diff)
parent 452 6ffc53b06085 (diff)
child 455 fb16726337be
merge heads
src/xorg/keytables/sun-src/symbols/ara
src/xorg/keytables/sun-src/symbols/be
src/xorg/keytables/sun-src/symbols/ch
src/xorg/keytables/sun-src/symbols/de
src/xorg/keytables/sun-src/symbols/dk
src/xorg/keytables/sun-src/symbols/es
src/xorg/keytables/sun-src/symbols/fi
src/xorg/keytables/sun-src/symbols/fr
src/xorg/keytables/sun-src/symbols/gb
src/xorg/keytables/sun-src/symbols/it
src/xorg/keytables/sun-src/symbols/kr
src/xorg/keytables/sun-src/symbols/nl
src/xorg/keytables/sun-src/symbols/no
src/xorg/keytables/sun-src/symbols/pt
src/xorg/keytables/sun-src/symbols/ru
src/xorg/keytables/sun-src/symbols/se
--- a/pkgmaps/prototype.xorg-xkb	Thu Jan 07 18:36:35 2010 +0900
+++ b/pkgmaps/prototype.xorg-xkb	Fri Jan 08 10:51:10 2010 +0900
@@ -348,25 +348,36 @@
 d none share/X11/xkb/symbols/sun_vndr 0755 root bin
 f none share/X11/xkb/symbols/sun_vndr/ara 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/be 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/br 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/ca 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/ch 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/cz 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/de 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/dk 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/ee 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/es 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/fi 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/fr 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/gb 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/gr 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/it 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/jp 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/kr 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/lt 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/lv 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/nl 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/no 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/pl 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/pt 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/ro 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/ru 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/se 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/sk 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/solaris 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/tr 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/tuv 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/tw 0444 root bin
+f none share/X11/xkb/symbols/sun_vndr/ua 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/us 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/us_old 0444 root bin
 f none share/X11/xkb/symbols/sun_vndr/usb 0444 root bin
--- a/src/xorg/keytables/sun-src/rules/base	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/rules/base	Fri Jan 08 10:51:10 2010 +0900
@@ -139,9 +139,10 @@
 ! $sun_jp = sun_type4_jp sun_type5_jp sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
 
 // Sun Type 6 keyboards with custom/non-standard layouts
-! $sun_t6_custom = ara be ch de dk es fi fr \
-                   gb it kr nl no pt ru \
-                   se tr tw \
+! $sun_t6_custom = ara be br ca ch cz de dk \
+		   ee es fi fr gb gr it kr \
+		   lt lv nl no pl pt ro ru \
+		   se sk tr tw ua
 
 
 ! model			=	keycodes
@@ -361,18 +362,18 @@
   amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
   classmate	us			=	pc+%l(classmate)
-  $sun_type4    $sun_t6_custom       	=       pc+sun_vndr/us(type4)+%l%(v)
-  $sun_type5    $sun_t6_custom		=       pc+sun_vndr/us(type5)+%l%(v)
-  $sun_hobo     $sun_t6_custom 		=       pc+sun_vndr/us(type5hobo)+%l%(v)
+  $sun_type4    $sun_t6_custom       	=       pc+sun_vndr/us(type4)+sun_vndr/%l%(v)
+  $sun_type5    $sun_t6_custom		=       pc+sun_vndr/us(type5)+sun_vndr/%l%(v)
+  $sun_hobo     $sun_t6_custom 		=       pc+sun_vndr/us(type5hobo)+sun_vndr/%l%(v)
   $sun_type6    us      		=       pc+sun_vndr/us(type6)
   $sun_type6    jp      		=       sun_vndr/us_old(type6)+sun_vndr/jp(type6)
   $sun_type7    jp      		=       sun_vndr/us_old(type6)+sun_vndr/jp(type7)
   jp106         jp      		=       sun_vndr/us_old(type6)+sun_vndr/jp(type7)
   $sun_type5    tw                      =       sun_vndr/us_old(type5)+sun_vndr/tw(type5)
   $sun_type6    tw                      =       sun_vndr/us_old(type6)+sun_vndr/tw(type6)
-  $sun_type6    $sun_t6_custom		=       pc+sun_vndr/us(type6)+%l%(v)
+  $sun_type6    $sun_t6_custom		=       pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
   $sun_type7    us      		=       pc+sun_vndr/us(type6)
-  $sun_type7    $sun_t6_custom 		=       pc+sun_vndr/us(type6)+%l%(v)
+  $sun_type7    $sun_t6_custom 		=       pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
@@ -470,13 +471,13 @@
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
-  $sun_type4    $sun_t6_custom          =       pc+sun_vndr/us(type4)+%l[1]%(v[1])
-  $sun_type5    $sun_t6_custom          =       pc+sun_vndr/us(type5)+%l[1]%(v[1])
-  $sun_hobo     $sun_t6_custom          =       pc+sun_vndr/us(type5hobo)+%l[1]%(v[1])
+  $sun_type4    $sun_t6_custom          =       pc+sun_vndr/us(type4)+sun_vndr/%l[1]%(v[1])
+  $sun_type5    $sun_t6_custom          =       pc+sun_vndr/us(type5)+sun_vndr/%l[1]%(v[1])
+  $sun_hobo     $sun_t6_custom          =       pc+sun_vndr/us(type5hobo)+sun_vndr/%l[1]%(v[1])
   $sun_type6    us                      =       pc+sun_vndr/us(type6)
-  $sun_type6    $sun_t6_custom          =       pc+sun_vndr/us(type6)+%l[1]%(v[1])
+  $sun_type6    $sun_t6_custom          =       pc+sun_vndr/us(type6)+sun_vndr/%l[1]%(v[1])
   $sun_type7    us                      =       pc+sun_vndr/us(type6)
-  $sun_type7    $sun_t6_custom          =       pc+sun_vndr/us(type6)+%l[1]%(v[1])
+  $sun_type7    $sun_t6_custom          =       pc+sun_vndr/us(type6)+sun_vndr/%l[1]%(v[1])
  $thinkpads	br			=	pc+%l[1](thinkpad)
   *		*			=	pc+%l[1]%(v[1])
 
--- a/src/xorg/keytables/sun-src/rules/base.lst	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/rules/base.lst	Fri Jan 08 10:51:10 2010 +0900
@@ -374,6 +374,7 @@
   nativo          br: Nativo
   nativo-us       br: Nativo for USA keyboards
   nativo-epo      br: Nativo for Esperanto
+  type6           br: Sun Type 6/7 Variant
   phonetic        bg: Traditional Phonetic
   bas_phonetic    bg: Standard Phonetic
   french          ma: French
@@ -392,6 +393,7 @@
   shs             ca: Secwepemctsin
   kut             ca: Ktunaxa
   eng             ca: English
+  type6           ca: Sun Type 6/7 Variant
   tib             cn: Tibetan
   tib_asciinum    cn: Tibetan (with ASCII numerals)
   alternatequotes hr: Use guillemets for quotes
@@ -402,6 +404,7 @@
   qwerty          cz: qwerty
   qwerty_bksl     cz: qwerty, extended Backslash
   ucw             cz: UCW layout (accented letters only)
+  type6           cz: Sun Type 6/7 Variant
   nodeadkeys      dk: Eliminate dead keys
   type6           dk: Sun Type 6/7 Variant
   type5           dk: Sun Type 5 Variant
@@ -417,6 +420,7 @@
   nodeadkeys      ee: Eliminate dead keys
   dvorak          ee: Dvorak
   us              ee: US keyboard with Estonian letters
+  type6           ee: Sun Type 6/7 Variant
   pro             ir: Pro
   keypad          ir: Keypad
   pro_keypad      ir: Pro Keypad
@@ -480,6 +484,7 @@
   extended        gr: Extended
   nodeadkeys      gr: Eliminate dead keys
   polytonic       gr: Polytonic
+  type6           gr: Sun Type 6/7 Variant
   standard        hu: Standard
   nodeadkeys      hu: Eliminate dead keys
   qwerty          hu: qwerty
@@ -526,9 +531,11 @@
   lekp            lt: LEKP
   lekpa           lt: LEKPa
   balticplus      lt: Baltic+
+  type6           lt: Sun Type 6/7 Variant
   apostrophe      lv: Apostrophe (') variant
   tilde           lv: Tilde (~) variant
   fkey            lv: F-letter (F) variant
+  type6           lv: Sun Type 6/7 Variant
   cyrillic        me: Cyrillic
   cyrillicyz      me: Cyrillic, Z and ZHE swapped
   latinunicode    me: Latin unicode
@@ -553,6 +560,7 @@
   dvorak_altquotes pl: Dvorak, Polish quotes on key 1
   csb             pl: Kashubian
   ru_phonetic_dvorak pl: Russian phonetic Dvorak
+  type6           pl: Sun Type 6/7 Variant
   nodeadkeys      pt: Eliminate dead keys
   type6           pt: Sun Type 6/7 Variant
   type5           pt: Sun Type 5 Variant
@@ -572,6 +580,7 @@
   crh_alt         ro: Crimean Tatar (Turkish Alt-Q)
   crh_dobruca1    ro: Crimean Tatar (Dobruca-1 Q)
   crh_dobruca2    ro: Crimean Tatar (Dobruca-2 Q)
+  type6           ro: Sun Type 6/7 Variant
   phonetic        ru: Phonetic
   phonetic_winkeys ru: Phonetic Winkeys
   typewriter      ru: Typewriter
@@ -599,6 +608,7 @@
   bksl            sk: Extended Backslash
   qwerty          sk: qwerty
   qwerty_bksl     sk: qwerty, extended Backslash
+  type6           sk: Sun Type 6/7 Variant
   nodeadkeys      es: Eliminate dead keys
   type6           es: Sun Type 6/7 Variant
   type5           es: Sun Type 5 Variant
@@ -662,6 +672,7 @@
   crh             ua: Crimean Tatar (Turkish Q)
   crh_f           ua: Crimean Tatar (Turkish F)
   crh_alt         ua: Crimean Tatar (Turkish Alt-Q)
+  type6           ua: Sun Type 6/7 Variant
   extd            gb: Extended - Winkeys
   intl            gb: International (with dead keys)
   dvorak          gb: Dvorak
@@ -676,6 +687,9 @@
   crh_f           uz: Crimean Tatar (Turkish F)
   crh_alt         uz: Crimean Tatar (Turkish Alt-Q)
   kr104           kr: 101/104 key Compatible
+  type6           kr: Sun Type 6/7 Variant
+  type5           kr: Sun Type 5 Variant
+  type4           kr: Sun Type 4 Variant
   CloGaelach      ie: CloGaelach
   UnicodeExpert   ie: UnicodeExpert
   ogam            ie: Ogham
--- a/src/xorg/keytables/sun-src/rules/base.xml	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/rules/base.xml	Fri Jan 08 10:51:10 2010 +0900
@@ -1953,6 +1953,12 @@
             <languageList><iso639Id>epo</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2110,6 +2116,12 @@
             <languageList><iso639Id>eng</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2211,6 +2223,12 @@
 	    <description>UCW layout (accented letters only)</description>
 	 </configItem>
 	</variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2339,6 +2357,12 @@
             <description>US keyboard with Estonian letters</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2838,6 +2862,12 @@
             <description>Polytonic</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3255,6 +3285,12 @@
             <description>Baltic+</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3283,6 +3319,12 @@
             <description>F-letter (F) variant</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3499,6 +3541,12 @@
             <languageList><iso639Id>rus</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3638,6 +3686,12 @@
             <languageList><iso639Id>crh</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3849,6 +3903,12 @@
             <description>qwerty, extended Backslash</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4343,6 +4403,12 @@
             <languageList><iso639Id>crh</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
--- a/src/xorg/keytables/sun-src/rules/evdev	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/rules/evdev	Fri Jan 08 10:51:10 2010 +0900
@@ -139,10 +139,10 @@
 ! $sun_jp = sun_type4_jp sun_type5_jp sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb
 
 // Sun Type 6 keyboards with custom/non-standard layouts
-! $sun_t6_custom = ara be ch de dk es fi fr \
-                   gb it jp ko nl no pt ru \
-                   se tr tw \
-
+! $sun_t6_custom = ara be br ca ch cz de dk \
+                   ee es fi fr gb gr it kr \
+                   lt lv nl no pl pt ro ru \
+                   se sk tr tw ua
 
 ! model		=	keycodes
   pc98		=	evdev(pc98)
@@ -349,16 +349,16 @@
   amiga		$nonlatin		=	xfree68_vndr/amiga(usa1)+%l%(v):2
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l%(v)
   classmate	us			=	pc+%l(classmate)
-  $sun_type4    $sun_t6_custom		=       pc+sun_vndr/us(type4)+%l%(v)
-  $sun_type5    $sun_t6_custom		=       pc+sun_vndr/us(type5)+%l%(v)
-  $sun_hobo     $sun_t6_custom		=       pc+sun_vndr/us(type5hobo)+%l%(v)
+  $sun_type4    $sun_t6_custom		=       pc+sun_vndr/us(type4)+sun_vndr/%l%(v)
+  $sun_type5    $sun_t6_custom		=       pc+sun_vndr/us(type5)+sun_vndr/%l%(v)
+  $sun_hobo     $sun_t6_custom		=       pc+sun_vndr/us(type5hobo)+sun_vndr/%l%(v)
   $sun_type6    us			=       pc+sun_vndr/us(type6)
   $sun_type6    jp			=       sun_vndr/us(type6)+sun_vndr/jp(type6)
   $sun_type7    jp			=       sun_vndr/us(type6)+sun_vndr/jp(type7)
   jp106         jp			=       sun_vndr/us(type6)+sun_vndr/jp(type7)
-  $sun_type6    $sun_t6_custom		=       pc+sun_vndr/us(type6)+%l%(v)
+  $sun_type6    $sun_t6_custom		=       pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
   $sun_type7    us			=       pc+sun_vndr/us(type6)
-  $sun_type7    $sun_t6_custom		=       pc+sun_vndr/us(type6)+%l%(v)
+  $sun_type7    $sun_t6_custom		=       pc+sun_vndr/us(type6)+sun_vndr/%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
@@ -452,13 +452,13 @@
   *		yu(unicodeyz)			=	pc+srp(latinunicodeyz)
   ataritt	*			=	xfree68_vndr/ataritt(us)+%l[1]%(v[1])
   amiga		*			=	xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
-  $sun_type4    $sun_t6_custom		=       pc+sun_vndr/us(type4)+%l[1]%(v[1])
-  $sun_type5    $sun_t6_custom		=       pc+sun_vndr/us(type5)+%l[1]%(v[1])
-  $sun_hobo     $sun_t6_custom		=       pc+sun_vndr/us(type5hobo)+%l[1]%(v[1])
+  $sun_type4    $sun_t6_custom		=       pc+sun_vndr/us(type4)+sun_vndr/%l[1]%(v[1])
+  $sun_type5    $sun_t6_custom		=       pc+sun_vndr/us(type5)+sun_vndr/%l[1]%(v[1])
+  $sun_hobo     $sun_t6_custom		=       pc+sun_vndr/us(type5hobo)+sun_vndr/%l[1]%(v[1])
   $sun_type6    us			=       pc+sun_vndr/us(type6)
-  $sun_type6    $sun_t6_custom		=       pc+sun_vndr/us(type6)+%l[1]%(v[1])
+  $sun_type6    $sun_t6_custom		=       pc+sun_vndr/us(type6)+sun_vndr/%l[1]%(v[1])
   $sun_type7    us			=       pc+sun_vndr/us(type6)
-  $sun_type7    $sun_t6_custom		=       pc+sun_vndr/us(type6)+%l[1]%(v[1])
+  $sun_type7    $sun_t6_custom		=       pc+sun_vndr/us(type6)+sun_vndr/%l[1]%(v[1])
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
--- a/src/xorg/keytables/sun-src/rules/evdev.lst	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/rules/evdev.lst	Fri Jan 08 10:51:10 2010 +0900
@@ -23,7 +23,6 @@
 // Use is subject to license terms.
 //
 
-
 ! model
   pc101           Generic 101-key PC
   pc102           Generic 102-key (Intl) PC
@@ -375,6 +374,7 @@
   nativo          br: Nativo
   nativo-us       br: Nativo for USA keyboards
   nativo-epo      br: Nativo for Esperanto
+  type6           br: Sun Type 6/7 Variant
   phonetic        bg: Traditional Phonetic
   bas_phonetic    bg: Standard Phonetic
   french          ma: French
@@ -393,6 +393,7 @@
   shs             ca: Secwepemctsin
   kut             ca: Ktunaxa
   eng             ca: English
+  type6           ca: Sun Type 6/7 Variant
   tib             cn: Tibetan
   tib_asciinum    cn: Tibetan (with ASCII numerals)
   alternatequotes hr: Use guillemets for quotes
@@ -403,6 +404,7 @@
   qwerty          cz: qwerty
   qwerty_bksl     cz: qwerty, extended Backslash
   ucw             cz: UCW layout (accented letters only)
+  type6           cz: Sun Type 6/7 Variant
   nodeadkeys      dk: Eliminate dead keys
   type6           dk: Sun Type 6/7 Variant
   type5           dk: Sun Type 5 Variant
@@ -418,6 +420,7 @@
   nodeadkeys      ee: Eliminate dead keys
   dvorak          ee: Dvorak
   us              ee: US keyboard with Estonian letters
+  type6           ee: Sun Type 6/7 Variant
   pro             ir: Pro
   keypad          ir: Keypad
   pro_keypad      ir: Pro Keypad
@@ -481,6 +484,7 @@
   extended        gr: Extended
   nodeadkeys      gr: Eliminate dead keys
   polytonic       gr: Polytonic
+  type6           gr: Sun Type 6/7 Variant
   standard        hu: Standard
   nodeadkeys      hu: Eliminate dead keys
   qwerty          hu: qwerty
@@ -527,9 +531,11 @@
   lekp            lt: LEKP
   lekpa           lt: LEKPa
   balticplus      lt: Baltic+
+  type6           lt: Sun Type 6/7 Variant
   apostrophe      lv: Apostrophe (') variant
   tilde           lv: Tilde (~) variant
   fkey            lv: F-letter (F) variant
+  type6           lv: Sun Type 6/7 Variant
   cyrillic        me: Cyrillic
   cyrillicyz      me: Cyrillic, Z and ZHE swapped
   latinunicode    me: Latin unicode
@@ -554,6 +560,7 @@
   dvorak_altquotes pl: Dvorak, Polish quotes on key 1
   csb             pl: Kashubian
   ru_phonetic_dvorak pl: Russian phonetic Dvorak
+  type6           pl: Sun Type 6/7 Variant
   nodeadkeys      pt: Eliminate dead keys
   type6           pt: Sun Type 6/7 Variant
   type5           pt: Sun Type 5 Variant
@@ -573,6 +580,7 @@
   crh_alt         ro: Crimean Tatar (Turkish Alt-Q)
   crh_dobruca1    ro: Crimean Tatar (Dobruca-1 Q)
   crh_dobruca2    ro: Crimean Tatar (Dobruca-2 Q)
+  type6           ro: Sun Type 6/7 Variant
   phonetic        ru: Phonetic
   phonetic_winkeys ru: Phonetic Winkeys
   typewriter      ru: Typewriter
@@ -600,6 +608,7 @@
   bksl            sk: Extended Backslash
   qwerty          sk: qwerty
   qwerty_bksl     sk: qwerty, extended Backslash
+  type6           sk: Sun Type 6/7 Variant
   nodeadkeys      es: Eliminate dead keys
   type6           es: Sun Type 6/7 Variant
   type5           es: Sun Type 5 Variant
@@ -663,6 +672,7 @@
   crh             ua: Crimean Tatar (Turkish Q)
   crh_f           ua: Crimean Tatar (Turkish F)
   crh_alt         ua: Crimean Tatar (Turkish Alt-Q)
+  type6           ua: Sun Type 6/7 Variant
   extd            gb: Extended - Winkeys
   intl            gb: International (with dead keys)
   dvorak          gb: Dvorak
@@ -677,6 +687,9 @@
   crh_f           uz: Crimean Tatar (Turkish F)
   crh_alt         uz: Crimean Tatar (Turkish Alt-Q)
   kr104           kr: 101/104 key Compatible
+  type6           kr: Sun Type 6/7 Variant
+  type5           kr: Sun Type 5 Variant
+  type4           kr: Sun Type 4 Variant
   CloGaelach      ie: CloGaelach
   UnicodeExpert   ie: UnicodeExpert
   ogam            ie: Ogham
--- a/src/xorg/keytables/sun-src/rules/evdev.xml	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/rules/evdev.xml	Fri Jan 08 10:51:10 2010 +0900
@@ -1953,6 +1953,12 @@
             <languageList><iso639Id>epo</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2110,6 +2116,12 @@
             <languageList><iso639Id>eng</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2211,6 +2223,12 @@
 	    <description>UCW layout (accented letters only)</description>
 	 </configItem>
 	</variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2339,6 +2357,12 @@
             <description>US keyboard with Estonian letters</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2838,6 +2862,12 @@
             <description>Polytonic</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3255,6 +3285,12 @@
             <description>Baltic+</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3283,6 +3319,12 @@
             <description>F-letter (F) variant</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3499,6 +3541,12 @@
             <languageList><iso639Id>rus</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3638,6 +3686,12 @@
             <languageList><iso639Id>crh</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -3849,6 +3903,12 @@
             <description>qwerty, extended Backslash</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -4343,6 +4403,12 @@
             <languageList><iso639Id>crh</iso639Id></languageList>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>type6</name>
+            <description>Sun Type 6/7 Variant</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
--- a/src/xorg/keytables/sun-src/symbols/ara	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,284 +0,0 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/ar' file
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-    name[Group1]= "Arabic";
-
-// NOTES:
-//
-// there is also combined shadda diacritis in AltGr position of simple
-// diacritics fatha, fathatan, damma, dammatan, kasra and kasratan
-// should a third state be added to Group2 ?
-//
-
-    key <TLDE> {  [     Arabic_thal,      Arabic_shadda   ]	};
-    key <AE01> {  [               1,          exclam      ]     };
-    key <AE02> {  [               2,              at      ]     };
-    key <AE03> {  [               3,      numbersign      ]     };
-    key <AE04> {  [               4,          dollar      ]     };
-    key <AE05> {  [               5,         percent      ]     };
-    key <AE06> {  [               6,     asciicircum      ]     };
-    key <AE07> {  [               7,       ampersand      ]     };
-    key <AE08> {  [               8,        asterisk      ]     };
-    key <AE09> {  [               9,      parenright      ]     };
-    key <AE10> {  [               0,       parenleft      ]     };
-    key <AE11> {  [           minus,      underscore      ]     };
-    key <AE12> {  [           equal,            plus      ]     };
-						
-    key <AD01> {  [      Arabic_dad,     Arabic_fatha     ]     };
-    key <AD02> {  [      Arabic_sad,     Arabic_fathatan  ]     };
-    key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };
-    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };
-    key <AD05> {  [      Arabic_feh,     0x100fef9        ]     };
-    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef ]     };
-    key <AD07> {  [      Arabic_ain,         grave        ]     };
-    key <AD08> {  [       Arabic_ha,        division      ]     };
-    key <AD09> {  [     Arabic_khah,       multiply       ]     };
-    key <AD10> {  [      Arabic_hah,    Arabic_semicolon  ]     };
-    key <AD11> {  [     Arabic_jeem,        less          ]     };
-    key <AD12> {  [      Arabic_dal,        greater       ]     };
-
-    key <AC01> {  [    Arabic_sheen,   Arabic_kasra       ]     };
-    key <AC02> {  [     Arabic_seen,   Arabic_kasratan    ]     };
-    key <AC03> {  [      Arabic_yeh,       bracketright   ]     };
-    key <AC04> {  [      Arabic_beh,       bracketleft    ]     };
-    key <AC05> {  [      Arabic_lam,       0x100fef7      ]     };
-    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef ]     };
-    key <AC07> {  [      Arabic_teh,      Arabic_tatweel  ]     };
-    key <AC08> {  [     Arabic_noon,      Arabic_comma    ]     };
-    key <AC09> {  [     Arabic_meem,         slash        ]     };
-    key <AC10> {  [      Arabic_kaf,           colon      ]     };
-    key <AC11> {  [      Arabic_tah,        quotedbl      ]     };
-
-    key <LSGT> {  [             bar,      brokenbar	  ]     };
-    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde       ]     };
-    key <AB02> {  [    Arabic_hamza,      Arabic_sukun    ]     };
-    key <AB03> {  [Arabic_hamzaonwaw,      braceright     ]     };
-    key <AB04> {  [       Arabic_ra,       braceleft      ]     };
-    key <AB05> {  [       0x100fefb,       0x100fef5      ]     };
-    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef ]     };
-    key <AB07> {  [Arabic_tehmarbuta,    apostrophe       ]     };
-    key <AB08> {  [      Arabic_waw,         comma        ]     };
-    key <AB09> {  [     Arabic_zain,         period       ]     };
-    key <AB10> {  [      Arabic_zah, Arabic_question_mark ]     };
-
-    // End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "qwerty" {
-    include "ara(basic)"
-    name[Group1]= "Arabic - qwerty";
-};
-
-partial alphanumeric_keys
-xkb_symbols "azerty" {
-    include "ara(basic)"
-    name[Group1]= "Arabic - azerty";
-
-	// the north african arabic keyboard differs from the middle east one
-	// by the numeric row; it follows French keyboard style
-	//
-	// PROBLEM: some chars are inaccessible: ! @ # $ % ^ *
-	// should they go elsewhere? replace " ' that are now in double ?
-	// also, dead_circumflex and dead_diaeresis from French keyboard
-	// as well as ugrave are missing, which questions the utility of the
-	// other accentuated latin letters. Maybe this is useful only with
-	// a French keyboard in Group1 ? Then, shouldn't Group1 be filled ?
-
-    key <AE01> {  [       ampersand,               1      ]       };
-    key <AE02> {  [          eacute,               2      ]       };
-    key <AE03> {  [        quotedbl,               3      ]       };
-    key <AE04> {  [      apostrophe,               4      ]       };
-    key <AE05> {  [       parenleft,               5      ]       };
-    key <AE06> {  [           minus,               6      ]       };
-    key <AE07> {  [          egrave,               7      ]       };
-    key <AE08> {  [      underscore,               8      ]       };
-    key <AE09> {  [        ccedilla,               9      ]       };
-    key <AE10> {  [          agrave,               0      ]       };
-    key <AE11> {  [      parenright,          degree      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "digits" {
-    include "ara(basic)"
-    name[Group1]= "Arabic - digits";
-
-	// use arabic script digits
-
-    key <AE01> {  [       0x1000661,          exclam      ]       };
-    key <AE02> {  [       0x1000662,              at      ]       };
-    key <AE03> {  [       0x1000663,      numbersign      ]       };
-    key <AE04> {  [       0x1000664,          dollar      ]       };
-    key <AE05> {  [       0x1000665,  Arabic_percent      ]       };
-    key <AE06> {  [       0x1000666,     asciicircum      ]       };
-    key <AE07> {  [       0x1000667,       ampersand      ]       };
-    key <AE08> {  [       0x1000668,        asterisk      ]       };
-    key <AE09> {  [       0x1000669,      parenright      ]       };
-    key <AE10> {  [       0x1000660,       parenleft      ]       };
-};
-
-partial alphanumeric_keys
-xkb_symbols "qwerty_digits" {
-    include "ara(digits)"
-    name[Group1]= "Arabic - qwerty/digits";
-};
-
-partial alphanumeric_keys
-xkb_symbols "azerty_digits" {
-    include "ara(azerty)"
-    name[Group1]= "Arabic - azerty/digits";
-	
-    key <AE01> {  [       ampersand,       0x1000661      ]       };
-    key <AE02> {  [          eacute,       0x1000662      ]       };
-    key <AE03> {  [        quotedbl,       0x1000663      ]       };
-    key <AE04> {  [      apostrophe,       0x1000664      ]       };
-    key <AE05> {  [       parenleft,       0x1000665      ]       };
-    key <AE06> {  [           minus,       0x1000666      ]       };
-    key <AE07> {  [          egrave,       0x1000667      ]       };
-    key <AE08> {  [      underscore,       0x1000668      ]       };
-    key <AE09> {  [        ccedilla,       0x1000669      ]       };
-    key <AE10> {  [          agrave,       0x1000660      ]       };
-};
-
-// Arabic keyboard using Buckwalter transliteration
-// http://www.qamus.org/transliteration.htm
-// Martin Vidner
-
-// symbol names: see /usr/X11R6/include/X11/keysymdef.h (XFree86-devel.rpm)
-
-partial alphanumeric_keys 
-xkb_symbols "buckwalter" {
-    name[Group1]= "Arabic - Buckwalter";
-
-    // ARABIC LETTER SUPERSCRIPT ALEF
-    key <TLDE> {  [       0x1000670,  Arabic_shadda       ]       };
-
-    // Arabic_0 .. Arabic_9 do not work in Kate,
-    // Unicode never seems to work worse.
-    key <AE01> {  [       0x1000661,   VoidSymbol         ]       };
-    key <AE02> {  [       0x1000662,   VoidSymbol         ]       };
-    key <AE03> {  [       0x1000663,   VoidSymbol         ]       };
-    key <AE04> {  [       0x1000664,   Arabic_sheen       ]       };
-    key <AE05> {  [       0x1000665,   Arabic_percent     ]       };
-    key <AE06> {  [       0x1000666,   VoidSymbol         ]       };
-    key <AE07> {  [       0x1000667,   Arabic_hamzaonwaw  ]       };
-    key <AE08> {  [       0x1000668,   Arabic_thal        ]       };
-    // ORNATE LEFT PARENTHESIS
-    key <AE09> {  [       0x1000669,   0x100fd3e          ]       };
-    // ORNATE RIGHT PARENTHESIS
-    key <AE10> {  [       0x1000660,   0x100fd3f          ]       };
-    key <AE11> {  [       minus,       Arabic_tatweel     ]       };
-    key <AE12> {  [       equal,       plus               ]       };
-						
-    key <AD01> {  [      Arabic_qaf,   VoidSymbol         ]       };
-    key <AD02> {  [      Arabic_waw,   Arabic_hamzaonwaw  ]       };
-    key <AD03> {  [      VoidSymbol,   Arabic_ain         ]       };
-    key <AD04> {  [      Arabic_ra,    VoidSymbol         ]       };
-    key <AD05> {  [      Arabic_teh,   Arabic_tah         ]       };
-    key <AD06> {  [      Arabic_yeh,   Arabic_alefmaksura ]       };
-    key <AD07> {  [      Arabic_damma, VoidSymbol         ]       };
-    key <AD08> {  [      Arabic_kasra, Arabic_hamzaunderalef ]    };
-    key <AD09> {  [      Arabic_sukun, Arabic_hamzaonalef ]       };
-    key <AD10> {  [      Arabic_tehmarbuta, VoidSymbol    ]       };
-    // ARABIC LETTER ALEF WASLA
-    key <AD11> {  [      VoidSymbol,   0x1000671          ]       };
-    key <AD12> {  [      VoidSymbol,   Arabic_hamzaonyeh  ]       };
-
-    key <AC01> {  [    Arabic_fatha,   Arabic_alef        ]       };
-    key <AC02> {  [    Arabic_seen,    Arabic_sad         ]       };
-    key <AC03> {  [    Arabic_dal,     Arabic_dad         ]       };
-    key <AC04> {  [    Arabic_feh,     Arabic_fathatan    ]       };
-    key <AC05> {  [    Arabic_ghain,   VoidSymbol         ]       };
-    key <AC06> {  [    Arabic_ha,      Arabic_hah         ]       };
-    key <AC07> {  [    Arabic_jeem,    VoidSymbol         ]       };
-    key <AC08> {  [    Arabic_kaf,     Arabic_kasratan    ]       };
-    key <AC09> {  [    Arabic_lam,     VoidSymbol         ]       };
-    key <AC10> {  [    Arabic_semicolon, VoidSymbol       ]       };
-    key <AC11> {  [    Arabic_hamza,   VoidSymbol         ]       };
-
-    key <BKSL> {  [      VoidSymbol,   Arabic_maddaonalef ]     };
-
-//    key <LSGT> {  [             bar,      brokenbar	  ]     };
-
-    key <AB01> {  [    Arabic_zain,    Arabic_zah         ]       };
-    key <AB02> {  [    Arabic_khah,    VoidSymbol         ]       };
-    key <AB03> {  [    VoidSymbol,     VoidSymbol         ]       };
-    key <AB04> {  [    Arabic_theh,    VoidSymbol         ]       };
-    key <AB05> {  [    Arabic_beh,     VoidSymbol         ]       };
-    key <AB06> {  [    Arabic_noon,    Arabic_dammatan    ]       };
-    key <AB07> {  [    Arabic_meem,    VoidSymbol         ]       };
-    key <AB08> {  [    Arabic_comma,   Arabic_hamzaunderalef ]    };
-    // ARABIC FULL STOP (Urdu)
-    key <AB09> {  [    0x10006d4,      Arabic_hamzaonalef ]       };
-    key <AB10> {  [    VoidSymbol,     Arabic_question_mark ]     };
-
-    // End alphanumeric section
-};
-
-partial alphanumeric_keys
-xkb_symbols "olpc" {
-
-    include "ara(basic)"
-
-    // As part of the olpc design some changes were made to the Arabic
-    // keyboard design. Major changes are:
-    //
-    //  * Removed the lam-alef single character. Poeple type as they
-    //    pronounce, and lam-alef is just a visual formatting of the
-    //    sequence and is not often used on the keyboard. It is
-    //    similar to the Allah single character, which is also not on
-    //    the keyboard.
-    //  * Moved the following keys:
-    //     o Thal from TLDE to AB05: Due to space limitation on the
-    //       keybaord, but also accessibility
-    //     o Shadda from TLDE to AD05
-    //  * Placed currency letters on number keys and moved the ^ and &
-    //    characters to lower keys (This change is worth revisiting
-    //    before end of test period)
-
-    key <TLDE> {  [           grave,      asciitilde  ] };
-
-    key <AE01> {  [       0x1000661,          exclam  ] };
-    key <AE02> {  [       0x1000662,              at  ] };
-    key <AE03> {  [       0x1000663,      numbersign  ] };
-    key <AE04> {  [       0x1000664,          dollar  ] };
-    key <AE05> {  [       0x1000665,  Arabic_percent  ] };
-    key <AE06> {  [       0x1000666,        sterling  ] };
-    key <AE07> {  [       0x1000667,        EuroSign  ] };
-    key <AE08> {  [       0x1000668,        asterisk  ] };
-    key <AE09> {  [       0x1000669,      parenright  ] };
-    key <AE10> {  [       0x1000660,       parenleft  ] };
-
-    key <AD05> {  [      Arabic_feh,   Arabic_shadda  ] };
-
-    key <AD08> {  [      Arabic_heh,        division  ] };
-    key <AD11> {  [     Arabic_jeem,      braceright  ] };
-    key <AD12> {  [      Arabic_dal,       braceleft  ] };
-
-    key <AC01> {  [    Arabic_sheen,         greater  ] };
-    key <AC02> {  [     Arabic_seen,            less  ] };
-    key <AC05> {  [      Arabic_lam,       ampersand  ] };
-    key <AC10> {  [      Arabic_kaf                   ] };
-    key <AC11> {  [      Arabic_tah                   ] };
-
-    key <BKSL> {  [       backslash,             bar  ] };
-
-
-    // REH isolated form?
-    key <AB03> {  [ Arabic_hamzaonwaw,   Arabic_kasra ] };
-    key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };    
-    key <AB05> {  [     Arabic_thal,      asciicircum ] };
-
-    include "group(olpc)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/ara(type6)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/be	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/be' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/be,v 1.3 2003/04/12 10:53:48 pascal Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin"
-
-    name[Group1]="Belgium";
-
-    key <AE01>	{ [ ampersand,          1,          bar,   exclamdown ]	};
-    key <AE02>	{ [    eacute,          2,           at,    oneeighth ]	};
-    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};
-    key <AE04>	{ [apostrophe,          4,   onequarter,       dollar ]	};
-    key <AE05>	{ [ parenleft,          5,      onehalf, threeeighths ]	};
-    key <AE06>	{ [   section,          6,  asciicircum,  fiveeighths ]	};
-    key <AE07>	{ [    egrave,          7,    braceleft, seveneighths ]	};
-    key <AE08>	{ [    exclam,          8,  bracketleft,    trademark ]	};
-    key <AE09>	{ [  ccedilla,          9,    braceleft,    plusminus ]	};
-    key <AE10>	{ [    agrave,          0,   braceright,       degree ]	};
-    key <AE11>	{ [parenright,     degree,    backslash, questiondown ]	};
-    key <AE12>	{ [     minus, underscore, dead_cedilla,  dead_ogonek ]	};
-
-    key <AD01>	{ [         a,          A,           at,  Greek_OMEGA ]	};
-    key <AD02>	{ [         z,          Z,      lstroke,      Lstroke ]	};
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
-    key <AD09>  { [         o,          O,           oe,           OE ] }; // o O œ Œ
-    key <AD11>	{ [dead_circumflex, dead_diaeresis,  bracketleft, dead_abovering ] };
-    key <AD12>	{ [    dollar,   asterisk, bracketright,  dead_macron ]	};
-
-    key <AC01>	{ [         q,          Q,           ae,           AE ]	};
-    key <AC10>	{ [         m,          M,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [    ugrave,    percent,   dead_acute,   dead_caron ]	};
-    key <TLDE>	{ [twosuperior, threesuperior,  notsign,      notsign ]	};
-
-    key <BKSL>	{ [        mu,   sterling,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         w,          W, guillemotleft,        less ]	};
-    key <AB07>	{ [     comma,   question, dead_cedilla,    masculine ]	};
-    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};
-    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
-    key <AB10>	{ [     equal,       plus,   dead_tilde, dead_abovedot]	};
-    key <LSGT>  { [      less,    greater,    backslash,    backslash ]	};
-
-    include "level3(ralt_switch)"
-};
-
-
-// Variant of the fr(oss) layout for Belgium
-// Copyright © 2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ³ ≤ │ 1 ≥ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ™ │ 7 È │ 8 ¡ │ 9 Ç │ 0 À │ ° Ø │ _ ± ┃ ⌫ Retour┃
-// │ ² ¹ │ & | │ é @ │ " # │ ' ¸ │ ( ˇ │ § ^ │ è ` │ ! ~ │ ç { │ à } │ ) ø │ - ‑ ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ * ̨ ┃Entrée ┃
-// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ [ │ $ ] ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ł │ M Ö │ % Ù │ £ ̄ ┃      ┃
-// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ł │ m ö │ ù ' │ µ ` ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ > ≠ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ + − ┃             ┃
-// ┃Shift ⇧┃ < \ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ = ~ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ␣              Espace insécable ⍽ ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace                        ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "oss" {
-
-    include "fr(oss)"
-    include "be(oss_frbe)"
-
-    name[Group1]="Belgium - Alternative";
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_frbe" {
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         lessthanequal ] }; // ² ³ ¹ ≤ 
-    key <AE01>	{ [        ampersand,                1,                  bar,      greaterthanequal ] }; // & 1 | ≥
-    key <AE02>	{ [           eacute,                2,                   at,                Eacute ] }; // é 2 @ É
-    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
-    key <AE05>	{ [        parenleft,                5,           dead_caron,             0x1002013 ] }; // ( 5 ˇ – (tiret demi-cadratin)
-    key <AE06>	{ [          section,                6,          asciicircum,             trademark ] }; // § 6 ^ ™
-    key <AE08>	{ [           exclam,                8,           asciitilde,            exclamdown ] }; // ! 8 ~ ¡
-    key <AE09>	{ [         ccedilla,                9,            braceleft,              Ccedilla ] }; // ç 9 { Ç
-    key <AE10>	{ [           agrave,                0,           braceright,                Agrave ] }; // à 0 } À
-    key <AE11>	{ [       parenright,           degree,               oslash,              Ooblique ] }; // ) ° ø Ø 
-    key <AE12>	{ [            minus,       underscore,            0x1002011,             plusminus ] }; // - _ - (tiret insécable) ±
-
-    // Second row
-    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈  [ ˚
-    key <AD12>	{ [           dollar,         asterisk,         bracketright,           dead_ogonek ] }; // $ * ] ̨
-
-    // Third row
-    key <AC09>  { [                l,                L,          dead_stroke ] }; // l L ł Ł
-    key <BKSL>	{ [              mu,          sterling,           dead_grave,           dead_macron ] }; // µ £ ` ̄
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,            backslash,              notequal ] }; // < > \ ≠
-    key <AB10>  { [            equal,             plus,           dead_tilde,             0x1002212 ] }; // = + ~ −
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "oss_latin9" {
-
-    // Restricts the be(oss) layout to latin9 symbols
-
-    include "fr(oss_latin9)"
-    include "be(oss_frbe)"
-    include "keypad(oss_latin9)"
-
-    name[Group1]="Belgium - Alternative, latin-9 only";
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,                  less ] }; // ² ³ ¹ < 
-    key <AE01>	{ [        ampersand,                1,                  bar,               greater ] }; // & 1 | >
-    key <AE04>	{ [       apostrophe,                4,         dead_cedilla,                 minus ] }; // ' 4 ¸ -
-    key <AE05>	{ [        parenleft,                5,           dead_caron,                 minus ] }; // ( 5 ˇ -
-    key <AE06>	{ [          section,                6,          asciicircum,           asciicircum ] }; // § 6 ^ ^
-    key <AE12>	{ [            minus,       underscore,                minus,             plusminus ] }; // - _ - ±
-
-    // Second row
-    key <AD12>	{ [           dollar,         asterisk,         bracketright,          dead_cedilla ] }; // $ * ] ¸
-
-    // Third row
-    key <AC09>  { [                l,                L,                    l,                     L ] }; // l L l L
-    key <BKSL>	{ [              mu,          sterling,           dead_grave,       dead_circumflex ] }; // µ £ ` ^
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,            backslash,                 equal ] }; // < > \ =
-    key <AB10>  { [            equal,             plus,           dead_tilde,                 minus ] }; // = + ~ -
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "oss_Sundeadkeys" {
-
-    // Modifies the basic be(oss) layout to use the Sun dead keys
-
-    include "be(oss)"
-
-    // First row
-    key <AE04>	{ [       apostrophe,                4,        SunFA_Cedilla,             0x1002014 ] }; // ' 4 ¸ — (tiret cadratin)
-
-    // Second row
-    key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          bracketleft,        dead_abovering ] }; // ^ ̈ [ ˚
-
-    //Third row
-    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [              mu,          sterling,          SunFA_Grave,           dead_macron ] }; // µ £ ` ̄
-
-    // Fourth row
-    key <AB10>  { [            equal,             plus,          SunFA_Tilde,             0x1002212 ] }; // = + ~ −
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_sundeadkeys" {
-
-    include "be(oss_Sundeadkeys)"
-
-    name[Group1]="Belgium - Alternative, Sun dead keys";
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "iso-alternate" {
-    include "be(basic)"
-    name[Group1]="Belgium - ISO Alternate";
-
-    key <AD01>	{ [         a,          A,           ae,           AE ]	};
-    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
-    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
-    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
-    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
-    key <AB07>	{ [ comma,   question, dead_cedilla, dead_doubleacute ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // Use the Sun dead keys
-
-    include "be(basic)"
-    name[Group1]="Belgium - Sun dead keys";
-
-    key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis, bracketleft, bracketleft] };
-    key <AC11>	{ [    ugrave,    percent,  SunFA_Acute,  SunFA_Acute ]	};
-    key <BKSL>	{ [        mu,   sterling,  SunFA_Grave,  SunFA_Grave ]	};
-    key <AB07>	{ [     comma,  question, SunFA_Cedilla, SunFA_Cedilla]	};
-    key <AB10>	{ [     equal,       plus,  SunFA_Tilde,  SunFA_Tilde ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // Use the Sun dead keys
-
-    include "be(sundeadkeys)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Eliminates dead keys from the basic Belgian layout
-
-    include "be(basic)"
-    name[Group1]="Belgium - Eliminate dead keys";
-
-    key <AE12>	{ [     minus, underscore,      cedilla,       ogonek ]	};
-    key <AD11>	{ [asciicircum,  diaeresis,  bracketleft,  bracketleft]	};
-    key <AD12>	{ [    dollar,   asterisk, bracketright,       macron ]	};
-    key <AC10>	{ [         m,          M,        acute,  doubleacute ]	};
-    key <AC11>	{ [    ugrave,    percent,   quoteright,   quoteright ]	};
-    key <BKSL>	{ [        mu,   sterling,    quoteleft,    quoteleft ]	};
-    key <AB07>	{ [     comma,   question,      cedilla,    masculine ]	};
-    key <AB10>	{ [     equal,       plus,   asciitilde,   asciitilde ]	};
-};
-
-// Wang model 724 azerty Belgium keyboard
-partial alphanumeric_keys
-xkb_symbols "wang" {
-
-    include "be(basic)"
-    include "keypad(legacy_wang)"
-    name[Group1]="Belgium - Wang model 724 azerty";
-
-    // Engravings on Wang 725-3771-ae
-    key <TLDE> { [ twosuperior, threesuperior,   notsign, asciitilde ] };
-    key <LSGT> { [        less,       greater, backslash,  brokenbar ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/be(type6)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/ch	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +0,0 @@
-// $XKeyboardConfig$
-// $Xorg: ch,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-// $XFree86: xc/programs/xkbcomp/symbols/ch,v 3.6 2002/11/25 14:05:06 eich Exp $
-
-partial default alphanumeric_keys 
-xkb_symbols "basic" {
-
-    include "latin"
-
-    // Alphanumeric section
-    name[Group1]= "Switzerland";
-    key <TLDE> { [    section,     degree                           ] };
-    key <AE01> { [          1,       plus,          bar, exclamdown ] };
-    key <AE02> { [          2,   quotedbl,           at, oneeighth  ] };
-    key <AE03> { [          3,   asterisk,   numbersign             ] };
-    key <AE04> { [          4,   ccedilla                           ] };
-    key <AE05> { [          5,    percent                           ] };
-    key <AE06> { [          6,  ampersand,      notsign             ] };
-    key <AE07> { [          7,      slash,    brokenbar             ] };
-    key <AE08> { [          8,  parenleft,         cent             ] };
-    key <AE09> { [          9, parenright                           ] };
-    key <AE10> { [          0,      equal                           ] };
-    key <AE11> { [ apostrophe,   question,   dead_acute             ] };
-    key <AE12> { [ dead_circumflex, dead_grave, dead_tilde          ] };
-
-    key <AD03> { [          e,          E,     EuroSign             ] };
-    key <AD06> { [          z,          Z                           ] };
-    key <AD11> { [ udiaeresis,     egrave,  bracketleft             ] };
-    key <AD12> { [ dead_diaeresis, exclam, bracketright             ] };
-
-    key <AC10> { [ odiaeresis,     eacute                           ] };
-    key <AC11> { [ adiaeresis,     agrave,    braceleft             ] };
-    key <BKSL> { [     dollar,   sterling,   braceright             ] };
-
-    key <LSGT> { [       less,    greater,    backslash, brokenbar  ] };
-    key <AB01> { [          y,          Y                           ] };
-    key <AB08> { [      comma,  semicolon                           ] };
-    key <AB09> { [     period,      colon                           ] };
-    key <AB10> { [      minus, underscore                           ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de" {
-    include "ch(basic)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de_Sundeadkeys" {
-    // modify the basic Swiss German layout to use Sun dead keys
-    include "ch(basic)"
-    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
-    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
-    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de_sundeadkeys" {
-    include "ch(de_Sundeadkeys)"
-    name[Group1]= "Switzerland - German, Sun dead keys";
-};
-
-partial alphanumeric_keys 
-xkb_symbols "de_nodeadkeys" {
-    // modify the basic Swiss German layout not to have any dead keys
-    include "ch(basic)"
-    name[Group1]= "Switzerland - German, eliminate dead keys";
-    key <AE11> { [  apostrophe, question,        acute  ] };
-    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
-    key <AD12> { [   diaeresis,   exclam, bracketright  ] };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "fr" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
-    include "ch(basic)"
-    name[Group1]= "Switzerland - French";
-
-    override key <AD11> {
-	[ egrave,	udiaeresis,	bracketleft	]
-    };
-    override key <AC10> {
-	[ eacute,	odiaeresis	]
-    };
-    override key <AC11> {
-	[ agrave,	adiaeresis,	braceleft	]
-    };
-};
-
-partial alphanumeric_keys
-xkb_symbols "fr_Sundeadkeys" {
-    // modify the basic Swiss French layout to use Sun dead keys
-    include "ch(fr)"
-    key <AE11> { [      apostrophe,    question,  SunFA_Acute   ] };
-    key <AE12> { [    SunFA_Circum, SunFA_Grave,  SunFA_Tilde   ] };
-    key <AD12> { [ SunFA_Diaeresis,      exclam, bracketright   ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "fr_sundeadkeys" {
-    include "ch(fr_Sundeadkeys)"
-    name[Group1]= "Switzerland - French, Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "fr_nodeadkeys" {
-    // modify the basic Swiss French layout not to have any dead keys
-    include "ch(fr)"
-    name[Group1]= "Switzerland - French, eliminate dead keys";
-    key <AE11> { [  apostrophe, question,        acute  ] };
-    key <AE12> { [ asciicircum,    grave,   asciitilde  ] };
-    key <AD12> { [   diaeresis,   exclam, bracketright  ] };
-};
-
-// Copied from macintosh_vndr/ch
-// 03.01.2003
-// Andreas Tobler <[email protected]>
-// modified for Swiss German Apple Extended Keyboard II
-
-partial alphanumeric_keys
-xkb_symbols "de_mac" {
-    
-    name[Group1]= "Switzerland - German (Macintosh)";
-
-    // Alphanumeric section
-
-    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
-    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
-    key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
-					// not displayed here
-    key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
-    key <AE05> { [	5,	percent, 	bracketleft			]	};
-    key <AE06> { [	6,	ampersand, 	bracketright			]	};
-    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
-    key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
-    key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
-    key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
-    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
-    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
-    key <AD01> { [	q,	Q, 	oe,		OE			]	};
-    key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
-    key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
-    key <AD04> { [ 	r,	R, 	registered,	Egrave			]	};
-    key <AD05> { [ 	t,	T, 	dagger,		Icircumflex		]	}; 
-    key <AD06> { [	z,	Z, 	Greek_OMEGA,	Iacute			]	};
-    key <AD07> { [ 	u,	U, 	degree,		Ugrave			]	};
-    key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
-    key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
-    key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
-    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
-    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
-    key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
-    key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
-					// ligature fl
-    key <AC03> { [ 	d,	D, 	Greek_sigma,	NoSymbol		]	};
-			// partialderivative is not available here att
-    key <AC04> { [ 	f,	F, 	function,	doubledagger		]	};
-    key <AC05> { [ 	g,	G, 	at,		comma			]	};
-    key <AC06> { [ 	h,	H, 	ordfeminine,	periodcentered		]	};
-    key <AC07> { [ 	j,	J,  	masculine,	eth	 		]	};
-    key <AC08> { [ 	k,	K, 	Greek_DELTA,	macron			]	};
-    key <AC09> { [ 	l,	L, 	notsign,	caret			]	};
-    key <AC10> { [	odiaeresis,	eacute, 	cent,		breve	]	};
-    key <AC11> { [	adiaeresis,	agrave, 	ae,		AE	]	};
-    key <AB01> { [	y,	Y, 	yen,		Ydiaeresis		]	};
-    key <AB02> { [ 	x,	X, 	similarequal,	trademark		]	};
-    key <AB03> { [ 	c,	C, 	copyright,	NoSymbol		]	};
-    key <AB04> { [ 	v,	V, 	radical,	diamond			]	};
-    key <AB05> { [ 	b,	B, 	integral,	NoSymbol		]	};  
-    key <AB06> { [ 	n,	N, 	dead_tilde, 	enopencircbullet	]       };
-					// to be fixed att
-    key <AB07> { [ 	m,	M, 	mu,		dead_abovering		]       };
-					// not sure att
-    key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
-    key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
-    key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
-    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
-			// ligature fi	// per mille
-    key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
-    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
-    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
-
-    include "kpdl(comma)"
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "fr_mac" {
-
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
-    include "ch(de_mac)"
-    name[Group1]= "Switzerland - French (Macintosh)";
-
-    override key <AD11> {
-	[ egrave,	udiaeresis,  bracketleft	]
-    };
-    override key <AC10> {
-	[ eacute,	odiaeresis	]
-    };
-    override key <AC11> {
-	[ agrave,	adiaeresis,   braceleft		]
-    };
-};
-
-partial alphanumeric_keys
-xkb_symbols "de_type6" {
-
-    include "sun_vndr/ch(de_type6)"
-    include "level3(ralt_switch)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "fr_type6" {
-
-    include "sun_vndr/ch(fr_type6)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/de	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,517 +0,0 @@
-
-// based on a keyboard map from an 'xkb/symbols/de' file
-//
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/de,v 1.6 2003/09/08 13:12:51 pascal Exp $
-
-default
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Germany";
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
-    key <AE03>	{ [         3,    section, threesuperior,    sterling ]	};
-    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
-
-    key <AE11> {type[Group1]="FOUR_LEVEL_PLUS_LOCK",  symbols[Group1]=
-                  [ssharp, question, backslash, questiondown, 0x1001E9E ]};
-// The unicode capital letter sharp s U+1E9E is transformed to "SS"
-// to match the rules for capitalizing sharp s in german.
-// If the capital sharp s is needed, delete the line
-// starting with <U1E9C> from /usr/share/X11/locale/iso8859-15/Compose.
-// If both doubled S and capital sharp s are needed, use  0x1001E9E
-// for capital sharp s and some free unicode codepoint like 0x1001E9C
-// for doubled S. Don`t forget to change this in the Compose file, too.
-
-    key <AE12>	{ [dead_acute, dead_grave, dead_cedilla,  dead_ogonek ]	};
-
-    key <AD03>	{ [         e,          E,     EuroSign,     EuroSign ]	};
-    key <AD06>	{ [         z,          Z,    leftarrow,          yen ]	};
-    key <AD11>	{ [udiaeresis, Udiaeresis, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
-
-    key <AC02>  { [         s,          S,                U017F,     U1E9E    ] };
-    key <AC07>  { [         j,          J,        dead_belowdot, dead_abovedot   ] };
-    key <AC10>	{ [odiaeresis, Odiaeresis, dead_doubleacute, dead_belowdot ] };
-    key <AC11>	{ [adiaeresis, Adiaeresis, dead_circumflex, dead_caron ] };
-    key <TLDE>	{ [dead_circumflex, degree,	U2032,    U2033	] };
-
-    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         y,          Y,       guillemotright,    U203A 	] };
-    key <AB02>	{ [         x,          X,        guillemotleft,    U2039 	] };
-    key <AB04>	{ [         v,          V,   doublelowquotemark, singlelowquotemark ]	};
-    key <AB05>	{ [         b,          B,  leftdoublequotemark, leftsinglequotemark ] };
-    key <AB06>	{ [         n,          N, rightdoublequotemark, rightsinglequotemark ]	};    
-    key <AB08>  { [     comma,  semicolon,       periodcentered,     multiply	] };
-    key <AB09>	{ [    period,      colon,                U2026,     division 	] };
-    key <AB10>	{ [     minus, underscore,               endash,     emdash	] };
-
-    include "kpdl(comma)"
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // modify the basic German layout to not have any dead keys
-
-    include "de(basic)"
-    name[Group1]="Germany - Eliminate dead keys";
-
-    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
-    key <AE12>	{ [     acute,      grave,      cedilla,      cedilla ]	};
-    key <AD11>	{ [udiaeresis, Udiaeresis,    diaeresis,    diaeresis ]	};
-    key <AD12>	{ [      plus,   asterisk,   asciitilde,       macron ]	};
-    key <AC10>	{ [odiaeresis, Odiaeresis,  doubleacute,  doubleacute ]	};
-    key <AC11>	{ [adiaeresis, Adiaeresis,  asciicircum,  asciicircum ]	};
-    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "deadgraveacute" {
-    // modify the basic German layout to have only acute and grave
-    // as dead keys (tilde and circumflex are needed as spacing characters
-    // in many programming languages)
-
-    include "de(basic)"
-    name[Group1]="Germany - Dead grave acute";
-
-    key <TLDE>	{ [asciicircum,    degree,      notsign,      notsign ]	};
-    key <AD12>	{ [      plus,   asterisk,   asciitilde,  dead_macron ]	};
-    key <BKSL>	{ [numbersign, apostrophe,        grave,        grave ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "deadacute" {
-    // modify the basic German layout to have only acute as
-    // dead keys (ASCII grave, tilde and circumflex are needed as
-    // spacing characters in many programming languages and text formatters)
-
-    include "de(deadgraveacute)"
-
-    name[Group1]="Germany - Dead acute";
-
-    key <AE12>	{ [dead_acute,      grave, dead_cedilla,  dead_ogonek ]	};
-    key <BKSL>	{ [numbersign, apostrophe,   dead_grave,   dead_grave ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "ro" {
-    // add romanian-specific letters to the basic German layout.
-    // Romanian symbols are accessible with combination of <AltGr> and
-    // 'a', 's', 't', 'i', 'ä (&auml)' (+<Shift> for capital letters).
-    // To view romanian-specific symbols, add "export LC_CTYPE=ro_RO"
-    // or "export LC_CTYPE=de_DE.utf8" to your .profile.
-
-    include "de(basic)"
-
-    name[Group1]="Germany - Romanian keyboard with German letters";
-
-    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
-    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
-    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
-    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
-    key <AC11> { [ adiaeresis,   Adiaeresis,    abreve,       Abreve    ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "ro_nodeadkeys" {
-    // add romanian-specific letters to the German nodeadkeys layout.
-    // Read the comment for de_ro !
-
-    include "de(nodeadkeys)"
-    name[Group1]="Germany - Romanian keyboard with German letters, eliminate dead keys";
-
-    key <AD05> { [         t,    T,           tcedilla,     Tcedilla    ] };
-    key <AD08> { [         i,    I,        icircumflex,  Icircumflex    ] };
-    key <AC01> { [         a,    A,        acircumflex,  Acircumflex    ] };
-    key <AC02> { [         s,    S,           scedilla,     Scedilla    ] };
-    key <AC11> { [ adiaeresis,   Adiaeresis, abreve,       Abreve       ] };
-};
-
-// German Dvorak keymap by Thorsten Staerk (www.staerk.de/thorsten)
-// Have acute and grave as dead keys, tilde and circumflex alive as they are needed 
-// in many programming languages.
-// to use this keymap, use a 105-key-keyboard and the command setxkbmap -model pc105 -layout dvorak -variant de
-// source: http://www-lehre.informatik.uni-osnabrueck.de/~rfreund/dvorak.php
-partial alphanumeric_keys 
-xkb_symbols "dvorak" {
-    include "us(dvorak)"
-
-    name[Group1]="Germany - Dvorak";
-
-    key <TLDE> { [ asciicircum, degree ] };
-
-    key <AE01> { [ 1, exclam, onesuperior ] };
-    key <AE02> { [ 2, quotedbl, twosuperior ] };
-    key <AE03> { [ 3, section, threesuperior ] };
-    key <AE04> { [ 4, dollar, bar ] };
-    key <AE05> { [ 5, percent, bar ] };
-    key <AE06> { [ 6, ampersand, brokenbar ] };
-    key <AE07> { [ 7, slash, braceleft ] };
-    key <AE08> { [ 8, parenleft, bracketleft ] };
-    key <AE09> { [ 9, parenright, bracketright ] };
-    key <AE10> { [ 0, equal, braceright ] };
-    key <AE11> { [ plus, asterisk, asciitilde ] };
-    key <AE12> { [ less, greater, dead_grave ] };
-
-    key <AD01> { [ udiaeresis, Udiaeresis, at ] };
-    key <AD02> { [ comma, semicolon, dead_diaeresis ] };
-    key <AD03> { [ period, colon ] };
-    key <AD08> { [ c, C, copyright, Cacute ] };
-    key <AD09> { [ t, T, trademark ] };
-    key <AD10> { [ z, Z, zabovedot, Zabovedot ] };
-    key <AD11> { [ question, ssharp ] };
-    key <AD12> { [ slash, backslash, dead_acute ] };
-
-    key <AC01> { [ a, A, at, aogonek ] };
-    key <AC02> { [ o, O, oacute, Oacute ] };
-    key <AC03> { [ e, E, EuroSign, eogonek ] };
-    key <AC04> { [ i, I ] };
-    key <AC05> { [ u, U ] };
-    key <AC06> { [ h, H ] };
-    key <AC07> { [ d, D ] };
-    key <AC08> { [ r, R, registered ] };
-    key <AC09> { [ n, N, nacute, Nacute ] };
-    key <AC10> { [ s, S, sacute, Sacute] };
-    key <AC11> { [ l, L, lstroke, Lstroke ] };
-
-    key <AB01> { [ odiaeresis, Odiaeresis ] };
-    key <AB02> { [ q, Q, at ] };
-    key <AB07> { [ m, M, mu ] };
-    key <AB10> { [ numbersign, apostrophe ] };
-
-    key <BKSL> { [ minus, underscore, hyphen, diaeresis] };
-
-    key <LSGT> { [ adiaeresis, Adiaeresis, bar ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "de(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    // For naming consistency
-
-    include "de(Sundeadkeys)"
-
-    name[Group1]="Germany - Sun dead keys";
-};
-
-
-// German NEO-Layout Version 2.0rc1 (rev: 1331)
-// adopted 2004 by Hanno Behrens <[email protected]>
-// inspired by Dvorak/de-ergo  http://www.goebel-consult.de/de-ergo/
-//
-// Authors: 
-//      <lucky at zankt dot net>
-//      Benjamin Kellermann <Benjamin dot Kellermann at gmx dot Germany>
-//      Erik Streb <mail at erikstreb dot de>
-//        and many other contributers
-//
-//      http://www.neo-layout.org
-
-
-partial alphanumeric_keys modifier_keys keypad_keys
-xkb_symbols "neo" {
-
-    name[Group1]= "Germany - Neo 2";
-
-    // Levels in Neo jargon
-    // --------------------------------------------------------------
-    // Ebene 1: normal
-    // Ebene 2: Shift
-    // Ebene 3: Mod3
-    // Ebene 4: Mod4 (for marking something use Shift+Mod4)
-    // Ebene 5: Shift+Mod3
-    // Ebene 6: Mod3+Mod4 (in this order)
-    // Compose (not a level): Mod3+Tab
-    // Feststelltaste (Capslock): Mod3+Mod3
-    //
-    // Levels in Xkbmap jargon to be found here in the definitions. 
-    // These are the levels used, and Xorg's translations with type="EIGHT_LEVEL":
-    // --------------------------------------------------------------
-    //   Modifier:        None    Shift   Mod3    Shift+Mod3  Mod4    Shift+Mod4    Mod3+Mod4
-    //   Xorg calls it:   Level1  Level2  Level3  Level4      Level5  Level6        Level7
-    //   Neo calls it:    Ebene1  Ebene2  Ebene3  Ebene5      Ebene4  Ebene4+Shift  Ebene6
-
-    // Modifier definitions
-    // --------------------------------------------------------------
-    // Definition of the so called Neo-Mod3
-    key.type[Group1]="THREE_LEVEL";
-    key <BKSL> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-    key <CAPS> { [ ISO_Level3_Shift, ISO_Level3_Shift,  Caps_Lock ] };
-
-    // Definition of the so called Neo-Mod4
-    key.type[Group1]="ONE_LEVEL";
-    key <LSGT> { [ ISO_Level5_Shift ]};
-    key <RALT> { [ ISO_Level5_Shift ]};
-    modifier_map Mod3 { <LSGT>, <RALT> };
-    // Attention: ^^^ This is a X server variable, not the Neo-Mod3.
-
-    key.type[Group1]="EIGHT_LEVEL_ALPHABETIC" ;
-
-    // Tab as Multi_key (Compose)
-    // --------------------------------------------------------------
-    key  <TAB> { [ Tab, ISO_Left_Tab, Multi_key ] };
-
-    // number row
-    // --------------------------------------------------------------
-    key <TLDE> { [ dead_circumflex, dead_tilde,         dead_abovering,         dead_breve,         dead_caron,     NoSymbol,    dead_macron    ] };
-
-    key <AE01> { [ 1,           degree,                 onesuperior,            onesubscript,       ordfeminine,    NoSymbol,    notsign        ] };
-    key <AE02> { [ 2,           section,                twosuperior,            twosubscript,       masculine,      NoSymbol,    logicalor      ] };
-    key <AE03> { [ 3,           U2113,                  threesuperior,          threesubscript,     numerosign,     NoSymbol,    logicaland     ] };
-    key <AE04> { [ 4,           guillemotright,         U203A,                  dagger,             Prior,          Prior,       U22A5          ] };
-    key <AE05> { [ 5,           guillemotleft,          U2039,                  femalesymbol,       periodcentered, NoSymbol,    U2221          ] };
-    key <AE06> { [ 6,           EuroSign,               cent,                   malesymbol,         sterling,       NoSymbol,    U2225          ] };
-
-    key <AE07> { [ 7,           dollar,                 yen,                    Greek_kappa,        currency,       NoSymbol,    rightarrow     ] };
-    key <AE08> { [ 8,           doublelowquotemark,     singlelowquotemark,     leftanglebracket,   NoSymbol,       NoSymbol,    U221E          ] };
-    key <AE09> { [ 9,           leftdoublequotemark,    leftsinglequotemark,    rightanglebracket,  slash,          NoSymbol,    U220B          ] };
-    key <AE10> { [ 0,           rightdoublequotemark,   rightsinglequotemark,   zerosubscript,      asterisk,       NoSymbol,    emptyset       ] };
-
-    key <AE11> { [ minus,       emdash,                 NoSymbol,               U2011,              minus,          NoSymbol,    hyphen         ] };
-    key <AE12> { [ dead_grave,  NoSymbol,               dead_diaeresis,         dead_dasia,         U030F,          NoSymbol,    NoSymbol       ] };
-
-    key <BKSP> { [ BackSpace,   BackSpace,              BackSpace,              BackSpace,          BackSpace,      BackSpace,   BackSpace      ] };
-
-    // top row
-    // --------------------------------------------------------------
-    // xvlcwkhgfqß
-    key <AD01> { [ x,           X,                      ellipsis,               Greek_xi,           U22EE,          NoSymbol,    Greek_XI         ] };
-    key <AD02> { [ v,           V,                      underscore,             NoSymbol,           BackSpace,      BackSpace,   U2259            ] };
-    key <AD03> { [ l,           L,                      bracketleft,            Greek_lambda,       Up,             Up,          Greek_LAMBDA     ] };
-    key <AD04> { [ c,           C,                      bracketright,           Greek_chi,          Delete,         Delete,      U2102            ] };
-    key <AD05> { [ w,           W,                      asciicircum,            Greek_omega,        Insert,         Insert,      Greek_OMEGA      ] };
-
-    key <AD06> { [ k,           K,                      exclam,                 U03F0,              exclamdown,     NoSymbol,    radical          ] };
-    key <AD07> { [ h,           H,                      less,                   Greek_psi,          7,              NoSymbol,    Greek_PSI        ] };
-    key <AD08> { [ g,           G,                      greater,                Greek_gamma,        8,              NoSymbol,    Greek_GAMMA      ] };
-    key <AD09> { [ f,           F,                      equal,                  Greek_phi,          9,              NoSymbol,    Greek_PHI        ] };
-    key <AD10> { [ q,           Q,                      ampersand,              U03D5,              plus,           NoSymbol,    U211A            ] };
-    key <AD11> { [ ssharp,      U1E9E,                  U017F,              Greek_finalsmallsigma,  NoSymbol,       NoSymbol,    jot              ] };
-
-    key <AD12> { [ dead_acute,  dead_cedilla,           dead_stroke,            dead_psili,         dead_doubleacute,NoSymbol,   dead_abovedot    ] };
-
-    // middle row
-    // --------------------------------------------------------------
-    // uiaeosnrtdy
-    key <AC01> { [ u,           U,                      backslash,              NoSymbol,           Home,           Home,        U222E             ] };
-    key <AC02> { [ i,           I,                      slash,                  Greek_iota,         Left,           Left,        integral          ] };
-    key <AC03> { [ a,           A,                      braceleft,              Greek_alpha,        Down,           Down,        U2200             ] };
-    key <AC04> { [ e,           E,                      braceright,             Greek_epsilon,      Right,          Right,       U2203             ] };
-    key <AC05> { [ o,           O,                      asterisk,               Greek_omicron,      End,            End,         elementof         ] };
-
-    key <AC06> { [ s,           S,                      question,               Greek_sigma,        questiondown,   NoSymbol,    Greek_SIGMA       ] };
-    key <AC07> { [ n,           N,                      parenleft,              Greek_nu,           4,              NoSymbol,    U2115             ] };
-    key <AC08> { [ r,           R,                      parenright,             U03F1,              5,              NoSymbol,    U211D             ] };
-    key <AC09> { [ t,           T,                      minus,                  Greek_tau,          6,              NoSymbol,    partialderivative ] };
-    key <AC10> { [ d,           D,                      colon,                  Greek_delta,        comma,          NoSymbol,    Greek_DELTA       ] };
-    key <AC11> { [ y,           Y,                      at,                     Greek_upsilon,      period,         NoSymbol,    nabla             ] };
-
-    // bottom row
-    // --------------------------------------------------------------
-    // üöäpzbm,.j
-    key <AB01> { [ udiaeresis,  Udiaeresis,             numbersign,             NoSymbol,           Escape,         Escape,      U211C             ] };
-    key <AB02> { [ odiaeresis,  Odiaeresis,             dollar,                 NoSymbol,           Tab,            Tab,         U2111             ] };
-    key <AB03> { [ adiaeresis,  Adiaeresis,             bar,                    Greek_eta,          Next,           Next,        U2135             ] };
-    key <AB04> { [ p,           P,                      asciitilde,             Greek_pi,           Return,         Return,      Greek_PI          ] };
-    key <AB05> { [ z,           Z,                      grave,                  Greek_zeta,         NoSymbol,       NoSymbol,    U2124             ] };
-
-    key <AB06> { [ b,           B,                      plus,                   Greek_beta,         colon,          NoSymbol,    U21D0             ] };
-    key <AB07> { [ m,           M,                      percent,                Greek_mu,           1,              NoSymbol,    ifonlyif          ] };
-    key <AB08> { [ comma,       endash,                 quotedbl,               Greek_rho,          2,              NoSymbol,    U21D2             ] };
-    key <AB09> { [ period,      enfilledcircbullet,     apostrophe,             U03D1,              3,              NoSymbol,    Greek_THETA       ] };
-    key <AB10> { [ j,           J,                      semicolon,              Greek_theta,        semicolon,      NoSymbol,    variation         ] };
-
-    // Space key
-    // --------------------------------------------------------------
-    key <SPCE> { [ space,       space,                  space,                  nobreakspace,       0,              NoSymbol,    U202F             ] };
-
-    // Keypad
-    // ===========
-
-    // Num-Lock is no longer used with Neo:
-    //key.type[Group1]="FOUR_LEVEL_MIXED_KEYPAD";
-
-    // the former Numlock key:
-    key <NMLK> { [ Tab,           ISO_Left_Tab,   equal,        approxeq,     notequal,   NoSymbol,   identical ] };
-
-    // topmost row
-    // --------------------------------------------------------------
-    key <KPDV> { [ KP_Divide,     KP_Divide,      division,     U2223,        U2300,      NoSymbol,   U2044 ] };
-    key <KPMU> { [ KP_Multiply,   KP_Multiply,    U22C5,        multiply,     U2299,      NoSymbol,   U2297 ] };
-    key <KPSU> { [ KP_Subtract,   KP_Subtract,    U2212,        U2216,        U2296,      NoSymbol,   U2238 ] };
-
-    // top row
-    // --------------------------------------------------------------
-    key  <KP7> { [ KP_7,          U2714,          U2195,        U226A,        KP_Home,    KP_Home,    upstile ] };
-    key  <KP8> { [ KP_8,          U2718,          uparrow,      intersection, KP_Up,      KP_Up,      U22C2   ] };
-    key  <KP9> { [ KP_9,          NoSymbol,       U20D7,        U226B,        KP_Prior,   KP_Prior,   U2309   ] };
-    key <KPAD> { [ KP_Add,        KP_Add,         plusminus,    U2213,        U2295,      NoSymbol,   U2214   ] };
-
-    // middle row
-    // --------------------------------------------------------------
-    key  <KP4> { [ KP_4,          club,           leftarrow,    includedin,   KP_Left,    KP_Left,    U2286 ] };
-    key  <KP5> { [ KP_5,          EuroSign,       brokenbar,    U22B6,        KP_Begin,   KP_Begin,   U22B7 ] };
-    key  <KP6> { [ KP_6,          NoSymbol,       rightarrow,   includes,     KP_Right,   KP_Right,   U2287 ] };
-
-    // bottom row
-    // --------------------------------------------------------------
-    key  <KP1> { [ KP_1,          diamond,        U2194,        lessthanequal,KP_End,     KP_End,     downstile ] };
-    key  <KP2> { [ KP_2,          heart,          downarrow,    union,        KP_Down,    KP_Down,    U22C3     ] };
-    key  <KP3> { [ KP_3,          U2660,          U21CC,     greaterthanequal,KP_Next,    KP_Next,    U230B     ] };
-    key <KPEN> { [ KP_Enter,      KP_Enter,       KP_Enter,     KP_Enter,     KP_Enter,   KP_Enter,   KP_Enter  ] };
-    key <KPEQ> { [ KP_Equal ] };
-
-    // bottommost row
-    // --------------------------------------------------------------
-    key  <KP0> { [ KP_0,         U2423,           percent,   U2030,        KP_Insert,   KP_Insert,   U25A1    ] };
-    key <KPDL> { [ KP_Decimal,   comma,           period,    apostrophe,   KP_Delete,   KP_Delete,   quotedbl ] };
-
-};
-
-// Copied from macintosh_vndr/de
-// [email protected]   very close to MacOS map
-
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    include "de"
-    name[Group1]= "Germany - Macintosh";
-
-    // Alphanumeric section
-    key <AE01>	{ [         1,     exclam,   exclamdown,           at ]	};
-    key <AE05>	{ [         5,    percent,  bracketleft       ]	};
-    key <AE06>	{ [         6,  ampersand, bracketright       ]	};
-    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
-    key <AE08>	{ [         8,  parenleft,    braceleft,   asciitilde ]	};
-    key <AE09>	{ [         9, parenright,   braceright       ]	};
-    key <AD01>	{ [         q,          Q, guillemotleft, guillemotright ]	};
-    key <AD04>	{ [         r,          R,   registered       ]	};
-    key <AD07>	{ [         u,          U,    diaeresis,       Aacute ]	};
-    key <AD08>	{ [         i,          I,        slash,  Ucircumflex ]	};
-    key <AD11>	{ [ udiaeresis, Udiaeresis, periodcentered,    degree ]	};
-    key <AD12>	{ [      plus,   asterisk,   asciitilde       ]	}; 
-    key <AC01>	{ [         a,          A,        aring,        Aring ]	};
-    key <AC05>	{ [         g,          G,    copyright       ]	};
-    key <AC06>	{ [         h,          H,  ordfeminine       ]	};
-    key <AC09>	{ [         l,          L,           at       ]	};
-    key <AC10>	{ [ odiaeresis, Odiaeresis,  dead_acute       ]	};
-    key <AB06>	{ [         n,          N,   asciitilde       ]	};
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "mac_nodeadkeys" {
-    // modify the standard German mac layout to not have any dead keys
-    include "de(mac)"
-    name[Group1]= "Germany - Macintosh, eliminate dead keys";
-    key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
-
-    key <TLDE>	{ [ asciicircum,    degree,     notsign       ]	};
-    key <AE12>	{ [      acute,      grave,     cedilla       ]	};
-    key <AD11>	{ [ udiaeresis, Udiaeresis,   diaeresis       ]	};
-    key <AD12>	{ [       plus,   asterisk,  asciitilde,       macron ]	};
-    key <AC10>	{ [ odiaeresis, Odiaeresis,       acute       ]	};
-    key <AC11>	{ [ adiaeresis, Adiaeresis, asciicircum       ]	};
-
-    key <BKSL>	{ [ numbersign, apostrophe,       grave       ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "dsb"
-{
-	name[Group1] = "Germany - Lower Sorbian";
-	include "latin(basic)"
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-	key <AB01> { [              z,              Z,         zcaron,         Zcaron ] };
-	key <AB02> { [              x,              X,         zacute,         Zacute ] };
-	key <AB03> { [              c,              C,         cacute,         Cacute ] };
-	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };
-	key <AB06> { [              n,              N,         nacute,         Nacute ] };
-	key <AC02> { [              s,              S,         sacute,         Sacute ] };
-	key <AC03> { [              d,              D,         scaron,         Scaron ] };
-	key <AC04> { [              f,              F                                 ] };
-	key <AD01> { [              q,              Q                                 ] };
-	key <AD02> { [              w,              W                                 ] };
-	key <AD03> { [              e,              E,         ecaron,         Ecaron ] };
-	key <AD04> { [              r,              R,         racute,         Racute ] };
-	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
-	key <AD09> { [              o,              O,         oacute,         Oacute ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "dsb_qwertz"
-{
-	name[Group1] = "Germany - Lower Sorbian (qwertz)";
-	include "latin(basic)"
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-	key <AB01> { [              y,              Y                                 ] };
-	key <AB02> { [              x,              X                                 ] };
-	key <AB03> { [              c,              C,         cacute,         Cacute ] };
-	key <AB04> { [              v,              V,         ccaron,         Ccaron ] };
-	key <AB06> { [              n,              N,         nacute,         Nacute ] };
-	key <AC02> { [              s,              S,         sacute,         Sacute ] };
-	key <AC03> { [              d,              D,         scaron,         Scaron ] };
-	key <AC04> { [              f,              F                                 ] };
-	key <AD01> { [              q,              Q                                 ] };
-	key <AD02> { [              w,              W                                 ] };
-	key <AD03> { [              e,              E,         ecaron,         Ecaron ] };
-	key <AD04> { [              r,              R,         racute,         Racute ] };
-	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
-	key <AD06> { [              z,              Z,         zcaron,         Zcaron ] };
-	key <AD07> { [              u,              U,         zacute,         Zacute ] };
-	key <AD09> { [              o,              O,         oacute,         Oacute ] };
-};
-
-partial alphanumeric_keys 
-xkb_symbols "qwerty" {
- 
-    // This layout should work exactly as a de with the exception 
-    // of 'Z' and 'Y' keys, which are in the qwerty style (ie. swapped).
-    // 2008 by Matej Košík <[email protected]>
-    
-    include "de(basic)"
-
-    name[Group1] = "Germany - qwerty";
-
-    key <AB01>	{ [         z,          Z,     leftarrow,         yen ]	};
-    key <AD06>	{ [         y,          Y, guillemotleft,        less ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/de(type4)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/de(type6)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/dk	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-
-// based on a keyboard map from an 'xkb/symbols/dk' file
-//
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/dk,v 1.3 2002/12/19 01:07:56 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type2)"
-
-    name[Group1]="Denmark";
-
-    key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};
-    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ]	};
-
-
-    key <AC10>	{ [        ae,        AE,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [    oslash,  Ooblique, dead_circumflex, dead_caron ]	};
-    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};
-
-    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
-
-    key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
-
-    include "kpdl(comma)"
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    include "dk(basic)"
-
-    name[Group1]="Denmark - Eliminate dead keys";
-
-    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
-    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
-    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};
-    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};
-    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};
-    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};
-    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
-    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
-
-};
-
-// Copied from macintosh_vndr/dk
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    include "dk"
-    name[Group1]= "Denmark - Macintosh";
-
-    key <SPCE>	{ [    space,       space, nobreakspace, nobreakspace ]	};
-    key <AB10>	{ [    minus,  underscore,       hyphen,       macron ]	};
-    include "kpdl(dot)"
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "mac_nodeadkeys" {
-    include "dk(mac)"
-    name[Group1]= "Denmark - Macintosh, eliminate dead keys";
-
-    key <AE12>	{ [    acute,       grave,          bar,       ogonek ]	};
-    key <AD12>	{ [diaeresis, asciicircum,   asciitilde,  dead_macron ]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "dvorak" {
-    include "no(dvorak)"
-
-    name[Group1]= "Denmark - Dvorak";
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/dk(type6)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/dk(type5)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/dk(type4)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/es	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-// $XKeyboardConfig$
-
-// based on a keyboard
-// Modified for a real Spanish Keyboard by Jon Tombs
-//
-// $XFree86: xc/programs/xkbcomp/symbols/es,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Spain";
-
-    key <AE01>	{ [         1,     exclam,          bar,   exclamdown ]	};
-    key <AE03>	{ [         3, periodcentered, numbersign,   sterling ]	};
-    key <AE04>	{ [         4,     dollar,   asciitilde,       dollar ]	};
-    key <AE06>	{ [         6,  ampersand,      notsign,  fiveeighths ]	};
-    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [exclamdown, questiondown, asciitilde,   asciitilde ]	};
-
-    key <AD11>	{ [dead_grave, dead_circumflex, bracketleft, dead_abovering ] };
-    key <AD12>	{ [      plus,   asterisk, bracketright,  dead_macron ]	};
-
-    key <AC10>	{ [    ntilde, Ntilde,   asciitilde, dead_doubleacute ]	};
-    key <AC11>	{ [dead_acute, dead_diaeresis, braceleft,   braceleft ]	};
-    key <TLDE>	{ [ masculine, ordfeminine,    backslash,   backslash ]	};
-
-    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,   dead_breve ]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    include "es(basic)"
-
-    key <AC11>	{ [SunFA_Acute, SunFA_Diaeresis, braceleft, braceleft ]	};
-    key <AD11>	{ [SunFA_Grave, SunFA_Circum, bracketleft, dead_abovering ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-    include "es(Sundeadkeys)"
-
-    name[Group1]="Spain - Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Eliminate dead keys";
-
-    key <AD11>	{ [     grave, asciicircum,  bracketleft,      degree ]	};
-    key <AD12>	{ [      plus,   asterisk, bracketright,       macron ]	};
-    key <AC10>	{ [    ntilde,     Ntilde,   asciitilde,  doubleacute ]	};
-    key <AC11>	{ [     acute,  diaeresis,    braceleft,    braceleft ]	};
-    key <BKSL>	{ [  ccedilla,   Ccedilla,   braceright,        breve ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
-};
-
-// Spanish mapping (note R-H exchange)
-partial alphanumeric_keys
-xkb_symbols "dvorak" {
-
-    name[Group1]="Spain - Dvorak";
-
-    // Alphanumeric section
-    key <TLDE> {[  masculine, ordfeminine, backslash, degree		]};
-    key <AE01> {[          1, exclam, bar, onesuperior			]};
-    key <AE02> {[          2, quotedbl, at, twosuperior			]};
-    key <AE03> {[          3, periodcentered, numbersign, threesuperior	]};
-    key <AE04> {[          4, dollar, asciitilde, onequarter		]};
-    key <AE05> {[          5, percent, brokenbar, fiveeighths		]};
-    key <AE06> {[          6, ampersand, notsign, threequarters		]};
-    key <AE07> {[          7, slash, onehalf, seveneighths		]};
-    key <AE08> {[          8, parenleft, oneeighth, threeeighths	]};
-    key <AE09> {[          9, parenright, asciicircum			]};
-    key <AE10> {[          0, equal, grave, dead_doubleacute		]};
-    key <AE11> {[ apostrophe, question, dead_macron, dead_ogonek	]};
-    key <AE12> {[ exclamdown, questiondown, dead_breve, dead_abovedot	]};
-
-    key <AD01> {[     period, colon					]};
-    key <AD02> {[      comma, semicolon					]};
-    key <AD03> {[     ntilde, Ntilde, lstroke, Lstroke			]};
-    key <AD04> {[          p, P, paragraph				]};
-    key <AD05> {[          y, Y, yen					]};
-    key <AD06> {[          f, F, tslash, Tslash				]};
-    key <AD07> {[          g, G, dstroke, Dstroke			]};
-    key <AD08> {[          c, C, cent, copyright			]};
-    key <AD09> {[          h, H, hstroke, Hstroke			]};
-    key <AD10> {[          l, L, sterling				]};
-    key <AD11> {[ dead_grave, dead_circumflex, bracketleft, dead_caron	]};
-    key <AD12> {[       plus, asterisk, bracketright, plusminus		]};
-
-    key <AC01> {[          a, A, ae, AE					]};
-    key <AC02> {[          o, O, oslash, Oslash				]};
-    key <AC03> {[          e, E, EuroSign				]};
-    key <AC04> {[          u, U, aring, Aring				]};
-    key <AC05> {[          i, I, oe, OE					]};
-    key <AC06> {[          d, D, eth, ETH				]};
-    key <AC07> {[          r, R, registered, trademark			]};
-    key <AC08> {[          t, T, thorn, THORN				]};
-    key <AC09> {[          n, N, eng, ENG				]};
-    key <AC10> {[          s, S, ssharp, section			]};
-    key <AC11> {[ dead_acute, dead_diaeresis, braceleft, dead_tilde	]};
-    key <BKSL> {[   ccedilla, Ccedilla, braceright, dead_cedilla	]};
-
-    key <LSGT> {[       less, greater, guillemotleft, guillemotright	]};
-    key <AB01> {[      minus, underscore, hyphen, macron		]};
-    key <AB02> {[          q, Q, currency				]};
-    key <AB03> {[          j, J						]};
-    key <AB04> {[          k, K, kra					]};
-    key <AB05> {[          x, X, multiply, division			]};
-    key <AB06> {[          b, B						]};
-    key <AB07> {[          m, M, mu					]};
-    key <AB08> {[          w, W						]};
-    key <AB09> {[          v, V						]};
-    key <AB10> {[          z, Z						]};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "cat" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Catalan variant with middle-dot L";
-
-    key <AC09>  { [	    l,      L,		0x1000140,  0x100013F ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "ast" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Asturian variant with bottom-dot H and bottom-dot L";
-
-    key <AC06>  { [	    h,      H,		0x1001E25,  0x1001E24 ] };
-    key <AC09>  { [	    l,      L,		0x1001E37,  0x1001E36 ] };
-};
-
-// Copied from macintosh_vndr/es
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Spanish keybaord
-
-    include "es"
-    name[Group1]= "Spain - Macintosh";
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "olpc" {
-
-    include "us(basic)"
-    name[Group1]="Spain";
-
-    key <TLDE> { [    masculine,    ordfeminine      ] };
-    key <AE01> { [            1,         exclam,             bar ] };
-    key <AE02> { [            2,       quotedbl,              at ] };
-    key <AE03> { [            3,     dead_grave,      numbersign,   grave           ] };
-    key <AE05> { [            5,        percent,     asciicircum,   dead_circumflex ] };
-    key <AE06> { [            6,      ampersand,         notsign ] };
-    key <AE07> { [            7,          slash,       backslash ] };
-    key <AE08> { [            8,      parenleft                         ] };
-    key <AE09> { [            9,     parenright                         ] };
-    key <AE10> { [            0,          equal                  ] };
-    key <AE11> { [   apostrophe,       question                  ] };
-    key <AE12> { [   exclamdown,   questiondown                  ] };
-
-    key <AD03> { [            e,              E,        EuroSign ] };
-    key <AD11> { [   dead_acute, dead_diaeresis,           acute,   dead_abovering  ] };
-    key <AD12> { [  bracketleft,      braceleft                  ] };
-
-    key <AC10> { [       ntilde,        Ntilde                  ] };
-    key <AC11> { [         plus,       asterisk,      dead_tilde ] };
-    key <BKSL> { [ bracketright,     braceright                  ] };
-
-    key <AB08> { [        comma,      semicolon                  ] };
-    key <AB09> { [       period,          colon                  ] };
-    key <AB10> { [        minus,     underscore                  ] };
-  
-    key <I219> { [         less,        greater,  ISO_Next_Group ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "deadtilde" {
-
-    include "es(basic)"
-
-    name[Group1]="Spain - Include dead tilde";
-
-    key <AE04>	{ [         4,     dollar,   dead_tilde,       dollar ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/es(type6)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/es(type5)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/es(type4)"
-    include "level3(ralt_switch)"
-
-};
--- a/src/xorg/keytables/sun-src/symbols/fi	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-// based on a keyboard map from an 'xkb/symbols/fi' file
-//
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/fi,v 1.9 2003/01/29 17:17:31 dawes Exp $
-
-// Troy Korjuslommi, 
-// Jan  6, 2006
-// May  5, 2006
-// May  6, 2006
-// May 12, 2006
-// Oct 10, 2007
-// Nov 11, 2008
-// Nov 29, 2008
-// Dec 31, 2008
-// Jan 22, 2009
-//
-//
-// Jan 22, 2009
-// Submit requests to change all remaining Uxxxx values to named versions
-// in keysymdef.h.
-// ezh      : U0292: LATIN SMALL LETTER EZH
-// Ezh      : U01B7: LATIN CAPITAL LETTER EZH
-// permille : U2030: PER MILLE SIGN
-// 
-// Dec 31, 2008
-// U0326 replaced with dead_belowcomma.
-// 
-// Nov 29, 2008
-// dead_belowcomma has been added to keysymdef.h, so the U0326 can be replaced with
-// it, as long as the version of X11 is built with the new keysymdef.h file.
-// 
-// Nov 11, 2008.
-// (a) Changed <AC10> level 4 from Ooblique to Oslash. The two names are synonyms. Since level 3 is already
-//     specified as oslash, the change adds consistency.
-// (b) The new Finnish keyboard standard (SFS 5966) reserves <AB10> level 4 for U0326, the combining comma below. 
-//     Removed the previous dead_abovedot entry there and replaced it with U0326, which can be replaced
-//     with dead_commabelow if that is added to keysymdef.h.
-// 
-// Oct 10, 2007.
-// -Changed space column 3 to nobreakspace (from space).
-// -Changed UFE63 entries to dead_stroke.
-// 
-// Nov 29, 2006.
-// UFE63 can be changed to dead_stroke starting with version 7.0.7. of the X server.
-//
-// Dec 05, 2006.
-// Changed instances of NoSymbol in columns 3 and 4 to characters in columns 1 and 2.
-// This fixes a bug where the mappings couldn't be changed (with xmodmap for example).
-// NoSymbol left in other positions, so nothing is output from those key presses.
-//
-// Dec 11, 2006.
-// Changed all Uxxxx values to named versions.
-// If you have problems, check these defines (when compiling X):
-// XK_LATIN9: oe, OE.
-// XK_CURRENCY: EuroSign.
-// XK_LATIN2: caron.
-// XK_LATIN3: idotless.
-// XK_LATIN4: kra, eng, ENG.
-// XK_CAUCASUS: schwa, SCHWA.
-// XK_PUBLISHING: rightdoublequotemark, leftdoublequotemark, singlelowquotemark, doublelowquotemark, emdash,
-//                rightsinglequotemark, leftsinglequotemark, endash.
-// 
-// Unnamed positions: 
-// UFE63: dead_stroke. Will be fixed, once the entry is in keysymdef.h.
-// U0292: LATIN SMALL LETTER EZH. 
-// U01B7: LATIN CAPITAL LETTER EZH.
-// U2030: PER MILLE SIGN.
-//        Comment: XK_MillSign is U+20A5 MILL SIGN. 
-//                 Per mille is a generic term for 1/1000. Mill is 1/1000 of a dollar.
-// 
-
-partial default alphanumeric_keys
-xkb_symbols "kotoistus" {
-
-    name[Group1]="Finland";
-
-    key <TLDE> { [  section,         onehalf,          dead_stroke,          NoSymbol             ] };
-    key <AE01> { [  1,               exclam,           NoSymbol,             exclamdown           ] };
-    key <AE02> { [  2,               quotedbl,         at,                   rightdoublequotemark ] };
-    key <AE03> { [  3,               numbersign,       sterling,             guillemotright       ] };
-    key <AE04> { [  4,               currency,         dollar,               guillemotleft        ] };
-    key <AE05> { [  5,               percent,          U2030,                leftdoublequotemark  ] };
-    key <AE06> { [  6,               ampersand,        singlelowquotemark,   doublelowquotemark   ] };
-    key <AE07> { [  7,               slash,            braceleft,            NoSymbol             ] };
-    key <AE08> { [  8,               parenleft,        bracketleft,          less                 ] };
-    key <AE09> { [  9,               parenright,       bracketright,         greater              ] };
-    key <AE10> { [  0,               equal,            braceright,           degree               ] };
-    key <AE11> { [  plus,            question,         backslash,            questiondown         ] };
-    key <AE12> { [  dead_acute,      dead_grave,       dead_cedilla,         dead_ogonek          ] };
-    key <AD01> { [  q,               Q,                q,                    Q                    ] };
-    key <AD02> { [  w,               W,                w,                    W                    ] };
-    key <AD03> { [  e,               E,                EuroSign,             NoSymbol             ] };
-    key <AD04> { [  r,               R,                r,                    R                    ] };
-    key <AD05> { [  t,               T,                thorn,                THORN                ] };
-    key <AD06> { [  y,               Y,                y,                    Y                    ] };
-    key <AD07> { [  u,               U,                u,                    U                    ] };
-    key <AD08> { [  i,               I,                idotless,             bar                  ] };
-    key <AD09> { [  o,               O,                oe,                   OE                   ] };
-    key <AD10> { [  p,               P,                dead_horn,            dead_hook            ] };
-    key <AD11> { [  aring,           Aring,            dead_doubleacute,     dead_abovering       ] };
-    key <AD12> { [  dead_diaeresis,  dead_circumflex,  dead_tilde,           dead_macron          ] };
-    key <AC01> { [  a,               A,                schwa,                SCHWA                ] };
-    key <AC02> { [  s,               S,                ssharp,               NoSymbol             ] };
-    key <AC03> { [  d,               D,                eth,                  ETH                  ] };
-    key <AC04> { [  f,               F,                f,                    F                    ] };
-    key <AC05> { [  g,               G,                g,                    G                    ] };
-    key <AC06> { [  h,               H,                h,                    H                    ] };
-    key <AC07> { [  j,               J,                j,                    J                    ] };
-    key <AC08> { [  k,               K,                kra,                  NoSymbol             ] };
-    key <AC09> { [  l,               L,                dead_stroke,          NoSymbol             ] };
-    key <AC10> { [  odiaeresis,      Odiaeresis,       oslash,               Oslash               ] };
-    key <AC11> { [  adiaeresis,      Adiaeresis,       ae,                   AE                   ] };
-    key <BKSL> { [  apostrophe,      asterisk,         dead_caron,           dead_breve           ] };
-    key <LSGT> { [  less,            greater,          bar,                  NoSymbol             ] };
-    key <AB01> { [  z,               Z,                U0292,                U01B7                ] };
-    key <AB02> { [  x,               X,                multiply,             periodcentered       ] };
-    key <AB03> { [  c,               C,                c,                    C                    ] };
-    key <AB04> { [  v,               V,                v,                    V                    ] };
-    key <AB05> { [  b,               B,                b,                    B                    ] };
-    key <AB06> { [  n,               N,                eng,                  ENG                  ] };
-    key <AB07> { [  m,               M,                mu,                   emdash               ] };
-    key <AB08> { [  comma,           semicolon,        rightsinglequotemark, leftsinglequotemark  ] };
-    key <AB09> { [  period,          colon,            dead_belowdot,        dead_abovedot        ] };
-    key <AB10> { [  minus,           underscore,       endash,               dead_belowcomma      ] };
-
-    include "nbsp(level3)"
-
-    include "kpdl(comma)"
-
-    include "level3(ralt_switch)"
-
-    include "compose(rwin)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "classic" {
-    include "latin(type2)"
-    include "fi(fi)"
-
-    name[Group1]="Finland - Classic";
-};
-
-hidden partial alphanumeric_keys
-xkb_symbols "fi" {
-
-    // a Finnish keyboard with dead key support and all of
-    // ISO-8859-1 and ISO-8859-15 characters available.
-
-    key <TLDE> { [ section,    onehalf,     onequarter,   threequarters	] };
-    key <LSGT> { [    less,    greater,            bar,       brokenbar	] };
-    // AltGr+<SPCE> is pressed accidentally too often after AltGr+<LSGT>,
-    // hence AltGr+<SPCE> produces now space, not nobreakspace.
-    key <SPCE> { [   space,      space,          space,    nobreakspace	] };
-    key <AE01> { [       1,     exclam,     exclamdown,     onesuperior	] };
-    key <AE02> { [       2,   quotedbl,             at,     twosuperior	] };
-    key <AE03> { [     	 3, numbersign,       sterling,   threesuperior	] };
-    key <AE04> { [       4,   currency,         dollar,	           cent	] };
-    key <AE05> { [       5,    percent,       EuroSign,	      masculine	] };
-    key <AE06> { [       6,  ampersand,            yen,     ordfeminine	] };
-    key <AE07> { [       7,      slash,      braceleft,       plusminus	] };
-    key <AE08> { [       8,  parenleft,    bracketleft,   guillemotleft	] };
-    key <AE09> { [       9, parenright,   bracketright,  guillemotright	] };
-    key <AE10> { [       0,      equal,     braceright,          degree	] };
-    key <AB09> { [  period,      colon, periodcentered,         notsign	] };
-    key <AB01> { [       z,          Z,         zcaron,	         Zcaron	] };
-    key <AB02> { [       x,          X,       multiply,	       division	] };
-    key <AB03> { [       c,          C,      copyright,	           cent	] };
-    key <AB05> { [       b,          B,         ssharp,        NoSymbol	] };
-    key <AB06> { [       n,          N,         ntilde,	         Ntilde	] };
-    key <AB07> { [       m,          M,             mu,	       NoSymbol	] };
-    key <AB10> { [   minus, underscore,         hyphen,     dead_macron	] };
-    key <AC02> { [       s,          S,         scaron,          Scaron	] };
-    key <AC03> { [       d,          D,            eth,             ETH	] };
-    key <AD03> { [       e,          E,       EuroSign,            cent	] };
-    key <AD04> { [       r,          R,     registered,        NoSymbol	] };
-    key <AD05> { [       t,          T,          thorn,           THORN	] };
-    key <AD10> { [       p,          P,      paragraph,        NoSymbol	] };
-    key <AC10> { [ odiaeresis, Odiaeresis,      oslash,        Ooblique	] };
-    key <AE11> { [    plus,      question,   backslash,    questiondown	] };
-    key	<AC11> { [ adiaeresis, Adiaeresis,         ae,	             AE	] };
-    key <BKSL> { [ apostrophe,   asterisk ] };
-    key <AD11> { [   aring,         Aring,         oe,		     OE	] };
-    key <AE12> { [ dead_acute, dead_grave ] };
-    key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde, dead_caron ] };
-
-    // End alphanumeric section, begin "Keypad"
-    include "kpdl(comma)"
-    // End "Keypad" section
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-    include "latin(type2)"
-    include "latin(type2_nodeadkeys)"
-    include "fi(fi)"
-
-    name[Group1]="Finland - Eliminate dead keys";
-
-    key <AE12> { [     acute,       grave ] };
-    key <AD12> { [ diaeresis, asciicircum, asciitilde,  caron ] };
-    key <AB10> { [     minus,  underscore,     hyphen, macron ] };
-};
-
-xkb_symbols "smi" {
-
-    // Describes the differences between a Norwegian Northern Sami
-    // (keyboard with dead key support) and a Swedish/Finnish Sami
-    // keyboard according to the specs at:
-    // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html
-
-    include "no(smi)"
-
-    name[Group1]= "Finland - Northern Saami";
-
-    key <AC10>	{ [odiaeresis, Odiaeresis,       oslash,     Ooblique ]	};
-    key <AC11>	{ [adiaeresis, Adiaeresis,           ae,           AE ]	};
-};
-
-// Copied from macintosh_vndr/fi
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Swedish(Finland) keybaord
-
-    include "se(mac)"
-    name[Group1]= "Finland - Macintosh";
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/fi(type6)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/fr	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1020 +0,0 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/fr' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/fr,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin"
-
-    name[Group1]="France";
-
-    key <AE01>	{ [ ampersand,          1,  onesuperior,   exclamdown ]	};
-    key <AE02>	{ [    eacute,          2,   asciitilde,    oneeighth ]	};
-    key <AE03>	{ [  quotedbl,          3,   numbersign,     sterling ]	};
-    key <AE04>	{ [apostrophe,          4,    braceleft,       dollar ]	};
-    key <AE05>	{ [ parenleft,          5,  bracketleft, threeeighths ]	};
-    key <AE06>	{ [     minus,          6,          bar,  fiveeighths ]	};
-    key <AE07>	{ [    egrave,          7,        grave, seveneighths ]	};
-    key <AE08>	{ [underscore,          8,    backslash,    trademark ]	};
-    key <AE09>	{ [  ccedilla,          9,  asciicircum,    plusminus ]	};
-    key <AE10>	{ [    agrave,          0,           at,       degree ]	};
-    key <AE11>	{ [parenright,     degree, bracketright, questiondown ]	};
-    key <AE12>	{ [     equal,       plus,   braceright,  dead_ogonek ]	};
-
-    key <AD01>	{ [         a,          A,           ae,           AE ]	};
-    key <AD02>	{ [         z,          Z, guillemotleft,        less ]	};
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ]	};
-    key <AD11>	{ [dead_circumflex, dead_diaeresis, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [    dollar,   sterling,     currency,  dead_macron ]	};
-
-    key <AC01>	{ [         q,          Q,           at,  Greek_OMEGA ]	};
-    key <AC10>	{ [         m,          M,           mu,    masculine ]	};
-    key <AC11>	{ [    ugrave,    percent, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [twosuperior, asciitilde,     notsign,      notsign ]	};
-
-    key <BKSL>	{ [  asterisk,         mu,   dead_grave,   dead_breve ]	};
-    key <AB01>	{ [         w,          W,      lstroke,      Lstroke ]	};
-    key <AB07>	{ [     comma,   question,   dead_acute, dead_doubleacute ] };
-    key <AB08>	{ [ semicolon,     period, horizconnector,   multiply ]	};
-    key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
-    key <AB10>	{ [    exclam,    section, dead_belowdot, dead_abovedot ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // Modifies the basic French layout to use the Sun dead keys
-
-    include "fr(basic)"
-
-    key <AD11>	{ [SunFA_Circum, SunFA_Diaeresis ]	};
-    key <AB07>	{ [comma,   question,  SunFA_Acute, dead_doubleacute ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "fr(Sundeadkeys)"
-
-    name[Group1]="France - Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic French layout to eliminate all dead keys
-
-    include "fr(basic)"
-
-    name[Group1]="France - Eliminate dead keys";
-
-    key <AE12>	{ [     equal,       plus,   braceright,       ogonek ]	};
-    key <AD11>	{ [asciicircum,  diaeresis ]	};
-    key <AD12>	{ [    dollar,   sterling,     currency,       macron ]	};
-    key <AC11>	{ [    ugrave,    percent,  asciicircum,        caron ]	};
-    key <BKSL>	{ [  asterisk,         mu,        grave,        breve ]	};
-    key <AB07>	{ [     comma,   question,        acute,  doubleacute ]	};
-    key <AB10>	{ [    exclam,    section, dead_belowdot,    abovedot ]	};
-};
-
-
-// Unicode French derivative
-// Loose refactoring of the historic Linux French keyboard layout
-//
-// Copyright © 2006-2008 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
-//
-// Credits (fr-latin1, fr-latin0, fr-latin9)
-//   © 199x-1996 René Cougnenc ✝
-//   © 1997-2002 Guylhem Aznar <clavier @ externe.net>
-//   © 2003-2006 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃
-// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ A Æ │ Z  │ E ¢ │ R Ê │ T Þ │ Y Ÿ │ U Û │ I Î │ O Œ │ P Ô │ ¨ ˚ │ £ Ø ┃Entrée ┃
-// ┃Tab ↹  ┃ a æ │ z â │ e € │ r ê │ t þ │ y ÿ │ u û │ i î │ o œ │ p ô │ ^ ~ │ $ ø ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ Q Ä │ S „ │ D Ë │ F ‚ │ G ¥ │ H Ð │ J Ü │ K Ï │ L Ŀ │ M Ö │ % Ù │ µ ̄ ┃      ┃
-// ┃Maj ⇬   ┃ q ä │ s ß │ d ë │ f ‘ │ g ’ │ h ð │ j ü │ k ï │ l ŀ │ m ö │ ù ' │ * ` ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N → │ ? … │ . . │ / ∕ │ § − ┃             ┃
-// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v ⍽ │ b ↓ │ n ¬ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ␣         Espace fine insécable ⍽ ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace       Espace insécable ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "oss" {
-
-    include "latin"
-    include "level3(ralt_switch)"
-    include "nbsp(level4nl)"
-    include "keypad(oss)"
-
-    name[Group1]="France - Alternative";
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 
-    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨
-    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
-    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
-    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
-    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
-    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
-    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
-    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™
-    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç
-    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À
-    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 
-    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±
-
-    // Second row
-    key <AD01>	{ [                a,                A,                   ae,                    AE ] }; // a A æ Æ
-    key <AD02>	{ [                z,                Z,          acircumflex,           Acircumflex ] }; // z Z â Â
-    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢
-    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê
-    key <AD05>	{ [                t,                T,                thorn,                 THORN ] }; // t T þ Þ
-    key <AD06>	{ [                y,                Y,           ydiaeresis,            Ydiaeresis ] }; // y Y ÿ Ÿ
-    key <AD07>	{ [                u,                U,          ucircumflex,           Ucircumflex ] }; // u U û Û
-    key <AD08>	{ [                i,                I,          icircumflex,           Icircumflex ] }; // i I î Î
-    key <AD09>	{ [                o,                O,                   oe,                    OE ] }; // o O œ Œ
-    key <AD10>	{ [                p,                P,          ocircumflex,           Ocircumflex ] }; // p P ô Ô
-    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,           dead_tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
-    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø
-
-    // Third row
-    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä
-    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 
-    key <AC03>	{ [                d,                D,           ediaeresis,            Ediaeresis ] }; // d D ë Ë
-    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚
-    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥
-    key <AC06>	{ [                h,                H,                  eth,                   ETH ] }; // h H ð Ð
-    key <AC07>	{ [                j,                J,           udiaeresis,            Udiaeresis ] }; // j J ü Ü
-    key <AC08>	{ [                k,                K,           idiaeresis,            Idiaeresis ] }; // k K ï Ï
-    key <AC09>	{ [                l,                L,            0x1000140,             0x100013F ] }; // l L ŀ Ŀ
-    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö
-    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
-    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “
-    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”
-    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®
-    key <AB04>  { [                v,                V,            0x100202F,             leftarrow ] }; // v V ⍽ ← (espace fine insécable)
-    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑
-    key <AB06>  { [                n,                N,              notsign,            rightarrow ] }; // n N ¬ →
-    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …
-    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅
-    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕
-    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_latin9" {
-
-    // Restricts the fr(oss) layout to latin9 symbols
-
-    include "fr(oss)"
-    include "keypad(oss_latin9)"
-
-    name[Group1]="France - Alternative, latin-9 only";
-
-    // First row
-    key <AE01>	{ [        ampersand,                1,           dead_caron,          dead_cedilla ] }; // & 1 ˇ ¸
-    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_tilde ] }; // " 3 # ~
-    key <AE04>	{ [       apostrophe,                4,            braceleft,            underscore ] }; // ' 4 { _
-    key <AE05>	{ [        parenleft,                5,          bracketleft,                 minus ] }; // ( 5 [ -
-    key <AE06>  { [            minus,                6,                  bar,                 minus ] }; // - 6 | -
-    key <AE08>  { [       underscore,                8,            backslash,             backslash ] }; // _ 8 \ \
-    key <AE11>	{ [       parenright,           degree,         bracketright,                 equal ] }; // ) ° ] =
-
-    // Third row
-    key <AC02>	{ [                s,                S,               ssharp,         guillemotleft ] }; // s S ß « 
-    key <AC04>	{ [                f,                F,           apostrophe,            apostrophe ] }; // f F ' '
-    key <AC05>	{ [                g,                G,           apostrophe,                   yen ] }; // g G ' ¥
-    key <AC09>  { [                l,                L,       periodcentered,        periodcentered ] }; // l L · ·
-    key <BKSL>	{ [         asterisk,               mu,           dead_grave,       dead_circumflex ] }; // * µ ` ^ 
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,                 less,               greater ] }; // < > < >
-    key <AB01>  { [                w,                W,        guillemotleft,         guillemotleft ] }; // w W « «
-    key <AB02>  { [                x,                X,       guillemotright,        guillemotright ] }; // x X » »
-    key <AB04>  { [                v,                V,         nobreakspace,                  less ] }; // v V ⍽ < (espace insécable)
-    key <AB05>  { [                b,                B,                minus,           asciicircum ] }; // b B - ^
-    key <AB06>  { [                n,                N,              notsign,               greater ] }; // n N ¬ >
-    key <AB07>  { [            comma,         question,         questiondown,                period ] }; // , ? ¿ .
-    key <AB08>  { [        semicolon,           period,             multiply,        periodcentered ] }; // ; . × ·
-    key <AB09>  { [            colon,            slash,             division,                 slash ] }; // : / ÷ /
-    key <AB10>  { [           exclam,          section,           exclamdown,                 minus ] }; // ! § ¡ -
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_Sundeadkeys" {
-
-    // Modifies the basic fr(oss) layout to use the Sun dead keys
-
-    include "fr(oss)"
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,         SunFA_Cedilla ] }; // ¹ ² ³ ¸ 
-
-    // Second row
-    key <AD11>	{ [     SunFA_Circum,  SunFA_Diaeresis,          SunFA_Tilde,        dead_abovering ] }; // ^ ̈ ̃ ˚
-
-    //Third row
-    key <AC11>	{ [           ugrave,          percent,          SunFA_Acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,          SunFA_Grave,           dead_macron ] }; // * µ ` ̄
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_sundeadkeys" {
-
-    include "fr(oss_Sundeadkeys)"
-
-    name[Group1]="France - Alternative, Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "oss_nodeadkeys" {
-
-    // Modifies the basic fr(oss) layout to eliminate all dead keys
-
-    include "fr(oss)"
-
-    name[Group1]="France - Alternative, eliminate dead keys";
-
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,               cedilla ] }; // ² ³ ¹ ¸ 
-    key <AE01>	{ [        ampersand,                1,                caron,                ogonek ] }; // & 1 ˇ ̨
-    key <AE03>	{ [         quotedbl,                3,           numbersign,                 breve ] }; // " 3 # ˘
-
-    // Second row
-    key <AD11>	{ [  asciicircum,   diaeresis,           asciitilde,                 Aring ] }; // ^ ̈ ̃ Å
-    key <AC11>	{ [           ugrave,          percent,                acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,                grave,                macron ] }; // * µ ` ̄
-};
-
-
-// Historic Linux French keyboard layout (fr-latin9)
-// Copyright (c) 199x, 2002 Rene Cougnenc (original work)
-//                          Guylhem Aznar <clavier @ externe.net> (maintainer)
-//                          Nicolas Mailhot <Nicolas.Mailhot @ laposte.net>
-//                              (XFree86 submission)
-//
-//  $XFree86: xc/programs/xkbcomp/symbols/fr-latin9,v 1.1 2002/12/20 02:07:11 dawes Exp $
-//
-// This layout has long been distributed and refined outside official channels.
-// To this day it remains more feature-rich and popular than the 'fr' layout.
-//
-// This file is derived from an original version by Guylhem Aznar.  The
-// original version is always available from:
-// http://en.tldp.org/HOWTO/Francophones-HOWTO.html
-// and is distributed under a GPL license.
-//
-// The author has given permission for this derived version to be distributed
-// under the standard XFree86 license. He would like all changes to this
-// version be send to him at <clavier @ externe.net> so he can sync the
-// identically named linux console map (kbd, linux-console) and this
-// fileout-of-tree GPL version.
-//
-// Now follows the keyboard design description in French.
-// (If you can't read it you probably have no business changing this file anyway:)
-//
-// Les accents circonflexes des principales voyelles sont obtenus avec
-// la touche Alt_Gr, les trémas sont obtenus par Alt_Gr + Shift.
-//
-//  ____                                     _________ _____________ _______
-// | S A| S = Shift,  A = AltGr + Shift     | Imprime | Arrêt défil | Pause |
-// | s a| s = normal, a = AltGr             |  Exec   |             | Halte |
-//  ¯¯¯¯                                     ¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯
-//  ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______
-// | œ "| 1 ·| 2 É| 3 ,| 4 '| 5 "| 6 || 7 È| 8 ¯| 9 Ç| 0 À| ° ÿ| + °| <--   |
-// | Œ "| & '| é ~| " #| ' {| ( [| - || è `| _ \| ç ^| à @| ) ]| = }|       |
-//  ========================================================================
-// | |<-  | A ä| Z Å| E ¢| R Ç| T Þ| Y Ý| U ü| I ï| O ö| P '| " `| $ ë|   , |
-// |  ->| | a â| z å| e €| r ç| t þ| y ý| u û| i î| o ô| p ¶| ^ ~| £ ê| <-' |
-//  ===================================================================¬    |
-// |       | Q Ä| S Ø| D Ë| F ª| G Æ| H Ð| J Ü| K Ï| L Ö| M º| % Ù| µ ¥|    |
-// | MAJ   | q Â| s ø| d Ê| f ±| g æ| h ð| j Û| k Î| l Ô| m ¹| ù ²| * ³|    |
-//  ========================================================================
-// | ^   | >  | W  | X  | C  | V  | B  | N  | ?  | .  | /  | §  |     ^     |
-// | |   | < || w «| x »| c ©| v ®| b ß| n ¬| , ¿| ; ×| : ÷| ! ¡|     |     |
-//  ========================================================================
-// |      |      |      |                       |       |      |     |      |
-// | Ctrl | Super| Alt  | Space    Nobreakspace | AltGr | Super|Menu | Ctrl |
-//  ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯
-//
-//
-//		Si les touches mortes fonctionnent, utiliser les accents dits
-//		« morts », i.e. fonctionnant comme l'accent circonflexe & le
-//		tréma des machines à écrire ; sont disponibles :
-//
-// (^) : accent circonflexe,
-// Shift+(^) : tréma,
-// Shift+AltGr (^) : tilde,
-// AltGr (1) : accent aigu,
-// AltGr (7) : accent grave
-//
-// Pour s'en servir, procéder comme avec l'accent circonflexe & le tréma
-// sur les vielles machines à écrire :
-//
-// AltGr (1) puis e : é
-// Shift+AltGr (1) puis e : É ...
-partial alphanumeric_keys
-
-xkb_symbols "latin9" {
-
-    include "latin"
-    include "nbsp(level3)"
-
-    name[Group1]="France - (Legacy) Alternative";
-
-    key <TLDE>	{ [              oe,              OE, leftdoublequotemark, rightdoublequotemark ] };
-    key <AE01>	{ [       ampersand,               1,          dead_acute,       periodcentered ] };
-    key <AE02>	{ [          eacute,               2,          asciitilde,               Eacute ] };
-    key <AE03>	{ [        quotedbl,               3,          numbersign,              cedilla ] };
-    key <AE04>	{ [      apostrophe,               4,           braceleft,                acute ] };
-    key <AE05>	{ [       parenleft,               5,         bracketleft,            diaeresis ] };
-    key <AE06>	{ [           minus,               6,                 bar,            brokenbar ] };
-    key <AE07>	{ [          egrave,               7,          dead_grave,               Egrave ] };
-    key <AE08>	{ [      underscore,               8,           backslash,               macron ] };
-    key <AE09>	{ [        ccedilla,               9,         asciicircum,             Ccedilla ] };
-    key <AE10>	{ [          agrave,               0,                  at,               Agrave ] };
-    key <AE11>	{ [      parenright,          degree,        bracketright,           ydiaeresis ] };
-    key <AE12>	{ [           equal,            plus,          braceright,       dead_abovering ] };
-
-    key <AD01>	{ [               a,               A,         acircumflex,           adiaeresis ] };
-    key <AD02>	{ [               z,               Z,               aring,                Aring ] };
-    key <AD03>	{ [               e,               E,            EuroSign,                 cent ] };
-    key <AD04>	{ [               r,               R,            ccedilla,             Ccedilla ] };
-    key <AD05>	{ [               t,               T,               thorn,                THORN ] };
-    key <AD06>	{ [               y,               Y,              yacute,               Yacute ] };
-    key <AD07>	{ [               u,               U,         ucircumflex,           udiaeresis ] };
-    key <AD08>	{ [               i,               I,         icircumflex,           idiaeresis ] };
-    key <AD09>	{ [               o,               O,         ocircumflex,           odiaeresis ] };
-    key <AD10>	{ [               p,               P,           paragraph,            quoteleft ] };
-    key <AD11>	{ [ dead_circumflex,  dead_diaeresis,          dead_tilde,           quoteright ] };
-    key <AD12>	{ [          dollar,	    sterling,         ecircumflex,           ediaeresis ] };
-
-    key <AC01>	{ [               q,               Q,         Acircumflex,           Adiaeresis ] };
-    key <AC02>	{ [               s,               S,              oslash,             Ooblique ] };
-    key <AC03>	{ [               d,               D,         Ecircumflex,           Ediaeresis ] };
-    key <AC04>	{ [               f,               F,           plusminus,          ordfeminine ] };
-    key <AC05>	{ [               g,               G,                  ae,                   AE ] };
-    key <AC06>	{ [               h,               H,                 eth,                  ETH ] };
-    key <AC07>	{ [               j,               J,         Ucircumflex,           Udiaeresis ] };
-    key <AC08>	{ [               k,               K,         Icircumflex,           Idiaeresis ] };
-    key <AC09>	{ [               l,               L,         Ocircumflex,           Odiaeresis ] };
-    key <AC10>	{ [               m,               M,         onesuperior,            masculine ] };
-    key <AC11>	{ [          ugrave,         percent,         twosuperior,               Ugrave ] };
-    key <BKSL>  { [        asterisk,              mu,       threesuperior,                  yen ] };
-
-    key <LSGT>	{ [            less,         greater,                 bar                       ] };
-    key <AB01>	{ [               w,               W,       guillemotleft	        	] };
-    key <AB02>	{ [               x,               X,      guillemotright                       ] };
-    key <AB03>	{ [               c,               C,           copyright                       ] };
-    key <AB04>	{ [               v,               V,          registered		        ] };
-    key <AB05>	{ [               b,               B,              ssharp                       ] };
-    key <AB06>	{ [               n,               N,             notsign                       ] };
-    key <AB07>	{ [           comma,        question,        questiondown                       ] };
-    key <AB08>	{ [       semicolon,          period,            multiply		        ] };
-    key <AB09>	{ [           colon,           slash,            division                       ] };
-    key <AB10>	{ [          exclam,         section,          exclamdown                       ] };
-
-    // French uses a comma as decimal separator, but keyboards are labeled with a period
-    // Will take effect when KP_Decimal is mapped to the locale decimal separator
-    key <KPDL>  { [       KP_Delete,      KP_Decimal,           KP_Delete,           KP_Decimal ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "latin9_Sundeadkeys" {
-
-    // Modifies the basic fr-latin9 layout to use the Sun dead keys
-
-    include "fr(latin9)"
-
-    key <AE01>	{ [       ampersand,               1,         SunFA_Acute,       periodcentered ] };
-    key <AE07>	{ [          egrave,               7,         SunFA_Grave,               Egrave ] };
-    key <AD11>	{ [    SunFA_Circum, SunFA_Diaeresis,         SunFA_Tilde,           quoteright ] };
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "latin9_sundeadkeys" {
-
-    include "fr(latin9_Sundeadkeys)"
-
-    name[Group1]="France - (Legacy) Alternative, Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "latin9_nodeadkeys" {
-
-    // Modifies the basic fr-latin9 layout to eliminate all dead keys
-
-    include "fr(latin9)"
-
-    name[Group1]="France - (Legacy) Alternative, eliminate dead keys";
-
-    key <AE01>	{ [       ampersand,               1,          apostrophe,       periodcentered ] };
-    key <AE07>	{ [          egrave,               7,               grave,               Egrave ] };
-    key <AE12>	{ [           equal,            plus,          braceright         	        ] };
-    key <AD11>	{ [	asciicircum,  	   diaeresis,          asciitilde,           quoteright ] };
-};
-
-// Bépo : Improved ergonomic french keymap using Dvorak method.
-// Built by community on 'Dvorak Fr / Bépo' :
-// see http://www.clavier-dvorak.org/wiki/ to join and help.
-// XOrg integration (1.0rc2 version) in 2008
-// by Frédéric Boiteux <fboiteux at free dot fr>
-//
-// Bépo layout (1.0rc2 version) for a pc105 keyboard (french) :
-// ┌────┐
-// │ S A│   S = Shift,  A = AltGr + Shift
-// │ s a│   s = normal, a = AltGr
-// └────┘
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ # ¶ │ 1 „ │ 2 “ │ 3 ” │ 4 ≤ │ 5 ≥ │ 6   │ 7 ¬ │ 8 ¼ │ 9 ½ │ 0 ¾ │ ° ′ │ ` ″ ┃ ⌫ Retour┃
-// │ $ – │ " — │ « < │ » > │ ( [ │ ) ] │ @ ^ │ + ± │ - − │ / ÷ │ * × │ = ≠ │ % ‰ ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ B ¦ │ É ˝ │ P § │ O Œ │ È ` │ !   │ V   │ D Ð │ L   │ J IJ │ Z Ə │ W   ┃Entrée ┃
-// ┃Tab ↹  ┃ b | │ é ˊ │ p & │ o œ │ è ` │ ˆ ¡ │ v ˇ │ d ð │ l / │ j ij │ z ə │ w ̆ ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ A Æ │ U Ù │ I ˙ │ E ¤ │ ; ̛ │ C ſ │ T Þ │ S ẞ │ R ™ │ N   │ M º │ Ç , ┃      ┃
-// ┃Maj ⇬   ┃ a æ │ u ù │ i ̈ │ e € │ , ’ │ c © │ t þ │ s ß │ r ® │ n ˜ │ m ¯ │ ç ¸ ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ Ê   │ À   │ Y ‘ │ X ’ │ : · │ K   │ ? ̉ │ Q ̣ │ G   │ H ‡ │ F ª ┃             ┃
-// ┃Shift ⇧┃ ê / │ à \ │ y { │ x } │ . … │ k ~ │ ' ¿ │ q ˚ │ g µ │ h † │ f ˛ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ Espace inséc.   Espace inséc. fin ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ (Espace)      _               ␣ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "bepo" {
-
-    include "level3(ralt_switch)"
-    include "keypad(oss)"
-
-    name[Group1]= "France - Bepo, ergonomic, Dvorak way";
-
-    // First row
-    key <TLDE> { [          dollar,   numbersign,        endash,       paragraph ] }; // $ # – ¶
-    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1,         emdash, doublelowquotemark ] }; // " 1 — „
-    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less,  leftdoublequotemark ] }; // « 2 < “
-    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater, rightdoublequotemark ] }; // » 3 > ”
-    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft,      lessthanequal ] }; // ( 4 [ ≤
-    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright,   greaterthanequal ] }; // ) 5 ] ≥
-    key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [              at,            6,    asciicircum                 ] }; // @ 6 ^
-    key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            plus,            7,      plusminus,        notsign ] }; // + 7 ± ¬
-    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          U2212,     onequarter ] }; // - 8 − ¼
-    key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           slash,            9,       division,        onehalf ] }; // / 9 ÷ ½
-    key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        asterisk,            0,       multiply,  threequarters ] }; // * 0 × ¾
-    key <AE11> { [           equal,       degree,       notequal,        minutes ] }; // = ° ≠ ′
-    key <AE12> { [         percent,        grave,          U2030,        seconds ] }; // % ` ‰ ″
-
-    // Second row
-    key <AD01> { [               b,            B,            bar,      brokenbar ] }; // b B | ¦
-    key <AD02> { [          eacute,       Eacute,     dead_acute, dead_doubleacute ] }; // é É ˊ ˝
-    key <AD03> { [               p,            P,      ampersand,        section ] }; // p P & §
-    key <AD04> { [               o,            O,             oe,             OE ] }; // o O œ Œ
-    key <AD05> { [          egrave,       Egrave,     dead_grave,          grave ] }; // è È ` `
-    key <AD06> { [ dead_circumflex,       exclam,     exclamdown                 ] }; // ^ ! ¡
-    key <AD07> { [               v,            V,     dead_caron                 ] }; // v V ˇ
-    key <AD08> { [               d,            D,            eth,            ETH ] }; // d D ð Ð
-    key <AD09> { [               l,            L,    dead_stroke                 ] }; // l L /
-    key <AD10> { [               j,            J,          U0133,          U0132 ] }; // j J ij IJ
-    key <AD11> { [               z,            Z,          schwa,          SCHWA ] }; // z Z ə Ə
-    key <AD12> { [               w,            W,     dead_breve                 ] }; // w W ̆
-
-    // Third row
-    key <AC01> { [               a,            A,             ae,             AE ] }; // a A æ Æ
-    key <AC02> { [               u,            U,         ugrave,         Ugrave ] }; // u U ù Ù
-    key <AC03> { [               i,            I, dead_diaeresis,  dead_abovedot ] }; // i I ̈ ˙
-    key <AC04> { [               e,            E,       EuroSign,  dead_currency ] }; // e E € ¤
-    key <AC05> { [           comma,    semicolon, rightsinglequotemark, dead_horn ] }; // , ; ’ ̛
-    key <AC06> { [               c,            C,      copyright,          U017F ] }; // c C © ſ
-    key <AC07> { [               t,            T,          thorn,          THORN ] }; // t T þ Þ
-    key <AC08> { [               s,            S,         ssharp,          U1E9E ] }; // s S ß ẞ
-    key <AC09> { [               r,            R,     registered,      trademark ] }; // r R ® ™
-    key <AC10> { [               n,            N,     dead_tilde                 ] }; // n N ~
-    key <AC11> { [               m,            M,    dead_macron,      masculine ] }; // m M ̄ º
-    key <BKSL> { [        ccedilla,     Ccedilla,   dead_cedilla, dead_belowcomma ] }; // ç Ç ¸ ,
-
-    // Fourth row
-    key <LSGT> { [     ecircumflex,  Ecircumflex,          slash                 ] }; // ê Ê /
-    key <AB01> { [          agrave,       Agrave,      backslash                 ] }; // à À \
-    key <AB02> { [               y,            Y,      braceleft, leftsinglequotemark  ] }; // y Y { ‘
-    key <AB03> { [               x,            X,     braceright, rightsinglequotemark ] }; // x X } ’
-    key <AB04> { [          period,        colon,       ellipsis, periodcentered ] }; // . : … ·
-    key <AB05> { [               k,            K,     asciitilde                 ] }; // k K ~
-    key <AB06> { [      apostrophe,     question,   questiondown,      dead_hook ] }; // ' ? ¿ ̉
-    key <AB07> { [               q,            Q, dead_abovering,  dead_belowdot ] }; // q Q ˚ ̣
-    key <AB08> { [               g,            G,             mu                 ] }; // g G µ
-    key <AB09> { [               h,            H,         dagger,   doubledagger ] }; // h H † ‡
-    key <AB10> { [               f,            F,    dead_ogonek,    ordfeminine ] }; // f F ̨ ª
-
-    key <SPCE> { [           space, nobreakspace,     underscore,          U202F ] }; // ␣ (espace insécable) _ (espace insécable fin)
-};
-
-partial alphanumeric_keys
-xkb_symbols "bepo_latin9" {
-
-    // Restricts the fr(bepo) layout to latin9 symbols
-
-    include "fr(bepo)"
-    include "keypad(oss_latin9)"
-
-    name[Group1]="France - Bepo, ergonomic, Dvorak way, latin-9 only";
-
-    key <TLDE> { [          dollar,   numbersign,        dollar,       paragraph ] }; // $ # $ ¶
-
-    key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        quotedbl,            1                                 ] }; // " 1
-    key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [   guillemotleft,            2,           less                 ] }; // « 2 <
-    key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  guillemotright,            3,        greater                 ] }; // » 3 >
-    key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenleft,            4,    bracketleft                 ] }; // ( 4 [
-    key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      parenright,            5,   bracketright                 ] }; // ) 5 ]
-    key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           minus,            8,          minus,     onequarter ] }; // - 8 - ¼
-    key <AE11> { [           equal,       degree                                 ] }; // = °
-    key <AE12> { [         percent,        grave                                 ] }; // % `
-
-    key <AD01> { [               b,            B,            bar                 ] }; // b B |
-    key <AD02> { [          eacute,       Eacute,     dead_acute                 ] }; // é É ˊ
-    key <AD10> { [               j,            J                                 ] }; // j J
-    key <AD11> { [               z,            Z                                 ] }; // z Z
-    key <AD12> { [               w,            W                                 ] }; // w W
-
-    key <AC03> { [               i,            I, dead_diaeresis                 ] }; // i I ̈
-    key <AC05> { [           comma,    semicolon,          comma,      dead_horn ] }; // , ; , ̛
-    key <AC06> { [               c,            C,      copyright                 ] }; // c C ©
-    key <AC08> { [               s,            S,         ssharp                 ] }; // s S ß
-    key <AC09> { [               r,            R,     registered                 ] }; // r R ®
-    key <AC11> { [               m,            M,         macron,      masculine ] }; // m M ̄ º
-
-    key <AB02> { [               y,            Y,      braceleft                 ] }; // y Y {
-    key <AB03> { [               x,            X,     braceright                 ] }; // x X }
-    key <AB04> { [          period,        colon                                 ] }; // . :
-    key <AB09> { [               h,            H                                 ] }; // h H
-    key <AB10> { [               f,            F,              f,    ordfeminine ] }; // f F   ª
-
-    // Note : on a besoin de redéfinir les niveaux 3 et 4,
-    // donc nbsp(level2) ne suffit pas !
-    key <SPCE> { [           space,  nobreakspace,    underscore,   nobreakspace ] }; // ␣ (espace insécable) _ (espace insécable)
-};
-
-// Author   : Francis Leboutte, http://www.algo.be/ergo/dvorak-fr.html
-//            thanks to Fabien Cazenave for his help
-// Licence  : X11 (the layout itself is released under CC-NC-ND licence)
-// Version  : 0.3
-
-// Base layer + dead AltGr key (`):
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━┓
-// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃
-// │ _   │ =   │ / ± │ - ¼ │ è ½ │ \ ¾ │ ^   │ (   │ ` ` │ )   │ "   │ [   │ ]   ┃ ⌫        ┃
-// ┢━━━━━┷━━┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺━━┳━━━━━━━┫
-// ┃        ┃ ? Æ │ <   │ >   │ G   │ !   │ H   │ V   │ C Ç │ M   │ K   │ Z   │ &   ┃       ┃
-// ┃ ↹      ┃ : æ │ ' $ │ é É │ g € │ . ° │ h   │ v   │ c ç │ m µ │ k   │ z   │ ¨   ┃       ┃
-// ┣━━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  ⏎   ┃
-// ┃         ┃ O Ò │ A À │ U Ù │ E È │ B   │ F   │ S   │ T   │ N   │ D   │ W   │ #   ┃      ┃
-// ┃ ⇬       ┃ o ò │ a à │ u ù │ e è │ b   │ f   │ s « │ t   │ n » │ d   │ w   │ ~   ┃      ┃
-// ┣━━━━━━┳━━┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲━━┷━━━━━┻━━━━━━┫
-// ┃      ┃ ç Ç │ | Œ │ Q   │ @   │ I Ì │ Y   │ X   │ R   │ L   │ P   │ J   ┃               ┃
-// ┃ ⇧    ┃ à À │ ; œ │ q { │ , } │ i ì │ y £ │ x   │ r º │ l   │ p § │ j   ┃ ⇧             ┃
-// ┣━━━━━━┻┳━━━━┷━━┳━━┷━━━━┱┴─────┴─────┴─────┴─────┴─────┴─┲━━━┷━━━┳━┷━━━━━╋━━━━━━━┳━━━━━━━┫
-// ┃       ┃       ┃       ┃ ␣                            ⍽ ┃       ┃       ┃       ┃       ┃
-// ┃ ctrl  ┃ super ┃ alt   ┃ ␣ Espace    Espace insécable ⍽ ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
-
-// Notice the specific Caps_Lock layer:
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━━┓
-// │ *   │ 1   │ 2   │ 3   │ 4   │ 5   │ 6   │ 7   │ 8   │ 9   │ 0   │ +   │ %   ┃          ┃
-// │     │     │     │     │     │     │     │     │     │     │     │     │     ┃ ⌫        ┃
-// ┢━━━━━┷━━┱──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┺━━┳━━━━━━━┫
-// ┃        ┃     │ <   │ >   │     │     │     │     │     │     │     │     │     ┃       ┃
-// ┃ ↹      ┃     │     │     │     │     │     │     │     │     │     │     │     ┃       ┃
-// ┣━━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓  ⏎   ┃
-// ┃         ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃
-// ┃ ⇬       ┃     │     │     │     │     │     │     │     │     │     │     │     ┃      ┃
-// ┣━━━━━━┳━━┹──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┬──┴──┲━━┷━━━━━┻━━━━━━┫
-// ┃      ┃ /   │ -   │     │     │     │     │     │     │     │     │     ┃               ┃
-// ┃ ⇧    ┃     │     │     │     │     │     │     │     │     │     │     ┃ ⇧             ┃
-// ┣━━━━━━┻┳━━━━┷━━┳━━┷━━━━┱┴─────┴─────┴─────┴─────┴─────┴─┲━━━┷━━━┳━┷━━━━━╋━━━━━━━┳━━━━━━━┫
-// ┃       ┃       ┃       ┃ ␣                            ⍽ ┃       ┃       ┃       ┃       ┃
-// ┃ ctrl  ┃ super ┃ alt   ┃ ␣ Espace    Espace insécable ⍽ ┃ alt   ┃ super ┃ menu  ┃ ctrl  ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
-
-partial alphanumeric_keys modifier_keys
-xkb_symbols "dvorak" {
-  name[Group1]="France - Dvorak";
-
-  // First row
-  key <TLDE> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       underscore,   asterisk                  ] };
-  key <AE01> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            equal,          1                  ] };
-  key <AE02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            slash,          2,       plusminus ] };
-  key <AE03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [            minus,          3,      onequarter ] };
-  key <AE04> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           egrave,          4,         onehalf ] };
-  key <AE05> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        backslash,          5,   threequarters ] };
-  key <AE06> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [  dead_circumflex,          6                  ] };
-  key <AE07> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [        parenleft,          7                  ] };
-  key <AE08> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [ ISO_Level3_Latch,          8,           grave ] };
-  key <AE09> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       parenright,          9                  ] };
-  key <AE10> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [         quotedbl,          0                  ] };
-  key <AE11> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [      bracketleft,       plus                  ] };
-  key <AE12> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [     bracketright,    percent                  ] };
-
-  // Second row
-  key <AD01> { [            colon,         question,              ae,               AE ] };
-  key <AD02> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [       apostrophe,       less,          dollar ] };
-  key <AD03> { type[group1] = "FOUR_LEVEL_SEMIALPHABETIC", [           eacute,    greater,          Eacute ] };
-  key <AD04> { [                g,                G,        EuroSign                   ] };
-  key <AD05> { [           period,           exclam,          degree                   ] };
-  key <AD06> { [                h,                H                                    ] };
-  key <AD07> { [                v,                V                                    ] };
-  key <AD08> { [                c,                C,        ccedilla,         Ccedilla ] };
-  key <AD09> { [                m,                M,              mu                   ] };
-  key <AD10> { [                k,                K                                    ] };
-  key <AD11> { [                z,                Z                                    ] };
-  key <AD12> { [   dead_diaeresis,        ampersand                                    ] };
-
-  // Third row
-  key <AC01> { [                o,                O,          ograve,           Ograve ] };
-  key <AC02> { [                a,                A,          agrave,           Agrave ] };
-  key <AC03> { [                u,                U,          ugrave,           Ugrave ] };
-  key <AC04> { [                e,                E,          egrave,           Egrave ] };
-  key <AC05> { [                b,                B                                    ] };
-  key <AC06> { [                f,                F                                    ] };
-  key <AC07> { [                s,                S,   guillemotleft                   ] };
-  key <AC08> { [                t,                T                                    ] };
-  key <AC09> { [                n,                N,  guillemotright                   ] };
-  key <AC10> { [                d,                D                                    ] };
-  key <AC11> { [                w,                W                                    ] };
-  key <BKSL> { [       asciitilde,       numbersign                                    ] };
-
-  // Fourth row
-  key <LSGT> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [       agrave, ccedilla,  Agrave, Ccedilla,   slash ] };
-  key <AB01> { type[group1] = "FOUR_LEVEL_PLUS_LOCK", [    semicolon,      bar,      oe,       OE,   minus ] };
-  key <AB02> { [                q,                Q,       braceleft                   ] };
-  key <AB03> { [            comma,               at,      braceright                   ] };
-  key <AB04> { [                i,                I,          igrave,           Igrave ] };
-  key <AB05> { [                y,                Y,        sterling                   ] };
-  key <AB06> { [                x,                X                                    ] };
-  key <AB07> { [                r,                R,       masculine                   ] };
-  key <AB08> { [                l,                L                                    ] };
-  key <AB09> { [                p,                P,         section                   ] };
-  key <AB10> { [                j,                J                                    ] };
-
-  key <SPCE> { [            space,            space,    nobreakspace,     nobreakspace ] };
-};
-
-// C'WHERTY: Breton keyboard. Ar c'hlavier brezhoneg.
-// Copyright © 2009 Dominique Pellé <[email protected]>
-// Version: 0.1
-//
-// ┌────┐
-// │ S A│   S = Reol = Shift,  A = ArErl + Pennlizherenn = AltGr + Shift
-// │ s a│   s = normal,        a = AltGr
-// └────┘
-//
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ $ Γ │ 1 Δ │ 2 Θ │ 3 Λ │ 4 Ξ │ 5 Π │ 6 Σ │ 7 Φ │ 8 Ψ │ 9 Ç │ 0 Ω │ ° ß │ + ¬ ┃ ⌫ Souzañ┃
-// │ ² ˙ │ & ¯ │ é ´ │ " # │ ' { │ ( [ │ - | │ è ` │ - \ │ ç ± │ à @ │ ) ] │ = } ┃         ┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃Toalenn┃ C'h │ W ω │ E ε │ R ρ │ T τ │ Y ψ │ U υ │ I ι │ O OE│ P π │ ¨ ¥ │ * £ ┃Enankañ┃
-// ┃     ↹ ┃ c'h │ w   │ e € │ r   │ t   │ y   │ u   │ i ı │ o oe│ p   │ ^ « │ / » ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃Prenn   ┃ A Æ │ S σ │ D δ │ F φ │ G γ │ H η │ J ς │ K κ │ L λ │ M μ │ Ù ® │ ! ¡ ┃      ┃
-// ┃Pennli ⇬┃ a æ │ s   │ d $ │ f   │ g   │ h   │ j   │ k   │ l   │ m   │ ù ŭ │ ? ¿ ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ Q θ │ Z ζ │ X ξ │ C χ │ V   │ B β │ N ν │ CH  │ Ñ   │ : © │ ;   ┃             ┃
-// ┃Shift ⇧┃ q < │ z > │ x   │ c ¢ │ v   │ b   │ n   │ ch  │ ñ   │ .   │ ,   ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ⍽ Espace insécable              ␣ ┃       ┃       ┃       ┃
-// ┃Reol   ┃Meta   ┃Erl    ┃ ␣ Espace                        ␣ ┃ArErl ⇮┃Menu   ┃Reol   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "bre" {
-
-    include "keypad(oss)"
-
-    name[Group1]= "France - Breton";
-
-    // First row
-    key <TLDE> { [     twosuperior,     dead_tilde,   dead_abovedot,    Greek_GAMMA ] };
-    key <AE01> { [       ampersand,              1,     dead_macron,    Greek_DELTA ] };
-    key <AE02> { [          eacute,              2,      dead_acute,    Greek_THETA ] };
-    key <AE03> { [        quotedbl,              3,      numbersign,    Greek_LAMDA ] };
-    key <AE04> { [      apostrophe,              4,       braceleft,       Greek_XI ] };
-    key <AE05> { [       parenleft,              5,     bracketleft,       Greek_PI ] };
-    key <AE06> { [           minus,              6,             bar,    Greek_SIGMA ] };
-    key <AE07> { [          egrave,              7,      dead_grave,      Greek_PHI ] };
-    key <AE08> { [      underscore,              8,       backslash,      Greek_PSI ] };
-    key <AE09> { [        ccedilla,              9,       plusminus,       Ccedilla ] };
-    key <AE10> { [          agrave,              0,              at,    Greek_OMEGA ] };
-    key <AE11> { [      parenright, dead_abovering,    bracketright,         ssharp ] };
-    key <AE12> { [           equal,           plus,      braceright,        notsign ] };
-
-    // Second row
-    // Handling the C'H key correctly requires an inputmethod (XIM)
-    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
- // key <AD01> { [    trigraph_c_h,   trigraph_C_h,    trigraph_C_H,    Greek_alpha ] };
-    key <AD01> { [           UF8FD,          UF8FE,           UF8FF,    Greek_alpha ] };
-    key <AD02> { [               w,              W,     Greek_omega,    Greek_omega ] };
-    key <AD03> { [               e,              E,        EuroSign,  Greek_epsilon ] };
-    key <AD04> { [               r,              R,       Greek_rho,      Greek_rho ] };
-    key <AD05> { [               t,              T,       Greek_tau,      Greek_tau ] };
-    key <AD06> { [               y,              Y,       Greek_psi,      Greek_psi ] };
-    key <AD07> { [               u,              U,   Greek_upsilon,  Greek_upsilon ] };
-    key <AD08> { [               i,              I,        idotless,     Greek_iota ] };
-    key <AD09> { [               o,              O,              oe,             OE ] };
-    key <AD10> { [               p,              P,        Greek_pi,       Greek_pi ] };
-    key <AD11> { [ dead_circumflex, dead_diaeresis,   guillemotleft,            yen ] };
-    key <AD12> { [           slash,       asterisk,  guillemotright,       sterling ] };
-
-    // Third row
-    key <AC01> { [               a,              A,              ae,             AE ] };
-    key <AC02> { [               s,              S,     Greek_sigma,    Greek_sigma ] };
-    key <AC03> { [               d,              D,          dollar,    Greek_delta ] };
-    key <AC04> { [               f,              F,       Greek_phi,      Greek_phi ] };
-    key <AC05> { [               g,              G,     Greek_gamma,    Greek_gamma ] };
-    key <AC06> { [               h,              H,       Greek_eta,      Greek_eta ] };
-    key <AC07> { [               j,              J, Greek_finalsmallsigma, Greek_finalsmallsigma ] };
-    key <AC08> { [               k,              K,       Greek_kappa,  Greek_kappa ] };
-    key <AC09> { [               l,              L,       Greek_lamda, Greek_lambda ] };
-    key <AC10> { [               m,              M,          Greek_mu,     Greek_mu ] };
-    key <AC11> { [          ugrave,         Ugrave,            ubreve,   registered ] };
-    key <BKSL> { [        question,         exclam,      questiondown,   exclamdown ] };
-
-    // Fourth row
-    key <LSGT> { [               q,              Q,            less,    Greek_theta ] };
-    key <AB01> { [               z,              Z,         greater,     Greek_zeta ] };
-    key <AB02> { [               x,              X,        Greek_xi,       Greek_xi ] };
-    key <AB03> { [               c,              C,            cent,      Greek_chi ] };
-    key <AB04> { [               v,              V                                  ] };
-    key <AB05> { [               b,              B,      Greek_beta,     Greek_beta ] };
-    key <AB06> { [               n,              N,        Greek_nu,       Greek_nu ] };
-    // Handling the CH key correctly requires an inputmethod (XIM)
-    // See https://bugs.freedesktop.org/show_bug.cgi?id=19506
- // key <AB07> { [      digraph_ch,     digraph_Ch,      digraph_CH,  Greek_omicron ] };
-    key <AB07> { [           UF8FA,          UF8FB,           UF8FC,  Greek_omicron ] };
-    key <AB08> { [          ntilde,         Ntilde                                  ] };
-    key <AB09> { [          period,          colon,         section,      copyright ] };
-    key <AB10> { [           comma,      semicolon,         percent                 ] };
-
-    key <SPCE> { [           space,   nobreakspace,           space,   nobreakspace ] };
-
-    include "level3(ralt_switch)"
-};
-
-// Occitan layout
-// Author : 2009 Thomas Metz <tmetz @ free.fr>
-// Derivated from the layout defined at http://www.panoccitan.org
-// Version: 0.1
-// From OSS french keyboard :
-// - add á, í, ò, ó et ú, Á, Í, Ò, Ó, Ú, ñ, Ñ
-// - change position of æ, ü, î, û, œ, ô, ö, ï, â, ë
-// 
-// ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
-// │ ³ ¸ │ 1 ̨ │ 2 É │ 3 ˘ │ 4 — │ 5 – │ 6 ‑ │ 7 È │ 8 ™ │ 9 Ç │ 0 À │ ° ≠ │ + ± ┃ ⌫ Retour┃
-// │ ² ¹ │ & ˇ │ é ~ │ " # │ ' { │ ( [ │ - | │ è ` │ _ \ │ ç ^ │ à @ │ ) ] │ = } ┃  arrière┃
-// ┢━━━━━┷━┱───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┴─┬───┺━┳━━━━━━━┫
-// ┃       ┃ A Á │ Z Æ │ E ¢ │ R Ê │ T Ë │ Y Û │ U Ú │ I Í │ O Ó │ P Ò │ ¨ Œ │ £ Ø ┃Entrée ┃
-// ┃Tab ↹  ┃ a á │ z æ │ e € │ r ê │ t ë │ y û │ u ú │ i í │ o ó │ p ò │ ^ œ │ $ ø ┃   ⏎   ┃
-// ┣━━━━━━━┻┱────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┴┬────┺┓      ┃
-// ┃        ┃ Q Ä │ S „ │ D Â │ F ‚ │ G ¥ │ H Ü │ J Î │ K Ï │ L Ô │ M Ö │ % Ù │ µ ̄ ┃      ┃
-// ┃Maj ⇬   ┃ q ä │ s ß │ d â │ f ‘ │ g ’ │ h ü │ j î │ k ï │ l ô │ m ö │ ù ' │ * ` ┃      ┃
-// ┣━━━━━━━┳┹────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┬┴────┲┷━━━━━┻━━━━━━┫
-// ┃       ┃ > ≥ │ W “ │ X ” │ C ® │ V ← │ B ↑ │ N Ñ │ ? … │ . . │ / ∕ │ § − ┃             ┃
-// ┃Shift ⇧┃ < ≤ │ w « │ x » │ c © │ v → │ b ↓ │ n ñ │ , ¿ │ ; × │ : ÷ │ ! ¡ ┃Shift ⇧      ┃
-// ┣━━━━━━━╋━━━━━┷━┳━━━┷━━━┱─┴─────┴─────┴─────┴─────┴─────┴───┲━┷━━━━━╈━━━━━┻━┳━━━━━━━┳━━━┛
-// ┃       ┃       ┃       ┃ ␣         Espace fine insécable ⍽ ┃       ┃       ┃       ┃
-// ┃Ctrl   ┃Meta   ┃Alt    ┃ ␣ Espace       Espace insécable ⍽ ┃AltGr ⇮┃Menu   ┃Ctrl   ┃
-// ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛
-partial alphanumeric_keys
-xkb_symbols "oci" {
-
-    include "keypad(oss)"
-
-    name[Group1]= "France - Occitan";
-
-    // First row
-    key <TLDE>	{ [      twosuperior,    threesuperior,          onesuperior,          dead_cedilla ] }; // ² ³ ¹ ¸ 
-    key <AE01>	{ [        ampersand,                1,           dead_caron,           dead_ogonek ] }; // & 1 ˇ ̨
-    key <AE02>	{ [           eacute,                2,           asciitilde,                Eacute ] }; // é 2 ~ É
-    key <AE03>	{ [         quotedbl,                3,           numbersign,            dead_breve ] }; // " 3 # ˘
-    key <AE04>	{ [       apostrophe,                4,            braceleft,             0x1002014 ] }; // ' 4 { — (tiret cadratin)
-    key <AE05>	{ [        parenleft,                5,          bracketleft,             0x1002013 ] }; // ( 5 [ – (tiret demi-cadratin)
-    key <AE06>	{ [            minus,                6,                  bar,             0x1002011 ] }; // - 6 | ‑ (tiret insécable)
-    key <AE07>	{ [           egrave,                7,                grave,                Egrave ] }; // è 7 ` È
-    key <AE08>	{ [       underscore,                8,            backslash,             trademark ] }; // _ 8 \ ™
-    key <AE09>	{ [         ccedilla,                9,          asciicircum,              Ccedilla ] }; // ç 9 ^ Ç
-    key <AE10>	{ [           agrave,                0,                   at,                Agrave ] }; // à 0 @ À
-    key <AE11>	{ [       parenright,           degree,         bracketright,              notequal ] }; // ) ° ] ≠ 
-    key <AE12>	{ [            equal,             plus,           braceright,             plusminus ] }; // = + } ±
-
-    // Second row
-    key <AD01>	{ [                a,                A,               aacute,                Aacute ] }; // a A á Á
-    key <AD02>	{ [                z,                Z,                   ae,                    AE ] }; // z Z æ Æ
-    key <AD03>	{ [                e,                E,             EuroSign,                  cent ] }; // e E € ¢
-    key <AD04>	{ [                r,                R,          ecircumflex,           Ecircumflex ] }; // r R ê Ê
-    key <AD05>	{ [                t,                T,           ediaeresis,            Ediaeresis ] }; // t T ë Ë
-    key <AD06>	{ [                y,                Y,          ucircumflex,           Ucircumflex ] }; // y Y û Û
-    key <AD07>	{ [                u,                U,               uacute,                Uacute ] }; // u U ú Ú
-    key <AD08>	{ [                i,                I,               iacute,                Iacute ] }; // i I í Í
-    key <AD09>	{ [                o,                O,               oacute,                Oacute ] }; // o O ó Ó
-    key <AD10>	{ [                p,                P,               ograve,                Ograve ] }; // p P ò Ò
-    key <AD11>	{ [  dead_circumflex,   dead_diaeresis,                   oe,                    OE ] }; // ^ ̈ ̃ œ Œ
-    key <AD12>	{ [           dollar,         sterling,               oslash,              Ooblique ] }; // $ £ ø Ø
-
-    // Third row
-    key <AC01>	{ [                q,                Q,           adiaeresis,            Adiaeresis ] }; // q Q ä Ä
-    key <AC02>	{ [                s,                S,               ssharp,    doublelowquotemark ] }; // s S ß „ 
-    key <AC03>	{ [                d,                D,           acircumflex,          Acircumflex ] }; // d D â Â
-    key <AC04>	{ [                f,                F,  leftsinglequotemark,    singlelowquotemark ] }; // f F ‘ ‚
-    key <AC05>	{ [                g,                G, rightsinglequotemark,                   yen ] }; // g G ’ ¥
-    key <AC06>	{ [                h,                H,           udiaeresis,            Udiaeresis ] }; // h H ü Ü
-    key <AC07>	{ [                j,                J,          icircumflex,            Icircumflex] }; // j J î Î
-    key <AC08>	{ [                k,                K,           idiaeresis,             Idiaeresis] }; // k K ï Ï
-    key <AC09>	{ [                l,                L,          ocircumflex,           Ocircumflex ] }; // l L ô Ô
-    key <AC10>	{ [                m,                M,           odiaeresis,            Odiaeresis ] }; // m M ö Ö
-    key <AC11>	{ [           ugrave,          percent,           dead_acute,                Ugrave ] }; // ù % ' Ù
-    key <BKSL>	{ [         asterisk,               mu,           dead_grave,           dead_macron ] }; // * µ ` ̄
-
-    // Fourth row
-    key <LSGT>  { [             less,          greater,        lessthanequal,      greaterthanequal ] }; // < > ≤ ≥
-    key <AB01>  { [                w,                W,        guillemotleft,   leftdoublequotemark ] }; // w W « “
-    key <AB02>  { [                x,                X,       guillemotright,  rightdoublequotemark ] }; // x X » ”
-    key <AB03>  { [                c,                C,            copyright,            registered ] }; // c C © ®
-    key <AB04>  { [                v,                V,            rightarrow,            leftarrow ] }; // v V → ← 
-    key <AB05>  { [                b,                B,            downarrow,               uparrow ] }; // b B ↓ ↑
-    key <AB06>  { [                n,                N,              ntilde,                 Ntilde ] }; // n N ñ Ñ
-    key <AB07>  { [            comma,         question,         questiondown,             0x1002026 ] }; // , ? ¿ …
-    key <AB08>  { [        semicolon,           period,             multiply,             0x10022C5 ] }; // ; . × ⋅
-    key <AB09>  { [            colon,            slash,             division,             0x1002215 ] }; // : / ÷ ∕
-    key <AB10>  { [           exclam,          section,           exclamdown,             0x1002212 ] }; // ! § ¡ −
-};
-
-// [email protected] 19-sep-1998
-// modifications : Etienne Herlent <[email protected]> june 2000
-// adapted to the new input layer :
-//        Martin Costabel <[email protected]> 3-jan-2001
-// adapted for Latin9 alphabet (ISO-8859-15): 
-//        Etienne Herlent <[email protected]> march 2005
-
-// This map is an almost-complete mapping of the standard French
-// MacIntosh keyboard under Xwindows.  I tried to remain as faithful
-// as possible to the Mac meaning of each key.	I did this entirely by
-// hand and by intuition, relying on the Clavier (Keyboard?) Desktop
-// Accessory for the Mac meaning of keys, and on reading keysymdef.h
-// to intuit the corresponding X names.	 Lacking proper documentation,
-// I may have made some mistakes.
-
-// Entries marked CHECK are particularly uncertain
-
-// Entries marked MISSING mark Mac characters for which I was unable
-// to find a corresponding keysym.  (Some for sure don't: e.g. the
-// Apple mark and the oe/OE character; others I may have simply not
-// found.)
-
-// Copied from macintosh_vndr/fr
-partial alphanumeric_keys
-xkb_symbols "mac" {
-
-    name[Group1]= "France - Macintosh";
-
-    // Alphanumeric section
-    key <TLDE> {	[          at,     numbersign, periodcentered,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
-    key <AE01> {	[   ampersand,    1,   VoidSymbol,    dead_acute	]	}; // MISSING: Apple
-    key <AE02> {	[      eacute,    2,   ediaeresis,        Eacute	]	};
-    key <AE03> {	[    quotedbl,    3,   VoidSymbol,    VoidSymbol	] 	}; // CHECK all quotemarks
-    key <AE04> {	[  apostrophe,    4,   VoidSymbol,    VoidSymbol	] 	};
-    key <AE05> {	[   parenleft,    5,    braceleft,   bracketleft	]	};
- // CHECK section
-    key <AE06> {	[     section,    6,    paragraph,         aring	]	};
-    key <AE07> {	[      egrave,    7, guillemotleft, guillemotright	]	};
-    key <AE08> {	[      exclam,    8,   exclamdown,   Ucircumflex	]	};
-    key <AE09> {	[    ccedilla,    9,     Ccedilla,        Aacute	]	};
-    key <AE10> {	[      agrave,    0,       oslash,    VoidSymbol	]	}; // MISSING: Oslash
-    key <AE11> {	[  parenright, degree, braceright,  bracketright	]	};
-    key <AE12> {	[       minus, underscore, emdash,        endash	]	}; // CHECK dashes
-
-    key <AD01> {	[           a,  A,           ae,          AE	]	};
-    key <AD02> {	[           z,  Z,  Acircumflex,       Aring		]	};
-    key <AD03> {	[           e,  E,  ecircumflex, Ecircumflex	]	};
-    key <AD04> {	[           r,  R,   registered,    currency	]	};
-    key <AD05> {	[           t,  T,   VoidSymbol,  VoidSymbol	]	};
-    key <AD06> {	[           y,  Y,       Uacute,  Ydiaeresis	]	}; // MISSING: Ydiaeresis; eherlent : ok in Latin9
-    key <AD07> {	[           u,  U,   VoidSymbol, ordfeminine	]	}; // MISSING: ordmasculine?
-    key <AD08> {	[           i,  I,  icircumflex,  idiaeresis	]	};
-    key <AD09> {	[           o,  O,           oe,          OE      	]	}; // MISSING: oe, OE lacking in Latin1; eherlent ok in Latin9
-    key <AD10> {	[           p,  P,   VoidSymbol,  VoidSymbol	]	};
-    key <AD11> {	[dead_circumflex,dead_diaeresis, ocircumflex, Ocircumflex	]	};
-    key <AD12> {	[      dollar, asterisk,   EuroSign, yen		]	}; // eherlent : EuroSign in Latin9
-
-    key <AC01> {	[         q, Q, acircumflex,         Agrave		]	};
-    key <AC02> {	[         s, S,      Ograve,     VoidSymbol	]	};
-    key <AC03> {	[         d, D,  VoidSymbol,     VoidSymbol	]	};
-    key <AC04> {	[         f, F,  VoidSymbol, periodcentered	]	}; // MISSING: oblong script f??
-    key <AC05> {	[         g, G,  VoidSymbol,     VoidSymbol	]	}; // MISSING: kerned fi, fl
-    key <AC06> {	[         h, H,      Igrave,    Icircumflex	]	};
-    key <AC07> {	[         j, J,  Idiaeresis,         Iacute	]	};
-    key <AC08> {	[         k, K,      Egrave,     Ediaeresis	]	};
-    key <AC09> {	[         l, L,     notsign,            bar	]	};
-    key <AC10> {	[         m, M,          mu,         Oacute	]	};
-    key <AC11> {	[    ugrave,percent, Ugrave,    ucircumflex	]	}; // MISSING: per-mille
-    key <BKSL> {	[ dead_grave, sterling,  at,     numbersign	]	};
-
-    key <LSGT> {	[      less, greater, VoidSymbol, VoidSymbol	]	};
-    key <AB01> {	[         w, W, VoidSymbol,   VoidSymbol	]	};	// MISSING: half-guillemot (single angle bracket)
-    key <AB02> {	[         x, X, VoidSymbol,   VoidSymbol	]	}; // CHECK similarequal; MISSING: extra-slanted slash
-    key <AB03> {	[         c, C,  copyright,         cent	]	};
-    key <AB04> {	[         v, V,    diamond,  leftradical	]	}; // CHECK diamond, leftradical
-    key <AB05> {	[         b, B,     ssharp,   VoidSymbol	]	}; // CHECK: Greek_beta or ssharp?; MISSING: oblong script s
-    key <AB06> {	[         n, N,  dead_tilde,  asciitilde	]	};
-    key <AB07> {	[     comma,  question, VoidSymbol,  questiondown	]	};
-    key <AB08> {	[ semicolon,  period, VoidSymbol,  periodcentered	]	};
-    key <AB09> {	[     colon,  slash,   division,        backslash	]	};
-    key <AB10> {	[     equal,   plus, VoidSymbol,        plusminus	]	};
-
-    key <SPCE> {	[     space,  space, nobreakspace,   nobreakspace	]	};
-    // End alphanumeric section
-
-    key <KPDL> {	[  comma,KP_Decimal	]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "geo" {
-    include "ge(basic)"
-
-    name[Group1]= "France - Georgian AZERTY Tskapo";
-
-    key <TLDE> { [ exclam, noSymbol ] };
-    key <AE01> { [ 0x0100201e, 1 ] };
-    key <AE02> { [ 0x01002116, 2 ] };
-    key <AE03> { [ percent, 3    ] };
-    key <AE04> { [ parenleft, 4  ] };
-    key <AE05> { [ colon, 5      ] };
-    key <AE06> { [ semicolon, 6  ] };
-    key <AE07> { [ question, 7   ] };
-    key <AE08> { [ 0x01002116, 8 ] };
-    key <AE09> { [ degree, 9     ] };
-    key <AE10> { [ parenright, 0 ] };
-    key <AE11> { [ minus, underscore, 0x01002014 ] };
-    key <AE12> { [ less, greater ] };
-
-    key <AD01> { [ 0x010010d0,  0x010010fa     ] };
-    key <AD02> { [ 0x010010d6,  Z              ] };
-    key <AD03> { [ 0x010010d4,  E, 0x010010f1  ] };
-    key <AD04> { [ 0x010010e0,  0x010000ae     ] };
-    key <AD05> { [ 0x010010e2,  T              ] };
-    key <AD06> { [ 0x010010e7,  0x010010f8     ] };
-    key <AD07> { [ 0x010010e3,  U              ] };
-    key <AD08> { [ 0x010010d8,  0x010010f2     ] };
-    key <AD09> { [ 0x010010dd,  O              ] };
-    key <AD10> { [ 0x010010de,  P              ] };
-    key <AD11> { [ 0x010010d7,  T              ] };
-    key <AD12> { [ 0x010010eb,  Z              ] };
-
-    key <AC01> { [ 0x010010e5,  Q              ] };
-    key <AC02> { [ 0x010010e1,  S              ] };
-    key <AC03> { [ 0x010010d3,  D              ] };
-    key <AC04> { [ 0x010010e4,  0x010010f6     ] };
-    key <AC05> { [ 0x010010d2,  0x010010f9     ] };
-    key <AC06> { [ 0x010010f0,  0x010010f5     ] };
-    key <AC07> { [ 0x010010ef,  0x010010f7     ] };
-    key <AC08> { [ 0x010010d9,  K              ] };
-    key <AC09> { [ 0x010010da,  L              ] };
-    key <AC10> { [ 0x010010db,  M              ] };
-    key <AC11> { [ 0x010010df,  J              ] };
-    key <BKSL> { [ 0x010010e9,  0x010000a9     ] };
-
-    key <LSGT> { [ guillemotleft,guillemotright ] };
-    key <AB01> { [ 0x010010ec,  W               ] };
-    key <AB02> { [ 0x010010ee,  0x010010f4      ] };
-    key <AB03> { [ 0x010010ea,  0x010000a9      ] };
-    key <AB04> { [ 0x010010d5,  0x010010f3      ] };
-    key <AB05> { [ 0x010010d1,  B               ] };
-    key <AB06> { [ 0x010010dc,  0x010010fc      ] };
-    key <AB07> { [ comma,       0x01002014      ] };
-    key <AB08> { [ 0x010010e8,  S               ] };
-    key <AB09> { [ 0x010010e6,  noSymbol        ] };
-    key <AB10> { [ 0x010010ed,  noSymbol        ] };
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/fr(type6)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/gb	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/gb' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/gb,v 1.6 2003/10/04 10:25:14 pascal Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple U.K. keyboard layout defined by
-    // the SVR4 European Language Supplement and sometimes also
-    // known as the IBM 166 layout.
-
-    include "latin"
-
-    name[Group1]="United Kingdom";
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
-    key <AE03>	{ [         3,   sterling, threesuperior,    sterling ]	};
-    key <AE04>	{ [         4,     dollar,     EuroSign,   onequarter ]	};
-
-    key <AC11>	{ [apostrophe,         at, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [     grave,    notsign,          bar,          bar ]	};
-
-    key <BKSL>	{ [numbersign, asciitilde,   dead_grave,   dead_breve ]	};
-    key <LSGT>	{ [ backslash,        bar,          bar,    brokenbar ]	};
-
-    include "level3(ralt_switch_multikey)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "intl" { 
-
-    // Describes the differences between a very simple en_US 
-    // keyboard and a very simple U.K. keyboard layout with 
-    // dead keys. By Phil Jones ([email protected]) 
-
-    // Includes the following keys: 
-    // dead_grave 
-    // dead_acute 
-    // dead_circumflex 
-    // dead_tilde 
-    // dead_diaeresis 
-
-    include "latin" 
-
-    name[Group1]="United Kingdom - International (with dead keys)"; 
-
-    key <AE02>  { [   2,  dead_diaeresis,      twosuperior,     onehalf ] };
-    key <AE03>  { [   3,        sterling,    threesuperior,    onethird ] };
-    key <AE04>  { [   4,          dollar,         EuroSign,  onequarter ] };
-    key <AE06>  { [   6, dead_circumflex,         NoSymbol,    onesixth ] };
-
-    key <AC11>  { [ dead_acute,         at,     apostrophe,         bar ] };
-    key <TLDE>  { [ dead_grave,    notsign,            bar,         bar ] };
-
-    key <BKSL>  { [ numbersign, dead_tilde,            bar,         bar ] };
-    key <LSGT>  { [  backslash,        bar,            bar,         bar ] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys 
-xkb_symbols "extd" {
-    // Clone of the Microsoft "United Kingdom - Extended" layout, which
-    // includes dead keys for: grave; diaeresis; circumflex; tilde; and
-    // accute. It also enables direct access to accute characters using
-    // the Multi_key (Alt Gr).
-    //
-    // Taken from...
-    //    "Windows Keyboard Layouts"
-    //    http://msdn.microsoft.com/en-us/goglobal/bb964651.aspx
-    //
-    // -- Jonathan Miles <[email protected]>
-
-    include "latin"
-
-    name[Group1]="United Kingdom - Extended - Winkeys";
-    
-    // Alphanumeric section
-    key <TLDE> { [ dead_grave,    notsign,       brokenbar,    NoSymbol ] };
-    
-    key <AE02> { [     2,        quotedbl,  dead_diaeresis,     onehalf ] };
-    key <AE03> { [     3,        sterling,   threesuperior,    onethird ] };
-    key <AE04> { [     4,          dollar,        EuroSign,  onequarter ] };
-    key <AE06> { [     6,     asciicircum, dead_circumflex,    NoSymbol ] };
-
-    key <AD02> { [   w,                 W,          wacute,      Wacute ] };
-    key <AD03> { [   e,                 E,          eacute,      Eacute ] };
-    key <AD06> { [   y,                 Y,          yacute,      Yacute ] };
-    key <AD07> { [   u,                 U,          uacute,      Uacute ] };
-    key <AD08> { [   i,                 I,          iacute,      Iacute ] };
-    key <AD09> { [   o,                 O,          oacute,      Oacute ] };
-
-    key <AC01> { [   a,                 A,          aacute,      Aacute ] };
-    key <AC11> { [  apostrophe,         at,     dead_acute,    NoSymbol ] };
-
-    key <AB03> { [   c,                 C,        ccedilla,    Ccedilla ] };
-
-    key <BKSL>  { [ numbersign, asciitilde,     dead_tilde,    NoSymbol ] };
-    key <LSGT>  { [  backslash,        bar,       NoSymbol,    NoSymbol ] };
-    // End alphanumeric section
-
-    include "level3(ralt_switch)"
-};
-
-// Describe the differences between the US Colemak layout
-// and a UK variant. By Andy Buckley ([email protected])
-
-partial alphanumeric_keys
-xkb_symbols "colemak" {
-    include "us(colemak)"
-
-    name[Group1]="United Kingdom - Colemak";
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
-    key <AE03>	{ [         3,   sterling, threesuperior,    sterling ]	};
-    key <AE04>	{ [         4,     dollar,     EuroSign,   onequarter ]	};
-
-    key <AC11>	{ [apostrophe,         at, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [     grave,    notsign,          bar,          bar ]	};
-
-    key <BKSL>	{ [numbersign, asciitilde,   dead_grave,   dead_breve ]	};
-    key <LSGT>	{ [ backslash,        bar,          bar,    brokenbar ]	};
-
-    include "level3(ralt_switch_multikey)"
-};
-
-
-// Dvorak (UK) keymap (by odaen) allowing the usage of
-// the £ and ? key and swapping the @ and " keys.
-
-partial alphanumeric_keys
-xkb_symbols "dvorak" {
-    include "us(dvorak-intl)"
-
-    name[Group1]="United Kingdom - Dvorak";
-
-    key <AD01> { [ apostrophe,	at		] };
-    key <AE02> { [	    2,	quotedbl,  twosuperior,   NoSymbol	] };
-    key <AE03> { [	    3,	sterling,  threesuperior, NoSymbol	] };
-    key <BKSL> { [ numbersign,	asciitilde	] };
-    key <LSGT> { [  backslash,	bar		] };
-    key <TLDE> { [	grave,	notsign,   bar,           bar		] };
-};
-
-// Dvorak letter positions, but punctuation all in the normal UK positions.
-partial alphanumeric_keys
-xkb_symbols "dvorakukp" {
-    include "gb(dvorak)"
-
-    name[Group1]="United Kingdom - Dvorak (UK Punctuation)";
-
-    key <AE11> {        [     minus,    underscore      ]       };
-    key <AE12> {        [     equal,    plus            ]       };
-    key <AD11> {        [ bracketleft,  braceleft       ]       };
-    key <AD12> {        [ bracketright, braceright      ]       };
-    key <AD01> {        [ slash,        question        ]       };
-    key <AC11> {        [apostrophe,    at,         dead_circumflex, dead_caron] };
-};
-
-// Copied from macintosh_vndr/gb
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple U.K. keyboard layout
-
-    include "latin"
-
-    name[Group1]= "United Kingdom - Macintosh";
-
-    key <AE02> {	[               2,              at,         EuroSign	]	};
-    key <AE03> {	[               3,        sterling,       numbersign	]	};
-
-    // End alphanumeric section
-    
-    include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/gb(type6)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/gb(type5)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/gb(type4)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/it	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/it' file
-// 17 May 2003 Modified by Sebastiano Vigna ([email protected])
-//
-// $XFree86: xc/programs/xkbcomp/symbols/it,v 1.4 2003/04/19 12:22:12 pascal Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Italy";
-
-    key <TLDE>	{ [ backslash,        bar,      notsign,    brokenbar ]	};
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior, dead_doubleacute ] };
-    key <AE03>	{ [         3,   sterling,threesuperior,   dead_tilde ]	};
-    key <AE04>	{ [         4,     dollar,   onequarter,    oneeighth ] };
-
-    key <AE10>	{ [         0,      equal,   braceright,  dead_ogonek ] };
-    key <AE11>	{ [apostrophe,   question,        grave, questiondown ]	};
-    key <AE12>	{ [    igrave, asciicircum,  asciitilde, dead_circumflex ] };
-
-    key <AD11>	{ [    egrave,     eacute,  bracketleft,    braceleft ]	};
-    key <AD12>	{ [      plus,   asterisk, bracketright,   braceright ]	};
-
-    key <AC10>	{ [    ograve,   ccedilla,           at, dead_cedilla ] };
-    key <AC11>	{ [    agrave,     degree,   numbersign, dead_abovering ] };
-
-    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};
-    key <AB08>	{ [     comma,  semicolon,   dead_acute,     multiply ]	};
-    key <AB09>	{ [    period,      colon,periodcentered, dead_diaeresis ] };
-    key <AB10>	{ [     minus, underscore,  dead_macron,     division ] };
-
-    key <BKSL>	{ [    ugrave,    section,   dead_grave,   dead_breve ]	};
-
-    key <LSGT>	{ [      less,    greater,guillemotleft,guillemotright] };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic italian layout to eliminate all dead keys
-
-    include "it(basic)"
-
-    name[Group1]="Italy - Eliminate dead keys";
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior,  doubleacute ] };
-    key <AE03>	{ [         3,   sterling,threesuperior,   asciitilde ]	};
-
-    key <AE10>	{ [         0,       equal,  braceright,       ogonek ]	};
-    key <AE12>	{ [    igrave, asciicircum,  asciitilde,  asciicircum ] };
-
-    key <AC10>	{ [    ograve,   ccedilla,           at,      cedilla ] };
-    key <AC11>	{ [    agrave,     degree,   numbersign,       degree ] };
-
-    key <AB08>	{ [     comma,  semicolon,        acute,     multiply ]	};
-    key <AB09>	{ [    period,      colon,periodcentered,   diaeresis ] };
-    key <AB10>	{ [     minus, underscore,       macron,     division ] };
-
-    key <BKSL>	{ [    ugrave,    section,        grave,        breve ]	};
-};
-
-// Copied from macintosh_vndr/it
-partial alphanumeric_keys
-xkb_symbols "mac" {
-
-    name[Group1]= "Italy - Macintosh";
-
-    // Alphanumeric section
-    key <LSGT> {	[        less,  greater   	]	};
-    key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
-    key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
-    key <AE02> {	[    quotedbl,    2 		]	};
-    key <AE03> {	[  apostrophe,    3         	]	};
-    key <AE04> {	[   parenleft,    4,    braceleft,    bracketleft	]	};
-    key <AE05> {	[    ccedilla,    5,     Ccedilla,    Iacute	]	};
-    key <AE06> {	[      egrave,    6,    paragraph,    periodcentered]	};
-    key <AE07> {	[  parenright,    7,   braceright,	  bracketright	]	};
-    key <AE08> {	[    sterling,    8,   infinity			]	};
-    key <AE09> {	[      agrave,    9,        acute,    Ocircumflex	]	};
-    key <AE10> {	[      eacute,    0,        grave,    Oacute	]	};
-    key <AE11> {	[       minus,    underscore	]	};
-    key <AE12> {	[       equal, 	  plus,     notequal,    plusminus	]	};
-
-    key <AD01> {	[           q,  Q 		]	};
-    key <AD02> {	[	    z,  Z		]	};
-    key <AD03> {	[	    e,  E,	EuroSign	]	};
-    key <AD04> {	[	    r,  R,   registered			] 	};
-    key <AD05> {	[	    t,  T		]	};
-    key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
-    key <AD07> {	[	    u,  U		]	};
-    key <AD08> {	[	    i,  I,  icircumflex,	idiaeresis      ] 	};
-    key <AD09> {	[	    o,  O		]	};
-    key <AD10> {	[	    p,  P		]	};
-    key <AD11> {	[      igrave,  asciicircum     ]	};
-    key <AD12> {	[      dollar,	asterisk        ]	};
-    key <BKSL> {	[     section,  degree,           at,  numbersign      ]	};
-
-    key <AC01> {	[	  a,	A,      aring,   Aring		] 	};
-    key <AC02> {	[	  s,	S,     ssharp			]	};
-    key <AC03> {	[	  d,	D		]	};
-    key <AC04> {	[	  f,	F		]	};
-    key <AC05> {	[	  g,	G		]	};
-    key <AC06> {	[	  h,	H,     Igrave,    Icircumflex     ]	};
-    key <AC07> {	[	  j,	J,  Idiaeresis,   Iacute          ]	};
-    key <AC08> {	[	  k,	K,     Egrave,    Ediaeresis      ]	};
-    key <AC09> {	[	  l,	L,     ssharp,    bar		]	};
-    key <AC10> {	[         m,	M,         mu,    Oacute		]	};
-    key <AC11> {	[    ugrave,	percent,         ae,    AE		]	};
-
-    key <AB01> {	[	  w,	W 		]	};
-    key <AB02> {	[	  x,	X		]	};
-    key <AB03> {	[	  c,	C,  copyright,    copyright	]	};
-    key <AB04> {	[	  v,	V		]	};
-    key <AB05> {	[	  b,	B		]	};
-    key <AB06> {	[	  n,	N,  dead_tilde                    ]       };
-    key <AB07> {	[     comma,	question,          questiondown		]	};
-    key <AB08> {	[ semicolon,	period          ]	};
-    key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
-    key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
-
-    // End alphanumeric section
-
-    include "kpdl(dot)"
-    include "level3(ralt_switch)"
-};
-
-// Used by Georgian people in Italy, 
-// contributed by Vladimer Sichinava
-partial alphanumeric_keys
-xkb_symbols "geo" {
-    include "it"
-    include "ge(basic)"
-
-    name[Group1]= "Italy - Georgian";
-    key <TLDE> { [ backslash, bar, notsign, brokenbar ] };
-    key <AE01> { [ 1, exclam, onesuperior ] };
-    key <AE02> { [ 2, quotedbl, twosuperior, dead_doubleacute ] };
-    key <AE03> { [ 3, sterling, threesuperior, dead_tilde ] };
-    key <AE04> { [ 4, dollar, onequarter, oneeighth ] };
-    key <AE05> { [ 5, percent, onehalf ] };
-    key <AE06> { [ 6, ampersand ] };
-    key <AE07> { [ 7, slash, braceleft ] };
-    key <AE08> { [ 8, parenleft, bracketleft ] };
-    key <AE09> { [ 9, parenright ] };
-    key <AE10> { [ 0, equal, braceright, dead_ogonek ] };
-    key <AE11> { [apostrophe, question, grave, questiondown ] };
-    key <AE12> { [ igrave, asciicircum, asciitilde, dead_circumflex ] };
-
-    key <AD03> { [0x010010d4, E, EuroSign ] };
-    key <AD11> { [ egrave, eacute, bracketleft, braceleft ] };
-    key <AD12> { [ plus, asterisk, bracketright, braceright ] };
-
-    key <AC10> { [ ograve, ccedilla, at, dead_cedilla ] };
-    key <AC11> { [ agrave, degree, numbersign, degree ] };
-    key <BKSL> { [ ugrave, section, dead_grave, dead_breve ] };
-    key <LSGT> { [ less, greater ] };
-
-    key <AB08> { [ comma, semicolon ] };
-    key <AB09> { [ period, colon ] };
-    key <AB10> { [ minus, underscore ] };
-};
-
-// OLPC Section
-xkb_symbols "olpc" {
-
-    include "it(basic)"
-
-    key <AE12> { [ igrave,  asciicircum,    asciitilde,     dead_tilde ] };
-    key <BKSL> { [ ugrave,      section,        Egrave,     dead_breve ] };
-    key <I219> { [ less,        greater, guillemotleft, guillemotright ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/it(type6)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/it(type5)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/it(type4)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/kr	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// $XKeyboardConfig$
-//
-
-default  alphanumeric_keys
-xkb_symbols "kr106" {
-    include "us"
-    name[Group1]= "Korea, Republic of";
-    include "kr(koreankeys)"
-};
-
-alphanumeric_keys
-xkb_symbols "kr104" {
-    include "us"
-    name[Group1]= "Korea, Republic of - 101/104 key Compatible";
-    include "kr(koreankeys)"
-    include "kr(koreankeys_raltctl)"
-};
-
-partial hidden function_keys
-xkb_symbols "koreankeys" {
-    key <K72> { [ Hangul ] };
-    key <K71> { [ Hangul_Hanja ] };    
-};
-
-partial hidden function_keys
-xkb_symbols "koreankeys_raltctl" {
-    key <RALT> { [ Hangul ] };
-    key <RCTL> { [ Hangul_Hanja ] };    
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/kr(type6)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/kr(type5)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/kr(type4)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/nl	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-// $XKeyboardConfig$
-
-// Basic layout based on converted file, from keytable file to xkb/symbols/ file
-// with mk_xkb by [email protected] Tue Sep 30 00:53:29 MET DST 1997
-
-// Converted from the nl-latin.map of the Linux kbd package by
-// Pablo Saratxaga <[email protected]>
-//
-// $XFree86: xc/programs/xkbcomp/symbols/nl,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-// Official layout by Benno Schulenberg <[email protected]>, January 2007,
-// based on http://www.xs4all.nl/~koospol/public/Xmodmap-nl-deadkeys.gz
-
-
-default partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin"
-
-    name[Group1]="Netherlands";
-
-    key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
-    key <AE07>	{ [         7, underscore,     sterling, seveneighths ]	};
-    key <AE08>	{ [         8,  parenleft,    braceleft,  bracketleft ]	};
-    key <AE09>	{ [         9, parenright,   braceright, bracketright ]	};
-    key <AE10>	{ [         0, apostrophe,       degree,    trademark ]	};
-    key <AE11>	{ [     slash,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [    degree, dead_tilde, dead_cedilla,  dead_ogonek ]	};
-
-    key <AD03>	{ [         e,          E,     EuroSign,         cent ] };
-    key <AD05>	{ [         t,          T,        thorn,        THORN ]	};
-    key <AD06>	{ [         y,          Y,   ydiaeresis,          yen ]	};
-    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
-    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
-    key <AD09>	{ [         o,          O,       ograve,       Ograve ]	};
-    key <AD10>	{ [         p,          P,    paragraph,        THORN ]	};
-    key <AD11>	{ [dead_diaeresis, dead_circumflex, asciitilde, asciicircum]	};
-    key <AD12>	{ [  asterisk,        bar,   dead_tilde,  dead_macron ]	};
-
-    key <AC01>	{ [         a,          A,       aacute,       Aacute ]	};
-    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
-    key <AC10>	{ [      plus,  plusminus,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [dead_acute, dead_grave,   apostrophe,        grave ] };
-    key <TLDE>	{ [        at,    section,      notsign,      notsign ]	};
-
-    key <BKSL>	{ [      less,    greater,   dead_grave,   dead_breve ]	};
-    key <AB06>	{ [         n,          N,       ntilde,       Ntilde ]	};
-    key <AB07>	{ [         m,          M,     Greek_mu,    masculine ]	};
-    key <AB08>	{ [     comma,  semicolon,      cedilla, guillemotleft]	};
-    key <AB09>	{ [    period,      colon, periodcentered, guillemotright ] };
-    key <AB10>	{ [     minus,      equal,       hyphen, dead_abovedot]	};
-
-    key <LSGT>	{ [bracketright, bracketleft,       bar,    brokenbar ]	};
-
-    include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "std" {
-
-    name[Group1]= "Netherlands - Standard";
-
-    key <TLDE>  { [             at,        section,        notsign ] };
-    key <AE01>  { [              1,         exclam,    onesuperior ] };
-    key <AE02>  { [              2,       quotedbl,    twosuperior ] };
-    key <AE03>  { [              3,     numbersign,  threesuperior ] };
-    key <AE04>  { [              4,         dollar,     onequarter ] };
-    key <AE05>  { [              5,        percent,        onehalf ] };
-    key <AE06>  { [              6,      ampersand,  threequarters ] };
-    key <AE07>  { [              7,     underscore,       sterling ] };
-    key <AE08>  { [              8,      parenleft,      braceleft ] };
-    key <AE09>  { [              9,     parenright,     braceright ] };
-    key <AE10>  { [              0,     apostrophe                 ] };
-    key <AE11>  { [          slash,       question,      backslash ] };
-    key <AE12>  { [         degree,     dead_tilde,   dead_cedilla ] };
-
-    key <AD01>  { [              q,              Q                 ] };
-    key <AD02>  { [              w,              W                 ] };
-    key <AD03>  { [              e,              E,       EuroSign ] };
-    key <AD04>  { [              r,              R,      paragraph ] };
-    key <AD05>  { [              t,              T                 ] };
-    key <AD06>  { [              y,              Y                 ] };
-    key <AD07>  { [              u,              U                 ] };
-    key <AD08>  { [              i,              I                 ] };
-    key <AD09>  { [              o,              O                 ] };
-    key <AD10>  { [              p,              P                 ] };
-    key <AD11>  { [ dead_diaeresis, dead_circumflex                ] };
-    key <AD12>  { [       asterisk,            bar                 ] };
-    key <BKSL>  { [           less,        greater                 ] };
-
-    key <AC01>  { [              a,              A                 ] };
-    key <AC02>  { [              s,              S,         ssharp ] };
-    key <AC03>  { [              d,              D                 ] };
-    key <AC04>  { [              f,              F                 ] };
-    key <AC05>  { [              g,              G                 ] };
-    key <AC06>  { [              h,              H                 ] };
-    key <AC07>  { [              j,              J                 ] };
-    key <AC08>  { [              k,              K                 ] };
-    key <AC09>  { [              l,              L                 ] };
-    key <AC10>  { [           plus,      plusminus                 ] };
-    key <AC11>  { [     dead_acute,     dead_grave                 ] };
-
-    key <LSGT>  { [   bracketright,    bracketleft,            bar ] };
-    key <AB01>  { [              z,              Z,  guillemotleft ] };
-    key <AB02>  { [              x,              X, guillemotright ] };
-    key <AB03>  { [              c,              C,           cent ] };
-    key <AB04>  { [              v,              V                 ] };
-    key <AB05>  { [              b,              B                 ] };
-    key <AB06>  { [              n,              N                 ] };
-    key <AB07>  { [              m,              M,             mu ] };
-    key <AB08>  { [          comma,      semicolon                 ] };
-    key <AB09>  { [         period,          colon, periodcentered ] };
-    key <AB10>  { [          minus,          equal                 ] };
-
-    include "level3(ralt_switch)"
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    // For naming consistency
-
-    include "nl(basic)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-
-     // For naming consistency
-
-    include "nl(Sundeadkeys)"
-    name[Group1]="Netherlands - Sun dead keys";
-};
-
-// Copied from macintosh_vndr/nl
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple netherland keybaord
-
-    include "latin"
-
-    name[Group1]= "Netherlands - Macintosh";
-
-    include "level3(ralt_switch)"
-
-// do just nothing
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/nl(type6)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/nl(type4)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/no	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +0,0 @@
-
-// based on a keyboard map from an 'xkb/symbols/no' file
-//
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/no,v 1.3 2002/12/19 01:07:56 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a Norwegian keyboard with dead key support
-    // and all of ISO-8859-1 characters available.
-
-    include "latin(type2)"
-
-    name[Group1]="Norway";
-
-    key <AE11>	{ [      plus,   question,    plusminus, questiondown ]	};
-    key <AE12>	{ [ backslash, dead_grave,   dead_acute,      notsign ]	};
-
-
-    key <AC10>	{ [    oslash,   Ooblique,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [        ae,         AE, dead_circumflex, dead_caron]	};
-    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
-
-    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
-    key <LSGT>	{ [      less,    greater,      onehalf, threequarters]	};
-
-    include "kpdl(comma)"
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic Norwegian layout to eliminate dead keys
-
-    include "no(basic)"
-
-    name[Group1]="Norway - Eliminate dead keys";
-
-    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
-    key <AD12>	{ [ diaeresis, asciicircum,   asciitilde,      macron ]	};
-    key <AC10>	{ [    oslash,   Ooblique,        acute,  doubleacute ]	};
-    key <AC11>	{ [        ae,         AE,  asciicircum,        caron ]	};
-    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
-    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
-};
-
-// Norwegian Dvorak
-partial alphanumeric_keys 
-xkb_symbols "dvorak" {
-    include "us(dvorak)"
-
-    name[Group1]="Norway - Dvorak";
-
-    key <TLDE> { [	  bar,	section, brokenbar, paragraph	] };
-
-    key <AE01> { [	    1,	exclam, exclamdown, onesuperior	] };
-    key <AE02> { [	    2,	quotedbl,   at,     twosuperior	] };
-    key <AE03> { [	    3,	numbersign, sterling, threesuperior ] };
-    key <AE04> { [	    4,	dollar,     currency,onequarter	] };
-    key <AE05> { [	    5,	percent,    onehalf,	onehalf	] };
-    key <AE06> { [	    6,	ampersand,  threequarters, threequarters ] };
-    key <AE07> { [	    7,	slash,      braceleft, division	] };
-    key <AE08> { [	    8,	parenleft,  bracketleft		] };
-    key <AE09> { [	    9,	parenright, bracketright	] };
-    key <AE10> { [	    0,	equal,	    braceright		] };
-    key <AE11> { [	 plus,	question,   plusminus, questiondown ] };
-    key <AE12> { [   backslash,	grave,	    dead_acute,	dead_grave  ] };
-
-    key <AD01> { [       aring,	Aring,  braceright, bracketright ] };
-    key <AD02> { [	comma,	semicolon, dead_cedilla, cedilla ] };
-    key <AD03> { [      period,	colon,  periodcentered		 ] };
-    key <AD04> { [	    p,	P,      thorn,	THORN		 ] };
-    key <AD05> { [	    y,	Y,      yen			 ] };
-    key <AD06> { [	    f,	F,      ordfeminine		 ] };
-    key <AD08> { [	    c,	C,      ccedilla, copyright	 ] };
-    key <AD09> { [	    r,	R,      registered		 ] };
-    key <AD11> { [  apostrophe,	asterisk, dead_circumflex, acute ] };
-    key <AD12> { [  asciitilde,	asciicircum, dead_diaeresis, dead_tilde	] };
-
-    key <AC03> { [	    e,	E,      EuroSign,	cent	 ] };
-    key <AC05> { [	    i,	I,      idotless,       Iabovedot] };
-    key <AC06> { [	    d,	D,      eth,		ETH	 ] };
-    key <AC10> { [	    s,	S,      ssharp			 ] };
-    key <AC11> { [	minus,	underscore, hyphen,	diaeresis] };
-
-    key <AB01> { [	   ae,	AE,     braceleft,	bracketleft] };
-    key <AB05> { [	    x,	X,      multiply		 ] };
-    key <AB07> { [	    m,	M,	mu			 ] };
-    key <BKSL> { [	 less,	greater, guillemotleft, guillemotright	] };
-
-    key <SPCE> { [	 space,	space, nobreakspace, nobreakspace] };
-
-    key <LSGT> { [	oslash,	Ooblique,  bar,	backslash	 ] };
-
-    // fixed https://bugs.freedesktop.org/show_bug.cgi?id=4397
-    include "level3(ralt_switch)"
-};
-
-// based on
-// Northern Sami keyboards for Finland, Norway and Sweden
-//
-// Describes the differences between a very simple en_US
-// keyboard and a Norwegian Northern Sami keyboard (with
-// dead key support) according to the spec on
-// http://www.hum.uit.no/a/trond/se-lat9-no-keys.html
-// Written by Børre Gaup <[email protected]>
-//
-// $XFree86: xc/programs/xkbcomp/symbols/sapmi,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial alphanumeric_keys
-xkb_symbols "smi" {
-    include "latin"
-
-    name[Group1]= "Norway - Northern Saami";
-
-    key <AE01>	{ [         1,     exclam,    copyright,   exclamdown ]	};
-    key <AE02>	{ [         2,   quotedbl,           at,   registered ]	};
-    key <AE03>	{ [         3, numbersign,     sterling,         less ]	};
-    key <AE04>	{ [         4,     dollar,       dollar,      greater ]	};
-    key <AE05>	{ [         5,    percent,        U2022,        U2030 ]	};
-    key <AE06>	{ [         6,  ampersand,      section,    paragraph ]	};
-    key <AE07>	{ [         7,      slash,    braceleft,          bar ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
-    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
-    key <AE10>	{ [         0,      equal,   braceright,     notequal ]	};
-    key <AE11>	{ [      plus,   question,     division, questiondown ]	};
-    key <AE12>	{ [ backslash,      grave,        acute,   asciitilde ]	};
-
-    key <AD01>	{ [    aacute,     Aacute,            q,            Q ]	};
-    key <AD02>	{ [    scaron,     Scaron,            w,            W ]	};
-    key <AD03>	{ [         e,          E,       eacute,       Eacute ]	};
-    key <AD04>	{ [         r,          R,   registered,    trademark ]	};
-    key <AD06>	{ [         y,          Y,       yacute,       Yacute ]	};
-    key <AD07>	{ [         u,          U,   udiaeresis,   Udiaeresis ]	};
-    key <AD08>	{ [         i,          I,   idiaeresis,   Idiaeresis ]	};
-    key <AD09>	{ [         o,          O,           oe,           OE ]	};
-    key <AD11>	{ [     aring,      Aring,  acircumflex,  Acircumflex ]	};
-    key <AD12>	{ [       eng,        ENG,     quotedbl,  asciicircum ]	};
-
-    key <AC01>	{ [         a,          A,       agrave,       Agrave ]	};
-    key <AC02>	{ [         s,          S,       ssharp,   apostrophe ]	};
-    key <AC04>	{ [         f,          F,  ordfeminine,  ordfeminine ]	};
-    key <AC05>	{ [         g,          G,       gcaron,       Gcaron ]	};
-    key <AC06>	{ [         h,          H,        U01E5,        U01E4 ]	};
-    key <AC07>	{ [         j,          J,      notsign,     multiply ]	};
-    key <AC08>	{ [         k,          K,        U01E9,        U01E8 ]	};
-    key <AC09>	{ [         l,          L,       degree,       hyphen ]	};
-    key <AC10>	{ [    oslash,   Ooblique,   odiaeresis,   Odiaeresis ]	};
-    key <AC11>	{ [        ae,         AE,   adiaeresis,   Adiaeresis ]	};
-    key <TLDE>	{ [       bar,    section,    brokenbar,    paragraph ]	};
-
-    key <BKSL>	{ [   dstroke,    Dstroke,   apostrophe,     asterisk ]	};
-    key <AB01>	{ [         z,          Z,        U0292,        U01B7 ]	};
-    key <AB02>	{ [    ccaron,     Ccaron,            x,            X ]	};
-    key <AB03>	{ [         c,          C,     ccedilla,     Ccedilla ]	};
-    key <AB04>	{ [         v,          V, lessthanequal, guillemotleft ] };
-    key <AB05>	{ [         b,          B, greaterthanequal, guillemotright ] };
-    key <AB06>	{ [         n,          N, leftsinglequotemark, leftdoublequotemark ] };
-    key <AB07>	{ [         m,          M, rightsinglequotemark, rightdoublequotemark ]	};
-    key <AB08>	{ [     comma,  semicolon, singlelowquotemark, doublelowquotemark ] };
-    key <AB09>	{ [    period,      colon,     ellipsis, periodcentered ] };
-    key <AB10>	{ [     minus, underscore,       endash,       emdash ]	};
-
-    key <LSGT>	{ type[Group1] = "FOUR_LEVEL",
-                  [    zcaron,     Zcaron,        U01EF,        U01EE ]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "smi_nodeadkeys" {
-
-    // Modifies the basic Norwegian layout to eliminate dead keys
-
-    include "no(smi)"
-
-    name[Group1]= "Norway - Northern Saami, eliminate dead keys";
-
-    key <AE12>	{ [ backslash,      grave,        acute,       ogonek ]	};
-};
-
-// Copied from macintosh_vndr/no
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Norwegian keybaord
-
-    include "latin(type4)"
-    name[Group1]= "Norway - Macintosh";
-
-    key <TLDE>	{ [       bar,    section     ]	};
-    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
-    key <AE04>	{ [         4,   currency,       dollar,       dollar ]	};
-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
-    key <AE07>	{ [         7,      slash,          bar,    backslash ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
-    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
-    key <AC10>	{ [    oslash,   Ooblique,   odiaeresis,   Odiaeresis ]	};
-    key <AE11>	{ [      plus,   question     ]	};
-    key <AC11>	{ [        ae,         AE     ]	};
-    key <AD11>	{ [     aring,      Aring     ]	};
-    key <AE12>	{ [ dead_grave, dead_acute,       acute,  dead_ogonek ]	};
-    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,  dead_macron ]	};
-    key <BKSL>	{ [        at,   asterisk     ]	};
-};
-
-
-partial alphanumeric_keys 
-xkb_symbols "mac_nodeadkeys" {
-
-    // Modifies the basic Norwegian layout to eliminate dead keys
-    include "no(mac)"
-    name[Group1]= "Norway - Macintosh, eliminate dead keys";
-
-    key <AE12>	{ [      grave,     acute,        acute,       ogonek ]	};
-    key <AD12>	{ [  diaeresis, asciicircum, asciitilde,       macron ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/no(type6)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/no(type5)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/no(type4)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/pt	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
-// $XKeyboardConfig$
-
-// based on a keyboard map from an 'xkb/symbols/pt' file
-//
-// $XFree86: xc/programs/xkbcomp/symbols/pt,v 1.2 2002/11/22 04:03:28 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "latin(type4)"
-
-    name[Group1]="Portugal";
-
-    key <LSGT>  { [      less,    greater ] };
-    key <AE03>	{ [         3, numbersign,     sterling,     sterling ]	};
-    key <AE04>	{ [         4,     dollar,      section,       dollar ]	};
-    key <AE11>	{ [apostrophe,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [guillemotleft, guillemotright, dead_cedilla, dead_ogonek ] };
-
-    key <AD11>	{ [      plus,   asterisk, dead_diaeresis, dead_abovering ] };
-    key <AD12>	{ [dead_acute, dead_grave,   dead_tilde,  dead_macron ]	};
-
-    key <AC10>	{ [  ccedilla,   Ccedilla,   dead_acute, dead_doubleacute ] };
-    key <AC11>	{ [ masculine, ordfeminine, dead_circumflex,   dead_caron ] };
-    key <TLDE>	{ [ backslash,        bar,      notsign,      notsign ]	};
-
-    key <BKSL>	{ [dead_tilde, dead_circumflex, dead_grave, dead_breve]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "Sundeadkeys" {
-
-    include "pt(basic)" // for consistent naming
-
-    key <AD11>	{ [plus,   asterisk, SunFA_Diaeresis, SunFA_Diaeresis ]	};
-    key <BKSL>	{ [SunFA_Tilde, SunFA_Circum ]	};
-    key <AD12>	{ [SunFA_Acute, SunFA_Grave ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "sundeadkeys" {
-    include "pt(Sundeadkeys)" // for consistent naming
-
-    name[Group1]="Portugal - Sun dead keys";
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    include "pt(basic)" // for consistent naming
-
-    name[Group1]="Portugal - Eliminate dead keys";
-
-    key <AE12>	{ [guillemotleft, guillemotright, cedilla,     ogonek ]	};
-    key <AD11>	{ [      plus,   asterisk,     quotedbl,     quotedbl ]	};
-    key <AD12>	{ [     acute,      grave ]	};
-    key <AC10>	{ [  ccedilla,   Ccedilla,        acute,  doubleacute ]	};
-    key <AC11>	{ [ masculine, ordfeminine, asciicircum,        caron ]	};
-    key <BKSL>	{ [asciitilde, asciicircum ]	};
-    key <AB10>	{ [     minus, underscore, dead_belowdot,    abovedot ]	};
-};
-
-// mac version from Ricardo Cabral <[email protected]>
-// Copied from macintosh_vndr/pt
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Portuguese keybaord
-
-    include "pt"
-    name[Group1]= "Portugal - Macintosh";
-
-    key <AE06>	{ [         6,  ampersand, threequarters, fiveeighths ]	};
-    key <AE08>	{ [         8,  parenleft,  bracketleft,    braceleft ]	};
-    key <AE09>	{ [         9, parenright, bracketright,   braceright ]	};
-    key <AE12>	{ [      plus,   asterisk, dead_diaeresis     ]	};
-    key <AC11>	{ [ dead_tilde, dead_circumflex       ]	};
-    key <AD11>	{ [ masculine, ordfeminine            ]	};
-    key <BKSL>	{ [ backslash,        bar,   dead_grave,   dead_breve ]	};
-    key <TLDE>	{ [     grave, asciitilde,      notsign,      notsign ]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "mac_sundeadkeys" {
-    include "pt(mac)"
-    name[Group1]= "Portugal - Macintosh, Sun dead keys";
-    
-    key <AE12> {	[	     plus,        asterisk,  SunFA_Diaeresis, SunFA_Diaeresis      ]	};
-    key <AC11> {	[     SunFA_Tilde,    SunFA_Circum	]	};
-    key <AD12> {	[     SunFA_Acute,     SunFA_Grave 	]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "mac_nodeadkeys" {
-    include "pt(mac)"
-    name[Group1]= "Portugal - Macintosh, eliminate dead keys";
-
-    key <AE12> {	[	     plus,        asterisk, 	 quotedbl,        quotedbl      ]	};
-    key <AC11> {	[      asciitilde,     asciicircum	]	};
-    key <AD12> {	[	    acute,           grave 	]	};
-};
-
-
-//
-// Teclado Nativo Portugues                                2005-07-19
-// Portuguese Nativo Keyboard
-//      This is a Dvorak-based layout, designed for the Portuguese language
-//
-// Ari Caldeira     [email protected]
-//
-partial alphanumeric_keys
-xkb_symbols "nativo" {
-
-    name[Group1]="Portugal - Nativo";
-
-// Numeric row
-    key <TLDE> { [         plus,        asterisk,       dead_diaeresis,        plusminus ] };
-    key <AE01> { [            1,          exclam,          onesuperior,       exclamdown ] };
-    key <AE02> { [            2,        quotedbl,                   at,      twosuperior ] };
-    key <AE03> { [            3,      numbersign,             sterling,    threesuperior ] };
-    key <AE04> { [            4,          dollar,              section,       onequarter ] };
-    key <AE05> { [            5,         percent,                 cent,       0x01002030 ] };
-    key <AE06> { [            6,       ampersand,              notsign,        diaeresis ] };
-    key <AE07> { [            7,           slash,            braceleft,       0x0100032D ] };
-    key <AE08> { [            8,       parenleft,          bracketleft,       0x01000331 ] };
-    key <AE09> { [            9,      parenright,         bracketright,        dead_horn ] };
-    key <AE10> { [            0,           equal,           braceright,        dead_hook ] };
-    key <AE11> { [    masculine,     ordfeminine,          dead_ogonek,       0x01000326 ] };
-    key <AE12> { [         less,         greater,         dead_cedilla,   dead_abovering ] };
-
-// Upper row
-    key <AD01> { [   apostrophe,        question,               degree,     questiondown ] };
-    key <AD02> { [        comma,       semicolon,           0x01000329,       0x01000315 ] };
-    key <AD03> { [       period,           colon,           0x01002022,   periodcentered ] };
-    key <AD04> { [            h,               H,            paragraph,        paragraph ] };
-    key <AD05> { [            x,               X,             multiply,         division ] };
-    key <AD06> { [            w,               W,               ubreve,           Ubreve ] };
-    key <AD07> { [            l,               L,              lstroke,          Lstroke ] };
-    key <AD08> { [            t,               T,            trademark,        trademark ] };
-    key <AD09> { [            c,               C,            copyright,        copyright ] };
-    key <AD10> { [            p,               P,                thorn,            THORN ] };
-    key <AD11> { [   dead_tilde, dead_circumflex,           dead_caron, dead_doubleacute ] };
-    key <AD12> { [        minus,      underscore,           0x01002015,       0x01000336 ] };
-
-// Central row
-    key <AC01> { [            i,               I,             idotless,        Iabovedot ] };
-    key <AC02> { [            e,               E,             EuroSign,         EuroSign ] };
-    key <AC03> { [            a,               A,                   ae,               AE ] };
-    key <AC04> { [            o,               O,                   oe,               OE ] };
-    key <AC05> { [            u,               U,               oslash,         Ooblique ] };
-    key <AC06> { [            m,               M,                   mu,               mu ] };
-    key <AC07> { [            d,               D,                  eth,              ETH ] };
-    key <AC08> { [            s,               S,               ssharp,           ssharp ] };
-    key <AC09> { [            r,               R,           registered,       registered ] };
-    key <AC10> { [            n,               N,                  eng,              ENG ] };
-    key <AC11> { [   dead_acute,      dead_grave,          dead_macron,       dead_breve ] };
-    key <BKSL> { [    backslash,             bar,        dead_belowdot,    dead_abovedot ] };
-
-// Lower row
-    key <LSGT> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
-    key <AB01> { [            y,               Y,                  yen,              yen ] };
-    key <AB02> { [     ccedilla,        Ccedilla                                         ] };
-    key <AB03> { [            j,               J,           0x01000292,       0x010001B7 ] };
-    key <AB04> { [            b,               B,           apostrophe,         quotedbl ] };
-    key <AB05> { [            k,               K,             currency,        brokenbar ] };
-    key <AB06> { [            q,               Q,           0x01000259,       0x0100018F ] };
-    key <AB07> { [            v,               V,   doublelowquotemark, singlelowquotemark ] };
-    key <AB08> { [            g,               G,  leftdoublequotemark, leftsinglequotemark ] };
-    key <AB09> { [            f,               F, rightdoublequotemark, rightsinglequotemark ] };
-    key <AB10> { [            z,               Z,           0x0100201F,       0x0100201B ] };
-
-    key <SPCE> { [        space,           space,         nobreakspace,     nobreakspace ] };
-
-// Configures the use of the AltGr key
-    include "level3(ralt_switch)"
-
-};
-
-
-//
-// Teclado Nativo Portugues para o teclado estadunidense   2005-07-19
-// Portuguese Nativo Keyboard for USA keyboards
-//
-// Ari Caldeira     [email protected]
-//
-partial alphanumeric_keys
-xkb_symbols "nativo-us" {
-    include "pt(nativo)"
-
-    name[Group1]="Portugal - Nativo for USA keyboards";
-
-// Lower row
-    key <AB01> { [            y,               Y,              ccedilla,        Ccedilla ] };
-    key <AB02> { [ guillemotleft, guillemotright,           0x01002039,       0x0100203A ] };
-
-};
-
-
-//
-// Teclado Nativo Portugues para digitacao em Esperanto    2005-07-19
-// Portuguese Nativo Keyboard for typing Esperanto
-//
-// Ari Caldeira     [email protected]
-//
-partial alphanumeric_keys
-xkb_symbols "nativo-epo" {
-    include "pt(nativo)"
-
-    name[Group1]="Portugal - Nativo for Esperanto";
-
-// Upper row Esperanto
-    key <AD04> { [            h,               H,          hcircumflex,      Hcircumflex ] };
-    key <AD05> { [  ccircumflex,     Ccircumflex,                    x,                X ] };
-    key <AD06> { [       ubreve,          Ubreve,                    w,                W ] };
-
-// Lower row Esperanto
-    key <AB01> { [  jcircumflex,     Jcircumflex,                    y,                Y ] };
-    key <AB02> { [  scircumflex,     Scircumflex,             ccedilla,         Ccedilla ] };
-    key <AB06> { [  gcircumflex,     Gcircumflex,                    q,                Q ] };
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/pt(type6)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/pt(type5)"
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/pt(type4)"
-    include "level3(ralt_switch)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/ru	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,447 +0,0 @@
-// $XKeyboardConfig$
-
-// based on
-// russian standard keyboard
-// AEN <[email protected]>
-// 2001/12/23 by Leon Kanter <[email protected]>
-// 2005/12/09 Valery Inozemtsev <[email protected]>
-//
-// $XFree86: xc/programs/xkbcomp/symbols/ru,v 1.3 2003/02/15 22:27:05 dawes Exp $
-
-// Windows layout
-partial default alphanumeric_keys
-xkb_symbols "winkeys" {
-    include "ru(common)"
-
-    name[Group1]= "Russia";
-
-    key <AE03> {        [               3,      numerosign      ]       };
-    key <AE04> {        [               4,       semicolon      ]       };
-    key <AE05> {        [               5,         percent      ]       };
-    key <AE06> {        [               6,           colon      ]       };
-    key <AE07> {        [               7,        question      ]       };
-    key <AE08> {        [               8,        asterisk      ]       };
-
-    key <AB10> {        [          period,           comma      ]       };
-    key <BKSL> {        [       backslash,           slash      ]       };
-};
-
-partial hidden alphanumeric_keys 
-xkb_symbols "common" {
-
-    key	<AE01> {	[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,        quotedbl	]	};
-    key	<AE03> {	[		3,      numbersign	]	};
-    key	<AE04> {	[		4,        asterisk	]	};
-    key	<AE05> {	[		5,	     colon	]	};
-    key	<AE06> {	[		6,	     comma	]	};
-    key	<AE07> {	[		7,	    period	]	};
-    key	<AE08> {	[		8,	 semicolon	]	};
-    key	<AE09> {	[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	]	};
-    key	<AE11> {	[	    minus,	underscore	]	};
-    key	<AE12> {	[	    equal,	      plus	]	};
-    key	<BKSL> {	[	backslash,             bar	]	};
-    key	<AB10> {	[	    slash,	  question	]	};
-    key <LSGT> {        [           slash,             bar      ]       };
-
-    key	<TLDE> {	[     Cyrillic_io,     Cyrillic_IO	]	};
-    key	<AD01> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<AD02> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<AD03> {	[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<AD04> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<AD05> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<AD06> {	[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<AD07> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<AD08> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AD09> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
-    key	<AD10> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<AD11> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
-    key	<AC01> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<AC02> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<AC03> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<AC04> {	[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<AC05> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
-    key	<AC06> {	[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<AC08> {	[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<AC09> {	[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<AC10> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<AC11> {	[      Cyrillic_e,	Cyrillic_E	]	};
-    key	<AB01> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<AB02> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AB03> {	[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<AB04> {	[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<AB05> {	[      Cyrillic_i,	Cyrillic_I	]	};
-    key	<AB06> {	[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<AB07> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<AB08> {	[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<AB09> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
-
-    key.type[group1]="TWO_LEVEL";
-
-    include "kpdl(comma)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "legacy" {
-    include "ru(common)"
-
-    name[Group1]= "Russia - Legacy";
-};
-
-partial alphanumeric_keys
-xkb_symbols "olpc" {
-
-    include "ru(common)"
-
-    key        <TLDE> {        [          0x01000451,          0x01000401, grave       ]       }; // Ñ‘, Ð
-    key <AE03> {        [               3,      numbersign, 0x01002116      ]       }; // â„–
-    key <AE04> {        [               4,          dollar, semicolon   ]       };
-    key <AE06> {        [               6,      asciicircum, colon      ]       };
-    key <AE07> {        [               7,          ampersand           ]       };
-    key <AE09> {        [               9,          parenleft, acute    ]       };
-    key <AC12> {        [       backslash,          bar, slash          ]       };
-
-    include "group(olpc)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "typewriter" {
-    include "ru(common)"
-    name[Group1]= "Russia - Typewriter";
-    key	<TLDE> {	[	      bar,	      plus	] 	};
-    key	<AE01> {	[      numerosign,		 1 	]	};
-    key	<AE02> {	[           minus,		 2	]	};
-    key	<AE03> {	[	    slash,		 3	]	};
-    key	<AE04> {	[	 quotedbl,		 4	]	};
-    key	<AE05> {	[	    colon,		 5	]	};
-    key	<AE06> {	[	    comma,		 6	]	};
-    key	<AE07> {	[	   period,		 7	]	};
-    key	<AE08> {	[      underscore,		 8	]	};
-    key	<AE09> {	[	 question,		 9	]	};
-    key	<AE10> {	[	  percent,		 0	]	};
-    key	<AE11> {	[	   exclam,	     equal	]	};
-    key	<AE12> {	[       semicolon,	 backslash	]	};
-
-    key	<BKSL> {	[	parenright,	 parenleft	]	};
-
-    key	<AD12> {	[Cyrillic_hardsign,Cyrillic_HARDSIGN	]	};
-    key	<AB10> {	[     Cyrillic_io,     Cyrillic_IO	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "phonetic" {
-
-    name[Group1]= "Russia - Phonetic";
-
-    key	<AE01> {	[		1,	    exclam 	]	};
-    key	<AE02> {	[		2,        	at	]	};
-    key	<AE03> {	[		3,     Cyrillic_io 	]	};
-    key	<AE04> {	[		4,     Cyrillic_IO	]	};
-    key	<AE05> {	[		5, Cyrillic_hardsign   	]	};
-    key	<AE06> {	[		6, Cyrillic_HARDSIGN	]	};
-    key	<AE07> {	[		7,	 ampersand	]	};
-    key	<AE08> {	[		8,        asterisk	]	};
-    key	<AE09> {	[		9,	 parenleft	]	};
-    key	<AE10> {	[		0,	parenright	]	};
-    key <AE11> {	[	    minus,	underscore	]	};
-
-    key	<AB09> {	[	   period,	   greater	]	};
-    key	<AB10> {	[	    slash,	  question	]	};
-    key	<AB08> {	[	    comma,	      less	]	};
-    key	<AC10> {	[	semicolon,	     colon	]	};
-    key	<AC11> {	[      apostrophe,	  quotedbl	]	};
-    key	<LSGT> {	[	      bar,	 brokenbar	]	};
-
-    key	<TLDE> {	[     Cyrillic_yu,     Cyrillic_YU	]	};
-    key	<LatQ> {	[     Cyrillic_ya,     Cyrillic_YA	]	};
-    key	<LatZ> {	[     Cyrillic_ze,     Cyrillic_ZE	]	};
-    key	<LatS> {	[     Cyrillic_es,     Cyrillic_ES	]	};
-    key	<LatA> {	[      Cyrillic_a,	Cyrillic_A	]	};
-    key	<LatW> {	[     Cyrillic_ve,     Cyrillic_VE	]	};
-    key	<LatC> {	[    Cyrillic_tse,    Cyrillic_TSE	]	};
-    key	<LatX> {	[Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
-    key	<LatD> {	[     Cyrillic_de,     Cyrillic_DE	]	};
-    key	<LatE> {	[     Cyrillic_ie,     Cyrillic_IE	]	};
-    key	<LatV> {	[    Cyrillic_zhe,    Cyrillic_ZHE	]	};
-    key	<LatF> {	[     Cyrillic_ef,     Cyrillic_EF	]	};
-    key	<LatT> {	[     Cyrillic_te,     Cyrillic_TE	]	};
-    key	<LatR> {	[     Cyrillic_er,     Cyrillic_ER	]	};
-    key	<LatN> {	[     Cyrillic_en,     Cyrillic_EN	]	};
-    key	<LatB> {	[     Cyrillic_be,     Cyrillic_BE	]	};
-    key	<LatH> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<LatG> {	[    Cyrillic_ghe,    Cyrillic_GHE	]	};
-    key	<LatY> {	[   Cyrillic_yeru,   Cyrillic_YERU	]	};
-    key	<LatM> {	[     Cyrillic_em,     Cyrillic_EM	]	};
-    key	<LatJ> {	[ Cyrillic_shorti, Cyrillic_SHORTI	]	};
-    key	<LatU> {	[      Cyrillic_u,	Cyrillic_U	]	};
-    key	<LatK> {	[     Cyrillic_ka,     Cyrillic_KA	]	};
-    key	<LatI> {	[      Cyrillic_i,	Cyrillic_I	]	};
-    key	<LatO> {	[      Cyrillic_o,	Cyrillic_O	]	};
-    key	<LatL> {	[     Cyrillic_el,     Cyrillic_EL	]	};
-    key	<LatP> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
-
-    key	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AE12> {	[    Cyrillic_che,    Cyrillic_CHE	]	};
-    key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
-    key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "phonetic_winkeys" {
-
-    include "ru(phonetic)"
-    name[Group1]= "Russia - Phonetic Winkeys";
-
-    key	<LatX> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
-    key	<LatH> {	[     Cyrillic_che,     Cyrillic_CHE	]	};
-    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_softsign  ]	};
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "tt" {
-    include "ru(winkeys)"
-    name[Group1]= "Russia - Tatar";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key <TLDE> {       [      0x010004bb,      0x010004ba,
-                             Cyrillic_io,     Cyrillic_IO      ]       };
-    key        <AD02> {        [      0x010004e9,      0x010004e8,
-                            Cyrillic_tse,    Cyrillic_TSE      ]       };
-    key        <AD09> {        [      0x010004d9,      0x010004d8,
-                          Cyrillic_shcha,  Cyrillic_SHCHA      ]       };
-    key        <AD12> {        [      0x010004af,      0x010004ae,
-                       Cyrillic_hardsign,Cyrillic_HARDSIGN     ]       };
-    key        <AC10> {        [      0x010004a3,      0x010004a2,
-                            Cyrillic_zhe,    Cyrillic_ZHE      ]       };
-    key        <AB07> {        [      0x01000497,      0x01000496,
-                       Cyrillic_softsign,Cyrillic_SOFTSIGN     ]       };
-
-    include "level3(ralt_switch)"
-
-};
-
-partial alphanumeric_keys 
-xkb_symbols "os_legacy" {
-    include "ru(common)"
-
-    name[Group1]= "Russia - Ossetian, legacy";
-
-    key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
-    key	<AC11> {	[      0x010004D5,      0x010004D4      ]	};
-};
-
-partial alphanumeric_keys 
-xkb_symbols "os_winkeys" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Ossetian, Winkeys";
-
-    key	<TLDE> {	[      Cyrillic_e,      Cyrillic_E	]	};
-    key	<AC07> {	[      Cyrillic_o,	Cyrillic_O, Cyrillic_io, Cyrillic_IO	]	};
-    key	<AC11> {	[      0x010004D5,      0x010004D4      ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "cv" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Chuvash";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key        <AD03> {        [      Cyrillic_u,	Cyrillic_U,
-                            0x010004f3,    0x010004f2      ]       };
-    key        <AD05> {        [      Cyrillic_ie,     Cyrillic_IE,
-                       0x01000115,	0x01000114     ]       };
-    key        <AC04> {        [      Cyrillic_a,	Cyrillic_A,
-                          abreve,  Abreve      ]       };
-    key        <AB03> {        [      Cyrillic_es,     Cyrillic_ES,
-                            ccedilla,    Ccedilla      ]       };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "udm" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Udmurt";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key	<AE01> {	[	 question,	    exclam,    1,       1 	]	};
-    key	<AE02> {	[	parenleft,        quotedbl,    2,       2	]	};
-    key	<AE03> {	[      parenright,      numbersign,    3,       3	]	};
-    key	<AE04> {	[	    colon,       semicolon,    4,       4	]	};
-    key	<AE05> {	[	 asterisk,	   percent,    5,       5	]	};
-    key	<AE06> {	[      0x010004dd,	0x010004dc,    6,       6	]	};
-    key	<AE07> {	[      0x010004e7,	0x010004e6,    7,       7	]	};
-    key	<AE08> {	[      0x010004f5,	0x010004f4,    8,       8	]	};
-    key	<AE09> {	[      0x010004e5,	0x010004e4,    9,       9	]	};
-    key	<AE10> {	[      0x010004df,	0x010004de,    0,       0	]	};
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "cv_latin" {
-    include "us(alt-intl)"
-
-    name[Group1]= "Russia - Chuvash Latin";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key        <AD01> {	[	  q,	Q,    0x01000161,       0x01000160 ] };
-    key        <AD02> {	[	  w,	W,    udiaeresis,       Udiaeresis ] };
-    key        <AD03> { [         e,	E,    0x01000115,	0x01000114 ] };
-    key        <AD07> {	[	  u,	U,    udiaeresis,       Udiaeresis ] };
-    key        <AD08> {	[	  i,	I,    0x0100012d,       0x0100012c ] };
-    key        <AD09> {	[	  o,	O,    odiaeresis,       Odiaeresis ] };
-    key        <AC01> { [	  a,    A,        abreve,           Abreve ] };
-    key        <AC02> { [	  s,    S,      scedilla,         Scedilla ] };
-    key        <AC05> { [	  g,    G,        gbreve,           Gbreve ] };
-    key        <AC07> { [	  j,    J,    0x01000131,       0x01000130 ] };
-    key        <AB03> { [         c,    C,      ccedilla,         Ccedilla ] };
-
-    include "level3(ralt_switch)"
-
-};
-
-// Komi language layout
-// based on
-// russian standard keyboard
-// Vlad Shakhov <[email protected]>
-// Last Changes 2007/10/23 by Vlad Shakhov <[email protected]>
-
-partial alphanumeric_keys 
-xkb_symbols "kom" {
-
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Komi";
-
-    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
-
-// cyrilllic o with diaeresis 
-    key	<AC07> { [ 	Cyrillic_o,		Cyrillic_O,		
-			U04E7,  		U04E6		] };
-    
-// hard I as additional key for soft Cyrillic_I 
-    key <AB05> { [      Cyrillic_i,		Cyrillic_I,
-			Ukrainian_i,     	Ukrainian_I     ] };
-
-    include "level3(ralt_switch)"
-};
-
-// Yakut language layout
-// 2008/04/23 Yakov Aleksandrov <[email protected]>
-// 2008/04/23 Anatoliy Zhozhikov <[email protected]>
-// 2008/04/23 Aleksandr Varlamov
-partial alphanumeric_keys
-xkb_symbols "sah" {
-
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Yakut";
-
-    key.type[group1]="FOUR_LEVEL_ALPHABETIC";
-
-    key <TLDE> { [	Cyrillic_io,		Cyrillic_IO,
-    			U04EB,			U04EA			] };
-    key <AD01> { [	Cyrillic_shorti,	Cyrillic_SHORTI,
-			U048B,			U048A			] };
-    key <AD03> { [	Cyrillic_u,		Cyrillic_U,
-			Cyrillic_u_straight,	Cyrillic_U_straight	] };
-    key <AD04> { [	Cyrillic_ka,		Cyrillic_KA,
-    			U04C4,			U04C3			] };
-    key <AD06> { [	Cyrillic_en,		Cyrillic_EN,
-			U04A5,			U04A4			] };
-    key <AD07> { [	Cyrillic_ghe,		Cyrillic_GHE,
-			U0495,			U0494			] };
-    key <AD10> { [	Cyrillic_ze,		Cyrillic_ZE,
-    			U04E1,			U04E0			] };
-    key <AD11> { [	Cyrillic_ha,		Cyrillic_HA,
-			Cyrillic_shha,		Cyrillic_SHHA		] };
-    key <AC07> { [	Cyrillic_o,		Cyrillic_O,
-			Cyrillic_o_bar,		Cyrillic_O_bar		] };
-    key <AC10> { [	Cyrillic_zhe,		Cyrillic_ZHE,
-    			U0461,			U0460			] };
-    key <AB02> { [	Cyrillic_che,		Cyrillic_CHE,
-    			Cyrillic_u_macron,	Cyrillic_U_macron	] };
-    key <AB04> { [	Cyrillic_em,		Cyrillic_EM,
-    			U04C8,			U04C7			] };
-    key <AB05> { [	Cyrillic_i,		Cyrillic_I,
-			Cyrillic_i_macron,	Cyrillic_I_macron	] };
-
-    include "level3(ralt_switch)"
-};
-
-
-//Kalmyk language layout
-//based on the Kalmyk language layout: http://soft.oyrat.org/
-//Nikolay Korneev <[email protected]>
-//Toli Miron <[email protected]>
-        
-partial alphanumeric_keys
-xkb_symbols "xal" {
-    include "ru(winkeys)"
-
-    name[Group1]= "Russia - Kalmyk";
-
-    key.type[group1]="FOUR_LEVEL";
-
-    key <AE01> {        [                     question,                  exclam,               1      ]       };
-    key <AE02> {        [      	            numerosign,                quotedbl,               2      ]       };
-    key <AE03> {        [          Cyrillic_u_straight,     Cyrillic_U_straight,               3      ]       };
-    key <AE04> {        [               Cyrillic_schwa,          Cyrillic_SCHWA,               4      ]       }; 
-    key <AE05> {        [                     asterisk,                 percent,               5      ]       };
-    key <AE06> {        [        Cyrillic_en_descender,   Cyrillic_EN_descender,               6      ]       };
-    key <AE07> {        [               Cyrillic_o_bar,          Cyrillic_O_bar,               7      ]       }; 
-    key <AE08> {        [                Cyrillic_shha,           Cyrillic_SHHA,               8      ]       }; 
-    key <AE09> {        [       Cyrillic_zhe_descender,  Cyrillic_ZHE_descender,               9      ]       };
-    key <AE10> {        [                    semicolon,                   colon,               0      ]       };
-
-    key <TLDE> {        [                    parenleft,               parenright, Cyrillic_io, Cyrillic_IO    ]       };
-
-    key <AD02> {        [                 Cyrillic_tse,             Cyrillic_TSE,         dollar      ]       };
-    key <AD03> {        [                   Cyrillic_u,               Cyrillic_U,       EuroSign      ]       }; 
-    key <AD04> {        [                  Cyrillic_ka,              Cyrillic_KA,     registered      ]       }; 
-    key <AD05> {        [                  Cyrillic_ie,              Cyrillic_IE,      trademark      ]       }; 
-    key <AD11> {        [                  Cyrillic_ha,              Cyrillic_HA,    bracketleft      ]       }; 
-    key <AD12> {        [            Cyrillic_hardsign,        Cyrillic_HARDSIGN,   bracketright      ]       };
-    key <AC11> {        [                   Cyrillic_e,               Cyrillic_E,     apostrophe      ]       };
-    key <AB03> {        [                  Cyrillic_es,              Cyrillic_ES,      copyright      ]       }; 
-    key <AB08> {        [                  Cyrillic_be,              Cyrillic_BE,           less      ]       };
-    key <AB09> {        [                  Cyrillic_yu,              Cyrillic_YU,        greater      ]       };
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "dos" {
-
-    include "ru(common)"
-
-    name[Group1]= "Russia - DOS";
-
-    key        <TLDE> {        [   parenright,  parenleft   ] };
-    key        <AE04> {        [   4,           currency    ] };
-    key        <AE09> {        [   9,           question    ] };
-    key        <AE10> {        [   0,           percent     ] };
-
-    key        <AB10> {        [   Cyrillic_io, Cyrillic_IO ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/ru(type6)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/se	Thu Jan 07 18:36:35 2010 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,285 +0,0 @@
-
-// based on a keyboard map from an 'xkb/symbols/se' file
-//
-// $XKeyboardConfig$
-// $XFree86: xc/programs/xkbcomp/symbols/se,v 1.5 2003/01/26 02:01:48 dawes Exp $
-
-partial default alphanumeric_keys
-xkb_symbols "basic" {
-    include "latin(type2)"
-    include "se(se)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "se" {
-
-    name[Group1]="Sweden";
-
-    key <AE05>	{ [         5,    percent,     EuroSign,         cent ]	};
-    key <AE11>	{ [      plus,   question,    backslash, questiondown ]	};
-    key <AE12>	{ [dead_acute, dead_grave,    plusminus,      notsign ]	};
-
-
-    key <AC10>	{ [odiaeresis, Odiaeresis,       oslash,     Ooblique ]	};
-    key <AC11>	{ [adiaeresis, Adiaeresis,           ae,           AE ]	};
-    key <TLDE>	{ [   section,    onehalf,    paragraph, threequarters]	};
-
-    key <BKSL>	{ [apostrophe,   asterisk,        acute,     multiply ]	};
-
-    key <SPCE>	{ [     space,      space,        space, nobreakspace ]	};
-
-    key <LSGT> { [ less,	greater,		bar,	bar ] };
-    include "kpdl(comma)"
-
-    include "level3(ralt_switch)"
-};
-
-partial alphanumeric_keys
-xkb_symbols "nodeadkeys" {
-
-    // Modifies the basic Swedish layout to eliminate all dead keys
-
-    include "latin(type2)"
-    include "latin(type2_nodeadkeys)"
-    include "se(se)"
-
-    name[Group1]="Sweden - Eliminate dead keys";
-
-    key <AE12>	{ [     acute,      grave,    plusminus,      notsign ]	};
-
-};
-
-// Swedish Dvorak
-partial alphanumeric_keys 
-xkb_symbols "dvorak" {
-
-    name[Group1]="Sweden - Dvorak";
-
-    include "se(basic)"
-
-    key <AD01> { [     aring,      Aring,    backslash		     ]	};
-    key <AD02> { [  adiaeresis,	Adiaeresis,  braceleft,  bracketleft ]	};
-    key <AD03> { [ odiaeresis, Odiaeresis,  braceright, bracketright ]	};
-    key <AD04> { [         p,          P,        thorn,        THORN ]	};
-    key <AD05> { [         y,          Y,    leftarrow,          yen ]	};
-    key <AD06> { [         f,          F,      dstroke,  ordfeminine ]	};
-    key <AD07> { [         g,          G,          eng,          ENG ]	};
-    key <AD08> { [         c,          C,    copyright,    copyright ]	};
-    key <AD09> { [         r,          R,   registered,   registered ]	};
-    key <AD10> { [         l,          L,      lstroke,      Lstroke ]	};
-    key <AD11> { [     comma,  semicolon, dead_cedilla,  dead_ogonek ]	};
-    key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde,	asciicircum	]	};
-
-    key <AC01> { [         a,          A,           ae,           AE ]	};
-    key <AC02> { [         o,          O,           oe,           OE ]	};
-    key <AC03> { [         e,          E,     EuroSign,         cent ]	};
-    key <AC04> { [         u,          U,    downarrow,      uparrow ]	};
-    key <AC05> { [         i,          I,   rightarrow,     idotless ]	};
-    key <AC06> { [         d,          D,          eth,          ETH ]	};
-    key <AC07> { [         h,          H,      hstroke,      Hstroke ]	};
-    key <AC08> { [         t,          T,       tslash,       Tslash ]	};
-    key <AC09> { [         n,          N ]	};
-    key <AC10> { [         s,          S,       ssharp,      section ]	};
-    key <AC11> { [     minus, underscore, dead_belowdot, dead_abovedot ] };
-
-    key <AB01> { [    period,   colon, periodcentered, dead_abovedot ]	};
-    key <AB02> { [         q,          Q,           at,  Greek_OMEGA ]	};
-    key <AB03> { [         j,          J ]	};
-    key <AB04> { [         k,          K,          kra,    ampersand ]	};
-    key <AB05> { [         x,          X, guillemotright,    greater ]	};
-    key <AB06> { [         b,          B, rightdoublequotemark, apostrophe ] };
-    key <AB07> { [         m,          M,           mu,    masculine ]	};
-    key <AB08> { [         w,          W,      lstroke,      Lstroke ]	};
-    key <AB09> { [         v,          V, leftdoublequotemark, grave ]	};
-    key <AB10> { [         z,          Z, guillemotleft,        less ]	};
-};
-
-// Ivan Popov, 2005-07-17
-// phonetic layout for Russian cyrillic letters
-// on Swedish (latin type2) keyboards
-
-// level3 modifier is a shortcut to the "se" meaning of the keys where
-// we place cyrillic letters, handy for accessing the corresponding
-// punctuation marks.
-// It is important to have access to punctuation marks, and the rest of
-// alphabetical keys are added for being consequent so that the users
-// can expect the level3 modifier to give what the key label shows.
-
-partial alphanumeric_keys
-xkb_symbols "rus" {
-    include "se(basic)"
-
-    name[Group1]="Sweden - Russian phonetic";
-    key.type[group1]="ALPHABETIC";
-
-    key <TLDE> {	[ Cyrillic_io, Cyrillic_IO ]	};
-    key <AE12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN ]	};
-
-    key <AD01> {	[ Cyrillic_ya, Cyrillic_YA ]	};
-    key <AD02> {	[ Cyrillic_ve, Cyrillic_VE ]	};
-    key <AD03> {	[ Cyrillic_ie, Cyrillic_IE ]	};
-    key <AD04> {	[ Cyrillic_er, Cyrillic_ER ]	};
-    key <AD05> {	[ Cyrillic_te, Cyrillic_TE ]	};
-    key <AD06> {	[ Cyrillic_yeru, Cyrillic_YERU ]	};
-    key <AD07> {	[ Cyrillic_u, Cyrillic_U ]	};
-    key <AD08> {	[ Cyrillic_i, Cyrillic_I ]	};
-    key <AD09> {	[ Cyrillic_o, Cyrillic_O ]	};
-    key <AD10> {	[ Cyrillic_pe, Cyrillic_PE ]	};
-    key <AD11> {	[ Cyrillic_e, Cyrillic_E ]	};
-
-    key <AC01> {	[ Cyrillic_a, Cyrillic_A ]	};
-    key <AC02> {	[ Cyrillic_es, Cyrillic_ES ]	};
-    key <AC03> {	[ Cyrillic_de, Cyrillic_DE ]	};
-    key <AC04> {	[ Cyrillic_ef, Cyrillic_EF ]	};
-    key <AC05> {	[ Cyrillic_ghe, Cyrillic_GHE ]	};
-    key <AC06> {	[ Cyrillic_ha, Cyrillic_HA ]	};
-    key <AC07> {	[ Cyrillic_shorti, Cyrillic_SHORTI ]	};
-    key <AC08> {	[ Cyrillic_ka, Cyrillic_KA ]	};
-    key <AC09> {	[ Cyrillic_el, Cyrillic_EL ]	};
-    key <AC10> {	[ Cyrillic_sha, Cyrillic_SHA ]	};
-    key <AC11> {	[ Cyrillic_shcha, Cyrillic_SHCHA ]	};
-    key <BKSL> {	[ Cyrillic_yu, Cyrillic_YU ]	};
-
-    key <LSGT> {	[ Cyrillic_che, Cyrillic_CHE ]	};
-    key <AB01> {	[ Cyrillic_ze, Cyrillic_ZE ]	};
-    key <AB02> {	[ Cyrillic_softsign, Cyrillic_SOFTSIGN ]	};
-    key <AB03> {	[ Cyrillic_tse, Cyrillic_TSE ]	};
-    key <AB04> {	[ Cyrillic_zhe, Cyrillic_ZHE ]	};
-    key <AB05> {	[ Cyrillic_be, Cyrillic_BE ]	};
-    key <AB06> {	[ Cyrillic_en, Cyrillic_EN ]	};
-    key <AB07> {	[ Cyrillic_em, Cyrillic_EM ]	};
-};
-
-partial alphanumeric_keys
-xkb_symbols "rus_nodeadkeys" {
-
-    include "se(nodeadkeys)"
-    include "se(rus)"
-
-    name[Group1]="Sweden - Russian phonetic, eliminate dead keys";
-
-    key <AE12> {	[ Cyrillic_hardsign, Cyrillic_HARDSIGN ]	};
-};
-
-xkb_symbols "smi" {
-
-    // Describes the differences between a Norwegian Northern Sami
-    // (keyboard with dead key support) and a Swedish/Finnish Sami
-    // keyboard according to the specs at:
-    // http://www.hum.uit.no/a/trond/se-lat9-sefi-keys.html
-
-    include "fi(smi)"
-
-    name[Group1]= "Sweden - Northern Saami";
-};
-
-// Copied from macintosh_vndr/se
-partial alphanumeric_keys 
-xkb_symbols "mac" {
-
-    // Describes the differences between a very simple en_US
-    // keyboard and a very simple Swedish(Sweden) keybaord
-
-    include "latin"
-    name[Group1]= "Sweden - Macintosh";
-
-    key <TLDE> {	[         section,         degree	]	};
-    key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};
-    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
-    key <AE03> {	[               3,      numbersign,         sterling,             yen	]	};
-    key <AE04> {	[               4,        currency, 	   dollar,	      cent	]	};
-    key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash, 	      bar,       backslash	]	};
-    key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft	]	};
-    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
-    key <AB08> {	[           comma,       semicolon     	]	};
-    key <AE10> {	[               0,           equal     	]	};
-    key <AB09> {	[          period,           colon     	]	};
-    key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	    Ooblique	]	};
-    key <AE11> {	[            plus,        question      ]	};
-    key <AC11> {	[      adiaeresis,      Adiaeresis,               ae,		AE	]	};
-    key <AD11> {	[	    aring,           Aring     	]	};
-    key <AE12> {	[           acute,           grave	]	};
-    key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};
-    key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
-
-    include "kpdl(comma)"
-    include "level3(ralt_switch)"
-};
-
-// Svdvorak
-// This version of Dvorak follows danish and norwegian style in hope for a
-// Scandinavian standard.
-partial alphanumeric_keys
-xkb_symbols "svdvorak" {
-
-   name[Group1]="Sweden - Svdvorak";
-
-   include "se(basic)"
-
-   key <AD01> { [ aring, Aring, braceleft ] };
-   key <AD02> { [ comma, semicolon, bracketleft ] };
-   key <AD03> { [ period, colon, bracketright ] };
-   key <AD04> { [ p, P, braceright ] };
-   key <AD05> { [ y, Y ] };
-   key <AD06> { [ f, F ] };
-   key <AD07> { [ g, G ] };
-   key <AD08> { [ c, C ] };
-   key <AD09> { [ r, R ] };
-   key <AD10> { [ l, L ] };
-   key <AD11> { [ apostrophe, asterisk ] };
-
-   key <AC01> { [ a, A ] };
-   key <AC02> { [ o, O, parenleft ] };
-   key <AC03> { [ e, E, parenright ] };
-   key <AC04> { [ u, U ] };
-   key <AC05> { [ i, I ] };
-   key <AC06> { [ d, D ] };
-   key <AC07> { [ h, H ] };
-   key <AC08> { [ t, T ] };
-   key <AC09> { [ n, N ] };
-   key <AC10> { [ s, S, ssharp ] };
-   key <AC11> { [ minus, underscore ] };
-   key <BKSL> { [ less, greater, bar ] };
-
-   key <LSGT> { [ odiaeresis, Odiaeresis ] };
-   key <AB01> { [ adiaeresis, Adiaeresis ] };
-   key <AB02> { [ q, Q ] };
-   key <AB03> { [ j, J ] };
-   key <AB04> { [ k, K ] };
-   key <AB05> { [ x, X ] };
-   key <AB06> { [ b, B ] };
-   key <AB07> { [ m, M ] };
-   key <AB08> { [ w, W ] };
-   key <AB09> { [ v, V ] };
-   key <AB10> { [ z, Z ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    include "sun_vndr/se(type6)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    include "sun_vndr/se(type5)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
-partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    include "sun_vndr/se(type4)"
-    include "level3(ralt_switch)"
-    include "kpdl(comma)"
-
-};
-
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ara	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ara	Fri Jan 08 10:51:10 2010 +0900
@@ -105,5 +105,55 @@
     key <AB09> {  [     Arabic_zain,         period, period,    greater       ]     };
     key <AB10> {  [      Arabic_zah, Arabic_question_mark, slash,    question ]     };
 
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "ara(qwerty)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "azerty" {
+	include "ara(azerty)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "digits" {
+	include "ara(digits)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_digits" {
+	include "ara(qwerty_digits)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "azerty_digits" {
+	include "ara(azerty_digits)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "buckwalter" {
+	include "ara(buckwalter)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ara(olpc)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ara(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/be	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/be	Fri Jan 08 10:51:10 2010 +0900
@@ -87,5 +87,73 @@
     key <AB09>  { [     colon,      slash                             ] };
     key <AB10>  { [     equal,       plus,   dead_tilde               ] };
 
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss" {
+	include "be(oss)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_frbe" {
+	include "be(oss_frbe)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_latin9" {
+	include "be(oss_latin9)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_Sundeadkeys" {
+	include "be(oss_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_sundeadkeys" {
+	include "be(oss_sundeadkeys)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "iso-alternate" {
+	include "be(iso-alternate)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "be(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "be(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "be(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "wang" {
+	include "be(wang)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/be(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/br	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,142 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Brazil - Sun type 6";
+
+    key <TLDE> { [      apostrophe,        quotedbl,	notsign		               ] };
+    key <AE01> { [               1,          exclam,	onesuperior,        exclamdown ] };
+    key <AE02> { [               2,              at,	twosuperior,           onehalf ] };
+    key <AE03> { [               3,      numbersign,	threesuperior,   threequarters ] };
+    key <AE04> { [               4,          dollar,	sterling,           onequarter ] };
+    key <AE05> { [               5,         percent,	cent                           ] };
+    key <AE06> { [               6,  dead_diaeresis,	notsign,             diaeresis ] };
+    key <AE07> { [               7,       ampersand,	braceleft                      ] };
+    key <AE08> { [               8,        asterisk,	bracketleft                    ] };
+    key <AE09> { [               9,       parenleft,	bracketright                   ] };
+    key <AE10> { [               0,      parenright,	braceright                     ] };
+    key <AE11> { [           minus,      underscore,	backslash                      ] };
+    key <AE12> { [           equal,            plus,	section                        ] };
+
+    key <AD03> { [               e,               E,	EuroSign                       ] };
+    key <AD04> { [               r,               R,	registered                     ] };
+    key <AD11> { [      dead_acute,      dead_grave,	acute,                   grave ] };
+    key <AD12> { [     bracketleft,       braceleft,	ordfeminine                    ] };
+
+    key <AC10> { [        ccedilla,        Ccedilla,	exclamdown		       ] };
+    key <AC11> { [      dead_tilde, dead_circumflex,	asciitilde,        asciicircum ] };
+    key <AC12> { [    bracketright,      braceright,	masculine                      ] };
+    key <BKSL> { [   bracketright,       braceright,    masculine                      ] };
+
+    key <LSGT> { [          slash,              bar,    degree                         ] };
+    key <AB01> { [               z,               Z,	guillemotleft 		       ] };
+    key <AB02> { [               x,               X,	guillemotright                 ] };
+    key <AB03> { [               c,               C,	copyright                      ] };
+    key <AB07> { [               m,               M,	mu                             ] };
+    key <AB08> { [           comma,            less,	question                       ] };
+    key <AB09> { [          period,         greater,	questiondown                   ] };
+    key <AB10> { [       semicolon,           colon                                    ] };
+    key <AB11> { [           slash,        question,	degree,           questiondown ] };
+
+    key <KPPT> { [      KP_Decimal                                                     ] };
+    key <KPDL> { [       KP_Delete,           comma                                    ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "abnt2" {
+	include "br(abnt2)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "br(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "thinkpad" {
+	include "br(thinkpad)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "br(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+        include "br(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo" {
+        include "br(nativo)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-us" {
+	include "br(nativo-us)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-epo" {
+	include "br(nativo-epo)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/br(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ca	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,154 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+   name[Group1]="Canada Bilingual - Sun type 6";
+
+   key <TLDE> { [           slash, bar,             backslash                  ]};
+   key <AE01> { [               1, exclam,          plusminus                  ]};
+   key <AE02> { [               2, at                                          ]};
+   key <AE03> { [               3, numbersign,      sterling                   ]};
+   key <AE04> { [               4, dollar,          cent                       ]};
+   key <AE05> { [               5, percent,         currency                   ]};
+   key <AE06> { [               6, question,        notsign	               ]};
+   key <AE07> { [               7, ampersand,       braceleft                  ]};
+   key <AE08> { [               8, asterisk,        braceright                 ]};
+   key <AE09> { [               9, parenleft,       bracketleft                ]};
+   key <AE10> { [               0, parenright,      bracketright               ]};
+   key <AE11> { [           minus, underscore,      onehalf	               ]};
+   key <AE12> { [           equal, plus,            notsign                    ]};
+  
+   key <AD03> { [               e, E,               EuroSign		       ]};
+   key <AD09> { [               o, O,               section		       ]};
+   key <AD10> { [               p, P,               paragraph                  ]};
+   key <AD11> { [ dead_circumflex, dead_diaeresis,  dead_grave                 ]};
+   key <AD12> { [        ccedilla, Ccedilla,        asciitilde                 ]};
+
+   key <AC10> { [       semicolon, colon,           degree                     ]};
+   key <AC11> { [          egrave, Egrave,          braceleft                  ]};
+   key <AC12> { [          agrave, Agrave,          braceright                 ]};
+   key <BKSL> { [          agrave, Agrave,          braceright                 ]};
+
+   key <LSGT> { [          uacute, Uacute                                      ]};
+   key <AB01> { [               z, Z,               guillemotleft              ]};
+   key <AB02> { [               x, X,               guillemotright             ]};
+   key <AB07> { [               m, M,               mu                         ]};
+   key <AB08> { [           comma, quoteright,      less                       ]};
+   key <AB09> { [          period, quotedbl,        greater                    ]};
+   key <AB10> { [          eacute, Eacute,          quoteleft                  ]};
+   
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr" {
+	include "ca(fr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-dvorak" {
+	include "ca(fr-dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-legacy" {
+	include "ca(fr-legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi" {
+	include "ca(multi)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi-2gr" {
+	include "ca(multi-2gr)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "ike" {
+	include "ca(ike)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multix" {
+	include "ca(multix)"
+};
+
+partial alphanumeric_keys  
+	xkb_symbols "shs" {
+	include "ca(shs)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ca(olpc)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "kut" {
+	include "ca(kut)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "eng" {
+	include "ca(eng)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ca(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ch	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ch	Fri Jan 08 10:51:10 2010 +0900
@@ -82,6 +82,8 @@
     key <AB09> { [     period,      colon                           ] };
     key <AB10> { [      minus, underscore                           ] };
 
+	include "level3(ralt_switch)"
+
 };
 
 
@@ -119,7 +121,75 @@
     key <AB08> { [      comma,  semicolon                           ] };
     key <AB09> { [     period,      colon                           ] };
     key <AB10> { [      minus, underscore                           ] };
+	
+	include "level3(ralt_switch)"
 
 };
 
 
+
+partial alphanumeric_keys
+	xkb_symbols "de" {
+	include "ch(de)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_Sundeadkeys" {
+	include "ch(de_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_sundeadkeys" {
+	include "ch(de_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_nodeadkeys" {
+	include "ch(de_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr" {
+	include "ch(fr)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_Sundeadkeys" {
+	include "ch(fr_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_sundeadkeys" {
+	include "ch(fr_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_nodeadkeys" {
+	include "ch(fr_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "de_mac" {
+	include "ch(de_mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fr_mac" {
+	include "ch(fr_mac)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ch(de_type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/cz	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,127 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Czech - Sun type 6";
+
+    key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};
+    key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};
+    key <AE02>	{ [    ecaron,          2,	at,     dead_caron 		]	};
+    key <AE03>	{ [    scaron,          3,	numbersign,  dead_circumflex 	] 	};
+    key <AE04>	{ [    ccaron,          4,	dollar,     dead_breve 		]	};
+    key <AE05>	{ [    rcaron,          5,	percent, dead_abovering 	] 	};
+    key <AE06>	{ [    zcaron,          6,	asciicircum,  dead_ogonek 	]	};
+    key <AE07>	{ [    yacute,          7,	ampersand,          grave 	]	};
+    key <AE08>	{ [    aacute,          8,	asterisk,  dead_abovedot	]	};
+    key <AE09>	{ [    iacute,          9,	parenleft,    dead_acute    	]	};
+    key <AE10>	{ [    eacute,          0,	parenright, dead_doubleacute	]	};
+    key <AE11>	{ [     equal,    percent,	dead_diaeresis, backslash 	]	};
+    key <AE12>	{ [ dead_acute, dead_caron,	dead_cedilla, minus 		]	};
+
+    key <AD01>	{ [         q,          Q,	backslash 		]	};
+    key <AD02>	{ [         w,          W,	bar 			]	};
+    key <AD03>	{ [         e,          E,	EuroSign 		]	};
+    key <AD06>	{ [         z,          Z 				]	};
+    key <AD11>	{ [    uacute,      slash,	division 		]	};
+    key <AD12>	{ [parenright,  parenleft,	multiply 		]	};
+
+    key <AC02>	{ [         s,          S,	dstroke			]	};
+    key <AC03>	{ [         d,          D,	Dstroke 		]	};
+    key <AC04>	{ [         f,          F,	bracketleft 		]	};
+    key <AC05>	{ [         g,          G,	bracketright 		]	};
+    key <AC08>	{ [         k,          K,	lstroke 		]	};
+    key <AC09>	{ [         l,          L,	Lstroke 		]	};              
+    key <AC10>	{ [      uring,       quotedbl,	dollar 			]	};
+    key <AC11>	{ [    section,         exclam,	ssharp,       currency	]	};
+    key <BKSL>	{ [ dead_diaeresis, apostrophe,	backslash,         bar	]	};
+
+    key <LSGT>	{ [  backslash,       asterisk,	slash,	     brokenbar	]	};
+    key <AB01>	{ [          y,          Y,	less	 		]	};
+    key <AB02>	{ [          x,          X,	greater,    numbersign  ]	};
+    key <AB04>	{ [          v,          V,	at 			]	};
+    key <AB05>	{ [          b,          B,	braceleft 		]	};
+    key <AB06>	{ [          n,          N,	braceright	 	]	};
+    key <AB08>	{ [      comma,       question,	less			]	};
+    key <AB09>	{ [     period,          colon,	greater			]	};
+    key <AB10>	{ [      minus,     underscore                   	]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bksl" {
+	include "cz(bksl)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "qwerty" {
+	include "cz(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_bksl" {
+	include "cz(qwerty_bksl)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "ucw" {
+	include "cz(ucw)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/cz(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/de	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/de	Fri Jan 08 10:51:10 2010 +0900
@@ -1,3 +1,4 @@
+//
 //
 // Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 //
@@ -48,6 +49,42 @@
 // CDDL HEADER END
 //
 
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Germany - Sun type 6";
+
+    key <TLDE> { [     asciicircum,           degree                   ] };
+    key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 
+    key <AE03> { [               3,          section,   threesuperior  ] };
+    key <AE04> { [               4,           dollar                   ] };
+    key <AE06> { [               6,        ampersand,         section  ] };
+    key <AE07> { [               7,            slash,       braceleft  ] };
+    key <AE08> { [               8,        parenleft,     bracketleft  ] };
+    key <AE09> { [               9,       parenright,    bracketright  ] };
+    key <AE10> { [               0,            equal,      braceright  ] };
+    key <AE11> { [          ssharp,         question,       backslash  ] };
+    key <AE12> { [      dead_acute,       dead_grave                   ] };
+    key <AD01> { [               q,                Q,              at  ] };
+    key <AD03> { [               e,                E,        EuroSign  ] };
+    key <AD06> { [               z,                Z                   ] };
+    key <AD11> { [      udiaeresis,       Udiaeresis                   ] };
+    key <AD12> { [            plus,         asterisk,      asciitilde  ] };
+    key <AC10> { [      odiaeresis,       Odiaeresis                   ] };
+    key <AC11> { [      adiaeresis,       Adiaeresis                   ] };
+    key <AB01> { [               y,                Y                   ] };
+    key <AB07> { [               m,                M,              mu  ] };
+    key <AB08> { [           comma,        semicolon                   ] };
+    key <AB09> { [          period,            colon                   ] };
+    key <AB10> { [           minus,       underscore                   ] };
+    key <BKSL> { [      numbersign,       apostrophe,           grave  ] };
+    key <LSGT> { [            less,          greater,             bar  ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
 partial alphanumeric_keys
 xkb_symbols "type4" {
 
@@ -91,39 +128,98 @@
     key <AB09>	{ [         period,         colon                                             ] };
     key <AB10>	{ [          minus,    underscore                                             ] };
 
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
 
 };
 
+
 partial alphanumeric_keys
-xkb_symbols "type6" {
+	xkb_symbols "nodeadkeys" {
+	include "de(nodeadkeys)"
+};
+
 
-    name[Group1]="Germany - Sun type 6";
+partial alphanumeric_keys
+	xkb_symbols "deadgraveacute" {
+	include "de(deadgraveacute)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "deadacute" {
+	include "de(deadacute)"
+};
+
 
-    key <TLDE> { [     asciicircum,           degree                   ] };
-    key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 
-    key <AE03> { [               3,          section,   threesuperior  ] };
-    key <AE04> { [               4,           dollar                   ] };
-    key <AE06> { [               6,        ampersand,         section  ] };
-    key <AE07> { [               7,            slash,       braceleft  ] };
-    key <AE08> { [               8,        parenleft,     bracketleft  ] };
-    key <AE09> { [               9,       parenright,    bracketright  ] };
-    key <AE10> { [               0,            equal,      braceright  ] };
-    key <AE11> { [          ssharp,         question,       backslash  ] };
-    key <AE12> { [      dead_acute,       dead_grave                   ] };
-    key <AD01> { [               q,                Q,              at  ] };
-    key <AD03> { [               e,                E,        EuroSign  ] };
-    key <AD06> { [               z,                Z                   ] };
-    key <AD11> { [      udiaeresis,       Udiaeresis                   ] };
-    key <AD12> { [            plus,         asterisk,      asciitilde  ] };
-    key <AC10> { [      odiaeresis,       Odiaeresis                   ] };
-    key <AC11> { [      adiaeresis,       Adiaeresis                   ] };
-    key <AB01> { [               y,                Y                   ] };
-    key <AB07> { [               m,                M,              mu  ] };
-    key <AB08> { [           comma,        semicolon                   ] };
-    key <AB09> { [          period,            colon                   ] };
-    key <AB10> { [           minus,       underscore                   ] };
-    key <BKSL> { [      numbersign,       apostrophe,           grave  ] };
-    key <LSGT> { [            less,          greater,             bar  ] };
+partial alphanumeric_keys
+	xkb_symbols "ro" {
+	include "de(ro)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ro_nodeadkeys" {
+	include "de(ro_nodeadkeys)"
+};
 
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "de(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "de(Sundeadkeys)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "de(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "neo" {
+	include "de(neo)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "de(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "de(mac_nodeadkeys)"
+};
+
+
+//partial alphanumeric_keys
+//	xkb_symbols "dsb"
+//	include "de(dsb)"
+//};
+
+
+//partial alphanumeric_keys
+//	xkb_symbols "dsb_qwertz"
+//	include "de(dsb_qwertz)"
+//};
+
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "de(qwerty)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/de(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/dk	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/dk	Fri Jan 08 10:51:10 2010 +0900
@@ -49,6 +49,40 @@
 //
 
 partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Denmark - Sun type 6";
+
+    key <TLDE> { [         onehalf,         section                ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,      numbersign,      sterling ] };
+    key <AE04> { [               4,        currency,        dollar ] };
+    key <AE05> { [               5,         percent,    asciitilde ] };
+    key <AE06> { [               6,       ampersand,   asciicircum ] };
+    key <AE07> { [               7,           slash,     braceleft ] };
+    key <AE08> { [               8,       parenleft,   bracketleft ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,    braceright ] };
+    key <AE11> { [            plus,        question                ] };
+    key <AE12> { [      dead_acute,      dead_grave,           bar ] }; 
+    key <AD03> { [               e,               E,      EuroSign ] }; 
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis, dead_circumflex,    dead_tilde ] };
+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
+    key <AC10> { [              ae,              AE                ] };
+    key <AC11> { [          oslash,        Ooblique                ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+    key <LSGT> { [            less,         greater,     backslash ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
 xkb_symbols "type4" {
 
    name[Group1]="Denmark - Sun type 4";
@@ -80,10 +114,13 @@
    key <COMP> { [ SunAltGraph                                    ] };
    key <ALGR> { [ SunCompose                                     ] };
 
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
 };
 
 
-partial default alphanumeric_keys
+partial alphanumeric_keys
 xkb_symbols "type5" {
 
    include "sun_vndr/dk(type4)"
@@ -98,37 +135,38 @@
     key <AE10> { [ 0,           equal,       braceright                 ] };
     key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };
     
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "dk(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "dk(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "dk(mac_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "dk(dvorak)"
 };
 
 
 partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Denmark - Sun type 6";
-
-    key <TLDE> { [         onehalf,         section                ] };
-    key <AE02> { [               2,        quotedbl,            at ] };
-    key <AE03> { [               3,      numbersign,      sterling ] };
-    key <AE04> { [               4,        currency,        dollar ] };
-    key <AE05> { [               5,         percent,    asciitilde ] };
-    key <AE06> { [               6,       ampersand,   asciicircum ] };
-    key <AE07> { [               7,           slash,     braceleft ] };
-    key <AE08> { [               8,       parenleft,   bracketleft ] };
-    key <AE09> { [               9,      parenright,  bracketright ] };
-    key <AE10> { [               0,           equal,    braceright ] };
-    key <AE11> { [            plus,        question                ] };
-    key <AE12> { [      dead_acute,      dead_grave,           bar ] }; 
-    key <AD03> { [               e,               E,      EuroSign ] }; 
-    key <AD11> { [           aring,           Aring                ] };
-    key <AD12> { [  dead_diaeresis, dead_circumflex,    dead_tilde ] };
-    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
-    key <AC10> { [              ae,              AE                ] };
-    key <AC11> { [          oslash,        Ooblique                ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
-    key <LSGT> { [            less,         greater,     backslash ] };
-
+	xkb_symbols "basic" {
+	include "sun_vndr/dk(type6)"
 };
 
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ee	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,134 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Estonia - Sun type 6";
+
+
+   key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };
+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
+   key <AE02> { [              2,      quotedbl,	at,     oneeighth ] };
+   key <AE03> { [              3,    numbersign,	sterling,      sterling ] };
+   key <AE04> { [              4,      currency,	dollar,        dollar ] };
+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
+   key <AE06> { [              6,     ampersand,	notsign,   fiveeighths ] };
+   key <AE07> { [              7,         slash,	braceleft,  seveneighths ] };
+   key <AE08> { [              8,     parenleft,	bracketleft,     trademark ] };
+   key <AE09> { [              9,    parenright,	bracketright,     plusminus ] };
+   key <AE10> { [              0,         equal,	braceright,        degree ] };
+   key <AE11> { [           plus,      question,	backslash,  questiondown ] };
+   key <AE12> { [     dead_acute,    dead_grave,	grave,    apostrophe ] };
+
+   key <AD01> { [              q,             Q,	at,   Greek_OMEGA ] };
+   key <AD02> { [              w,             W,	lstroke,       Lstroke ] };
+   key <AD03> { [              e,             E,	EuroSign,          cent ] };
+   key <AD04> { [              r,             R,	paragraph,    registered ] };
+   key <AD05> { [              t,             T,	tslash,        Tslash ] };
+   key <AD06> { [              y,             Y,	leftarrow,           yen ] };
+   key <AD07> { [              u,             U,	downarrow,       uparrow ] };
+   key <AD08> { [              i,             I,	rightarrow,      idotless ] };
+   key <AD09> { [              o,             O,	oslash,      Ooblique ] };
+   key <AD10> { [              p,             P,	thorn,         THORN ] };
+   key <AD11> { [     udiaeresis,    Udiaeresis,	dead_diaeresis,dead_abovering ] };
+   key <AD12> { [         otilde,        Otilde,	section,   dead_macron ] };
+
+   key <AC01> { [              a,             A,	ae,            AE ] };
+   key <AC02> { [              s,             S,	ssharp,       section ] };
+   key <AC03> { [              d,             D,	eth,           ETH ] };
+   key <AC04> { [              f,             F,	dstroke,   ordfeminine ] };
+   key <AC05> { [              g,             G,	eng,           ENG ] };
+   key <AC06> { [              h,             H,	hstroke,       Hstroke ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	kra,     ampersand ] };
+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
+   key <AC10> { [     odiaeresis,    Odiaeresis,	dead_acute, dead_doubleacute ] };
+   key <AC11> { [     adiaeresis,    Adiaeresis,	asciicircum,    dead_caron ] };
+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
+
+   key <BKSL> { [     apostrophe,      asterisk,	onehalf,    dead_breve ] };
+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
+   key <AB02> { [              x,             X,	guillemotright,       greater ] };
+   key <AB03> { [              c,             C,	cent,     copyright ] };
+   key <AB04> { [              v,             V,	leftdoublequotemark, leftsinglequotemark ] };
+   key <AB05> { [              b,             B,	rightdoublequotemark, rightsinglequotemark ] };
+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
+   key <AB07> { [              m,             M,	mu,     masculine ] };
+   key <AB08> { [          comma,     semicolon,	less,      multiply ] };
+   key <AB09> { [         period,         colon,	greater,      division ] };
+   key <AB10> { [          minus,    underscore,	dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "ee(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "ee(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "us" {
+	include "ee(us)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ee(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/es	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/es	Fri Jan 08 10:51:10 2010 +0900
@@ -48,6 +48,40 @@
 // CDDL HEADER END
 //
 
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Spain - Sun type 6";
+
+    key <TLDE> { [       masculine,     ordfeminine,     backslash ] };
+    key <LSGT> { [            less,         greater                ] };
+    key <AE01> { [               1,          exclam,           bar ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,  periodcentered,    numbersign ] };
+    key <AE04> { [               4,          dollar,   asciicircum ] };
+    key <AE05> { [               5,         percent,    asciitilde ] };
+    key <AE06> { [               6,       ampersand,       notsign ] };
+    key <AE07> { [               7,           slash                ] };
+    key <AE08> { [               8,       parenleft                ] };
+    key <AE09> { [               9,      parenright                ] }; 
+    key <AE10> { [               0,           equal                ] };
+    key <AE11> { [      apostrophe,        question,         grave ] };
+    key <AE12> { [      exclamdown,    questiondown                ] };
+    key <AD03> { [               e,               E,      EuroSign ] };
+    key <AD11> { [      dead_grave, dead_circumflex,   bracketleft ] };
+    key <AD12> { [            plus,        asterisk,  bracketright ] };
+    key <AC10> { [          ntilde,          Ntilde                ] };
+    key <AC11> { [      dead_acute,  dead_diaeresis,     braceleft ] };
+    key <BKSL> { [        ccedilla,        Ccedilla,    braceright ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+   
+        include "level3(ralt_switch)"
+
+};
+
+
 partial alphanumeric_keys
 xkb_symbols "type4" {
     
@@ -84,7 +118,7 @@
 };
  
 
-partial default alphanumeric_keys
+partial alphanumeric_keys
 xkb_symbols "type5" {
     include "sun_vndr/es(type4)"
 
@@ -101,37 +135,66 @@
     key <AD11> { [ dead_grave, dead_circumflex,  bracketleft ] };
     key <AD12> { [ dead_acute, dead_diaeresis, braceleft      ] };
  
+	include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "es(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "es(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "es(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "es(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "cat" {
+	include "es(cat)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ast" {
+	include "es(ast)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "es(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "es(olpc)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "deadtilde" {
+	include "es(deadtilde)"
 };
 
 
 partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Spain - Sun type 6";
-
-    key <TLDE> { [       masculine,     ordfeminine,     backslash ] };
-    key <LSGT> { [            less,         greater                ] };
-    key <AE01> { [               1,          exclam,           bar ] };
-    key <AE02> { [               2,        quotedbl,            at ] };
-    key <AE03> { [               3,  periodcentered,    numbersign ] };
-    key <AE04> { [               4,          dollar,   asciicircum ] };
-    key <AE05> { [               5,         percent,    asciitilde ] };
-    key <AE06> { [               6,       ampersand,       notsign ] };
-    key <AE07> { [               7,           slash                ] };
-    key <AE08> { [               8,       parenleft                ] };
-    key <AE09> { [               9,      parenright                ] }; 
-    key <AE10> { [               0,           equal                ] };
-    key <AE11> { [      apostrophe,        question,         grave ] };
-    key <AE12> { [      exclamdown,    questiondown                ] };
-    key <AD03> { [               e,               E,      EuroSign ] };
-    key <AD11> { [      dead_grave, dead_circumflex,   bracketleft ] };
-    key <AD12> { [            plus,        asterisk,  bracketright ] };
-    key <AC10> { [          ntilde,          Ntilde                ] };
-    key <AC11> { [      dead_acute,  dead_diaeresis,     braceleft ] };
-    key <BKSL> { [        ccedilla,        Ccedilla,    braceright ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
-   
+	xkb_symbols "basic" {
+	include "sun_vndr/es(type6)"
 };
 
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/fi	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/fi	Fri Jan 08 10:51:10 2010 +0900
@@ -77,5 +77,50 @@
     key <AB09> { [  period,          colon                                    ] };
     key <AB10> { [  minus,           underscore                               ] };
 
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "kotoistus" {
+	include "fi(kotoistus)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "classic" {
+	include "fi(classic)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "fi" {
+	include "fi(fi)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "fi(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "fi(smi)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "fi(mac)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fi(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/fr	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/fr	Fri Jan 08 10:51:10 2010 +0900
@@ -85,5 +85,127 @@
     key <AB09>	{ [           colon,      slash                  ] };
     key <AB10>	{ [          exclam,    section                  ] };
 
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "fr(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "fr(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "fr(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss" {
+	include "fr(oss)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_latin9" {
+	include "fr(oss_latin9)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_Sundeadkeys" {
+	include "fr(oss_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_sundeadkeys" {
+	include "fr(oss_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oss_nodeadkeys" {
+	include "fr(oss_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "latin9" {
+	include "fr(latin9)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_Sundeadkeys" {
+	include "fr(latin9_Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_sundeadkeys" {
+	include "fr(latin9_sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_nodeadkeys" {
+	include "fr(latin9_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "bepo" {
+	include "fr(bepo)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "bepo_latin9" {
+	include "fr(bepo_latin9)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "fr(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "bre" {
+	include "fr(bre)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "oci" {
+	include "fr(oci)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "fr(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "fr(geo)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fr(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/gb	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/gb	Fri Jan 08 10:51:10 2010 +0900
@@ -62,10 +62,12 @@
     key <AC11> { [ apostrophe,         at             ] };
     key <LSGT> { [  backslash,        bar             ] };
 
+	include "level3(ralt_switch)"
+
 };
 
 
-partial default alphanumeric_keys
+partial alphanumeric_keys
 xkb_symbols "type5" {
 
     name[Group1]="United Kingdom - Sun type 5";
@@ -73,10 +75,12 @@
     key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };
     key <AD03> {        [               e,      E,          EuroSign          ] };
 
+	include "level3(ralt_switch)"
+
 };
 
 
-partial default alphanumeric_keys
+partial alphanumeric_keys
 xkb_symbols "type4" {
 
     name[Group1]="United Kingdom - Sun type 4";
@@ -87,5 +91,49 @@
     key <AE11> { [  minus, underscore,     notsign ] };
     key <AD03> { [      e,          E,    EuroSign ] };
 
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "gb(intlespacio)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "extd" {
+	include "gb(extd)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "gb(colemak)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "gb(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorakukp" {
+	include "gb(dvorakukp)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "gb(mac)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gb(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/gr	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,144 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Greece - Sun type 6";
+
+
+	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };
+	key <AE01> { [                     1,         exclam ] };
+	key <AE02> { [                     2,             at ] };
+	key <AE03> { [                     3,     numbersign,	sterling ] };
+	key <AE04> { [                     4,         dollar,	EuroSign ] };
+	key <AE05> { [                     5,        percent,	EuroSign ] };
+	key <AE06> { [                     6,    asciicircum,	notsign ] };
+	key <AE07> { [                     7,      ampersand ] };
+	key <AE08> { [                     8,       asterisk ] };
+	key <AE09> { [                     9,      parenleft ] };
+	key <AE10> { [                     0,     parenright,	degree ] };
+	key <AE11> { [                 minus,     underscore,	plusminus ] };
+	key <AE12> { [                 equal,           plus ] };
+
+	key <AD01> { [             semicolon,          colon,	periodcentered ] };
+	key <AD02> { [ Greek_finalsmallsigma, periodcentered,	Greek_SIGMA ] };
+	key <AD03> { [         Greek_epsilon,  Greek_EPSILON,	EuroSign ] };
+	key <AD04> { [             Greek_rho,      Greek_RHO,	registered ] };
+	key <AD05> { [             Greek_tau,      Greek_TAU ] };
+	key <AD06> { [         Greek_upsilon,  Greek_UPSILON ] };
+	key <AD07> { [           Greek_theta,    Greek_THETA ] };
+	key <AD08> { [            Greek_iota,     Greek_IOTA ] };
+	key <AD09> { [         Greek_omicron,  Greek_OMICRON ] };
+	key <AD10> { [              Greek_pi,       Greek_PI ] };
+	key <AD11> { [           bracketleft,      braceleft,	guillemotleft ] };
+	key <AD12> { [          bracketright,     braceright,	guillemotright ] };
+
+	key <AC01> { [           Greek_alpha,    Greek_ALPHA ] };
+	key <AC02> { [           Greek_sigma,    Greek_SIGMA ] };
+	key <AC03> { [           Greek_delta,    Greek_DELTA ] };
+	key <AC04> { [             Greek_phi,      Greek_PHI ] };
+	key <AC05> { [           Greek_gamma,    Greek_GAMMA ] };
+	key <AC06> { [             Greek_eta,      Greek_ETA ] };
+	key <AC07> { [              Greek_xi,       Greek_XI ] };
+	key <AC08> { [           Greek_kappa,    Greek_KAPPA ] };
+	key <AC09> { [           Greek_lamda,    Greek_LAMDA ] };
+	key <AC10> { [            dead_acute, dead_diaeresis ] };
+	key <AC11> { [            apostrophe,       quotedbl ] };
+	key <BKSL> { [             backslash,            bar,	brokenbar ] };
+
+	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };
+        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
+        key <AB02> { [             Greek_chi,      Greek_CHI ] };
+        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };
+        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
+        key <AB05> { [            Greek_beta,     Greek_BETA ] };
+        key <AB06> { [              Greek_nu,       Greek_NU ] };
+        key <AB07> { [              Greek_mu,       Greek_MU ] };
+	key <AB08> { [                 comma,           less,	guillemotleft ] };
+	key <AB09> { [                period,        greater,	guillemotright ] };
+	key <AB10> { [                 slash,       question ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "simple" {
+	include "gr(simple)"
+};
+
+hidden partial alphanumeric_keys alternate_group
+	xkb_symbols "bare" {
+	include "gr(bare)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "extended" {
+	include "gr(extended)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "polytonic" {
+	include "gr(polytonic)"
+};
+
+partial alphanumeric_keys alternate_group
+	xkb_symbols "nodeadkeys" {
+	include "gr(nodeadkeys)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gr(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/it	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/it	Fri Jan 08 10:51:10 2010 +0900
@@ -48,8 +48,38 @@
 // CDDL HEADER END
 //
 
+partial default alphanumeric_keys
+xkb_symbols "type6" {
 
-partial default alphanumeric_keys
+    name[Group1]="Italy - Sun type 6";
+
+    key <LSGT> { [            less,         greater                                ] };
+    key <TLDE> { [       backslash,             bar                                ] };
+    key <AE02> { [               2,        quotedbl                                ] };
+    key <AE03> { [               3,        sterling                                ] };
+    key <AE06> { [               6,       ampersand                                ] };
+    key <AE07> { [               7,           slash                                ] };
+    key <AE08> { [               8,       parenleft,    braceleft                  ] };     
+    key <AE09> { [               9,      parenright,   braceright                  ] };     
+    key <AE10> { [               0,           equal                                ] };
+    key <AE11> { [      apostrophe,        question,        grave                  ] };     
+    key <AE12> { [          igrave,     asciicircum                                ] };
+    key <AD03> { [               e,               E,     EuroSign                  ] };
+    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };
+    key <AD12> { [            plus,        asterisk, bracketright                  ] };      
+    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };
+    key <AC10> { [          ograve,        ccedilla,           at                  ] };      
+    key <AC11> { [          agrave,          degree,   numbersign                  ] };
+    key <AB08> { [           comma,       semicolon                                ] };
+    key <AB09> { [          period,           colon                                ] };
+    key <AB10> { [           minus,      underscore                                ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
 xkb_symbols "type4" {
 
     name[Group1]="Italy - Sun type 4";
@@ -85,10 +115,12 @@
     key <LCTL> { [ Caps_Lock            ] };
     key <CAPS> { [ Control_L            ] };
  
+	include "level3(ralt_switch)"
+
 };
 
  
-partial default alphanumeric_keys
+partial alphanumeric_keys
 xkb_symbols "type5" {
 
     name[Group1]="Italy - Sun type 5";
@@ -97,34 +129,37 @@
     key <AE09> { [ 9,      parenright,  braceright                 ] };
     key <BKSL> { [ ugrave, section,     asciitilde                 ] };
 
+	include "level3(ralt_switch)"
+
 };
  
 
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Italy - Sun type 6";
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "it(nodeadkeys)"
+};
 
-    key <LSGT> { [            less,         greater                                ] };
-    key <TLDE> { [       backslash,             bar                                ] };
-    key <AE02> { [               2,        quotedbl                                ] };
-    key <AE03> { [               3,        sterling                                ] };
-    key <AE06> { [               6,       ampersand                                ] };
-    key <AE07> { [               7,           slash                                ] };
-    key <AE08> { [               8,       parenleft,    braceleft                  ] };     
-    key <AE09> { [               9,      parenright,   braceright                  ] };     
-    key <AE10> { [               0,           equal                                ] };
-    key <AE11> { [      apostrophe,        question,        grave                  ] };     
-    key <AE12> { [          igrave,     asciicircum                                ] };
-    key <AD03> { [               e,               E,     EuroSign                  ] };
-    key <AD11> { [          egrave,          eacute,  bracketleft,  dead_abovering ] };
-    key <AD12> { [            plus,        asterisk, bracketright                  ] };      
-    key <BKSL> { [          ugrave,         section,   asciitilde                  ] };
-    key <AC10> { [          ograve,        ccedilla,           at                  ] };      
-    key <AC11> { [          agrave,          degree,   numbersign                  ] };
-    key <AB08> { [           comma,       semicolon                                ] };
-    key <AB09> { [          period,           colon                                ] };
-    key <AB10> { [           minus,      underscore                                ] };
 
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "it(mac)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "it(geo)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "it(olpc)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/it(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/kr	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/kr	Fri Jan 08 10:51:10 2010 +0900
@@ -1,4 +1,3 @@
-// $XdotOrg: $
 //
 // Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 //
@@ -50,6 +49,22 @@
 // CDDL HEADER END
 //
 
+// Korean layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+
+    // A few keys are different
+    key <ALGR> { [ Hangul                       ]       };
+    key <COMP> { [ Hangul_Hanja                 ]       };
+    key <KANA> { [ Hangul                       ]       };
+    key <EISU> { [ Hangul_Hanja                 ]       };
+    key <BKSL> { [ backslash, bar,  brokenbar   ]       };
+
+        include "level3(ralt_switch)"
+
+};
+
+
 // Korean layout for a Type 4 Sun keyboard
 xkb_symbols "type4" {
 
@@ -59,6 +74,8 @@
     key <RALT> { [ Linefeed		]			};
     key <COMP> { [ Hangul_Hanja		]			};
 
+	include "level3(ralt_switch)"
+
 };
 
 // Korean layout for a Type 5 Sun keyboard
@@ -69,16 +86,37 @@
     key <COMP> { [ Hangul_Hanja		]				  };
     key <BKSL> { [ backslash, bar,  brokenbar			] };
 
-};
-
-// Korean layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar,  brokenbar			] };
+	include "level3(ralt_switch)"
 
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "kr106" {
+	include "kr(kr106)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "kr104" {
+	include "kr(kr104)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "koreankeys" {
+	include "kr(koreankeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "koreankeys_raltctl" {
+	include "kr(koreankeys_raltctl)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/kr(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/lt	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,150 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Lithuania - Sun type 6";
+
+
+
+    key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };
+    key <AE01>  { [   aogonek,      Aogonek,	1,      exclam ]    };
+    key <AE02>  { [    ccaron,       Ccaron,	2,          at ]    };
+    key <AE03>  { [   eogonek,      Eogonek,	3,  numbersign ]    };
+    key <AE04>  { [ eabovedot,    Eabovedot,	4,      dollar ]    };
+    key <AE05>  { [   iogonek,      Iogonek,	5,     percent ]    };
+    key <AE06>  { [    scaron,       Scaron,	6, asciicircum ]    };
+    key <AE07>  { [   uogonek,      Uogonek,	7,   ampersand ]    };
+    key <AE08>  { [   umacron,      Umacron,	8,    asterisk ]    };
+    key <AE09>  { [  doublelowquotemark,  parenleft,	9,  parenleft ]    };
+    key <AE10>  { [ leftdoublequotemark, parenright,	0, parenright ]    };
+    key <AE11>  { [     minus,   underscore,	backslash, questiondown ]  };
+    key <AE12>  { [    zcaron,       Zcaron,	equal,         plus ]  };
+
+    key <AD01>  { [         q,          Q,	at,  Greek_OMEGA ] };
+    key <AD02>  { [         w,          W,	lstroke,      Lstroke ] };
+    key <AD03>  { [         e,          E,	EuroSign               ] };
+    key <AD04>  { [         r,          R,	paragraph,   registered ] };
+    key <AD05>  { [         t,          T,	tslash,       Tslash ] };
+    key <AD06>  { [         y,          Y,	leftarrow,          yen ] };
+    key <AD07>  { [         u,          U,	downarrow,      uparrow ] };
+    key <AD08>  { [         i,          I,	rightarrow,     idotless ] };
+    key <AD09>  { [         o,          O,	oslash,     Ooblique ] };
+    key <AD10>  { [         p,          P,	thorn,        THORN ] };
+    key <AD11>  { [  bracketleft,  braceleft,	dead_diaeresis, dead_abovering ] };
+    key <AD12>  { [ bracketright, braceright,	dead_tilde,    dead_macron ] };
+
+    key <AC01>  { [         a,          A,	ae,           AE ] };
+    key <AC02>  { [         s,          S,	ssharp,      section ] };
+    key <AC03>  { [         d,          D,	eth,          ETH ] };
+    key <AC04>  { [         f,          F,	dstroke,  ordfeminine ] };
+    key <AC05>  { [         g,          G,	eng,          ENG ] };
+    key <AC06>  { [         h,          H,	hstroke,      Hstroke ] };
+    key <AC07>  { [         j,          J ] 				    };
+    key <AC08>  { [         k,          K,	kra,    ampersand ] };
+    key <AC09>  { [         l,          L,	lstroke,      Lstroke ] };
+    key <AC10>  { [  semicolon,     colon,	dead_acute, dead_doubleacute ] };
+    key <AC11>  { [ apostrophe,  quotedbl,	dead_circumflex,  dead_caron ] };
+    key <LSGT>  { [  backslash,       bar,	dead_grave,   dead_breve ] };
+
+    key <BKSL>  { [ backslash,        bar,	dead_grave,   dead_breve ] };
+    key <AB01>  { [         z,          Z,	guillemotleft,        less ] };
+    key <AB02>  { [         x,          X,	guillemotright,    greater ] };
+    key <AB03>  { [         c,          C,	cent,    copyright ] };
+    key <AB04>  { [         v,          V,	leftdoublequotemark, leftsinglequotemark ]   };
+    key <AB05>  { [         b,          B,	rightdoublequotemark, rightsinglequotemark ] };
+    key <AB06>  { [         n,          N ]     };
+    key <AB07>  { [         m,          M,	mu,    masculine ] };
+    key <AB08>  { [     comma,       less,	ampersand,     multiply ] };
+    key <AB09>  { [    period,    greater,	periodcentered,   division ] };
+    key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "us" {
+	include "lt(us)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "std" {
+	include "lt(std)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "ibm" {
+	include "lt(ibm)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "lekp" {
+	include "lt(lekp)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "lekpa" {
+	include "lt(lekpa)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "balticplus" {
+	include "lt(balticplus)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lt(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/lv	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,134 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Latvia - Sun type 6";
+
+
+   key <TLDE> { [          grave,    asciitilde,	acute,    asciitilde ] };
+   key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
+   key <AE02> { [              2,            at,	twosuperior,     oneeighth ] };
+   key <AE03> { [              3,    numbersign,	threesuperior,      sterling ] };
+   key <AE04> { [              4,        dollar,	EuroSign,          cent ] };
+   key <AE05> { [              5,       percent,	onehalf,  threeeighths ] };
+   key <AE06> { [              6,   asciicircum,	threequarters,   fiveeighths ] };
+   key <AE07> { [              7,     ampersand,	braceleft,  seveneighths ] };
+   key <AE08> { [              8,      asterisk,	bracketleft,     trademark ] };
+   key <AE09> { [              9,     parenleft,	bracketright,     plusminus ] };
+   key <AE10> { [              0,    parenright,	braceright,        degree ] };
+   key <AE11> { [          minus,    underscore,	backslash,  questiondown ] };
+   key <AE12> { [          equal,          plus,	endash,        emdash ] };
+
+   key <AD01> { [              q,             Q,	q,             Q ] };
+   key <AD02> { [              w,             W,	w,             W ] };
+   key <AD03> { [              e,             E,	emacron,       Emacron ] };
+   key <AD04> { [              r,             R,	rcedilla,      Rcedilla ] };
+   key <AD05> { [              t,             T,	t,             T ] };
+   key <AD06> { [              y,             Y,	y,             Y ] };
+   key <AD07> { [              u,             U,	umacron,       Umacron ] };
+   key <AD08> { [              i,             I,	imacron,       Imacron ] };
+   key <AD09> { [              o,             O,	omacron,       Omacron ] };
+   key <AD10> { [              p,             P,	p,             P ] };
+   key <AD11> { [    bracketleft,     braceleft,	guillemotleft, leftdoublequotemark ] };
+   key <AD12> { [   bracketright,    braceright,	guillemotright, rightdoublequotemark ] };
+
+   key <AC01> { [              a,             A,	amacron,       Amacron ] };
+   key <AC02> { [              s,             S,	scaron,        Scaron ] };
+   key <AC03> { [              d,             D,	d,             D ] };
+   key <AC04> { [              f,             F,	f,             F ] };
+   key <AC05> { [              g,             G,	gcedilla,      Gcedilla ] };
+   key <AC06> { [              h,             H,	h,             H ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	kcedilla,      Kcedilla ] };
+   key <AC09> { [              l,             L,	lcedilla,      Lcedilla ] };
+   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
+   key <AC11> { [     apostrophe,      quotedbl,	leftdoublequotemark, doublelowquotemark ] };
+   key <LSGT> { [      backslash,           bar,	degree,     brokenbar ] };
+
+   key <BKSL> { [      backslash,           bar,	grave,         breve ] };
+   key <AB01> { [              z,             Z,	zcaron,        Zcaron ] };
+   key <AB02> { [              x,             X,	x,             X ] };
+   key <AB03> { [              c,             C,	ccaron,        Ccaron ] };
+   key <AB04> { [              v,             V,	v,             V ] };
+   key <AB05> { [              b,             B,	b,             B ] };
+   key <AB06> { [              n,             N,	ncedilla,      Ncedilla ] };
+   key <AB07> { [              m,             M,	m,             M ] };
+   key <AB08> { [          comma,          less,	horizconnector,      multiply ] };
+   key <AB09> { [         period,       greater,	periodcentered,      division ] };
+   key <AB10> { [          slash,      question,	slash,      abovedot ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "apostrophe" {
+	include "lv(apostrophe)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "tilde" {
+	include "lv(tilde)"
+};
+
+partial alphanumeric_keys modifier_keys
+	xkb_symbols "fkey" {
+	include "lv(fkey)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lv(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/nl	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/nl	Fri Jan 08 10:51:10 2010 +0900
@@ -48,48 +48,6 @@
 // CDDL HEADER END
 //
 
-
-partial default alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Netherlands - Sun type 4";
-
-    key <BKSL> { [ at, section, notsign ]           };
-    key <BRCR> { [ backslash, bar       ]                       };
-    key <AE01> { [ 1, exclam, onesuperior ]       };
-    key <AE02> { [ 2, quotedbl, twosuperior ]       };
-    key <AE03> { [ 3, numbersign, threesuperior]      };
-    key <AE04> { [ 4, dollar, onequarter  ]       };
-    key <AE05> { [ 5, percent, onehalf     ]       };
-    key <AE06> { [ 6, ampersand, threequarters]      };
-    key <AE07> { [ 7, underscore, sterling    ]       };
-    key <AE08> { [ 8, parenleft, braceleft   ]       };
-    key <AE09> { [ 9, parenright, braceright  ]       };
-    key <AE10> { [ 0, quoteright, quoteleft   ]       };
-    key <AE11> { [ slash, question, backslash  ]        };
-    key <AE12> { [ degree, SunFA_Tilde, SunFA_Cedilla]      };
-    key <AD03> { [ e, E, EuroSign, Eacute    ]};
-    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
-    key <AD12> { [ asterisk, bar, asciitilde  ]       };
-    key <AC02> { [ S, S, ssharp      ]               };
-    key <AC10> { [ plus, plusminus      ]                       };
-    key <AC11> { [ dead_acute, dead_grave ]                    };
-    key <TLDE> { [ less, greater, asciicircum ]       };
-    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };
-    key <AB01> { [ z, Z, guillemotleft]      };
-    key <AB02> { [ x, X, guillemotright]     };
-    key <AB03> { [ c, C, cent        ]       };
-    key <AB07> { [ m, M, Greek_mu, masculine ]       };
-    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };
-    key <AB09> { [ period, colon, periodcentered, guillemotright ] };
-    key <AB10> { [ minus, equal, hyphen ]            };
-    key <CAPS> { [ SunAltGraph          ]                       };
-//    key <COMP> { [ SunCompose         ]                       };
-    key <ALGR> { [ Caps_Lock            ]                       }; 
-
-};
-
-
 default partial alphanumeric_keys
 xkb_symbols "type6" {
 
@@ -136,5 +94,80 @@
     key <AB09>  { [    period,      colon ] };
     key <AB10>  { [     minus,      equal ] };
 
+        include "level3(ralt_switch)"
+
 };
 
+
+partial alphanumeric_keys
+xkb_symbols "type4" {
+
+    name[Group1]="Netherlands - Sun type 4";
+
+    key <BKSL> { [ at, section, notsign ]           };
+    key <BRCR> { [ backslash, bar       ]                       };
+    key <AE01> { [ 1, exclam, onesuperior ]       };
+    key <AE02> { [ 2, quotedbl, twosuperior ]       };
+    key <AE03> { [ 3, numbersign, threesuperior]      };
+    key <AE04> { [ 4, dollar, onequarter  ]       };
+    key <AE05> { [ 5, percent, onehalf     ]       };
+    key <AE06> { [ 6, ampersand, threequarters]      };
+    key <AE07> { [ 7, underscore, sterling    ]       };
+    key <AE08> { [ 8, parenleft, braceleft   ]       };
+    key <AE09> { [ 9, parenright, braceright  ]       };
+    key <AE10> { [ 0, quoteright, quoteleft   ]       };
+    key <AE11> { [ slash, question, backslash  ]        };
+    key <AE12> { [ degree, SunFA_Tilde, SunFA_Cedilla]      };
+    key <AD03> { [ e, E, EuroSign, Eacute    ]};
+    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
+    key <AD12> { [ asterisk, bar, asciitilde  ]       };
+    key <AC02> { [ S, S, ssharp      ]               };
+    key <AC10> { [ plus, plusminus      ]                       };
+    key <AC11> { [ dead_acute, dead_grave ]                    };
+    key <TLDE> { [ less, greater, asciicircum ]       };
+    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };
+    key <AB01> { [ z, Z, guillemotleft]      };
+    key <AB02> { [ x, X, guillemotright]     };
+    key <AB03> { [ c, C, cent        ]       };
+    key <AB07> { [ m, M, Greek_mu, masculine ]       };
+    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };
+    key <AB09> { [ period, colon, periodcentered, guillemotright ] };
+    key <AB10> { [ minus, equal, hyphen ]            };
+    key <CAPS> { [ SunAltGraph          ]                       };
+//    key <COMP> { [ SunCompose         ]                       };
+    key <ALGR> { [ Caps_Lock            ]                       }; 
+
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "nl(std)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "nl(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "nl(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "nl(mac)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/nl(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/no	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/no	Fri Jan 08 10:51:10 2010 +0900
@@ -49,6 +49,39 @@
 //
 
 partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Norway - Sun type 6";
+
+    key <TLDE> { [             bar,         section                ] };
+    key <LSGT> { [            less,         greater                ] };
+    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };
+    key <AE02> { [               2,        quotedbl,  at           ] };
+    key <AE03> { [               3,      numbersign,  sterling     ] };
+    key <AE04> { [               4,        currency,  dollar       ] };
+    key <AE05> { [               5,         percent,  asciitilde   ] };
+    key <AE06> { [               6,       ampersand,  asciicircum  ] };
+    key <AE07> { [               7,           slash,  braceleft    ] };
+    key <AE08> { [               8,       parenleft,  bracketleft  ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,  braceright   ] };
+    key <AE11> { [            plus,        question                ] };
+    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };
+    key <AD03> { [               e,               E,  EuroSign     ] };
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };
+    key <AC10> { [          oslash,          Oslash                ] }; 
+    key <AC11> { [              ae,              AE                ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
+partial alphanumeric_keys
 xkb_symbols "type4" {
 
      name[Group1]="Norway - Sun type 4";
@@ -78,6 +111,9 @@
     key <AB10> { [ minus, underscore    ]                       };
     key <CAPS> { [ Control_L            ]                       };
 
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
+
 };
 
 
@@ -86,46 +122,60 @@
     
     name[Group1]="Norway - Sun type 5";
 
-    key <AE05> { [ 5, percent, asciitilde                  ]};
-    key <AE06> { [ 6, ampersand, asciicircum                 ]};
-    key <AE07> { [ 7, slash,  braceleft                  ]};
-    key <AE08> { [ 8, parenleft,  bracketright               ]};
-    key <AE09> { [ 9, parenright,  bracketright               ]};
-    key <AE10> { [ 0, equal,  braceright                 ]};
+    key <AE05> { [ 5, percent, asciitilde               ] };
+    key <AE06> { [ 6, ampersand, asciicircum            ] };
+    key <AE07> { [ 7, slash,  braceleft                 ] };
+    key <AE08> { [ 8, parenleft,  bracketright          ] };
+    key <AE09> { [ 9, parenright,  bracketright         ] };
+    key <AE10> { [ 0, equal,  braceright                ] };
 
-    key <BKSL> { [ quoteright, asterisk,  quoteleft                  ]};
-    key <LSGT> { [ less, greater        ]                               };
+    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };
+    key <LSGT> { [ less, greater                        ] };
+
+	include "level3(ralt_switch)"
+	include "kpdl(comma)"
 
 };
 
 
 partial alphanumeric_keys
-xkb_symbols "type6" {
+	xkb_symbols "nodeadkeys" {
+	include "no(nodeadkeys)"
+};
 
-    name[Group1]="Norway - Sun type 6";
 
-    key <TLDE> { [             bar,         section                ] };
-    key <LSGT> { [            less,         greater                ] };
-    key <BKSL> { [      apostrophe,        asterisk,  grave        ] };
-    key <AE02> { [               2,        quotedbl,  at           ] };
-    key <AE03> { [               3,      numbersign,  sterling     ] };
-    key <AE04> { [               4,        currency,  dollar       ] };
-    key <AE05> { [               5,         percent,  asciitilde   ] };
-    key <AE06> { [               6,       ampersand,  asciicircum  ] };
-    key <AE07> { [               7,           slash,  braceleft    ] };
-    key <AE08> { [               8,       parenleft,  bracketleft  ] };
-    key <AE09> { [               9,      parenright,  bracketright ] };
-    key <AE10> { [               0,           equal,  braceright   ] };
-    key <AE11> { [            plus,        question                ] };
-    key <AE12> { [       backslash,      dead_grave,  dead_acute   ] };
-    key <AD03> { [               e,               E,  EuroSign     ] };
-    key <AD11> { [           aring,           Aring                ] };
-    key <AD12> { [  dead_diaeresis, dead_circumflex,  dead_tilde   ] };
-    key <AC10> { [          oslash,          Oslash                ] }; 
-    key <AC11> { [              ae,              AE                ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "no(dvorak)"
+};
 
+
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "no(smi)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "smi_nodeadkeys" {
+	include "no(smi_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "no(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "no(mac_nodeadkeys)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/no(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/pl	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,132 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Polish Developers - Sun type 6";
+
+    key <TLDE> { [ grave, 	 asciitilde					] };
+    key <AE01> { [ 1,		 exclam						] };
+    key <AE02> { [ 2,		 at						] };
+    key <AE03> { [ 3,		 numbersign 					] };
+    key <AE04> { [ 4,		 dollar	 					] };
+    key <AE05> { [ 5,		 percent 					] };
+    key <AE06> { [ 6,		 asciicirum					] };
+    key <AE07> { [ 7,		 ampersand					] };
+    key <AE08> { [ 8,		 asterisk					] };
+    key <AE09> { [ 9,		 parenleft					] };
+    key <AE10> { [ 0,		 parenright					] };
+    key <AE11> { [ minus,	 underscore 					] };
+    key <AE12> { [ equal,	 plus	 					] };
+
+    key <AD03> { [ e,		 E,		eogonek,	Eogonek		] };       
+    key <AD07> { [ u,		 U,		EuroSign			] };
+    key <AD09> { [ o,		 O,		oacute,		Oacute		] };
+    key <AD11> { [ bracketleft,  braceleft					] };
+    key <AD12> { [ bracketright, braceright					] };
+
+    key <AC01> { [ a,		 A,		aogonek,	Aogonek		] };
+    key <AC02> { [ s,		 S,		sacute,		Sacute		] };
+    key <AC09> { [ l,		 L,		lstroke,        Lstroke		] };
+    key <AC10> { [ semicolon,	 colon						] };
+    key <AC11> { [ apostrophe,	 quotedbl 					] };
+    key <BKSL> { [ backslash,	 bar,		brokenbar			] };
+
+    key <LSGT> { [ less,         greater,       bar,            brokenbar	] };
+    key <AB01> { [ z, 		 Z,		zabovedot,	Zabovedot	] };
+    key <AB02> { [ x,		 X,		zacute,		Zacute		] };
+    key <AB03> { [ c,		 C,		cacute,		Cacute		] };
+    key <AB06> { [ n,		 N,		nacute,		Nacute		] };
+    key <AB08> { [ comma,	 less 						] };
+    key <AB09> { [ period,	 greater				 	] };
+    key <AB10> { [ slash,	 question					] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwertz" {
+	include "pl(qwertz)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "dvorak" {
+	include "pl(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak_quotes" {
+	include "pl(dvorak_quotes)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak_altquotes" {
+	include "pl(dvorak_altquotes)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "csb" {
+	include "pl(csb)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ru_phonetic_dvorak" {
+	include "pl(ru_phonetic_dvorak)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/pl(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/pt	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/pt	Fri Jan 08 10:51:10 2010 +0900
@@ -49,6 +49,38 @@
 //
 
 partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Portugal - Sun type 6";
+
+    key <LSGT> { [            less,          greater                  ] };
+    key <TLDE> { [       backslash,              bar                  ] };
+    key <AE02> { [               2,         quotedbl,              at ] };
+    key <AE03> { [               3,       numbersign,        sterling ] };
+    key <AE04> { [               4,           dollar,         section ] };
+    key <AE05> { [               5,          percent,      asciitilde ] };
+    key <AE06> { [               6,        ampersand,     asciicircum ] };
+    key <AE07> { [               7,            slash,       braceleft ] };
+    key <AE08> { [               8,        parenleft,     bracketleft ] };
+    key <AE09> { [               9,       parenright,    bracketright ] };
+    key <AE10> { [               0,            equal,      braceright ] };
+    key <AE11> { [      quoteright,         question,       quoteleft ] };
+    key <AE12> { [   guillemotleft,   guillemotright                  ] };
+    key <AD03> { [               e,                E,        EuroSign ] };
+    key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 
+    key <AD12> { [      dead_acute,       dead_grave                  ] };
+    key <BKSL> { [      dead_tilde,  dead_circumflex                  ] };
+    key <AC10> { [        ccedilla,         Ccedilla                  ] };
+    key <AC11> { [       masculine,      ordfeminine                  ] };
+    key <AB08> { [           comma,        semicolon                  ] };
+    key <AB09> { [          period,            colon                  ] };
+    key <AB10> { [           minus,       underscore                  ] };
+
+        include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
 xkb_symbols "type4" {
 
      name[Group1]="Portugal - Sun type 4";
@@ -78,6 +110,8 @@
     key <AB10> { [ minus, underscore    ]                       };
     key <CAPS> { [ Control_L            ]                       };
 
+	include "level3(ralt_switch)"
+
 };
 
 
@@ -97,36 +131,67 @@
 
     key <AD11> { [ plus, asterisk, dead_diaeresis         ]};
 
+	include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "pt(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "pt(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "pt(nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "pt(mac)"
 };
 
 
 partial alphanumeric_keys
-xkb_symbols "type6" {
+	xkb_symbols "mac_sundeadkeys" {
+	include "pt(mac_sundeadkeys)"
+};
 
-    name[Group1]="Portugal - Sun type 6";
 
-    key <LSGT> { [            less,          greater                  ] };
-    key <TLDE> { [       backslash,              bar                  ] };
-    key <AE02> { [               2,         quotedbl,              at ] };
-    key <AE03> { [               3,       numbersign,        sterling ] };
-    key <AE04> { [               4,           dollar,         section ] };
-    key <AE05> { [               5,          percent,      asciitilde ] };
-    key <AE06> { [               6,        ampersand,     asciicircum ] };
-    key <AE07> { [               7,            slash,       braceleft ] };
-    key <AE08> { [               8,        parenleft,     bracketleft ] };
-    key <AE09> { [               9,       parenright,    bracketright ] };
-    key <AE10> { [               0,            equal,      braceright ] };
-    key <AE11> { [      quoteright,         question,       quoteleft ] };
-    key <AE12> { [   guillemotleft,   guillemotright                  ] };
-    key <AD03> { [               e,                E,        EuroSign ] };
-    key <AD11> { [            plus,         asterisk,  dead_diaeresis ] }; 
-    key <AD12> { [      dead_acute,       dead_grave                  ] };
-    key <BKSL> { [      dead_tilde,  dead_circumflex                  ] };
-    key <AC10> { [        ccedilla,         Ccedilla                  ] };
-    key <AC11> { [       masculine,      ordfeminine                  ] };
-    key <AB08> { [           comma,        semicolon                  ] };
-    key <AB09> { [          period,            colon                  ] };
-    key <AB10> { [           minus,       underscore                  ] };
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "pt(mac_nodeadkeys)"
+};
 
+
+partial alphanumeric_keys
+	xkb_symbols "nativo" {
+	include "pt(nativo)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-us" {
+	include "pt(nativo-us)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-epo" {
+	include "pt(nativo-epo)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/pt(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ro	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,159 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Romania - Sun type 6";
+
+
+   key <TLDE> { [          grave,    asciitilde,	grave,    asciitilde ] };
+   key <AE01> { [              1,        exclam,	dead_tilde                ] };
+   key <AE02> { [              2,            at,	dead_caron                ] };
+   key <AE03> { [              3,    numbersign,	dead_circumflex                ] };
+   key <AE04> { [              4,        dollar,	dead_breve                ] };
+   key <AE05> { [              5,       percent,	dead_abovering                ] };
+   key <AE06> { [              6,   asciicircum,	dead_ogonek                ] };
+   key <AE07> { [              7,     ampersand,	dead_grave                ] };
+   key <AE08> { [              8,      asterisk,	dead_abovedot                ] };
+   key <AE09> { [              9,     parenleft,	dead_acute                ] };
+   key <AE10> { [              0,    parenright,	dead_doubleacute                ] };
+   key <AE11> { [          minus,    underscore,	dead_diaeresis,        endash ] };
+   key <AE12> { [          equal,          plus,	dead_cedilla,     plusminus ] };
+
+   key <AD01> { [              q,             Q,	acircumflex,   Acircumflex ] };
+   key <AD02> { [              w,             W,	ssharp                ] };
+   key <AD03> { [              e,             E,	EuroSign                ] };
+   key <AD04> { [              r,             R,	r,             R ] };
+   key <AD05> { [              t,             T,	0x100021b,     0x100021a ] };
+   key <AD06> { [              y,             Y,	y,             Y ] };
+   key <AD07> { [              u,             U,	u,             U ] };
+   key <AD08> { [              i,             I,	icircumflex,   Icircumflex ] };
+   key <AD09> { [              o,             O,	o,             O ] };
+   key <AD10> { [              p,             P,	section                ] };
+   key <AD11> { [    bracketleft,     braceleft,	doublelowquotemark              ] };
+   key <AD12> { [   bracketright,    braceright,	rightdoublequotemark            ] };
+
+   key <AC01> { [              a,             A,	abreve,        Abreve ] };
+   key <AC02> { [              s,             S,	0x1000219,     0x1000218 ] };
+   key <AC03> { [              d,             D,	dstroke,       Dstroke ] };
+   key <AC04> { [              f,             F,	f,             F ] };
+   key <AC05> { [              g,             G,	g,             G ] };
+   key <AC06> { [              h,             H,	h,             H ] };
+   key <AC07> { [              j,             J,	j,             J ] };
+   key <AC08> { [              k,             K,	k,             K ] };
+   key <AC09> { [              l,             L,	lstroke,       Lstroke ] };
+   key <AC10> { [      semicolon,         colon,	semicolon,         colon ] };
+   key <AC11> { [     apostrophe,      quotedbl,	apostrophe,      quotedbl ] };
+   key <LSGT> { [      backslash,           bar,	backslash,     brokenbar ] };
+
+   key <BKSL> { [      backslash,           bar,	backslash,     brokenbar ] };
+   key <AB01> { [              z,             Z,	z,             Z ] };
+   key <AB02> { [              x,             X,	x,             X ] };
+   key <AB03> { [              c,             C,	copyright                ] };
+   key <AB04> { [              v,             V,	v,             V ] };
+   key <AB05> { [              b,             B,	b,             B ] };
+   key <AB06> { [              n,             N,	n,             N ] };
+   key <AB07> { [              m,             M,	m,             M ] };
+   key <AB08> { [          comma,          less,	guillemotleft,      multiply ] };
+   key <AB09> { [         period,       greater,	guillemotright,      division ] };
+   key <AB10> { [          slash,      question,	slash,      question ] };
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "cedilla" {
+	include "ro(cedilla)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "ro(std)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std_cedilla" {
+	include "ro(std_cedilla)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ro(winkeys)"
+};
+
+partial
+	xkb_symbols "crh_f" {
+	include "ro(crh_f)"
+};
+
+partial
+	xkb_symbols "crh_alt" {
+	include "ro(crh_alt)"
+};
+
+partial
+	xkb_symbols "crh_dobruca1" {
+	include "ro(crh_dobruca1)"
+};
+
+partial
+	xkb_symbols "crh_dobruca2" {
+	include "ro(crh_dobruca2)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ro(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/ru	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ru	Fri Jan 08 10:51:10 2010 +0900
@@ -104,3 +104,111 @@
 
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ru(winkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "common" {
+	include "ru(common)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "ru(legacy)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ru(olpc)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter" {
+	include "ru(typewriter)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic" {
+	include "ru(phonetic)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic_winkeys" {
+	include "ru(phonetic_winkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "tt" {
+	include "ru(tt)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "os_legacy" {
+	include "ru(os_legacy)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "os_winkeys" {
+	include "ru(os_winkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "cv" {
+	include "ru(cv)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "udm" {
+	include "ru(udm)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "cv_latin" {
+	include "ru(cv_latin)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "kom" {
+	include "ru(kom)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sah" {
+	include "ru(sah)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "xal" {
+	include "ru(xal)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dos" {
+	include "ru(dos)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ru(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/se	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/se	Fri Jan 08 10:51:10 2010 +0900
@@ -48,6 +48,38 @@
 // CDDL HEADER END
 //
 
+partial alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Sweden - Sun type 6";
+
+    key <TLDE> { [         section,         onehalf                ] };
+    key <LSGT> { [            less,         greater,           bar ] };
+    key <AE02> { [               2,        quotedbl,            at ] };
+    key <AE03> { [               3,      numbersign,      sterling ] };
+    key <AE04> { [               4,        currency,        dollar ] };
+    key <AE06> { [               6,       ampersand                ] };
+    key <AE07> { [               7,           slash,     braceleft ] };
+    key <AE08> { [               8,       parenleft,   bracketleft ] };
+    key <AE09> { [               9,      parenright,  bracketright ] };
+    key <AE10> { [               0,           equal,    braceright ] };
+    key <AE11> { [            plus,        question,     backslash ] };
+    key <AE12> { [      dead_acute,      dead_grave                ] };
+    key <AD03> { [               e,               E,      EuroSign ] };
+    key <AD11> { [           aring,           Aring                ] };
+    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };
+    key <AC10> { [      odiaeresis,      Odiaeresis                ] };
+    key <AC11> { [      adiaeresis,      Adiaeresis                ] };
+    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
+    key <AB08> { [           comma,       semicolon                ] };
+    key <AB09> { [          period,           colon                ] };
+    key <AB10> { [           minus,      underscore                ] };
+
+        include "level3(ralt_switch)"
+        include "kpdl(comma)"
+
+};
+
 // Swedish layout for a Type 5/5c Sun keyboard
 xkb_symbols "type5" {
     include "sun_vndr/us(type5)+se(basic)"
@@ -242,31 +274,55 @@
 
 
 partial alphanumeric_keys
-xkb_symbols "type6" {
+	xkb_symbols "se" {
+	include "se(se)"
+};
+
 
-    name[Group1]="Sweden - Sun type 6";
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "se(nodeadkeys)"
+};
 
-    key <TLDE> { [         section,         onehalf                ] };
-    key <LSGT> { [            less,         greater,           bar ] };
-    key <AE02> { [               2,        quotedbl,            at ] };
-    key <AE03> { [               3,      numbersign,      sterling ] };
-    key <AE04> { [               4,        currency,        dollar ] };
-    key <AE06> { [               6,       ampersand                ] };
-    key <AE07> { [               7,           slash,     braceleft ] };
-    key <AE08> { [               8,       parenleft,   bracketleft ] };
-    key <AE09> { [               9,      parenright,  bracketright ] };
-    key <AE10> { [               0,           equal,    braceright ] };
-    key <AE11> { [            plus,        question,     backslash ] };
-    key <AE12> { [      dead_acute,      dead_grave                ] };
-    key <AD03> { [               e,               E,      EuroSign ] };
-    key <AD11> { [           aring,           Aring                ] };
-    key <AD12> { [  dead_diaeresis,     asciicircum,    asciitilde ] };
-    key <AC10> { [      odiaeresis,      Odiaeresis                ] };
-    key <AC11> { [      adiaeresis,      Adiaeresis                ] };
-    key <BKSL> { [      apostrophe,        asterisk,         grave ] };
-    key <AB08> { [           comma,       semicolon                ] };
-    key <AB09> { [          period,           colon                ] };
-    key <AB10> { [           minus,      underscore                ] };
 
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "se(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "rus" {
+	include "se(rus)"
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "rus_nodeadkeys" {
+	include "se(rus_nodeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "se(smi)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "se(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "svdvorak" {
+	include "se(svdvorak)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/se(type6)"
+};
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/sk	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,126 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Slovakia - Sun type 6";
+
+
+    key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};
+    key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};
+    key <AE02>  {	[	   lcaron,         2,	at,                   dead_caron  ]	};
+    key <AE03>  {	[	   scaron,         3,	numbersign,      dead_circumflex  ]	};
+    key <AE04>  {	[          ccaron,         4,	dollar,               dead_breve  ]	};
+    key <AE05>  {	[	   tcaron,         5,	percent,          dead_abovering  ]	};
+    key <AE06>  {	[	   zcaron,         6,	asciicircum,         dead_ogonek  ]	};
+    key <AE07>  {	[	   yacute,         7,	ampersand,                 grave  ]	};
+    key <AE08>  {	[	   aacute,         8,	asterisk,          dead_abovedot  ]	};
+    key <AE09>  {	[	   iacute,         9,	parenleft,            apostrophe  ]	};
+    key <AE10>  {	[	   eacute,         0,	parenright,     dead_doubleacute  ]	};
+    key <AE11>  {	[	    equal,   percent,	dead_diaeresis,        backslash  ]	};
+    key <AE12>  {	[      dead_acute, dead_caron,	dead_cedilla,              minus  ]	};
+
+    key <AD01>  {	[ 		q,         Q,	backslash		          ]	};
+    key <AD02>  {	[	        w,         W,	bar	                          ]	};
+    key <AD03>  {	[	        e,         E,	EuroSign 		          ]	};
+    key <AD06>  {       [               z,         Z                                      ]     };
+    key <AD10>  {       [               p,         P,	apostrophe   		          ]	};
+    key <AD11>  {	[	   uacute,     slash,	division		          ]	};
+    key <AD12>  {	[      adiaeresis, parenleft,	multiply      		          ]	};
+
+    key <AC02>  {	[	        s,         S,	dstroke		       		  ]	};
+    key <AC03>  {	[	        d,         D,	Dstroke			          ]	};
+    key <AC04>  {	[	        f,         F,	bracketleft		          ]	};
+    key <AC05>  {	[	        g,         G,	bracketright		          ]	};
+    key <AC08>  {	[		k,         K,	lstroke 		       	  ]	};
+    key <AC09>  {	[	        l,         L,	Lstroke		                  ]	};
+    key <AC10>  {	[     ocircumflex,  quotedbl,	dollar		                  ]	};
+    key <AC11>  {	[         section,    exclam,	ssharp   		          ]	};
+    key <AC12>  {	[          ncaron, parenright,	currency,               currency  ]	};
+    key <BKSL>  {	[          ncaron, parenright,	backslash,                   bar  ]	};
+
+    key <LSGT>  { 	[       backslash,       bar,	slash,                 brokenbar  ]     };
+    key <AB01>  {       [               y,        Y,	less  	                          ]	};
+    key <AB02>  {	[	        x,        X,	greater,              numbersign  ]	};
+    key <AB03>  {	[		c,        C,	ampersand	 	          ]	};
+    key <AB04>  {	[	        v,        V,	at 		                  ]	};
+    key <AB05>  {	[	        b,        B,	braceleft              	          ]	};
+    key <AB06>  {	[        	n,        N,	braceright              	  ]	};
+    key <AB08>  {	[  	    comma, question,	less 		                  ]	};
+    key <AB09>  {	[	   period,    colon,	greater		                  ]	};
+    key <AB10>  {	[ 	    minus, underscore,	asterisk 			  ]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bksl" {
+	include "sk(bksl)"
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "qwerty" {
+	include "sk(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_bksl" {
+	include "sk(qwerty_bksl)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/sk(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/tr	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tr	Fri Jan 08 10:51:10 2010 +0900
@@ -82,4 +82,83 @@
     key <AB09>	{ [  ccedilla,   Ccedilla               ] };
     key <AB10>	{ [    period,      colon               ] };
 
+	include "level3(ralt_switch)"
+
 };
+
+partial alphanumeric_keys
+	xkb_symbols "f" {
+	include "tr(f)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "alt" {
+	include "tr(alt)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "tr(Sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "tr(sundeadkeys)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ku" {
+	include "tr(ku)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ku_f" {
+	include "tr(ku_f)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "ku_alt" {
+	include "tr(ku_alt)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "tr(intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "tr(olpc)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "crh" {
+	include "tr(crh)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "crh_f" {
+	include "tr(crh_f)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "crh_alt" {
+	include "tr(crh_alt)"
+};
+
+partial default alphanumeric_keys
+        xkb_symbols "basic" {
+        include "sun_vndr/tr(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/tw	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/tw	Fri Jan 08 10:51:10 2010 +0900
@@ -48,6 +48,16 @@
 // CDDL HEADER END
 //
 
+// Taiwanese layout for a Type 6 Sun keyboard
+partial
+xkb_symbols "type6" {
+    // A few keys are different from US layout - only those are shown here
+    key <ALGR> { [ Henkan_Mode          ]                       };
+    key <BKSL> { [ backslash, bar,  brokenbar   ]               };
+
+};
+
+
 // Taiwanese layout for a Type 4 Sun keyboard
 
 xkb_symbols "type4" {
@@ -67,12 +77,3 @@
 
 };
 
-// Taiwanese layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-    // A few keys are different from US layout - only those are shown here
-    key <ALGR> { [ Henkan_Mode		]			};
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
-
-};
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/ua	Fri Jan 08 10:51:10 2010 +0900
@@ -0,0 +1,169 @@
+//
+// Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, provided that the above
+// copyright notice(s) and this permission notice appear in all copies of
+// the Software and that both the above copyright notice(s) and this
+// permission notice appear in supporting documentation.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+// 
+// Except as contained in this notice, the name of a copyright holder
+// shall not be used in advertising or otherwise to promote the sale, use
+// or other dealings in this Software without prior written authorization
+// of the copyright holder.
+//
+
+//
+// CDDL HEADER START
+//
+// The contents of this file are subject to the terms of the
+// Common Development and Distribution License (the "License").
+// You may not use this file except in compliance with the License.
+//
+// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
+// or http://www.opensolaris.org/os/licensing.
+// See the License for the specific language governing permissions
+// and limitations under the License.
+//
+// When distributing Covered Code, include this CDDL HEADER in each
+// file and include the License file at src/OPENSOLARIS.LICENSE.
+// If applicable, add the following below this CDDL HEADER, with the
+// fields enclosed by brackets "[]" replaced with your own identifying
+// information: Portions Copyright [yyyy] [name of copyright owner]
+//
+// CDDL HEADER END
+//
+
+
+partial default alphanumeric_keys
+xkb_symbols "type6" {
+
+    name[Group1]="Ukrainian - Sun type 6";
+
+
+    key	<TLDE> {	[	    grave,	asciitilde,	apostrophe,	asciitilde	]	};
+    key	<AE01> {	[		1,	    exclam,	1,	    exclam 	]	};
+    key	<AE02> {	[		2,		at,	2,        quotedbl	]	};
+    key	<AE03> {	[		3,	numbersign,	3,      numbersign	]	};
+    key	<AE04> {	[		4,	    dollar,	4,        asterisk	]	};
+    key	<AE05> {	[		5,	   percent,	5,	     colon	]	};
+    key	<AE06> {	[		6,     asciicircum,	6,	     comma	]	};
+    key	<AE07> {	[		7,	 ampersand,	7,	    period	]	};
+    key	<AE08> {	[		8,	  asterisk,	8,	 semicolon	]	};
+    key	<AE09> {	[		9,	 parenleft,	9,	 parenleft	]	};
+    key	<AE10> {	[		0,	parenright,	0,	parenright	]	};
+    key	<AE11> {	[	    minus,	underscore,	minus,	underscore	]	};
+    key	<AE12> {	[	    equal,	      plus,	equal,	      plus	]	};
+
+    key	<AD01> {	[		q,		 Q,	Cyrillic_shorti, Cyrillic_SHORTI	]	};
+    key	<AD02> {	[		w,		 W,	Cyrillic_tse,    Cyrillic_TSE	]	};
+    key	<AD03> {	[		e,		 E,	Cyrillic_u,	Cyrillic_U	]	};
+    key	<AD04> {	[		r,		 R,	Cyrillic_ka,     Cyrillic_KA	]	};
+    key	<AD05> {	[		t,		 T,	Cyrillic_ie,     Cyrillic_IE	]	};
+    key	<AD06> {	[		y,		 Y,	Cyrillic_en,     Cyrillic_EN	]	};
+    key	<AD07> {	[		u,		 U,	Cyrillic_ghe,    Cyrillic_GHE	]	};
+    key	<AD08> {	[		i,		 I,	Cyrillic_sha,    Cyrillic_SHA	]	};
+    key	<AD09> {	[		o,		 O,	Cyrillic_shcha,  Cyrillic_SHCHA	]	};
+    key	<AD10> {	[		p,		 P,	Cyrillic_ze,     Cyrillic_ZE	]	};
+    key	<AD11> {	[     bracketleft,	 braceleft,	Cyrillic_ha,     Cyrillic_HA	]	};
+    key	<AD12> {	[    bracketright,	braceright,	Ukrainian_yi,    Ukrainian_YI	]	};
+
+    key	<AC01> {	[		a,		 A,	Cyrillic_ef,     Cyrillic_EF	]	};
+    key	<AC02> {	[		s,		 S,	Ukrainian_i,     Ukrainian_I	]	};
+    key	<AC03> {	[		d,		 D,	Cyrillic_ve,     Cyrillic_VE	]	};
+    key	<AC04> {	[		f,		 F,	Cyrillic_a,	Cyrillic_A	]	};
+    key	<AC05> {	[		g,		 G,	Cyrillic_pe,     Cyrillic_PE	]	};
+    key	<AC06> {	[		h,		 H,	Cyrillic_er,     Cyrillic_ER	]	};
+    key	<AC07> {	[		j,		 J,	Cyrillic_o,	Cyrillic_O	]	};
+    key	<AC08> {	[		k,		 K,	Cyrillic_el,     Cyrillic_EL	]	};
+    key	<AC09> {	[		l,		 L,	Cyrillic_de,     Cyrillic_DE	]	};
+    key	<AC10> {	[	semicolon,	     colon,	Cyrillic_zhe,    Cyrillic_ZHE	]	};
+    key	<AC11> {	[      apostrophe,	  quotedbl,	Ukrainian_ie,    Ukrainian_IE	]	};
+    key <BKSL> {        [       backslash,             bar,     Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] };
+
+    key <LSGT> {        [            less,         greater,     slash,           bar            ]       };
+    key	<AB01> {	[		z,		 Z,	Cyrillic_ya,     Cyrillic_YA	]	};
+    key	<AB02> {	[		x,		 X,	Cyrillic_che,    Cyrillic_CHE	]	};
+    key	<AB03> {	[		c,		 C,	Cyrillic_es,     Cyrillic_ES	]	};
+    key	<AB04> {	[		v,		 V,	Cyrillic_em,     Cyrillic_EM	]	};
+    key	<AB06> {	[		n,		 N,	Cyrillic_te,     Cyrillic_TE	]	};
+    key	<AB05> {	[		b,		 B,	Cyrillic_i,	Cyrillic_I	]	};
+    key	<AB07> {	[		m,		 M,	Cyrillic_softsign,Cyrillic_SOFTSIGN	]	};
+    key	<AB08> {	[	    comma,	      less,	Cyrillic_be,     Cyrillic_BE	]	};
+    key	<AB09> {	[	   period,	   greater,	Cyrillic_yu,     Cyrillic_YU	]	};
+    key	<AB10> {	[	    slash,	  question,	slash,	  question	        ]	};
+
+	include "level3(ralt_switch)"
+
+};
+
+partial alphanumeric_keys 
+	xkb_symbols "legacy" {
+	include "ua(legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ua(winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter" {
+	include "ua(typewriter)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic" {
+	include "ua(phonetic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "rstu" {
+	include "ua(rstu)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "rstu_ru" {
+	include "ua(rstu_ru)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "homophonic" {
+	include "ua(homophonic)"
+};
+
+partial
+	xkb_symbols "crh" {
+	include "ua(crh)"
+};
+
+partial
+	xkb_symbols "crh_f" {
+	include "ua(crh_f)"
+};
+
+partial
+	xkb_symbols "crh_alt" {
+	include "ua(crh_alt)"
+};
+
+
+partial default alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ua(type6)"
+};
+
--- a/src/xorg/keytables/sun-src/symbols/sun_vndr/us	Thu Jan 07 18:36:35 2010 +0900
+++ b/src/xorg/keytables/sun-src/symbols/sun_vndr/us	Fri Jan 08 10:51:10 2010 +0900
@@ -399,3 +399,123 @@
     key <RCTL> { [ Multi_key		]				};
 };
 
+
+partial alphanumeric_keys
+	xkb_symbols "euro" {
+	include "us(euro)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "us(intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "alt-intl" {
+	include "us(alt-intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "us(dvorak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak-intl" {
+	include "us(dvorak-intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak-l" {
+	include "us(dvorak-l)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak-r" {
+	include "us(dvorak-r)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak-classic" {
+	include "us(dvorak-classic)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "dvp" {
+	include "us(dvp)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "rus" {
+	include "us(rus)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "us(mac)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "us(colemak)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "altgr-intl" {
+	include "us(altgr-intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "classmate" {
+	include "us(classmate)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "classmate-intl" {
+	include "us(classmate-intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "classmate-alt-intl" {
+	include "us(classmate-alt-intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "classmate-altgr-intl" {
+	include "us(classmate-altgr-intl)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "us(olpc)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "olpc2" {
+	include "us(olpc2)"
+};
+
+
+partial alphanumeric_keys
+	xkb_symbols "chr" {
+	include "us(chr)"
+};
+