Commit 076047b21acae4b430a657677de45acfddb7c055

Ran Benita 2019-10-16T10:32:19

keymap-dump: use consistent capitalization for "Group<N>" It's used capitalized everywhere except a couple places. Signed-off-by: Ran Benita <ran@unusedvar.com>

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
diff --git a/src/xkbcomp/keymap-dump.c b/src/xkbcomp/keymap-dump.c
index 775fbf5..5aea4b5 100644
--- a/src/xkbcomp/keymap-dump.c
+++ b/src/xkbcomp/keymap-dump.c
@@ -515,7 +515,7 @@ write_key(struct xkb_keymap *keymap, struct buf *buf,
                     continue;
 
                 type = key->groups[group].type;
-                write_buf(buf, "\n\t\ttype[group%u]= \"%s\",",
+                write_buf(buf, "\n\t\ttype[Group%u]= \"%s\",",
                             group + 1,
                             xkb_atom_text(keymap->ctx, type->name));
             }
@@ -609,7 +609,7 @@ write_symbols(struct xkb_keymap *keymap, struct buf *buf)
     for (group = 0; group < keymap->num_group_names; group++)
         if (keymap->group_names[group])
             write_buf(buf,
-                      "\tname[group%u]=\"%s\";\n", group + 1,
+                      "\tname[Group%u]=\"%s\";\n", group + 1,
                       xkb_atom_text(keymap->ctx, keymap->group_names[group]));
     if (group > 0)
         write_buf(buf, "\n");
diff --git a/test/data/keymaps/stringcomp.data b/test/data/keymaps/stringcomp.data
index e905a48..2fd27df 100644
--- a/test/data/keymaps/stringcomp.data
+++ b/test/data/keymaps/stringcomp.data
@@ -1073,103 +1073,103 @@ xkb_compatibility "complete_caps(caps_lock)_4_misc(assign_shift_left_action)_4_l
 };
 
 xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
-	name[group1]="English (US)";
-	name[group2]="Russian";
-	name[group3]="Canadian Multilingual";
-	name[group4]="German (Neo 2)";
+	name[Group1]="English (US)";
+	name[Group2]="Russian";
+	name[Group3]="Canadian Multilingual";
+	name[Group4]="German (Neo 2)";
 
 	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]= [ { H, E, L, L, O },     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]= [ { Y, E, S, space, T, H, I, S, space, I, S, space, D, O, G },       ampersand ],
 		symbols[Group2]= [               7,        question ],
 		symbols[Group3]= [               7,       ampersand,       braceleft,        NoSymbol,        NoSymbol,    seveneighths,        NoSymbol,        NoSymbol ],
 		symbols[Group4]= [               7,        EuroSign,             yen,           U03F0,        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 ],
@@ -1177,125 +1177,125 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 	};
 	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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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,           U03D5,          KP_Add,          KP_Add,           U211A,        NoSymbol ]
 	};
 	key <AD11>               {
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group2]= "ALPHABETIC",
+		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,           U017F, Greek_finalsmallsigma,           U2212,        NoSymbol,             jot,        NoSymbol ]
 	};
 	key <AD12>               {
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL",
+		type[Group2]= "ALPHABETIC",
+		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 ],
@@ -1304,245 +1304,245 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 	key <RTRN>               {	[          Return ] };
 	key <LCTL>               {	[       Control_L ] };
 	key <AC01>               {
-		type[group1]= "ALPHABETIC",
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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,           U0133,           U0132,        NoSymbol,        NoSymbol ],
 		symbols[Group4]= [               n,               N,       parenleft,        Greek_nu,            KP_4,            KP_4,           U2115,        NoSymbol ]
 	};
 	key <AC08>               {
-		type[group1]= "ALPHABETIC",
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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,           U0140,           U013F,        NoSymbol,        NoSymbol ],
 		symbols[Group4]= [               t,               T,           minus,       Greek_tau,            KP_6,            KP_6, partialderivative,        NoSymbol ]
 	};
 	key <AC10>               {
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group2]= "ALPHABETIC",
+		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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group2]= "ALPHABETIC",
+		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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL",
+		type[Group2]= "ALPHABETIC",
+		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,           U02DE,   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[group2]= "ALPHABETIC",
-		type[group3]= "FOUR_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "FOUR_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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,           U03F5,             Tab,             Tab,    intersection,        NoSymbol ]
 	};
 	key <AB03>               {
-		type[group1]= "ALPHABETIC",
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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,           U0149,           U266A,        NoSymbol,        NoSymbol ],
 		symbols[Group4]= [               b,               B,            plus,      Greek_beta,           colon,        NoSymbol,           U21D0,        NoSymbol ]
 	};
 	key <AB07>               {
-		type[group1]= "ALPHABETIC",
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL_SEMIALPHABETIC",
+		type[Group1]= "ALPHABETIC",
+		type[Group2]= "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[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL",
+		type[Group2]= "ALPHABETIC",
+		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,           U03F1,            KP_2,            KP_2,           U21D2,        NoSymbol ]
 	};
 	key <AB09>               {
-		type[group2]= "ALPHABETIC",
-		type[group3]= "EIGHT_LEVEL_SEMIALPHABETIC",
-		type[group4]= "EIGHT_LEVEL",
+		type[Group2]= "ALPHABETIC",
+		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,           U03D1,            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 ],
@@ -1550,8 +1550,8 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 	};
 	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 ],
@@ -1605,7 +1605,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 		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 ],
@@ -1613,98 +1613,98 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 	};
 	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 ],
@@ -1712,9 +1712,9 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 	};
 	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 ],
@@ -1734,7 +1734,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 	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 ],
@@ -1747,10 +1747,10 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 		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 ],
@@ -1761,10 +1761,10 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 		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 ],
@@ -1786,7 +1786,7 @@ xkb_symbols "pc_us_ru_2_ca(multix)_3_de(neo)_4_inet(evdev)" {
 	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 ],