From: Ian Kelling <ian@iankelling.org>
Date: Thu, 21 Oct 2021 22:17:48 +0000 (-0400)
Subject: revert intl kb variants
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=3501498f1b3c272bef3e9fb7bf642200f940576e;p=distro-setup

revert intl kb variants
---

diff --git a/model01.xkb b/model01.xkb
index 57a151f..50384bf 100644
--- a/model01.xkb
+++ b/model01.xkb
@@ -1178,207 +1178,144 @@ xkb_compatibility "complete" {
     };
 };
 
-xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
+xkb_symbols "pc+us+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
 
-    name[group1]="English (US, intl., with dead keys)";
+    name[group1]="English (US)";
 
     key  <ESC> {         [          Escape ] };
-    key <AE01> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               1,          exclam,      exclamdown,     onesuperior ]
-    };
-    key <AE02> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               2,              at,     twosuperior, dead_doubleacute ]
-    };
-    key <AE03> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               3,      numbersign,   threesuperior,     dead_macron ]
-    };
-    key <AE04> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               4,          dollar,        currency,        sterling ]
-    };
-    key <AE05> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               5,         percent,        EuroSign,    dead_cedilla ]
-    };
-    key <AE06> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               6, dead_circumflex,      onequarter,     asciicircum ]
-    };
-    key <AE07> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               7,       ampersand,         onehalf,       dead_horn ]
-    };
-    key <AE08> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               8,        asterisk,   threequarters,     dead_ogonek ]
-    };
-    key <AE09> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               9,       parenleft, leftsinglequotemark,      dead_breve ]
-    };
-    key <AE10> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               0,      parenright, rightsinglequotemark,  dead_abovering ]
-    };
-    key <AE11> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           minus,      underscore,             yen,   dead_belowdot ]
-    };
-    key <AE12> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           equal,            plus,        multiply,        division ]
-    };
+    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,       parenleft ] };
+    key <AE10> {         [               0,      parenright ] };
+    key <AE11> {         [           minus,      underscore ] };
+    key <AE12> {         [           equal,            plus ] };
     key <BKSP> {
         type= "CTRL+ALT",
         symbols[Group1]= [       BackSpace,       BackSpace,        NoSymbol,        NoSymbol, Terminate_Server ]
     };
     key  <TAB> {         [             Tab,    ISO_Left_Tab ] };
     key <AD01> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               q,               Q,      adiaeresis,      Adiaeresis ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               q,               Q ]
     };
     key <AD02> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               w,               W,           aring,           Aring ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               w,               W ]
     };
     key <AD03> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               e,               E,          eacute,          Eacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               e,               E ]
     };
     key <AD04> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               r,               R,      registered,      registered ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               r,               R ]
     };
     key <AD05> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               t,               T,           thorn,           THORN ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               t,               T ]
     };
     key <AD06> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               y,               Y,      udiaeresis,      Udiaeresis ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               y,               Y ]
     };
     key <AD07> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               u,               U,          uacute,          Uacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               u,               U ]
     };
     key <AD08> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               i,               I,          iacute,          Iacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               i,               I ]
     };
     key <AD09> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               o,               O,          oacute,          Oacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               o,               O ]
     };
     key <AD10> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               p,               P,      odiaeresis,      Odiaeresis ]
-    };
-    key <AD11> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [     bracketleft,       braceleft,   guillemotleft, leftdoublequotemark ]
-    };
-    key <AD12> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [    bracketright,      braceright,  guillemotright, rightdoublequotemark ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               p,               P ]
     };
+    key <AD11> {         [     bracketleft,       braceleft ] };
+    key <AD12> {         [    bracketright,      braceright ] };
     key <RTRN> {         [          Return ] };
     key <LCTL> {         [       Control_L ] };
     key <AC01> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               a,               A,          aacute,          Aacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               a,               A ]
     };
     key <AC02> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               s,               S,          ssharp,         section ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               s,               S ]
     };
     key <AC03> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               d,               D,             eth,             ETH ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               d,               D ]
     };
     key <AC04> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               f,               F,               f,               F ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               f,               F ]
     };
     key <AC05> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               g,               G,               g,               G ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               g,               G ]
     };
     key <AC06> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               h,               H,               h,               H ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               h,               H ]
     };
     key <AC07> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               j,               J,               j,               J ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               j,               J ]
     };
     key <AC08> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               k,               K,              oe,              OE ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               k,               K ]
     };
     key <AC09> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               l,               L,          oslash,          Oslash ]
-    };
-    key <AC10> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [       semicolon,           colon,       paragraph,          degree ]
-    };
-    key <AC11> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [      dead_acute,  dead_diaeresis,      apostrophe,        quotedbl ]
-    };
-    key <TLDE> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [      dead_grave,      dead_tilde,           grave,      asciitilde ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               l,               L ]
     };
+    key <AC10> {         [       semicolon,           colon ] };
+    key <AC11> {         [      apostrophe,        quotedbl ] };
+    key <TLDE> {         [           grave,      asciitilde ] };
     key <LFSH> {         [         Shift_L ] };
-    key <BKSL> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [       backslash,             bar,         notsign,       brokenbar ]
-    };
+    key <BKSL> {         [       backslash,             bar ] };
     key <AB01> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               z,               Z,              ae,              AE ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               z,               Z ]
     };
     key <AB02> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               x,               X,               x,               X ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               x,               X ]
     };
     key <AB03> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               c,               C,       copyright,            cent ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               c,               C ]
     };
     key <AB04> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               v,               V,               v,               V ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               v,               V ]
     };
     key <AB05> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               b,               B,               b,               B ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               b,               B ]
     };
     key <AB06> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               n,               N,          ntilde,          Ntilde ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               n,               N ]
     };
     key <AB07> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               m,               M,              mu,              mu ]
-    };
-    key <AB08> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           comma,            less,        ccedilla,        Ccedilla ]
-    };
-    key <AB09> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [          period,         greater,   dead_abovedot,      dead_caron ]
-    };
-    key <AB10> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           slash,        question,    questiondown,       dead_hook ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               m,               M ]
     };
+    key <AB08> {         [           comma,            less ] };
+    key <AB09> {         [          period,         greater ] };
+    key <AB10> {         [           slash,        question ] };
     key <RTSH> {         [         Shift_R ] };
     key <KPMU> {
         type= "CTRL+ALT",
@@ -1448,13 +1385,10 @@ xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
     key  <KP3> {         [         KP_Next,            KP_3 ] };
     key  <KP0> {         [       KP_Insert,            KP_0 ] };
     key <KPDL> {         [       KP_Delete,      KP_Decimal ] };
-    key <LVL3> {
-        type= "ONE_LEVEL",
-        symbols[Group1]= [ ISO_Level3_Shift ]
-    };
+    key <LVL3> {         [ ISO_Level3_Shift ] };
     key <LSGT> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [       backslash,             bar,       backslash,             bar ]
+        symbols[Group1]= [            less,         greater,             bar,       brokenbar ]
     };
     key <FK11> {
         type= "CTRL+ALT",
@@ -1480,8 +1414,8 @@ xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
         symbols[Group1]= [           Print,         Sys_Req ]
     };
     key <RALT> {
-        type= "ONE_LEVEL",
-        symbols[Group1]= [ ISO_Level3_Shift ]
+        type= "TWO_LEVEL",
+        symbols[Group1]= [           Alt_R,          Meta_R ]
     };
     key <LNFD> {         [        Linefeed ] };
     key <HOME> {         [            Home ] };
@@ -1621,6 +1555,7 @@ xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
     modifier_map Mod2 { <NMLK> };
     modifier_map Mod5 { <LVL3> };
     modifier_map Control { <RCTL> };
+    modifier_map Mod1 { <RALT> };
     modifier_map Mod4 { <LWIN> };
     modifier_map Mod4 { <RWIN> };
     modifier_map Mod5 { <MDSW> };
diff --git a/x2.xkb b/x2.xkb
index 98b37b5..361f60a 100644
--- a/x2.xkb
+++ b/x2.xkb
@@ -1178,207 +1178,144 @@ xkb_compatibility "complete" {
     };
 };
 
-xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
+xkb_symbols "pc+us+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
 
-    name[group1]="English (US, intl., with dead keys)";
+    name[group1]="English (US)";
 
     key  <ESC> {         [          Escape ] };
-    key <AE01> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               1,          exclam,      exclamdown,     onesuperior ]
-    };
-    key <AE02> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               2,              at,     twosuperior, dead_doubleacute ]
-    };
-    key <AE03> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               3,      numbersign,   threesuperior,     dead_macron ]
-    };
-    key <AE04> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               4,          dollar,        currency,        sterling ]
-    };
-    key <AE05> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               5,         percent,        EuroSign,    dead_cedilla ]
-    };
-    key <AE06> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               6, dead_circumflex,      onequarter,     asciicircum ]
-    };
-    key <AE07> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               7,       ampersand,         onehalf,       dead_horn ]
-    };
-    key <AE08> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               8,        asterisk,   threequarters,     dead_ogonek ]
-    };
-    key <AE09> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               9,       parenleft, leftsinglequotemark,      dead_breve ]
-    };
-    key <AE10> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [               0,      parenright, rightsinglequotemark,  dead_abovering ]
-    };
-    key <AE11> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           minus,      underscore,             yen,   dead_belowdot ]
-    };
-    key <AE12> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           equal,            plus,        multiply,        division ]
-    };
+    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,       parenleft ] };
+    key <AE10> {         [               0,      parenright ] };
+    key <AE11> {         [           minus,      underscore ] };
+    key <AE12> {         [           equal,            plus ] };
     key <BKSP> {
         type= "CTRL+ALT",
         symbols[Group1]= [       BackSpace,       BackSpace,        NoSymbol,        NoSymbol, Terminate_Server ]
     };
     key  <TAB> {         [             Tab,    ISO_Left_Tab ] };
     key <AD01> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               q,               Q,      adiaeresis,      Adiaeresis ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               q,               Q ]
     };
     key <AD02> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               w,               W,           aring,           Aring ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               w,               W ]
     };
     key <AD03> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               e,               E,          eacute,          Eacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               e,               E ]
     };
     key <AD04> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               r,               R,      registered,      registered ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               r,               R ]
     };
     key <AD05> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               t,               T,           thorn,           THORN ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               t,               T ]
     };
     key <AD06> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               y,               Y,      udiaeresis,      Udiaeresis ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               y,               Y ]
     };
     key <AD07> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               u,               U,          uacute,          Uacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               u,               U ]
     };
     key <AD08> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               i,               I,          iacute,          Iacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               i,               I ]
     };
     key <AD09> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               o,               O,          oacute,          Oacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               o,               O ]
     };
     key <AD10> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               p,               P,      odiaeresis,      Odiaeresis ]
-    };
-    key <AD11> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [     bracketleft,       braceleft,   guillemotleft, leftdoublequotemark ]
-    };
-    key <AD12> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [    bracketright,      braceright,  guillemotright, rightdoublequotemark ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               p,               P ]
     };
+    key <AD11> {         [     bracketleft,       braceleft ] };
+    key <AD12> {         [    bracketright,      braceright ] };
     key <RTRN> {         [          Return ] };
     key <LCTL> {         [       Control_L ] };
     key <AC01> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               a,               A,          aacute,          Aacute ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               a,               A ]
     };
     key <AC02> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               s,               S,          ssharp,         section ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               s,               S ]
     };
     key <AC03> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               d,               D,             eth,             ETH ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               d,               D ]
     };
     key <AC04> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               f,               F,               f,               F ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               f,               F ]
     };
     key <AC05> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               g,               G,               g,               G ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               g,               G ]
     };
     key <AC06> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               h,               H,               h,               H ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               h,               H ]
     };
     key <AC07> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               j,               J,               j,               J ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               j,               J ]
     };
     key <AC08> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               k,               K,              oe,              OE ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               k,               K ]
     };
     key <AC09> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               l,               L,          oslash,          Oslash ]
-    };
-    key <AC10> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [       semicolon,           colon,       paragraph,          degree ]
-    };
-    key <AC11> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [      dead_acute,  dead_diaeresis,      apostrophe,        quotedbl ]
-    };
-    key <TLDE> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [      dead_grave,      dead_tilde,           grave,      asciitilde ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               l,               L ]
     };
+    key <AC10> {         [       semicolon,           colon ] };
+    key <AC11> {         [      apostrophe,        quotedbl ] };
+    key <TLDE> {         [           grave,      asciitilde ] };
     key <LFSH> {         [         Shift_L ] };
-    key <BKSL> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [       backslash,             bar,         notsign,       brokenbar ]
-    };
+    key <BKSL> {         [       backslash,             bar ] };
     key <AB01> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               z,               Z,              ae,              AE ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               z,               Z ]
     };
     key <AB02> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               x,               X,               x,               X ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               x,               X ]
     };
     key <AB03> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               c,               C,       copyright,            cent ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               c,               C ]
     };
     key <AB04> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               v,               V,               v,               V ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               v,               V ]
     };
     key <AB05> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               b,               B,               b,               B ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               b,               B ]
     };
     key <AB06> {
-        type= "FOUR_LEVEL_ALPHABETIC",
-        symbols[Group1]= [               n,               N,          ntilde,          Ntilde ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               n,               N ]
     };
     key <AB07> {
-        type= "FOUR_LEVEL_SEMIALPHABETIC",
-        symbols[Group1]= [               m,               M,              mu,              mu ]
-    };
-    key <AB08> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           comma,            less,        ccedilla,        Ccedilla ]
-    };
-    key <AB09> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [          period,         greater,   dead_abovedot,      dead_caron ]
-    };
-    key <AB10> {
-        type= "FOUR_LEVEL",
-        symbols[Group1]= [           slash,        question,    questiondown,       dead_hook ]
+        type= "ALPHABETIC",
+        symbols[Group1]= [               m,               M ]
     };
+    key <AB08> {         [           comma,            less ] };
+    key <AB09> {         [          period,         greater ] };
+    key <AB10> {         [           slash,        question ] };
     key <RTSH> {         [         Shift_R ] };
     key <KPMU> {
         type= "CTRL+ALT",
@@ -1448,13 +1385,10 @@ xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
     key  <KP3> {         [         KP_Next,            KP_3 ] };
     key  <KP0> {         [       KP_Insert,            KP_0 ] };
     key <KPDL> {         [       KP_Delete,      KP_Decimal ] };
-    key <LVL3> {
-        type= "ONE_LEVEL",
-        symbols[Group1]= [ ISO_Level3_Shift ]
-    };
+    key <LVL3> {         [ ISO_Level3_Shift ] };
     key <LSGT> {
         type= "FOUR_LEVEL",
-        symbols[Group1]= [       backslash,             bar,       backslash,             bar ]
+        symbols[Group1]= [            less,         greater,             bar,       brokenbar ]
     };
     key <FK11> {
         type= "CTRL+ALT",
@@ -1480,8 +1414,8 @@ xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
         symbols[Group1]= [           Print,         Sys_Req ]
     };
     key <RALT> {
-        type= "ONE_LEVEL",
-        symbols[Group1]= [ ISO_Level3_Shift ]
+        type= "TWO_LEVEL",
+        symbols[Group1]= [           Alt_R,          Meta_R ]
     };
     key <LNFD> {         [        Linefeed ] };
     key <HOME> {         [            Home ] };
@@ -1617,6 +1551,7 @@ xkb_symbols "pc+us(intl)+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
     modifier_map Mod2 { <NMLK> };
     modifier_map Mod5 { <LVL3> };
     modifier_map Control { <RCTL> };
+    modifier_map Mod1 { <RALT> };
     modifier_map Mod4 { <LWIN> };
     modifier_map Mod4 { <RWIN> };
     modifier_map Mod5 { <MDSW> };