Repair some keymap/xfree86 mappings to symbol files. Added some non-obvious info...

diff --git a/keymap/README b/keymap/README
index bec7ed4..318089e 100644 (file)
--- a/keymap/README
+++ b/keymap/README
@@ -2,3 +2,5 @@ The keymap component provides a way how to set up one pre-defined keyboard
 mapping from a given set. It has been obsoleted by 'rules' component which
 is simplier and more flexible. The directory is preserved for compatibility
 reasons. Avoid using it if it is possible.
+
+The keymap files are in .xkm format and useful when using xkbcomp.  

diff --git a/keymap/xfree86 b/keymap/xfree86
index e4255a6..8686f78 100644 (file)
--- a/keymap/xfree86
+++ b/keymap/xfree86
@@ -5,7 +5,7 @@ default xkb_keymap "us" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "us(pc105)"           };
+    xkb_symbols                { include "pc(pc105)"           };
     xkb_geometry       { include "pc"                  };
 };
 
@@ -14,21 +14,21 @@ xkb_keymap "ar" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+ar"     };
+    xkb_symbols                { include "pc(pc105)+ara"       };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "be"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+be"     };
+    xkb_symbols                { include "pc(pc105)+be"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "bg"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+bg"     };
+    xkb_symbols                { include "pc(pc105)+bg"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 // us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
@@ -36,7 +36,7 @@ xkb_keymap "br"       {
     xkb_keycodes       { include "xfree86"     };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "us(pc101)+br"        };
+    xkb_symbols                { include "pc(pc105)+br"        };
     xkb_geometry       { include "pc(abnt2)"           };
 };
 // cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
@@ -46,98 +46,98 @@ xkb_keymap "cz" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+cz"     };
+    xkb_symbols                { include "pc(pc105)+cz"        };
     xkb_geometry       { include "pc"                  };
 };
 xkb_keymap "de"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+de"     };
+    xkb_symbols                { include "pc(pc105)+de"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "ch_de"     {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+ch(de)" };
+    xkb_symbols                { include "pc(pc105)+ch(de)"    };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "ch_fr"     {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+ch(fr)" };
+    xkb_symbols                { include "pc(pc105)+ch(fr)"    };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "dk"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+dk"     };
+    xkb_symbols                { include "pc(pc105)+dk"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "dvorak" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+dvorak" };
+    xkb_symbols                { include "pc(pc105)+us(dvorak)"};
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "en_US" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols        { include "en_US(pc105)"        };
+    xkb_symbols        { include "pc(pc105)"   };
     xkb_geometry       { include "pc"                  };
 };
 xkb_keymap "es"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+es"     };
+    xkb_symbols                { include "pc(pc105)+es"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "fr"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+fr"     };
+    xkb_symbols                { include "pc(pc105)+fr"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "fr-latin9" {
     xkb_keycodes        { include "xfree86"             };
     xkb_types           { include "default"             };
     xkb_compatibility   { include "default"             };
-    xkb_symbols         { include "en_US(pc105)+fr-latin9" };
+    xkb_symbols         { include "pc(pc105)+fr-latin9" };
     xkb_geometry        { include "pc"                 };
 };
 xkb_keymap "fr_CA"     {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+ca"     };
+    xkb_symbols                { include "pc(pc105)+ca"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "gb"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+gb"     };
+    xkb_symbols                { include "pc(pc105)+gb"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "hr"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+hr"     };
+    xkb_symbols                { include "pc(pc105)+hr"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "it"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+it"     };
+    xkb_symbols                { include "pc(pc105)+it"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "jp106" {
@@ -151,56 +151,56 @@ xkb_keymap "lt"   {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+lt"     };
+    xkb_symbols                { include "pc(pc105)+lt"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "lt_std"    {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+lt_std" };
+    xkb_symbols                { include "pc(pc105)+lt(std)"   };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "lv"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+lv"     };
+    xkb_symbols                { include "pc(pc105)+lv"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "mk" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+mk"     };
+    xkb_symbols                { include "pc(pc105)+mk"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "mt" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+mt"     };
+    xkb_symbols                { include "pc(pc105)+mt"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "no"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+no"     };
+    xkb_symbols                { include "pc(pc105)+no"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "pl"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+pl"     };
+    xkb_symbols                { include "pc(pc105)+pl"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "pt"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+pt"     };
+    xkb_symbols                { include "pc(pc105)+pt"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 // ro: additions by Cristian Gafton, <gafton@redhat.com>
@@ -208,49 +208,49 @@ xkb_keymap "ro" {
     xkb_keycodes       { include "xfree86"                     };
     xkb_types          { include "default"                     };
     xkb_compatibility  { include "default"                     };
-    xkb_symbols                { include "en_US(pc101)+ro(pc101)"      };
+    xkb_symbols                { include "pc(pc105)+ro(pc101)" };
     xkb_geometry       { include "pc(pc101)"                   };
 };
 xkb_keymap "ro_microsoft" {
     xkb_keycodes       { include "xfree86"                     };
     xkb_types          { include "default"                     };
     xkb_compatibility  { include "default"                     };
-    xkb_symbols                { include "en_US(pc105)+ro(pc105)"      };
+    xkb_symbols                { include "pc(pc105)+ro(pc105)" };
     xkb_geometry       { include "pc(pc105)"                   };
 };
 xkb_keymap "ru"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+ru"     };
+    xkb_symbols                { include "pc(pc105)+ru"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "se_FI"     {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+fi"     };
+    xkb_symbols                { include "pc(pc105)+fi"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "se_SE"     {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+se"     };
+    xkb_symbols                { include "pc(pc105)+se"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "sl" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+si"     };
+    xkb_symbols                { include "pc(pc105)+si"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "sl_SI" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+si"     };
+    xkb_symbols                { include "pc(pc105)+si"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 // cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
@@ -260,7 +260,7 @@ xkb_keymap "sk" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+sk"     };
+    xkb_symbols                { include "pc(pc105)+sk"        };
     xkb_geometry       { include "pc"                  };
 };
 // Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
@@ -268,42 +268,42 @@ xkb_keymap "syr" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+syr"    };
+    xkb_symbols                { include "pc(pc105)+syr"       };
     xkb_geometry       { include "pc(pc102)"           };
 };    
 xkb_keymap "th"        {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+th"     };
+    xkb_symbols                { include "pc(pc105)+th"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "th_tis"    {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+th_tis" };
+    xkb_symbols                { include "pc(pc105)+th(tis)"   };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "th_pat"    {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+th_pat" };
+    xkb_symbols                { include "pc(pc105)+th(pat)"   };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "tr" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+tr"     };
+    xkb_symbols                { include "pc(pc105)+tr"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "uk" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+uk)"    };
+    xkb_symbols                { include "pc(pc105)+uk)"       };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "us_flexpro" {
@@ -335,7 +335,7 @@ xkb_keymap "uz" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+uz"     };
+    xkb_symbols                { include "pc(pc105)+uz"        };
     xkb_geometry       { include "pc(pc102)"           };
 };
 
@@ -344,34 +344,34 @@ xkb_keymap "cz_qwerty" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+cz(qwerty)"     };
+    xkb_symbols                { include "pc(pc105)+cz(qwerty)"        };
     xkb_geometry       { include "pc"                  };
 };
 xkb_keymap "de_CH"     {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+ch(de)" };
+    xkb_symbols                { include "pc(pc105)+ch(de)"    };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "fr_CH"     {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+ch(fr)" };
+    xkb_symbols                { include "pc(pc105)+ch(fr)"    };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "mt_us" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+mt(us)" };
+    xkb_symbols                { include "pc(pc105)+mt(us)"    };
     xkb_geometry       { include "pc(pc102)"           };
 };
 xkb_keymap "sk_qwerty" {
     xkb_keycodes       { include "xfree86"             };
     xkb_types          { include "default"             };
     xkb_compatibility  { include "default"             };
-    xkb_symbols                { include "en_US(pc105)+sk(qwerty)"     };
+    xkb_symbols                { include "pc(pc105)+sk(qwerty)"        };
     xkb_geometry       { include "pc"                  };
 };