Hello!
As currently keybord layouts in X.org is very generic,
I'd like to add more ergonomic ones.

Can somebody apply proposed patch?


Thanks in advance!
Valdis Vitolins





diff -rupwN xkb/rules/base.lst /usr/share/X11/xkb/rules/base.lst
--- xkb/rules/base.lst	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/base.lst	2010-08-30 00:21:04.722176445 +0300
@@ -483,6 +483,9 @@
   apostrophe      lv: Apostrophe (') variant
   tilde           lv: Tilde (~) variant
   fkey            lv: F-letter (F) variant
+  adapted         lv: Adapted variant
+  ergonomic       lv: Ergonomic
+  modern          lv: Modern
   cyrillic        me: Cyrillic
   cyrillicyz      me: Cyrillic, Z and ZHE swapped
   latinunicode    me: Latin unicode
diff -rupwN xkb/rules/base.xml /usr/share/X11/xkb/rules/base.xml
--- xkb/rules/base.xml	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/base.xml	2010-08-30 00:21:33.642174444 +0300
@@ -3112,6 +3112,24 @@
             <description>F-letter (F) variant</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>adapted</name>
+            <description>Adapted variant</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <description>Ergonomic</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>modern</name>
+            <description>Modern</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff -rupwN xkb/rules/evdev.lst /usr/share/X11/xkb/rules/evdev.lst
--- xkb/rules/evdev.lst	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/evdev.lst	2010-08-30 00:21:47.212176568 +0300
@@ -483,6 +483,9 @@
   apostrophe      lv: Apostrophe (') variant
   tilde           lv: Tilde (~) variant
   fkey            lv: F-letter (F) variant
+  adapted         lv: Adapted variant
+  ergonomic       lv: Ergonomic
+  modern          lv: Modern
   cyrillic        me: Cyrillic
   cyrillicyz      me: Cyrillic, Z and ZHE swapped
   latinunicode    me: Latin unicode
diff -rupwN xkb/rules/evdev.xml /usr/share/X11/xkb/rules/evdev.xml
--- xkb/rules/evdev.xml	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/evdev.xml	2010-08-30 00:22:08.522173576 +0300
@@ -3112,6 +3112,24 @@
             <description>F-letter (F) variant</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>adapted</name>
+            <description>Adapted variant</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <description>Ergonomic</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>modern</name>
+            <description>Modern</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff -rupwN xkb/rules/xfree86.lst /usr/share/X11/xkb/rules/xfree86.lst
--- xkb/rules/xfree86.lst	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/xfree86.lst	2010-08-30 00:21:04.722176445 +0300
@@ -483,6 +483,9 @@
   apostrophe      lv: Apostrophe (') variant
   tilde           lv: Tilde (~) variant
   fkey            lv: F-letter (F) variant
+  adapted         lv: Adapted variant
+  ergonomic       lv: Ergonomic
+  modern          lv: Modern
   cyrillic        me: Cyrillic
   cyrillicyz      me: Cyrillic, Z and ZHE swapped
   latinunicode    me: Latin unicode
diff -rupwN xkb/rules/xfree86.xml /usr/share/X11/xkb/rules/xfree86.xml
--- xkb/rules/xfree86.xml	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/xfree86.xml	2010-08-30 00:21:33.642174444 +0300
@@ -3112,6 +3112,24 @@
             <description>F-letter (F) variant</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>adapted</name>
+            <description>Adapted variant</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <description>Ergonomic</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>modern</name>
+            <description>Modern</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff -rupwN xkb/rules/xorg.lst /usr/share/X11/xkb/rules/xorg.lst
--- xkb/rules/xorg.lst	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/xorg.lst	2010-08-30 00:21:04.722176445 +0300
@@ -483,6 +483,9 @@
   apostrophe      lv: Apostrophe (') variant
   tilde           lv: Tilde (~) variant
   fkey            lv: F-letter (F) variant
+  adapted         lv: Adapted variant
+  ergonomic       lv: Ergonomic
+  modern          lv: Modern
   cyrillic        me: Cyrillic
   cyrillicyz      me: Cyrillic, Z and ZHE swapped
   latinunicode    me: Latin unicode
diff -rupwN xkb/rules/xorg.xml /usr/share/X11/xkb/rules/xorg.xml
--- xkb/rules/xorg.xml	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/rules/xorg.xml	2010-08-30 00:21:33.642174444 +0300
@@ -3112,6 +3112,24 @@
             <description>F-letter (F) variant</description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>adapted</name>
+            <description>Adapted variant</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <description>Ergonomic</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>modern</name>
+            <description>Modern</description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
diff -rupwN xkb/symbols/lv /usr/share/X11/xkb/symbols/lv
--- xkb/symbols/lv	2010-04-15 15:12:00.000000000 +0300
+++ /usr/share/X11/xkb/symbols/lv	2010-09-01 18:21:49.085526415 +0300
@@ -127,3 +127,198 @@ xkb_symbols "fkey" {
 	modifier_map Mod5 { <AC04> };
 
 };
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "adapted" {
+
+    include "lv(basic)"
+
+    name[Group1]= "Latvia - Adapted variant";
+
+        key <TLDE>      {[grave, asciitilde, acute]};
+        key <AE01>      {[1, exclam, onesuperior, exclamdown]};
+        key <AE02>      {[2, Ccaron, at, twosuperior]};
+        key <AE03>      {[3, ccaron, numbersign, threesuperior]};
+        key <AE04>      {[4, Zcaron, dollar, EuroSign]};
+        key <AE05>      {[5, zcaron, percent, onehalf]};
+        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>      {[scaron, Scaron, q, Q]};
+        key <AD02>      {[emacron, Emacron, w, W]};
+        key <AD03>      {[e, E, e, E]};
+        key <AD04>      {[r, R, rcedilla, Rcedilla]};
+        key <AD05>      {[t, T, t, T]};
+        key <AD06>      {[amacron, Amacron, y, Y]};
+        key <AD07>      {[u, U, u, U]};
+        key <AD08>      {[i, I, i, I]};
+        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, g, G]};
+        key <AC06>      {[h, H, h, H]};
+        key <AC07>      {[j, J, j, J]};
+        key <AC08>      {[k, K, k, K]};
+        key <AC09>      {[l, L, l, L]};
+        key <AC10>      {[imacron, Imacron, semicolon, colon]};
+        key <AC11>      {[ISO_Level3_Latch, quotedbl, apostrophe]};
+
+        key <AB01>      {[z, Z, zcaron, Zcaron]};
+        key <AB02>      {[kcedilla, Kcedilla, x, X]};
+        key <AB03>      {[c, C, ccaron, Ccaron]};
+        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, gcedilla, less, multiply]};
+        key <AB09>      {[period, Gcedilla, greater, division]};
+        key <AB10>      {[lcedilla, Lcedilla, slash, question]};
+        key <BKSL>      {[backslash, bar, grave, breve]};
+
+        key <SPCE>      {[space, space, apostrophe]};
+
+        include "level3(ralt_switch)"
+
+        modifier_map Mod5 { <AC11> };
+
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "ergonomic" {
+
+    name[Group1]= "Latvia Ergonomic";
+
+        key <TLDE>      {[grave, asciitilde, acute]};
+        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, endash, emdash]};
+        key <AE12>      {[f, F, equal, plus]};
+
+        key <AD01>      {[umacron, Umacron, q, Q]};
+        key <AD02>      {[g, G]};
+        key <AD03>      {[j, J]};
+        key <AD04>      {[r, R, rcedilla, Rcedilla]};
+        key <AD05>      {[m, M]};
+        key <AD06>      {[v, V, w, W]};
+        key <AD07>      {[n, N, y, Y]};
+        key <AD08>      {[z, Z]};
+        key <AD09>      {[emacron, Emacron]};
+        key <AD10>      {[ccaron, Ccaron]};
+        key <AD11>      {[zcaron, Zcaron, bracketleft, braceleft]};
+        key <AD12>      {[h, H, bracketright, braceright]};
+
+        key <AC01>      {[scaron, Scaron]};
+        key <AC02>      {[u, U]};
+        key <AC03>      {[s, S]};
+        key <AC04>      {[i, I]};
+        key <AC05>      {[l, L]};
+        key <AC06>      {[d, D]};
+        key <AC07>      {[a, A]};
+        key <AC08>      {[t, T]};
+        key <AC09>      {[e, E]};
+        key <AC10>      {[c, C]};
+        key <AC11>      {[ISO_Level3_Latch, quotedbl, apostrophe, quotedbl]};
+        key <AC12>      {[kcedilla, Kcedilla, slash, backslash]};
+
+        key <LSGT>      {[gcedilla, Gcedilla]};
+        key <AB01>      {[ncedilla, Ncedilla]};
+        key <AB02>      {[b, B, x, X]};
+        key <AB03>      {[imacron, Imacron]};
+        key <AB04>      {[k, K]};
+        key <AB05>      {[p, P]};
+        key <AB06>      {[o, O, omacron, Omacron]};
+        key <AB07>      {[amacron, Amacron]};
+        key <AB08>      {[comma, semicolon, less, multiply]};
+        key <AB09>      {[period, colon, greater, division]};
+        key <AB10>      {[lcedilla, Lcedilla, question, slash]};
+
+        key <SPCE>      {[space, space, space, space]};
+
+        include "level3(ralt_switch)"
+        modifier_map Mod5 { <AC11> };
+
+};
+
+partial alphanumeric_keys modifier_keys
+xkb_symbols "modern" {
+
+    name[Group1]= "Latvia Modern";
+
+        key <TLDE>      {[grave, asciitilde, acute]};
+        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>      {[b, B]};
+        key <AD02>      {[j, J]};
+        key <AD03>      {[o, O, omacron, Omacron]};
+        key <AD04>      {[m, M]};
+        key <AD05>      {[l, L, lcedilla, Lcedilla]};
+        key <AD06>      {[z, Z, zcaron, Zcaron]};
+        key <AD07>      {[k, K, kcedilla, Kcedilla]};
+        key <AD08>      {[amacron, Amacron]};
+        key <AD09>      {[d, D]};
+        key <AD10>      {[emacron, Emacron]};
+        key <AD11>      {[bracketleft, braceleft, guillemotleft, leftdoublequotemark]};
+        key <AD12>      {[bracketright, braceright, guillemotright, rightdoublequotemark]};
+
+        key <AC01>      {[u, U, umacron, Umacron]};
+        key <AC02>      {[s, S, scaron, Scaron]};
+        key <AC03>      {[i, I]};
+        key <AC04>      {[r, R, rcedilla, Rcedilla]};
+        key <AC05>      {[v, V]};
+        key <AC06>      {[p, P]};
+        key <AC07>      {[n, N, ncedilla, Ncedilla]};
+        key <AC08>      {[a, A]};
+        key <AC09>      {[t, T]};
+        key <AC10>      {[e, E]};
+        key <AC11>      {[y, Y]};
+        key <AC12>      {[q, Q]};
+
+        key <LSGT>      {[x, X]};
+        key <AB01>      {[w, W]};
+        key <AB02>      {[f, F]};
+        key <AB03>      {[imacron, Imacron]};
+        key <AB04>      {[c, C, ccaron, Ccaron]};
+        key <AB05>      {[h, H]};
+        key <AB06>      {[g, G, gcedilla, Gcedilla]};
+        key <AB07>      {[comma, semicolon, less, multiply]};
+        key <AB08>      {[period, colon, greater, division]};
+        key <AB09>      {[ISO_Level3_Latch, quotedbl, apostrophe]};
+        key <AB10>      {[slash, question, backslash, bar]};
+                        
+        key <SPCE>      {[space, space, apostrophe]};
+        include "level3(ralt_switch)"
+        modifier_map Mod5 { <AB09> };
+
+};
+
+
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to