dump: a few more tweaks to match xkbcomp output
authorRan Benita <ran234@gmail.com>
Wed, 11 Jul 2012 13:35:43 +0000 (16:35 +0300)
committerDaniel Stone <daniel@fooishbar.org>
Thu, 12 Jul 2012 17:24:30 +0000 (18:24 +0100)
Only uppercase / lowercase stuff.

Signed-off-by: Ran Benita <ran234@gmail.com>
src/keymap-dump.c
test/data/keymaps/dump.data

index d0f8ef6..08d4979 100644 (file)
@@ -261,19 +261,19 @@ get_control_mask_text(uint32_t control_mask)
     static char ret[GET_TEXT_BUF_SIZE];
     /* FIXME: Merge with ... something ... in xkbcomp. */
     static const char *ctrl_names[] = {
-        "repeatKeys",
-        "slowKeys",
-        "bounceKeys",
-        "stickyKeys",
-        "mouseKeys",
-        "mouseKeysAccel",
-        "accessXKeys",
-        "accessXTimeout",
-        "accessXFeedback",
-        "audibleBell",
-        "overlay1",
-        "overlay2",
-        "ignoreGroupLock"
+        "RepeatKeys",
+        "SlowKeys",
+        "BounceKeys",
+        "StickyKeys",
+        "MouseKeys",
+        "MouseKeysAccel",
+        "AccessXKeys",
+        "AccessXTimeout",
+        "AccessXFeedback",
+        "AudibleBell",
+        "Overlay1",
+        "Overlay2",
+        "IgnoreGroupLock"
     };
 
     memset(ret, 0, GET_TEXT_BUF_SIZE);
@@ -637,8 +637,8 @@ write_compat(struct xkb_keymap *keymap, char **buf, size_t *size,
     write_vmods(keymap, buf, size, offset);
 
     write_buf(keymap, buf, size, offset, "\t\tinterpret.useModMapMods= AnyLevel;\n");
-    write_buf(keymap, buf, size, offset, "\t\tinterpret.repeat= false;\n");
-    write_buf(keymap, buf, size, offset, "\t\tinterpret.locking= false;\n");
+    write_buf(keymap, buf, size, offset, "\t\tinterpret.repeat= False;\n");
+    write_buf(keymap, buf, size, offset, "\t\tinterpret.locking= False;\n");
 
     darray_foreach(interp, keymap->compat->sym_interpret) {
         char keysym_name[64];
@@ -661,9 +661,9 @@ write_compat(struct xkb_keymap *keymap, char **buf, size_t *size,
        if (interp->match & XkbSI_LevelOneOnly)
            write_buf(keymap, buf, size, offset, "\t\t\tuseModMapMods=level1;\n");
        if (interp->flags & XkbSI_LockingKey)
-           write_buf(keymap, buf, size, offset, "\t\t\tlocking= true;\n");
+           write_buf(keymap, buf, size, offset, "\t\t\tlocking= True;\n");
        if (interp->flags & XkbSI_AutoRepeat)
-           write_buf(keymap, buf, size, offset, "\t\t\trepeat= true;\n");
+           write_buf(keymap, buf, size, offset, "\t\t\trepeat= True;\n");
 
        write_action(keymap, buf, size, offset, &interp->act,
                      "\t\t\taction= ", ";\n");
@@ -790,7 +790,7 @@ write_symbols(struct xkb_keymap *keymap, char **buf, size_t *size,
                             continue;
                         type = XkbKeyTypeIndex(keymap, key, group);
                         write_buf(keymap, buf, size, offset,
-                                  "\n\t\t\ttype[Group%d]= \"%s\",",
+                                  "\n\t\t\ttype[group%d]= \"%s\",",
                                   group + 1,
                                   darray_item(map->types, type).name);
                     }
index 13d04cc..8c24337 100644 (file)
@@ -597,8 +597,8 @@ xkb_keymap {
                virtual_modifiers NumLock,Alt,LevelThree,LAlt,RAlt,RControl,LControl,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper;
 
                interpret.useModMapMods= AnyLevel;
-               interpret.repeat= false;
-               interpret.locking= false;
+               interpret.repeat= False;
+               interpret.locking= False;
                interpret ISO_Level2_Latch+Exactly(Shift) {
                        useModMapMods=level1;
                        action= LatchMods(modifiers=Shift,clearLocks,latchToLock);
@@ -713,151 +713,151 @@ xkb_keymap {
                        action= LockGroup(group=2);
                };
                interpret KP_1+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=+1);
                };
                interpret KP_End+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=+1);
                };
                interpret KP_2+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+0,y=+1);
                };
                interpret KP_Down+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+0,y=+1);
                };
                interpret KP_3+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=+1);
                };
                interpret KP_Next+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=+1);
                };
                interpret KP_4+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=+0);
                };
                interpret KP_Left+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=+0);
                };
                interpret KP_6+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=+0);
                };
                interpret KP_Right+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=+0);
                };
                interpret KP_7+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=-1);
                };
                interpret KP_Home+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=-1);
                };
                interpret KP_8+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+0,y=-1);
                };
                interpret KP_Up+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+0,y=-1);
                };
                interpret KP_9+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=-1);
                };
                interpret KP_Prior+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=-1);
                };
                interpret KP_5+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= PtrBtn(button=default);
                };
                interpret KP_Begin+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= PtrBtn(button=default);
                };
                interpret KP_F2+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=1);
                };
                interpret KP_Divide+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=1);
                };
                interpret KP_F3+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=2);
                };
                interpret KP_Multiply+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=2);
                };
                interpret KP_F4+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=3);
                };
                interpret KP_Subtract+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=3);
                };
                interpret KP_Separator+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= PtrBtn(button=default,count=2);
                };
                interpret KP_Add+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= PtrBtn(button=default,count=2);
                };
                interpret KP_0+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= LockPtrBtn(button=default,affect=lock);
                };
                interpret KP_Insert+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= LockPtrBtn(button=default,affect=lock);
                };
                interpret KP_Decimal+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= LockPtrBtn(button=default,affect=unlock);
                };
                interpret KP_Delete+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= LockPtrBtn(button=default,affect=unlock);
                };
                interpret F25+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=1);
                };
                interpret F26+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SetPtrDflt(affect=button,button=2);
                };
                interpret F27+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=-1);
                };
                interpret F29+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=-1);
                };
                interpret F31+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= PtrBtn(button=default);
                };
                interpret F33+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=-1,y=+1);
                };
                interpret F35+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= MovePtr(x=+1,y=+1);
                };
                interpret Pointer_Button_Dflt+AnyOfOrNone(all) {
@@ -897,10 +897,10 @@ xkb_keymap {
                        action= LockPtrBtn(button=3,affect=both);
                };
                interpret Pointer_EnableKeys+AnyOfOrNone(all) {
-                       action= LockControls(controls=mouseKeys);
+                       action= LockControls(controls=MouseKeys);
                };
                interpret Pointer_Accelerate+AnyOfOrNone(all) {
-                       action= LockControls(controls=mouseKeysAccel);
+                       action= LockControls(controls=MouseKeysAccel);
                };
                interpret Pointer_DfltBtnNext+AnyOfOrNone(all) {
                        action= SetPtrDflt(affect=button,button=+1);
@@ -909,28 +909,28 @@ xkb_keymap {
                        action= SetPtrDflt(affect=button,button=-1);
                };
                interpret AccessX_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=accessXKeys);
+                       action= LockControls(controls=AccessXKeys);
                };
                interpret AccessX_Feedback_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=accessXFeedback);
+                       action= LockControls(controls=AccessXFeedback);
                };
                interpret RepeatKeys_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=repeatKeys);
+                       action= LockControls(controls=RepeatKeys);
                };
                interpret SlowKeys_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=slowKeys);
+                       action= LockControls(controls=SlowKeys);
                };
                interpret BounceKeys_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=bounceKeys);
+                       action= LockControls(controls=BounceKeys);
                };
                interpret StickyKeys_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=stickyKeys);
+                       action= LockControls(controls=StickyKeys);
                };
                interpret MouseKeys_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=mouseKeys);
+                       action= LockControls(controls=MouseKeys);
                };
                interpret MouseKeys_Accel_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=mouseKeysAccel);
+                       action= LockControls(controls=MouseKeysAccel);
                };
                interpret Overlay1_Enable+AnyOfOrNone(all) {
                        action= LockControls(controls=none);
@@ -939,7 +939,7 @@ xkb_keymap {
                        action= LockControls(controls=none);
                };
                interpret AudibleBell_Enable+AnyOfOrNone(all) {
-                       action= LockControls(controls=audibleBell);
+                       action= LockControls(controls=AudibleBell);
                };
                interpret Terminate_Server+AnyOfOrNone(all) {
                        action= Terminate();
@@ -972,67 +972,67 @@ xkb_keymap {
                        action= SetMods(modifiers=Shift);
                };
                interpret XF86Switch_VT_1+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=1,!same);
                };
                interpret XF86Switch_VT_2+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=2,!same);
                };
                interpret XF86Switch_VT_3+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=3,!same);
                };
                interpret XF86Switch_VT_4+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=4,!same);
                };
                interpret XF86Switch_VT_5+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=5,!same);
                };
                interpret XF86Switch_VT_6+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=6,!same);
                };
                interpret XF86Switch_VT_7+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=7,!same);
                };
                interpret XF86Switch_VT_8+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=8,!same);
                };
                interpret XF86Switch_VT_9+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=9,!same);
                };
                interpret XF86Switch_VT_10+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=10,!same);
                };
                interpret XF86Switch_VT_11+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=11,!same);
                };
                interpret XF86Switch_VT_12+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= SwitchScreen(screen=12,!same);
                };
                interpret XF86LogGrabInfo+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x47,data[3]=0x72,data[4]=0x62,data[5]=0x73,data[6]=0x00);
                };
                interpret XF86LogWindowTree+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x57,data[3]=0x69,data[4]=0x6e,data[5]=0x73,data[6]=0x00);
                };
                interpret XF86Next_VMode+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= Private(type=0x86,data[0]=0x2b,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00);
                };
                interpret XF86Prev_VMode+AnyOfOrNone(all) {
-                       repeat= true;
+                       repeat= True;
                        action= Private(type=0x86,data[0]=0x2d,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00);
                };
                interpret ISO_Level5_Shift+AnyOfOrNone(all) {
@@ -1076,7 +1076,7 @@ xkb_keymap {
                        groups= 0xfe;
                };
                indicator "Mouse Keys" {
-                       controls= mouseKeys;
+                       controls= MouseKeys;
                };
        };
 
@@ -1089,96 +1089,96 @@ xkb_keymap {
 
                key  <ESC> {    [          Escape ] };
                key <AE01> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               1,          exclam ],
                        symbols[Group2]= [               1,          exclam ],
                        symbols[Group3]= [               1,          exclam,       plusminus,        NoSymbol,     onesuperior,      exclamdown,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               1,          degree,     onesuperior,    onesubscript,     ordfeminine,        NoSymbol,         notsign,        NoSymbol ]
                };
                key <AE02> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               2,              at ],
                        symbols[Group2]= [               2,        quotedbl ],
                        symbols[Group3]= [               2,              at,              at,        NoSymbol,     twosuperior,        NoSymbol,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               2,         section,     twosuperior,    twosubscript,       masculine,        NoSymbol,       logicalor,        NoSymbol ]
                };
                key <AE03> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               3,      numbersign ],
                        symbols[Group2]= [               3,      numerosign ],
                        symbols[Group3]= [               3,      numbersign,        sterling,        NoSymbol,   threesuperior,        sterling,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               3,           U2113,   threesuperior,  threesubscript,      numerosign,        NoSymbol,      logicaland,        NoSymbol ]
                };
                key <AE04> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               4,          dollar ],
                        symbols[Group2]= [               4,       semicolon ],
                        symbols[Group3]= [               4,          dollar,            cent,        NoSymbol,      onequarter,        currency,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               4,  guillemotright,           U203a,    femalesymbol,        NoSymbol,        NoSymbol,           U22a5,        NoSymbol ]
                };
                key <AE05> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               5,         percent ],
                        symbols[Group2]= [               5,         percent ],
                        symbols[Group3]= [               5,         percent,        currency,        NoSymbol,         onehalf,    threeeighths,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               5,   guillemotleft,           U2039,      malesymbol,  periodcentered,        NoSymbol,           U2221,        NoSymbol ]
                };
                key <AE06> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               6,     asciicircum ],
                        symbols[Group2]= [               6,           colon ],
                        symbols[Group3]= [               6,        question,         notsign,        NoSymbol,   threequarters,     fiveeighths,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               6,          dollar,            cent,           U26a5,        sterling,        NoSymbol,           U2225,        NoSymbol ]
                };
                key <AE07> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               7,       ampersand ],
                        symbols[Group2]= [               7,        question ],
                        symbols[Group3]= [               7,       ampersand,       braceleft,        NoSymbol,        NoSymbol,    seveneighths,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               7,        EuroSign,             yen,            U3f0,        currency,        NoSymbol,      rightarrow,        NoSymbol ]
                };
                key <AE08> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               8,        asterisk ],
                        symbols[Group2]= [               8,        asterisk ],
                        symbols[Group3]= [               8,        asterisk,      braceright,        NoSymbol,        NoSymbol,       trademark,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               8, doublelowquotemark, singlelowquotemark,           U27e8,             Tab,    ISO_Left_Tab,           U221e,        NoSymbol ]
                };
                key <AE09> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               9,       parenleft ],
                        symbols[Group2]= [               9,       parenleft ],
                        symbols[Group3]= [               9,       parenleft,     bracketleft,        NoSymbol,        NoSymbol,       plusminus,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               9, leftdoublequotemark, leftsinglequotemark,           U27e9,       KP_Divide,       KP_Divide,       variation,        NoSymbol ]
                };
                key <AE10> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [               0,      parenright ],
                        symbols[Group2]= [               0,      parenright ],
                        symbols[Group3]= [               0,      parenright,    bracketright,        NoSymbol,        NoSymbol,        NoSymbol,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               0, rightdoublequotemark, rightsinglequotemark,   zerosubscript,     KP_Multiply,     KP_Multiply,        emptyset,        NoSymbol ]
                };
                key <AE11> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [           minus,      underscore ],
                        symbols[Group2]= [           minus,      underscore ],
                        symbols[Group3]= [           minus,      underscore,         onehalf,        NoSymbol,        NoSymbol,    questiondown,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [           minus,          emdash,        NoSymbol,           U2011,     KP_Subtract,     KP_Subtract,          hyphen,        NoSymbol ]
                };
                key <AE12> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [           equal,            plus ],
                        symbols[Group2]= [           equal,            plus ],
                        symbols[Group3]= [           equal,            plus,         notsign,        NoSymbol,    dead_cedilla,     dead_ogonek,        NoSymbol,        NoSymbol ],
@@ -1186,113 +1186,113 @@ xkb_keymap {
                };
                key <BKSP> {    [       BackSpace,       BackSpace ] };
                key  <TAB> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [             Tab,    ISO_Left_Tab ],
                        symbols[Group2]= [             Tab,    ISO_Left_Tab ],
                        symbols[Group3]= [             Tab,    ISO_Left_Tab ],
                        symbols[Group4]= [             Tab,    ISO_Left_Tab,       Multi_key, ISO_Level5_Lock,        NoSymbol,        NoSymbol,        NoSymbol, ISO_Level5_Lock ]
                };
                key <AD01> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               q,               Q ],
                        symbols[Group2]= [ Cyrillic_shorti, Cyrillic_SHORTI ],
                        symbols[Group3]= [               q,               Q,        NoSymbol,        NoSymbol,        NoSymbol,     Greek_OMEGA,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               x,               X,        ellipsis,        Greek_xi,           Prior,           Prior,        Greek_XI,        NoSymbol ]
                };
                key <AD02> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               w,               W ],
                        symbols[Group2]= [    Cyrillic_tse,    Cyrillic_TSE ],
                        symbols[Group3]= [               w,               W,        NoSymbol,        NoSymbol,         lstroke,         Lstroke,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               v,               V,      underscore,        NoSymbol,       BackSpace,       BackSpace,         radical,        NoSymbol ]
                };
                key <AD03> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               e,               E ],
                        symbols[Group2]= [      Cyrillic_u,      Cyrillic_U ],
                        symbols[Group3]= [               e,               E,        NoSymbol,        NoSymbol,              oe,              OE,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               l,               L,     bracketleft,     Greek_lamda,              Up,              Up,     Greek_LAMDA,        NoSymbol ]
                };
                key <AD04> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               r,               R ],
                        symbols[Group2]= [     Cyrillic_ka,     Cyrillic_KA ],
                        symbols[Group3]= [               r,               R,        NoSymbol,        NoSymbol,       paragraph,      registered,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               c,               C,    bracketright,       Greek_chi,          Delete,          Delete,           U2102,        NoSymbol ]
                };
                key <AD05> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               t,               T ],
                        symbols[Group2]= [     Cyrillic_ie,     Cyrillic_IE ],
                        symbols[Group3]= [               t,               T,        NoSymbol,        NoSymbol,          tslash,          Tslash,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               w,               W,     asciicircum,     Greek_omega,            Next,            Next,     Greek_OMEGA,        NoSymbol ]
                };
                key <AD06> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               y,               Y ],
                        symbols[Group2]= [     Cyrillic_en,     Cyrillic_EN ],
                        symbols[Group3]= [               y,               Y,        NoSymbol,        NoSymbol,       leftarrow,             yen,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               k,               K,          exclam,     Greek_kappa,      exclamdown,        NoSymbol,        multiply,        NoSymbol ]
                };
                key <AD07> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               u,               U ],
                        symbols[Group2]= [    Cyrillic_ghe,    Cyrillic_GHE ],
                        symbols[Group3]= [               u,               U,        NoSymbol,        NoSymbol,       downarrow,         uparrow,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               h,               H,            less,       Greek_psi,            KP_7,            KP_7,       Greek_PSI,        NoSymbol ]
                };
                key <AD08> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               i,               I ],
                        symbols[Group2]= [    Cyrillic_sha,    Cyrillic_SHA ],
                        symbols[Group3]= [               i,               I,        NoSymbol,        NoSymbol,      rightarrow,        idotless,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               g,               G,         greater,     Greek_gamma,            KP_8,            KP_8,     Greek_GAMMA,        NoSymbol ]
                };
                key <AD09> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               o,               O ],
                        symbols[Group2]= [  Cyrillic_shcha,  Cyrillic_SHCHA ],
                        symbols[Group3]= [               o,               O,         section,        NoSymbol,          oslash,          Oslash,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               f,               F,           equal,       Greek_phi,            KP_9,            KP_9,       Greek_PHI,        NoSymbol ]
                };
                key <AD10> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               p,               P ],
                        symbols[Group2]= [     Cyrillic_ze,     Cyrillic_ZE ],
                        symbols[Group3]= [               p,               P,       paragraph,        NoSymbol,           thorn,           THORN,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               q,               Q,       ampersand,            U3d5,          KP_Add,          KP_Add,           U211a,        NoSymbol ]
                };
                key <AD11> {
-                       type[Group3]= "EIGHT_LEVEL",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [     bracketleft,       braceleft ],
                        symbols[Group2]= [     Cyrillic_ha,     Cyrillic_HA ],
                        symbols[Group3]= [ dead_circumflex,  dead_diaeresis,      dead_grave,        NoSymbol,        NoSymbol,  dead_abovering,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [          ssharp,           U1e9e,            U17f, Greek_finalsmallsigma,           U2212,        NoSymbol,             jot,        NoSymbol ]
                };
                key <AD12> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [    bracketright,      braceright ],
                        symbols[Group2]= [ Cyrillic_hardsign, Cyrillic_HARDSIGN ],
                        symbols[Group3]= [        ccedilla,        Ccedilla,      asciitilde,        NoSymbol,      dead_tilde,     dead_macron,        NoSymbol,        NoSymbol ],
@@ -1301,224 +1301,224 @@ xkb_keymap {
                key <RTRN> {    [          Return ] };
                key <LCTL> {    [       Control_L ] };
                key <AC01> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               a,               A ],
                        symbols[Group2]= [     Cyrillic_ef,     Cyrillic_EF ],
                        symbols[Group3]= [               a,               A,        NoSymbol,        NoSymbol,              ae,              AE,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               u,               U,       backslash,        NoSymbol,            Home,            Home,      includedin,        NoSymbol ]
                };
                key <AC02> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               s,               S ],
                        symbols[Group2]= [   Cyrillic_yeru,   Cyrillic_YERU ],
                        symbols[Group3]= [               s,               S,        NoSymbol,        NoSymbol,          ssharp,         section,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               i,               I,           slash,      Greek_iota,            Left,            Left,        integral,        NoSymbol ]
                };
                key <AC03> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               d,               D ],
                        symbols[Group2]= [     Cyrillic_ve,     Cyrillic_VE ],
                        symbols[Group3]= [               d,               D,        NoSymbol,        NoSymbol,             eth,             ETH,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               a,               A,       braceleft,     Greek_alpha,            Down,            Down,           U2200,        NoSymbol ]
                };
                key <AC04> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               f,               F ],
                        symbols[Group2]= [      Cyrillic_a,      Cyrillic_A ],
                        symbols[Group3]= [               f,               F,        NoSymbol,        NoSymbol,        NoSymbol,     ordfeminine,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               e,               E,      braceright,   Greek_epsilon,           Right,           Right,           U2203,        NoSymbol ]
                };
                key <AC05> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               g,               G ],
                        symbols[Group2]= [     Cyrillic_pe,     Cyrillic_PE ],
                        symbols[Group3]= [               g,               G,        NoSymbol,        NoSymbol,             eng,             ENG,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               o,               O,        asterisk,   Greek_omicron,             End,             End,       elementof,        NoSymbol ]
                };
                key <AC06> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               h,               H ],
                        symbols[Group2]= [     Cyrillic_er,     Cyrillic_ER ],
                        symbols[Group3]= [               h,               H,        NoSymbol,        NoSymbol,         hstroke,         Hstroke,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               s,               S,        question,     Greek_sigma,    questiondown,        NoSymbol,     Greek_SIGMA,        NoSymbol ]
                };
                key <AC07> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               j,               J ],
                        symbols[Group2]= [      Cyrillic_o,      Cyrillic_O ],
                        symbols[Group3]= [               j,               J,        NoSymbol,        NoSymbol,            U133,            U132,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               n,               N,       parenleft,        Greek_nu,            KP_4,            KP_4,           U2115,        NoSymbol ]
                };
                key <AC08> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               k,               K ],
                        symbols[Group2]= [     Cyrillic_el,     Cyrillic_EL ],
                        symbols[Group3]= [               k,               K,        NoSymbol,        NoSymbol,             kra,        NoSymbol,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               r,               R,      parenright,       Greek_rho,            KP_5,            KP_5,           U211d,        NoSymbol ]
                };
                key <AC09> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               l,               L ],
                        symbols[Group2]= [     Cyrillic_de,     Cyrillic_DE ],
                        symbols[Group3]= [               l,               L,        NoSymbol,        NoSymbol,            U140,            U13f,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               t,               T,           minus,       Greek_tau,            KP_6,            KP_6, partialderivative,        NoSymbol ]
                };
                key <AC10> {
-                       type[Group3]= "EIGHT_LEVEL",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [       semicolon,           colon ],
                        symbols[Group2]= [    Cyrillic_zhe,    Cyrillic_ZHE ],
                        symbols[Group3]= [       semicolon,           colon,          degree,        NoSymbol,      dead_acute, dead_doubleacute,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               d,               D,           colon,     Greek_delta,    KP_Separator,           comma,     Greek_DELTA,        NoSymbol ]
                };
                key <AC11> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [      apostrophe,        quotedbl ],
                        symbols[Group2]= [      Cyrillic_e,      Cyrillic_E ],
                        symbols[Group3]= [          egrave,          Egrave,       braceleft,        NoSymbol,        NoSymbol,      dead_caron,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               y,               Y,              at,   Greek_upsilon,          period,      KP_Decimal,           nabla,        NoSymbol ]
                };
                key <TLDE> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [           grave,      asciitilde ],
                        symbols[Group2]= [     Cyrillic_io,     Cyrillic_IO ],
                        symbols[Group3]= [           slash,       backslash,             bar,        NoSymbol,        NoSymbol,          hyphen,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [ dead_circumflex,      dead_caron,           U21bb,            U2de,   dead_abovedot, Pointer_EnableKeys,   dead_belowdot,        NoSymbol ]
                };
                key <LFSH> {
-                       type[Group4]= "TWO_LEVEL",
+                       type[group4]= "TWO_LEVEL",
                        symbols[Group1]= [         Shift_L ],
                        symbols[Group2]= [         Shift_L ],
                        symbols[Group3]= [         Shift_L ],
                        symbols[Group4]= [         Shift_L,       Caps_Lock ]
                };
                key <BKSL> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "ONE_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "ONE_LEVEL",
                        symbols[Group1]= [       backslash,             bar ],
                        symbols[Group2]= [       backslash,           slash ],
                        symbols[Group3]= [          agrave,          Agrave,      braceright,        NoSymbol,        NoSymbol,      dead_breve,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [ ISO_Level3_Shift ]
                };
                key <AB01> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "FOUR_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "FOUR_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               z,               Z ],
                        symbols[Group2]= [     Cyrillic_ya,     Cyrillic_YA ],
                        symbols[Group3]= [               z,               Z,   guillemotleft,        NoSymbol ],
                        symbols[Group4]= [      udiaeresis,      Udiaeresis,      numbersign,        NoSymbol,          Escape,          Escape,           union,        NoSymbol ]
                };
                key <AB02> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "FOUR_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "FOUR_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               x,               X ],
                        symbols[Group2]= [    Cyrillic_che,    Cyrillic_CHE ],
                        symbols[Group3]= [               x,               X,  guillemotright,        NoSymbol ],
                        symbols[Group4]= [      odiaeresis,      Odiaeresis,          dollar,            U3f5,             Tab,             Tab,    intersection,        NoSymbol ]
                };
                key <AB03> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               c,               C ],
                        symbols[Group2]= [     Cyrillic_es,     Cyrillic_ES ],
                        symbols[Group3]= [               c,               C,        NoSymbol,        NoSymbol,            cent,       copyright,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [      adiaeresis,      Adiaeresis,             bar,       Greek_eta,          Insert,          Insert,           U2135,        NoSymbol ]
                };
                key <AB04> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               v,               V ],
                        symbols[Group2]= [     Cyrillic_em,     Cyrillic_EM ],
                        symbols[Group3]= [               v,               V,        NoSymbol,        NoSymbol, leftdoublequotemark, leftsinglequotemark,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               p,               P,      asciitilde,        Greek_pi,          Return,          Return,        Greek_PI,        NoSymbol ]
                };
                key <AB05> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               b,               B ],
                        symbols[Group2]= [      Cyrillic_i,      Cyrillic_I ],
                        symbols[Group3]= [               b,               B,        NoSymbol,        NoSymbol, rightdoublequotemark, rightsinglequotemark,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               z,               Z,           grave,      Greek_zeta,            Undo,            Undo,           U2124,        NoSymbol ]
                };
                key <AB06> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               n,               N ],
                        symbols[Group2]= [     Cyrillic_te,     Cyrillic_TE ],
                        symbols[Group3]= [               n,               N,        NoSymbol,        NoSymbol,            U149,           U266a,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               b,               B,            plus,      Greek_beta,           colon,        NoSymbol,           U21d0,        NoSymbol ]
                };
                key <AB07> {
-                       type[Group1]= "ALPHABETIC",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group1]= "ALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [               m,               M ],
                        symbols[Group2]= [ Cyrillic_softsign, Cyrillic_SOFTSIGN ],
                        symbols[Group3]= [               m,               M,              mu,        NoSymbol,              mu,       masculine,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               m,               M,         percent,        Greek_mu,            KP_1,            KP_1,        ifonlyif,        NoSymbol ]
                };
                key <AB08> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [           comma,            less ],
                        symbols[Group2]= [     Cyrillic_be,     Cyrillic_BE ],
                        symbols[Group3]= [           comma,      apostrophe,            less,        NoSymbol,  Greek_horizbar,        multiply,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [           comma,          endash,        quotedbl,            U3f1,            KP_2,            KP_2,           U21d2,        NoSymbol ]
                };
                key <AB09> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [          period,         greater ],
                        symbols[Group2]= [     Cyrillic_yu,     Cyrillic_YU ],
                        symbols[Group3]= [          period,        quotedbl,         greater,        NoSymbol,  periodcentered,        division,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [          period, enfilledcircbullet,      apostrophe,            U3d1,            KP_3,            KP_3,           U21a6,        NoSymbol ]
                };
                key <AB10> {
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
                        symbols[Group1]= [           slash,        question ],
                        symbols[Group2]= [          period,           comma ],
                        symbols[Group3]= [          eacute,          Eacute,      dead_acute,        NoSymbol,        NoSymbol,   dead_abovedot,        NoSymbol,        NoSymbol ],
                        symbols[Group4]= [               j,               J,       semicolon,     Greek_theta,       semicolon,        NoSymbol,     Greek_THETA,        NoSymbol ]
                };
                key <RTSH> {
-                       type[Group4]= "TWO_LEVEL",
+                       type[group4]= "TWO_LEVEL",
                        symbols[Group1]= [         Shift_R ],
                        symbols[Group2]= [         Shift_R ],
                        symbols[Group3]= [         Shift_R ],
                        symbols[Group4]= [         Shift_R,       Caps_Lock ]
                };
                key <KPMU> {
-                       type[Group1]= "CTRL+ALT",
-                       type[Group2]= "CTRL+ALT",
-                       type[Group3]= "CTRL+ALT",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group1]= "CTRL+ALT",
+                       type[group2]= "CTRL+ALT",
+                       type[group3]= "CTRL+ALT",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [     KP_Multiply,     KP_Multiply,     KP_Multiply,     KP_Multiply,   XF86ClearGrab ],
                        symbols[Group2]= [     KP_Multiply,     KP_Multiply,     KP_Multiply,     KP_Multiply,   XF86ClearGrab ],
                        symbols[Group3]= [     KP_Multiply,     KP_Multiply,     KP_Multiply,     KP_Multiply,   XF86ClearGrab ],
@@ -1526,8 +1526,8 @@ xkb_keymap {
                };
                key <LALT> {    [           Alt_L,          Meta_L ] };
                key <SPCE> {
-                       type[Group3]= "FOUR_LEVEL",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group3]= "FOUR_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [           space ],
                        symbols[Group2]= [           space ],
                        symbols[Group3]= [           space,           space,    nobreakspace,        NoSymbol ],
@@ -1581,7 +1581,7 @@ xkb_keymap {
                        symbols[Group1]= [             F10,             F10,             F10,             F10, XF86Switch_VT_10 ]
                };
                key <NMLK> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [        Num_Lock ],
                        symbols[Group2]= [        Num_Lock ],
                        symbols[Group3]= [        Num_Lock ],
@@ -1589,98 +1589,98 @@ xkb_keymap {
                };
                key <SCLK> {    [     Scroll_Lock ] };
                key  <KP7> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [         KP_Home,            KP_7 ],
                        symbols[Group2]= [         KP_Home,            KP_7 ],
                        symbols[Group3]= [         KP_Home,            KP_7 ],
                        symbols[Group4]= [            KP_7,           U2714,           U2195,           U226a,         KP_Home,         KP_Home,         upstile,        NoSymbol ]
                };
                key  <KP8> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [           KP_Up,            KP_8 ],
                        symbols[Group2]= [           KP_Up,            KP_8 ],
                        symbols[Group3]= [           KP_Up,            KP_8 ],
                        symbols[Group4]= [            KP_8,           U2718,         uparrow,    intersection,           KP_Up,           KP_Up,           U22c2,        NoSymbol ]
                };
                key  <KP9> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [        KP_Prior,            KP_9 ],
                        symbols[Group2]= [        KP_Prior,            KP_9 ],
                        symbols[Group3]= [        KP_Prior,            KP_9 ],
                        symbols[Group4]= [            KP_9,          dagger,           U20d7,           U226b,        KP_Prior,        KP_Prior,           U2309,        NoSymbol ]
                };
                key <KPSU> {
-                       type[Group1]= "CTRL+ALT",
-                       type[Group2]= "CTRL+ALT",
-                       type[Group3]= "CTRL+ALT",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group1]= "CTRL+ALT",
+                       type[group2]= "CTRL+ALT",
+                       type[group3]= "CTRL+ALT",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [     KP_Subtract,     KP_Subtract,     KP_Subtract,     KP_Subtract,  XF86Prev_VMode ],
                        symbols[Group2]= [     KP_Subtract,     KP_Subtract,     KP_Subtract,     KP_Subtract,  XF86Prev_VMode ],
                        symbols[Group3]= [     KP_Subtract,     KP_Subtract,     KP_Subtract,     KP_Subtract,  XF86Prev_VMode ],
                        symbols[Group4]= [     KP_Subtract,     KP_Subtract,           U2212,           U2296,           U2216,        NoSymbol,           U2238,        NoSymbol ]
                };
                key  <KP4> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [         KP_Left,            KP_4 ],
                        symbols[Group2]= [         KP_Left,            KP_4 ],
                        symbols[Group3]= [         KP_Left,            KP_4 ],
                        symbols[Group4]= [            KP_4,            club,       leftarrow,      includedin,         KP_Left,         KP_Left,           U2286,        NoSymbol ]
                };
                key  <KP5> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [        KP_Begin,            KP_5 ],
                        symbols[Group2]= [        KP_Begin,            KP_5 ],
                        symbols[Group3]= [        KP_Begin,            KP_5 ],
                        symbols[Group4]= [            KP_5,        EuroSign,           colon,           U22b6,        KP_Begin,        KP_Begin,           U22b7,        NoSymbol ]
                };
                key  <KP6> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [        KP_Right,            KP_6 ],
                        symbols[Group2]= [        KP_Right,            KP_6 ],
                        symbols[Group3]= [        KP_Right,            KP_6 ],
                        symbols[Group4]= [            KP_6,           U2023,      rightarrow,        includes,        KP_Right,        KP_Right,           U2287,        NoSymbol ]
                };
                key <KPAD> {
-                       type[Group1]= "CTRL+ALT",
-                       type[Group2]= "CTRL+ALT",
-                       type[Group3]= "CTRL+ALT",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group1]= "CTRL+ALT",
+                       type[group2]= "CTRL+ALT",
+                       type[group3]= "CTRL+ALT",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [          KP_Add,          KP_Add,          KP_Add,          KP_Add,  XF86Next_VMode ],
                        symbols[Group2]= [          KP_Add,          KP_Add,          KP_Add,          KP_Add,  XF86Next_VMode ],
                        symbols[Group3]= [          KP_Add,          KP_Add,          KP_Add,          KP_Add,  XF86Next_VMode ],
                        symbols[Group4]= [          KP_Add,          KP_Add,       plusminus,           U2295,           U2213,        NoSymbol,           U2214,        NoSymbol ]
                };
                key  <KP1> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [          KP_End,            KP_1 ],
                        symbols[Group2]= [          KP_End,            KP_1 ],
                        symbols[Group3]= [          KP_End,            KP_1 ],
                        symbols[Group4]= [            KP_1,         diamond,           U2194,   lessthanequal,          KP_End,          KP_End,       downstile,        NoSymbol ]
                };
                key  <KP2> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [         KP_Down,            KP_2 ],
                        symbols[Group2]= [         KP_Down,            KP_2 ],
                        symbols[Group3]= [         KP_Down,            KP_2 ],
                        symbols[Group4]= [            KP_2,           heart,       downarrow,           union,         KP_Down,         KP_Down,           U22c3,        NoSymbol ]
                };
                key  <KP3> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [         KP_Next,            KP_3 ],
                        symbols[Group2]= [         KP_Next,            KP_3 ],
                        symbols[Group3]= [         KP_Next,            KP_3 ],
                        symbols[Group4]= [            KP_3,           U2660,           U21cc, greaterthanequal,         KP_Next,         KP_Next,           U230b,        NoSymbol ]
                };
                key  <KP0> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [       KP_Insert,            KP_0 ],
                        symbols[Group2]= [       KP_Insert,            KP_0 ],
                        symbols[Group3]= [       KP_Insert,            KP_0 ],
                        symbols[Group4]= [            KP_0,           U2423,         percent,           U2030,       KP_Insert,       KP_Insert,           U25a1,        NoSymbol ]
                };
                key <KPDL> {
-                       type[Group2]= "KEYPAD",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group2]= "KEYPAD",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [       KP_Delete,      KP_Decimal ],
                        symbols[Group2]= [       KP_Delete,    KP_Separator ],
                        symbols[Group3]= [       KP_Delete,      KP_Decimal ],
@@ -1688,9 +1688,9 @@ xkb_keymap {
                };
                key <LVL3> {    [ ISO_Level3_Shift ] };
                key <LSGT> {
-                       type[Group1]= "FOUR_LEVEL",
-                       type[Group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-                       type[Group4]= "ONE_LEVEL",
+                       type[group1]= "FOUR_LEVEL",
+                       type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
+                       type[group4]= "ONE_LEVEL",
                        symbols[Group1]= [            less,         greater,             bar,       brokenbar ],
                        symbols[Group2]= [           slash,             bar ],
                        symbols[Group3]= [          ugrave,          Ugrave,          degree,        NoSymbol,        NoSymbol,       brokenbar,        NoSymbol,        NoSymbol ],
@@ -1710,7 +1710,7 @@ xkb_keymap {
                key <HKTG> {    [ Hiragana_Katakana ] };
                key <MUHE> {    [        Muhenkan ] };
                key <KPEN> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [        KP_Enter ],
                        symbols[Group2]= [        KP_Enter ],
                        symbols[Group3]= [        KP_Enter ],
@@ -1723,10 +1723,10 @@ xkb_keymap {
                        symbols[Group3]= [ ISO_Level5_Shift ]
                };
                key <KPDV> {
-                       type[Group1]= "CTRL+ALT",
-                       type[Group2]= "CTRL+ALT",
-                       type[Group3]= "CTRL+ALT",
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group1]= "CTRL+ALT",
+                       type[group2]= "CTRL+ALT",
+                       type[group3]= "CTRL+ALT",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [       KP_Divide,       KP_Divide,       KP_Divide,       KP_Divide,      XF86Ungrab ],
                        symbols[Group2]= [       KP_Divide,       KP_Divide,       KP_Divide,       KP_Divide,      XF86Ungrab ],
                        symbols[Group3]= [       KP_Divide,       KP_Divide,       KP_Divide,       KP_Divide,      XF86Ungrab ],
@@ -1737,10 +1737,10 @@ xkb_keymap {
                        symbols[Group1]= [           Print,         Sys_Req ]
                };
                key <RALT> {
-                       type[Group1]= "TWO_LEVEL",
-                       type[Group2]= "TWO_LEVEL",
-                       type[Group3]= "ONE_LEVEL",
-                       type[Group4]= "ONE_LEVEL",
+                       type[group1]= "TWO_LEVEL",
+                       type[group2]= "TWO_LEVEL",
+                       type[group3]= "ONE_LEVEL",
+                       type[group4]= "ONE_LEVEL",
                        symbols[Group1]= [           Alt_R,          Meta_R ],
                        symbols[Group2]= [           Alt_R,          Meta_R ],
                        symbols[Group3]= [ ISO_Level3_Shift ],
@@ -1762,7 +1762,7 @@ xkb_keymap {
                key <VOL+> {    [ XF86AudioRaiseVolume ] };
                key <POWR> {    [    XF86PowerOff ] };
                key <KPEQ> {
-                       type[Group4]= "EIGHT_LEVEL",
+                       type[group4]= "EIGHT_LEVEL",
                        symbols[Group1]= [        KP_Equal ],
                        symbols[Group2]= [        KP_Equal ],
                        symbols[Group3]= [        KP_Equal ],