diff --git a/common/web/types/src/consts/virtual-key-constants.ts b/common/web/types/src/consts/virtual-key-constants.ts
index 7b083241bd..ca1719f280 100644
--- a/common/web/types/src/consts/virtual-key-constants.ts
+++ b/common/web/types/src/consts/virtual-key-constants.ts
@@ -39,7 +39,7 @@ export const USVirtualKeyCodes = {
K_7:55,
K_8:56,
K_9:57,
- K_A:65,
+ K_A:65, /*34.*/
K_B:66,
K_C:67,
K_D:68,
diff --git a/developer/src/kmc-convert/src/kmc-convert-convert/inkey-to-kmn-converter.ts b/developer/src/kmc-convert/src/kmc-convert-convert/inkey-to-kmn-converter.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-convert/inkey-to-kmn-converter.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-convert/inkey-to-ldml-converter.ts b/developer/src/kmc-convert/src/kmc-convert-convert/inkey-to-ldml-converter.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-convert/inkey-to-ldml-converter.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-convert/keylayout-to-ldml-converter.ts b/developer/src/kmc-convert/src/kmc-convert-convert/keylayout-to-ldml-converter.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-convert/keylayout-to-ldml-converter.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-convert/kmn-to-ldml-converter.ts b/developer/src/kmc-convert/src/kmc-convert-convert/kmn-to-ldml-converter.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-convert/kmn-to-ldml-converter.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-convert/ldml-to-kmn-converter.ts b/developer/src/kmc-convert/src/kmc-convert-convert/ldml-to-kmn-converter.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-convert/ldml-to-kmn-converter.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-convert/msklc-to-kmn-converter.ts b/developer/src/kmc-convert/src/kmc-convert-convert/msklc-to-kmn-converter.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-convert/msklc-to-kmn-converter.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-convert/msklc-to-ldml-converter.ts b/developer/src/kmc-convert/src/kmc-convert-convert/msklc-to-ldml-converter.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-convert/msklc-to-ldml-converter.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-read/inkey-file-reader.ts b/developer/src/kmc-convert/src/kmc-convert-read/inkey-file-reader.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-read/inkey-file-reader.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-read/kmn-file-reader.ts b/developer/src/kmc-convert/src/kmc-convert-read/kmn-file-reader.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-read/kmn-file-reader.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-read/ldml-file-reader.ts b/developer/src/kmc-convert/src/kmc-convert-read/ldml-file-reader.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-read/ldml-file-reader.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/src/kmc-convert-read/msklc-file-reader.ts b/developer/src/kmc-convert/src/kmc-convert-read/msklc-file-reader.ts
deleted file mode 100644
index c27f478b68..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-read/msklc-file-reader.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-// tbd.
-
diff --git a/developer/src/kmc-convert/src/kmc-convert-write/ldml-file-writer.ts b/developer/src/kmc-convert/src/kmc-convert-write/ldml-file-writer.ts
deleted file mode 100644
index 5e1a8c0d61..0000000000
--- a/developer/src/kmc-convert/src/kmc-convert-write/ldml-file-writer.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-// tbd.
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/keylayout.dtd b/developer/src/kmc-convert/test/data/tests-keylayout-kmn/keylayout.dtd
similarity index 100%
rename from developer/src/kmc-convert/test/data/tests-xkb-kmn/keylayout.dtd
rename to developer/src/kmc-convert/test/data/tests-keylayout-kmn/keylayout.dtd
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test copy.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test copy.keylayout
deleted file mode 100644
index 76fd91b4db..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test copy.keylayout
+++ /dev/null
@@ -1,596 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C0.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C0.keylayout
deleted file mode 100644
index d8c49ea62a..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C0.keylayout
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C0_C1_C2_C3.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C0_C1_C2_C3.keylayout
deleted file mode 100644
index f1f3ebab1e..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C0_C1_C2_C3.keylayout
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C1.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C1.keylayout
deleted file mode 100644
index e785e58ca1..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C1.keylayout
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C2.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C2.keylayout
deleted file mode 100644
index aa6b60997b..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C2.keylayout
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C2_several.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C2_several.keylayout
deleted file mode 100644
index d51369c934..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C2_several.keylayout
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C3.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C3.keylayout
deleted file mode 100644
index 6275a230bb..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C3.keylayout
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C3_several.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C3_several.keylayout
deleted file mode 100644
index 7fff380f2c..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_C3_several.keylayout
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_ExtraWarning.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_ExtraWarning.keylayout
deleted file mode 100644
index 0d36b2a5fe..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_ExtraWarning.keylayout
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_ambiguous_keys.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_ambiguous_keys.keylayout
deleted file mode 100644
index 97778e876e..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_ambiguous_keys.keylayout
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_characters.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_characters.keylayout
deleted file mode 100644
index 2aae8f1bb4..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_characters.keylayout
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_differentAmountOfKeysInBehaviours.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_differentAmountOfKeysInBehaviours.keylayout
deleted file mode 100644
index 4b770866cd..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_differentAmountOfKeysInBehaviours.keylayout
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_differentEncodings.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_differentEncodings.keylayout
deleted file mode 100644
index c526f8c2af..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_differentEncodings.keylayout
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_keys.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_keys.keylayout
deleted file mode 100644
index a5cb09069b..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_keys.keylayout
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_missing_keycode.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_missing_keycode.keylayout
deleted file mode 100644
index 39da3300f4..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_missing_keycode.keylayout
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_missing_keys.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_missing_keys.keylayout
deleted file mode 100644
index b367056143..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_duplicate_missing_keys.keylayout
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_maxKeyCode.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_maxKeyCode.keylayout
deleted file mode 100644
index a5f9e178b9..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_maxKeyCode.keylayout
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages.keylayout
deleted file mode 100644
index 5d8d1b8682..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages.keylayout
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_controlCharacter.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_controlCharacter.keylayout
deleted file mode 100644
index f97abb984d..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_controlCharacter.keylayout
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_superior_C2.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_superior_C2.keylayout
deleted file mode 100644
index 3416bb5e8f..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_superior_C2.keylayout
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_superior_C3.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_superior_C3.keylayout
deleted file mode 100644
index f95afe40db..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_messages_superior_C3.keylayout
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_modifier.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_modifier.keylayout
deleted file mode 100644
index 67ccf4db63..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_modifier.keylayout
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_modifierNoCaps.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_modifierNoCaps.keylayout
deleted file mode 100644
index 9656413d7e..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_modifierNoCaps.keylayout
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeyMapThanKeyMapselectAndJisERROR.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeyMapThanKeyMapselectAndJisERROR.keylayout
deleted file mode 100644
index 13be153d75..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeyMapThanKeyMapselectAndJisERROR.keylayout
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeyMapThanKeyMapselectERROR.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeyMapThanKeyMapselectERROR.keylayout
deleted file mode 100644
index 3bd9b5ba49..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeyMapThanKeyMapselectERROR.keylayout
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeymapSelectThanKeymapERROR.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeymapSelectThanKeymapERROR.keylayout
deleted file mode 100644
index 25d178237c..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_moreKeymapSelectThanKeymapERROR.keylayout
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_nr_elements.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_nr_elements.keylayout
deleted file mode 100644
index 7a32f4b3c2..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_nr_elements.keylayout
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_onlyOneKeymap.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_onlyOneKeymap.keylayout
deleted file mode 100644
index 8f17399457..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_onlyOneKeymap.keylayout
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_undefinedAction.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_undefinedAction.keylayout
deleted file mode 100644
index 4e6f0ce802..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_undefinedAction.keylayout
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_unsupportedCharacters.keylayout b/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_unsupportedCharacters.keylayout
deleted file mode 100644
index d393b332ee..0000000000
--- a/developer/src/kmc-convert/test/data/tests-xkb-kmn/Test_unsupportedCharacters.keylayout
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/developer/src/kmc-convert/test/data/tests-xkb-kmn/de_simple b/developer/src/kmc-convert/test/data/tests-xkb-kmn/de_simple
new file mode 100644
index 0000000000..61a0b63eb7
--- /dev/null
+++ b/developer/src/kmc-convert/test/data/tests-xkb-kmn/de_simple
@@ -0,0 +1,60 @@
+// Common Latin alphabet layout
+// 0x1001E9E on key key , key , key added for testing purposes by SAB
+
+default partial
+xkb_symbols "basic" {
+
+ key { [ 1, exclam, onesuperior, exclamdown ] };
+ key { [ 2, quotedbl, twosuperior, oneeighth ] };
+ key { [ 3, section, threesuperior, sterling ] };
+ key { [ 4, dollar, onequarter, currency ] };
+ key { [ 5, percent, onehalf, threeeighths ] };
+ key { [ 6, asciicircum, threequarters, fiveeighths] };
+ key { [ 7, ampersand, braceleft, seveneighths ] };
+ key { [ 8, asterisk, bracketleft, trademark ] };
+ key { [ 9, parenleft, bracketright, plusminus ] };
+ key { [ 0, parenright, braceright, degree ] };
+ key { [ ssharp, question, backslash, 0x1001E9E ] };
+ key { [ NoSymbol, NoSymbol, NoSymbol, 0x1001E9E] };
+
+
+ key { [ q, Q, at, Greek_OMEGA ] };
+ key { [ w, W, lstroke, Lstroke ] };
+ key { [ e, E, EuroSign, EuroSign ] };
+ key { [ r, R, paragraph, registered ] };
+ key { [ t, T, tslash, Tslash ] };
+ key { [ z, Z, leftarrow, yen ] };
+ key { [ u, U, downarrow, uparrow ] };
+ key { [ i, I, rightarrow, idotless ] };
+ key { [ o, O, oslash, Ooblique ] };
+ key { [ p, P, thorn, THORN ] };
+ key { [udiaeresis, Udiaeresis, NoSymbol, NoSymbol ] };
+ key { [ plus, asterisk, asciitilde, macron ] };
+
+ key { [ a, A, ae, AE ] };
+ key { [ s, S, ssharp, section ] };
+ key { [ d, D, eth, ETH ] };
+ key { [ f, F, dstroke, ordfeminine ] };
+ key { [ g, G, eng, ENG ] };
+ key { [ h, H, hstroke, Hstroke ] };
+ key { [ j, J, NoSymbol, NoSymbol ] };
+ key { [ k, K, kra, ampersand ] };
+ key { [ l, L, lstroke, Lstroke ] };
+ key { [odiaeresis, Odiaeresis, NoSymbol, 0x1001E9E] };
+ key { [adiaeresis, Adiaeresis, NoSymbol, NoSymbol ] };
+ key { [NoSymbol, degree, U2032, U2033 ] };
+
+ key { [numbersign, apostrophe,rightsinglequotemark,NoSymbol ] };
+ key { [ y, Y, guillemotright, U203A ] };
+ key { [ x, X, guillemotleft, U2039 ] };
+ key { [ c, C, cent, copyright ] };
+ key { [ v, V, doublelowquotemark, singlelowquotemark ] };
+ key { [ b, B, leftdoublequotemark, leftsinglequotemark ] };
+ key { [ n, N, rightdoublequotemark, rightsinglequotemark] };
+ key { [ m, M, mu, masculine ] };
+ key { [ comma, semicolon, periodcentered, multiply ] };
+ key { [ period, colon, U2026, division ] };
+ key { [ minus, underscore, endash, emdash ] };
+ key { [ less, greater, bar, 0x1001E9E ] };
+
+};