keymanapp · mcdurdin · Dec 22, 2025 · Jan 6, 2026 · Jan 6, 2026 · Jan 6, 2026
diff --git a/android/KMEA/app/src/main/assets/android-host.js b/android/KMEA/app/src/main/assets/android-host.js
@@ -247,7 +247,7 @@ function deregisterModel(modelID) {
 }
 
 function enableSuggestions(model, suggestionType) {
-  // Set the options first so that KMW's ModelManager can properly handle model enablement states
+  // Set the options first so that KMW's ModelCache can properly handle model enablement states
   // the moment we actually register the new model.
   // Use console_debug
   console_debug('enableSuggestions(model, maySuggest='+suggestionType+')');

diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh
@@ -23,7 +23,7 @@ JUNIT_RESULTS="##teamcity[importData type='junit' path='keyman\android\KMEA\app\
 
 builder_describe "Builds Keyman Engine for Android." \
   "@/web/src/app/webview" \
-  "@/web/src/engine/sentry-manager" \
+  "@/common/web/sentry-manager" \
   "clean" \
   "configure" \
   "build" \
@@ -81,7 +81,7 @@ if builder_start_action build:engine; then
   cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/kmwosk.css" "$ENGINE_ASSETS/kmwosk.css"
   cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/globe-hint.css" "$ENGINE_ASSETS/globe-hint.css"
   cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf"
-  cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js"
+  cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js"
 
   echo "Copying es6-shim polyfill"
   cp "$KEYMAN_ROOT/node_modules/es6-shim/es6-shim.min.js" "$ENGINE_ASSETS/es6-shim.min.js"

diff --git a/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj b/android/Tests/KeyboardHarness/app/src/main/assets/keyboardharness.kpj
@@ -7,6 +7,6 @@
     <CompilerWarningsAsErrors>True</CompilerWarningsAsErrors>
     <CheckFilenameConventions>True</CheckFilenameConventions>
     <SkipMetadataFiles>True</SkipMetadataFiles>
-    <ProjectType>lexicalmodel</ProjectType>
+    <ProjectType>keyboard</ProjectType>
   </Options>
 </KeymanDeveloperProject>
diff --git a/common/include/km_types.h b/common/include/km_types.h
@@ -11,12 +11,20 @@
 
 #if defined(__LP64__) || defined(_LP64)
 /* 64-bit, g++ */
-#define KMX_64BIT
+#define KMX_REQUIRES_REALIGNMENT
 #endif
 
 #if defined(_WIN64) && !defined(USE_64)
 /* 64-bit, Windows */
-#define KMX_64BIT
+#define KMX_REQUIRES_REALIGNMENT
+#endif
+
+#if defined(__EMSCRIPTEN__)
+// Emscripten/WASM. Emscripten even though it uses 32-bit (and not 64-bit
+// pointers like the 64-bit architectures above) requires 32-bit alignment
+// for pointers which we don't always have in the KMX data from file
+// (see #12844).
+#define KMX_REQUIRES_REALIGNMENT
 #endif
 
 typedef uint32_t   KMX_DWORD;

diff --git a/common/include/kmx_file.h b/common/include/kmx_file.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <km_types.h>
+#include "km_types.h"
 
 #ifdef KM_CORE_LIBRARY
 // TODO: move this to a common namespace keyman::common::kmx_file or similar in the future
@@ -52,8 +52,10 @@ namespace kmx {
 #define VERSION_160 0x00001000
 #define VERSION_170 0x00001100
 
+#define VERSION_190 0x00001300
+
 #define VERSION_MIN VERSION_50
-#define VERSION_MAX VERSION_170
+#define VERSION_MAX VERSION_190
 
 //
 // Backspace types
@@ -62,6 +64,9 @@ namespace kmx {
 #define BK_DEFAULT    0
 #define BK_DEADKEY    1
 
+// Next character to delete is a Unicode surrogate pair
+#define BK_SURROGATE  4
+
 // Different begin types
 #define BEGIN_ANSI    0
 #define BEGIN_UNICODE 1
@@ -267,14 +272,24 @@ namespace kmx {
 #define C_CODE_IFSYSTEMSTORE(store, val1, val2) U_UC_SENTINEL U_CODE_IFSYSTEMSTORE store val1 val2
 #define C_CODE_SETSYSTEMSTORE(store, val) U_UC_SENTINEL U_CODE_SETSYSTEMSTORE store val
 
+//
+// COMP_KEYBOARD.dwFlags bitfield
+//
+
 #define KF_SHIFTFREESCAPS 0x0001
 #define KF_CAPSONONLY   0x0002
 #define KF_CAPSALWAYSOFF  0x0004
 #define KF_LOGICALLAYOUT  0x0008
 #define KF_AUTOMATICVERSION 0x0010
 
-// 16.0: Support for LDML Keyboards in KMXPlus file format
-#define KF_KMXPLUS  0x0020
+/** 16.0+: A `COMP_KEYBOARD_KMXPLUSINFO` structure is present immediately after `COMP_KEYBOARD` */
+#define KF_KMXPLUS          0x0020
+
+/**
+ * 19.0+: The `COMP_KEYBOARD_KMXPLUSINFO` structure contains a v19 embedded OSK;
+ * may be used with or without KF_KMXPLUS.
+ */
+#define KF_KMXPLUSOSK       0x0040
 
 #define HK_ALT      0x00010000
 #define HK_CTRL     0x00020000
@@ -362,17 +377,17 @@ struct COMP_KEYBOARD_KMXPLUSINFO {
 };
 
 /**
- * Only valid if comp_keyboard.dwFlags&KF_KMXPLUS
+ * Only valid if comp_keyboard.dwFlags&(KF_KMXPLUS|KF_KMXPLUSOSK)
  */
 struct COMP_KEYBOARD_EX {
-  COMP_KEYBOARD             header;    // 0000 see COMP_KEYBOARD
-  COMP_KEYBOARD_KMXPLUSINFO kmxplus;   // 0040 see COMP_KEYBOARD_EXTRA
+  struct COMP_KEYBOARD             header;    // 0000 see COMP_KEYBOARD
+  struct COMP_KEYBOARD_KMXPLUSINFO kmxplus;   // 0040 see COMP_KEYBOARD_EXTRA
 };
 
-typedef COMP_KEYBOARD *PCOMP_KEYBOARD;
-typedef COMP_STORE *PCOMP_STORE;
-typedef COMP_KEY *PCOMP_KEY;
-typedef COMP_GROUP *PCOMP_GROUP;
+typedef struct COMP_KEYBOARD *PCOMP_KEYBOARD;
+typedef struct COMP_STORE *PCOMP_STORE;
+typedef struct COMP_KEY *PCOMP_KEY;
+typedef struct COMP_GROUP *PCOMP_GROUP;
 
 extern const int CODE__SIZE[];
 #define CODE__SIZE_MAX 5
@@ -382,10 +397,10 @@ extern const int CODE__SIZE[];
 #define KEYBOARDFILEGROUP_SIZE  24
 #define KEYBOARDFILEKEY_SIZE    20
 
-static_assert(sizeof(COMP_STORE) == KEYBOARDFILESTORE_SIZE, "COMP_STORE must be KEYBOARDFILESTORE_SIZE bytes");
-static_assert(sizeof(COMP_KEY) == KEYBOARDFILEKEY_SIZE, "COMP_KEY must be KEYBOARDFILEKEY_SIZE bytes");
-static_assert(sizeof(COMP_GROUP) == KEYBOARDFILEGROUP_SIZE, "COMP_GROUP must be KEYBOARDFILEGROUP_SIZE bytes");
-static_assert(sizeof(COMP_KEYBOARD) == KEYBOARDFILEHEADER_SIZE, "COMP_KEYBOARD must be KEYBOARDFILEHEADER_SIZE bytes");
+static_assert(sizeof(struct COMP_STORE) == KEYBOARDFILESTORE_SIZE, "COMP_STORE must be KEYBOARDFILESTORE_SIZE bytes");
+static_assert(sizeof(struct COMP_KEY) == KEYBOARDFILEKEY_SIZE, "COMP_KEY must be KEYBOARDFILEKEY_SIZE bytes");
+static_assert(sizeof(struct COMP_GROUP) == KEYBOARDFILEGROUP_SIZE, "COMP_GROUP must be KEYBOARDFILEGROUP_SIZE bytes");
+static_assert(sizeof(struct COMP_KEYBOARD) == KEYBOARDFILEHEADER_SIZE, "COMP_KEYBOARD must be KEYBOARDFILEHEADER_SIZE bytes");
 
 #ifdef KM_CORE_LIBRARY
 } // namespace kmx

diff --git a/common/test/keyboards/baseline/README.md b/common/test/keyboards/baseline/README.md
@@ -4,21 +4,48 @@ This folder contains a set of keyboards that are used by multiple projects to
 verify behaviour, both for compilation, and for runtime tests.
 
 The following projects are known to use these keyboards:
+
 * core -- .kmn files only, compiled with kmc during tests
 * developer/kmcmplib -- .kmn files, compiled for tests, and .kmx as reference
 * linux -- .kmn files for test steps only, .kmx files
+* web -- .kmn files for test steps, .kmx and .js files
 
-The .kmx files were built with kmcomp, not kmc, in order to ensure that
+The .kmx and .js files were built with kmcomp, not kmc, in order to ensure that
 developer/kmcmplib gets a valid baseline reference.
 
 Once kmc is stable, it is possible that we will be able to use the kmc npm
 module to build .kmx for all projects that need them.
 
 ## Build parameters
 
-Keyboards were built with debug information and no compiler version embedded,
-with kmcomp 16.0.138:
+The keyboards can be built with:
 
-```bat
-for %d in (*.kmn) do kmcomp -no-compiler-version -d %d
+```bash
+./build.sh build
 ```
+
+This builds the keyboards with debug information and no compiler version
+embedded.
+
+## Grouping of the test fixtures
+
+Fixtures that test similar functionality are roughly grouped together.
+There is some overlap between different groups, so this was done
+mainly by test name.
+
+| Name     | Test group                               |
+|----------|------------------------------------------|
+| k_00xx_* | Tests that didn't fit in any other group |
+| k_01xx_* | Basic rules                              |
+| k_02xx_* | RALT                                     |
+| k_03xx_* | deadkeys                                 |
+| k_04xx_* | Using multiple groups                    |
+| k_05xx_* | Options                                  |
+| k_06xx_* | System stores                            |
+| k_07xx_* | Caps related tests                       |
+| k_08xx_* | Context related                          |
+
+## Description of file format
+
+See [README.md](/core/tests/unit/kmx/README.md) in core for a description
+of the file format.