Reenable layer5-lock for de variants

https://bugs.freedesktop.org/show_bug.cgi?id=93763

2 files changed, 138 insertions, 138 deletions

diff --git a/symbols/de b/symbols/de
index 90910e01..c16a4624 100644
--- a/symbols/de
+++ b/symbols/de
@@ -339,7 +339,7 @@ xkb_symbols "neo_base" {
 
     // Alphanumeric-keys
     // ===============
-    key.type[Group1] = "EIGHT_LEVEL";
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
 
     // Tab as Multi_key (Compose)
     // --------------------------------------------------------------
@@ -367,7 +367,7 @@ xkb_symbols "neo_base" {
 
     // Top row
     // --------------------------------------------------------------
-    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
     key <AD01> { [ x,                       X,                       ellipsis,                Greek_xi,                Prior,                   Prior,                   Greek_XI,                NoSymbol                 ] };
     key <AD02> { [ v,                       V,                       underscore,              NoSymbol,                BackSpace,               BackSpace,               radical,                 NoSymbol                 ] };
     key <AD03> { [ l,                       L,                       bracketleft,             Greek_lambda,            Up,                      Up,                      Greek_LAMBDA,            NoSymbol                 ] };
@@ -382,12 +382,12 @@ xkb_symbols "neo_base" {
 
     key <AD11> { [ ssharp,                  U1E9E,                   U017F,                   Greek_finalsmallsigma,   U2212,                   NoSymbol,                jot,                     NoSymbol                 ] };
 
-    key.type[Group1] = "EIGHT_LEVEL";
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
     key <AD12> { [ dead_acute,              dead_tilde,              dead_stroke,             dead_psili,              dead_doubleacute,        NoSymbol,                dead_breve,              NoSymbol                 ] };
 
     // Middle row
     // --------------------------------------------------------------
-    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
     key <AC01> { [ u,                       U,                       backslash,               NoSymbol,                Home,                    Home,                    includedin,              NoSymbol                 ] };
     key <AC02> { [ i,                       I,                       slash,                   Greek_iota,              Left,                    Left,                    integral,                NoSymbol                 ] };
     key <AC03> { [ a,                       A,                       braceleft,               Greek_alpha,             Down,                    Down,                    U2200,                   NoSymbol                 ] };
@@ -412,12 +412,12 @@ xkb_symbols "neo_base" {
 
     key <AB06> { [ b,                       B,                       plus,                    Greek_beta,              colon,                   NoSymbol,                U21D0,                   NoSymbol                 ] };
     key <AB07> { [ m,                       M,                       percent,                 Greek_mu,                KP_1,                    KP_1,                    ifonlyif,                NoSymbol                 ] };
-    key.type[Group1] = "EIGHT_LEVEL";
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
     key <AB08> { [ comma,                   endash,                  quotedbl,                U03F1,                   KP_2,                    KP_2,                    U21D2,                   NoSymbol                 ] };
     key <AB09> { [ period,                  enfilledcircbullet,      apostrophe,              U03D1,                   KP_3,                    KP_3,                    U21A6,                   NoSymbol                 ] };
-    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
     key <AB10> { [ j,                       J,                       semicolon,               Greek_theta,             semicolon,               NoSymbol,                Greek_THETA,             NoSymbol                 ] };
-    key.type[Group1] = "EIGHT_LEVEL";
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
 
     // Space key
     // --------------------------------------------------------------
@@ -473,8 +473,8 @@ xkb_symbols "neo" {
     include "shift(both_capslock)"
     include "level3(caps_switch)"
     include "level3(bksl_switch)"
-    include "level5(lsgt_switch)"
-    include "level5(ralt_switch)"
+    include "level5(lsgt_switch_lock)"
+    include "level5(ralt_switch_lock)"
 };
 
 // Copied from macintosh_vndr/de
@@ -788,11 +788,11 @@ partial alphanumeric_keys
 xkb_symbols "adnw_base" {
     include "de(neo_base)"
 
-    key.type[Group1] = "EIGHT_LEVEL";
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
     key <AD04> { [ period,                  enfilledcircbullet,      NoSymbol,                U03D1,                   NoSymbol,                NoSymbol,                U21A6,                   NoSymbol                 ] };
     key <AB04> { [ comma,                   endash,                  NoSymbol,                U03F1,                   NoSymbol,                NoSymbol,                U21D2,                   NoSymbol                 ] };
 
-    key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
     key <AD01> { [ k,                       K,                       NoSymbol,                Greek_kappa,             NoSymbol,                NoSymbol,                multiply,                NoSymbol                 ] };
     key <AD02> { [ u,                       U,                       NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                includedin,              NoSymbol                 ] };
     key <AD03> { [ udiaeresis,              Udiaeresis,              NoSymbol,                NoSymbol,                NoSymbol,                NoSymbol,                union,                   NoSymbol                 ] };
@@ -835,19 +835,19 @@ xkb_symbols "adnw" {
     include "shift(both_capslock)"
     include "level3(caps_switch)"
     include "level3(bksl_switch)"
-    include "level5(lsgt_switch)"
-    include "level5(ralt_switch)"
+    include "level5(lsgt_switch_lock)"
+    include "level5(ralt_switch_lock)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "koy_base" {
     include "de(neo_base)"
 
-    key.type[Group1] = "EIGHT_LEVEL";
+    key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
     key <AD02> { [ period,                  enfilledcircbullet,      NoSymbol,                U03D1,                   NoSymbol,                NoSymbol,                U21A6,                   NoSymbol                 ] };
     key <AD04> { [ comma,                   endash,                  NoSymbol,                U03F1,                   NoSymbol,                NoSymbol,                U21D2,                   NoSymbol                 ] };
 
-    key.type[Group1] = "EIGHT_LEVEL";
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
     key <AD01> { [ k,                       K,                       NoSymbol,                Greek_kappa,             NoSymbol,                NoSymbol,                multiply,                NoSymbol                 ] };
     key <AD03> { [ o,                       O,                       NoSymbol,                Greek_omicron,           NoSymbol,                NoSymbol,                elementof,               NoSymbol                 ] };
     key <AD05> { [ y,                       Y,                       NoSymbol,                Greek_upsilon,           NoSymbol,                NoSymbol,                nabla,                   NoSymbol                 ] };
@@ -890,6 +890,6 @@ xkb_symbols "koy" {
     include "shift(both_capslock)"
     include "level3(caps_switch)"
     include "level3(bksl_switch)"
-    include "level5(lsgt_switch)"
-    include "level5(ralt_switch)"
+    include "level5(lsgt_switch_lock)"
+    include "level5(ralt_switch_lock)"
 };
diff --git a/types/level5 b/types/level5
index 1796f502..05707256 100644
--- a/types/level5
+++ b/types/level5
@@ -53,127 +53,127 @@ partial default xkb_types "default" {
 	level_name[Level8] = "X Shift Alt";
     };
 
-//    type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
-//      // Level5-Lock is implemented by using NumLock, because a real modifier
-//      // is required.
-//
-//        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
-//
-//        map[None]                                    = Level1;
-//        map[Shift]                                   = Level2;
-//        map[LevelThree]                              = Level3;
-//        map[LevelThree+Shift]                        = Level4;
-//
-//        map[LevelFive]                               = Level5;
-//        map[LevelFive+Shift]                         = Level6;
-//        map[LevelFive+LevelThree]                    = Level7;
-//        map[LevelFive+LevelThree+Shift]              = Level8;
-//
-//        map[NumLock]                                 = Level5;
-//        map[NumLock+Shift]                           = Level6;
-//        map[NumLock+LevelThree]                      = Level7;
-//        map[NumLock+LevelThree+Shift]                = Level8;
-//
-//        map[NumLock+LevelFive]                       = Level1;
-//        map[NumLock+LevelFive+Shift]                 = Level2;
-//        map[NumLock+LevelFive+LevelThree]            = Level3;
-//        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
-//
-//        // Lock has no effect
-//        map[Lock]                                    = Level1;
-//        map[Lock+Shift]                              = Level2;
-//        map[Lock+LevelThree]                         = Level3;
-//        map[Lock+LevelThree+Shift]                   = Level4;
-//
-//        map[Lock+LevelFive]                          = Level5;
-//        map[Lock+LevelFive+Shift]                    = Level6;
-//        map[Lock+LevelFive+LevelThree]               = Level7;
-//        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
-//
-//        map[Lock+NumLock]                            = Level5;
-//        map[Lock+NumLock+Shift]                      = Level6;
-//        map[Lock+NumLock+LevelThree]                 = Level7;
-//        map[Lock+NumLock+LevelThree+Shift]           = Level8;
-//
-//        map[Lock+NumLock+LevelFive]                  = Level1;
-//        map[Lock+NumLock+LevelFive+Shift]            = Level2;
-//        map[Lock+NumLock+LevelFive+LevelThree]       = Level3;
-//        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
-//
-//        preserve[LevelFive+Shift] = Shift;
-//        preserve[NumLock+Shift] = Shift;
-//        preserve[Lock+LevelFive+Shift] = Shift;
-//        preserve[Lock+NumLock+Shift] = Shift;
-//
-//        level_name[Level1] = "Base";
-//        level_name[Level2] = "Shift";
-//        level_name[Level3] = "Alt Base";
-//        level_name[Level4] = "Shift Alt";
-//        level_name[Level5] = "X";
-//        level_name[Level6] = "X Shift";
-//        level_name[Level7] = "X Alt Base";
-//        level_name[Level8] = "X Shift Alt";
-//    };
-//
-//    type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
-//      // Level5-Lock is implemented by using NumLock, because a real modifier
-//      // is required.
-//
-//        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
-//
-//        map[None]                                    = Level1;
-//        map[Shift]                                   = Level2;
-//        map[LevelThree]                              = Level3;
-//        map[LevelThree+Shift]                        = Level4;
-//
-//        map[LevelFive]                               = Level5;
-//        map[LevelFive+Shift]                         = Level6;
-//        map[LevelFive+LevelThree]                    = Level7;
-//        map[LevelFive+LevelThree+Shift]              = Level8;
-//
-//        map[NumLock]                                 = Level5;
-//        map[NumLock+Shift]                           = Level6;
-//        map[NumLock+LevelThree]                      = Level7;
-//        map[NumLock+LevelThree+Shift]                = Level8;
-//
-//        map[NumLock+LevelFive]                       = Level1;
-//        map[NumLock+LevelFive+Shift]                 = Level2;
-//        map[NumLock+LevelFive+LevelThree]            = Level3;
-//        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
-//
-//        // Lock interchanges Level1 and Level2
-//        map[Lock]                                    = Level2;
-//        map[Lock+Shift]                              = Level1;
-//        map[Lock+LevelThree]                         = Level3;
-//        map[Lock+LevelThree+Shift]                   = Level4;
-//
-//        map[Lock+LevelFive]                          = Level5;
-//        map[Lock+LevelFive+Shift]                    = Level6;
-//        map[Lock+LevelFive+LevelThree]               = Level7;
-//        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
-//
-//        map[Lock+NumLock]                            = Level5;
-//        map[Lock+NumLock+Shift]                      = Level6;
-//        map[Lock+NumLock+LevelThree]                 = Level7;
-//        map[Lock+NumLock+LevelThree+Shift]           = Level8;
-//
-//        map[Lock+NumLock+LevelFive]                  = Level2;
-//        map[Lock+NumLock+LevelFive+Shift]            = Level1;
-//        map[Lock+NumLock+LevelFive+LevelThree]       = Level4;
-//        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
-//
-//        preserve[LevelFive+Shift] = Shift;
-//        preserve[NumLock+Shift] = Shift;
-//
-//        level_name[Level1] = "Base";
-//        level_name[Level2] = "Shift";
-//        level_name[Level3] = "Alt Base";
-//        level_name[Level4] = "Shift Alt";
-//        level_name[Level5] = "X";
-//        level_name[Level6] = "X Shift";
-//        level_name[Level7] = "X Alt Base";
-//        level_name[Level8] = "X Shift Alt";
-//    };
+    type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
+      // Level5-Lock is implemented by using NumLock, because a real modifier
+      // is required.
+
+        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+
+        map[None]                                    = Level1;
+        map[Shift]                                   = Level2;
+        map[LevelThree]                              = Level3;
+        map[LevelThree+Shift]                        = Level4;
+
+        map[LevelFive]                               = Level5;
+        map[LevelFive+Shift]                         = Level6;
+        map[LevelFive+LevelThree]                    = Level7;
+        map[LevelFive+LevelThree+Shift]              = Level8;
+
+        map[NumLock]                                 = Level5;
+        map[NumLock+Shift]                           = Level6;
+        map[NumLock+LevelThree]                      = Level7;
+        map[NumLock+LevelThree+Shift]                = Level8;
+
+        map[NumLock+LevelFive]                       = Level1;
+        map[NumLock+LevelFive+Shift]                 = Level2;
+        map[NumLock+LevelFive+LevelThree]            = Level3;
+        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+
+        // Lock has no effect
+        map[Lock]                                    = Level1;
+        map[Lock+Shift]                              = Level2;
+        map[Lock+LevelThree]                         = Level3;
+        map[Lock+LevelThree+Shift]                   = Level4;
+
+        map[Lock+LevelFive]                          = Level5;
+        map[Lock+LevelFive+Shift]                    = Level6;
+        map[Lock+LevelFive+LevelThree]               = Level7;
+        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+
+        map[Lock+NumLock]                            = Level5;
+        map[Lock+NumLock+Shift]                      = Level6;
+        map[Lock+NumLock+LevelThree]                 = Level7;
+        map[Lock+NumLock+LevelThree+Shift]           = Level8;
+
+        map[Lock+NumLock+LevelFive]                  = Level1;
+        map[Lock+NumLock+LevelFive+Shift]            = Level2;
+        map[Lock+NumLock+LevelFive+LevelThree]       = Level3;
+        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
+
+        preserve[LevelFive+Shift] = Shift;
+        preserve[NumLock+Shift] = Shift;
+        preserve[Lock+LevelFive+Shift] = Shift;
+        preserve[Lock+NumLock+Shift] = Shift;
+
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+        level_name[Level5] = "X";
+        level_name[Level6] = "X Shift";
+        level_name[Level7] = "X Alt Base";
+        level_name[Level8] = "X Shift Alt";
+    };
+
+    type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
+      // Level5-Lock is implemented by using NumLock, because a real modifier
+      // is required.
+
+        modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
+
+        map[None]                                    = Level1;
+        map[Shift]                                   = Level2;
+        map[LevelThree]                              = Level3;
+        map[LevelThree+Shift]                        = Level4;
+
+        map[LevelFive]                               = Level5;
+        map[LevelFive+Shift]                         = Level6;
+        map[LevelFive+LevelThree]                    = Level7;
+        map[LevelFive+LevelThree+Shift]              = Level8;
+
+        map[NumLock]                                 = Level5;
+        map[NumLock+Shift]                           = Level6;
+        map[NumLock+LevelThree]                      = Level7;
+        map[NumLock+LevelThree+Shift]                = Level8;
+
+        map[NumLock+LevelFive]                       = Level1;
+        map[NumLock+LevelFive+Shift]                 = Level2;
+        map[NumLock+LevelFive+LevelThree]            = Level3;
+        map[NumLock+LevelFive+LevelThree+Shift]      = Level4;
+
+        // Lock interchanges Level1 and Level2
+        map[Lock]                                    = Level2;
+        map[Lock+Shift]                              = Level1;
+        map[Lock+LevelThree]                         = Level3;
+        map[Lock+LevelThree+Shift]                   = Level4;
+
+        map[Lock+LevelFive]                          = Level5;
+        map[Lock+LevelFive+Shift]                    = Level6;
+        map[Lock+LevelFive+LevelThree]               = Level7;
+        map[Lock+LevelFive+LevelThree+Shift]         = Level8;
+
+        map[Lock+NumLock]                            = Level5;
+        map[Lock+NumLock+Shift]                      = Level6;
+        map[Lock+NumLock+LevelThree]                 = Level7;
+        map[Lock+NumLock+LevelThree+Shift]           = Level8;
+
+        map[Lock+NumLock+LevelFive]                  = Level2;
+        map[Lock+NumLock+LevelFive+Shift]            = Level1;
+        map[Lock+NumLock+LevelFive+LevelThree]       = Level4;
+        map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
+
+        preserve[LevelFive+Shift] = Shift;
+        preserve[NumLock+Shift] = Shift;
+
+        level_name[Level1] = "Base";
+        level_name[Level2] = "Shift";
+        level_name[Level3] = "Alt Base";
+        level_name[Level4] = "Shift Alt";
+        level_name[Level5] = "X";
+        level_name[Level6] = "X Shift";
+        level_name[Level7] = "X Alt Base";
+        level_name[Level8] = "X Shift Alt";
+    };
 
     type "EIGHT_LEVEL_SEMIALPHABETIC" {
 	modifiers = Shift+Lock+LevelThree+LevelFive;