types: put the eight-level semialphabetic type in a more logical position

Twelve years ago, commit 39124ccf14 inserted two new eight-level types
between the plain alphabetic and semialphabetic types, but these latter
two logically belong together.  So, place them together again.

Also, improve a comment, and remove a modifier that is not used here.

1 files changed, 38 insertions, 38 deletions

diff --git a/types/level5 b/types/level5
index 51770a2..f4c6a9d 100644
--- a/types/level5
+++ b/types/level5
@@ -1,9 +1,9 @@
 default partial xkb_types "default" {
 
-    // Defines a type with an eight-level shift, similar to the three-level
+    // Defines types with an eight-level shift, similar to the three-level
     // type used for iso9995, but it lets the Shift key behave "normally".
 
-    virtual_modifiers LevelThree,ScrollLock,LevelFive;
+    virtual_modifiers  LevelThree, LevelFive;
 
     type "EIGHT_LEVEL" {
 	modifiers = Shift+LevelThree+LevelFive;
@@ -53,6 +53,42 @@ default partial xkb_types "default" {
 	level_name[Level8] = "X Shift Alt";
     };
 
+    type "EIGHT_LEVEL_SEMIALPHABETIC" {
+	modifiers = Shift+Lock+LevelThree+LevelFive;
+	map[None] = Level1;
+	map[Shift] = Level2;
+	map[Lock]  = Level2;
+	map[LevelThree] = Level3;
+	map[Shift+LevelThree] = Level4;
+	map[Lock+LevelThree] =  Level3;
+	map[Lock+Shift+LevelThree] = Level4;
+
+	map[LevelFive] = Level5;
+	map[Shift+LevelFive] = Level6;
+	map[Lock+LevelFive]  = Level6;
+	map[Lock+Shift+LevelFive]  = Level6;
+	map[LevelThree+LevelFive] = Level7;
+	map[Shift+LevelThree+LevelFive] = Level8;
+	map[Lock+LevelThree+LevelFive] =  Level7;
+	map[Lock+Shift+LevelThree+LevelFive] = Level8;
+
+	preserve[Lock+LevelThree] = Lock;
+	preserve[Lock+Shift+LevelThree] = Lock;
+	preserve[Lock+LevelFive] = Lock;
+	preserve[Lock+Shift+LevelFive] = Lock;
+	preserve[Lock+LevelThree+LevelFive] = Lock;
+	preserve[Lock+Shift+LevelThree+LevelFive] = Lock;
+
+	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 with virtual modifier NumLock.
 
@@ -173,40 +209,4 @@ default partial xkb_types "default" {
         level_name[Level8] = "X Shift Alt";
     };
 
-    type "EIGHT_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree+LevelFive;
-	map[None] = Level1;
-	map[Shift] = Level2;
-	map[Lock]  = Level2;
-	map[LevelThree] = Level3;
-	map[Shift+LevelThree] = Level4;
-	map[Lock+LevelThree] =  Level3;
-	map[Lock+Shift+LevelThree] = Level4;
-
-	map[LevelFive] = Level5;
-	map[Shift+LevelFive] = Level6;
-	map[Lock+LevelFive]  = Level6;
-	map[Lock+Shift+LevelFive]  = Level6;
-	map[LevelThree+LevelFive] = Level7;
-	map[Shift+LevelThree+LevelFive] = Level8;
-	map[Lock+LevelThree+LevelFive] =  Level7;
-	map[Lock+Shift+LevelThree+LevelFive] = Level8;
-
-	preserve[Lock+LevelThree] = Lock;
-	preserve[Lock+Shift+LevelThree] = Lock;
-	preserve[Lock+LevelFive] = Lock;
-	preserve[Lock+Shift+LevelFive] = Lock;
-	preserve[Lock+LevelThree+LevelFive] = Lock;
-	preserve[Lock+Shift+LevelThree+LevelFive] = Lock;
-
-	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";
-    };
-
 };