From cd276286524f95bb7388d6794313ead442cef7d2 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Sat, 23 Sep 2023 10:31:40 +0700
Subject: [PATCH 01/67] chore(developer): Add non-printing characters

---
 .../src/tike/xml/layoutbuilder/constants.js   | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/developer/src/tike/xml/layoutbuilder/constants.js b/developer/src/tike/xml/layoutbuilder/constants.js
index d79850bc23a..117020e5d51 100644
--- a/developer/src/tike/xml/layoutbuilder/constants.js
+++ b/developer/src/tike/xml/layoutbuilder/constants.js
@@ -551,8 +551,8 @@ $(function() {
   }
   this.lookupKeyNames.sort();
 
-  // Defines the PUA code mapping for the various 'special' modifier/control keys on keyboards.
-  // This is lifted directly from visualKeyboard.ts and must be kept in sync. See also CompileKeymanWeb.pas: CSpecialText10
+  // Defines the PUA code mapping for the various 'special' modifier/control/non-printing keys on keyboards.
+  // This is lifted directly from specialCharacters.ts and must be kept in sync. See also CompileKeymanWeb.pas: CSpecialText10
   this.specialCharacters = {
     '*Shift*':    8,
     '*Enter*':    5,
@@ -586,7 +586,9 @@ $(function() {
     '*RAltShift*':      0x68,
     '*LCtrlShift*':     0x69,
     '*RCtrlShift*':     0x70,
-    // Following codes introduced in Keyman 14.0
+    // Added in Keyman 14.0
+    '*LTREnter*':       0x05, // Default alias of '*Enter*'.
+    '*LTRBkSp*':        0x04, // Default alias of '*BkSp*'.
     '*RTLEnter*':       0x71,
     '*RTLBkSp*':        0x72,
     '*ShiftLock*':      0x73,
@@ -594,8 +596,29 @@ $(function() {
     '*ZWNJ*':           0x75, // * If this one is specified, auto-detection will kick in.
     '*ZWNJiOS*':        0x75, //   The iOS version will be used by default, but the
     '*ZWNJAndroid*':    0x76, //   Android platform has its own default glyph.
-    '*LTREnter*':       5,    // * Forces LTR shaping for the Enter/BkSp keys regardless
-    '*LTRBkSp*':        4,    //   of layout's directionality.
+    // Added in Keyman 17.0.
+    // Reference: https://github.com/silnrsi/font-symchar/blob/v4.000/documentation/encoding.md
+    '*ZWNJGeneric*':    0x79, // Generic version of ZWNJ (no override)
+    '*Sp*':             0x80, // Space
+    '*NBSp*':           0x82, // No-break Space
+    '*NarNBSp*':        0x83, // Narrow No-break Space
+    '*EnQ*':            0x84, // En Quad
+    '*EmQ*':            0x85, // Em Quad
+    '*EnSp*':           0x86, // En Space
+    '*EmSp*':           0x87, // Em Space
+    // TODO: Skipping #-per-em-space
+    '*PunctSp*':        0x8c, // Punctuation Space
+    '*ThSp*':           0x8d, // Thin Space
+    '*HSp*':            0x8e, // Hair Space
+    '*ZWSp*':           0x81, // Zero Width Space
+    '*ZWJ*':            0x77, // Zero Width Joiner
+    '*WJ*':             0x78, // Word Joiner
+    '*CGJ*':            0x7a, // Combining Grapheme Joiner
+    '*LTRM*':           0x90, // Left-to-right Mark
+    '*RTLM*':           0x91, // Right-to-left Mark
+    '*SH*':             0xa1, // Soft Hyphen
+    '*HTab*':           0xa2, // Horizontal Tabulation
+    // TODO: Skipping size references
   };
 
   this.specialKeyNames = Object.entries(this.specialCharacters).map(ch => ch[0]);
@@ -711,4 +734,4 @@ $(function() {
     return r;
   };
 
-}.bind(builder));
\ No newline at end of file
+}.bind(builder));

From bf0a0938a84b895b70ff0d71267a40a31b630231 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Wed, 25 Oct 2023 14:44:48 +0700
Subject: [PATCH 02/67] chore(developer): Add handling for new characters

---
 .../src/kmw-compiler/compiler-globals.ts      |  4 +++
 .../src/kmc-kmn/src/kmw-compiler/constants.ts |  9 ++++++-
 .../src/kmw-compiler/validate-layout-file.ts  | 26 ++++++++++++++++---
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts b/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts
index 26981f5711c..92cba914c5e 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts
@@ -46,3 +46,7 @@ export function IsKeyboardVersion14OrLater(): boolean {
 export function IsKeyboardVersion15OrLater(): boolean {
   return fk.fileVersion >= KMX.KMXFile.VERSION_150;
 }
+
+export function IsKeyboardVersion17OrLater(): boolean {
+  return fk.fileVersion >= KMX.KMXFile.VERSION_170;
+}
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
index 55bae9fdb90..a8d88538843 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
@@ -21,7 +21,14 @@ export const
     ['*ShiftedLock*', '*Shifted*'],
     ['*ZWNJ*', '<|>'],
     ['*ZWNJiOS*', '<|>'],
-    ['*ZWNJAndroid*', '<|>']
+    ['*ZWNJAndroid*', '<|>'],
+  ],
+  // these names were added in Keyman 17
+  CSpecialText17: string = '*Sp*\0*NBSp*\0*NarNBSp*\0*EnQ*\0*EmQ*\0*EnSp*\0*EmSp*\0*PunctSp*\0' +
+    '*ThSp*\0*HSp*\0*ZWSp*\0*ZWJ*\0*WJ*\0*CGJ*\0*LTRM*\0*RTLM*\0*SH*\0*HTab*\0',
+  CSpecialText17ZWNJ: string = '*ZWNJGeneric*',
+  CSpecialText17Map: string[][] = [
+    ['*ZWNJGeneric*', '<|>']
   ];
 
 
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index 6a28c38b477..7a1ee1842c4 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -1,7 +1,7 @@
 import { KMX, Osk, TouchLayout, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
-import { callbacks, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater } from "./compiler-globals.js";
+import { callbacks, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater, IsKeyboardVersion17OrLater } from "./compiler-globals.js";
 import { JavaScript_Key } from "./javascript-strings.js";
-import { TRequiredKey, CRequiredKeys, CSpecialText10, CSpecialText14, CSpecialText14ZWNJ, CSpecialText14Map } from "./constants.js";
+import { TRequiredKey, CRequiredKeys, CSpecialText10, CSpecialText14, CSpecialText14ZWNJ, CSpecialText14Map, CSpecialText17, CSpecialText17ZWNJ, CSpecialText17Map } from "./constants.js";
 import { KeymanWebTouchStandardKeyNames, KMWAdditionalKeyNames, VKeyNames } from "./keymanweb-key-codes.js";
 import { KmwCompilerMessages } from "./messages.js";
 
@@ -147,6 +147,8 @@ function CheckKey(
     if((CSpecialText10.includes(FText) || CSpecialText14.includes(FText)) &&
         !CSpecialText14ZWNJ.includes(FText) &&
         !IsKeyboardVersion14OrLater() &&
+        !CSpecialText17ZWNJ.includes(FText) &&
+        !IsKeyboardVersion17OrLater() &&
         !([TouchLayout.TouchLayoutKeySp.special, TouchLayout.TouchLayoutKeySp.specialActive].includes(FKeyType))) {
       callbacks.reportMessage(KmwCompilerMessages.Warn_TouchLayoutSpecialLabelOnNormalKey({
         keyId: FId,
@@ -199,6 +201,22 @@ function TransformSpecialKeys14(FDebug: boolean, sLayoutFile: string): string {
   return sLayoutFile;
 }
 
+function TransformSpecialKeys17(FDebug: boolean, sLayoutFile: string): string {
+  // Rewrite Special key labels that are only supported in Keyman 17+
+  // This code is a little ugly but effective.
+  if(!IsKeyboardVersion17OrLater()) {
+    for(let i = 0; i < CSpecialText17Map.length; i++) {
+      // Assumes the JSON output format will not change
+      if(FDebug) {
+        sLayoutFile = sLayoutFile.replaceAll('"text": "'+CSpecialText17Map[i][0]+'"', '"text": this._v>16 ? "'+CSpecialText17Map[i][0]+'" : "'+CSpecialText17Map[i][1]+'"');
+      } else {
+        sLayoutFile = sLayoutFile.replaceAll('"text":"'+CSpecialText17Map[i][0]+'"', '"text":this._v>16?"'+CSpecialText17Map[i][0]+'":"'+CSpecialText17Map[i][1]+'"');
+      }
+    }
+  }
+  return sLayoutFile;
+}
+
 export function ValidateLayoutFile(fk: KMX.KEYBOARD, FDebug: boolean, sLayoutFile: string, sVKDictionary: string, displayMap: Osk.PuaMap): VLFOutput {   // I4060   // I4139
   let FDictionary: string[] = sVKDictionary.split(/\s+/);
 
@@ -282,8 +300,10 @@ export function ValidateLayoutFile(fk: KMX.KEYBOARD, FDebug: boolean, sLayoutFil
 
   sLayoutFile = TransformSpecialKeys14(FDebug, sLayoutFile);
 
+  sLayoutFile = TransformSpecialKeys17(FDebug, sLayoutFile);
+
   return {
     output: sLayoutFile,
     result
   }
-}
\ No newline at end of file
+}

From 7b00306954e55fd637ac0458ef6b2f3250708c82 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 26 Oct 2023 04:46:57 +0700
Subject: [PATCH 03/67] fix(developer): Add check for CSpecialText17

---
 developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index 7a1ee1842c4..4d12425df09 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -144,7 +144,7 @@ function CheckKey(
     // Keyman versions before 14 do not support '*special*' labels on non-special keys.
     // ZWNJ use, however, is safe because it will be transformed in function
     // TransformSpecialKeys14 to '<|>',  which does not require the custom OSK font.
-    if((CSpecialText10.includes(FText) || CSpecialText14.includes(FText)) &&
+    if((CSpecialText10.includes(FText) || CSpecialText14.includes(FText) || CSpecialText17.includes(FText)) &&
         !CSpecialText14ZWNJ.includes(FText) &&
         !IsKeyboardVersion14OrLater() &&
         !CSpecialText17ZWNJ.includes(FText) &&

From 1a2a85affdaa3363096981b126977567870e764d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 24 Oct 2023 18:14:51 +0200
Subject: [PATCH 04/67] chore(linux): Use workflow_dispatch instead of
 repository_dispatch

This makes it possible to manually trigger workflow runs.

Closes #9548.
---
 .github/workflows/deb-packaging.yml   | 64 ++++++++++++++++++---------
 resources/build/trigger-builds.inc.sh | 19 ++++----
 2 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 8cc431f1787..8a61206497e 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -1,8 +1,33 @@
 name: "Ubuntu packaging"
-run-name: "Ubuntu packaging - ${{ github.event.client_payload.branch }} (branch ${{ github.head_ref }}), by @${{ github.actor }}"
+run-name: "Ubuntu packaging - ${{ github.event.inputs.branch }} (branch ${{ github.head_ref }}), by @${{ github.actor }}"
 on:
-  repository_dispatch:
-    types: ['deb-release-packaging:*', 'deb-pr-packaging:*']
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: 'For a PR `refs/pull/<PR-NUMBER>/merge`'
+        required: true
+      headRef:
+        description: 'The ref of HEAD. For a PR `refs/pull/<PR-NUMBER>/head`.'
+        required: true
+      branch:
+        description: 'The branch. For a PR `PR-<PR-NUMBER>`.'
+        required: true
+        default: 'master'
+      baseBranch:
+        description: 'For a PR the base branch, otherwise the same as `branch`.'
+        required: true
+        default: 'master'
+      baseRef:
+        description: 'The ref of the previous commit. For a PR the same as `baseBranch`.'
+        required: true
+      user:
+        description: 'The user that triggered the build or created the PR'
+        required: true
+      isTestBuild:
+        description: 'True if this is a test build. False if this is a release build.'
+        required: false
+        default: 'true'
+
 env:
   COLOR_GREEN: "\e[32m"
   GH_TOKEN: ${{ github.token }}
@@ -17,26 +42,21 @@ jobs:
     outputs:
       VERSION: ${{ steps.version_step.outputs.VERSION }}
       PRERELEASE_TAG: ${{ steps.prerelease_tag.outputs.PRERELEASE_TAG }}
-      GIT_SHA: ${{ steps.set_status.outputs.GIT_SHA }}
-      GHA_TEST_BUILD: ${{ github.event.client_payload.isTestBuild }}
-      GHA_BRANCH: ${{ github.event.client_payload.branch }}
     steps:
     - name: Checkout
       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       with:
-        ref: '${{ github.event.client_payload.ref }}'
+        ref: '${{ github.event.inputs.ref }}'
 
     - name: Set pending status on PR builds
       id: set_status
-      if: github.event.client_payload.isTestBuild == 'true'
+      if: github.event.inputs.isTestBuild == 'true'
       shell: bash
       run: |
-        GIT_SHA="${{ github.event.client_payload.sha }}"
-        echo "GIT_SHA=$GIT_SHA" >> $GITHUB_OUTPUT
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/$GIT_SHA \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.sha }} \
           -f state='pending' \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description='Debian packaging started' \
@@ -72,8 +92,8 @@ jobs:
       id: prerelease_tag
       shell: bash
       run: |
-        if [ "${{ github.event.client_payload.isTestBuild }}" == "true" ]; then
-          PRERELEASE_TAG="~${{ github.event.client_payload.branch }}-$GITHUB_RUN_NUMBER.$GITHUB_RUN_ATTEMPT"
+        if [ "${{ github.event.inputs.isTestBuild }}" == "true" ]; then
+          PRERELEASE_TAG="~${{ github.event.inputs.branch }}-$GITHUB_RUN_NUMBER.$GITHUB_RUN_ATTEMPT"
         else
           PRERELEASE_TAG=""
         fi
@@ -81,10 +101,10 @@ jobs:
 
     - name: Output which branch or PR we're building plus name of .dsc file
       run: |
-        if [ "${{ github.event.client_payload.isTestBuild }}" == "true" ]; then
-          echo ":checkered_flag: **Test build of version ${{ steps.version_step.outputs.VERSION }} for ${{ github.event.client_payload.branch }}**" >> $GITHUB_STEP_SUMMARY
+        if [ "${{ github.event.inputs.isTestBuild }}" == "true" ]; then
+          echo ":checkered_flag: **Test build of version ${{ steps.version_step.outputs.VERSION }} for ${{ github.event.inputs.branch }}**" >> $GITHUB_STEP_SUMMARY
         else
-          echo ":ship: **Release build of ${{ github.event.client_payload.branch }} branch (${{ github.event.client_payload.ref}}), version ${{ steps.version_step.outputs.VERSION }}**" >> $GITHUB_STEP_SUMMARY
+          echo ":ship: **Release build of ${{ github.event.inputs.branch }} branch (${{ github.event.inputs.ref}}), version ${{ steps.version_step.outputs.VERSION }}**" >> $GITHUB_STEP_SUMMARY
         fi
         echo "" >> $GITHUB_STEP_SUMMARY
         echo ":gift: Generated source package:" >> $GITHUB_STEP_SUMMARY
@@ -146,7 +166,7 @@ jobs:
     needs: [sourcepackage, binary_packages]
     runs-on: ubuntu-latest
     environment: "deploy (linux)"
-    if: github.event.client_payload.isTestBuild == 'false'
+    if: github.event.inputs.isTestBuild == 'false'
 
     steps:
       - name: Sign packages
@@ -165,7 +185,7 @@ jobs:
     needs: [sourcepackage, deb_signing]
     runs-on: self-hosted
     environment: "deploy (linux)"
-    if: github.event.client_payload.isTestBuild == 'false'
+    if: github.event.inputs.isTestBuild == 'false'
 
     steps:
     - name: Install dput
@@ -195,7 +215,7 @@ jobs:
 
     - name: Upload
       run: |
-        case ${{ github.event.client_payload.branch }} in
+        case ${{ github.event.inputs.branch }} in
           stable-*)  destination='' ;;
           beta)      destination='-proposed' ;;
           *)         destination='-experimental' ;;
@@ -227,7 +247,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       with:
-        ref: '${{ github.event.client_payload.ref }}'
+        ref: '${{ github.event.inputs.ref }}'
 
     - name: Download Artifacts
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
@@ -259,7 +279,7 @@ jobs:
     name: Set result status on PR builds
     needs: [sourcepackage, binary_packages, api_verification]
     runs-on: ubuntu-latest
-    if: ${{ always() && github.event.client_payload.isTestBuild == 'true' }}
+    if: ${{ always() && github.event.inputs.isTestBuild == 'true' }}
     steps:
     - name: Set success
       if: needs.sourcepackage.result == 'success' && needs.binary_packages.result == 'success' && needs.api_verification.result == 'success'
@@ -284,7 +304,7 @@ jobs:
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ needs.sourcepackage.outputs.GIT_SHA }} \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.sha }} \
           -f state="$RESULT" \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description="$MSG" \
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index 8d6297b9e1f..60e2b5c22cc 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -69,30 +69,31 @@ function triggerGitHubActionsBuild() {
   local IS_TEST_BUILD="$1"
   local GITHUB_ACTION="$2"
   local GIT_BRANCH="${3:-master}"
-  local GIT_REF GIT_SHA
+  local GIT_REF GIT_HEAD_REF
 
-  local GITHUB_SERVER=https://api.github.com/repos/keymanapp/keyman/dispatches
+  local GITHUB_SERVER=https://api.github.com/repos/keymanapp/keyman
 
   if [ "${action:-""}" == "commit" ]; then
     # This will only be true if we created and pushed a tag
     GIT_REF="refs/tags/release@$VERSION_WITH_TAG"
-    GIT_SHA="$(git rev-parse "${GIT_REF}")"
+    GIT_HEAD_REF="${GIT_REF}"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${VERSION_WITH_TAG}"
   elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
     GIT_REF="refs/pull/${GIT_BRANCH}/merge"
-    GIT_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/head")"
+    GIT_HEAD_REF="refs/pull/${GIT_BRANCH}/head"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
     GIT_BRANCH="PR-${GIT_BRANCH}"
   else
     GIT_REF="refs/heads/${GIT_BRANCH}"
-    GIT_SHA="$(git rev-parse "${GIT_REF}")"
+    GIT_HEAD_REF="${GIT_REF}"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: ${GIT_BRANCH}"
   fi
 
-  local DATA="{\"event_type\": \"$GIT_EVENT_TYPE\", \
-      \"client_payload\": { \
+  local DATA="{
+    \"ref\": \"$GIT_REF\", \
+    \"inputs\": { \
         \"ref\": \"$GIT_REF\", \
-        \"sha\": \"$GIT_SHA\", \
+        \"headRef\": \"$GIT_HEAD_REF\", \
         \"branch\": \"$GIT_BRANCH\", \
         \"isTestBuild\": \"$IS_TEST_BUILD\" \
     }}"
@@ -106,5 +107,5 @@ function triggerGitHubActionsBuild() {
     --header "Accept: application/vnd.github+json" \
     --header "Authorization: token $GITHUB_TOKEN" \
     --data "$DATA" \
-    $GITHUB_SERVER
+    ${GITHUB_SERVER}/actions/workflows/deb-packaging.yml/dispatches
 }

From 9257750bb8db6d4b0d3b835d7b1c5016cf87ed50 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 20 Oct 2023 16:09:25 +0200
Subject: [PATCH 05/67] chore(linux): Refactor deb-packaging.sh script

Make use of builder_run_action.
---
 linux/scripts/deb-packaging.sh | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
index 3a669ab9af2..e6e05a33141 100755
--- a/linux/scripts/deb-packaging.sh
+++ b/linux/scripts/deb-packaging.sh
@@ -28,13 +28,11 @@ else
   END_STEP=""
 fi
 
-if builder_start_action dependencies; then
+dependencies_action() {
   sudo mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
-  builder_finish_action success dependencies
-  exit 0
-fi
+}
 
-if builder_start_action source; then
+source_action() {
   echo "${START_STEP}Make source package for keyman${COLOR_RESET}"
 
   echo "${START_STEP}reconfigure${COLOR_RESET}"
@@ -50,25 +48,23 @@ if builder_start_action source; then
   echo "${END_STEP}"
 
   mv builddebs/* "${OUTPUT_PATH:-..}"
+}
 
-  builder_finish_action success source
-  exit 0
-fi
-
-if builder_start_action verify; then
+verify_action() {
   tar xf "${SRC_PKG}"
-  if [ ! -f debian/libkeymancore.symbols ]; then
-    echo ":warning: Missing libkeymancore.symbols file" >&2
+  PKG_NAME=libkeymancore
+  LIB_NAME=libkeymancore
+  if [ ! -f debian/${PKG_NAME}.symbols ]; then
+    echo ":warning: Missing ${PKG_NAME}.symbols file" >&2
   else
-    PKG_NAME=libkeymancore
-    LIB_NAME=libkeymancore
-
     tmpDir=$(mktemp -d)
     dpkg -x "${BIN_PKG}" "$tmpDir"
     cd debian
     dpkg-gensymbols -v"${PKG_VERSION}" -p${PKG_NAME} -e"${tmpDir}"/usr/lib/x86_64-linux-gnu/${LIB_NAME}.so* -O${PKG_NAME}.symbols -c4
     echo ":heavy_check_mark: ${LIB_NAME} API didn't change" >&2
   fi
-  builder_finish_action success verify
-  exit 0
-fi
+}
+
+builder_run_action dependencies  dependencies_action
+builder_run_action source        source_action
+builder_run_action verify        verify_action

From 7665ab35aa1eb67cb39e5ed94fbd3df9e02d431c Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 24 Oct 2023 16:14:59 +0200
Subject: [PATCH 06/67] chore(linux): Add Core API version number

Closes #9801.
---
 core/CORE_API_VERSION.md | 1 +
 core/meson.build         | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 core/CORE_API_VERSION.md

diff --git a/core/CORE_API_VERSION.md b/core/CORE_API_VERSION.md
new file mode 100644
index 00000000000..3eefcb9dd5b
--- /dev/null
+++ b/core/CORE_API_VERSION.md
@@ -0,0 +1 @@
+1.0.0
diff --git a/core/meson.build b/core/meson.build
index 2061942d61b..716faca2dc2 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -12,14 +12,15 @@ project('keyman_core', 'cpp', 'c',
                            'cpp_std=c++14',
                            'b_vscrt=static_from_buildtype',
                            'warning_level=2'],
-        meson_version: '>=0.53.0')
+        meson_version: '>=0.57.0')
 
 # Import our standard compiler defines; this is copied from
 # /resources/build/standard.meson.build by build.sh, because
 # meson doesn't allow us to reference a file outside its root
 subdir('resources')
 
-lib_version = '1.0.0'
+fs = import('fs')
+lib_version = fs.read('CORE_API_VERSION.md').strip()
 
 py = import('python')
 python = py.find_installation()

From 30250e3d8d71b93bd90d3dd6dc67c78efd0f49e8 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 24 Oct 2023 16:51:00 +0200
Subject: [PATCH 07/67] chore(linux): Enhance GHA API check

This change adds additional checks for the symbols file:

- if a line with a method name gets changed, the package version number
  in that line also needs to be updated
- for major API changes (methods renamed or removed) the API version
  numbers needs to be incremented
- the API version numbers in the .symbols file and in `CORE_API_VERSION.md`
  need to match
---
 .github/workflows/deb-packaging.yml   |  17 +--
 docs/linux/ibus-keyman.md             |   2 +-
 linux/scripts/deb-packaging.sh        | 166 +++++++++++++++++++++++---
 resources/build/trigger-builds.inc.sh |  17 ++-
 4 files changed, 174 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 8a61206497e..d9ea32e1478 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -1,14 +1,11 @@
 name: "Ubuntu packaging"
-run-name: "Ubuntu packaging - ${{ github.event.inputs.branch }} (branch ${{ github.head_ref }}), by @${{ github.actor }}"
+run-name: "Ubuntu packaging - ${{ github.event.inputs.branch }} (branch ${{ github.event.inputs.baseBranch }}), by @${{ github.event.inputs.user }}"
 on:
   workflow_dispatch:
     inputs:
       ref:
         description: 'For a PR `refs/pull/<PR-NUMBER>/merge`'
         required: true
-      headRef:
-        description: 'The ref of HEAD. For a PR `refs/pull/<PR-NUMBER>/head`.'
-        required: true
       branch:
         description: 'The branch. For a PR `PR-<PR-NUMBER>`.'
         required: true
@@ -248,6 +245,7 @@ jobs:
       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       with:
         ref: '${{ github.event.inputs.ref }}'
+        fetch-depth: 0
 
     - name: Download Artifacts
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
@@ -263,10 +261,13 @@ jobs:
       run: |
         cd linux
         PKG_NAME=libkeymancore
-        SRC_PKG="${GITHUB_WORKSPACE}/artifacts/keyman-srcpkg/keyman_${{ needs.sourcepackage.outputs.VERSION }}-1.debian.tar.xz" \
-        BIN_PKG="${GITHUB_WORKSPACE}/artifacts/keyman-binarypkgs/${PKG_NAME}_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \
-        PKG_VERSION="${{ needs.sourcepackage.outputs.VERSION }}" \
-        ./scripts/deb-packaging.sh --gha verify 2>> $GITHUB_STEP_SUMMARY
+        ./scripts/deb-packaging.sh \
+          --gha \
+          --bin-pkg "${GITHUB_WORKSPACE}/artifacts/keyman-binarypkgs/${PKG_NAME}_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \
+          --pkg-version "${{ needs.sourcepackage.outputs.VERSION }}" \
+          --git-ref "${{ github.sha }}" \
+          --git-base "${{ github.event.inputs.baseRef }}" \
+          verify 2>> $GITHUB_STEP_SUMMARY
 
     - name: Archive .symbols file
       uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
diff --git a/docs/linux/ibus-keyman.md b/docs/linux/ibus-keyman.md
index db09d67f5a8..ffc7b06c1cf 100644
--- a/docs/linux/ibus-keyman.md
+++ b/docs/linux/ibus-keyman.md
@@ -6,7 +6,7 @@ Source code for Keyman engine for IBus is in [linux/ibus-keyman](../../linux/ibu
 
 ## Requirements
 
-meson (>= 0.53)
+meson (>= 0.57)
 
 ## Building
 
diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
index e6e05a33141..8ac8de96c6d 100755
--- a/linux/scripts/deb-packaging.sh
+++ b/linux/scripts/deb-packaging.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2154 # (variables are set in build-utils.sh)
 # Actions for creating a Debian source package. Used by deb-packaging.yml GHA.
 
 set -eu
+shopt -s inherit_errexit
 
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
@@ -11,14 +13,18 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe \
   "Helper for building Debian packages." \
-  "dependencies              Install dependencies as found in debian/control" \
-  "source+                   Build source package" \
-  "verify                    Verify API" \
-  "--gha                     Build from GitHub Action"
+  "dependencies               Install dependencies as found in debian/control" \
+  "source+                    Build source package" \
+  "verify                     Verify API" \
+  "--gha                      Build from GitHub Action" \
+  "--bin-pkg=BIN_PKG          Path and name of binary Debian package (for verify action)" \
+  "--pkg-version=PKG_VERSION  The version of the Debian package (for verify action)" \
+  "--git-ref=GIT_REF          The ref of the HEAD commit, e.g. HEAD of the PR branch (for verify action)" \
+  "--git-base=GIT_BASE        The ref of the base commit, e.g. HEAD of the master branch (for verify action)"
 
 builder_parse "$@"
 
-cd "$REPO_ROOT/linux"
+cd "${REPO_ROOT}/linux"
 
 if builder_has_option --gha; then
   START_STEP="::group::${COLOR_GREEN}"
@@ -50,19 +56,151 @@ source_action() {
   mv builddebs/* "${OUTPUT_PATH:-..}"
 }
 
+output_log() {
+  echo "$1" >&2
+  builder_echo "$1"
+}
+
+output_ok() {
+  echo ":heavy_check_mark: $1" >&2
+  builder_echo green "OK: $1"
+}
+
+output_warning() {
+  echo ":warning: $1" >&2
+  builder_echo warning "WARNING: $1"
+}
+
+output_error() {
+  echo ":x: $1" >&2
+  builder_echo error "ERROR: $1"
+}
+
+check_api_not_changed() {
+  # Checks that the API did not change compared to what's documented in the .symbols file
+  tmpDir=$(mktemp -d)
+  dpkg -x "${BIN_PKG}" "${tmpDir}"
+  cd debian
+  dpkg-gensymbols -v"${PKG_VERSION}" -p"${PKG_NAME}" -e"${tmpDir}"/usr/lib/x86_64-linux-gnu/"${LIB_NAME}".so* -O"${PKG_NAME}.symbols" -c4
+  output_ok "${LIB_NAME} API didn't change"
+  cd "${REPO_ROOT}/linux"
+}
+
+is_symbols_file_changed() {
+  local CHANGED_REF CHANGED_BASE
+  CHANGED_REF=$(git rev-parse "${GIT_REF}":"linux/debian/${PKG_NAME}.symbols")
+  CHANGED_BASE=$(git rev-parse "${GIT_BASE}":"linux/debian/${PKG_NAME}.symbols")
+  if [[ "${CHANGED_REF}" == "${CHANGED_BASE}" ]]; then
+    return 1
+  fi
+  return 0
+}
+
+check_updated_version_number() {
+  # Checks that the package version number got updated in the .symbols file if it got changed
+  # shellcheck disable=SC2310
+  if is_symbols_file_changed; then
+    # .symbols file changed, now check if the package version got updated as well
+    # Note: We don't check that ALL changes in that file have an updated package version -
+    # we hope this gets flagged in code review.
+    if ! git log -p -1 -- "debian/${PKG_NAME}.symbols" | grep -q "${PKG_VERSION}"; then
+      output_error "${PKG_NAME}.symbols file got changed without changing the package version number of the symbol"
+      EXIT_CODE=1
+    else
+      output_ok "${PKG_NAME}.symbols file got updated with package version number"
+    fi
+  else
+    output_ok "${PKG_NAME}.symbols file didn't change"
+  fi
+}
+
+get_api_version_in_symbols_file() {
+  # Extract 1 from "libkeymancore.so.1 libkeymancore #MINVER#"
+  local firstline
+  firstline=$(head -1 "debian/${PKG_NAME}.symbols")
+  firstline="${firstline#"${PKG_NAME}".so.}"
+  firstline="${firstline%% *}"
+  echo "${firstline}"
+}
+
+is_api_version_updated() {
+  local NEW_VERSION OLD_VERSION
+  git checkout "${GIT_REF}" -- "debian/${PKG_NAME}.symbols"
+  NEW_VERSION=$(get_api_version_in_symbols_file)
+  git checkout "${GIT_BASE}" -- "debian/${PKG_NAME}.symbols"
+  OLD_VERSION=$(get_api_version_in_symbols_file)
+  git checkout "${GIT_REF}" -- "debian/${PKG_NAME}.symbols"
+  if (( NEW_VERSION > OLD_VERSION )); then
+    return 0
+  fi
+  return 1
+}
+
+check_for_major_api_changes() {
+  # Checks that API version number gets updated if API changes
+  local WHAT_CHANGED CHANGES INSERTED DELETED MODIFIED
+
+  # shellcheck disable=2310
+  if ! is_symbols_file_changed; then
+    output_ok "No major API change"
+    return
+  fi
+
+  WHAT_CHANGED=$(git diff "${GIT_BASE}".."${GIT_REF}" -- "debian/${PKG_NAME}.symbols" | diffstat -m -t | tail -1)
+
+  IFS=',' read -r -a CHANGES <<< "${WHAT_CHANGED}"
+  INSERTED="${CHANGES[0]}"
+  DELETED="${CHANGES[1]}"
+  MODIFIED="${CHANGES[2]}"
+
+  if (( DELETED > 0 )) || (( MODIFIED > 0 )); then
+    builder_echo "Major API change: ${DELETED} lines deleted and ${MODIFIED} lines modified"
+    # shellcheck disable=2310
+    if ! is_api_version_updated; then
+      output_error "Major API change without updating API version number in ${PKG_NAME}.symbols file"
+      EXIT_CODE=2
+    else
+      output_ok "API version number got updated in ${PKG_NAME}.symbols file after major API change"
+    fi
+  elif (( INSERTED > 0 )); then
+    output_ok "Minor API change: ${INSERTED} lines added"
+    # We currently don't check version number for minor API changes
+  else
+    output_ok "No major API change"
+  fi
+}
+
+check_for_api_version_consistency() {
+  # Checks that the (major) API version number in the .symbols file and
+  # in CORE_API_VERSION.md are the same
+  local symbols_version api_version
+  symbols_version=$(get_api_version_in_symbols_file)
+  api_version=$(cat ../core/CORE_API_VERSION.md)
+  # Extract major version number from "1.0.0"
+  api_version=${api_version%%.*}
+
+  if (( symbols_version == api_version )); then
+    output_ok "API version in .symbols file and in CORE_API_VERSION.md is the same"
+  else
+    output_error "API version in .symbols file and in CORE_API_VERSION.md is different"
+    EXIT_CODE=3
+  fi
+}
+
 verify_action() {
-  tar xf "${SRC_PKG}"
   PKG_NAME=libkeymancore
   LIB_NAME=libkeymancore
-  if [ ! -f debian/${PKG_NAME}.symbols ]; then
-    echo ":warning: Missing ${PKG_NAME}.symbols file" >&2
-  else
-    tmpDir=$(mktemp -d)
-    dpkg -x "${BIN_PKG}" "$tmpDir"
-    cd debian
-    dpkg-gensymbols -v"${PKG_VERSION}" -p${PKG_NAME} -e"${tmpDir}"/usr/lib/x86_64-linux-gnu/${LIB_NAME}.so* -O${PKG_NAME}.symbols -c4
-    echo ":heavy_check_mark: ${LIB_NAME} API didn't change" >&2
+  if [[ ! -f debian/${PKG_NAME}.symbols ]]; then
+    output_warning "Missing ${PKG_NAME}.symbols file"
+    exit 0
   fi
+
+  EXIT_CODE=0
+  check_api_not_changed
+  check_updated_version_number
+  check_for_major_api_changes
+  check_for_api_version_consistency
+  exit "${EXIT_CODE}"
 }
 
 builder_run_action dependencies  dependencies_action
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index 60e2b5c22cc..fb780afa2cb 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -69,23 +69,28 @@ function triggerGitHubActionsBuild() {
   local IS_TEST_BUILD="$1"
   local GITHUB_ACTION="$2"
   local GIT_BRANCH="${3:-master}"
-  local GIT_REF GIT_HEAD_REF
+  local GIT_BASE_BRANCH="${GIT_BRANCH}"
+  local GIT_USER="keyman-server"
+  local GIT_REF GIT_BASE_REF JSON
 
   local GITHUB_SERVER=https://api.github.com/repos/keymanapp/keyman
 
   if [ "${action:-""}" == "commit" ]; then
     # This will only be true if we created and pushed a tag
     GIT_REF="refs/tags/release@$VERSION_WITH_TAG"
-    GIT_HEAD_REF="${GIT_REF}"
+    GIT_BASE_REF="$(git rev-parse "${GIT_REF}^")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${VERSION_WITH_TAG}"
   elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
     GIT_REF="refs/pull/${GIT_BRANCH}/merge"
-    GIT_HEAD_REF="refs/pull/${GIT_BRANCH}/head"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
+    JSON=$(curl -s "${GITHUB_SERVER}/pulls/${GIT_BRANCH}")
+    GIT_USER="$(echo "$JSON" | $JQ -r '.user.login')"
+    GIT_BASE_REF="$(echo "$JSON" | $JQ -r '.base.ref')"
+    GIT_BASE_BRANCH="${GIT_BASE_REF}"
     GIT_BRANCH="PR-${GIT_BRANCH}"
   else
     GIT_REF="refs/heads/${GIT_BRANCH}"
-    GIT_HEAD_REF="${GIT_REF}"
+    GIT_BASE_REF="$(git rev-parse "${GIT_REF}^")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: ${GIT_BRANCH}"
   fi
 
@@ -93,8 +98,10 @@ function triggerGitHubActionsBuild() {
     \"ref\": \"$GIT_REF\", \
     \"inputs\": { \
         \"ref\": \"$GIT_REF\", \
-        \"headRef\": \"$GIT_HEAD_REF\", \
         \"branch\": \"$GIT_BRANCH\", \
+        \"baseBranch\": \"$GIT_BASE_BRANCH\", \
+        \"baseRef\": \"$GIT_BASE_REF\", \
+        \"user\": \"$GIT_USER\", \
         \"isTestBuild\": \"$IS_TEST_BUILD\" \
     }}"
 

From 4085612ad9b4a724aca31abf218bf60f40cf6a0e Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 30 Oct 2023 09:26:22 +0700
Subject: [PATCH 08/67] fix(developer): Revise check on special characters

---
 .../src/kmc-kmn/src/kmw-compiler/constants.ts     | 15 +++++++++++++--
 .../src/kmw-compiler/validate-layout-file.ts      | 12 +++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
index a8d88538843..90f71cefeac 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
@@ -8,9 +8,9 @@ export const
 // See also builder.js: specialCharacters; web/source/osk/oskKey.ts: specialCharacters
 export const
   CSpecialText10: string = '*Shift*\0*Enter*\0*Tab*\0*BkSp*\0*Menu*\0*Hide*\0*Alt*\0*Ctrl*\0*Caps*\0' +
-    '*ABC*\0*abc*\0*123*\0*Symbol*\0*Currency*\0*Shifted*\0*AltGr*\0*TabLeft*',
+    '*ABC*\0*abc*\0*123*\0*Symbol*\0*Currency*\0*Shifted*\0*AltGr*\0*TabLeft*\0',
   // these names were added in Keyman 14
-  CSpecialText14: string = '*LTREnter*\0*LTRBkSp*\0*RTLEnter*\0*RTLBkSp*\0*ShiftLock*\0*ShiftedLock*\0*ZWNJ*\0*ZWNJiOS*\0*ZWNJAndroid*',
+  CSpecialText14: string = '*LTREnter*\0*LTRBkSp*\0*RTLEnter*\0*RTLBkSp*\0*ShiftLock*\0*ShiftedLock*\0*ZWNJ*\0*ZWNJiOS*\0*ZWNJAndroid*\0',
   CSpecialText14ZWNJ: string = '*ZWNJ*\0*ZWNJiOS*\0*ZWNJAndroid*',
   CSpecialText14Map: string[][] = [
     ['*LTREnter*', '*Enter*'],
@@ -31,6 +31,17 @@ export const
     ['*ZWNJGeneric*', '<|>']
   ];
 
+  // Map for checking minimum versions and Special Text
+  export const CSpecialText = new Map<number, string>([
+    [10, CSpecialText10],
+    [11, CSpecialText10],
+    [12, CSpecialText10],
+    [13, CSpecialText10],
+    [14, CSpecialText14 + CSpecialText10],
+    [15, CSpecialText14 + CSpecialText10],
+    [16, CSpecialText14 + CSpecialText10],
+    [17, CSpecialText17 + CSpecialText14 + CSpecialText10]
+  ]);
 
 // These correspond to TSS_ values in kmx.ts
 export const
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index 4d12425df09..cc86d4bca32 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -1,7 +1,7 @@
 import { KMX, Osk, TouchLayout, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
-import { callbacks, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater, IsKeyboardVersion17OrLater } from "./compiler-globals.js";
+import { callbacks, fk, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater, IsKeyboardVersion17OrLater } from "./compiler-globals.js";
 import { JavaScript_Key } from "./javascript-strings.js";
-import { TRequiredKey, CRequiredKeys, CSpecialText10, CSpecialText14, CSpecialText14ZWNJ, CSpecialText14Map, CSpecialText17, CSpecialText17ZWNJ, CSpecialText17Map } from "./constants.js";
+import { TRequiredKey, CRequiredKeys, CSpecialText, CSpecialText14ZWNJ, CSpecialText14Map, CSpecialText17ZWNJ, CSpecialText17Map } from "./constants.js";
 import { KeymanWebTouchStandardKeyNames, KMWAdditionalKeyNames, VKeyNames } from "./keymanweb-key-codes.js";
 import { KmwCompilerMessages } from "./messages.js";
 
@@ -144,11 +144,9 @@ function CheckKey(
     // Keyman versions before 14 do not support '*special*' labels on non-special keys.
     // ZWNJ use, however, is safe because it will be transformed in function
     // TransformSpecialKeys14 to '<|>',  which does not require the custom OSK font.
-    if((CSpecialText10.includes(FText) || CSpecialText14.includes(FText) || CSpecialText17.includes(FText)) &&
-        !CSpecialText14ZWNJ.includes(FText) &&
-        !IsKeyboardVersion14OrLater() &&
-        !CSpecialText17ZWNJ.includes(FText) &&
-        !IsKeyboardVersion17OrLater() &&
+    const mapVersion = (fk.fileVersion > 17 ? 17 : fk.fileVersion < 10 ? 10 : fk.fileVersion);
+    const specialText = CSpecialText.get(mapVersion);
+    if(specialText.includes(FText) &&
         !([TouchLayout.TouchLayoutKeySp.special, TouchLayout.TouchLayoutKeySp.specialActive].includes(FKeyType))) {
       callbacks.reportMessage(KmwCompilerMessages.Warn_TouchLayoutSpecialLabelOnNormalKey({
         keyId: FId,

From 2064ac4556a2ffdb558a7e753163d0f5e90cfe91 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 30 Oct 2023 09:29:30 +0700
Subject: [PATCH 09/67] chore(developer): Cleanup unused ZWNJ

---
 developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index cc86d4bca32..fb0e21d83a0 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -1,7 +1,7 @@
 import { KMX, Osk, TouchLayout, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
 import { callbacks, fk, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater, IsKeyboardVersion17OrLater } from "./compiler-globals.js";
 import { JavaScript_Key } from "./javascript-strings.js";
-import { TRequiredKey, CRequiredKeys, CSpecialText, CSpecialText14ZWNJ, CSpecialText14Map, CSpecialText17ZWNJ, CSpecialText17Map } from "./constants.js";
+import { TRequiredKey, CRequiredKeys, CSpecialText, CSpecialText14Map, CSpecialText17Map } from "./constants.js";
 import { KeymanWebTouchStandardKeyNames, KMWAdditionalKeyNames, VKeyNames } from "./keymanweb-key-codes.js";
 import { KmwCompilerMessages } from "./messages.js";
 

From b26b6a37d75c3fa3ed4da1bf43c742cc31d2b19d Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 1 Nov 2023 04:43:42 +0700
Subject: [PATCH 10/67] fix(developer): use KeymanWeb.Codes for 17.0+

Fixes #8147.

Keyboards debug-compiled for web 17.0+ will use `KeymanWeb.Codes.`
instead of `keyman.osk.`.
---
 .../src/kmc-kmn/src/kmw-compiler/compiler-globals.ts  |  4 ++++
 .../src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts      | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts b/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts
index 26981f5711c..92cba914c5e 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/compiler-globals.ts
@@ -46,3 +46,7 @@ export function IsKeyboardVersion14OrLater(): boolean {
 export function IsKeyboardVersion15OrLater(): boolean {
   return fk.fileVersion >= KMX.KMXFile.VERSION_150;
 }
+
+export function IsKeyboardVersion17OrLater(): boolean {
+  return fk.fileVersion >= KMX.KMXFile.VERSION_170;
+}
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts
index 986db18050e..b3baaea9fb2 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts
@@ -1,6 +1,6 @@
 import { KMX, CompilerOptions, CompilerCallbacks, KvkFileReader, VisualKeyboard, KmxFileReader, KvkFile } from "@keymanapp/common-types";
 import { ExpandSentinel, incxstr, xstrlen } from "./util.js";
-import { options, nl, FTabStop, setupGlobals, IsKeyboardVersion10OrLater, callbacks, FFix183_LadderLength, FCallFunctions, fk } from "./compiler-globals.js";
+import { options, nl, FTabStop, setupGlobals, IsKeyboardVersion10OrLater, callbacks, FFix183_LadderLength, FCallFunctions, fk, IsKeyboardVersion17OrLater } from "./compiler-globals.js";
 import { JavaScript_ContextMatch, JavaScript_KeyAsString, JavaScript_Name, JavaScript_OutputString, JavaScript_Rules, JavaScript_Shift, JavaScript_ShiftAsString, JavaScript_Store, zeroPadHex } from './javascript-strings.js';
 import { KmwCompilerMessages } from "./messages.js";
 import { ValidateLayoutFile } from "./validate-layout-file.js";
@@ -435,8 +435,13 @@ function GetKeyboardModifierBitmask(keyboard: KMX.KEYBOARD, fMnemonic: boolean):
 function JavaScript_SetupDebug() {
   if(IsKeyboardVersion10OrLater()) {
     if(options.saveDebug) {
-      return 'var modCodes = keyman.osk.modifierCodes;'+nl+
-             FTabStop+'var keyCodes = keyman.osk.keyCodes;'+nl;
+      if(IsKeyboardVersion17OrLater()) {
+        return 'var modCodes = KeymanWeb.Codes.modifierCodes;'+nl+
+              FTabStop+'var keyCodes = KeymanWeb.Codes.keyCodes;'+nl;
+      } else {
+        return 'var modCodes = keyman.osk.modifierCodes;'+nl+
+              FTabStop+'var keyCodes = keyman.osk.keyCodes;'+nl;
+      }
     }
   }
   return '';

From 4ce16a08fc8d3b6ae765eddcdc4d20e503c9b3a4 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 1 Nov 2023 05:57:13 +0700
Subject: [PATCH 11/67] fix(developer): don't use osk-always-visible on touch
 devices

Fixes #9845.

It seems that the logic for `osk-always-visible` is not quite right on
touch devices -- the OSK disappears on blur but remains touchable -- so
presses in the OSK region emit key events. For Keyman Developer Server,
the simple workaround is to only use `<body class="osk-always-visible">`
when on desktop devices.

We should review the logic for `osk-always-visible` in KeymanWeb, so
that this issue does not arise on touch devices. This patch addresses
the issue in Keyman Developer Server, and matches the behaviour we want
on touch devices in any case, as we don't really want the OSK visible
when blurred, unlike on desktop.
---
 developer/src/server/src/site/index.html | 2 +-
 developer/src/server/src/site/test.js    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/developer/src/server/src/site/index.html b/developer/src/server/src/site/index.html
index 5a4fd139a55..8147a849a46 100644
--- a/developer/src/server/src/site/index.html
+++ b/developer/src/server/src/site/index.html
@@ -21,7 +21,7 @@
     <link href="inc/keyboards.css" type="text/css" rel="stylesheet" /> <!-- This script loads the dynamic keyboard fonts -->
   </head>
 
-  <body class='osk-always-visible'>
+  <body>
 
     <header class='navbar navbar-dark bg-dark text-white'>
       <div class='container-fluid'>
diff --git a/developer/src/server/src/site/test.js b/developer/src/server/src/site/test.js
index 6014c8ab264..b1620489179 100644
--- a/developer/src/server/src/site/test.js
+++ b/developer/src/server/src/site/test.js
@@ -42,6 +42,10 @@ function enableControls(enable) {
 let keymanInitialized = false;
 enableControls(false);
 
+if(!keyman.util.isTouchDevice()) {
+  document.body.className = 'osk-always-visible';
+}
+
 keyman.init({
   ui:'button',
   resources:'/resource/',

From 06cf276806e6bd1bce8d27a6a4206af9119a4149 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 2 Nov 2023 13:22:49 +0700
Subject: [PATCH 12/67] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 .../src/kmc-kmn/src/kmw-compiler/constants.ts  | 18 ++++++++++--------
 .../src/kmw-compiler/validate-layout-file.ts   |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
index 90f71cefeac..09c42898d57 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
@@ -33,15 +33,17 @@ export const
 
   // Map for checking minimum versions and Special Text
   export const CSpecialText = new Map<number, string>([
-    [10, CSpecialText10],
-    [11, CSpecialText10],
-    [12, CSpecialText10],
-    [13, CSpecialText10],
-    [14, CSpecialText14 + CSpecialText10],
-    [15, CSpecialText14 + CSpecialText10],
-    [16, CSpecialText14 + CSpecialText10],
-    [17, CSpecialText17 + CSpecialText14 + CSpecialText10]
+    [KMX.KMXFile.VERSION_100, CSpecialText10],
+    [KMX.KMXFile.VERSION_110, CSpecialText10],
+    [KMX.KMXFile.VERSION_120, CSpecialText10],
+    [KMX.KMXFile.VERSION_130, CSpecialText10],
+    [KMX.KMXFile.VERSION_140, CSpecialText14 + CSpecialText10],
+    [KMX.KMXFile.VERSION_150, CSpecialText14 + CSpecialText10],
+    [KMX.KMXFile.VERSION_160, CSpecialText14 + CSpecialText10],
+    [KMX.KMXFile.VERSION_170, CSpecialText17 + CSpecialText14 + CSpecialText10]
   ]);
+  export const CSpecialTextMinVer = KMX.KMXFile.VERSION_100;
+  export const CSpecialTextMaxVer = KMX.KMXFile.VERSION_170;
 
 // These correspond to TSS_ values in kmx.ts
 export const
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index fb0e21d83a0..f9da003fa86 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -144,7 +144,7 @@ function CheckKey(
     // Keyman versions before 14 do not support '*special*' labels on non-special keys.
     // ZWNJ use, however, is safe because it will be transformed in function
     // TransformSpecialKeys14 to '<|>',  which does not require the custom OSK font.
-    const mapVersion = (fk.fileVersion > 17 ? 17 : fk.fileVersion < 10 ? 10 : fk.fileVersion);
+    const mapVersion = (fk.fileVersion > CSpecialTextMaxVer ? CSpecialTextMaxVer : fk.fileVersion < CSpecialTextMinVer ? CSpecialTextMinVer : fk.fileVersion);
     const specialText = CSpecialText.get(mapVersion);
     if(specialText.includes(FText) &&
         !([TouchLayout.TouchLayoutKeySp.special, TouchLayout.TouchLayoutKeySp.specialActive].includes(FKeyType))) {

From ecae59062b5fe95ca91a1443f1eb6319d9042854 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 2 Nov 2023 15:50:50 +0700
Subject: [PATCH 13/67] fix(developer): Update keymanweb-osk.ttf font

---
 .../tike/xml/layoutbuilder/keymanweb-osk.ttf  | Bin 40076 -> 35164 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/developer/src/tike/xml/layoutbuilder/keymanweb-osk.ttf b/developer/src/tike/xml/layoutbuilder/keymanweb-osk.ttf
index d33aedc35efe6928b5f134fae9fcb8296fb6725d..e0651b14d4f770d2a9b15e8850203c05112a23d7 100644
GIT binary patch
delta 6545
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

delta 11509
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


From 9b8097ea966ee11b3922bed15e8e7930fa2aa1af Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 2 Nov 2023 16:32:41 +0700
Subject: [PATCH 14/67] fix(developer): import KMX

---
 developer/src/kmc-kmn/src/kmw-compiler/constants.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
index 09c42898d57..8c7d5860690 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
@@ -1,3 +1,5 @@
+import { KMX } from "@keymanapp/common-types";
+
 export enum TRequiredKey {
   K_LOPT='K_LOPT', K_BKSP='K_BKSP', K_ENTER='K_ENTER'
 }; // I4447

From 25c54d363c2795c610e9f999cc4af7fe3b8735fa Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 2 Nov 2023 17:37:43 +0700
Subject: [PATCH 15/67] fix(common): Add constants

---
 common/web/types/src/kmx/kmx.ts                              | 5 ++++-
 .../src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/web/types/src/kmx/kmx.ts b/common/web/types/src/kmx/kmx.ts
index 6102a69cf55..873b575205a 100644
--- a/common/web/types/src/kmx/kmx.ts
+++ b/common/web/types/src/kmx/kmx.ts
@@ -140,6 +140,9 @@ export class KMXFile {
   public static readonly VERSION_80 =  0x00000800;
   public static readonly VERSION_90 =  0x00000900;
   public static readonly VERSION_100 = 0x00000A00;
+  public static readonly VERSION_110 = 0x00000B00;
+  public static readonly VERSION_120 = 0x00000C00;
+  public static readonly VERSION_130 = 0x00000D00;
   public static readonly VERSION_140 = 0x00000E00;
   public static readonly VERSION_150 = 0x00000F00;
 
@@ -457,4 +460,4 @@ export class KMXFile {
       throw "COMP_KEYBOARD size is "+this.COMP_KEYBOARD.size()+" but should be "+KMXFile.COMP_KEYBOARD_SIZE+" bytes";
     }
   }
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index f9da003fa86..7838d836d92 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -1,7 +1,7 @@
 import { KMX, Osk, TouchLayout, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
 import { callbacks, fk, IsKeyboardVersion14OrLater, IsKeyboardVersion15OrLater, IsKeyboardVersion17OrLater } from "./compiler-globals.js";
 import { JavaScript_Key } from "./javascript-strings.js";
-import { TRequiredKey, CRequiredKeys, CSpecialText, CSpecialText14Map, CSpecialText17Map } from "./constants.js";
+import { TRequiredKey, CRequiredKeys, CSpecialText, CSpecialText14Map, CSpecialText17Map, CSpecialTextMinVer, CSpecialTextMaxVer } from "./constants.js";
 import { KeymanWebTouchStandardKeyNames, KMWAdditionalKeyNames, VKeyNames } from "./keymanweb-key-codes.js";
 import { KmwCompilerMessages } from "./messages.js";
 

From 024b20a8393bb285491c181064e892fb04b7ceb3 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 2 Nov 2023 21:05:51 +0700
Subject: [PATCH 16/67] fix(developer): Define special touch layout key

---
 .../test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
index 7c36c893249..e43108aa1e5 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
@@ -115,6 +115,7 @@
               {
                 "id": "K_X",
                 "text": "*Enter*"
+                "sp": "1",
               },
               {
                 "id": "K_C",
@@ -665,4 +666,4 @@
     ],
     "displayUnderlying": false
   }
-}
\ No newline at end of file
+}

From 6adfa8a9cfdbceede742602c69d232b91e37f503 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 31 Oct 2023 17:45:32 +0700
Subject: [PATCH 17/67] fix(linux): Fix environment for Debian packages

When didn't set the correct environment when building Debian packages
with GitHub actions. The version information wasn't included in the
source file but instead was generated at binary package build time,
at which time not all necessary environment variables were available.
This change will create a patch file on-the-fly which gets
included in the source package that contains the correct information.

Fixes #9878.
---
 .github/workflows/deb-packaging.yml | 12 +++++++-----
 linux/.gitignore                    |  4 ++++
 linux/debian/control                |  1 +
 linux/scripts/reconf.sh             |  8 ++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 8cc431f1787..14ce64b9d1b 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -16,10 +16,8 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       VERSION: ${{ steps.version_step.outputs.VERSION }}
-      PRERELEASE_TAG: ${{ steps.prerelease_tag.outputs.PRERELEASE_TAG }}
       GIT_SHA: ${{ steps.set_status.outputs.GIT_SHA }}
-      GHA_TEST_BUILD: ${{ github.event.client_payload.isTestBuild }}
-      GHA_BRANCH: ${{ github.event.client_payload.branch }}
+      PRERELEASE_TAG: ${{ steps.prerelease_tag.outputs.PRERELEASE_TAG }}
     steps:
     - name: Checkout
       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
@@ -53,10 +51,14 @@ jobs:
         ./scripts/deb-packaging.sh --gha dependencies
 
     - name: Build source package
+      id: build_source_package
       run: |
-        TIER=$(cat TIER.md)
-        export TIER
+        export TIER=$(cat TIER.md)
+        export GHA_TEST_BUILD="${{ github.event.client_payload.isTestBuild }}"
+        export GHA_BRANCH="${{ github.event.client_payload.branch }}"
         echo "TIER=$TIER" >> $GITHUB_ENV
+        echo "GHA_TEST_BUILD=${GHA_TEST_BUILD}" >> $GITHUB_ENV
+        echo "GHA_BRANCH=${GHA_BRANCH}" >> $GITHUB_ENV
         cd linux
         ./scripts/deb-packaging.sh --gha source
 
diff --git a/linux/.gitignore b/linux/.gitignore
index 0abbd99c585..625bdd136cd 100644
--- a/linux/.gitignore
+++ b/linux/.gitignore
@@ -38,3 +38,7 @@ help/reference/
 
 # Debian watch file - we generate it from watch.in
 watch
+# Debian quilt metadata
+.pc/
+# Debian patch files will be re-generated
+debian/patches/
diff --git a/linux/debian/control b/linux/debian/control
index 9b5e217aba5..acf64ea7f6a 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -26,6 +26,7 @@ Build-Depends:
  python3-requests,
  python3-requests-cache,
  python3-setuptools,
+ quilt,
  meson (>= 0.53),
  ninja-build,
  libevdev-dev,
diff --git a/linux/scripts/reconf.sh b/linux/scripts/reconf.sh
index 49dfe21b1d0..c05148a818f 100755
--- a/linux/scripts/reconf.sh
+++ b/linux/scripts/reconf.sh
@@ -25,6 +25,12 @@ cd "$BASEDIR/keyman-config"
 ./build.sh clean
 
 cd "$BASEDIR/keyman-config/keyman_config"
+export QUILT_PATCHES="${BASEDIR}/debian/patches"
+export QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
+quilt push -a || true
+quilt new version_py.diff
+quilt add "version.py"
+
 sed \
     -e "s/_VERSION_/${VERSION}/g" \
     -e "s/_VERSIONWITHTAG_/${VERSION_WITH_TAG}/g" \
@@ -35,5 +41,7 @@ sed \
     -e "s/_ENVIRONMENT_/${VERSION_ENVIRONMENT}/g" \
     -e "s/_UPLOADSENTRY_/${UPLOAD_SENTRY}/g" \
     version.py.in > version.py
+quilt refresh
+quilt pop -a
 cd ../buildtools && python3 ./build-langtags.py
 cd "$BASEDIR"

From 517c300abc6ea6a198509ffd4463a48c4863db9b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 1 Nov 2023 22:48:22 +0700
Subject: [PATCH 18/67] chore(linux): Revert to repository_dispatch

This addresses code review comments. Also add readme how to manually
trigger a GHA build, e.g. for testing changes to the GHA.
---
 .github/workflows/deb-packaging.README.md | 22 ++++++++
 .github/workflows/deb-packaging.yml       | 66 +++++++++--------------
 resources/build/trigger-builds.inc.sh     | 28 +++++-----
 3 files changed, 61 insertions(+), 55 deletions(-)
 create mode 100644 .github/workflows/deb-packaging.README.md

diff --git a/.github/workflows/deb-packaging.README.md b/.github/workflows/deb-packaging.README.md
new file mode 100644
index 00000000000..a1b1c12d122
--- /dev/null
+++ b/.github/workflows/deb-packaging.README.md
@@ -0,0 +1,22 @@
+# Debian Packaging GitHub Action
+
+You can manually trigger a deb-packaging action on GitHub, e.g. to test changes:
+
+- push the changes to your fork of keymanapp/keyman: git push myfork HEAD:master
+- make sure you have GHA enabled in the settings of your fork and created an
+  access token on GitHub
+- trigger a build with:
+
+  ```bash
+   curl --write-out '\n' --request POST \
+    --header "Accept: application/vnd.github+json" \
+    --header "Authorization: token $GITHUB_TOKEN" \
+    --data "{ \"event_type\": \"deb-pr-packaging: master\", \
+    \"client_payload\": { \
+      \"buildSha\": \"$(git rev-parse refs/heads/master)\", \
+      \"headSha\": \"$(git rev-parse refs/heads/master)\", \
+      \"branch\": \"master\", \
+      \"isTestBuild\": \"true\"}" \
+    https://api.github.com/repos/<yourgithubname>/keyman/dispatches
+
+  ```
diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 8a61206497e..9dbf85b2c05 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -1,32 +1,16 @@
 name: "Ubuntu packaging"
-run-name: "Ubuntu packaging - ${{ github.event.inputs.branch }} (branch ${{ github.head_ref }}), by @${{ github.actor }}"
+run-name: "Ubuntu packaging - ${{ github.event.client_payload.branch }} (branch ${{ github.head_ref }}), by @${{ github.actor }}"
 on:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'For a PR `refs/pull/<PR-NUMBER>/merge`'
-        required: true
-      headRef:
-        description: 'The ref of HEAD. For a PR `refs/pull/<PR-NUMBER>/head`.'
-        required: true
-      branch:
-        description: 'The branch. For a PR `PR-<PR-NUMBER>`.'
-        required: true
-        default: 'master'
-      baseBranch:
-        description: 'For a PR the base branch, otherwise the same as `branch`.'
-        required: true
-        default: 'master'
-      baseRef:
-        description: 'The ref of the previous commit. For a PR the same as `baseBranch`.'
-        required: true
-      user:
-        description: 'The user that triggered the build or created the PR'
-        required: true
-      isTestBuild:
-        description: 'True if this is a test build. False if this is a release build.'
-        required: false
-        default: 'true'
+  repository_dispatch:
+    types: ['deb-release-packaging:*', 'deb-pr-packaging:*']
+
+# Input:
+# buildSha:    The SHA of the commit to build, e.g. of the branch or
+#              refs/pull/1234/merge for PR
+# headSha:     The SHA of the branch head. Same as buildSha for regular
+#              builds, SHA of refs/pull/1234/head for PRs
+# branch:      The branch to build, for a PR in the form `PR-1234`
+# isTestBuild: false for Releases, otherwise true
 
 env:
   COLOR_GREEN: "\e[32m"
@@ -46,17 +30,17 @@ jobs:
     - name: Checkout
       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       with:
-        ref: '${{ github.event.inputs.ref }}'
+        ref: '${{ github.event.client_payload.buildSha }}'
 
     - name: Set pending status on PR builds
       id: set_status
-      if: github.event.inputs.isTestBuild == 'true'
+      if: github.event.client_payload.isTestBuild == 'true'
       shell: bash
       run: |
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ github.sha }} \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.headSha }} \
           -f state='pending' \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description='Debian packaging started' \
@@ -92,8 +76,8 @@ jobs:
       id: prerelease_tag
       shell: bash
       run: |
-        if [ "${{ github.event.inputs.isTestBuild }}" == "true" ]; then
-          PRERELEASE_TAG="~${{ github.event.inputs.branch }}-$GITHUB_RUN_NUMBER.$GITHUB_RUN_ATTEMPT"
+        if [ "${{ github.event.client_payload.isTestBuild }}" == "true" ]; then
+          PRERELEASE_TAG="~${{ github.event.client_payload.branch }}-$GITHUB_RUN_NUMBER.$GITHUB_RUN_ATTEMPT"
         else
           PRERELEASE_TAG=""
         fi
@@ -101,10 +85,10 @@ jobs:
 
     - name: Output which branch or PR we're building plus name of .dsc file
       run: |
-        if [ "${{ github.event.inputs.isTestBuild }}" == "true" ]; then
-          echo ":checkered_flag: **Test build of version ${{ steps.version_step.outputs.VERSION }} for ${{ github.event.inputs.branch }}**" >> $GITHUB_STEP_SUMMARY
+        if [ "${{ github.event.client_payload.isTestBuild }}" == "true" ]; then
+          echo ":checkered_flag: **Test build of version ${{ steps.version_step.outputs.VERSION }} for ${{ github.event.client_payload.branch }}**" >> $GITHUB_STEP_SUMMARY
         else
-          echo ":ship: **Release build of ${{ github.event.inputs.branch }} branch (${{ github.event.inputs.ref}}), version ${{ steps.version_step.outputs.VERSION }}**" >> $GITHUB_STEP_SUMMARY
+          echo ":ship: **Release build of ${{ github.event.client_payload.branch }} branch (${{ github.event.client_payload.branch}}), version ${{ steps.version_step.outputs.VERSION }}**" >> $GITHUB_STEP_SUMMARY
         fi
         echo "" >> $GITHUB_STEP_SUMMARY
         echo ":gift: Generated source package:" >> $GITHUB_STEP_SUMMARY
@@ -166,7 +150,7 @@ jobs:
     needs: [sourcepackage, binary_packages]
     runs-on: ubuntu-latest
     environment: "deploy (linux)"
-    if: github.event.inputs.isTestBuild == 'false'
+    if: github.event.client_payload.isTestBuild == 'false'
 
     steps:
       - name: Sign packages
@@ -185,7 +169,7 @@ jobs:
     needs: [sourcepackage, deb_signing]
     runs-on: self-hosted
     environment: "deploy (linux)"
-    if: github.event.inputs.isTestBuild == 'false'
+    if: github.event.client_payload.isTestBuild == 'false'
 
     steps:
     - name: Install dput
@@ -215,7 +199,7 @@ jobs:
 
     - name: Upload
       run: |
-        case ${{ github.event.inputs.branch }} in
+        case ${{ github.event.client_payload.branch }} in
           stable-*)  destination='' ;;
           beta)      destination='-proposed' ;;
           *)         destination='-experimental' ;;
@@ -247,7 +231,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
       with:
-        ref: '${{ github.event.inputs.ref }}'
+        ref: '${{ github.event.client_payload.buildSha }}'
 
     - name: Download Artifacts
       uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
@@ -279,7 +263,7 @@ jobs:
     name: Set result status on PR builds
     needs: [sourcepackage, binary_packages, api_verification]
     runs-on: ubuntu-latest
-    if: ${{ always() && github.event.inputs.isTestBuild == 'true' }}
+    if: ${{ always() && github.event.client_payload.isTestBuild == 'true' }}
     steps:
     - name: Set success
       if: needs.sourcepackage.result == 'success' && needs.binary_packages.result == 'success' && needs.api_verification.result == 'success'
@@ -304,7 +288,7 @@ jobs:
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ github.sha }} \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.headSha }} \
           -f state="$RESULT" \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description="$MSG" \
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index 60e2b5c22cc..a8cbcfd4d88 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -69,33 +69,33 @@ function triggerGitHubActionsBuild() {
   local IS_TEST_BUILD="$1"
   local GITHUB_ACTION="$2"
   local GIT_BRANCH="${3:-master}"
-  local GIT_REF GIT_HEAD_REF
+  local GIT_BUILD_SHA GIT_HEAD_SHA
 
   local GITHUB_SERVER=https://api.github.com/repos/keymanapp/keyman
 
   if [ "${action:-""}" == "commit" ]; then
     # This will only be true if we created and pushed a tag
-    GIT_REF="refs/tags/release@$VERSION_WITH_TAG"
-    GIT_HEAD_REF="${GIT_REF}"
+    GIT_BUILD_SHA="$(git rev-parse "refs/tags/release@$VERSION_WITH_TAG")"
+    GIT_HEAD_SHA="${GIT_BUILD_SHA}"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${VERSION_WITH_TAG}"
   elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
-    GIT_REF="refs/pull/${GIT_BRANCH}/merge"
-    GIT_HEAD_REF="refs/pull/${GIT_BRANCH}/head"
+    GIT_BUILD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/merge")"
+    GIT_HEAD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/head")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
     GIT_BRANCH="PR-${GIT_BRANCH}"
   else
-    GIT_REF="refs/heads/${GIT_BRANCH}"
-    GIT_HEAD_REF="${GIT_REF}"
+    GIT_BUILD_SHA="$(git rev-parse "refs/heads/${GIT_BRANCH}")"
+    GIT_HEAD_SHA="${GIT_BUILD_SHA}"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: ${GIT_BRANCH}"
   fi
 
   local DATA="{
-    \"ref\": \"$GIT_REF\", \
-    \"inputs\": { \
-        \"ref\": \"$GIT_REF\", \
-        \"headRef\": \"$GIT_HEAD_REF\", \
-        \"branch\": \"$GIT_BRANCH\", \
-        \"isTestBuild\": \"$IS_TEST_BUILD\" \
+    \"event_type\": \"$GIT_EVENT_TYPE\", \
+    \"client_payload\": { \
+      \"buildSha\": \"$GIT_BUILD_SHA\", \
+      \"headSha\": \"$GIT_HEAD_SHA\", \
+      \"branch\": \"$GIT_BRANCH\", \
+      \"isTestBuild\": \"$IS_TEST_BUILD\" \
     }}"
 
   echo "GitHub Action Data: $DATA"
@@ -107,5 +107,5 @@ function triggerGitHubActionsBuild() {
     --header "Accept: application/vnd.github+json" \
     --header "Authorization: token $GITHUB_TOKEN" \
     --data "$DATA" \
-    ${GITHUB_SERVER}/actions/workflows/deb-packaging.yml/dispatches
+    ${GITHUB_SERVER}/dispatches
 }

From fd1e6bde10566e99e755f7b48671c858b15a359b Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Thu, 2 Nov 2023 14:05:06 -0400
Subject: [PATCH 19/67] auto: increment master version to 17.0.205

---
 HISTORY.md | 20 ++++++++++++++++++++
 VERSION.md |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 8bc6b8f02aa..a861f08d306 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,25 @@
 # Keyman Version History
 
+## 17.0.204 alpha 2023-11-02
+
+* fix(web): fixes doc-kbd display of default layer when it's not defined first (#9891)
+* fix(developer): compiler crash when no project loaded (#9898)
+* fix(developer): debug flag for compiling keyboards (#9901)
+* chore(developer): verify kmp.json output from kmc-package (#9844)
+* fix(developer): Project MRU now saves correctly (#9902)
+* chore(common): fixup SchemaValidators error handling (#9903)
+* chore(developer): change field label to 'Related Package ID' in Related Packages dialog (#9904)
+* fix(developer): open editor links in new window (#9905)
+* fix(developer): enable and update unit tests (#9907)
+* fix(developer): layout builder - maintain presentation during undo (#9914)
+* feat(developer): extract font family from .ttf in kmc-keyboard-info (#9859)
+* fix(developer): raise error if virtual key in context string (#9908)
+* feat(developer): Compile button in TIKE toolbar (#9910)
+* chore(developer): rename messages.ts for clarity (#9920)
+* fix(developer): warn if layer switch key is missing ID (#9921)
+* fix(developer): restore selection in layout builder even with duplicate ids (#9922)
+* fix(developer): enable line breaks in debugger (#9906)
+
 ## 17.0.203 alpha 2023-10-30
 
 * fix(linux): Fix uninstallation of shared keyboard (#9880)
diff --git a/VERSION.md b/VERSION.md
index d8de415ab0b..015caead570 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-17.0.204
\ No newline at end of file
+17.0.205
\ No newline at end of file

From bfac2795d1acccdc1f6de3e0d2e3334202b229ed Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 3 Nov 2023 04:57:32 +0700
Subject: [PATCH 20/67] fix(developer): Fix JSON

---
 .../auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
index e43108aa1e5..9d8c34ef083 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
@@ -114,8 +114,8 @@
               },
               {
                 "id": "K_X",
-                "text": "*Enter*"
-                "sp": "1",
+                "text": "*Enter*",
+                "sp": "1"
               },
               {
                 "id": "K_C",

From 09411eba33cd0f9cdc819fa00c0f4fb28735e796 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 31 Oct 2023 17:41:53 -0500
Subject: [PATCH 21/67] =?UTF-8?q?feat(common):=20ldml=20update=20to=20WIP?=
 =?UTF-8?q?=20cldr=20data=20=F0=9F=99=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- bn-bengali with a basic test
- fr-optimise
- note: disabling bengali reorders for now, not working properly due to tertiary reordering feat(core): tertiary reorders 🙀  #9707

For: #9916
---
 core/tests/unit/ldml/keyboards/meson.build    |   4 +-
 .../ldml-keyboards/techpreview/3.0/bn.xml     | 172 ++++++++++++++
 .../techpreview/3.0/fr-t-k0-optimise-test.xml |  16 ++
 .../techpreview/3.0/fr-t-k0-optimise.xml      | 200 ++++++++++++++++
 .../techpreview/3.0/fr-t-k0-test-test.xml     |  22 ++
 .../techpreview/3.0/fr-t-k0-test.xml          | 213 ++++++++++++++++++
 .../techpreview/test/bn-test.xml              |  26 +++
 7 files changed, 652 insertions(+), 1 deletion(-)
 create mode 100644 resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml
 create mode 100644 resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise-test.xml
 create mode 100644 resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise.xml
 create mode 100644 resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test-test.xml
 create mode 100644 resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test.xml
 create mode 100644 resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml

diff --git a/core/tests/unit/ldml/keyboards/meson.build b/core/tests/unit/ldml/keyboards/meson.build
index 89077fabaca..f4b7f23a29d 100644
--- a/core/tests/unit/ldml/keyboards/meson.build
+++ b/core/tests/unit/ldml/keyboards/meson.build
@@ -10,8 +10,10 @@
 tests_from_cldr = [
   'ja-Latn',
   'pt-t-k0-abnt2',
-  'fr-t-k0-azerty',
+  # 'fr-t-k0-optimise', (not yet)
+  # 'fr-t-k0-test',
   'pcm',
+  'bn',
 ]
 
 tests_without_testdata = [
diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml
new file mode 100644
index 00000000000..fc04ec3cbca
--- /dev/null
+++ b/resources/standards-data/ldml-keyboards/techpreview/3.0/bn.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd">
+<keyboard3 locale="bn" conformsTo="techpreview">
+    <!--
+        History:
+          Based on
+    https://github.com/keymanapp/ldml-keyboards-dev/blob/master/keyboards/sil-bengali/bn-t-k0-cldr-phonetic.ldml
+     -->
+    <locales>
+        <locale id="as" />
+        <locale id="syl" />
+    </locales>
+    <version number="1.3.0" />
+    <info name="SIL Bengali-Assamese Phonetic" indicator="bn" layout="QWERTY" />
+
+    <keys>
+        <import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
+        <import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+
+        <!-- key names based on https://www.loc.gov/catdir/cpso/romanization/bengali.pdf + Assamese for /wa/ -->
+
+        <!-- UNSHIFTED KEYS -->
+        <!-- E: (top) row -->
+        <key id="candrabindu" output="\u{0981}" /> <!-- n̐  -->
+        <key id="1" output="১" />
+        <key id="2" output="২" />
+        <key id="3" output="৩" />
+        <key id="4" output="৪" />
+        <key id="5" output="৫" />
+        <key id="6" output="৬" />
+        <key id="7" output="৭" />
+        <key id="8" output="৮" />
+        <key id="9" output="৯" />
+        <key id="0" output="০" />
+        <!-- hyphen -->
+        <!-- equal -->
+
+        <!-- D: -->
+        <key id="more" output="\m{q}" /> <!-- 'additional characters' -->
+        <key id="wa" output="ৱ" /> <!-- Assamese-->
+        <key id="e" output="\u{09C7}" />
+        <key id="ra" output="র" />
+        <key id="ta" output="ত" />
+        <key id="sha" output="য" />
+        <key id="u" output="\u{09C1}" />
+        <key id="i" output="\u{09BF}" />
+        <key id="o" output="\u{09CB}" />
+        <key id="pa" output="প" />
+
+        <!-- C: -->
+        <key id="ā" output="\u{09BE}" />
+        <key id="sa" output="স" />
+        <key id="da" output="দ" />
+        <key id="ṭa" output="ট" />
+        <key id="ga" output="গ" />
+        <key id="ha" output="হ" />
+        <key id="ja" output="জ" />
+        <key id="ka" output="ক" />
+        <key id="la" output="ল" />
+
+        <!-- B: -->
+        <key id="śa" output="শ" />
+        <key id="hasant" output="\u{09CD}" />
+        <key id="ca" output="চ" />
+        <key id="ḍa" output="ড" />
+        <key id="ba" output="ব" />
+        <key id="na" output="ন" />
+        <key id="ma" output="ম" />
+        <!-- comma -->
+        <key id="dahri" output="।" />
+
+
+        <!-- SHIFTED KEYS -->
+        <key id="ṃ" output="\u{0982}" />
+        <!-- exclam, etc -->
+
+        <!-- gap -->
+        <key id="ña" output="ঞ" />
+        <key id="ai" output="\u{09C8}" />
+        <key id="ṛ" output="\u{09C3}" />
+        <key id="tha" output="থ" />
+        <key id="ẏa" output="য়" /> <!-- Missing in Keyman version of file-->
+        <key id="ū" output="\u{09C2}" />
+        <key id="ī" output="\u{09C0}" />
+        <key id="au" output="\u{09CC}" />
+        <key id="pha" output="ফ" />
+
+        <key id="lengthener" output="\m{A}" />
+        <key id="sha" output="ষ" />
+        <key id="dha" output="ধ" />
+        <key id="ṭha" output="ঠ" />
+        <key id="gha" output="ঘ" />
+        <!-- gap -->
+        <key id="jha" output="ঝ" />
+        <key id="kha" output="খ" />
+        <!-- gap -->
+
+        <!-- gap -->
+        <key id="vis-hasant" output="\m{X}" />
+        <key id="cha" output="ছ" />
+        <key id="ḍha" output="ঢ" />
+        <key id="bha" output="ভ" />
+        <key id="ṇa" output="ণ" />
+        <key id="ṅa" output="ঙ" />
+        <!-- less-than -->
+        <key id="nukta" output="\u{09BC}" />
+        <!-- question -->
+
+
+    </keys>
+    <layers formId="us">
+        <layer modifiers="none">
+            <row keys="candrabindu 1 2 3 4 5 6 7 8 9 0 hyphen equal" />
+            <row keys="more wa e ra ta sha u i o pa open-square close-square backslash" />
+            <row keys="ā sa da ṭa ga ha ja ka la semi-colon apos" />
+            <row keys="śa hasant ca ḍa ba na ma comma dahri slash" />
+            <row keys="space" />
+        </layer>
+        <layer modifiers="shift">
+            <row
+                keys="ṃ bang at hash dollar percent caret amp asterisk open-paren close-paren underscore plus" />
+            <row keys="gap ña ai ṛ tha ẏa ū ī au pha open-curly close-curly pipe" />
+            <row keys="lengthener sha dha ṭha gha gap jha kha gap colon double-quote" />
+            <row keys="gap vis-hasant cha ḍha bha ṇa ṅa open-angle nukta question" />
+            <row keys="space" />
+        </layer>
+    </layers>
+
+    <transforms type="simple">
+        <transformGroup>
+            <transform from="\u{09C7}\m{A}" to="\u{09CC}" /> <!-- E + lengthener = AU -->
+            <!-- <transform from="\u{09C7}\u{09BE}" to="\u09CB" /> --> <!-- E + O = O This is handled by normalization. -->
+
+            <!-- these suport the 'q' key -->
+            <transform from="\m{q}:" to="\u{0983}" />
+            <transform from="\m{q}L" to="ৡ" />
+            <transform from="\m{q}।" to="॥" />
+            <transform from="\m{q}ড" to="ড়" />
+            <transform from="\m{q}ঢ" to="ঢ়" />
+            <transform from="\m{q}ত" to="ৎ" />
+            <transform from="\m{q}য" to="য়" />
+            <transform from="\m{q}র" to="ৰ" />
+            <transform from="\m{q}ল" to="ঌ" />
+            <transform from="\m{q}\u{09BE}" to="অ" />
+            <transform from="\m{q}\u{09BF}" to="ই" />
+            <transform from="\m{q}\u{09C0}" to="ঈ" />
+            <transform from="\m{q}\u{09C1}" to="উ" />
+            <transform from="\m{q}\u{09C2}" to="ঊ" />
+            <transform from="\m{q}\u{09C3}" to="ৠ" />
+            <transform from="\m{q}\u{09C7}" to="এ" />
+            <transform from="\m{q}\u{09C8}" to="ঐ" />
+            <transform from="\m{q}\u{09CB}" to="ও" />
+            <transform from="\m{q}\u{09CC}" to="ঔ" />
+            <transform from="\m{q}\m{A}" to="আ" />
+            <transform from="\m{q}\m{X}" to="\u{09CD}\u{200C}" /> <!-- virama + zwnj-->
+        </transformGroup>
+          <!-- TODO: document these -->
+          <!-- TODO-LDML: not working, probably due to #9707 -->
+          <!-- <transformGroup>
+            <reorder from="\u{09BC}" tertiary="3"/>
+            <reorder from="\u{09CD}[\u{0980}\u{0985}-\u{098C}\u{098F}\u{0990}\u{0993}-\u{09A8}\u{09AA}-\u{09B0}\u{09B2}\u{09B6}-\u{09B9}\u{09BD}\u{09DC}\u{09DD}\u{09DF}-\u{09E1}\u{09E6}-\u{09F1}\u{09FC}]" order="10" tertiaryBase="true"/>
+            <reorder from="\u{09CD}[\u{200C}\u{200D}][\u{0980}\u{0985}-\u{098C}\u{098F}\u{0990}\u{0993}-\u{09A8}\u{09AA}-\u{09B0}\u{09B2}\u{09B6}-\u{09B9}\u{09BD}\u{09DC}\u{09DD}\u{09DF}-\u{09E1}\u{09E6}-\u{09F1}\u{09FC}]" order="10" tertiaryBase="true"/>
+            <reorder from="\u{09CD}" order="120" tertiaryBase="true"/>
+            <reorder from="[\u{09BF}\u{09C7}\u{09C8}]" order="60"/>
+            <reorder from="[\u{09C1}-\u{09C4}\u{09E2}\u{09E3}]" order="70"/>
+            <reorder from="[\u{09BE}\u{09C0}\u{09CB}\u{09CC}]" order="75"/>
+            <reorder from="\u{0981}" order="85"/>
+            <reorder from="[\u{0982}\u{0983}]" order="95"/>
+            <reorder from="\u{09FE}" order="117"/>
+        </transformGroup> -->
+    </transforms>
+</keyboard3>
diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise-test.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise-test.xml
new file mode 100644
index 00000000000..593b8bd2e72
--- /dev/null
+++ b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise-test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
+    <info keyboard="fr-t-k0-optimise.xml" author="Team Keyboard" name="fr-test" />
+    <repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
+    <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
+    <tests name="key-tests">
+        <test name="key-test">
+            <startContext to="abc\u0022..."/>
+            <!-- tests by pressing key ids -->
+            <keystroke key="s"/>
+            <check result="abc\u0022...s" />
+            <!-- TODO -->
+        </test>
+    </tests>
+</keyboardTest3>
diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise.xml
new file mode 100644
index 00000000000..8db073cc763
--- /dev/null
+++ b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-optimise.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd">
+<!--
+  New French
+-->
+<keyboard3 locale="fr-t-k0-optimise" conformsTo="techpreview">
+	<version number="1.0.0" />
+	<info author="Team Keyboard" name="French AZERTY optimisé" layout="AZERTY" indicator="FR" />
+
+	<displays>
+    <display output="\u0300" display="${grave}" />
+    <display output="\m{acute}" display="´" />
+    <display output="\m{grave}" display="`" />
+    <display output="\m{umlaut}" display="¨" />
+    <display output="\m{caret}" display="^" />
+    <display output="\m{tilde}" display="~" />
+  </displays>
+
+	<keys>
+		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
+		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+
+		<!-- deadkeys -->
+		<key id="mark-acute" output="\m{acute}" />
+		<key id="mark-breve" output="\m{breve}" />
+		<key id="mark-caret" output="\m{caret}" />
+		<key id="mark-caron" output="\m{caron}" />
+		<key id="mark-cedilla" output="\m{cedilla}" />
+		<key id="mark-circumflex" output="\m{circumflex}" />
+		<key id="mark-comma" output="\m{comma}" />
+		<key id="mark-currency" output="\m{currency}" />
+		<key id="mark-dotabove" output="\m{dotabove}" />
+		<key id="mark-dotbelow" output="\m{dotbelow}" />
+		<key id="mark-doubleacute" output="\m{doubleacute}" />
+		<key id="mark-doublegrave" output="\m{doublegrave}" />
+		<key id="mark-euro" output="\m{euro}" />
+		<key id="mark-grave" output="\m{grave}" />
+		<key id="mark-macron" output="\m{macron}" />
+		<key id="mark-ogonek" output="\m{ogonek}" />
+		<key id="mark-ring" output="\m{ring}" />
+		<key id="mark-scientific" output="\m{scientific}" />
+		<key id="mark-solidus" output="\m{solidus}" />
+		<key id="mark-stroke" output="\m{stroke}" />
+		<key id="mark-submacron" output="\m{submacron}" />
+		<key id="mark-tilde" output="\m{tilde}" />
+		<key id="mark-umlaut" output="\m{umlaut}" />
+
+
+		<!-- extra keys -->
+		<key id="e-grave" output="è" />
+		<key id="e-acute" output="é" />
+		<key id="c-cedilla" output="ç" />
+		<key id="a-acute" output="á" />
+		<key id="a-grave" output="à" />
+		<key id="e-caret" output="ê" />
+
+		<!-- extra symbols -->
+		<key id="bullet" output="•" />
+		<key id="umlaut" output="¨" />
+		<key id="sub-2" output="₂" />
+		<key id="super-2" output="²" longPressKeyIds="sub-2" />
+		<key id="en-dash" output="–" />
+		<key id="plus-minus" output="±" />
+		<key id="vulgar-half" output="½" />
+		<key id="vulgar-quarter" output="¼" />
+		<key id="ellipsis" output="…" />
+		<key id="open-apos" output="‘" />
+		<key id="close-apos" output="’" />
+		<key id="open-g" output="«" />
+		<key id="close-g" output="»" />
+
+		<key id="theta" output="θ" /> <!-- "for Romani" -->
+		<key id="Theta" output="ϴ" /> <!-- "for Romani" -->
+		<key id="tm" output="™" />
+		<key id="open-double" output="“" />
+		<key id="close-double" output="’" />
+		<key id="oe" output="œ" />
+		<key id="Oe" output="Œ" />
+		<key id="registered" output="®" />
+		<key id="minus-sign" output="−" />
+		<key id="ss" output="ß" />
+		<key id="ininity" output="∞" />
+		<key id="division" output="÷" />
+		<key id="less-equal" output="≤" />
+		<key id="greater-equal" output="≥" />
+		<key id="copy" output="©" />
+		<key id="inverse-question" output="¿" />
+		<key id="inverse-bang" output="¡" />
+		<key id="middle-dot" output="•" />
+		<key id="A-grave" output="À" />
+		<key id="E-acute" output="É" />
+		<key id="E-caret" output="Ê" />
+		<key id="em-dash" output="—" />
+		<key id="open-single" output="’" />
+		<key id="close-single" output="’" />
+		<key id="u-grave" output="Ù" />
+		<key id="radix" output="√" />
+		<key id="C-cedilla" output="Ç" />
+		<key id="not-equal" output="±" />
+
+		<key id="infinity" output="∞" />
+		<key id="E-grave" output="È" />
+		<key id="U-grave" output="Ù" />
+		<key id="nb-hyphen" output="‑" />
+		<key id="multiplication" output="×" />
+		<key id="ezh" output="ʒ" />
+		<key id="Ezh" output="Ʒ" />
+		<key id="ae" output="æ" />
+		<key id="Ae" output="Æ" />
+		<key id="permille" output="‰" />
+		<key id="dbl-dagger" output="‡" />
+		<key id="dagger" output="†" />
+		<key id="asym-equal" output="≃" />
+		<key id="Ss" output="ẞ" />
+	</keys>
+
+	<layers formId="iso">
+		<layer modifiers="none">
+      <row keys="at a-grave e-acute e-grave e-caret open-paren close-paren open-apos close-apos open-g close-g apos mark-caret" />
+			<row keys="a z e r t y u i o p hyphen plus" />
+			<row keys="q s d f g h j k l m slash asterisk" />
+			<row keys="open-angle w x c v b n period comma colon semi-colon" />
+			<row keys="space" />
+		</layer>
+
+		<layer modifiers="shift">
+			<row keys="hash 1 2 3 4 5 6 7 8 9 0 double-quote mark-umlaut" />
+			<row keys="A Z E R T Y U I O P en-dash plus-minus" />
+			<row keys="Q S D F G H J K L M backslash vulgar-half" />
+			<row keys="close-angle W X C V B N question bang ellipsis equal" />
+			<row keys="space" />
+		</layer>
+
+		<layer modifiers="alt">
+			<row keys="mark-breve section mark-acute mark-grave amp open-square close-square mark-macron underscore open-double close-double degree mark-caron"/>
+			<row keys="ae pound euro registered open-curly close-curly u-grave mark-dotabove oe percent minus-sign dagger"/>
+			<row keys="theta ss dollar mark-currency mark-scientific mark-euro gap mark-solidus pipe infinity division multiplication"/>
+			<row keys="less-equal ezh copy c-cedilla mark-cedilla mark-stroke mark-tilde inverse-question inverse-bang middle-dot asym-equal"/>
+			<row keys="space" />
+		</layer>
+
+		<layer modifiers="alt shift">
+			<row keys="mark-circumflex A-grave E-acute E-grave E-caret mark-doubleacute mark-doublegrave gap em-dash open-single close-single mark-ring gap"/>
+			<row keys="Ae gap gap gap tm gap U-grave mark-dotbelow Oe permille nb-hyphen dbl-dagger"/>
+			<row keys="Theta Ss gap gap gap mark-submacron gap gap gap gap radix vulgar-quarter"/>
+			<row keys="greater-equal Ezh gap C-cedilla mark-ogonek gap gap gap mark-comma gap not-equal"/>
+			<row keys="space" />
+		</layer>
+	</layers>
+
+	<variables>
+		<!-- spacing accents as string variables -->
+		<string id="grave"  value="`" />
+		<string id="caret"  value="^" />
+		<string id="umlaut" value="¨" />
+		<string id="tilde"  value="~" />
+
+		<!-- sets representing vowels and accented vowels.  -->
+		<!-- There's an extra space between the lower and upper case for visual separation -->
+		<!-- but, there are only 10 items in the following four sets -->
+		<set id="vowel"       value="a e i o u  A E I O U" />
+		<set id="graveVowel"  value="à è ì ò ù  À È Ì Ò Ù" />
+		<set id="caretVowel"  value="â ê î ô û  Â Ê Î Ô Û" />
+		<set id="umlautVowel" value="ä ë ï ö ü  Ä Ë Ï Ö Ü" />
+
+		<!-- a set containing all spacing accents -->
+		<set id="spacing_accent" value="${grave} ${caret} ${umlaut} ${tilde}" />
+	</variables>
+
+	<transforms type="simple">
+		<transformGroup>
+			<!-- use sets for those that fit neatly into sets -->
+			<transform from="${grave}($[vowel])"  to="$[1:graveVowel]" />
+			<transform from="${caret}($[vowel])"  to="$[1:caretVowel]" />
+			<transform from="${umlaut}($[vowel])" to="$[1:umlautVowel]" />
+
+			<!-- y also takes umlaut (in this sample) -->
+			<transform from="${umlaut}y" to="ÿ" />
+
+			<!-- tilde is on a subset, not all vowels, + n -->
+			<transform from="${tilde}a" to="ã" />
+			<transform from="${tilde}A" to="Ã" />
+			<transform from="${tilde}n" to="ñ" />
+			<transform from="${tilde}N" to="Ñ" />
+			<transform from="${tilde}o" to="õ" />
+			<transform from="${tilde}O" to="Õ" />
+
+			<!-- accent + space = spacing accent -->
+			<transform from="($[spacing_accent]) " to="$1" />
+		</transformGroup>
+		<transformGroup>
+			<!-- this is a reorder group -->
+			<!-- nod-Lana partial example -->
+			<reorder from="\u1A60" order="127" />
+			<reorder from="\u1A6B" order="42" />
+			<reorder from="[\u1A75-\u1A79]" order="55" />
+			<!-- ... partial example ... -->
+		</transformGroup>
+	</transforms>
+</keyboard3>
diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test-test.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test-test.xml
new file mode 100644
index 00000000000..c03ce54362a
--- /dev/null
+++ b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test-test.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
+    <info keyboard="fr-t-k0-test.xml" author="Team Keyboard" name="fr-test" />
+    <repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
+    <repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
+    <tests name="key-tests">
+        <test name="key-test">
+            <startContext to="abc\u{0022}..."/>
+            <!-- tests by pressing key ids -->
+            <keystroke key="s"/>
+            <check result="abc\u{0022}...s" />
+            <keystroke key="t"/>
+            <check result="abc\u{0022}...st" />
+            <keystroke key="u"/>
+            <check result="abc\u{0022}...stu" />
+            <!-- tests by specifying 'to' output char -->
+            <emit to="v"/>
+            <check result="abc\u{0022}...stuv" />
+        </test>
+    </tests>
+</keyboardTest3>
diff --git a/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test.xml b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test.xml
new file mode 100644
index 00000000000..76b35304ef5
--- /dev/null
+++ b/resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-test.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboard3 SYSTEM "../dtd/ldmlKeyboard3.dtd">
+<!--
+    This file is part of the CLDR Keyboard Technical Preview.
+    This is a sample data file.
+    This file is subject to change.
+    Please see https://cldr.unicode.org/index/keyboard-workgroup for the latest information.
+
+	Also NOTE: this is really a test keyboard.  CLDR-12026 will be for the real new azerty keyboard
+-->
+<keyboard3 locale="fr-t-k0-test" conformsTo="techpreview">
+	<locales>
+		<locale id="br" /> <!-- example of including Breton -->
+	</locales>
+	<!-- 'conformsTo' gives CLDR spec conformance. Distinguishes from prior
+		keyboard formats -->
+	<!-- 'version' element is now optional -->
+	<version number="1.0.0" />
+	<info name="French Test AZERTY" author="Team Keyboard" layout="AZERTY" indicator="FR" />
+
+	<displays>
+		<!-- Note: displays is only used for keycap presentation -->
+		<!-- this example is not required for this keyboard as we use the spacing
+			modifiers -->
+		<display output="\u{0300}" display="${grave}" /> <!-- display combining grave as modifier letter grave ˋ -->
+		<!-- Note: We discussed why the existing displayMap was used for display.
+			rather than adding something closer to the key layout. 1. This way we can
+			tell the renderer what to do. Could be double diacritics, spacing issues,
+			etc. 2. We expect that keys have output. Otherwise the input content is malformed.
+			3. Don't Repeat Yourself : multiple keys (i.e. on different symbol layers)
+			may have the same display. -->
+
+		<!-- Example of a display mapping for a key by id -->
+		<display keyId="symbol" display="@" />
+		<display keyId="numeric" display="123" />
+		<displayOptions baseCharacter="x" />
+	</displays>
+
+	<keys>
+		<import base="cldr" path="techpreview/keys-Zyyy-punctuation.xml" />
+		<import base="cldr" path="techpreview/keys-Zyyy-currency.xml" />
+
+		<!-- switch keys -->
+		<key id="shift" layerId="shift" />
+		<key id="numeric" layerId="numeric" />
+		<key id="symbol" layerId="symbol" />
+		<key id="base" layerId="base" />
+
+		<!--
+			TODO: need discussion
+		<key id="bksp" gap="true" /> -->
+		<key id="extra" gap="true" />
+		<!--
+			TODO: need discussion
+		<key id="enter" to="\u{000A}" />
+		-->
+		<key id="enter" gap="true" />
+
+		<!-- extra keys -->
+		<key id="u-grave" output="ü" />
+		<key id="e-grave" output="é" /> <!-- 2 -->
+		<key id="e-acute" output="è" /> <!-- 7 -->
+		<key id="c-cedilla" output="ç" /> <!-- 9 -->
+		<key id="a-grave" output="à"  />
+		<key id="a-acute" output="á" />
+		<key id="a-caret" output="â" />
+		<key id="a-umlaut" output="ä" />
+		<key id="a-tilde" output="ã" />
+		<key id="a-ring" output="å" />
+		<key id="a-caron" output="ā" />
+
+		<key id="A-grave" output="À" /> <!-- 0 -->
+		<key id="A-acute" output="Á" />
+		<key id="A-caret" output="Â" />
+		<key id="A-umlaut" output="Ä" />
+		<key id="A-tilde" output="Ã" />
+		<key id="A-ring" output="Å" />
+		<key id="A-caron" output="Ā" />
+
+
+		<!-- extra symbols -->
+		<key id="bullet" output="•" />
+		<key id="umlaut" output="¨" />
+		<key id="super-2" output="²" multiTapKeyIds="sub-2 2" /> <!-- taps produce: ² ₂ 2 -->
+		<key id="sub-2" output="₂" />
+
+		<!-- note that a-caret is the default-->
+		<key id="a" flickId="a" output="a"
+			longPressKeyIds="a-grave a-caret a-acute a-umlaut a-tilde a-ring a-caron"
+			longPressDefaultKeyId="a-caret" />
+		<!-- note that A-caret is the default-->
+		<key id="A" flickId="b" output="A"
+			longPressKeyIds="A-grave A-caret A-acute A-umlaut a-tilde A-ring A-caron"
+			longPressDefaultKeyId="A-caret" />
+	</keys>
+
+	<flicks>
+		<flick id="b">
+			<flickSegment directions="nw" keyId="A-grave" />
+			<flickSegment directions="nw se" keyId="A-acute" />
+			<flickSegment directions="e" keyId="A-caron" />
+			<flickSegment directions="s" keyId="numeric" /> <!-- layer shifting flick-->
+		</flick>
+		<flick id="a">
+			<flickSegment directions="nw" keyId="a-grave" />
+			<flickSegment directions="nw se" keyId="a-acute" />
+			<flickSegment directions="e" keyId="a-caron" />
+		</flick>
+	</flicks>
+
+	<layers formId="iso">
+		<!-- in DTD: required if conformsTo ≥ 41 -->
+		<layer modifiers="none">
+			<row
+				keys="super-2 amp e-grave double-quote apos open-paren hyphen e-acute underscore c-cedilla a-acute close-paren equal" />
+			<row keys="a z e r t y u i o p caret dollar" />
+			<row keys="q s d f g h j k l m u-grave asterisk" />
+			<row keys="open-angle w x c v b n comma semi-colon colon bang" />
+			<row keys="space" />
+		</layer>
+
+		<layer modifiers="shift">
+			<row keys="1 2 3 4 5 6 7 8 9 0 degree plus" />
+			<row keys="A Z E R T Y U I O P umlaut pound" />
+			<row keys="Q S D F G H J K L M percent micro" />
+			<row keys="close-angle W X C V B N question period slash section" />
+			<row keys="space" />
+		</layer>
+	</layers>
+
+	<layers formId="touch" minDeviceWidth="150">
+		<!-- optional attribute for min physical device size -->
+		<layer id="base">
+			<row keys="a z e r t y u i o p" />
+			<row keys="q s d f g h j k l m" />
+			<row keys="shift gap w x c v b n gap" /> <!--TODO:  + bksp -->
+			<row keys="numeric extra space enter" />
+		</layer>
+
+		<layer id="shift">
+			<row keys="A Z E R T Y U I O P" />
+			<row keys="Q S D F G H J K L M" />
+			<row keys="base W X C V B N" />  <!--TODO:  + bksp -->
+			<row keys="numeric extra space enter" />
+		</layer>
+
+		<layer id="numeric">
+			<row keys="1 2 3 4 5 6 7 8 9 0" />
+			<row
+				keys="hyphen slash colon semi-colon open-paren close-paren dollar amp at double-quote" />
+			<row keys="symbol period comma question bang double-quote" /> <!--TODO:  + bksp -->
+			<row keys="base extra space enter" />
+		</layer>
+
+		<layer id="symbol">
+			<row
+				keys="open-square close-square open-curly close-curly hash percent caret asterisk plus equal" />
+			<row keys="underscore backslash pipe tilde open-angle close-angle euro pound yen bullet" />
+			<row keys="numeric period comma question bang double-quote" /> <!--TODO:  + bksp -->
+			<row keys="base extra space enter" />
+		</layer>
+	</layers>
+
+	<variables>
+		<!-- spacing accents as string variables -->
+		<string id="grave"  value="`" />
+		<string id="caret"  value="^" />
+		<string id="umlaut" value="¨" />
+		<string id="tilde"  value="~" />
+
+		<!-- sets representing vowels and accented vowels.  -->
+		<!-- There's an extra space between the lower and upper case for visual separation -->
+		<!-- but, there are only 10 items in the following four sets -->
+		<set id="vowel"       value="a e i o u  A E I O U" />
+		<set id="graveVowel"  value="à è ì ò ù  À È Ì Ò Ù" />
+		<set id="caretVowel"  value="â ê î ô û  Â Ê Î Ô Û" />
+		<set id="umlautVowel" value="ä ë ï ö ü  Ä Ë Ï Ö Ü" />
+
+		<!-- a set containing all spacing accents -->
+		<set id="spacing_accent" value="${grave} ${caret} ${umlaut} ${tilde}" />
+	</variables>
+
+	<transforms type="simple">
+		<transformGroup>
+			<!-- use sets for those that fit neatly into sets -->
+			<transform from="${grave}($[vowel])"  to="$[1:graveVowel]" />
+			<transform from="${caret}($[vowel])"  to="$[1:caretVowel]" />
+			<transform from="${umlaut}($[vowel])" to="$[1:umlautVowel]" />
+
+			<!-- y also takes umlaut (in this sample) -->
+			<transform from="${umlaut}y" to="ÿ" />
+
+			<!-- tilde is on a subset, not all vowels, + n -->
+			<transform from="${tilde}a" to="ã" />
+			<transform from="${tilde}A" to="Ã" />
+			<transform from="${tilde}n" to="ñ" />
+			<transform from="${tilde}N" to="Ñ" />
+			<transform from="${tilde}o" to="õ" />
+			<transform from="${tilde}O" to="Õ" />
+
+			<!-- accent + space = spacing accent -->
+			<transform from="($[spacing_accent]) " to="$1" />
+		</transformGroup>
+		<transformGroup>
+			<!-- this is a reorder group -->
+			<!-- nod-Lana partial example -->
+			<reorder from="\u{1A60}" order="127" />
+			<reorder from="\u{1A6B}" order="42" />
+			<reorder from="[\u{1A75}-\u{1A79}]" order="55" />
+			<!-- ... partial example ... -->
+		</transformGroup>
+	</transforms>
+</keyboard3>
diff --git a/resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml b/resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml
new file mode 100644
index 00000000000..ba0d7d84302
--- /dev/null
+++ b/resources/standards-data/ldml-keyboards/techpreview/test/bn-test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE keyboardTest3 SYSTEM "../dtd/ldmlKeyboardTest3.dtd">
+<keyboardTest3 conformsTo="techpreview">
+    <info keyboard="bn.xml" author="Team Keyboard" name="bn-test" />
+    <tests name="tests">
+        <test name="au">
+            <startContext to=""/>
+            <keystroke key="ka"/>
+            <keystroke key="e"/>
+            <keystroke key="lengthener"/>
+            <check result="কৌ" /> <!-- ka + AU -->
+        </test>
+        <test name="greetings">
+          <startContext to="" />
+          <keystroke key="śa"/>
+          <keystroke key="u"/>
+          <keystroke key="bha"/>
+          <keystroke key="e"/>
+          <keystroke key="ca"/>
+          <keystroke key="hasant"/>
+          <keystroke key="cha"/>
+          <keystroke key="ā"/>
+          <check result="শুভেচ্ছা"/>
+        </test>
+    </tests>
+</keyboardTest3>

From 16cd8a6e17d4844e1d8ec4c6068bf1f0fd52c6f3 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 3 Nov 2023 06:35:47 +0700
Subject: [PATCH 22/67] fix(developer): Define special touch layout key for
 other tests

---
 .../auto/kmcomp/test_194_filename_case.keyman-touch-layout   | 5 +++--
 .../auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout
index 7c36c893249..9d8c34ef083 100644
--- a/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout
@@ -114,7 +114,8 @@
               },
               {
                 "id": "K_X",
-                "text": "*Enter*"
+                "text": "*Enter*",
+                "sp": "1"
               },
               {
                 "id": "K_C",
@@ -665,4 +666,4 @@
     ],
     "displayUnderlying": false
   }
-}
\ No newline at end of file
+}
diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
index 7c36c893249..9d8c34ef083 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
@@ -114,7 +114,8 @@
               },
               {
                 "id": "K_X",
-                "text": "*Enter*"
+                "text": "*Enter*",
+                "sp": "1"
               },
               {
                 "id": "K_C",
@@ -665,4 +666,4 @@
     ],
     "displayUnderlying": false
   }
-}
\ No newline at end of file
+}

From a02dde9f1ccf664500fe0899f814c20151e2e68e Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Fri, 3 Nov 2023 07:50:44 +0700
Subject: [PATCH 23/67] fix(developer): Revert 14_1

---
 .../test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout  | 1 -
 .../test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
index 9d8c34ef083..0fe6efcf550 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
@@ -115,7 +115,6 @@
               {
                 "id": "K_X",
                 "text": "*Enter*",
-                "sp": "1"
               },
               {
                 "id": "K_C",
diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout
index 6705864636a..577ff750258 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout
@@ -665,4 +665,4 @@
     ],
     "displayUnderlying": false
   }
-}
\ No newline at end of file
+}

From 186132dcb96090774662097108171a3e42e0b5ca Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 3 Nov 2023 12:29:56 +0700
Subject: [PATCH 24/67] fix(developer): kmc code generation for context(n) in
 context

Fixes #9930.

* Fixes the index offset calculation, with +1 for >=v10.0 keyboards and
  -1 for <v10.0 keyboards (difference is because older version keyboards
  have context offsets calculated in the opposite direction). Note that
  this happened because the `CODE_CONTEXTEX` index is stored in memory
  as 0-based in kmc, but was 1-based in kmcomp.

* Adds unit tests for v9.0 and v10.0 keyboards for `context(n)` in
  context.

* Adds unit tests for v9.0 and v10.0 keyboards for `context(n)` in
  output. These were already correct but now we can be assured that
  they are being tested.

* Enables code coverage for kmw-compiler, and sets a lower threshold for
  pass because coverage is still just over 70%.
---
 developer/src/kmc-kmn/build.sh                |  6 ++-
 developer/src/kmc-kmn/package.json            |  1 -
 .../src/kmw-compiler/javascript-strings.ts    |  4 +-
 .../fixtures/kmw/test_context_in_context.js   | 54 +++++++++++++++++++
 .../fixtures/kmw/test_context_in_context.kmn  | 17 ++++++
 .../fixtures/kmw/test_context_in_context_9.js | 47 ++++++++++++++++
 .../kmw/test_context_in_context_9.kmn         | 17 ++++++
 .../fixtures/kmw/test_contextn_in_output.js   | 44 +++++++++++++++
 .../fixtures/kmw/test_contextn_in_output.kmn  | 13 +++++
 .../fixtures/kmw/test_contextn_in_output_9.js | 38 +++++++++++++
 .../kmw/test_contextn_in_output_9.kmn         | 13 +++++
 .../src/kmc-kmn/test/kmw/test-kmw-compiler.ts | 24 +++++++--
 12 files changed, 270 insertions(+), 8 deletions(-)
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.js
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.kmn
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.js
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.kmn
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.js
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.kmn
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.js
 create mode 100644 developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.kmn

diff --git a/developer/src/kmc-kmn/build.sh b/developer/src/kmc-kmn/build.sh
index 7766610ac7a..a6163d9eaf1 100755
--- a/developer/src/kmc-kmn/build.sh
+++ b/developer/src/kmc-kmn/build.sh
@@ -70,7 +70,11 @@ if builder_start_action test; then
   copy_deps
   tsc --build test/
   npm run lint
-  c8 --reporter=lcov --reporter=text --exclude-after-remap mocha "${builder_extra_params[@]}"
+  readonly C8_THRESHOLD=70
+  c8 --reporter=lcov --reporter=text --lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD mocha
+  builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
+  builder_echo warning "Please increase threshold in build.sh as test coverage improves."
+
   builder_finish_action success test
 fi
 
diff --git a/developer/src/kmc-kmn/package.json b/developer/src/kmc-kmn/package.json
index 5802c859055..4105c04b9e8 100644
--- a/developer/src/kmc-kmn/package.json
+++ b/developer/src/kmc-kmn/package.json
@@ -61,7 +61,6 @@
     "exclude-after-remap": true,
     "exclude": [
       "src/import/",
-      "src/kmw-compiler",
       "test/"
     ]
   },
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
index 7c59f69e6f9..bafbae2794a 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
@@ -482,7 +482,7 @@ function JavaScript_CompositeContextValue(fk: KMX.KEYBOARD, fkp: KMX.KEY, pwsz:
         Cur--; // don't increment on ifsystemstore -- correlates with AdjustIndex function   // I3910
         break;
       case KMX.KMXFile.CODE_CONTEXTEX:   // I3980
-        Result += `k.KCCM(${Len-Cur},${Len-rec.ContextEx.Index+1},t)`;
+        Result += `k.KCCM(${Len-Cur},${Len-rec.ContextEx.Index},t)`;
         break;
       case KMX.KMXFile.CODE_NOTANY:   // I3981
         CheckStoreForInvalidFunctions(fk, fkp, rec.Any.Store);  // I1520
@@ -572,7 +572,7 @@ function JavaScript_FullContextValue(fk: KMX.KEYBOARD, fkp: KMX.KEY, pwsz: strin
         FullContext += `{t:'a',a:this.s${JavaScript_Name(rec.Any.StoreIndex, rec.Any.Store.dpName)},n:1}`;
         break;
       case KMX.KMXFile.CODE_CONTEXTEX:
-        FullContext += `{t:'c',c:${rec.ContextEx.Index}}`;   // I4611
+        FullContext += `{t:'c',c:${rec.ContextEx.Index+1}}`;   // I4611
         break;
       case KMX.KMXFile.CODE_INDEX:
         FullContext += `{t:'i',i:this.s${JavaScript_Name(rec.Index.StoreIndex, rec.Index.Store.dpName)},`+
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.js b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.js
new file mode 100644
index 00000000000..3e401d6241c
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.js
@@ -0,0 +1,54 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_test_context_in_context());
+}
+function Keyboard_test_context_in_context()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_test_context_in_context";
+  this.KN="test context(n) in context, #9930";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.SHIFT /* 0x0010 */;
+  this.s_liveQwerty_6="qwerty";
+  this.s_deadQwerty_7=[{t:'d',d:0},{t:'d',d:1},{t:'d',d:2},{t:'d',d:3},{t:'d',d:4},{t:'d',d:5}];
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_1 /* 0x31 */)) {
+      if(k.KFCM(1,t,[{t:'a',a:this.s_liveQwerty_6}])){
+        r=m=1;   // Line 13
+        k.KDC(1,t);
+        k.KO(-1,t,"?");
+        k.KIO(-1,this.s_deadQwerty_7,1,t);
+        k.KIO(-1,this.s_deadQwerty_7,1,t);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_PERIOD /* 0xBE */)) {
+      if(k.KFCM(3,t,['?',{t:'a',a:this.s_deadQwerty_7},{t:'c',c:2}])){
+        r=m=1;   // Line 17
+        k.KDC(3,t);
+        k.KO(-1,t,"(");
+        k.KIO(-1,this.s_liveQwerty_6,2,t);
+        k.KIO(-1,this.s_liveQwerty_6,2,t);
+        k.KO(-1,t,")");
+      }
+    }
+    return r;
+  };
+}
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.kmn b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.kmn
new file mode 100644
index 00000000000..4854ef491ce
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context.kmn
@@ -0,0 +1,17 @@
+store(&VERSION) "10.0"
+store(&TARGETS) 'web'
+store(&NAME) 'test context(n) in context, #9930'
+
+begin Unicode > use(main)
+
+group(main) using keys
+
+store(liveQwerty) 'qwerty'
+store(deadQwerty) dk(q) dk(w) dk(e) dk(r) dk(t) dk(y)
+
+c any/index with deadkeys in stores.
+any(liveQwerty) + '!' > '?' index(deadQwerty, 1) index(deadQwerty, 1)
+
+c The rule below is misgenerated by kmc-17.0.205-alpha on `context(2)` statement;
+c see https://github.com/keymanapp/keyman/issues/9930
+'?' any(deadQwerty) context(2) + '.' > '(' index(liveQwerty, 2) index(liveQwerty, 2) ')'
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.js b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.js
new file mode 100644
index 00000000000..d4a6983ffe1
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.js
@@ -0,0 +1,47 @@
+
+KeymanWeb.KR(new Keyboard_test_context_in_context_9());
+
+function Keyboard_test_context_in_context_9()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_test_context_in_context_9";
+  this.KN="test context(n) in context, #9930, v9.0";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0010;
+  this.s_liveQwerty_6="qwerty";
+  this.s_deadQwerty_7="123456";
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4010, 0x31)) {
+      if(k.KA(0,k.KC(1,1,t),this.s_liveQwerty_6)){
+        r=m=1;   // Line 13
+        k.KO(1,t,"?");
+        k.KIO(-1,this.s_deadQwerty_7,1,t);
+        k.KIO(-1,this.s_deadQwerty_7,1,t);
+      }
+    }
+    else if(k.KKM(e, 0x4000, 0xBE)) {
+      if(k.KCM(3,t,"?",1)&&k.KA(1,k.KC(2,1,t),this.s_deadQwerty_7)&&k.KCCM(1,2,t)){
+        r=m=1;   // Line 17
+        k.KO(3,t,"(");
+        k.KIO(-1,this.s_liveQwerty_6,2,t);
+        k.KIO(-1,this.s_liveQwerty_6,2,t);
+        k.KO(-1,t,")");
+      }
+    }
+    return r;
+  };
+}
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.kmn b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.kmn
new file mode 100644
index 00000000000..6b06eb6cec0
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_context_in_context_9.kmn
@@ -0,0 +1,17 @@
+store(&VERSION) "9.0"
+store(&TARGETS) 'web'
+store(&NAME) 'test context(n) in context, #9930, v9.0'
+
+begin Unicode > use(main)
+
+group(main) using keys
+
+store(liveQwerty) 'qwerty'
+store(deadQwerty) '123456'
+
+c any/index with deadkeys in stores.
+any(liveQwerty) + '!' > '?' index(deadQwerty, 1) index(deadQwerty, 1)
+
+c The rule below is misgenerated by kmc-17.0.205-alpha on `context(2)` statement;
+c see https://github.com/keymanapp/keyman/issues/9930
+'?' any(deadQwerty) context(2) + '.' > '(' index(liveQwerty, 2) index(liveQwerty, 2) ')'
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.js b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.js
new file mode 100644
index 00000000000..da0c1b9477f
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.js
@@ -0,0 +1,44 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_test_contextn_in_output());
+}
+function Keyboard_test_contextn_in_output()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_test_contextn_in_output";
+  this.KN="test context(n) in output, #9930, v10.0";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=modCodes.SHIFT /* 0x0010 */;
+  this.s_liveQwerty_6="qwerty";
+  this.s_deadQwerty_7=[{t:'d',d:0},{t:'d',d:1},{t:'d',d:2},{t:'d',d:3},{t:'d',d:4},{t:'d',d:5}];
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.SHIFT | modCodes.VIRTUAL_KEY /* 0x4010 */, keyCodes.K_1 /* 0x31 */)) {
+      if(k.KFCM(2,t,[{t:'a',a:this.s_liveQwerty_6},'1'])){
+        r=m=1;   // Line 13
+        k.KDC(2,t);
+        k.KO(-1,t,"?");
+        k.KIO(-1,this.s_deadQwerty_7,1,t);
+        k.KO(-1,t,"1");
+      }
+    }
+    return r;
+  };
+}
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.kmn b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.kmn
new file mode 100644
index 00000000000..4a34730922b
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output.kmn
@@ -0,0 +1,13 @@
+store(&VERSION) "10.0"
+store(&TARGETS) 'web'
+store(&NAME) 'test context(n) in output, #9930, v10.0'
+
+begin Unicode > use(main)
+
+group(main) using keys
+
+store(liveQwerty) 'qwerty'
+store(deadQwerty) dk(q) dk(w) dk(e) dk(r) dk(t) dk(y)
+
+c any/index with deadkeys in stores.
+any(liveQwerty) '1' + '!' > '?' index(deadQwerty, 1) context(2)
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.js b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.js
new file mode 100644
index 00000000000..07755dc1752
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.js
@@ -0,0 +1,38 @@
+
+KeymanWeb.KR(new Keyboard_test_contextn_in_output_9());
+
+function Keyboard_test_contextn_in_output_9()
+{
+  
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_test_contextn_in_output_9";
+  this.KN="test context(n) in output, #9930, v9.0";
+  this.KMINVER="9.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0x0010;
+  this.s_liveQwerty_6="qwerty";
+  this.s_deadQwerty_7="123456";
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, 0x4010, 0x31)) {
+      if(k.KA(0,k.KC(2,1,t),this.s_liveQwerty_6)&&k.KCM(1,t,"1",1)){
+        r=m=1;   // Line 13
+        k.KO(2,t,"?");
+        k.KIO(-1,this.s_deadQwerty_7,1,t);
+        k.KO(-1,t,"1");
+      }
+    }
+    return r;
+  };
+}
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.kmn b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.kmn
new file mode 100644
index 00000000000..971d11694aa
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_contextn_in_output_9.kmn
@@ -0,0 +1,13 @@
+store(&VERSION) "9.0"
+store(&TARGETS) 'web'
+store(&NAME) 'test context(n) in output, #9930, v9.0'
+
+begin Unicode > use(main)
+
+group(main) using keys
+
+store(liveQwerty) 'qwerty'
+store(deadQwerty) '123456'
+
+c any/index with deadkeys in stores.
+any(liveQwerty) '1' + '!' > '?' index(deadQwerty, 1) context(2)
diff --git a/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts b/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts
index 42aa489a911..a7eecda019e 100644
--- a/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts
+++ b/developer/src/kmc-kmn/test/kmw/test-kmw-compiler.ts
@@ -35,11 +35,11 @@ describe('KeymanWeb Compiler', function() {
     callbacks.clear();
   });
 
-  it('should compile a complex keyboard', async function() {
+  it('should compile a complex keyboard', function() {
     run_test_keyboard(kmnCompiler, 'khmer_angkor');
   });
 
-  it('should handle option stores', async function() {
+  it('should handle option stores', function() {
     //
     // This is enough to verify that the option store is set appropriately with
     // KLOAD because the fixture has that code present:
@@ -49,7 +49,7 @@ describe('KeymanWeb Compiler', function() {
     run_test_keyboard(kmnCompiler, 'test_options');
   });
 
-  it('should translate every "character style" key correctly', async function() {
+  it('should translate every "character style" key correctly', function() {
     //
     // This is enough to verify that every character style key is encoded in the
     // same way as the fixture.
@@ -57,9 +57,25 @@ describe('KeymanWeb Compiler', function() {
     run_test_keyboard(kmnCompiler, 'test_keychars');
   });
 
-  it('should handle readonly groups', async function() {
+  it('should handle readonly groups', function() {
     run_test_keyboard(kmnCompiler, 'test_readonly_groups');
   });
+
+  it('should handle context(n) in output of rule, v10.0 generation', function() {
+    run_test_keyboard(kmnCompiler, 'test_contextn_in_output');
+  });
+
+  it('should handle context(n) in output of rule, v9.0 generation', function() {
+    run_test_keyboard(kmnCompiler, 'test_contextn_in_output_9');
+  });
+
+  it('should handle context(n) in context part of rule, v9.0 generation', function() {
+    run_test_keyboard(kmnCompiler, 'test_context_in_context_9');
+  });
+
+  it('should handle context(n) in context part of rule, v10.0 generation', function() {
+    run_test_keyboard(kmnCompiler, 'test_context_in_context');
+  });
 });
 
 

From 0aa4445ec82931e08944517d6af315bf010c6734 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 3 Nov 2023 12:49:18 +0700
Subject: [PATCH 25/67] docs(windows): update meson and emscripten details

* meson 1.2.3 is now available on choco
* emscripten 3.1.40 is currently latest available choco version
---
 docs/build/windows.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/build/windows.md b/docs/build/windows.md
index 81a96a4a209..da320f244e9 100644
--- a/docs/build/windows.md
+++ b/docs/build/windows.md
@@ -149,10 +149,8 @@ PowerShell.
 # Elevated PowerShell
 # for *much* faster download, hide progress bar (PowerShell/PowerShell#2138)
 $ProgressPreference = 'SilentlyContinue'
-choco install git jq python ninja pandoc
+choco install git jq python ninja pandoc meson
 refreshenv
-# choco meson (0.55) is too old, 1.0 required:
-python -m pip install meson
 ```
 
 **Environment variables**:
@@ -183,7 +181,7 @@ You can use Windows Settings to add these environment variables permanently:
 * KeymanWeb
 
 **Requirements**:
-* emscripten 3.1.32
+* emscripten 3.1.40
 * node.js 18+
 * [openjdk 11](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-11)+
 
@@ -193,7 +191,7 @@ You can use Windows Settings to add these environment variables permanently:
 # for *much* faster download, hide progress bar (PowerShell/PowerShell#2138)
 $ProgressPreference = 'SilentlyContinue'
 
-choco install emscripten
+choco install emscripten --version 3.1.40
 ```
 
 Note: emscripten very unhelpfully overwrites JAVA_HOME, and adds its own

From 3336539ec5f2864ed892c29976cb26a5c4b5e3d1 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 3 Nov 2023 13:24:05 +0700
Subject: [PATCH 26/67] chore(developer): remove obsolete 'Allow Multiple
 Instances' and 'Use Legacy Compiler' options

Fixes #9925.

Allow Multiple Instances is now always true.
Use Legacy Compiler did nothing (there is no legacy compiler!).
---
 .../windows/delphi/general/RegistryKeys.pas   | 32 +--------
 .../windows/delphi/general/UserMessages.pas   |  4 --
 developer/src/tike/dialogs/UfrmOptions.dfm    | 70 +++++++------------
 developer/src/tike/dialogs/UfrmOptions.pas    | 10 ---
 .../src/tike/main/KeymanDeveloperOptions.pas  | 14 ----
 .../src/tike/main/KeymanDeveloperUtils.pas    | 52 --------------
 developer/src/tike/main/UfrmMain.pas          | 26 -------
 developer/src/tike/tike.dpr                   |  3 +-
 8 files changed, 29 insertions(+), 182 deletions(-)

diff --git a/common/windows/delphi/general/RegistryKeys.pas b/common/windows/delphi/general/RegistryKeys.pas
index 57f865f9b29..62599851cd2 100644
--- a/common/windows/delphi/general/RegistryKeys.pas
+++ b/common/windows/delphi/general/RegistryKeys.pas
@@ -103,8 +103,7 @@ interface
 
   SRegValue_Engine_OEMProductPath = 'oem product path';
 
-//  SRegValue_UnknownLayoutID         = 'unknown layout id';                          // LM
-    SRegValue_Legacy_Default_UnknownLayoutID = '000005FE';   // I4220
+  SRegValue_Legacy_Default_UnknownLayoutID = '000005FE';   // I4220
 
   SRegValue_KeymanDebug             = 'debug';                                      // CU
 
@@ -112,11 +111,8 @@ interface
 
   SRegValue_ShowStartup             = 'show startup';                        // CU
   SRegValue_ShowWelcome             = 'show welcome';                        // CU
-  //SRegValue_NoCheckAssociations     = 'no check associations';                      // CU
   SRegValue_UseAdvancedInstall      = 'use advanced install';                       // CU
 
-//TOUCH    SRegValue_UseTouchLayout          = 'use touch layout';                           // CU, default false
-
   SRegValue_AltGrCtrlAlt                = 'simulate altgr';                         // CU
   SRegValue_KeyboardHotKeysAreToggle    = 'hotkeys are toggles';                    // CU
   SRegValue_ReleaseShiftKeysAfterKeyPress = 'release shift keys after key press';   // CU
@@ -171,9 +167,6 @@ interface
   SRegValue_DeadkeyConversionMode       = 'deadkey conversion mode';                // CU   // I4552
   SRegValue_UnderlyingLayout            = 'underlying layout';                      // CU
 
-//  SRegKey_AppInitDLLs                   = 'Software\Microsoft\Windows NT\CurrentVersion\Windows';  // LM
-//  SRegValue_AppInitDLLs                 = 'AppInit_DLLs';                                          // LM
-
   SRegKey_KeyboardLayoutToggle          = 'keyboard layout\toggle';                 // CU  // I2522
   SRegValue_Toggle_Hotkey               = 'Hotkey';
   SRegValue_Toggle_LanguageHotkey       = 'Language Hotkey';
@@ -272,10 +265,6 @@ interface
   SRegValue_CPIUP_CachedLanguageName = 'CachedLanguageName';
   SRegValue_CPIUP_InputMethodOverride = 'InputMethodOverride';
 
-  { User profile keys }
-
-  //SRegKey_NTProfileList = 'Software\Microsoft\Windows NT\CurrentVersion\ProfileList';
-
   { Font keys }
 
   SRegKey_FontList_LM   = 'Software\Microsoft\Windows\CurrentVersion\Fonts';           // LM
@@ -318,13 +307,6 @@ interface
   SRegKey_IDETestFonts_CU        = SRegKey_IDE_CU                 + '\TestFonts';           // CU
   SRegKey_IDEVisualKeyboard_CU   = SRegKey_IDE_CU                 + '\VisualKeyboard';      // CU
   SRegKey_IDEToolbars_CU         = SRegKey_IDE_CU                 + '\Toolbars';            // CU
-//  SRegKey_KCT                 = SRegKey_KeymanDeveloper_CU     + '\KCT';               // LM CU
-//  SRegKey_KCTFiles            = SRegKey_KCT_CU                 + '\Files';             // CU
-
-//  SRegKey_IDEOnline          = SRegKey_IDE_CU                + '\Online';              // CU
-//  SRegKey_IDE_BrandingPackTest = SRegKey_IDE_CU              + '\Branding Pack\Test';  // CU   // I4873
-
-//  SRegKey_CRM                = SRegKey_KeymanDeveloper    + '\CRM';                 // CU
 
   SRegValue_CheckForUpdates   = 'check for updates'; // CU
   SRegValue_LastUpdateCheckTime = 'last update check time'; // CU
@@ -335,8 +317,6 @@ interface
 
   SRegValue_KeepInTouchShown = 'keep in touch shown'; // CU. bool   // I4658
 
-  //SRegValue_OnlineUsername    = 'online username';
-  //SRegValue_OnlinePassword    = 'online password';
   SRegValue_OnlineLogin = 'online login';
 
   { SRegKey_CRM values }
@@ -349,7 +329,6 @@ interface
 
   { SRegKey_KeymanDeveloper values }
 
-  //SRegValue_ShowStartup             = 'show startup';                           // CU -- see Keyman option of same name
   SRegValue_Evaluation              = 'evaluation';                                 // CU
   SRegValue_ActiveProject           = 'active project';                             // CU
 
@@ -364,7 +343,6 @@ interface
 
   SRegValue_IDEMRU                 = 'MRU';                                        // CU
   SRegValue_CharMapSize             = 'char map size';                              // CU
-//SRegValue_IDERegressionTestPath  = 'regression test path';                       // CU
 
   { SRegKey_IDEVisualKeyboard values }
 
@@ -393,8 +371,6 @@ interface
   SRegValue_IDEOptAutoSaveBeforeCompiling = 'auto save before compiling'; // CU
   SRegValue_IDEOptOSKAutoSaveBeforeImporting = 'osk auto save before importing'; // CU
 
-  SRegValue_IDEOptUseLegacyCompiler = 'use legacy compiler'; // CU
-
   // Note: keeping 'web host port' reg value name to ensure settings maintained
   //       from version 14.0 and earlier of Keyman Developer. Other values are
   //       new with Keyman Developer 15.0
@@ -409,8 +385,6 @@ interface
   SRegValue_IDEOptCharMapDisableDatabaseLookups = 'char map disable database lookups';  // CU
   SRegValue_IDEOptCharMapAutoLookup             = 'char map auto lookup';               // CU
 
-  SRegValue_IDEOptMultipleInstances = 'multiple instances';                         // CU
-
   SRegValue_IDEOptOpenKeyboardFilesInSourceView = 'open keyboard files in source view';  // CU   // I4751
 
   SRegValue_IDEDisplayTheme = 'display theme';   // I4796
@@ -425,10 +399,6 @@ interface
 
   SRegValue_IDEOpt_DefaultProjectPath = 'default project path';
 
-  { SRegKey_KCT values }
-
-//  SRegValue_KCTTemplatePath = 'template path';                                      // LM
-
 {-------------------------------------------------------------------------------
  - Shared keys and values                                                      -
  ------------------------------------------------------------------------------}
diff --git a/common/windows/delphi/general/UserMessages.pas b/common/windows/delphi/general/UserMessages.pas
index 9480714f0a3..0b547891490 100644
--- a/common/windows/delphi/general/UserMessages.pas
+++ b/common/windows/delphi/general/UserMessages.pas
@@ -42,10 +42,6 @@ interface
   WM_USER_CheckFonts = WM_USER + 115;
 
 const
-  // KeymanDeveloperUtils
-  WM_USER_LOADREGFILES = WM_USER+120;
-  //WM_USER_FORMSHOWN = WM_USER+100;
-
   WC_COMMAND = 0;
   WC_HELP = 1;
   WC_OPENURL = 2;
diff --git a/developer/src/tike/dialogs/UfrmOptions.dfm b/developer/src/tike/dialogs/UfrmOptions.dfm
index d20db381fd7..3bff861879e 100644
--- a/developer/src/tike/dialogs/UfrmOptions.dfm
+++ b/developer/src/tike/dialogs/UfrmOptions.dfm
@@ -25,21 +25,21 @@ inherited frmOptions: TfrmOptions
       Caption = 'General'
       ImageIndex = 2
       object cmdProxySettings: TButton
-        Left = 8
-        Top = 209
+        Left = 7
+        Top = 185
         Width = 125
         Height = 25
         Caption = '&Proxy Settings...'
-        TabOrder = 5
+        TabOrder = 4
         OnClick = cmdProxySettingsClick
       end
       object gbExternalEditor: TGroupBox
-        Left = 8
-        Top = 71
+        Left = 7
+        Top = 47
         Width = 401
         Height = 45
         Caption = '&External Editor Path'
-        TabOrder = 2
+        TabOrder = 1
         object editExternalEditorPath: TEdit
           Left = 8
           Top = 16
@@ -57,46 +57,38 @@ inherited frmOptions: TfrmOptions
         end
       end
       object cmdSMTPSettings: TButton
-        Left = 8
-        Top = 240
+        Left = 7
+        Top = 216
         Width = 125
         Height = 25
         Caption = 'S&MTP Settings...'
-        TabOrder = 6
+        TabOrder = 5
         OnClick = cmdSMTPSettingsClick
       end
       object chkOpenKeyboardFilesInSourceView: TCheckBox
-        Left = 8
-        Top = 36
+        Left = 7
+        Top = 12
         Width = 221
         Height = 17
         Caption = 'Open &keyboard files in source view'
-        TabOrder = 1
+        TabOrder = 0
       end
       object cmdResetToolWindows: TButton
-        Left = 8
-        Top = 178
+        Left = 7
+        Top = 154
         Width = 125
         Height = 25
         Caption = '&Reset tool windows'
-        TabOrder = 4
+        TabOrder = 3
         OnClick = cmdResetToolWindowsClick
       end
-      object chkAllowMultipleInstances: TCheckBox
-        Left = 8
-        Top = 12
-        Width = 289
-        Height = 17
-        Caption = '&Allow multiple instances of Keyman Developer'
-        TabOrder = 0
-      end
       object gbDefaultProjectPath: TGroupBox
-        Left = 8
-        Top = 122
+        Left = 7
+        Top = 98
         Width = 401
         Height = 45
         Caption = '&Default Project Folder'
-        TabOrder = 3
+        TabOrder = 2
         object editDefaultProjectPath: TEdit
           Left = 8
           Top = 16
@@ -115,28 +107,28 @@ inherited frmOptions: TfrmOptions
         end
       end
       object chkAutoSaveBeforeCompiling: TCheckBox
-        Left = 152
-        Top = 182
+        Left = 151
+        Top = 158
         Width = 218
         Height = 17
         Caption = '&Automatically save before compiling'
-        TabOrder = 7
+        TabOrder = 6
       end
       object chkOSKAutoSaveBeforeImporting: TCheckBox
-        Left = 152
-        Top = 205
+        Left = 151
+        Top = 181
         Width = 218
         Height = 17
         Caption = '&Automatically save before importing OSK'
-        TabOrder = 8
+        TabOrder = 7
       end
       object gbPrivacy: TGroupBox
-        Left = 8
-        Top = 280
+        Left = 7
+        Top = 256
         Width = 401
         Height = 73
         Caption = 'Privacy'
-        TabOrder = 10
+        TabOrder = 8
         object chkReportUsage: TCheckBox
           Left = 8
           Top = 44
@@ -154,14 +146,6 @@ inherited frmOptions: TfrmOptions
           TabOrder = 0
         end
       end
-      object chkUseLegacyCompiler: TCheckBox
-        Left = 152
-        Top = 244
-        Width = 250
-        Height = 17
-        Caption = 'Use legacy .kmn compiler (removing in 18.0)'
-        TabOrder = 9
-      end
     end
     object tabEditor: TTabSheet
       Caption = 'Editor'
diff --git a/developer/src/tike/dialogs/UfrmOptions.pas b/developer/src/tike/dialogs/UfrmOptions.pas
index 3976e6ceb57..683b6d5e8d2 100644
--- a/developer/src/tike/dialogs/UfrmOptions.pas
+++ b/developer/src/tike/dialogs/UfrmOptions.pas
@@ -90,7 +90,6 @@   TfrmOptions = class(TTikeForm)
     cbEditorTheme: TComboBox;
     lblEditorCustomTheme: TLabel;
     lblEditorTheme: TLabel;
-    chkAllowMultipleInstances: TCheckBox;
     gbDefaultProjectPath: TGroupBox;
     editDefaultProjectPath: TEdit;
     cmdBrowseDefaultProjectPath: TButton;
@@ -105,7 +104,6 @@   TfrmOptions = class(TTikeForm)
     gbServer: TGroupBox;
     chkListLocalURLs: TCheckBox;
     cmdConfigureServer: TButton;
-    chkUseLegacyCompiler: TCheckBox;
     procedure FormCreate(Sender: TObject);
     procedure cmdOKClick(Sender: TObject);
     procedure cmdDefaultFontClick(Sender: TObject);
@@ -195,13 +193,9 @@ procedure TfrmOptions.FormCreate(Sender: TObject);
     chkAutoSaveBeforeCompiling.Checked :=          AutoSaveBeforeCompiling;
     chkOSKAutoSaveBeforeImporting.Checked :=       OSKAutoSaveBeforeImporting;
 
-    chkUseLegacyCompiler.Checked := UseLegacyCompiler;
-
     chkCharMapAutoLookup.Checked := CharMapAutoLookup;
     chkCharMapDisableDatabaseLookups.Checked := CharMapDisableDatabaseLookups;
 
-    chkAllowMultipleInstances.Checked := AllowMultipleInstances;
-
     chkOpenKeyboardFilesInSourceView.Checked := OpenKeyboardFilesInSourceView;   // I4751
 
     editExternalEditorPath.Text := ExternalEditorPath;
@@ -298,15 +292,11 @@ procedure TfrmOptions.cmdOKClick(Sender: TObject);
     AutoSaveBeforeCompiling          := chkAutoSaveBeforeCompiling.Checked;
     OSKAutoSaveBeforeImporting       := chkOSKAutoSaveBeforeImporting.Checked;
 
-    UseLegacyCompiler := chkUseLegacyCompiler.Checked;
-
     ServerUseLocalAddresses := chkListLocalURLs.Checked;
 
     CharMapAutoLookup := chkCharMapAutoLookup.Checked;
     CharMapDisableDatabaseLookups := chkCharMapDisableDatabaseLookups.Checked;
 
-    AllowMultipleInstances := chkAllowMultipleInstances.Checked;
-
     OpenKeyboardFilesInSourceView := chkOpenKeyboardFilesInSourceView.Checked;   // I4751
 
     ExternalEditorPath := editExternalEditorPath.Text;
diff --git a/developer/src/tike/main/KeymanDeveloperOptions.pas b/developer/src/tike/main/KeymanDeveloperOptions.pas
index d7068788cd9..4f757b17da4 100644
--- a/developer/src/tike/main/KeymanDeveloperOptions.pas
+++ b/developer/src/tike/main/KeymanDeveloperOptions.pas
@@ -49,7 +49,6 @@   TKeymanDeveloperOptions = class
     FCharMapAutoLookup: Boolean;
     FCharMapDisableDatabaseLookups: Boolean;
     FDebuggerAutoRecompileWithDebugInfo: Boolean;
-    FAllowMultipleInstances: Boolean;
     FExternalEditorPath: WideString;
     FServerDefaultPort: Integer;   // I4021
     FSMTPServer: string;   // I4506
@@ -70,7 +69,6 @@   TKeymanDeveloperOptions = class
     FServerNgrokToken: string;
     FServerNgrokRegion: string;
     FServerKeepAlive: Boolean;
-    FUseLegacyCompiler: Boolean;
     procedure CloseRegistry;
     procedure OpenRegistry;
     function regReadString(const nm, def: string): string;
@@ -105,8 +103,6 @@   TKeymanDeveloperOptions = class
     property AutoSaveBeforeCompiling: Boolean read FAutoSaveBeforeCompiling write FAutoSaveBeforeCompiling;
     property OSKAutoSaveBeforeImporting: Boolean read FOSKAutoSaveBeforeImporting write FOSKAutoSaveBeforeImporting;
 
-    property UseLegacyCompiler: Boolean read FUseLegacyCompiler write FUseLegacyCompiler;
-
     property ReportErrors: Boolean read FReportErrors write FReportErrors;
     property ReportUsage: Boolean read FReportUsage write FReportUsage;
 
@@ -119,8 +115,6 @@   TKeymanDeveloperOptions = class
     property ServerUseNgrok: Boolean read FServerUseNgrok write FServerUseNgrok;
     property ServerServerShowConsoleWindow: Boolean read FServerServerShowConsoleWindow write FServerServerShowConsoleWindow;
 
-    property AllowMultipleInstances: Boolean read FAllowMultipleInstances write FAllowMultipleInstances;
-
     property OpenKeyboardFilesInSourceView: Boolean read FOpenKeyboardFilesInSourceView write FOpenKeyboardFilesInSourceView;   // I4751
     property DefaultProjectPath: string read FDefaultProjectPath write FDefaultProjectPath;
 
@@ -218,8 +212,6 @@ procedure TKeymanDeveloperOptions.Read;
     FAutoSaveBeforeCompiling := regReadBool(SRegValue_IDEOptAutoSaveBeforeCompiling, False);
     FOSKAutoSaveBeforeImporting := regReadBool(SRegValue_IDEOptOSKAutoSaveBeforeImporting, False);
 
-    FUseLegacyCompiler := regReadBool(SRegValue_IDEOptUseLegacyCompiler, False);
-
     FServerDefaultPort := regReadInt(SRegValue_IDEOptServerPort, 8008);
     FServerKeepAlive := regReadBool(SRegValue_IDEOptServerKeepAlive, False);
     FServerUseLocalAddresses := regReadBool(SRegValue_IDEOptServerUseLocalAddresses, True);
@@ -232,8 +224,6 @@ procedure TKeymanDeveloperOptions.Read;
     FCharMapDisableDatabaseLookups := regReadBool(SRegValue_IDEOptCharMapDisableDatabaseLookups, False);
     FCharMapAutoLookup             := regReadBool(SRegValue_IDEOptCharMapAutoLookup,             True);
 
-    FAllowMultipleInstances := regReadBool(SRegValue_IDEOptMultipleInstances, False);
-
     FOpenKeyboardFilesInSourceView  := regReadBool(SRegValue_IDEOptOpenKeyboardFilesInSourceView,  False);   // I4751
 
     if GetOS in [osWin10, osOther]
@@ -281,8 +271,6 @@ procedure TKeymanDeveloperOptions.Write;
     regWriteBool(SRegValue_IDEOptAutoSaveBeforeCompiling, FAutoSaveBeforeCompiling);
     regWriteBool(SRegValue_IDEOptOSKAutoSaveBeforeImporting, FOSKAutoSaveBeforeImporting);
 
-    regWriteBool(SRegValue_IDEOptUseLegacyCompiler, FUseLegacyCompiler);
-
     regWriteInt(SRegValue_IDEOptServerPort, FServerDefaultPort);
     regWriteBool(SRegValue_IDEOptServerKeepAlive, FServerKeepAlive);
     regWriteBool(SRegValue_IDEOptServerUseLocalAddresses, FServerUseLocalAddresses);
@@ -296,8 +284,6 @@ procedure TKeymanDeveloperOptions.Write;
     regWriteBool(SRegValue_IDEOptCharMapDisableDatabaseLookups, FCharMapDisableDatabaseLookups);
     regWriteBool(SRegValue_IDEOptCharMapAutoLookup,             FCharMapAutoLookup);
 
-    regWriteBool(SRegValue_IDEOptMultipleInstances,             FAllowMultipleInstances);
-
     regWriteBool(SRegValue_IDEOptOpenKeyboardFilesInSourceView,  FOpenKeyboardFilesInSourceView);   // I4751
 
     regWriteString(SRegValue_IDEDisplayTheme, FDisplayTheme);   // I4796
diff --git a/developer/src/tike/main/KeymanDeveloperUtils.pas b/developer/src/tike/main/KeymanDeveloperUtils.pas
index 25db17d1b5a..fe2e60f939d 100644
--- a/developer/src/tike/main/KeymanDeveloperUtils.pas
+++ b/developer/src/tike/main/KeymanDeveloperUtils.pas
@@ -62,7 +62,6 @@ interface
   MAX_REG_FONT_ENTRIES = 16;
 
 function GetFolderPath(csidl: Integer): string;
-function TikeActive: Boolean;
 function CreateLink(const ObjPath, LinkPath, Desc: string): Boolean;
 procedure SetFontFromString(f: TFont; s: string);
 function FontAsString(f: TFont): string;
@@ -95,9 +94,6 @@ implementation
 
 function GetKMShellPath(var ps: string): Boolean; forward;  // I3655
 
-var
-  hMutex: THandle;
-
 type
 { IPersist interface }
 
@@ -192,54 +188,6 @@ function GetFolderPath(csidl: Integer): string;
     end;
 end;
 
-function TikeActive: Boolean;
-var
-  handle: THandle;
-  i: Integer;
-  FMultiInstance: Boolean;
-begin
-  with TRegistryErrorControlled.Create do  // I2890
-  try
-    if OpenKeyReadOnly(SRegKey_IDEOptions_CU) and ValueExists(SRegValue_IDEOptMultipleInstances)
-      then FMultiInstance := ReadString(SRegValue_IDEOptMultipleInstances) = '1'
-      else FMultiInstance := False;
-  finally
-    Free;
-  end;
-
-  if FMultiInstance then
-  begin
-    Result := False;
-    Exit;
-  end;
-
-  hMutex := CreateMutex(nil, True, 'Tavultesoft Integrated Keyboard Editor Mutex');
-  if GetLastError = ERROR_ALREADY_EXISTS then
-  begin
-    handle := FindWindow('TfrmKeymanDeveloper', nil);   // I4264
-    if (handle <> 0) then
-    begin
-      with TRegistryErrorControlled.Create do  // I2890
-      try
-        RootKey := HKEY_CURRENT_USER;
-        if not OpenKey(SRegKey_IDEFiles_CU, True) then  // I2890
-          RaiseLastRegistryError;
-        for i := 1 to ParamCount do
-        begin
-          WriteString(IntToStr(i), ExpandFileNameClean(IncludeTrailingPathDelimiter(GetCurrentDir), ParamStr(i)));   // I4749   // I4749
-        end;
-      finally
-        Free;
-      end;
-      PostMessage(handle, WM_USER_LOADREGFILES, 0, 0);
-      SetForegroundWindow(handle);
-    end;
-    Result := True;
-  end
-  else
-    Result := False;
-end;
-
 function FontAsString(f: TFont): string;
 begin
   Result := f.Name + '|' + IntToStr(f.Size) + '|';
diff --git a/developer/src/tike/main/UfrmMain.pas b/developer/src/tike/main/UfrmMain.pas
index 18dc12c59d5..993ea86d8a1 100644
--- a/developer/src/tike/main/UfrmMain.pas
+++ b/developer/src/tike/main/UfrmMain.pas
@@ -327,7 +327,6 @@   TfrmKeymanDeveloper = class(TTikeForm, IUnicodeDataUIManager, IDragDrop)
 
     //procedure ChildWindowsChange(Sender: TObject);
     procedure WMUserFormShown(var Message: TMessage); message WM_USER_FORMSHOWN;
-    procedure WMUserLoadRegFiles(var Message: TMessage); message WM_USER_LOADREGFILES;
     procedure WMUserInputLangChange(var Message: TMessage); message WM_USER_INPUTLANGCHANGE;
 
     procedure UpdateFileMRU;
@@ -761,31 +760,6 @@ procedure TfrmKeymanDeveloper.WMUserInputLangChange(var Message: TMessage);
     PostMessage(FChildWindows[i].Handle, WM_USER_INPUTLANGCHANGE, Message.wParam, Message.LParam);
 end;
 
-procedure TfrmKeymanDeveloper.WMUserLoadRegFiles(var Message: TMessage);
-var
-  i: Integer;
-  s: TStringList;
-  t: string;
-begin
-  s := TStringList.Create;
-  with TRegistryErrorControlled.Create do  // I2890
-  try
-    RootKey := HKEY_CURRENT_USER;
-    if not OpenKey(SRegKey_IDEFiles_CU, True) then  // I2890
-      RaiseLastRegistryError;
-
-    GetValueNames(s);
-    for i := 0 to s.Count - 1 do
-    begin
-      t := ReadString(s[i]);
-      DeleteValue(s[i]);
-      OpenFile(t, False);
-    end;
-  finally
-    Free;
-  end;
-end;
-
 const
   SPI_GETKEYBOARDCUES = $100A;
 var
diff --git a/developer/src/tike/tike.dpr b/developer/src/tike/tike.dpr
index 11ac819f88b..90225d646f9 100644
--- a/developer/src/tike/tike.dpr
+++ b/developer/src/tike/tike.dpr
@@ -311,9 +311,8 @@ begin
           Application.MainFormOnTaskBar := True;
           Application.Initialize;
           Application.Title := 'Keyman Developer';
-          if TikeActive then Exit;
           Application.CreateForm(TmodWebHttpServer, modWebHttpServer);
-  try
+          try
             Application.CreateForm(TfrmKeymanDeveloper, frmKeymanDeveloper);
             Application.Run;
           finally

From fa30924b54fa82a6fe3c90aa39a38092a1045b52 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Fri, 3 Nov 2023 13:31:45 +0700
Subject: [PATCH 27/67] chore(developer): common/include dep for kmcmplib

Fixes #9929.
---
 developer/src/kmcmplib/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/developer/src/kmcmplib/build.sh b/developer/src/kmcmplib/build.sh
index 1ccd13575c4..ce1c5eed1af 100755
--- a/developer/src/kmcmplib/build.sh
+++ b/developer/src/kmcmplib/build.sh
@@ -47,6 +47,7 @@ Libraries will be built in 'build/<target>/<configuration>/src'.
   * <configuration>: 'debug' or 'release' (see --debug flag)
   * All parameters after '--' are passed to meson or ninja
 " \
+  "@/common/include" \
   "clean" \
   "configure" \
   "build" \

From 46caf92ba2fa57d2a7303a7ef242633ef7ebc595 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Fri, 3 Nov 2023 14:09:17 -0400
Subject: [PATCH 28/67] auto: increment master version to 17.0.206

---
 HISTORY.md | 12 ++++++++++++
 VERSION.md |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index a861f08d306..81d403b9b9c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,17 @@
 # Keyman Version History
 
+## 17.0.205 alpha 2023-11-03
+
+* fix(developer): use KeymanWeb.Codes for 17.0+ (#9913)
+* fix(developer): don't use osk-always-visible on touch devices (#9917)
+* chore(linux): Improve repository_dispatch (#9865)
+* chore(linux): Refactor deb-packaging.sh script (#9866)
+* chore(linux): Add Core API version number (#9877)
+* fix(developer): kmc code generation for context(n) in context (#9932)
+* chore(developer): remove obsolete 'Allow Multiple Instances' and 'Use Legacy Compiler' options (#9934)
+* chore(developer): common/include dep for kmcmplib (#9935)
+* feat(common): ldml update to WIP cldr data (#9919)
+
 ## 17.0.204 alpha 2023-11-02
 
 * fix(web): fixes doc-kbd display of default layer when it's not defined first (#9891)
diff --git a/VERSION.md b/VERSION.md
index 015caead570..98f9b53f4a7 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-17.0.205
\ No newline at end of file
+17.0.206
\ No newline at end of file

From c5c5b35415ef9bdcf098fcc73b3dd01c8ab7201f Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Sat, 4 Nov 2023 07:34:18 +0700
Subject: [PATCH 29/67] chore(common): remove prepublish step from package.json

Given we've just run a build, this (a) seems unnecessary, and (b) seems
to go wrong in some circumstances anyway, e.g.
https://build.palaso.org/buildConfiguration/Keyman_Developer_Release/421326?buildTab=log&focusLine=19936&linesState=18839&logView=flowAware:

```
07:01:29   > @keymanapp/kmc@17.0.205-alpha prepublishOnly
07:01:29   > npm run build
07:01:29
07:01:31
07:01:31   > @keymanapp/kmc@17.0.205-alpha build
07:01:31   > tsc -b
07:01:31
07:01:35   ../../../common/web/types/build/src/kmx/kmx.d.ts(1,1): error TS1036: Statements are not allowed in ambient contexts.
07:01:35   ../../../common/web/types/build/src/kmx/kmx.d.ts(1,2): error TS1345: An expression of type 'void' cannot be tested for truthiness.
...
```
---
 common/web/types/package.json                | 3 +--
 developer/src/kmc-keyboard-info/package.json | 3 +--
 developer/src/kmc-kmn/package.json           | 3 +--
 developer/src/kmc-ldml/package.json          | 3 +--
 developer/src/kmc-model-info/package.json    | 3 +--
 developer/src/kmc-model/package.json         | 3 +--
 developer/src/kmc-package/package.json       | 3 +--
 developer/src/kmc/package.json               | 3 +--
 8 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/common/web/types/package.json b/common/web/types/package.json
index fd59cffa97d..e481735cc44 100644
--- a/common/web/types/package.json
+++ b/common/web/types/package.json
@@ -18,8 +18,7 @@
     "build": "tsc -b",
     "build:schema": "ajv compile",
     "lint": "eslint .",
-    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --skip-full --reporter=lcov --reporter=text mocha",
-    "prepublishOnly": "npm run build"
+    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --skip-full --reporter=lcov --reporter=text mocha"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "license": "MIT",
diff --git a/developer/src/kmc-keyboard-info/package.json b/developer/src/kmc-keyboard-info/package.json
index d269e914390..e873d57d7c0 100644
--- a/developer/src/kmc-keyboard-info/package.json
+++ b/developer/src/kmc-keyboard-info/package.json
@@ -16,8 +16,7 @@
   "scripts": {
     "build": "tsc -b",
     "lint": "eslint .",
-    "test": "npm run lint",
-    "prepublishOnly": "npm run build"
+    "test": "npm run lint"
   },
   "license": "MIT",
   "bugs": {
diff --git a/developer/src/kmc-kmn/package.json b/developer/src/kmc-kmn/package.json
index 5802c859055..a28d07c4240 100644
--- a/developer/src/kmc-kmn/package.json
+++ b/developer/src/kmc-kmn/package.json
@@ -18,8 +18,7 @@
   "scripts": {
     "build": "tsc -b",
     "lint": "eslint .",
-    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha",
-    "prepublishOnly": "npm run build"
+    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "license": "MIT",
diff --git a/developer/src/kmc-ldml/package.json b/developer/src/kmc-ldml/package.json
index 88173c2902e..6d84b3f2ebd 100644
--- a/developer/src/kmc-ldml/package.json
+++ b/developer/src/kmc-ldml/package.json
@@ -17,8 +17,7 @@
   "scripts": {
     "build": "tsc -b",
     "lint": "eslint .",
-    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha",
-    "prepublishOnly": "npm run build"
+    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "license": "MIT",
diff --git a/developer/src/kmc-model-info/package.json b/developer/src/kmc-model-info/package.json
index a953062acb3..5f8819e62e0 100644
--- a/developer/src/kmc-model-info/package.json
+++ b/developer/src/kmc-model-info/package.json
@@ -18,8 +18,7 @@
   "scripts": {
     "build": "tsc -b",
     "lint": "eslint .",
-    "test": "npm run lint",
-    "prepublishOnly": "npm run build"
+    "test": "npm run lint"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "contributors": [
diff --git a/developer/src/kmc-model/package.json b/developer/src/kmc-model/package.json
index faed0049d4a..7d9da682daf 100644
--- a/developer/src/kmc-model/package.json
+++ b/developer/src/kmc-model/package.json
@@ -18,8 +18,7 @@
   "scripts": {
     "build": "tsc -b",
     "lint": "eslint .",
-    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha",
-    "prepublishOnly": "npm run build"
+    "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "contributors": [
diff --git a/developer/src/kmc-package/package.json b/developer/src/kmc-package/package.json
index a5f9f3e7936..597d0af078c 100644
--- a/developer/src/kmc-package/package.json
+++ b/developer/src/kmc-package/package.json
@@ -17,8 +17,7 @@
     "build": "tsc -b",
     "lint": "eslint .",
     "test": "npm run lint && cd test && tsc -b && cd .. && c8 --reporter=lcov --reporter=text mocha",
-    "coverage": "npm test",
-    "prepublishOnly": "npm run build"
+    "coverage": "npm test"
   },
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "contributors": [
diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json
index 7f9e0a9053a..69f2d990d51 100644
--- a/developer/src/kmc/package.json
+++ b/developer/src/kmc/package.json
@@ -15,8 +15,7 @@
     "bundle-kmc": "esbuild build/src/kmc.js --bundle --platform=node --target=es2022 > build/cjs-src/kmc.cjs",
     "bundle-kmlmc": "esbuild build/src/kmlmc.js --bundle --platform=node --target=es2022 > build/cjs-src/kmlmc.cjs",
     "bundle-kmlmp": "esbuild build/src/kmlmp.js --bundle --platform=node --target=es2022 > build/cjs-src/kmlmp.cjs",
-    "test": "eslint . && cd test && tsc -b && cd .. && mocha",
-    "prepublishOnly": "npm run build"
+    "test": "eslint . && cd test && tsc -b && cd .. && mocha"
   },
   "type": "module",
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",

From 02e1ea59a200bfbd4596afd14208c2dc5bfbef25 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Sun, 5 Nov 2023 06:12:42 +0700
Subject: [PATCH 30/67] feat(developer): provide line number for some kmw
 compiler messages

Fixes #9931.

Provide additional line and file context for some KeymanWeb
compiler messages. This change requires debug data in the intermediate
kmx data provided to the kmw compiler, which should have no impact on
the final .js if debug=false.

This commit only addresses line number data in
Error_NotSupportedInKeymanWebContext and
Error_NotSupportedInKeymanWebOutput.

There are other compiler messages which could benefit from this data:
  * Warn_OptionStoreNameInvalid
  * Error_VirtualCharacterKeysNotSupportedInKeymanWeb
  * Error_VirtualKeysNotValidForMnemonicLayouts
  * Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb
  * Hint_UnreachableKeyCode
  * Error_NotSupportedInKeymanWebStore
  * Warn_HelpFileMissing
  * Warn_EmbedJsFileMissing
  * Error_NotAnyRequiresVersion14
---
 .../src/kmc-kmn/src/compiler/compiler.ts      |  6 +++
 .../src/kmw-compiler/javascript-strings.ts    |  8 ++--
 .../src/kmw-compiler/kmw-compiler-messages.ts | 45 +++++++++++++++----
 ...ror_not_supported_in_keyman_web_output.kmn | 11 +++++
 developer/src/kmc-kmn/test/test-messages.ts   |  7 +++
 5 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_not_supported_in_keyman_web_output.kmn

diff --git a/developer/src/kmc-kmn/src/compiler/compiler.ts b/developer/src/kmc-kmn/src/compiler/compiler.ts
index df20b698529..317cfc757c3 100644
--- a/developer/src/kmc-kmn/src/compiler/compiler.ts
+++ b/developer/src/kmc-kmn/src/compiler/compiler.ts
@@ -298,6 +298,12 @@ export class KmnCompiler implements UnicodeSetParser {
 
       if(wasm_result.extra.targets & COMPILETARGETS_JS) {
         wasm_options.target = 1; // CKF_KEYMANWEB TODO use COMPILETARGETS_JS
+
+        // We always want debug data in the intermediate .kmx, so that error
+        // messages from KMW compiler can give line numbers in .kmn. This
+        // should have no impact on the final .js if options.debug is false
+        wasm_options.saveDebug = true;
+
         wasm_result = Module.kmcmp_compile(infile, wasm_options, wasm_interface);
         if(!wasm_result.result) {
           return null;
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
index bafbae2794a..b7b9817572c 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
@@ -490,7 +490,7 @@ function JavaScript_CompositeContextValue(fk: KMX.KEYBOARD, fkp: KMX.KEY, pwsz:
           `this.s${JavaScript_Name(rec.Any.StoreIndex, rec.Any.Store.dpName)})`;
         break;
       default:
-        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebContext({code: GetCodeName(rec.Code)}));
+        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebContext({line: fkp.Line, code: GetCodeName(rec.Code)}));
         Result += '/*.*/ 0 ';
       }
     }
@@ -579,7 +579,7 @@ function JavaScript_FullContextValue(fk: KMX.KEYBOARD, fkp: KMX.KEY, pwsz: strin
           `o:${rec.Index.Index}}`;   // I4611
         break;
       default:
-        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebContext({code: GetCodeName(rec.Code)}));
+        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebContext({line: fkp.Line, code: GetCodeName(rec.Code)}));
         Result += '/*.*/ 0 ';
       }
     }
@@ -677,7 +677,7 @@ export function JavaScript_OutputString(fk: KMX.KEYBOARD, FTabStops: string, fkp
           // These have no output for a context emit
           break;
       default:
-        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebContext({code: GetCodeName(recContext.Code)}));
+        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebContext({line: fkp.Line, code: GetCodeName(recContext.Code)}));
         Result += nlt + '/*.*/ ';   // I4611
       }
     }
@@ -885,7 +885,7 @@ export function JavaScript_OutputString(fk: KMX.KEYBOARD, FTabStops: string, fkp
         len = -1;
         break;
       default:
-        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebOutput({code: GetCodeName(rec.Code)}));
+        callbacks.reportMessage(KmwCompilerMessages.Error_NotSupportedInKeymanWebOutput({line: fkp.Line, code: GetCodeName(rec.Code)}));
         Result += '';
       }
     }
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts
index 0c2e5bbdb64..a9521255710 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts
@@ -1,5 +1,6 @@
 import { KmnCompilerMessages } from "../compiler/kmn-compiler-messages.js";
-import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m } from "@keymanapp/common-types";
+import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageSpec } from "@keymanapp/common-types";
+import { kmnfile } from "./compiler-globals.js";
 
 const Namespace = CompilerErrorNamespace.KmwCompiler;
 // const SevInfo = CompilerErrorSeverity.Info | Namespace;
@@ -8,6 +9,12 @@ const Namespace = CompilerErrorNamespace.KmwCompiler;
 const SevError = CompilerErrorSeverity.Error | Namespace;
 // const SevFatal = CompilerErrorSeverity.Fatal | Namespace;
 
+const m = (code: number, message: string, o?: {e?: any, filename?: string, line?: number}) : CompilerEvent => ({
+  ...CompilerMessageSpec(code, message, o?.e),
+  filename: o?.filename ?? kmnfile,
+  line: o?.line,
+});
+
 export class KmwCompilerMessages extends KmnCompilerMessages {
   // Note: for legacy reasons, KMWCompilerMessages extends from
   // KMNCompilerMessages as they share the same error codes. This can be a
@@ -19,44 +26,66 @@ export class KmwCompilerMessages extends KmnCompilerMessages {
 
   static Error_InvalidBegin = () => m(this.ERROR_InvalidBegin,
     `A "begin unicode" statement is required to compile a KeymanWeb keyboard`);
+
   static Error_InvalidTouchLayoutFile = (o:{filename:string}) => m(this.ERROR_InvalidTouchLayoutFile,
     `Touch layout file ${o.filename} is not valid`);
+
   static Warn_DontMixChiralAndNonChiralModifiers = () => m(this.WARN_DontMixChiralAndNonChiralModifiers,
     `This keyboard contains Ctrl,Alt and LCtrl,LAlt,RCtrl,RAlt sets of modifiers. Use only one or the other set for web target.`);
+
   static Warn_OptionStoreNameInvalid = (o:{name:string}) => m(this.WARN_OptionStoreNameInvalid,
     `The option store ${o.name} should be named with characters in the range A-Z, a-z, 0-9 and _ only.`);
+
   static Error_VirtualCharacterKeysNotSupportedInKeymanWeb = () => m(this.ERROR_VirtualCharacterKeysNotSupportedInKeymanWeb,
     `Virtual character keys not currently supported in KeymanWeb`);
+
   static Error_VirtualKeysNotValidForMnemonicLayouts = () => m(this.ERROR_VirtualKeysNotValidForMnemonicLayouts,
     `Virtual keys are not valid for mnemonic layouts`);
+
   static Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb = (o:{flags:string}) => m(this.WARN_ExtendedShiftFlagsNotSupportedInKeymanWeb,
     `Extended shift flags ${o.flags} are not supported in KeymanWeb`);
+
   static Hint_UnreachableKeyCode = (o:{key:string}) => m(this.HINT_UnreachableKeyCode,
     `The rule will never be matched for key ${o.key} because its key code is never fired.`);
+
   static Error_NotSupportedInKeymanWebStore = (o:{code:string,store:string}) => m(this.ERROR_NotSupportedInKeymanWebStore,
-    `${o.code} is not currently supported in store '${o.store}' when used by any or index`);
-  static Error_NotSupportedInKeymanWebContext = (o:{code:String}) => m(this.ERROR_NotSupportedInKeymanWebContext,
-    `Statement ${o.code} is not currently supported in context`);
-  static Error_NotSupportedInKeymanWebOutput = (o:{code:string}) => m(this.ERROR_NotSupportedInKeymanWebOutput,
-    `Statement ${o.code} is not currently supported in output`);
+    `'${o.code}' is not currently supported in store '${o.store}' when used by any or index for web and touch targets`);
+
+  static Error_NotSupportedInKeymanWebContext = (o:{line:number, code:String}) => m(this.ERROR_NotSupportedInKeymanWebContext,
+    `Statement '${o.code}' is not currently supported in context for web and touch targets`, o);
+
+  static Error_NotSupportedInKeymanWebOutput = (o:{line:number, code:string}) => m(this.ERROR_NotSupportedInKeymanWebOutput,
+    `Statement '${o.code}' is not currently supported in output for web and touch targets`, o);
+
   static Warn_HelpFileMissing = (o:{filename: string, e:any}) => m(this.WARN_HelpFileMissing,
     `File ${o.filename} could not be loaded: ${(o.e??'').toString()}`);
+
   static Warn_EmbedJsFileMissing = (o:{filename: string, e:any}) => m(this.WARN_EmbedJsFileMissing,
     `File ${o.filename} could not be loaded: ${(o.e??'').toString()}`);
+
   static Warn_TouchLayoutMissingLayer = (o:{keyId:string, platformName:string, layerId:string, nextLayer:string}) => m(this.WARN_TouchLayoutMissingLayer,
     `Key "${o.keyId}" on platform "${o.platformName}", layer "${o.layerId}", references a missing layer "${o.nextLayer}"`);
+
   static Warn_TouchLayoutUnidentifiedKey = (o:{layerId:string}) => m(this.WARN_TouchLayoutUnidentifiedKey,
     `A key on layer "${o.layerId}" has no identifier.`);
+
   static Error_TouchLayoutInvalidIdentifier = (o:{keyId:string, platformName: string, layerId:string}) => m(this.ERROR_TouchLayoutInvalidIdentifier,
     `Key "${o.keyId}" on "${o.platformName}", layer "${o.layerId}" has an invalid identifier.`);
+
   static Warn_TouchLayoutCustomKeyNotDefined = (o:{keyId:string, platformName:string, layerId:string}) => m(this.WARN_TouchLayoutCustomKeyNotDefined,
     `Key "${o.keyId}" on platform "${o.platformName}", layer "${o.layerId}", is a custom key but has no corresponding rule in the source.`);
-  static Warn_TouchLayoutSpecialLabelOnNormalKey = (o:{keyId:string, platformName:string, layerId:string, label:string}) => m(this.WARN_TouchLayoutSpecialLabelOnNormalKey,
-    `Key "${o.keyId}" on platform "${o.platformName}", layer "${o.layerId}" does not have the key type "Special" or "Special (active)" but has the label "${o.label}". This feature is only supported in Keyman 14 or later`);
+
+  static Warn_TouchLayoutSpecialLabelOnNormalKey = (o:{keyId:string, platformName:string, layerId:string, label:string}) =>
+    m(this.WARN_TouchLayoutSpecialLabelOnNormalKey,
+    `Key "${o.keyId}" on platform "${o.platformName}", layer "${o.layerId}" does not have `+
+    `the key type "Special" or "Special (active)" but has the label "${o.label}". This feature is only supported in Keyman 14 or later`);
+
   static Error_InvalidKeyCode = (o:{keyId: string}) => m(this.ERROR_InvalidKeyCode,
     `Invalid key identifier "${o.keyId}"`);
+
   static Warn_TouchLayoutFontShouldBeSameForAllPlatforms = () => m(this.WARN_TouchLayoutFontShouldBeSameForAllPlatforms,
     `The touch layout font should be the same for all platforms.`);
+
   static Warn_TouchLayoutMissingRequiredKeys = (o:{layerId:string, platformName:string, missingKeys:string}) => m(this.WARN_TouchLayoutMissingRequiredKeys,
     `Layer "${o.layerId}" on platform "${o.platformName}" is missing the required key(s) '${o.missingKeys}'.`);
 
diff --git a/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_not_supported_in_keyman_web_output.kmn b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_not_supported_in_keyman_web_output.kmn
new file mode 100644
index 00000000000..cd2c34bb64b
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_not_supported_in_keyman_web_output.kmn
@@ -0,0 +1,11 @@
+c Tests ERROR_NotSupportedInKeymanWebOutput for `return`
+
+store(&NAME) 'ERROR_NotSupportedInKeymanWebOutput'
+store(&VERSION) '9.0'
+store(&TARGETS) 'web'
+
+begin unicode > use(main)
+
+group(main) using keys
+
++ 'a' > return
diff --git a/developer/src/kmc-kmn/test/test-messages.ts b/developer/src/kmc-kmn/test/test-messages.ts
index 0220c2d037a..af07abc2adf 100644
--- a/developer/src/kmc-kmn/test/test-messages.ts
+++ b/developer/src/kmc-kmn/test/test-messages.ts
@@ -80,4 +80,11 @@ describe('CompilerMessages', function () {
     assert.equal(callbacks.messages[0].message, "A key on layer \"default\" has no identifier.");
   });
 
+  // ERROR_NotSupportedInKeymanWebOutput
+
+  it('should generate ERROR_NotSupportedInKeymanWebOutput if a rule has `return` in the output', async function() {
+    await testForMessage(this, ['invalid-keyboards', 'error_not_supported_in_keyman_web_output.kmn'], KmnCompilerMessages.ERROR_NotSupportedInKeymanWebOutput);
+    assert.equal(callbacks.messages[0].message, "Statement \"return\" is not currently supported in output");
+  });
+
 });

From ab4fcef9f7a8af90d3eee27d9e06ba688422b86c Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Sun, 5 Nov 2023 06:33:06 +0700
Subject: [PATCH 31/67] feat(developer): add line number information for more
 kmw messages

Adds line number context for:
  * Error_VirtualCharacterKeysNotSupportedInKeymanWeb
  * Error_VirtualKeysNotValidForMnemonicLayouts
  * Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb
  * Hint_UnreachableKeyCode
  * Warn_HelpFileMissing
  * Warn_EmbedJsFileMissing
  * Error_NotAnyRequiresVersion14

Line number metadata is not easily accessible where the following
messages are generated, so these are a potential future improvement:
  * Warn_OptionStoreNameInvalid
  * Error_NotSupportedInKeymanWebStore
---
 .../src/kmw-compiler/javascript-strings.ts    | 12 ++++----
 .../src/kmw-compiler/kmw-compiler-messages.ts | 28 +++++++++----------
 .../kmc-kmn/src/kmw-compiler/kmw-compiler.ts  | 22 +++++++++------
 developer/src/kmc-kmn/test/test-messages.ts   |  2 +-
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
index b7b9817572c..0b356a9a18c 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
@@ -233,7 +233,7 @@ export function JavaScript_Rules(keyboard: KMX.KEYBOARD, fMnemonic: boolean, fgp
 export function JavaScript_Shift(fkp: KMX.KEY, FMnemonic: boolean): number {
   if (FMnemonic) {
     if (fkp.ShiftFlags & KMX.KMXFile.VIRTUALCHARKEY) {
-      callbacks.reportMessage(KmwCompilerMessages.Error_VirtualCharacterKeysNotSupportedInKeymanWeb());
+      callbacks.reportMessage(KmwCompilerMessages.Error_VirtualCharacterKeysNotSupportedInKeymanWeb({line:fkp.Line}));
       return 0;
     }
 
@@ -241,7 +241,7 @@ export function JavaScript_Shift(fkp: KMX.KEY, FMnemonic: boolean): number {
       // We prohibit K_ keys for mnemonic layouts. We don't block T_ and U_ keys.
       // TODO: this doesn't resolve the issue of, e.g. SHIFT+K_SPACE
       // https://github.com/keymanapp/keyman/issues/265
-      callbacks.reportMessage(KmwCompilerMessages.Error_VirtualKeysNotValidForMnemonicLayouts());
+      callbacks.reportMessage(KmwCompilerMessages.Error_VirtualKeysNotValidForMnemonicLayouts({line:fkp.Line}));
       return 0;
     }
   }
@@ -254,13 +254,13 @@ export function JavaScript_Shift(fkp: KMX.KEY, FMnemonic: boolean): number {
 
     // Non-chiral support only and no support for state keys
     if (fkp.ShiftFlags & (KMX.KMXFile.LCTRLFLAG | KMX.KMXFile.RCTRLFLAG | KMX.KMXFile.LALTFLAG | KMX.KMXFile.RALTFLAG)) {   // I4118
-      callbacks.reportMessage(KmwCompilerMessages.Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb({flags: 'LALT, RALT, LCTRL, RCTRL'}));
+      callbacks.reportMessage(KmwCompilerMessages.Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb({line:fkp.Line, flags: 'LALT, RALT, LCTRL, RCTRL'}));
     }
 
     if (fkp.ShiftFlags & (
       KMX.KMXFile.CAPITALFLAG | KMX.KMXFile.NOTCAPITALFLAG | KMX.KMXFile.NUMLOCKFLAG | KMX.KMXFile.NOTNUMLOCKFLAG |
       KMX.KMXFile.SCROLLFLAG | KMX.KMXFile.NOTSCROLLFLAG)) {   // I4118
-      callbacks.reportMessage(KmwCompilerMessages.Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb({flags: 'CAPS and NCAPS'}));
+      callbacks.reportMessage(KmwCompilerMessages.Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb({line:fkp.Line, flags: 'CAPS and NCAPS'}));
     }
 
     return KMX.KMXFile.ISVIRTUALKEY | (fkp.ShiftFlags & (KMX.KMXFile.K_SHIFTFLAG | KMX.KMXFile.K_CTRLFLAG | KMX.KMXFile.K_ALTFLAG));
@@ -378,7 +378,7 @@ export function JavaScript_Key(fkp: KMX.KEY, FMnemonic: boolean): number {
 
   if (Result == 0 || Result >= TKeymanWebTouchStandardKey.K_LOPT) {   // I4141
     if(!FUnreachableKeys.includes(fkp)) {
-      callbacks.reportMessage(KmwCompilerMessages.Hint_UnreachableKeyCode({key: FormatKeyForErrorMessage(fkp,FMnemonic)}));
+      callbacks.reportMessage(KmwCompilerMessages.Hint_UnreachableKeyCode({line:fkp.Line, key: FormatKeyForErrorMessage(fkp,FMnemonic)}));
       FUnreachableKeys.push(fkp);
     }
   }
@@ -667,7 +667,7 @@ export function JavaScript_OutputString(fk: KMX.KEYBOARD, FTabStops: string, fkp
         // #917: Minimum version required is 14.0: the KCXO function was only added for 14.0
         // Note that this is checked in compiler.cpp as well, so this error can probably never occur
         if(!IsKeyboardVersion14OrLater()) {
-          callbacks.reportMessage(KmwCompilerMessages.Error_NotAnyRequiresVersion14());
+          callbacks.reportMessage(KmwCompilerMessages.Error_NotAnyRequiresVersion14({line:fkp.Line}));
         }
         Result += nlt + `k.KCXO(${len},t,${AdjustIndex(fkp.dpContext, xstrlen(fkp.dpContext))},${AdjustIndex(fkp.dpContext, ContextIndex)+1});`;
         break;
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts
index a9521255710..4c4b41505ce 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler-messages.ts
@@ -36,17 +36,17 @@ export class KmwCompilerMessages extends KmnCompilerMessages {
   static Warn_OptionStoreNameInvalid = (o:{name:string}) => m(this.WARN_OptionStoreNameInvalid,
     `The option store ${o.name} should be named with characters in the range A-Z, a-z, 0-9 and _ only.`);
 
-  static Error_VirtualCharacterKeysNotSupportedInKeymanWeb = () => m(this.ERROR_VirtualCharacterKeysNotSupportedInKeymanWeb,
-    `Virtual character keys not currently supported in KeymanWeb`);
+  static Error_VirtualCharacterKeysNotSupportedInKeymanWeb = (o:{line:number}) => m(this.ERROR_VirtualCharacterKeysNotSupportedInKeymanWeb,
+    `Virtual character keys not currently supported in KeymanWeb`, o);
 
-  static Error_VirtualKeysNotValidForMnemonicLayouts = () => m(this.ERROR_VirtualKeysNotValidForMnemonicLayouts,
-    `Virtual keys are not valid for mnemonic layouts`);
+  static Error_VirtualKeysNotValidForMnemonicLayouts = (o:{line:number}) => m(this.ERROR_VirtualKeysNotValidForMnemonicLayouts,
+    `Virtual keys are not valid for mnemonic layouts`, o);
 
-  static Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb = (o:{flags:string}) => m(this.WARN_ExtendedShiftFlagsNotSupportedInKeymanWeb,
-    `Extended shift flags ${o.flags} are not supported in KeymanWeb`);
+  static Warn_ExtendedShiftFlagsNotSupportedInKeymanWeb = (o:{line:number,flags:string}) => m(this.WARN_ExtendedShiftFlagsNotSupportedInKeymanWeb,
+    `Extended shift flags ${o.flags} are not supported in KeymanWeb`, o);
 
-  static Hint_UnreachableKeyCode = (o:{key:string}) => m(this.HINT_UnreachableKeyCode,
-    `The rule will never be matched for key ${o.key} because its key code is never fired.`);
+  static Hint_UnreachableKeyCode = (o:{line:number,key:string}) => m(this.HINT_UnreachableKeyCode,
+    `The rule will never be matched for key ${o.key} because its key code is never fired.`, o);
 
   static Error_NotSupportedInKeymanWebStore = (o:{code:string,store:string}) => m(this.ERROR_NotSupportedInKeymanWebStore,
     `'${o.code}' is not currently supported in store '${o.store}' when used by any or index for web and touch targets`);
@@ -57,11 +57,11 @@ export class KmwCompilerMessages extends KmnCompilerMessages {
   static Error_NotSupportedInKeymanWebOutput = (o:{line:number, code:string}) => m(this.ERROR_NotSupportedInKeymanWebOutput,
     `Statement '${o.code}' is not currently supported in output for web and touch targets`, o);
 
-  static Warn_HelpFileMissing = (o:{filename: string, e:any}) => m(this.WARN_HelpFileMissing,
-    `File ${o.filename} could not be loaded: ${(o.e??'').toString()}`);
+  static Warn_HelpFileMissing = (o:{line:number, helpFilename:string, e:any}) => m(this.WARN_HelpFileMissing,
+    `File ${o.helpFilename} could not be loaded: ${(o.e??'').toString()}`,o);
 
-  static Warn_EmbedJsFileMissing = (o:{filename: string, e:any}) => m(this.WARN_EmbedJsFileMissing,
-    `File ${o.filename} could not be loaded: ${(o.e??'').toString()}`);
+  static Warn_EmbedJsFileMissing = (o:{line:number, jsFilename: string, e:any}) => m(this.WARN_EmbedJsFileMissing,
+    `File ${o.jsFilename} could not be loaded: ${(o.e??'').toString()}`, o);
 
   static Warn_TouchLayoutMissingLayer = (o:{keyId:string, platformName:string, layerId:string, nextLayer:string}) => m(this.WARN_TouchLayoutMissingLayer,
     `Key "${o.keyId}" on platform "${o.platformName}", layer "${o.layerId}", references a missing layer "${o.nextLayer}"`);
@@ -91,8 +91,8 @@ export class KmwCompilerMessages extends KmnCompilerMessages {
 
   // Following messages are kmw-compiler only, so use KmwCompiler error namespace
 
-  static Error_NotAnyRequiresVersion14 = () => m(this.ERROR_NotAnyRequiresVersion14,
-    `Statement notany in context() match requires version 14.0+ of KeymanWeb`);
+  static Error_NotAnyRequiresVersion14 = (o:{line: number}) => m(this.ERROR_NotAnyRequiresVersion14,
+    `Statement notany in context() match requires version 14.0+ of KeymanWeb`, o);
   static ERROR_NotAnyRequiresVersion14 = SevError | 0x0001;
 
   static Error_TouchLayoutIdentifierRequires15 = (o:{keyId:string, platformName:string, layerId:string}) => m(this.ERROR_TouchLayoutIdentifierRequires15,
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts
index 2cd7e762d6f..dd891cd7cb1 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/kmw-compiler.ts
@@ -53,6 +53,12 @@ export function WriteCompiledKeyboard(
 
   setupGlobals(callbacks, opts, FDebug?'  ':'', FDebug?'\r\n':'', kmxResult, keyboard, kmnfile);
 
+  const isStoreType = (index:number, type: number) => !!(kmxResult.extra.stores[index].storeType & type);
+  const isDebugStore = (index: number) => isStoreType(index, STORETYPE_DEBUG);
+  const isReservedStore = (index: number) => isStoreType(index, STORETYPE_RESERVED);
+  const isOptionStore = (index: number) => isStoreType(index, STORETYPE_OPTION);
+  const getStoreLine = (index: number) => kmxResult.extra.stores[index].line;
+
   let vMnemonic: number = 0;
   let sRTL: string = "", sHelp: string = "''", sHelpFile: string = "",
       sEmbedJSFilename: string = "", sEmbedCSSFilename: string = "";
@@ -63,6 +69,7 @@ export function WriteCompiledKeyboard(
   let sModifierBitmask: string;
   let FOptionStores: string;
   let FKeyboardVersion = "1.0";
+  let sHelpFileStoreIndex, sEmbedJSStoreIndex, sEmbedCSSStoreIndex;
 
   let result = "";
 	// Locate the name of the keyboard
@@ -76,6 +83,7 @@ export function WriteCompiledKeyboard(
     }
     else if (fsp.dpName == 'HelpFile' || fsp.dwSystemID == KMX.KMXFile.TSS_KMW_HELPFILE) {
       sHelpFile = fsp.dpString;
+      sHelpFileStoreIndex = i;
     }
     else if (fsp.dpName == 'Help' || fsp.dwSystemID == KMX.KMXFile.TSS_KMW_HELPTEXT) {
       sHelp = '"'+RequotedString(fsp.dpString)+'"';
@@ -85,9 +93,11 @@ export function WriteCompiledKeyboard(
     }
     else if (fsp.dpName == 'EmbedJS' || fsp.dwSystemID == KMX.KMXFile.TSS_KMW_EMBEDJS) {
       sEmbedJSFilename = fsp.dpString;
+      sEmbedJSStoreIndex = i;
     }
     else if (fsp.dpName == 'EmbedCSS' || fsp.dwSystemID == KMX.KMXFile.TSS_KMW_EMBEDCSS) {   // I4368
       sEmbedCSSFilename = fsp.dpString;
+      sEmbedCSSStoreIndex = i;
     }
     else if (fsp.dpName == 'RTL' || fsp.dwSystemID == KMX.KMXFile.TSS_KMW_RTL) {
       sRTL = fsp.dpString == '1' ? FTabStop+'this.KRTL=1;'+nl : '';   // I3681
@@ -121,7 +131,7 @@ export function WriteCompiledKeyboard(
       sHelp = html.replace(/\r/g, '').replace(/\n/g, ' ');
       sHelp = requote(sHelp);
     } catch(e) {
-      callbacks.reportMessage(KmwCompilerMessages.Warn_HelpFileMissing({filename: sHelpFile, e}));
+      callbacks.reportMessage(KmwCompilerMessages.Warn_HelpFileMissing({line: getStoreLine(sHelpFileStoreIndex), helpFilename: sHelpFile, e}));
       sHelp = '';
     }
   }
@@ -133,7 +143,7 @@ export function WriteCompiledKeyboard(
       const data = callbacks.loadFile(sEmbedJSFilename);
       sEmbedJS = new TextDecoder().decode(data);
     } catch(e) {
-      callbacks.reportMessage(KmwCompilerMessages.Warn_EmbedJsFileMissing({filename: sEmbedJSFilename, e}));
+      callbacks.reportMessage(KmwCompilerMessages.Warn_EmbedJsFileMissing({line: getStoreLine(sEmbedJSStoreIndex), jsFilename: sEmbedJSFilename, e}));
       sEmbedJS = '';
     }
   }
@@ -147,7 +157,7 @@ export function WriteCompiledKeyboard(
       if(sEmbedCSS != '' && !sEmbedCSS.endsWith('\r\n')) sEmbedCSS += '\r\n';  // match CompileKeymanWeb.pas
     } catch(e) {
       // TODO(lowpri): rename error constant to Warn_EmbedFileMissing
-      callbacks.reportMessage(KmwCompilerMessages.Warn_EmbedJsFileMissing({filename: sEmbedCSSFilename, e}));
+      callbacks.reportMessage(KmwCompilerMessages.Warn_EmbedJsFileMissing({line: getStoreLine(sEmbedCSSStoreIndex), jsFilename: sEmbedCSSFilename, e}));
       sEmbedCSS = '';
     }
   }
@@ -222,12 +232,6 @@ export function WriteCompiledKeyboard(
     result += `${FTabStop}this.KCSS="${RequotedString(sEmbedCSS)}";${nl}`;
   }
 
-  const isStoreType = (index:number, type: number) => !!(kmxResult.extra.stores[index].storeType & type);
-  const isDebugStore = (index: number) => isStoreType(index, STORETYPE_DEBUG);
-  const isReservedStore = (index: number) => isStoreType(index, STORETYPE_RESERVED);
-  const isOptionStore = (index: number) => isStoreType(index, STORETYPE_OPTION);
-  const getStoreLine = (index: number) => kmxResult.extra.stores[index].line;
-
 	// Write the stores out
   FOptionStores = '';
 	for(let i = 0; i < keyboard.stores.length; i++) {
diff --git a/developer/src/kmc-kmn/test/test-messages.ts b/developer/src/kmc-kmn/test/test-messages.ts
index af07abc2adf..6970b997417 100644
--- a/developer/src/kmc-kmn/test/test-messages.ts
+++ b/developer/src/kmc-kmn/test/test-messages.ts
@@ -84,7 +84,7 @@ describe('CompilerMessages', function () {
 
   it('should generate ERROR_NotSupportedInKeymanWebOutput if a rule has `return` in the output', async function() {
     await testForMessage(this, ['invalid-keyboards', 'error_not_supported_in_keyman_web_output.kmn'], KmnCompilerMessages.ERROR_NotSupportedInKeymanWebOutput);
-    assert.equal(callbacks.messages[0].message, "Statement \"return\" is not currently supported in output");
+    assert.equal(callbacks.messages[0].message, "Statement 'return' is not currently supported in output for web and touch targets");
   });
 
 });

From 8e6252c7de1d5fa424048dc196ded51acb71d31a Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Sun, 5 Nov 2023 06:57:01 +0700
Subject: [PATCH 32/67] fix(developer): move KeymanSentry to developer-utils

Relates to #9939. Splits KeymanSentry.ts into common functionality in
developer-utils, and TestKeymanSentry.ts.
---
 developer/src/common/web/utils/index.ts       |  3 +-
 .../web/utils/src}/KeymanSentry.ts            | 59 ++++---------------
 .../web/utils/src}/spawnAwait.ts              |  0
 developer/src/common/web/utils/tsconfig.json  |  3 +-
 developer/src/kmc/src/kmc.ts                  |  5 +-
 .../src/kmc/src/util/NodeCompilerCallbacks.ts |  2 +-
 .../src/kmc/src/util/TestKeymanSentry.ts      | 52 ++++++++++++++++
 7 files changed, 71 insertions(+), 53 deletions(-)
 rename developer/src/{kmc/src/util => common/web/utils/src}/KeymanSentry.ts (62%)
 rename developer/src/{kmc/src/util => common/web/utils/src}/spawnAwait.ts (100%)
 create mode 100644 developer/src/kmc/src/util/TestKeymanSentry.ts

diff --git a/developer/src/common/web/utils/index.ts b/developer/src/common/web/utils/index.ts
index f18f2e90de5..fe3cd7ad847 100644
--- a/developer/src/common/web/utils/index.ts
+++ b/developer/src/common/web/utils/index.ts
@@ -1 +1,2 @@
-export { validateMITLicense } from './src/validate-mit-license.js';
\ No newline at end of file
+export { validateMITLicense } from './src/validate-mit-license.js';
+export { KeymanSentry } from './src/KeymanSentry.js';
diff --git a/developer/src/kmc/src/util/KeymanSentry.ts b/developer/src/common/web/utils/src/KeymanSentry.ts
similarity index 62%
rename from developer/src/kmc/src/util/KeymanSentry.ts
rename to developer/src/common/web/utils/src/KeymanSentry.ts
index 3314086f6a3..bc5f126803f 100644
--- a/developer/src/kmc/src/util/KeymanSentry.ts
+++ b/developer/src/common/web/utils/src/KeymanSentry.ts
@@ -1,5 +1,3 @@
-import { KmnCompiler } from "@keymanapp/kmc-kmn";
-import { NodeCompilerCallbacks } from "./NodeCompilerCallbacks.js";
 import Sentry from "@sentry/node";
 import KEYMAN_VERSION from "@keymanapp/keyman-version";
 import { spawnChild } from "./spawnAwait.js";
@@ -10,52 +8,9 @@ import { spawnChild } from "./spawnAwait.js";
  */
 const CLOSE_TIMEOUT = 2000;
 
-const cli = process.argv.join(' ');
 let isInit = false;
 
 export class KeymanSentry {
-  static isTestCL() {
-    // Note single hyphen match which matches other Developer console app
-    // implementations, but this will also work with
-    // --sentry-client-test-exception, so we get the best of both worlds.
-    // This parameter is undocumented by design
-    return cli.includes('-sentry-client-test-exception');
-  }
-
-  static async runTestIfCLRequested() {
-    if(KeymanSentry.isTestCL()) {
-      await KeymanSentry.test();
-      console.error('Unexpected return from KeymanSentry.test');
-      process.exit(1);
-    }
-  }
-
-  static async test() {
-    KeymanSentry.init();
-    if(cli.includes('kmcmplib')) {
-      const compiler = new KmnCompiler();
-      const callbacks = new NodeCompilerCallbacks({});
-      if(!await compiler.init(callbacks)) {
-        throw new Error('Failed to instantiate WASM compiler');
-      }
-      try {
-        compiler.testSentry();
-      } catch(e: any) {
-        await KeymanSentry.captureException(e);
-      }
-    } else if(cli.includes('event')) {
-      const eventId = Sentry.captureMessage('Test message from -sentry-client-test-exception event');
-      await Sentry.close(CLOSE_TIMEOUT);
-      console.log(`Captured test message with id ${eventId}`);
-      process.exit(0);
-    } else {
-      try {
-        throw new Error('Test error from -sentry-client-test-exception event');
-      } catch(e: any) {
-        await KeymanSentry.captureException(e);
-      }
-    }
-  }
 
   static async isEnabled() {
     if(process.argv.includes('--no-error-reporting')) {
@@ -115,14 +70,22 @@ export class KeymanSentry {
     return null;
   }
 
-  static async captureException(e: any) {
+  static captureMessage(message: string) {
+    if(isInit) {
+      return Sentry.captureMessage(message);
+    } else {
+      return null;
+    }
+  }
+
+  static async captureException(e: any): Promise<never> {
     if(isInit) {
       const eventId = Sentry.captureException(e);
       process.stderr.write(`
       Fatal error: ${(e??'').toString()}
       `);
       this.writeSentryMessage(eventId);
-      this.close();
+      await this.close();
 
       // For local development, we don't want to bury the trace; we need the cast to avoid
       // TS2367 (comparison appears to be unintentional)
@@ -137,7 +100,7 @@ export class KeymanSentry {
 
   static async close() {
     if(isInit) {
-      await Sentry.close(2000);
+      await Sentry.close(CLOSE_TIMEOUT);
     }
   }
 }
\ No newline at end of file
diff --git a/developer/src/kmc/src/util/spawnAwait.ts b/developer/src/common/web/utils/src/spawnAwait.ts
similarity index 100%
rename from developer/src/kmc/src/util/spawnAwait.ts
rename to developer/src/common/web/utils/src/spawnAwait.ts
diff --git a/developer/src/common/web/utils/tsconfig.json b/developer/src/common/web/utils/tsconfig.json
index b509561362d..9d67982457f 100644
--- a/developer/src/common/web/utils/tsconfig.json
+++ b/developer/src/common/web/utils/tsconfig.json
@@ -10,7 +10,8 @@
       },
     },
   "include": [
-    "./*.ts", "src/validate-mit-license.ts",
+    "index.ts",
+    "src/**/*.ts",
   ],
   "references": [
     { "path": "../../../../../common/web/types/" },
diff --git a/developer/src/kmc/src/kmc.ts b/developer/src/kmc/src/kmc.ts
index 049dc7c6aad..9fbd6f13b11 100644
--- a/developer/src/kmc/src/kmc.ts
+++ b/developer/src/kmc/src/kmc.ts
@@ -6,10 +6,11 @@
 import { Command, Option } from 'commander';
 import { declareBuild } from './commands/build.js';
 import { declareAnalyze } from './commands/analyze.js';
-import { KeymanSentry } from './util/KeymanSentry.js';
+import { KeymanSentry } from '@keymanapp/developer-utils';
 import KEYMAN_VERSION from "@keymanapp/keyman-version";
+import { TestKeymanSentry } from './util/TestKeymanSentry.js';
 
-await KeymanSentry.runTestIfCLRequested();
+await TestKeymanSentry.runTestIfCLRequested();
 try {
   await run();
 } catch(e) {
diff --git a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
index dc048317deb..f781b241929 100644
--- a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
+++ b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
@@ -10,7 +10,7 @@ import { CompilerCallbacks, CompilerEvent,
 import { InfrastructureMessages } from '../messages/infrastructureMessages.js';
 import chalk from 'chalk';
 import supportsColor from 'supports-color';
-import { KeymanSentry } from './KeymanSentry.js';
+import { KeymanSentry } from '@keymanapp/developer-utils';
 
 const color = chalk.default;
 const severityColors: {[value in CompilerErrorSeverity]: chalk.Chalk} = {
diff --git a/developer/src/kmc/src/util/TestKeymanSentry.ts b/developer/src/kmc/src/util/TestKeymanSentry.ts
new file mode 100644
index 00000000000..c2df448ebfb
--- /dev/null
+++ b/developer/src/kmc/src/util/TestKeymanSentry.ts
@@ -0,0 +1,52 @@
+import { KmnCompiler } from "@keymanapp/kmc-kmn";
+import { NodeCompilerCallbacks } from "./NodeCompilerCallbacks.js";
+import { KeymanSentry } from '@keymanapp/developer-utils';
+
+const cli = process.argv.join(' ');
+const CLOSE_TIMEOUT = 2000;
+
+export class TestKeymanSentry {
+  static isTestCL() {
+    // Note single hyphen match which matches other Developer console app
+    // implementations, but this will also work with
+    // --sentry-client-test-exception, so we get the best of both worlds.
+    // This parameter is undocumented by design
+    return cli.includes('-sentry-client-test-exception');
+  }
+
+  static async runTestIfCLRequested() {
+    if(TestKeymanSentry.isTestCL()) {
+      await TestKeymanSentry.test();
+      console.error('Unexpected return from KeymanSentry.test');
+      process.exit(1);
+    }
+  }
+
+  static async test() {
+    KeymanSentry.init();
+    if(cli.includes('kmcmplib')) {
+      const compiler = new KmnCompiler();
+      const callbacks = new NodeCompilerCallbacks({});
+      if(!await compiler.init(callbacks)) {
+        throw new Error('Failed to instantiate WASM compiler');
+      }
+      try {
+        compiler.testSentry();
+      } catch(e: any) {
+        await KeymanSentry.captureException(e);
+      }
+    } else if(cli.includes('event')) {
+      const eventId = KeymanSentry.captureMessage('Test message from -sentry-client-test-exception event');
+      await KeymanSentry.close();
+      console.log(`Captured test message with id ${eventId}`);
+      process.exit(0);
+    } else {
+      try {
+        throw new Error('Test error from -sentry-client-test-exception event');
+      } catch(e: any) {
+        await KeymanSentry.captureException(e);
+      }
+    }
+  }
+
+}
\ No newline at end of file

From 716cb526b7688da24eb4bf6275d179f7223d5712 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 6 Nov 2023 08:18:24 +0700
Subject: [PATCH 33/67] fix(developer): Sentry in Server should honour
 reporting settings

Fixes #9939.

Uses refactored KeymanSentry.ts in developer-utils and updates the
loader in Server to run from that.

The changes to tray.ts and friends are required to deal with a top-level
await issue with the shutdown call.

The top-level await issue is described in detail at
https://marc.durdin.net/2023/11/dynamic-import-on-node-js-with-circular-dependencies-leads-to-interesting-failure-modes/

tl;dr: shutdown needed to do a proper Sentry shutdown. The shutdown code
was in index.ts. This led to a circular dependency and caused a silent
and abrupt exit code 13 in Node.js. Moved shutdown code into shutdown.ts
to resolve this.
---
 developer/src/kmc/package.json                |   4 +
 developer/src/kmc/src/kmc.ts                  |   1 +
 .../src/kmc/src/util/TestKeymanSentry.ts      |   1 -
 developer/src/server/build.sh                 |   1 +
 developer/src/server/package.json             |   4 +
 developer/src/server/src/index.ts             | 189 +++++++++---------
 developer/src/server/src/routes.ts            |   3 +-
 developer/src/server/src/shutdown.ts          |   6 +
 developer/src/server/src/tray.ts              |  14 +-
 developer/src/server/src/win32-tray.ts        |   3 +-
 developer/src/server/tsconfig.json            |   9 +-
 package-lock.json                             |   8 +
 12 files changed, 141 insertions(+), 102 deletions(-)
 create mode 100644 developer/src/server/src/shutdown.ts

diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json
index 7f9e0a9053a..0cb776c327e 100644
--- a/developer/src/kmc/package.json
+++ b/developer/src/kmc/package.json
@@ -36,6 +36,7 @@
   },
   "dependencies": {
     "@keymanapp/common-types": "*",
+    "@keymanapp/developer-utils": "*",
     "@keymanapp/keyman-version": "*",
     "@keymanapp/kmc-analyze": "*",
     "@keymanapp/kmc-keyboard-info": "*",
@@ -50,6 +51,9 @@
     "commander": "^10.0.0",
     "supports-color": "^9.4.0"
   },
+  "bundleDependencies": [
+    "@keymanapp/developer-utils"
+  ],
   "files": [
     "build/src/"
   ],
diff --git a/developer/src/kmc/src/kmc.ts b/developer/src/kmc/src/kmc.ts
index 9fbd6f13b11..9751376f524 100644
--- a/developer/src/kmc/src/kmc.ts
+++ b/developer/src/kmc/src/kmc.ts
@@ -11,6 +11,7 @@ import KEYMAN_VERSION from "@keymanapp/keyman-version";
 import { TestKeymanSentry } from './util/TestKeymanSentry.js';
 
 await TestKeymanSentry.runTestIfCLRequested();
+KeymanSentry.init();
 try {
   await run();
 } catch(e) {
diff --git a/developer/src/kmc/src/util/TestKeymanSentry.ts b/developer/src/kmc/src/util/TestKeymanSentry.ts
index c2df448ebfb..75da80e53de 100644
--- a/developer/src/kmc/src/util/TestKeymanSentry.ts
+++ b/developer/src/kmc/src/util/TestKeymanSentry.ts
@@ -3,7 +3,6 @@ import { NodeCompilerCallbacks } from "./NodeCompilerCallbacks.js";
 import { KeymanSentry } from '@keymanapp/developer-utils';
 
 const cli = process.argv.join(' ');
-const CLOSE_TIMEOUT = 2000;
 
 export class TestKeymanSentry {
   static isTestCL() {
diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index 51523c52a3e..1e94dfc05e4 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -14,6 +14,7 @@ cd "$THIS_SCRIPT_PATH"
 
 builder_describe "Build Keyman Developer Server" \
   @/common/web/keyman-version \
+  @/developer/src/common/web/utils \
   @/web \
   clean \
   configure \
diff --git a/developer/src/server/package.json b/developer/src/server/package.json
index fbba3454395..f9d4e8eddf0 100644
--- a/developer/src/server/package.json
+++ b/developer/src/server/package.json
@@ -23,6 +23,7 @@
   },
   "devDependencies": {
     "@keymanapp/keyman-version": "*",
+    "@keymanapp/developer-utils": "*",
     "@keymanapp/resources-gosh": "*",
     "@types/chai": "^4.3.0",
     "@types/express": "^4.17.13",
@@ -37,6 +38,9 @@
     "tsc-watch": "^4.5.0",
     "typescript": "^4.9.5"
   },
+  "bundleDependencies": [
+    "@keymanapp/developer-utils"
+  ],
   "mocha": {
     "require": "ts-node/register",
     "spec": "build/**/*.test.js"
diff --git a/developer/src/server/src/index.ts b/developer/src/server/src/index.ts
index a2975545730..bde4076fb62 100644
--- a/developer/src/server/src/index.ts
+++ b/developer/src/server/src/index.ts
@@ -1,12 +1,5 @@
 import { environment } from './environment.js';
-
-import * as Sentry from '@sentry/node';
-Sentry.init({
-  dsn: 'https://39b25a09410349a58fe12aaf721565af@o1005580.ingest.sentry.io/5983519',  // Keyman Developer
-  environment: environment.versionEnvironment,
-  release: environment.versionGitTag
-});
-
+import { KeymanSentry } from '@keymanapp/developer-utils';
 import express from 'express';
 import * as ws from 'ws';
 import * as os from 'os';
@@ -14,8 +7,9 @@ import multer from 'multer';
 import * as fs from 'fs';
 import setupRoutes from './routes.js';
 import { configuration } from './config.js';
-import tray from './tray.js';
+import { initTray } from './tray.js';
 import chalk from 'chalk';
+import { shutdown } from './shutdown.js';
 
 const options = {
   ngrokLog: false,   // Set this to true if you need to see ngrok logs in the console
@@ -25,102 +19,117 @@ const options = {
 
 console.log(`Starting Keyman Developer Server ${environment.versionWithTag}, listening on port ${configuration.port}.`);
 
-// This triggers the exit event for Ctrl+C which allows us to cleanup
-// consistently
-process.on('SIGINT', ()=>{process.exit(0)});
+KeymanSentry.init();
+try {
+  await run();
+} catch(e) {
+  KeymanSentry.captureException(e);
+  throw e;
+}
 
-if(fs.existsSync(configuration.lockFilename)) {
-  // Attempt connection to existing port
+// Ensure any messages reported to Sentry have had time to be uploaded before we
+// exit. In most cases, this will be a no-op so should not affect performance.
+await KeymanSentry.close();
 
-  // If that fails, we'll assume the previous process died and delete the lockfile.
-}
+export async function run() {
+  // This triggers the exit event for Ctrl+C which allows us to cleanup
+  // consistently
+  process.on('SIGINT', shutdown);
 
-// TODO: flock with fs-ext
-let lockFileDescriptor = fs.openSync(configuration.lockFilename, 'w');
-fs.writeFileSync(configuration.pidFilename, process.pid.toString());
-fs.writeFileSync(lockFileDescriptor, process.pid.toString());
+  const tray = await initTray();
 
-process.on('exit', () => {
-  if(fs.existsSync(configuration.pidFilename)) {
-    fs.unlinkSync(configuration.pidFilename);
-  }
-  if(lockFileDescriptor) {
-    fs.closeSync(lockFileDescriptor);
-    lockFileDescriptor = null;
-    fs.unlinkSync(configuration.lockFilename);
+  if(fs.existsSync(configuration.lockFilename)) {
+    // Attempt connection to existing port
+
+    // If that fails, we'll assume the previous process died and delete the lockfile.
   }
-});
 
-/* Server Setup */
+  // TODO: flock with fs-ext
+  let lockFileDescriptor = fs.openSync(configuration.lockFilename, 'w');
+  fs.writeFileSync(configuration.pidFilename, process.pid.toString());
+  fs.writeFileSync(lockFileDescriptor, process.pid.toString());
+
+  process.on('exit', () => {
+    if(fs.existsSync(configuration.pidFilename)) {
+      fs.unlinkSync(configuration.pidFilename);
+    }
+    if(lockFileDescriptor) {
+      fs.closeSync(lockFileDescriptor);
+      lockFileDescriptor = null;
+      fs.unlinkSync(configuration.lockFilename);
+    }
+  });
+
+  /* Server Setup */
 
-const app = express();
-const upload = multer({ storage: multer.memoryStorage(), limits: { fileSize: 1024*1024*100 /*100MB*/ } });
+  const app = express();
+  const upload = multer({ storage: multer.memoryStorage(), limits: { fileSize: 1024*1024*100 /*100MB*/ } });
 
-/* Websockets */
+  /* Websockets */
 
-const wsServer = new ws.WebSocketServer({ noServer: true });
-wsServer.on('connection', socket => {
-  socket.on('message', (message) => {
-    console.debug('wsServer.socket.onmessage: '+message.toString());
-    if(message.toString() == 'ping')
-      socket.send('pong');
+  const wsServer = new ws.WebSocketServer({ noServer: true });
+  wsServer.on('connection', socket => {
+    socket.on('message', (message) => {
+      console.debug('wsServer.socket.onmessage: '+message.toString());
+      if(message.toString() == 'ping')
+        socket.send('pong');
+    });
+    socket.send('refresh');
   });
-  socket.send('refresh');
-});
 
-/* Setup routes */
+  /* Setup routes */
 
-setupRoutes(app, upload, wsServer, environment);
+  setupRoutes(app, upload, wsServer, environment);
 
-/* Start the server */
+  /* Start the server */
 
-const server = app.listen(configuration.port);
+  const server = app.listen(configuration.port);
 
-server.on('upgrade', (request, socket, head) => {
-  wsServer.handleUpgrade(request, socket, head, socket => {
-    wsServer.emit('connection', socket, request);
+  server.on('upgrade', (request, socket, head) => {
+    wsServer.handleUpgrade(request, socket, head, socket => {
+      wsServer.emit('connection', socket, request);
+    });
   });
-});
-
-/* Launch ngrok if enabled */
-
-configuration.ngrokEndpoint = '';
-
-if(configuration.useNgrok && os.platform() == 'win32' && fs.existsSync(configuration.ngrokBinPath)) {
-  const ngrok: any = await import('ngrok');
-  (async function() {
-    configuration.ngrokEndpoint = await ngrok.connect({
-      proto: 'http',
-      bind_tls: true,
-      addr: configuration.port,
-      authtoken: configuration.ngrokToken,
-      region: configuration.ngrokRegion,
-      binPath: () => configuration.ngrokBinPath,
-      onLogEvent: (msg: string) => {
-        if(options.ngrokLog) {
-          console.log(chalk.cyan(('\n'+msg).split('\n').join('\n[ngrok] ').trim()));
-        }
-      },
-      onStatusChange: (state: string) => {
-        if(state == 'connected') {
-          setTimeout(async () => {
-            const api = ngrok.getApi();
-            const tunnels = await api.listTunnels();
-            configuration.ngrokEndpoint = tunnels.tunnels[0]?.public_url ?? '';
-            console.log(chalk.blueBright('ngrok tunnel established at %s'), configuration.ngrokEndpoint);
-          }, 1000);
-        } else if(state == 'closed') {
-          configuration.ngrokEndpoint = '';
-          console.log(chalk.blueBright('ngrok tunnel closed'));
+
+  /* Launch ngrok if enabled */
+
+  configuration.ngrokEndpoint = '';
+
+  if(configuration.useNgrok && os.platform() == 'win32' && fs.existsSync(configuration.ngrokBinPath)) {
+    const ngrok: any = await import('ngrok');
+    (async function() {
+      configuration.ngrokEndpoint = await ngrok.connect({
+        proto: 'http',
+        bind_tls: true,
+        addr: configuration.port,
+        authtoken: configuration.ngrokToken,
+        region: configuration.ngrokRegion,
+        binPath: () => configuration.ngrokBinPath,
+        onLogEvent: (msg: string) => {
+          if(options.ngrokLog) {
+            console.log(chalk.cyan(('\n'+msg).split('\n').join('\n[ngrok] ').trim()));
+          }
+        },
+        onStatusChange: (state: string) => {
+          if(state == 'connected') {
+            setTimeout(async () => {
+              const api = ngrok.getApi();
+              const tunnels = await api.listTunnels();
+              configuration.ngrokEndpoint = tunnels.tunnels[0]?.public_url ?? '';
+              console.log(chalk.blueBright('ngrok tunnel established at %s'), configuration.ngrokEndpoint);
+            }, 1000);
+          } else if(state == 'closed') {
+            configuration.ngrokEndpoint = '';
+            console.log(chalk.blueBright('ngrok tunnel closed'));
+          }
         }
-      }
-    });
-    console.log(chalk.blueBright('ngrok tunnel initially established at %s'), configuration.ngrokEndpoint);
+      });
+      console.log(chalk.blueBright('ngrok tunnel initially established at %s'), configuration.ngrokEndpoint);
+      tray.start(configuration.port, configuration.ngrokEndpoint);
+    })();
+  }
+  else {
+    /* Load the tray icon */
     tray.start(configuration.port, configuration.ngrokEndpoint);
-  })();
-}
-else {
-  /* Load the tray icon */
-  tray.start(configuration.port, configuration.ngrokEndpoint);
-}
-
+  }
+}
\ No newline at end of file
diff --git a/developer/src/server/src/routes.ts b/developer/src/server/src/routes.ts
index 20c09f838f7..3876bf0d7a1 100644
--- a/developer/src/server/src/routes.ts
+++ b/developer/src/server/src/routes.ts
@@ -14,6 +14,7 @@ import handleIncKeyboardsCss from './handlers/inc/keyboards-css.js';
 import { Environment } from './version-data.js';
 import { configuration } from './config.js';
 import chalk from 'chalk';
+import { shutdown } from './shutdown.js';
 
 export default function setupRoutes(app: express.Express, upload: multer.Multer, wsServer: ws.WebSocketServer, environment: Environment ) {
 
@@ -97,7 +98,7 @@ export default function setupRoutes(app: express.Express, upload: multer.Multer,
 
   /* Localhost only routes -- todo /api/internal/ vs /api/... */
 
-  app.post('/api/shutdown', (_req,res) => { setTimeout(() => process.exit(0), 100); res.send('ok'); });
+  app.post('/api/shutdown', (_req,res) => { setTimeout(shutdown, 100); res.send('ok'); });
 
   appGetData(app, /\/data\/keyboard\/(.+)\.js$/, data.keyboards);
   appGetData(app, /\/data\/model\/(.+)\.model\.js$/, data.models);
diff --git a/developer/src/server/src/shutdown.ts b/developer/src/server/src/shutdown.ts
new file mode 100644
index 00000000000..d33b035bfcb
--- /dev/null
+++ b/developer/src/server/src/shutdown.ts
@@ -0,0 +1,6 @@
+import { KeymanSentry } from '@keymanapp/developer-utils';
+
+export async function shutdown(code?: number): Promise<never> {
+  await KeymanSentry.close();
+  process.exit(code ?? 0);
+}
diff --git a/developer/src/server/src/tray.ts b/developer/src/server/src/tray.ts
index 780d9c792c4..284949282ec 100644
--- a/developer/src/server/src/tray.ts
+++ b/developer/src/server/src/tray.ts
@@ -6,11 +6,11 @@ class TrayStub {
   public shutdown() {};
 };
 
-let tray = new TrayStub();
-
-if(os.platform() == 'win32') {
-  const { Win32Tray } = await import('./win32-tray.js');
-  tray = new Win32Tray();
+export async function initTray() {
+  let tray = new TrayStub();
+  if(os.platform() == 'win32') {
+    const { Win32Tray } = await import('./win32-tray.js');
+    tray = new Win32Tray();
+  }
+  return tray;
 }
-
-export default tray;
diff --git a/developer/src/server/src/win32-tray.ts b/developer/src/server/src/win32-tray.ts
index 02ef0a4db80..a71771f3de1 100644
--- a/developer/src/server/src/win32-tray.ts
+++ b/developer/src/server/src/win32-tray.ts
@@ -1,5 +1,6 @@
 import * as path from "path";
 import * as url from 'url';
+import { shutdown } from './shutdown.js';
 
 // TODO: this is a Windows-only tray icon. There are a number of
 // cross-platform solutions but none of them are wonderful. We
@@ -76,7 +77,7 @@ export class Win32Tray {
           WindowsConsole.hideConsole();
           break;
         case 'item-id-exit':
-          process.exit(0);
+          shutdown();
       }
     });
 
diff --git a/developer/src/server/tsconfig.json b/developer/src/server/tsconfig.json
index e5adde95784..5afa4ea2d06 100644
--- a/developer/src/server/tsconfig.json
+++ b/developer/src/server/tsconfig.json
@@ -17,12 +17,17 @@
     "strictFunctionTypes": true,
     "noUnusedLocals": true,
     "allowJs": true,
-    "lib": ["es2022"]
+    "lib": ["es2022"],
+
+    "paths": {
+      "@keymanapp/developer-utils": ["../common/web/utils/index"],
+    }
   },
   "include": [
     "src/**/*.ts"
   ],
   "references": [
-    { "path": "../../../common/web/keyman-version" }
+    { "path": "../../../common/web/keyman-version" },
+    { "path": "../common/web/utils" },
   ]
 }
diff --git a/package-lock.json b/package-lock.json
index 447759c5816..359a098c95b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -835,9 +835,13 @@
     },
     "developer/src/kmc": {
       "name": "@keymanapp/kmc",
+      "bundleDependencies": [
+        "@keymanapp/developer-utils"
+      ],
       "license": "MIT",
       "dependencies": {
         "@keymanapp/common-types": "*",
+        "@keymanapp/developer-utils": "*",
         "@keymanapp/keyman-version": "*",
         "@keymanapp/kmc-analyze": "*",
         "@keymanapp/kmc-keyboard-info": "*",
@@ -2758,6 +2762,9 @@
     },
     "developer/src/server": {
       "name": "@keymanapp/developer-server",
+      "bundleDependencies": [
+        "@keymanapp/developer-utils"
+      ],
       "license": "MIT",
       "dependencies": {
         "@sentry/node": "^6.16.1",
@@ -2769,6 +2776,7 @@
         "ws": "^8.3.0"
       },
       "devDependencies": {
+        "@keymanapp/developer-utils": "*",
         "@keymanapp/keyman-version": "*",
         "@keymanapp/resources-gosh": "*",
         "@types/chai": "^4.3.0",

From 8e21925c26d4fc60cbfb0ac6f0d6dcdf81fc75a4 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 6 Nov 2023 08:30:05 +0700
Subject: [PATCH 34/67] fix(developer): resilience in loading Server config and
 cache files

Fixes #9848.

Root cause of #9848 is unknown, because the cache state file was filled
with nul bytes. It is unclear how that could have happened, but seems
likely to be external interference.

The cascade was that Server failed to start because it would crash when
attempting to load the cache state file. So this fix resolves that by
handling invalid file exceptions.
---
 developer/src/server/src/config.ts         | 11 ++++-------
 developer/src/server/src/data.ts           |  7 ++++---
 developer/src/server/src/load-json-file.ts | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 developer/src/server/src/load-json-file.ts

diff --git a/developer/src/server/src/config.ts b/developer/src/server/src/config.ts
index 6197cde05aa..2f8e4bb136b 100644
--- a/developer/src/server/src/config.ts
+++ b/developer/src/server/src/config.ts
@@ -1,4 +1,5 @@
-import * as fs from 'fs';
+import { mkdirSync } from 'fs';
+import { loadJsonFile } from './load-json-file.js';
 
 export class Configuration {
   public readonly appDataPath: string;
@@ -34,13 +35,9 @@ export class Configuration {
     this.pidFilename = this.appDataPath + 'pid.json';
     this.configFilename = this.appDataPath + 'config.json';
 
-    fs.mkdirSync(this.cachePath, { recursive: true});
+    mkdirSync(this.cachePath, { recursive: true});
 
-    let cfg = null;
-    if(fs.existsSync(this.configFilename)) {
-      const data = fs.readFileSync(this.configFilename, 'utf-8');
-      cfg = JSON.parse(data);
-    }
+    const cfg = loadJsonFile(this.configFilename);
 
     this.port = cfg?.port ?? 8008;
 
diff --git a/developer/src/server/src/data.ts b/developer/src/server/src/data.ts
index 58763f07013..6600d57b4d9 100644
--- a/developer/src/server/src/data.ts
+++ b/developer/src/server/src/data.ts
@@ -1,5 +1,6 @@
-import * as fs from 'fs';
+import { writeFileSync } from 'fs';
 import { configuration } from './config.js';
+import { loadJsonFile } from './load-json-file.js';
 
 export interface DebugObject {
   id: string;
@@ -96,7 +97,7 @@ export class SiteData {
   }
 
   private loadState() {
-    const state = fs.existsSync(configuration.cacheStateFilename) ? JSON.parse(fs.readFileSync(configuration.cacheStateFilename, 'utf-8')) : null;
+    const state = loadJsonFile(configuration.cacheStateFilename);
     this.loadDebugObject(DebugKeyboard, state?.keyboards, this.keyboards);
     this.loadDebugObject(DebugModel, state?.models, this.models);
     this.loadDebugObject(DebugFont, state?.fonts, this.fonts);
@@ -105,7 +106,7 @@ export class SiteData {
   }
 
   public saveState() {
-    fs.writeFileSync(configuration.cacheStateFilename, JSON.stringify(this, null, 2), 'utf-8');
+    writeFileSync(configuration.cacheStateFilename, JSON.stringify(this, null, 2), 'utf-8');
   }
 };
 
diff --git a/developer/src/server/src/load-json-file.ts b/developer/src/server/src/load-json-file.ts
new file mode 100644
index 00000000000..28916cd83bb
--- /dev/null
+++ b/developer/src/server/src/load-json-file.ts
@@ -0,0 +1,14 @@
+import { KeymanSentry } from '@keymanapp/developer-utils';
+import { readFileSync, existsSync } from 'fs';
+
+export function loadJsonFile(filename: string): any {
+  try {
+    return existsSync(filename) ?
+      JSON.parse(readFileSync(filename, 'utf-8')) :
+      null;
+  } catch(e: any) {
+    console.error(`Error loading ${filename}: ${(e ?? '').toString()}`);
+    KeymanSentry.reportException(e);
+    return null;
+  }
+}
\ No newline at end of file

From ea038c6db800b6dd32f1fe0961146b962ef728d6 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 6 Nov 2023 10:46:48 +0700
Subject: [PATCH 35/67] chore(developer): developer-utils embed

---
 developer/src/server/build.sh     | 3 ++-
 developer/src/server/package.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index 1e94dfc05e4..853f94cc357 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -106,7 +106,7 @@ function installer_server() {
   # Remove @keymanapp devDependencies because they won't install outside the
   # monorepo context
   cat package.json | "$JQ" \
-    '. | del(.devDependencies."@keymanapp/resources-gosh") | del(.devDependencies."@keymanapp/keyman-version")' \
+    '. | del(.devDependencies."@keymanapp/resources-gosh") | del(.devDependencies."@keymanapp/keyman-version") | del(.dependencies."@keymanapp/developer-utils")' \
     > "$PRODBUILDTEMP/package.json"
 
   pushd "$PRODBUILDTEMP"
@@ -118,6 +118,7 @@ function installer_server() {
   # @keymanapp/keyman-version is required in build/ now but we need to copy it in manually
   mkdir -p "$PRODBUILDTEMP/node_modules/@keymanapp/"
   cp -R "$KEYMAN_ROOT/node_modules/@keymanapp/keyman-version/" "$PRODBUILDTEMP/node_modules/@keymanapp/"
+  cp -R "$KEYMAN_ROOT/node_modules/@keymanapp/developer-utils/" "$PRODBUILDTEMP/node_modules/@keymanapp/"
 
   # We'll build in the $KEYMAN_ROOT/developer/bin/server/ folder
   rm -rf "$KEYMAN_ROOT/developer/bin/server/"
diff --git a/developer/src/server/package.json b/developer/src/server/package.json
index f9d4e8eddf0..122ad1e24f1 100644
--- a/developer/src/server/package.json
+++ b/developer/src/server/package.json
@@ -10,6 +10,7 @@
   "license": "MIT",
   "dependencies": {
     "@sentry/node": "^6.16.1",
+    "@keymanapp/developer-utils": "*",
     "chalk": "^4.1.2",
     "express": "^4.17.2",
     "multer": "^1.4.5-lts.1",
@@ -23,7 +24,6 @@
   },
   "devDependencies": {
     "@keymanapp/keyman-version": "*",
-    "@keymanapp/developer-utils": "*",
     "@keymanapp/resources-gosh": "*",
     "@types/chai": "^4.3.0",
     "@types/express": "^4.17.13",

From fa0b3e839eea2f1ecc15df392213da6125419eb8 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Nov 2023 12:06:49 +0700
Subject: [PATCH 36/67] refactor(core): Remove obsolete comments

Since things are working in both cases it seems that the problem got
fixed and the comments are obsolete.
---
 .../k_014___groups_and_virtual_keys.kmn       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmn b/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmn
index 81e26763b6d..0e32c432eb6 100644
--- a/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmn
+++ b/common/test/keyboards/baseline/k_014___groups_and_virtual_keys.kmn
@@ -11,16 +11,16 @@ store(&MnemonicLayout) "0"
 
 c ----------------------------------------------
 
-group(UMain) using keys 
-  + [K_A] > U+03B1
-  + [CTRL  K_2] > deadkey(MacronBug)
-  + [ALT  K_2] > deadkey(MacronBug)
-  + [SHIFT    K_2] > deadkey(BreveBug)
-      
+group(UMain) using keys
+  + [K_A]        > U+03B1
+  + [CTRL   K_2] > deadkey(MacronBug)
+  + [ALT    K_2] > deadkey(MacronBug)
+  + [SHIFT  K_2] > deadkey(BreveBug)
+
   match > use(DK1)
- 
+
 c ----------------------------------------------
 
-group(DK1)           
-  deadkey(MacronBug) U+03B1 > U+1FB1 c won't work
-  deadkey(BreveBug)  U+03B1 > U+1FB0 c works
+group(DK1)
+  deadkey(MacronBug) U+03B1 > U+1FB1
+  deadkey(BreveBug)  U+03B1 > U+1FB0

From 84dd0c6b95cd535a2b7e328d9d7e3225bb94c8c0 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Nov 2023 12:05:20 +0700
Subject: [PATCH 37/67] chore(web): Improve debug output of nodeProctor

---
 common/web/recorder/src/nodeProctor.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/web/recorder/src/nodeProctor.ts b/common/web/recorder/src/nodeProctor.ts
index 5548905e6e9..8693bd8c83f 100644
--- a/common/web/recorder/src/nodeProctor.ts
+++ b/common/web/recorder/src/nodeProctor.ts
@@ -88,9 +88,10 @@ export default class NodeProctor extends Proctor {
         // it's a matter of actually adding the feature.
         let ruleBehavior = processor.processKeystroke(new KeyEvent(keyEvent), target);
 
-        if(this.debugMode) {
-          console.log(JSON.stringify(target, null, '  '));
-          console.log(JSON.stringify(ruleBehavior, null, '  '));
+        if (this.debugMode) {
+          console.log("Processing %d:", keyEvent.Lcode);
+          console.log("target=%s", JSON.stringify(target, null, '  '));
+          console.log("ruleBehavior=%s", JSON.stringify(ruleBehavior, null, '  '));
         }
       }
     } else {
@@ -98,4 +99,4 @@ export default class NodeProctor extends Proctor {
     }
     return target.getText();
   }
-}
\ No newline at end of file
+}

From 2e71ec9e7008881c7d00ebf04c8cb03e0b3a2a72 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Fri, 3 Nov 2023 10:36:35 +0700
Subject: [PATCH 38/67] chore(web): Add failing test for deadkey bug

Also adds a similar testcase to the baseline keyboard tests.
---
 .../k_020___deadkeys_and_backspace.kmn        |   8 +-
 .../k_020___deadkeys_and_backspace.kmx        | Bin 882 -> 1172 bytes
 .../json/engine_tests/8568_deadkeys.json      |  95 ++++++++++++++++++
 .../json/keyboards/test_8568_deadkeys.json    |  10 ++
 .../keyboards/test_8568_deadkeys.html         |  92 +++++++++++++++++
 .../resources/keyboards/test_8568_deadkeys.js |  55 ++++++++++
 .../keyboards/test_8568_deadkeys.kmn          |  12 +++
 .../keyboards/test_8568_deadkeys.kmx          | Bin 0 -> 768 bytes
 ...putProcessor.js => inputProcessorTests.js} |  50 ++++++++-
 9 files changed, 319 insertions(+), 3 deletions(-)
 create mode 100644 common/test/resources/json/engine_tests/8568_deadkeys.json
 create mode 100644 common/test/resources/json/keyboards/test_8568_deadkeys.json
 create mode 100644 common/test/resources/keyboards/test_8568_deadkeys.html
 create mode 100644 common/test/resources/keyboards/test_8568_deadkeys.js
 create mode 100644 common/test/resources/keyboards/test_8568_deadkeys.kmn
 create mode 100644 common/test/resources/keyboards/test_8568_deadkeys.kmx
 rename common/web/input-processor/tests/cases/{inputProcessor.js => inputProcessorTests.js} (78%)

diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
index cf83220f9c3..757a03d3d60 100644
--- a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+++ b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
@@ -6,8 +6,9 @@ c 3. One deadkey and one char in context      dk(3) 'a' + BKSP = nul
 c 4. Two deadkeys in a row in context         dk(4a) dk(4b) + BKSP = nul
 c 5. One char and two deadkeys in context     'a' dk(5a) dk(5b) 'b' + BKSP = 'a'
 c 6. One char and two deadkeys and one char and two deadkeys in context     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
-c keys: [K_1][K_BKSP][K_2][K_BKSP][K_3][K_BKSP][K_4][K_BKSP][K_5][K_BKSP][K_6][K_BKSP]
-c expected: 78aa
+c 7. Two chars and one deadkey in between in context: 'c' (dk7) 'd' + BKSP = 'ok'
+c keys: [K_1][K_BKSP][K_2][K_BKSP][K_3][K_BKSP][K_4][K_BKSP][K_5][K_BKSP][K_6][K_BKSP][K_7][K_BKSP]
+c expected: 78aa ok
 c context: 7890
 
 store(&VERSION) '9.0'
@@ -22,3 +23,6 @@ group(main) using keys
 + '4' > dk(4a) dk(4b)
 + '5' > 'a' dk(5a) dk(5b) 'b'
 + '6' > 'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d)
++ '7' > 'c' dk(7) 'd'
+'c' 'd' + [K_BKSP]       > ' fail'
+'c' dk(7) 'd' + [K_BKSP] > ' ok'
diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx
index 149c2a4f97bb2bd48506ea090f64ee8594015a9e..3c2001fcb8f08af09dd373454c338f38329211a8 100644
GIT binary patch
literal 1172
zcmZvby=zoK6va<A(QIOn6n;jFL1Ym@*|%TWfXJG}FM?4L4XK39ZbFvCtZYPym4#SY
zEh)sp%0jHHEG?}318lSwD+^1p(cis0F)!eSGw0khcV^zqyqQ_NJ+C1teEBdXqR$%Q
z5HMW>r~9Qp1oB^O5A@_=s7qlU96`T;x4}{L8~7y{M1O<df-L$M{1c3#M>EneFr9-#
z)ED7u)U)ulsPDpyQE$MjQ9pqnN8N>=NBtUp74>`gUDTi8k5PYxKS%uo{vNg1_iwbF
z#VPa%m{Lc}s_Ox5Q$df^La(A`aJF=hz74WzvWH+@ZQX}Ec$Rmx$%wYsBpTOw<w1eA
z=$fU_7U}sc&wEwSIc91yQ=N7V-eSh!tJ?Q0p&Iy`tZHhRkvYxkl5XfSdLpip(*pUN
z=5<{+>6a2!X|J+Q@Lja{Msq8)le$CJV!pPoExyI7r@cBs?c@og3#q(7UQFdh@)BRR
zJEG*yQpzdgl=swB+)3Ar<5c$4RNYC}Ot{lX&7Ao6R@lSt`U!gs+=T7*|Mzi$d%ps9
zg6HCI!|u9wO7>TuwC);z43!yPhj}NWcaVGx*h$&nWD&^E06Q&vMHXktOTbRdUXw+I
zyk<VyUX{fp`7KaJA9F{VBX0t`ujA2MA%6;NcVp3eM&1R1yIjL-@V2uW@iPfp@jb1(
x-=wv^J|9_kopEh$zn^}uV!-?MrRw&(GsypF(Hom}ZwSxE4|{vS`_tbb{RL*kg>wJ^

literal 882
zcmY+Cy-!nN6viJYl!6R^wK|yCFc1c4xc#^kV+<OMF?^<cgu$2qZ2~cBQzlj><4l5+
ze}j{=le3dE6Mp~`Tlt-H-{S2_p7(jqbI$v9@4LFcv#n9-S^cssV!#Gs5|~~Fok6Kf
zAn&7-Nn`<<pm7{LMi=2JFoJ#$PlFt~4IhIE^jG*i=pXR+pnt(XgZ=~m4*DPbH|T5l
zD(GAICg?HFI0S6{r*I+Y5<DC9GW<N~2D}z@6aD}em@BQSr89lffj)b_pfZ)B=0TI%
z0pmySImNNACVYrG!ar5pRg1YZ+R!Vl>kWEIC0~C=d*lsm>zy{KOOX~C-})Z5>xu6h
zsfPPnyJRP<{KfYcXQ|?^cz1;A<q>DFAK1&w<dsxjA+NIf|Bk9VhbgCqQ|s%A-AVT>
z;>3MDb$8M|OYR({R*w9<F?W!@@ue?7FS3XMkiNV0FqFr6XL(?E%LlJOUIcc(N5PvW
zp9A)F>`hvf$X@{alJ+(&UXpKt82!W@sX^Wb-EPiLBJO88Ii#tK-#F<Q^4hS^P5QF#
VjPM355-;c8D4xw9^YMY#?*O2FUF84(

diff --git a/common/test/resources/json/engine_tests/8568_deadkeys.json b/common/test/resources/json/engine_tests/8568_deadkeys.json
new file mode 100644
index 00000000000..a18294d45e5
--- /dev/null
+++ b/common/test/resources/json/engine_tests/8568_deadkeys.json
@@ -0,0 +1,95 @@
+{
+  "specVersion": "14.0",
+  "keyboard": {
+    "id": "test_8568_deadkeys",
+    "name": "Testcase for deadkeys bug (#8568)",
+    "filename": "resources/keyboards/test_8568_deadkeys.js",
+    "languages": [
+      {
+        "id": "en",
+        "name": "English",
+        "region": "World"
+      }
+    ]
+  },
+  "inputTestSets": [
+    {
+      "constraint": {
+        "target": "hardware",
+        "validOSList": null,
+        "validBrowsers": null
+      },
+      "testSet": [
+        {
+          "inputs": [
+            {
+              "type": "key",
+              "keyCode": 88,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "x",
+                "code": "KeyX",
+                "keyCode": 88,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 70,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "f",
+                "code": "KeyF",
+                "keyCode": 70,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            }
+          ],
+          "output": "pass"
+        }
+      ]
+    }
+  ]
+}
diff --git a/common/test/resources/json/keyboards/test_8568_deadkeys.json b/common/test/resources/json/keyboards/test_8568_deadkeys.json
new file mode 100644
index 00000000000..bd366c1bac7
--- /dev/null
+++ b/common/test/resources/json/keyboards/test_8568_deadkeys.json
@@ -0,0 +1,10 @@
+{
+  "id": "test_8568_deadkeys",
+  "name":"Testcase for deadkeys bug (#8568)",
+  "languages":{
+    "id":"en",
+    "name": "English",
+    "region": "World"
+  },
+  "filename":"resources/keyboards/test_8568_deadkeys.js"
+}
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.html b/common/test/resources/keyboards/test_8568_deadkeys.html
new file mode 100644
index 00000000000..1b4cf314247
--- /dev/null
+++ b/common/test/resources/keyboards/test_8568_deadkeys.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+    <!-- Set the viewport width to match phone and tablet device widths -->
+    <meta name="viewport" content="width=device-width,user-scalable=no" />
+
+    <!-- Allow KeymanWeb to be saved to the iPhone home screen -->
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+
+    <!-- Enable IE9 Standards mode -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+
+    <title>KeymanWeb #8568</title>
+
+    <!-- Your page CSS -->
+    <style type='text/css'>
+      body {font-family: Tahoma,helvetica;}
+      h3 {font-size: 1em;font-weight:normal;color: darkred; margin-bottom: 4px}
+      .test {font-size: 1.5em; width:80%; min-height:30px; border: 1px solid gray;}
+      #KeymanWebControl {width:50%;min-width:600px;}
+    </style>
+
+    <!-- Insert uncompiled KeymanWeb source scripts -->
+    <script src="../../../../web/build/publish/debug/keymanweb.js" type="application/javascript"></script>
+
+    <!--
+      For desktop browsers, a script for the user interface must be inserted here.
+
+      Standard UIs are toggle, button, float and toolbar.
+      The toolbar UI is best for any page designed to support keyboards for
+      a large number of languages.
+    -->
+    <script src="../../../../web/build/publish/debug/kmwuitoggle.js"></script>
+
+    <!-- Initialization: set paths to keyboards, resources and fonts as required -->
+    <script>
+      (function(kmw) {
+        kmw.init({
+          attachType:'auto'
+        }).then(function() {
+          kmw.addKeyboards({
+            id:'test_8568_deadkeys',
+            name:'Testcase for deadkeys bug (#8568)',
+            languages:{
+              id:'en',
+              name:'English'
+            },
+            filename:'./test_8568_deadkeys.js'
+          });
+        });
+        })(keyman);
+      </script>
+
+
+  </head>
+
+<!-- Sample page HTML -->
+  <body>
+    <h2>KeymanWeb #8568</h2>
+
+    <div>
+    <!--
+      The following DIV is used to position the Button or Toolbar User Interfaces on the page.
+      If omitted, those User Interfaces will appear at the top of the document body.
+      (It is ignored by other User Interfaces.)
+    -->
+    <div id='KeymanWebControl'></div>
+
+    <h3>Typing <code>x</code> and <code>f</code> followed by 2 <code>backspace</code> should output <code>pass</code>:</h3>
+    <textarea id='ta1' class='test' placeholder='Type here'></textarea>
+  </div>
+
+  </body>
+
+  <!--
+    *** DEVELOPER NOTE -- FIREFOX CONFIGURATION FOR TESTING ***
+    *
+    * If the URL bar starts with <b>file://</b>, Firefox may not load the font used
+    * to display the special characters used in the On-Screen Keyboard.
+    *
+    * To work around this Firefox bug, navigate to <b>about:config</b>
+    * and set <b>security.fileuri.strict_origin_policy</b> to <b>false</b>
+    * while testing.
+    *
+    * Firefox resolves website-based CSS URI references correctly without needing
+    * any configuration change, so this change should only be made for file-based testing.
+    *
+    ***
+  -->
+</html>
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.js b/common/test/resources/keyboards/test_8568_deadkeys.js
new file mode 100644
index 00000000000..4a61a0e0745
--- /dev/null
+++ b/common/test/resources/keyboards/test_8568_deadkeys.js
@@ -0,0 +1,55 @@
+if(typeof keyman === 'undefined') {
+  console.log('Keyboard requires KeymanWeb 10.0 or later');
+  if(typeof tavultesoft !== 'undefined') tavultesoft.keymanweb.util.alert("This keyboard requires KeymanWeb 10.0 or later");
+} else {
+KeymanWeb.KR(new Keyboard_test_8568_deadkeys());
+}
+function Keyboard_test_8568_deadkeys()
+{
+  var modCodes = keyman.osk.modifierCodes;
+  var keyCodes = keyman.osk.keyCodes;
+
+  this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
+  this.KI="Keyboard_test_8568_deadkeys";
+  this.KN="Testcase for deadkeys bug (#8568)";
+  this.KMINVER="10.0";
+  this.KV=null;
+  this.KDU=0;
+  this.KH='';
+  this.KM=0;
+  this.KBVER="1.0";
+  this.KMBM=0 /* 0x0000 */;
+  this.KVER="17.0.203.0";
+  this.KVS=[];
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.gs=function(t,e) {
+    return this.g_main_0(t,e);
+  };
+  this.g_main_0=function(t,e) {
+    var k=KeymanWeb,r=0,m=0;
+    if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_BKSP /* 0x08 */)) {
+      if(k.KFCM(3,t,['c',{t:'d',d:0},'e'])){
+        r=m=1;   // Line 12
+        k.KDC(3,t);
+        k.KO(-1,t,"pass");
+      }
+      else if(k.KFCM(2,t,['c','e'])){
+        r=m=1;   // Line 11
+        k.KDC(2,t);
+        k.KO(-1,t,"fail");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_X /* 0x58 */)) {
+      if(1){
+        r=m=1;   // Line 10
+        k.KDC(0,t);
+        k.KO(-1,t,"c");
+        k.KDO(-1,t,0);
+        k.KO(-1,t,"e");
+      }
+    }
+    return r;
+  };
+}
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.kmn b/common/test/resources/keyboards/test_8568_deadkeys.kmn
new file mode 100644
index 00000000000..69b6ea4bf04
--- /dev/null
+++ b/common/test/resources/keyboards/test_8568_deadkeys.kmn
@@ -0,0 +1,12 @@
+store(&VERSION) "10.0"
+store(&TARGETS) 'any windows'
+store(&NAME) 'Testcase for deadkeys bug (#8568)'
+store(&COPYRIGHT) '© 2023 SIL International'
+begin Unicode > use(main)
+
+group(main) using keys
+c Test for #8568: BKSP should not remove deadkeys.
+c See also common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+  + 'x' > 'c' dk(A) 'e'
+  'c' 'e' + [K_BKSP]       > 'fail'
+  'c' dk(A) 'e' + [K_BKSP] > 'pass'
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.kmx b/common/test/resources/keyboards/test_8568_deadkeys.kmx
new file mode 100644
index 0000000000000000000000000000000000000000..12c9c5f3909b9cd4686453e61a06dc0c19ac7c14
GIT binary patch
literal 768
zcmZ{iyDx)L7{;HHAQ%iTi{VQo4T&^uT?diUx-_j4Ex}e*G-#WzZr#P~KQQ|vYzBi-
z`~j>cgAu>?Ahmdt=e*B*Ip;jz`<>KAE~|Fw_T~LrSilyn0~n8ia+CClK^xZmO?z-b
z8t?GEU>H6K`ruRe5NLxh;-^6n?&G&WEBqdR0k}dfERXOmxCieC#z*ntAD+g~gKqMN
z_;nDMucGogX5EpeGnL@`uoRiPj;NK15=5uqP!(12J~@kh)!0#SJrPYPq%erGjyTR$
zaI?SXSsZblRtsufb6QnaNi8cw#_p{Ds41hXg07nD%xQ+s1^RRJi?vAQSOxaf;GTBr
zHg!8hdDa7botmd@ooEj~r~yrCOyjIW?$ivYE^(%GL*3Lz(eF7$X?zkrHX$Exv-<wx
zJkv1saa6Bp6J1G^Euu+GLhvwqZGt8Ci5sO^t-(v^tvH1?hbZ}k>z#r9H^oc-))n|Q
zdqe@yIN#n%r<G&U1D#L6a`qlA_e}f>&Ix(8&fbVWK-JC9W?bOCwsCS1zU#ExR~B6S
Hw<di7OfO)C

literal 0
HcmV?d00001

diff --git a/common/web/input-processor/tests/cases/inputProcessor.js b/common/web/input-processor/tests/cases/inputProcessorTests.js
similarity index 78%
rename from common/web/input-processor/tests/cases/inputProcessor.js
rename to common/web/input-processor/tests/cases/inputProcessorTests.js
index 00fc130a200..a5ee27ceee0 100644
--- a/common/web/input-processor/tests/cases/inputProcessor.js
+++ b/common/web/input-processor/tests/cases/inputProcessorTests.js
@@ -7,6 +7,7 @@ const require = createRequire(import.meta.url);
 import { InputProcessor } from '@keymanapp/input-processor';
 import { KeyboardInterface, MinimalKeymanGlobal, Mock } from '@keymanapp/keyboard-processor';
 import { NodeKeyboardLoader } from '@keymanapp/keyboard-processor/node-keyboard-loader';
+import { KeyboardTest, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
 
 import { Worker } from '@keymanapp/lexical-model-layer/node';
 import * as utils from '@keymanapp/web-utils';
@@ -175,4 +176,51 @@ describe('InputProcessor', function() {
       });
     });
   });
-});
\ No newline at end of file
+
+  describe('Deadkeys bug #8568', function () {
+    let keyboardWithHarness;
+    let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/8568_deadkeys.json'));
+    // For convenience we define the key sequence in a test file although we don't use the
+    // rest of the recorder stuff since it uses only KeyboardProcessor, not InputProcessor.
+    let testDefinitions = new KeyboardTest(JSON.parse(testJSONtext));
+
+    before(async function () {
+      // Load the keyboard.
+      let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+      const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_8568_deadkeys.js'));
+      keyboardWithHarness = keyboardLoader.harness;
+      keyboardWithHarness.activeKeyboard = keyboard;
+
+      // This part provides extra assurance that the keyboard properly loaded.
+      assert.equal(keyboard.id, "Keyboard_test_8568_deadkeys");
+    });
+
+    it('does not remove deadkeys from context (#8568)', function () {
+      this.timeout(32); // ms
+      let core = new InputProcessor(device);
+      let context = new Mock("", 0);
+
+      core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
+      let keyboard = keyboardWithHarness.activeKeyboard;
+
+      const testSet = testDefinitions.inputTestSets[0]['testSet'][0];
+      for (let keystroke of testSet.inputs) {
+        let keyEvent = {
+          Lcode: keystroke.keyCode,
+          Lmodifiers: keystroke.modifiers,
+          LmodifierChange: keystroke.modifierChanged,
+          vkCode: keystroke.vkCode,
+          Lstates: keystroke.states,
+          kName: '',
+          device: device,
+          isSynthetic: false,
+          LisVirtualKey: keyboard.definesPositionalOrMnemonic // Only false for 1.0 keyboards.
+        };
+
+        let behavior = core.processKeyEvent(keyEvent, context);
+        assert.isNotNull(behavior);
+      }
+      assert.equal(context.getText(), testSet.output);
+    });
+  });
+});

From a43fad4678d465c966a5e00a811d553142c81b95 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Nov 2023 12:19:39 +0700
Subject: [PATCH 39/67] fix(web): Don't clear deadkeys after backspace

Fixes #8568.
---
 common/web/keyboard-processor/src/text/keyboardProcessor.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/web/keyboard-processor/src/text/keyboardProcessor.ts b/common/web/keyboard-processor/src/text/keyboardProcessor.ts
index 3726c67a170..2a2dc0bb70b 100644
--- a/common/web/keyboard-processor/src/text/keyboardProcessor.ts
+++ b/common/web/keyboard-processor/src/text/keyboardProcessor.ts
@@ -530,10 +530,7 @@ export default class KeyboardProcessor extends EventEmitter<EventMap> {
       return false;
     }
 
-    if(Levent.Lcode == 8) {
-      // I3318 (always clear deadkeys after backspace)
-      outputTarget.deadkeys().clear();
-    } else if(Levent.isModifier) {
+    if(Levent.isModifier) {
       this.activeKeyboard.notify(Levent.Lcode, outputTarget, isKeyDown ? 1 : 0);
       // For eventual integration - we bypass an OSK update for physical keystrokes when in touch mode.
       if(!Levent.device.touchable) {

From 56a86a8f87521f27d9e292eb0e535467a42d7533 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 6 Nov 2023 13:42:36 +0700
Subject: [PATCH 40/67] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 developer/src/kmc-kmn/src/kmw-compiler/constants.ts         | 6 +++---
 .../src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts    | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
index 8c7d5860690..1c41df145b8 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/constants.ts
@@ -36,9 +36,9 @@ export const
   // Map for checking minimum versions and Special Text
   export const CSpecialText = new Map<number, string>([
     [KMX.KMXFile.VERSION_100, CSpecialText10],
-    [KMX.KMXFile.VERSION_110, CSpecialText10],
-    [KMX.KMXFile.VERSION_120, CSpecialText10],
-    [KMX.KMXFile.VERSION_130, CSpecialText10],
+    // [KMX.KMXFile.VERSION_110, CSpecialText10], - this file version does not exist
+    // [KMX.KMXFile.VERSION_120, CSpecialText10], - this file version does not exist
+    // [KMX.KMXFile.VERSION_130, CSpecialText10], - this file version does not exist
     [KMX.KMXFile.VERSION_140, CSpecialText14 + CSpecialText10],
     [KMX.KMXFile.VERSION_150, CSpecialText14 + CSpecialText10],
     [KMX.KMXFile.VERSION_160, CSpecialText14 + CSpecialText10],
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index 7838d836d92..9a12e7d05ce 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -147,6 +147,7 @@ function CheckKey(
     const mapVersion = (fk.fileVersion > CSpecialTextMaxVer ? CSpecialTextMaxVer : fk.fileVersion < CSpecialTextMinVer ? CSpecialTextMinVer : fk.fileVersion);
     const specialText = CSpecialText.get(mapVersion);
     if(specialText.includes(FText) &&
+        !IsKeyboardVersion14OrLater() &&
         !([TouchLayout.TouchLayoutKeySp.special, TouchLayout.TouchLayoutKeySp.specialActive].includes(FKeyType))) {
       callbacks.reportMessage(KmwCompilerMessages.Warn_TouchLayoutSpecialLabelOnNormalKey({
         keyId: FId,

From 132c8c79809f65edc5e842fcc4b0712e72c40322 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 6 Nov 2023 13:48:31 +0700
Subject: [PATCH 41/67] fix(developer): Revert test changes

---
 .../test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout | 2 +-
 .../test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
index 0fe6efcf550..ab44666c3bc 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
@@ -114,7 +114,7 @@
               },
               {
                 "id": "K_X",
-                "text": "*Enter*",
+                "text": "*Enter*"
               },
               {
                 "id": "K_C",
diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
index 9d8c34ef083..ab44666c3bc 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
@@ -114,8 +114,7 @@
               },
               {
                 "id": "K_X",
-                "text": "*Enter*",
-                "sp": "1"
+                "text": "*Enter*"
               },
               {
                 "id": "K_C",

From 7ff8d7acd97b9e5e37a70ca2b899606a37150b8c Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 6 Nov 2023 13:52:20 +0700
Subject: [PATCH 42/67] chore(common): revert VERSIONs

---
 common/web/types/src/kmx/kmx.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/common/web/types/src/kmx/kmx.ts b/common/web/types/src/kmx/kmx.ts
index 873b575205a..74995221c82 100644
--- a/common/web/types/src/kmx/kmx.ts
+++ b/common/web/types/src/kmx/kmx.ts
@@ -140,9 +140,6 @@ export class KMXFile {
   public static readonly VERSION_80 =  0x00000800;
   public static readonly VERSION_90 =  0x00000900;
   public static readonly VERSION_100 = 0x00000A00;
-  public static readonly VERSION_110 = 0x00000B00;
-  public static readonly VERSION_120 = 0x00000C00;
-  public static readonly VERSION_130 = 0x00000D00;
   public static readonly VERSION_140 = 0x00000E00;
   public static readonly VERSION_150 = 0x00000F00;
 

From 699e1f350b963dd432c4e1717efdcaf8c53a1084 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 6 Nov 2023 15:25:59 +0700
Subject: [PATCH 43/67] chore(common): Revert other files

---
 common/web/types/src/kmx/kmx.ts                              | 2 +-
 .../auto/kmcomp/test_194_filename_case.keyman-touch-layout   | 5 ++---
 .../auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout    | 2 +-
 .../auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout    | 2 +-
 .../auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout    | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/common/web/types/src/kmx/kmx.ts b/common/web/types/src/kmx/kmx.ts
index 74995221c82..6102a69cf55 100644
--- a/common/web/types/src/kmx/kmx.ts
+++ b/common/web/types/src/kmx/kmx.ts
@@ -457,4 +457,4 @@ export class KMXFile {
       throw "COMP_KEYBOARD size is "+this.COMP_KEYBOARD.size()+" but should be "+KMXFile.COMP_KEYBOARD_SIZE+" bytes";
     }
   }
-}
+}
\ No newline at end of file
diff --git a/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout
index 9d8c34ef083..7c36c893249 100644
--- a/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_194_filename_case.keyman-touch-layout
@@ -114,8 +114,7 @@
               },
               {
                 "id": "K_X",
-                "text": "*Enter*",
-                "sp": "1"
+                "text": "*Enter*"
               },
               {
                 "id": "K_C",
@@ -666,4 +665,4 @@
     ],
     "displayUnderlying": false
   }
-}
+}
\ No newline at end of file
diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
index ab44666c3bc..7c36c893249 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_1.keyman-touch-layout
@@ -665,4 +665,4 @@
     ],
     "displayUnderlying": false
   }
-}
+}
\ No newline at end of file
diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
index ab44666c3bc..7c36c893249 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_2.keyman-touch-layout
@@ -665,4 +665,4 @@
     ],
     "displayUnderlying": false
   }
-}
+}
\ No newline at end of file
diff --git a/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout b/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout
index 577ff750258..6705864636a 100644
--- a/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout
+++ b/developer/src/test/auto/kmcomp/test_touchlayout_14_3.keyman-touch-layout
@@ -665,4 +665,4 @@
     ],
     "displayUnderlying": false
   }
-}
+}
\ No newline at end of file

From 5902c764c74c5179333a1605513c6b870a32e604 Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Mon, 6 Nov 2023 15:26:32 +0700
Subject: [PATCH 44/67] Apply suggestions from code review

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
index 9a12e7d05ce..e745269ee3a 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/validate-layout-file.ts
@@ -144,7 +144,7 @@ function CheckKey(
     // Keyman versions before 14 do not support '*special*' labels on non-special keys.
     // ZWNJ use, however, is safe because it will be transformed in function
     // TransformSpecialKeys14 to '<|>',  which does not require the custom OSK font.
-    const mapVersion = (fk.fileVersion > CSpecialTextMaxVer ? CSpecialTextMaxVer : fk.fileVersion < CSpecialTextMinVer ? CSpecialTextMinVer : fk.fileVersion);
+    const mapVersion = Math.max(Math.min(fk.fileVersion, CSpecialTextMaxVer), CSpecialTextMinVer);
     const specialText = CSpecialText.get(mapVersion);
     if(specialText.includes(FText) &&
         !IsKeyboardVersion14OrLater() &&

From abe6cee202eaa1d846f52bce97ece14ae53c7d3b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Nov 2023 15:51:29 +0700
Subject: [PATCH 45/67] chore(web): Additional tests for backspace

Addresses code review comments.
---
 .../json/engine_tests/8568_deadkeys.json      | 229 +++++++++++++++++-
 .../resources/keyboards/test_8568_deadkeys.js |  71 +++++-
 .../keyboards/test_8568_deadkeys.kmn          |  27 ++-
 .../keyboards/test_8568_deadkeys.kmx          | Bin 768 -> 1326 bytes
 .../tests/cases/inputProcessorTests.js        |  59 ++---
 5 files changed, 334 insertions(+), 52 deletions(-)

diff --git a/common/test/resources/json/engine_tests/8568_deadkeys.json b/common/test/resources/json/engine_tests/8568_deadkeys.json
index a18294d45e5..e3aaf8ed9e9 100644
--- a/common/test/resources/json/engine_tests/8568_deadkeys.json
+++ b/common/test/resources/json/engine_tests/8568_deadkeys.json
@@ -21,35 +21,248 @@
       },
       "testSet": [
         {
+          "msg": "1. One deadkey in context",
           "inputs": [
             {
               "type": "key",
-              "keyCode": 88,
+              "keyCode": 49,
               "states": 9728,
               "modifiers": 0,
               "modifierChanged": false,
               "isVirtualKey": true,
               "eventSpec": {
                 "type": "key",
-                "key": "x",
-                "code": "KeyX",
-                "keyCode": 88,
+                "key": "1",
+                "code": "Key1",
+                "keyCode": 49,
                 "location": 0,
                 "modifierSet": 32
               }
             },
             {
               "type": "key",
-              "keyCode": 70,
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            }
+          ],
+          "output": ""
+        },
+        {
+          "msg": "2. One char and one deadkey in context",
+          "inputs": [
+            {
+              "type": "key",
+              "keyCode": 50,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "2",
+                "code": "Key2",
+                "keyCode": 50,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            }
+          ],
+          "output": ""
+        },
+        {
+          "msg": "3. One deadkey and one char in context",
+          "inputs": [
+            {
+              "type": "key",
+              "keyCode": 51,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "3",
+                "code": "Key3",
+                "keyCode": 51,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            }
+          ],
+          "output": ""
+        },
+        {
+          "msg": "4. Two deadkeys in a row in context",
+          "inputs": [
+            {
+              "type": "key",
+              "keyCode": 52,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "4",
+                "code": "Key4",
+                "keyCode": 52,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            }
+          ],
+          "output": ""
+        },
+        {
+          "msg": "5. One char and two deadkeys in context",
+          "inputs": [
+            {
+              "type": "key",
+              "keyCode": 53,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "5",
+                "code": "Key5",
+                "keyCode": 53,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            }
+          ],
+          "output": "a"
+        },
+        {
+          "msg": "6. One char and two deadkeys and one char and two deadkeys in context",
+          "inputs": [
+            {
+              "type": "key",
+              "keyCode": 54,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "6",
+                "code": "Key6",
+                "keyCode": 54,
+                "location": 0,
+                "modifierSet": 32
+              }
+            },
+            {
+              "type": "key",
+              "keyCode": 8,
+              "states": 9728,
+              "modifiers": 0,
+              "modifierChanged": false,
+              "isVirtualKey": true,
+              "eventSpec": {
+                "type": "key",
+                "key": "Backspace",
+                "code": "Backspace",
+                "keyCode": 8,
+                "location": 0,
+                "modifierSet": 32
+              }
+            }
+          ],
+          "output": "a"
+        },
+        {
+          "msg": "7. Two chars and one deadkey in between in context",
+          "inputs": [
+            {
+              "type": "key",
+              "keyCode": 55,
               "states": 9728,
               "modifiers": 0,
               "modifierChanged": false,
               "isVirtualKey": true,
               "eventSpec": {
                 "type": "key",
-                "key": "f",
-                "code": "KeyF",
-                "keyCode": 70,
+                "key": "7",
+                "code": "Key7",
+                "keyCode": 55,
                 "location": 0,
                 "modifierSet": 32
               }
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.js b/common/test/resources/keyboards/test_8568_deadkeys.js
index 4a61a0e0745..fad6c4fd3db 100644
--- a/common/test/resources/keyboards/test_8568_deadkeys.js
+++ b/common/test/resources/keyboards/test_8568_deadkeys.js
@@ -11,7 +11,7 @@ function Keyboard_test_8568_deadkeys()
 
   this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;
   this.KI="Keyboard_test_8568_deadkeys";
-  this.KN="Testcase for deadkeys bug (#8568)";
+  this.KN="Testcases for deadkeys bug (#8568)";
   this.KMINVER="10.0";
   this.KV=null;
   this.KDU=0;
@@ -30,24 +30,77 @@ function Keyboard_test_8568_deadkeys()
   this.g_main_0=function(t,e) {
     var k=KeymanWeb,r=0,m=0;
     if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_BKSP /* 0x08 */)) {
-      if(k.KFCM(3,t,['c',{t:'d',d:0},'e'])){
-        r=m=1;   // Line 12
+      if(k.KFCM(3,t,['c',{t:'d',d:11},'d'])){
+        r=m=1;   // Line 27
         k.KDC(3,t);
         k.KO(-1,t,"pass");
       }
-      else if(k.KFCM(2,t,['c','e'])){
-        r=m=1;   // Line 11
+      else if(k.KFCM(2,t,['c','d'])){
+        r=m=1;   // Line 26
         k.KDC(2,t);
         k.KO(-1,t,"fail");
       }
     }
-    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_X /* 0x58 */)) {
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_1 /* 0x31 */)) {
       if(1){
-        r=m=1;   // Line 10
+        r=m=1;   // Line 19
         k.KDC(0,t);
-        k.KO(-1,t,"c");
         k.KDO(-1,t,0);
-        k.KO(-1,t,"e");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_2 /* 0x32 */)) {
+      if(1){
+        r=m=1;   // Line 20
+        k.KDC(0,t);
+        k.KO(-1,t,"a");
+        k.KDO(-1,t,1);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_3 /* 0x33 */)) {
+      if(1){
+        r=m=1;   // Line 21
+        k.KDC(0,t);
+        k.KDO(-1,t,2);
+        k.KO(-1,t,"a");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_4 /* 0x34 */)) {
+      if(1){
+        r=m=1;   // Line 22
+        k.KDC(0,t);
+        k.KDO(-1,t,3);
+        k.KDO(-1,t,4);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_5 /* 0x35 */)) {
+      if(1){
+        r=m=1;   // Line 23
+        k.KDC(0,t);
+        k.KO(-1,t,"a");
+        k.KDO(-1,t,5);
+        k.KDO(-1,t,6);
+        k.KO(-1,t,"b");
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_6 /* 0x36 */)) {
+      if(1){
+        r=m=1;   // Line 24
+        k.KDC(0,t);
+        k.KO(-1,t,"a");
+        k.KDO(-1,t,7);
+        k.KDO(-1,t,8);
+        k.KO(-1,t,"b");
+        k.KDO(-1,t,9);
+        k.KDO(-1,t,10);
+      }
+    }
+    else if(k.KKM(e, modCodes.VIRTUAL_KEY /* 0x4000 */, keyCodes.K_7 /* 0x37 */)) {
+      if(1){
+        r=m=1;   // Line 25
+        k.KDC(0,t);
+        k.KO(-1,t,"c");
+        k.KDO(-1,t,11);
+        k.KO(-1,t,"de");
       }
     }
     return r;
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.kmn b/common/test/resources/keyboards/test_8568_deadkeys.kmn
index 69b6ea4bf04..d09c7415ec3 100644
--- a/common/test/resources/keyboards/test_8568_deadkeys.kmn
+++ b/common/test/resources/keyboards/test_8568_deadkeys.kmn
@@ -1,12 +1,27 @@
+store(&NAME) 'Testcases for deadkeys bug (#8568)'
+c Description: Tests deadkey backspacing
+c See also common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+c 1. One deadkey in context                   dk(1) + BKSP = nul
+c 2. One char and one deadkey in context      'a' dk(2) + BKSP = nul
+c 3. One deadkey and one char in context      dk(3) 'a' + BKSP = nul
+c 4. Two deadkeys in a row in context         dk(4a) dk(4b) + BKSP = nul
+c 5. One char and two deadkeys in context     'a' dk(5a) dk(5b) 'b' + BKSP = 'a'
+c 6. One char and two deadkeys and one char and two deadkeys in context     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
+c 7. Two chars and one deadkey in between in context: 'c' (dk7) 'd' + BKSP = 'ok'
+
 store(&VERSION) "10.0"
 store(&TARGETS) 'any windows'
-store(&NAME) 'Testcase for deadkeys bug (#8568)'
 store(&COPYRIGHT) '© 2023 SIL International'
+
 begin Unicode > use(main)
 
 group(main) using keys
-c Test for #8568: BKSP should not remove deadkeys.
-c See also common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
-  + 'x' > 'c' dk(A) 'e'
-  'c' 'e' + [K_BKSP]       > 'fail'
-  'c' dk(A) 'e' + [K_BKSP] > 'pass'
+  + '1' > dk(1)
+  + '2' > 'a' dk(2)
+  + '3' > dk(3) 'a'
+  + '4' > dk(4a) dk(4b)
+  + '5' > 'a' dk(5a) dk(5b) 'b'
+  + '6' > 'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d)
+  + '7' > 'c' dk(7) 'de'
+  'c' 'd' + [K_BKSP]       > 'fail'
+  'c' dk(7) 'd' + [K_BKSP] > 'pass'
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.kmx b/common/test/resources/keyboards/test_8568_deadkeys.kmx
index 12c9c5f3909b9cd4686453e61a06dc0c19ac7c14..88f00e8baf5cb34b76f0c49e74ea59f021eded31 100644
GIT binary patch
literal 1326
zcmZ{kJxtS46vYn(p`e3NR8T{jXc{$!(9)KgIG~`kLD4`p$|Mv}B2v=&5f&#$CkNx;
zWE{{q7$#zjA<V`&7-JlalQB+CPDK6P+lMWKH{5&9J@3BzK6w8QUn-2LO^S4$ekiQL
z0=64B-jBa-l>T7Qf7ZRFN_PRzDa_$E=Oy?8-veI-m+=;OG$O6Rqwp?xJ06GUz#g1G
z-6xFW+u=*#lfd7AD}jFm-v|B;{2KT#@Mqx7>{qz;=>T^Gegr%i_;D~3_z0K_{0cZ8
zcp01v{2q8W@JHYSyq*59z^C|t%9_@MZW5;y(;dyiufc{<7IlNMd9p#W+xVPHS^&#v
zmX}pwM#*au>QlFR@FcO<IZMIK>ibz<V0MMIimXs^9@7k+tn(E41o1k!$Y@NHx}~e&
zAstXwX=R9q=@Qq7PUx&o!4tl=trpislu?Z-uX9w$PqD~+JKsE=OR$Pp7MMS(A?gd%
zOV6mX{U<p=%sZR`^USh4DuZ@g)iY0UAGX>6tDM(m`sC@9qm%6>OB|w8%x}@wH8n##
zsS9MYoW0~{6|4234|;V1wvi`%H?=%T-di_rdrYyTT1Cp0$vP#ClHOF4aizYd4<)my
zChJOl%`sPsb)D_TZQj%-&Gu}k`QLl^z`Of`Z&)j&0k^kSy(RnF_StYhFSbc~jGMMM
zXiMbFxZTuF)36otRXho|7jCvj{uZ|zvoGH49r-6b1-CEX>@)dyJPo&B0J9(D>$v^D
zI$V){lkevj#7@^4v@Y_a_yW7H_?s&7s}t2Wzm*w3lf9Cn=Qd(zwHIkT;@nsxika~y
fk2J-qb<M7{@Ez2&sB5igHmA+wRv)kJVA}J)EJLBg

literal 768
zcmZ{iyDx)L7{;HHAQ%iTi{VQo4T&^uT?diUx-_j4Ex}e*G-#WzZr#P~KQQ|vYzBi-
z`~j>cgAu>?Ahmdt=e*B*Ip;jz`<>KAE~|Fw_T~LrSilyn0~n8ia+CClK^xZmO?z-b
z8t?GEU>H6K`ruRe5NLxh;-^6n?&G&WEBqdR0k}dfERXOmxCieC#z*ntAD+g~gKqMN
z_;nDMucGogX5EpeGnL@`uoRiPj;NK15=5uqP!(12J~@kh)!0#SJrPYPq%erGjyTR$
zaI?SXSsZblRtsufb6QnaNi8cw#_p{Ds41hXg07nD%xQ+s1^RRJi?vAQSOxaf;GTBr
zHg!8hdDa7botmd@ooEj~r~yrCOyjIW?$ivYE^(%GL*3Lz(eF7$X?zkrHX$Exv-<wx
zJkv1saa6Bp6J1G^Euu+GLhvwqZGt8Ci5sO^t-(v^tvH1?hbZ}k>z#r9H^oc-))n|Q
zdqe@yIN#n%r<G&U1D#L6a`qlA_e}f>&Ix(8&fbVWK-JC9W?bOCwsCS1zU#ExR~B6S
Hw<di7OfO)C

diff --git a/common/web/input-processor/tests/cases/inputProcessorTests.js b/common/web/input-processor/tests/cases/inputProcessorTests.js
index a5ee27ceee0..4085efee4f5 100644
--- a/common/web/input-processor/tests/cases/inputProcessorTests.js
+++ b/common/web/input-processor/tests/cases/inputProcessorTests.js
@@ -7,7 +7,7 @@ const require = createRequire(import.meta.url);
 import { InputProcessor } from '@keymanapp/input-processor';
 import { KeyboardInterface, MinimalKeymanGlobal, Mock } from '@keymanapp/keyboard-processor';
 import { NodeKeyboardLoader } from '@keymanapp/keyboard-processor/node-keyboard-loader';
-import { KeyboardTest, RecordedKeystrokeSequence } from '@keymanapp/recorder-core';
+import { KeyboardTest } from '@keymanapp/recorder-core';
 
 import { Worker } from '@keymanapp/lexical-model-layer/node';
 import * as utils from '@keymanapp/web-utils';
@@ -177,7 +177,7 @@ describe('InputProcessor', function() {
     });
   });
 
-  describe('Deadkeys bug #8568', function () {
+  describe('Deadkeys bug #8568 - backspace should not reset all deadkeys', function () {
     let keyboardWithHarness;
     let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/8568_deadkeys.json'));
     // For convenience we define the key sequence in a test file although we don't use the
@@ -195,32 +195,33 @@ describe('InputProcessor', function() {
       assert.equal(keyboard.id, "Keyboard_test_8568_deadkeys");
     });
 
-    it('does not remove deadkeys from context (#8568)', function () {
-      this.timeout(32); // ms
-      let core = new InputProcessor(device);
-      let context = new Mock("", 0);
-
-      core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
-      let keyboard = keyboardWithHarness.activeKeyboard;
-
-      const testSet = testDefinitions.inputTestSets[0]['testSet'][0];
-      for (let keystroke of testSet.inputs) {
-        let keyEvent = {
-          Lcode: keystroke.keyCode,
-          Lmodifiers: keystroke.modifiers,
-          LmodifierChange: keystroke.modifierChanged,
-          vkCode: keystroke.vkCode,
-          Lstates: keystroke.states,
-          kName: '',
-          device: device,
-          isSynthetic: false,
-          LisVirtualKey: keyboard.definesPositionalOrMnemonic // Only false for 1.0 keyboards.
-        };
-
-        let behavior = core.processKeyEvent(keyEvent, context);
-        assert.isNotNull(behavior);
-      }
-      assert.equal(context.getText(), testSet.output);
-    });
+    for (let testSet of testDefinitions.inputTestSets[0]['testSet']) {
+      it(testSet.msg ?? 'test', function() {
+        this.timeout(32); // ms
+        let core = new InputProcessor(device);
+        let context = new Mock("", 0);
+
+        core.keyboardProcessor.keyboardInterface = keyboardWithHarness;
+        let keyboard = keyboardWithHarness.activeKeyboard;
+
+        for (let keystroke of testSet.inputs) {
+          let keyEvent = {
+            Lcode: keystroke.keyCode,
+            Lmodifiers: keystroke.modifiers,
+            LmodifierChange: keystroke.modifierChanged,
+            vkCode: keystroke.vkCode,
+            Lstates: keystroke.states,
+            kName: '',
+            device: device,
+            isSynthetic: false,
+            LisVirtualKey: keyboard.definesPositionalOrMnemonic // Only false for 1.0 keyboards.
+          };
+
+          let behavior = core.processKeyEvent(keyEvent, context);
+          assert.isNotNull(behavior);
+        }
+        assert.equal(context.getText(), testSet.output);
+      });
+    }
   });
 });

From 4851c547a9cf33f5ca0f323f726f0b0c0a7b582e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Nov 2023 15:56:37 +0700
Subject: [PATCH 46/67] chore(core): Enhance core test

---
 .../k_020___deadkeys_and_backspace.kmn        |   4 ++--
 .../k_020___deadkeys_and_backspace.kmx        | Bin 1172 -> 1174 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
index 757a03d3d60..999e4e09432 100644
--- a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+++ b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
@@ -7,7 +7,7 @@ c 4. Two deadkeys in a row in context         dk(4a) dk(4b) + BKSP = nul
 c 5. One char and two deadkeys in context     'a' dk(5a) dk(5b) 'b' + BKSP = 'a'
 c 6. One char and two deadkeys and one char and two deadkeys in context     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
 c 7. Two chars and one deadkey in between in context: 'c' (dk7) 'd' + BKSP = 'ok'
-c keys: [K_1][K_BKSP][K_2][K_BKSP][K_3][K_BKSP][K_4][K_BKSP][K_5][K_BKSP][K_6][K_BKSP][K_7][K_BKSP]
+c keys: [K_1][K_BKSP][K_2][K_BKSP][K_3][K_BKSP][K_4][K_BKSP][K_5][K_BKSP][K_6][K_BKSP][K_7][K_BKSP] [K_BKSP]
 c expected: 78aa ok
 c context: 7890
 
@@ -23,6 +23,6 @@ group(main) using keys
 + '4' > dk(4a) dk(4b)
 + '5' > 'a' dk(5a) dk(5b) 'b'
 + '6' > 'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d)
-+ '7' > 'c' dk(7) 'd'
++ '7' > 'c' dk(7) 'd' 'e'
 'c' 'd' + [K_BKSP]       > ' fail'
 'c' dk(7) 'd' + [K_BKSP] > ' ok'
diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx
index 3c2001fcb8f08af09dd373454c338f38329211a8..61946d2a2af79a0b3134a49501c3c092b99fa16f 100644
GIT binary patch
delta 39
tcmbQjIgOLYJ0c{Qfs=v3e9m&Ai99-t(>7Y}WoDc*`8)GWwp0cX007nn3RnOD

delta 37
scmbQnIfawQJ0c{Qfs=tj;pRT)i99-tQ#M-eWoDc-`8)GW76u>y0La-2TL1t6


From 09843634bbded902c823739372129917b6f305c2 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 6 Nov 2023 17:28:25 +0700
Subject: [PATCH 47/67] chore(web): Address code review comments

---
 .../baseline/k_020___deadkeys_and_backspace.kmn        | 10 +++++++---
 common/test/resources/keyboards/test_8568_deadkeys.kmn |  7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
index 999e4e09432..26cdb5894f8 100644
--- a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+++ b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
@@ -5,9 +5,13 @@ c 2. One char and one deadkey in context      'a' dk(2) + BKSP = nul
 c 3. One deadkey and one char in context      dk(3) 'a' + BKSP = nul
 c 4. Two deadkeys in a row in context         dk(4a) dk(4b) + BKSP = nul
 c 5. One char and two deadkeys in context     'a' dk(5a) dk(5b) 'b' + BKSP = 'a'
-c 6. One char and two deadkeys and one char and two deadkeys in context     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
-c 7. Two chars and one deadkey in between in context: 'c' (dk7) 'd' + BKSP = 'ok'
-c keys: [K_1][K_BKSP][K_2][K_BKSP][K_3][K_BKSP][K_4][K_BKSP][K_5][K_BKSP][K_6][K_BKSP][K_7][K_BKSP] [K_BKSP]
+c 6. One char and two deadkeys and one char and two deadkeys in context:
+     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
+c 7. Tests behaviour when deleting two characters with deadkey prior to first character,
+c    verifying that deadkeys are preserved with the first backspace event:
+c    'c' (dk7) 'de' + BKSP + BKSP = 'ok'
+
+c keys: [K_1][K_BKSP][K_2][K_BKSP][K_3][K_BKSP][K_4][K_BKSP][K_5][K_BKSP][K_6][K_BKSP][K_7][K_BKSP][K_BKSP]
 c expected: 78aa ok
 c context: 7890
 
diff --git a/common/test/resources/keyboards/test_8568_deadkeys.kmn b/common/test/resources/keyboards/test_8568_deadkeys.kmn
index d09c7415ec3..4cf7cc799d1 100644
--- a/common/test/resources/keyboards/test_8568_deadkeys.kmn
+++ b/common/test/resources/keyboards/test_8568_deadkeys.kmn
@@ -6,8 +6,11 @@ c 2. One char and one deadkey in context      'a' dk(2) + BKSP = nul
 c 3. One deadkey and one char in context      dk(3) 'a' + BKSP = nul
 c 4. Two deadkeys in a row in context         dk(4a) dk(4b) + BKSP = nul
 c 5. One char and two deadkeys in context     'a' dk(5a) dk(5b) 'b' + BKSP = 'a'
-c 6. One char and two deadkeys and one char and two deadkeys in context     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
-c 7. Two chars and one deadkey in between in context: 'c' (dk7) 'd' + BKSP = 'ok'
+c 6. One char and two deadkeys and one char and two deadkeys in context:
+     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
+c 7. Tests behaviour when deleting two characters with deadkey prior to first character,
+c    verifying that deadkeys are preserved with the first backspace event:
+c    'c' (dk7) 'de' + BKSP + BKSP = 'ok'
 
 store(&VERSION) "10.0"
 store(&TARGETS) 'any windows'

From 4b3f16dec3b8b594269d2d05a62a12eea0b61035 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Mon, 6 Nov 2023 13:03:23 -0500
Subject: [PATCH 48/67] auto: increment master version to 17.0.207

---
 HISTORY.md | 8 ++++++++
 VERSION.md | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index 81d403b9b9c..c9b9d851a19 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,13 @@
 # Keyman Version History
 
+## 17.0.206 alpha 2023-11-06
+
+* chore(developer): remove compile.pas and CompileErrorCodes.pas (#9924)
+* chore(common): remove prepublish step from package.json (#9937)
+* feat(developer): provide line number for some kmw compiler messages (#9938)
+* fix(developer): Sentry in Server should honour reporting settings (#9940)
+* fix(developer): resilience in loading Server config and cache files (#9941)
+
 ## 17.0.205 alpha 2023-11-03
 
 * fix(developer): use KeymanWeb.Codes for 17.0+ (#9913)
diff --git a/VERSION.md b/VERSION.md
index 98f9b53f4a7..87d064124d4 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-17.0.206
\ No newline at end of file
+17.0.207
\ No newline at end of file

From eb64ca4d013a98e48b6262e990cb220eb09534da Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 7 Nov 2023 08:24:45 +0700
Subject: [PATCH 49/67] chore(core): Fix test keyboard

---
 .../k_020___deadkeys_and_backspace.kmn        |   2 +-
 .../k_020___deadkeys_and_backspace.kmx        | Bin 1174 -> 1174 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
index 26cdb5894f8..13c34f31280 100644
--- a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+++ b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
@@ -6,7 +6,7 @@ c 3. One deadkey and one char in context      dk(3) 'a' + BKSP = nul
 c 4. Two deadkeys in a row in context         dk(4a) dk(4b) + BKSP = nul
 c 5. One char and two deadkeys in context     'a' dk(5a) dk(5b) 'b' + BKSP = 'a'
 c 6. One char and two deadkeys and one char and two deadkeys in context:
-     'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
+c    'a' dk(6a) dk(6b) 'b' dk(6c) dk(6d) + BKSP = 'a'
 c 7. Tests behaviour when deleting two characters with deadkey prior to first character,
 c    verifying that deadkeys are preserved with the first backspace event:
 c    'c' (dk7) 'de' + BKSP + BKSP = 'ok'
diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx
index 61946d2a2af79a0b3134a49501c3c092b99fa16f..b8eae9a0f31d5d03a4a9c92fff7f6c07c07c6843 100644
GIT binary patch
delta 448
zcmY+9yAA<C7=;h3u*pX2&PGF2_BQBbBT;C?CDFPj3N-p{yn)0^s63Z9P>3^Q#hBz2
z-#2F_|9>^FrZt>TCoq9i{gl01uSDd+1u#GhHuhLxhXdIq10iOl9acDEjSY>b+I`h_
zG<Nt}{`0+e$)3g@+2`-ShOf*r(o{ed{FQ_<ORdwU5r3VIGJ2=0%u0LZsDTBS_zmDd
z4t+@*VPsRI2RscRnF7+pYV0!P0wcH0NylT88;smIuME&6`;6SW5IaHcNlz}uE+mhb
afL!{x8pafBMo^UF;+A}7+T_aRVcgzzP$^>o

delta 448
zcmY+AyK2KQ7==&b3^te!rMcAYU^<mfl`nF-8B^%crSt+_8@mM$NglyV-oW4~dxlJX
zuD(Hs&?8k~MQ{Y)$C1#l&g(q?@%{A$9*}K!r{Dfz&<M-{Jm3}~miR!86<I)XFYrdH
zQDTh>pEQwf-|M!pSnzaYaYT+Sj>!pc?{7%7Su~bPsnVm8)MjCIG8%c*nQLQr?zAbb
zQ$jyja)|x`f<uOAU8iU+sgVP}4lo=6F7d*+6LP?)Y0s473dz@uns}@Ya6?WQHTA?e
lNzRogPmL?cPfSXl{ktnXQ&f!l^m9}EB5#<C9JD{q{tswADeC|L


From ad716f878bd417352806ccba7c4cea9dd872ff0f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 7 Nov 2023 08:37:30 +0700
Subject: [PATCH 50/67] fix(web): Ignore `osk-always-visible` on non-desktop
 devices

Fixes #9918.
---
 web/src/engine/osk/src/views/oskView.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/osk/src/views/oskView.ts b/web/src/engine/osk/src/views/oskView.ts
index 968a6333974..dfc6aa18db1 100644
--- a/web/src/engine/osk/src/views/oskView.ts
+++ b/web/src/engine/osk/src/views/oskView.ts
@@ -964,8 +964,10 @@ export default abstract class OSKView extends EventEmitter<EventMap> implements
    * Performs the _actual_ logic and functionality involved in hiding the OSK.
    */
   protected finalizeHide() {
-    if(document.body.className.indexOf('osk-always-visible') >= 0) {
-      return;
+    if (document.body.className.indexOf('osk-always-visible') >= 0) {
+      if (this.hostDevice.formFactor == 'desktop') {
+        return;
+      }
     }
 
     if(this._Box) {

From ac29930d1fe2415432c99694a85b851ee9c5ea5b Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 7 Nov 2023 09:38:15 +0700
Subject: [PATCH 51/67] refactor(web): Link to `index.html` in test pages

This change adds `index.html` to all links that point to test index pages.
This will show the index page instead of the directory listing when
opening locally, identical to the behavior on TC.
---
 web/index.html                       |  8 +--
 web/src/samples/index.html           | 10 ++--
 web/src/test/manual/embed/index.html |  7 ++-
 web/src/test/manual/web/index.html   | 85 ++++++++++++++--------------
 web/src/tools/testing/index.html     |  6 +-
 5 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/web/index.html b/web/index.html
index 909d3fc4f37..7dc31756496 100644
--- a/web/index.html
+++ b/web/index.html
@@ -20,9 +20,9 @@
   </head>
   <body>
   <h1>KeymanWeb Repo Index</h1>
-  <h2><a href="./src/samples/">View Keymanweb use samples.</a></h2>
-  <h2><a href="./src/test/manual/embed/">View manual test pages for embedded-mode Keymanweb.</a></h2>
-  <h2><a href="./src/test/manual/web/">View Keymanweb website-oriented manual test pages.</a></h2>
-  <h2><a href="./src/tools/testing/">Use Keymanweb development tools.</a></h2>
+  <h2><a href="./src/samples/index.html">View Keymanweb use samples.</a></h2>
+  <h2><a href="./src/test/manual/embed/index.html">View manual test pages for embedded-mode Keymanweb.</a></h2>
+  <h2><a href="./src/test/manual/web/index.html">View Keymanweb website-oriented manual test pages.</a></h2>
+  <h2><a href="./src/tools/testing/index.html">Use Keymanweb development tools.</a></h2>
   </body>
 </html>
diff --git a/web/src/samples/index.html b/web/src/samples/index.html
index 2a9259063f9..bc78e6f8791 100644
--- a/web/src/samples/index.html
+++ b/web/src/samples/index.html
@@ -20,9 +20,11 @@
   </head>
   <body>
   <h1>KeymanWeb Samples</h1>
-  <h2><a href="./simplest/">Example 1 - Toggle UI, all resources in same folder as page</a></h2>
-  <h2><a href="./subfolder_toggle/">Example 2 - Toggle UI, all resources in a common subfolder</a></h2>
-  <h2><a href="./subfolder_toolbar/">Example 3 - Toolbar UI, all resources in a common subfolder</a></h2>
-  <h2><a href="./complex/root/pages/">Example 4 - a more complex file-organization setup</a></h2>
+  <h2><a href="./simplest/index.html">Example 1 - Toggle UI, all resources in same folder as page</a></h2>
+  <h2><a href="./subfolder_toggle/index.html">Example 2 - Toggle UI, all resources in a common subfolder</a></h2>
+  <h2><a href="./subfolder_toolbar/index.html">Example 3 - Toolbar UI, all resources in a common subfolder</a></h2>
+  <h2><a href="./complex/root/pages/index.html">Example 4 - a more complex file-organization setup</a></h2>
+  <hr>
+  <p><a href="../../index.html">Return to main index</a></p>
   </body>
 </html>
diff --git a/web/src/test/manual/embed/index.html b/web/src/test/manual/embed/index.html
index 8d74c612a23..bcb69864c7e 100644
--- a/web/src/test/manual/embed/index.html
+++ b/web/src/test/manual/embed/index.html
@@ -19,8 +19,9 @@
     </style>
   </head>
   <body>
-  <h1>KeymanWeb 15 Testing - for embedded contexts</h1>
-  <h2><a href="./android-harness/">Android test harness</a></h2>
-  <p><a href="../../../../index.html">Return to main index.</a>
+  <h1>KeymanWeb Testing - for embedded contexts</h1>
+  <h2><a href="./android-harness/index.html">Android test harness</a></h2>
+  <hr>
+  <p><a href="../../../../index.html">Return to main index</a>
   </body>
 </html>
diff --git a/web/src/test/manual/web/index.html b/web/src/test/manual/web/index.html
index 2597d8caac5..61ee99d2de4 100644
--- a/web/src/test/manual/web/index.html
+++ b/web/src/test/manual/web/index.html
@@ -22,52 +22,53 @@
   <h1>KeymanWeb 17 Testing</h1>
   <h2><a href="./unminified.html">Test unminified Keymanweb</a></h2>
   <h2><a href="./unminified - manual.html">Test unminified Keymanweb in manual-attachment mode.</a></h2>
-  <h2><a href="./keyboard-errors/">Tests keyboard error-handling functionality</a></h2>
-  <h2><a href="./attachment-api/?mode=auto">Tests the new Attachment/Enablement API functionality</a><h2>
-  <h2><a href="./chirality/">Chirality testing/bootstrapping</a><h2>
-  <h2><a href="./options-with-save/">Tests option/variable store functionality</a></h2>
-  <h2><a href="./empty-row/">Tests OSK handling of empty rows</a></h2>
-  <h2><a href="./platform/">Platform testing</a></h2>
-  <h2><a href="./prediction-ui/">Prediction UI testing</a></h2>
-  <h2><a href="./prediction-mtnt/">Prediction - robust testing</a></h2>
-  <h2><a href="./promise-api/">Promise API testing</a></h2>
-  <h2><a href="./desktop-ui/">Desktop UI module testing</a></h2>
-  <h2><a href="./build-visual-keyboard/">Tests keyboard documentation rendering.</a></h2>
-  <h2><a href="./sentry-integration/">Tests Sentry error-reporting functionality</a></h2>
-  <h2><a href="./osk-movement/">Test page for osk setRect() and restorePosition() interaction</a></h2>
-  <h2><a href="./ckeditor/">Integration with CKEditor</a></h2>
-  <h2><a href="./osk-event-buttons/">Tests toggling & use of desktop OSK config & help buttons</a></h2>
+  <h2><a href="./keyboard-errors/index.html">Tests keyboard error-handling functionality</a></h2>
+  <h2><a href="./attachment-api/index.html?mode=auto">Tests the new Attachment/Enablement API functionality</a><h2>
+  <h2><a href="./chirality/index.html">Chirality testing/bootstrapping</a><h2>
+  <h2><a href="./options-with-save/index.html">Tests option/variable store functionality</a></h2>
+  <h2><a href="./empty-row/index.html">Tests OSK handling of empty rows</a></h2>
+  <h2><a href="./platform/index.html">Platform testing</a></h2>
+  <h2><a href="./prediction-ui/index.html">Prediction UI testing</a></h2>
+  <h2><a href="./prediction-mtnt/index.html">Prediction - robust testing</a></h2>
+  <h2><a href="./promise-api/index.html">Promise API testing</a></h2>
+  <h2><a href="./desktop-ui/index.html">Desktop UI module testing</a></h2>
+  <h2><a href="./build-visual-keyboard/index.html">Tests keyboard documentation rendering.</a></h2>
+  <h2><a href="./sentry-integration/index.html">Tests Sentry error-reporting functionality</a></h2>
+  <h2><a href="./osk-movement/index.html">Test page for osk setRect() and restorePosition() interaction</a></h2>
+  <h2><a href="./ckeditor/index.html">Integration with CKEditor</a></h2>
+  <h2><a href="./osk-event-buttons/index.html">Tests toggling & use of desktop OSK config & help buttons</a></h2>
   <h1>Auto-attachment mode tests</h1>
-  <h2><a href="./issue29/">Test desktop MutationObserver functionality</a></h2>
-  <h2><a href="./issue62/">Light test for touch-based MutationObserver functionality</a></h2>
-  <h2><a href="./issue63/">Test/stress-test touch-based MutationObserver functionality</a></h2>
+  <h2><a href="./issue29/index.html">Test desktop MutationObserver functionality</a></h2>
+  <h2><a href="./issue62/index.html">Light test for touch-based MutationObserver functionality</a></h2>
+  <h2><a href="./issue63/index.html">Test/stress-test touch-based MutationObserver functionality</a></h2>
   <h1>Issue Testing</h1>
-  <h2><a href="./issue005/">'Test case' for proper implementation of the removeKeyboards API function.</a></h2>
-  <h2><a href="./issue53/">Tests layering transitions for keyboards with variable layer sizes.</a></h2>
-  <h2><a href="./issue103/">Tests keyboard loading with repeated requests</a></h2>
-  <h2><a href="./issue115/">Long-press on numeric and symbolic layer testing</a></h2>
-  <h2><a href="./issue116/">Next-layer processing testing</a></h2>
-  <h2><a href="./issue160/">Uxxxx code testing</a></h2>
+  <h2><a href="./issue005/index.html">'Test case' for proper implementation of the removeKeyboards API function.</a></h2>
+  <h2><a href="./issue53/index.html">Tests layering transitions for keyboards with variable layer sizes.</a></h2>
+  <h2><a href="./issue103/index.html">Tests keyboard loading with repeated requests</a></h2>
+  <h2><a href="./issue115/index.html">Long-press on numeric and symbolic layer testing</a></h2>
+  <h2><a href="./issue116/index.html">Next-layer processing testing</a></h2>
+  <h2><a href="./issue160/index.html">Uxxxx code testing</a></h2>
   <h2><a href="./issue266/index.html">Test KMW beep</a></h2>
-  <h2><a href="./issue271/">Test page for interactions between setActiveKeyboard and the toolbar UI.</a></h2>
+  <h2><a href="./issue271/index.html">Test page for interactions between setActiveKeyboard and the toolbar UI.</a></h2>
   <h2><a href="./issue1332/index.html">Test keyboard loading with upper case TTF font</a></h2>
-  <h2><a href="./basic-iframe">Test page for IFrame connectivity and class prototype management.</a></h2>
-  <h2><a href="./mnemonic">Test page for mnemonic basic support on US English.</a></h2>
-  <h2><a href="./rotation-events">Test page for evaluating issues with mobile device rotation events.</a></h2>
-  <h2><a href="./issue382/">Test page for automatic key-cap scaling.</a></h2>
-  <h2><a href="./issue3701/">Test page for fat-finger interaction with beep feedback</a></h2>
-  <h2><a href="./issue917-context-and-notany/">Test page for context() and notany() interaction</a></h2>
-  <h2><a href="./spacebar-text/">Test SpacebarText APIs (#949)</a></h2>
-  <h2><a href="./inline-osk/">Test inline OSK (#5665)</a></h2>
-  <h2><a href="./issue2924/">Test variable stores and predictive text (#2924)</a></h2>
-  <h2><a href="./caps-lock-layer-3620/">Test Caps Lock Layer (#3620)</a></h2>
-  <h2><a href="./start-of-sentence-3621/">Test Start of Sentence (#3621)</a></h2>
-  <h2><a href="./start-of-sentence-3621/">Test start of sentence keyboard rules (#5963)</a></h2>
-  <h2><a href="./issue6005/">Tests predictive text & other handling of rule matching when the final rule group does not match (#6005)</a></h2>
-  <h2><a href="./default-subkey/">Tests handling of new default-subkey feature (#9430)</a></h2>
-  <h2><a href="./issue9469/">Test special characters rendering with keymanweb-osk.ttf (#9469)</a></h2>
+  <h2><a href="./basic-iframe/index.html">Test page for IFrame connectivity and class prototype management</a></h2>
+  <h2><a href="./mnemonic/index.html">Test page for mnemonic basic support on US English</a></h2>
+  <h2><a href="./rotation-events/index.html">Test page for evaluating issues with mobile device rotation events</a></h2>
+  <h2><a href="./issue382/index.html">Test page for automatic key-cap scaling</a></h2>
+  <h2><a href="./issue3701/index.html">Test page for fat-finger interaction with beep feedback</a></h2>
+  <h2><a href="./issue917-context-and-notany/index.html">Test page for context() and notany() interaction</a></h2>
+  <h2><a href="./spacebar-text/index.html">Test SpacebarText APIs (#949)</a></h2>
+  <h2><a href="./inline-osk/index.html">Test inline OSK (#5665)</a></h2>
+  <h2><a href="./issue2924/index.html">Test variable stores and predictive text (#2924)</a></h2>
+  <h2><a href="./caps-lock-layer-3620/index.html">Test Caps Lock Layer (#3620)</a></h2>
+  <h2><a href="./start-of-sentence-3621/index.html">Test Start of Sentence (#3621)</a></h2>
+  <h2><a href="./start-of-sentence-3621/index.html">Test start of sentence keyboard rules (#5963)</a></h2>
+  <h2><a href="./issue6005/index.html">Tests predictive text & other handling of rule matching when the final rule group does not match (#6005)</a></h2>
+  <h2><a href="./default-subkey/index.html">Tests handling of new default-subkey feature (#9430)</a></h2>
+  <h2><a href="./issue9469/index.html">Test special characters rendering with keymanweb-osk.ttf (#9469)</a></h2>
   <h1>Other</h1>
-  <h2><a href="./regression-tests/">Keystroke processing regression test engine.</a></h2>
-  <p><a href="../../../../index.html">Return to main index.</a>
+  <h2><a href="./regression-tests/index.html">Keystroke processing regression test engine.</a></h2>
+  <hr>
+  <p><a href="../../../../index.html">Return to main index</a>
   </body>
 </html>
diff --git a/web/src/tools/testing/index.html b/web/src/tools/testing/index.html
index eaa2a1bdf75..69425a54190 100644
--- a/web/src/tools/testing/index.html
+++ b/web/src/tools/testing/index.html
@@ -20,9 +20,9 @@
   </head>
   <body>
     <h1>KeymanWeb Resources and Tools</h1>
-  <h2><a href="./bulk_rendering/">Bulk OSK renderer</a></h2>
-  <h2><a href="./recorder/">Test-sequence recorder</a></h2>
+  <h2><a href="./bulk_rendering/index.html">Bulk OSK renderer</a></h2>
+  <h2><a href="./recorder/index.html">Test-sequence recorder</a></h2>
   <hr>
-  <p><a href="../../../index.html">Return to main index.</a>
+  <p><a href="../../../index.html">Return to main index</a>
   </body>
 </html>

From 1e4546ac2c01c958f945eb2298efd7fd0d7c519e Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 7 Nov 2023 10:34:04 +0700
Subject: [PATCH 52/67] fix(web): Increase size of spacebar text

The caption on the spacebar used to be 60%. This change increases it to
100%, but that might be sometimes too big. On the other hand, 80% still
seemed to be too small.

Fixes #7940.
---
 web/src/resources/osk/kmwosk.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/resources/osk/kmwosk.css b/web/src/resources/osk/kmwosk.css
index 029a0f74665..87b77ddc9b5 100644
--- a/web/src/resources/osk/kmwosk.css
+++ b/web/src/resources/osk/kmwosk.css
@@ -526,7 +526,7 @@ div.android div.kmw-keytip-cap {
 .kmw-wait-graphic{width:100%;min-height:19px;background:url('ajax-loader.gif') no-repeat;background-position:center top;}
 .kmw-alert-text{margin:10px;white-space:default;font-family:Arial,sans-serif;}
 
-.kmw-spacebar-caption{font:0.6em Arial !important;color:rgba(0,0,0,0.25);}
+.kmw-spacebar-caption{font:1em Arial !important;color:rgba(0,0,0,0.25);}
 
 /* Probably best to make this its own CSS that can be optionally included? */
 @media (prefers-color-scheme: dark) {

From fde460ecea0cea63d99792863872a96967852500 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 7 Nov 2023 05:02:30 +0100
Subject: [PATCH 53/67] chore(core): Recompile keyboard with kmcomp

---
 .../k_020___deadkeys_and_backspace.kmx        | Bin 1174 -> 1026 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmx
index b8eae9a0f31d5d03a4a9c92fff7f6c07c07c6843..68271160736d730fec3a93720e79a8442ccf8803 100644
GIT binary patch
delta 472
zcmX|+JxBs^7>D2cpOkLeV3uFt5E2noYS855QkxD=jS>#h&?M18NK-_l+^R%_h&1FX
z4b2VV?Bv`Kg0z*-buYc}-0%6l_w9zRgU)faQkIa&$SfklSl)qI1J8?aZ$y3>^nXmi
z*C>(T!WgXMJ7fx0@iTH4g7_tQ0b#sD-udpx0D00AZ{%2gLcXid$f^3A{8SI{VL$3o
zJnX>>vSdd6h|H;<kR|m~vT9=f4d;})o@kL*X7pe+t(89hV%pnw)~VSd4e)*@4N??o
z(r;jo%9H-)mfnGV+J^32dJhiho4R|X4<Sd7>+YF8hCDr?yI1;$En8Axk<{gc<rf^%
MQ@WeerTuMpmtg!bdH?_b

literal 1174
zcmZ{jJ8KkC7>3_$qS?eCDZIwpAhJq8+1YCXB5RB{f>9C;sf5jLLYBm=Y!)R}7Gh-;
zf{2Bcg;-hn1FZZ3R@P!=VJSBHeBYjRCxr*z^Ipz(E^}sPX7TR4hNSk{_F>WbtfL(O
zrYqn~zx0QO{MTL%bmT#3o5CzOgnk9@09))G{2C0RzrpW88vP6Y2}aSQDQOs(&cIR7
zm*9z@XW<(`--j22-hfwwehNPcdK-Qb^jr8%&>!IsL4Srn1^pHN67&!Fd(h&!f1~X#
zPNPS_6}7ais@n8*MS83TdKEQ8vZV)%ZQ!PHkHET`dI-13%(t}3jHcJbD(ix>AV;5f
z%~oh@$@R=<y(-dqR;sg7m3|H0V#UaJweu{YYUG>jYHFF88O`dlZs{s|GVGGk0)9^O
zx~bcYi`8@V*V!lXr)Y3SOYJmMx`%79Ueos$r?u*7uZ~e&A2ZuVx;}@`Cwv}X;AFju
zf+tIfq)1ZSRa5dLSyLt{?W&pZBv~`*NiDH*?B^}<488qh*_q2E|9c-7dGFUixAD99
zzhUpXb4&JBM>bsHi=i^b-(lIQknP8h0lTRqmeC^oIbgSS)DvkOUjTMvV<9WyE0*Jr
zg=`9c2NdzgLpF!6gA)Ek$X4*rfIZ#GkUhumfQWawMponBPHV*PB+`mM)4Jz%dK>HW
unN`;**OvDC?RP2$d~8pmZm%bUe2>;TbJLy;k=guV@Avt5?+o_6N`C=OA%x}t


From 1fa4090d0596cb1e501b85eac9475fbe861acb5f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 7 Nov 2023 19:23:27 +0700
Subject: [PATCH 54/67] fix(web): Improve cause of issue

One reason for the sometimes small text on the spacebar besides the
too small font size on `kmw-spacebar-caption` was that the calculation
of the ideal font size added double padding: it added two pixels of
padding to the height, but also multiplied the height value by 0.9 which
effectively added more padding. This change removes the 2 pixel padding
from the calculation.

The existing calculation varies the text size to fit in the available
width of the spacebar, so calculating with font size of 1em is reasonable
and better than the previous 0.6em. The previous value would lead to even
an smaller font size for long texts, far below the size that would be
sufficient to fit the text.
---
 web/src/engine/osk/src/keyboard-layout/oskKey.ts | 6 ++++--
 web/src/resources/osk/kmwosk.css                 | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/src/engine/osk/src/keyboard-layout/oskKey.ts b/web/src/engine/osk/src/keyboard-layout/oskKey.ts
index 77d8927b60a..67835207c78 100644
--- a/web/src/engine/osk/src/keyboard-layout/oskKey.ts
+++ b/web/src/engine/osk/src/keyboard-layout/oskKey.ts
@@ -208,6 +208,7 @@ export default abstract class OSKKey {
   /**
    * Calculate the font size required for a key cap, scaling to fit longer text
    * @param vkbd
+   * @param text
    * @param style     specification for the desired base font size
    * @param override  if true, don't use the font spec from the button, just use the passed in spec
    * @returns         font size as a style string
@@ -239,14 +240,15 @@ export default abstract class OSKKey {
     const MAX_X_PROPORTION = 0.90;
     const MAX_Y_PROPORTION = 0.90;
     const X_PADDING = 2;
-    const Y_PADDING = 2;
 
     var fontHeight: number, keyHeight: number;
     if(metrics.fontBoundingBoxAscent) {
       fontHeight = metrics.fontBoundingBoxAscent + metrics.fontBoundingBoxDescent;
     }
 
-    let textHeight = fontHeight ? fontHeight + Y_PADDING : 0;
+    // Don't add extra padding to height - multiplying with MAX_Y_PROPORTION already gives
+    // padding
+    let textHeight = fontHeight ? fontHeight : 0;
     if(style.height && style.height.indexOf('px') != -1) {
       keyHeight = Number.parseFloat(style.height.substring(0, style.height.indexOf('px')));
     }
diff --git a/web/src/resources/osk/kmwosk.css b/web/src/resources/osk/kmwosk.css
index 87b77ddc9b5..7bab478eb7d 100644
--- a/web/src/resources/osk/kmwosk.css
+++ b/web/src/resources/osk/kmwosk.css
@@ -526,6 +526,7 @@ div.android div.kmw-keytip-cap {
 .kmw-wait-graphic{width:100%;min-height:19px;background:url('ajax-loader.gif') no-repeat;background-position:center top;}
 .kmw-alert-text{margin:10px;white-space:default;font-family:Arial,sans-serif;}
 
+/* Note: font size gets overwritten in source code! */
 .kmw-spacebar-caption{font:1em Arial !important;color:rgba(0,0,0,0.25);}
 
 /* Probably best to make this its own CSS that can be optionally included? */

From 4467c4d6633253a42c72873da4c996428864b120 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Tue, 7 Nov 2023 13:02:50 -0500
Subject: [PATCH 55/67] auto: increment master version to 17.0.208

---
 HISTORY.md | 5 +++++
 VERSION.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index c9b9d851a19..cc1fec44015 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 17.0.207 alpha 2023-11-07
+
+* refactor(web): Link to `index.html` in test pages (#9953)
+* feat(developer): Add more non-printing characters (#9846)
+
 ## 17.0.206 alpha 2023-11-06
 
 * chore(developer): remove compile.pas and CompileErrorCodes.pas (#9924)
diff --git a/VERSION.md b/VERSION.md
index 87d064124d4..c1a8b355240 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-17.0.207
\ No newline at end of file
+17.0.208
\ No newline at end of file

From 32f3074273bae509fcbecb7e16589ffd2912d48f Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 8 Nov 2023 10:42:30 +0700
Subject: [PATCH 56/67] chore(linux): Fix GHA triggering

When we build a PR on TC we use `pull/ID/head` for the build, not
`pull/ID/merge`, i.e. the tip of the feature branch and not a merge
with the base branch. This means that during the build `pull/ID/merge`
is unknown. This change modifies the trigger to use `pull/ID/head` for
GHA builds as well.

It's still a mystery why `pull/ID/merge` was known to builds in most
cases but failed for some PRs.
---
 resources/build/trigger-builds.inc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index a8cbcfd4d88..dd950f1c512 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -79,7 +79,7 @@ function triggerGitHubActionsBuild() {
     GIT_HEAD_SHA="${GIT_BUILD_SHA}"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${VERSION_WITH_TAG}"
   elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
-    GIT_BUILD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/merge")"
+    GIT_BUILD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/head")"
     GIT_HEAD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/head")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
     GIT_BRANCH="PR-${GIT_BRANCH}"

From 46cdd07e22f23b17dd99095137c840888bab656d Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 8 Nov 2023 12:13:56 +0700
Subject: [PATCH 57/67] fix(linux): Fix baseline tests

Change the test to use characters in the context that don't appear in
the keyboard.
---
 .../keyboards/baseline/k_020___deadkeys_and_backspace.kmn     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
index 13c34f31280..af7c80f21d9 100644
--- a/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
+++ b/common/test/keyboards/baseline/k_020___deadkeys_and_backspace.kmn
@@ -12,8 +12,8 @@ c    verifying that deadkeys are preserved with the first backspace event:
 c    'c' (dk7) 'de' + BKSP + BKSP = 'ok'
 
 c keys: [K_1][K_BKSP][K_2][K_BKSP][K_3][K_BKSP][K_4][K_BKSP][K_5][K_BKSP][K_6][K_BKSP][K_7][K_BKSP][K_BKSP]
-c expected: 78aa ok
-c context: 7890
+c expected: wxaa ok
+c context: wxyz
 
 store(&VERSION) '9.0'
 

From 71c9cda362024729f813f447b2909af1ee7160cb Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Wed, 8 Nov 2023 12:26:48 +0700
Subject: [PATCH 58/67] fix(linux): Fix trigger for baseline tests

When the baseline tests change we want to trigger a Linux build.
---
 resources/build/trigger-definitions.inc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/build/trigger-definitions.inc.sh b/resources/build/trigger-definitions.inc.sh
index 4698719d4d7..dbfad6abfba 100644
--- a/resources/build/trigger-definitions.inc.sh
+++ b/resources/build/trigger-definitions.inc.sh
@@ -11,7 +11,7 @@ available_platforms=(android common_web common_windows common_mac common_linux i
 
 watch_android='web|common/models|common/predictive-text|common/web'
 watch_ios='web|common/models|common/predictive-text|common/web'
-watch_linux='core'
+watch_linux='core|common/test/keyboards/baseline'
 watch_mac='core'
 watch_web='common/models|common/predictive-text|common/web|core'
 watch_windows='common|core|web'

From cd49f3f2b75ca99f14a4c7f044660f3e3dc20f26 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <ermshiperete@users.noreply.github.com>
Date: Wed, 8 Nov 2023 19:29:15 +0700
Subject: [PATCH 59/67] Update web/src/engine/osk/src/keyboard-layout/oskKey.ts

Co-authored-by: Marc Durdin <marc@durdin.net>
---
 web/src/engine/osk/src/keyboard-layout/oskKey.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/engine/osk/src/keyboard-layout/oskKey.ts b/web/src/engine/osk/src/keyboard-layout/oskKey.ts
index 67835207c78..d21939f2ec0 100644
--- a/web/src/engine/osk/src/keyboard-layout/oskKey.ts
+++ b/web/src/engine/osk/src/keyboard-layout/oskKey.ts
@@ -248,7 +248,7 @@ export default abstract class OSKKey {
 
     // Don't add extra padding to height - multiplying with MAX_Y_PROPORTION already gives
     // padding
-    let textHeight = fontHeight ? fontHeight : 0;
+    let textHeight = fontHeight ?? 0;
     if(style.height && style.height.indexOf('px') != -1) {
       keyHeight = Number.parseFloat(style.height.substring(0, style.height.indexOf('px')));
     }

From f174c9bc0c804a96d63a39dff263f22edb7ddb56 Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Wed, 8 Nov 2023 13:03:05 -0500
Subject: [PATCH 60/67] auto: increment master version to 17.0.209

---
 HISTORY.md | 8 ++++++++
 VERSION.md | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index cc1fec44015..a8c2c21b1f7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,13 @@
 # Keyman Version History
 
+## 17.0.208 alpha 2023-11-08
+
+* fix(web): Fix clearing of deadkeys (#9944)
+* fix(web): Ignore `osk-always-visible` on non-desktop devices (#9951)
+* fix(linux): Fix baseline tests (#9967)
+* chore(linux): Fix GHA triggering (#9965)
+* fix(linux): Fix trigger for baseline tests (#9968)
+
 ## 17.0.207 alpha 2023-11-07
 
 * refactor(web): Link to `index.html` in test pages (#9953)
diff --git a/VERSION.md b/VERSION.md
index c1a8b355240..8b8d8ba5257 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-17.0.208
\ No newline at end of file
+17.0.209
\ No newline at end of file

From afc63278b8fc13e26950e4c978b3ce4bf8f49d44 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 13 Nov 2023 14:50:48 +0100
Subject: [PATCH 61/67] chore(linux): Address code review comments

---
 .github/workflows/deb-packaging.README.md | 21 ++++++++++++++-
 .github/workflows/deb-packaging.yml       | 11 +++-----
 linux/scripts/deb-packaging.sh            | 31 +++++++++++++++--------
 resources/build/trigger-builds.inc.sh     |  8 ++----
 4 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/deb-packaging.README.md b/.github/workflows/deb-packaging.README.md
index a1b1c12d122..6bbeabd9e1e 100644
--- a/.github/workflows/deb-packaging.README.md
+++ b/.github/workflows/deb-packaging.README.md
@@ -14,9 +14,28 @@ You can manually trigger a deb-packaging action on GitHub, e.g. to test changes:
     --data "{ \"event_type\": \"deb-pr-packaging: master\", \
     \"client_payload\": { \
       \"buildSha\": \"$(git rev-parse refs/heads/master)\", \
-      \"headSha\": \"$(git rev-parse refs/heads/master)\", \
       \"branch\": \"master\", \
+      \"baseBranch\": \"master\",
+      \"baseRef\": \"$(git rev-parse refs/heads/master^)\",
+      \"user\": \"${USER}\",
       \"isTestBuild\": \"true\"}" \
     https://api.github.com/repos/<yourgithubname>/keyman/dispatches
+  ```
+
+  To trigger a build for PR #1234 in a branch `pr-1234` this would look similar
+  to this:
 
+  ```bash
+   curl --write-out '\n' --request POST \
+    --header "Accept: application/vnd.github+json" \
+    --header "Authorization: token $GITHUB_TOKEN" \
+    --data "{ \"event_type\": \"deb-pr-packaging: PR #1234\", \
+    \"client_payload\": { \
+      \"buildSha\": \"$(git rev-parse refs/heads/pr-1234)\", \
+      \"branch\": \"pr-1234\", \
+      \"baseBranch\": \"master\",
+      \"baseRef\": \"$(git rev-parse refs/heads/master)\",
+      \"user\": \"${USER}\",
+      \"isTestBuild\": \"true\"}" \
+    https://api.github.com/repos/<yourgithubname>/keyman/dispatches
   ```
diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index 6df9d37bf03..a86c60ec3de 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -6,9 +6,7 @@ on:
 
 # Input:
 # buildSha:    The SHA of the commit to build, e.g. of the branch or
-#              refs/pull/1234/merge for PR
-# headSha:     The SHA of the branch head. Same as buildSha for regular
-#              builds, SHA of refs/pull/1234/head for PRs
+#              refs/pull/1234/head for PR
 # branch:      The branch to build, for a PR in the form `PR-1234`
 # baseBranch:  For a PR the base branch, otherwise the same as `branch`
 # baseRef:     The ref of the previous commit. For a PR the same as `baseBranch`.
@@ -43,7 +41,7 @@ jobs:
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.headSha }} \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
           -f state='pending' \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description='Debian packaging started' \
@@ -258,8 +256,7 @@ jobs:
         ./scripts/deb-packaging.sh \
           --gha \
           --bin-pkg "${GITHUB_WORKSPACE}/artifacts/keyman-binarypkgs/${PKG_NAME}_${{ needs.sourcepackage.outputs.VERSION }}-1${{ needs.sourcepackage.outputs.PRERELEASE_TAG }}+jammy1_amd64.deb" \
-          --pkg-version "${{ needs.sourcepackage.outputs.VERSION }}" \
-          --git-ref "${{ github.sha }}" \
+          --git-sha "${{ github.event.client_payload.buildSha }}" \
           --git-base "${{ github.event.client_payload.baseRef }}" \
           verify 2>> $GITHUB_STEP_SUMMARY
 
@@ -299,7 +296,7 @@ jobs:
         gh api \
           --method POST \
           -H "Accept: application/vnd.github+json" \
-          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.headSha }} \
+          /repos/$GITHUB_REPOSITORY/statuses/${{ github.event.client_payload.buildSha }} \
           -f state="$RESULT" \
           -f target_url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \
           -f description="$MSG" \
diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
index 8ac8de96c6d..fd11a05b50e 100755
--- a/linux/scripts/deb-packaging.sh
+++ b/linux/scripts/deb-packaging.sh
@@ -18,9 +18,9 @@ builder_describe \
   "verify                     Verify API" \
   "--gha                      Build from GitHub Action" \
   "--bin-pkg=BIN_PKG          Path and name of binary Debian package (for verify action)" \
-  "--pkg-version=PKG_VERSION  The version of the Debian package (for verify action)" \
-  "--git-ref=GIT_REF          The ref of the HEAD commit, e.g. HEAD of the PR branch (for verify action)" \
-  "--git-base=GIT_BASE        The ref of the base commit, e.g. HEAD of the master branch (for verify action)"
+  "--git-sha=GIT_SHA          The SHA of the HEAD commit, e.g. of the PR branch (for verify action)" \
+  "--git-base=GIT_BASE        The ref of the base commit, e.g. usually the name of the base" \
+  "                           branch, e.g. master, stable-16.0 (for verify action)"
 
 builder_parse "$@"
 
@@ -79,16 +79,23 @@ output_error() {
 check_api_not_changed() {
   # Checks that the API did not change compared to what's documented in the .symbols file
   tmpDir=$(mktemp -d)
+  # shellcheck disable=SC2064
+  trap "rm -rf \"${tmpDir}\"" ERR
   dpkg -x "${BIN_PKG}" "${tmpDir}"
   cd debian
-  dpkg-gensymbols -v"${PKG_VERSION}" -p"${PKG_NAME}" -e"${tmpDir}"/usr/lib/x86_64-linux-gnu/"${LIB_NAME}".so* -O"${PKG_NAME}.symbols" -c4
+  dpkg-gensymbols -v"${VERSION}" -p"${PKG_NAME}" -e"${tmpDir}"/usr/lib/x86_64-linux-gnu/"${LIB_NAME}".so* -O"${PKG_NAME}.symbols" -c4
   output_ok "${LIB_NAME} API didn't change"
   cd "${REPO_ROOT}/linux"
+  rm -rf "${tmpDir}"
+  trap ERR
 }
 
+#
+# Compare the SHA of the base and head commits for changes to the .symbols file
+#
 is_symbols_file_changed() {
   local CHANGED_REF CHANGED_BASE
-  CHANGED_REF=$(git rev-parse "${GIT_REF}":"linux/debian/${PKG_NAME}.symbols")
+  CHANGED_REF=$(git rev-parse "${GIT_SHA}":"linux/debian/${PKG_NAME}.symbols")
   CHANGED_BASE=$(git rev-parse "${GIT_BASE}":"linux/debian/${PKG_NAME}.symbols")
   if [[ "${CHANGED_REF}" == "${CHANGED_BASE}" ]]; then
     return 1
@@ -103,7 +110,11 @@ check_updated_version_number() {
     # .symbols file changed, now check if the package version got updated as well
     # Note: We don't check that ALL changes in that file have an updated package version -
     # we hope this gets flagged in code review.
-    if ! git log -p -1 -- "debian/${PKG_NAME}.symbols" | grep -q "${PKG_VERSION}"; then
+    # Note: This version number check may not match the actual released version, if the branch
+    # is out of date when it is merged to the release branch (master/beta/stable-x.y). If this
+    # is considered important, then make sure the branch is up to date, and wait for test
+    # builds to complete, before merging.
+    if ! git log -p -1 -- "debian/${PKG_NAME}.symbols" | grep -q "${VERSION}"; then
       output_error "${PKG_NAME}.symbols file got changed without changing the package version number of the symbol"
       EXIT_CODE=1
     else
@@ -117,7 +128,7 @@ check_updated_version_number() {
 get_api_version_in_symbols_file() {
   # Extract 1 from "libkeymancore.so.1 libkeymancore #MINVER#"
   local firstline
-  firstline=$(head -1 "debian/${PKG_NAME}.symbols")
+  firstline="$(head -1 "debian/${PKG_NAME}.symbols")"
   firstline="${firstline#"${PKG_NAME}".so.}"
   firstline="${firstline%% *}"
   echo "${firstline}"
@@ -125,11 +136,11 @@ get_api_version_in_symbols_file() {
 
 is_api_version_updated() {
   local NEW_VERSION OLD_VERSION
-  git checkout "${GIT_REF}" -- "debian/${PKG_NAME}.symbols"
+  git checkout "${GIT_SHA}" -- "debian/${PKG_NAME}.symbols"
   NEW_VERSION=$(get_api_version_in_symbols_file)
   git checkout "${GIT_BASE}" -- "debian/${PKG_NAME}.symbols"
   OLD_VERSION=$(get_api_version_in_symbols_file)
-  git checkout "${GIT_REF}" -- "debian/${PKG_NAME}.symbols"
+  git checkout "${GIT_SHA}" -- "debian/${PKG_NAME}.symbols"
   if (( NEW_VERSION > OLD_VERSION )); then
     return 0
   fi
@@ -146,7 +157,7 @@ check_for_major_api_changes() {
     return
   fi
 
-  WHAT_CHANGED=$(git diff "${GIT_BASE}".."${GIT_REF}" -- "debian/${PKG_NAME}.symbols" | diffstat -m -t | tail -1)
+  WHAT_CHANGED=$(git diff "${GIT_BASE}".."${GIT_SHA}" -- "debian/${PKG_NAME}.symbols" | diffstat -m -t | tail -1)
 
   IFS=',' read -r -a CHANGES <<< "${WHAT_CHANGED}"
   INSERTED="${CHANGES[0]}"
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index 3ae3e3ce4a3..aadf72e3565 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -71,19 +71,17 @@ function triggerGitHubActionsBuild() {
   local GIT_BRANCH="${3:-master}"
   local GIT_BASE_BRANCH="${GIT_BRANCH}"
   local GIT_USER="keyman-server"
-  local GIT_BUILD_SHA GIT_HEAD_SHA GIT_BASE_REF JSON
+  local GIT_BUILD_SHA GIT_BASE_REF JSON
 
   local GITHUB_SERVER=https://api.github.com/repos/keymanapp/keyman
 
   if [ "${action:-""}" == "commit" ]; then
     # This will only be true if we created and pushed a tag
     GIT_BUILD_SHA="$(git rev-parse "refs/tags/release@$VERSION_WITH_TAG")"
-    GIT_HEAD_SHA="${GIT_BUILD_SHA}"
     GIT_BASE_REF="$(git rev-parse "${GIT_BUILD_SHA}^")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${VERSION_WITH_TAG}"
   elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
-    GIT_BUILD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/merge")"
-    GIT_HEAD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/head")"
+    GIT_BUILD_SHA="$(git rev-parse "refs/pull/${GIT_BRANCH}/head")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
     JSON=$(curl -s "${GITHUB_SERVER}/pulls/${GIT_BRANCH}")
     GIT_USER="$(echo "$JSON" | $JQ -r '.user.login')"
@@ -92,7 +90,6 @@ function triggerGitHubActionsBuild() {
     GIT_BRANCH="PR-${GIT_BRANCH}"
   else
     GIT_BUILD_SHA="$(git rev-parse "refs/heads/${GIT_BRANCH}")"
-    GIT_HEAD_SHA="${GIT_BUILD_SHA}"
     GIT_BASE_REF="$(git rev-parse "${GIT_BUILD_SHA}^")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: ${GIT_BRANCH}"
   fi
@@ -101,7 +98,6 @@ function triggerGitHubActionsBuild() {
     \"event_type\": \"$GIT_EVENT_TYPE\", \
     \"client_payload\": { \
       \"buildSha\": \"$GIT_BUILD_SHA\", \
-      \"headSha\": \"$GIT_HEAD_SHA\", \
       \"branch\": \"$GIT_BRANCH\", \
       \"baseBranch\": \"$GIT_BASE_BRANCH\", \
       \"baseRef\": \"$GIT_BASE_REF\", \

From 5bb30f55bca80d47c795218f9d3221fc04c4140e Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Mon, 13 Nov 2023 13:07:41 -0500
Subject: [PATCH 62/67] auto: increment master version to 17.0.210

---
 HISTORY.md | 5 +++++
 VERSION.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index a8c2c21b1f7..e120a76c9aa 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 17.0.209 alpha 2023-11-13
+
+* docs(windows): update meson and emscripten details (#9933)
+* fix(web): Increase size of spacebar text (#9954)
+
 ## 17.0.208 alpha 2023-11-08
 
 * fix(web): Fix clearing of deadkeys (#9944)
diff --git a/VERSION.md b/VERSION.md
index 8b8d8ba5257..100ad927f22 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-17.0.209
\ No newline at end of file
+17.0.210
\ No newline at end of file

From f22c773430594524d02c4e7fa1f9bf00ba7e6d8e Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Tue, 14 Nov 2023 06:52:10 +0700
Subject: [PATCH 63/67] chore(common): Update CODEOWNERS for web

---
 docs/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index 464387941af..7902ce7a682 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -26,7 +26,7 @@
 /oem/firstvoices/windows/     @rc-swag      @ermshiperete
 /resources/                   @mcdurdin     @jahorton
 
-# Web is currently shared between Marc and Joshua:
-/web/                         @jahorton     @mcdurdin
+# Web is currently shared between Eberhard and Joshua:
+/web/                         @ermshiperete @jahorton
 
 /windows/                     @rc-swag      @ermshiperete

From f4c1cc10bdb1274b790366c4cade2dfd58559f31 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 14 Nov 2023 10:28:52 +0700
Subject: [PATCH 64/67] fix(windows): setup.inf generation had whitespace

This is a regression coming out of #9616. The new setup.inf generation
process is done in a Makefile and inadvertently added significant
whitespace, which was not being trimmed by setup.
---
 windows/src/desktop/inst/download.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/windows/src/desktop/inst/download.in b/windows/src/desktop/inst/download.in
index aab048d8508..689a3065e49 100644
--- a/windows/src/desktop/inst/download.in
+++ b/windows/src/desktop/inst/download.in
@@ -73,9 +73,9 @@ candle-locale:
 #
 
 setup-inf:
-  echo [Setup] > setup.inf
-  echo Version=$VersionWin >> setup.inf
-  echo MSIFileName=keymandesktop.msi >> setup.inf
-  echo MSIOptions= >> setup.inf
-  echo License=license.html >> setup.inf
-  echo [Packages] >> setup.inf
+  echo [Setup]>setup.inf
+  echo Version=$VersionWin>>setup.inf
+  echo MSIFileName=keymandesktop.msi>>setup.inf
+  echo MSIOptions=>>setup.inf
+  echo License=license.html>>setup.inf
+  echo [Packages]>>setup.inf

From 40cdd49c287b85e2d6ac41b3d26b2d6189fb55fb Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Tue, 14 Nov 2023 12:47:13 +0700
Subject: [PATCH 65/67] fix(windows): setup handle whitespace in setup.inf

---
 .../setup/Keyman.Setup.System.InstallInfo.pas | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/windows/src/desktop/setup/Keyman.Setup.System.InstallInfo.pas b/windows/src/desktop/setup/Keyman.Setup.System.InstallInfo.pas
index b90a583f1fc..951ae8da980 100644
--- a/windows/src/desktop/setup/Keyman.Setup.System.InstallInfo.pas
+++ b/windows/src/desktop/setup/Keyman.Setup.System.InstallInfo.pas
@@ -270,7 +270,7 @@ procedure TInstallInfo.LoadSetupInf(const SetupInfPath: string);
   FInPackages: Boolean;
   FInStrings: Boolean;
   location: TInstallInfoFileLocation;
-  val, nm: WideString;
+  s, val, nm: string;
   pack: TInstallInfoPackage;
   packLocation: TInstallInfoPackageFileLocation;
   FVersion, FMSIFileName: string;
@@ -286,16 +286,17 @@ procedure TInstallInfo.LoadSetupInf(const SetupInfPath: string);
 
     for i := 0 to Count - 1 do
     begin
-      if Trim(Strings[i]) = '' then Continue;
+      s := Trim(Strings[i]);
+      if s = '' then Continue;
 
-      nm := KeyNames[i];
-      val := ValueFromIndex[i];
+      nm := Trim(KeyNames[i]);
+      val := Trim(ValueFromIndex[i]);
 
-      if Copy(Strings[i], 1, 1) = '[' then
+      if Copy(s, 1, 1) = '[' then
       begin
-        FInSetup := WideSameText(Strings[i], '[Setup]');
-        FInPackages := WideSameText(Strings[i], '[Packages]');
-        FInStrings := WideSameText(Strings[i], '[Strings]');
+        FInSetup := WideSameText(s, '[Setup]');
+        FInPackages := WideSameText(s, '[Packages]');
+        FInStrings := WideSameText(s, '[Strings]');
       end
       else if FInSetup then
       begin
@@ -318,7 +319,7 @@ procedure TInstallInfo.LoadSetupInf(const SetupInfPath: string);
         end;
       end
       else if FInStrings then
-        FStrings.Add(Strings[i]);
+        FStrings.Add(s);
     end;
 
     if System.SysUtils.FileExists(FMSIFileName) then  // I3476

From 5badb17d4a649406bcffbb78fbd038a113a9e434 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Tue, 14 Nov 2023 10:26:29 +0100
Subject: [PATCH 66/67] chore(linux): reduce number of checkouts

Addresses code review comment.
---
 linux/scripts/deb-packaging.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
index fd11a05b50e..034fa6f0d8c 100755
--- a/linux/scripts/deb-packaging.sh
+++ b/linux/scripts/deb-packaging.sh
@@ -136,11 +136,10 @@ get_api_version_in_symbols_file() {
 
 is_api_version_updated() {
   local NEW_VERSION OLD_VERSION
-  git checkout "${GIT_SHA}" -- "debian/${PKG_NAME}.symbols"
-  NEW_VERSION=$(get_api_version_in_symbols_file)
   git checkout "${GIT_BASE}" -- "debian/${PKG_NAME}.symbols"
   OLD_VERSION=$(get_api_version_in_symbols_file)
   git checkout "${GIT_SHA}" -- "debian/${PKG_NAME}.symbols"
+  NEW_VERSION=$(get_api_version_in_symbols_file)
   if (( NEW_VERSION > OLD_VERSION )); then
     return 0
   fi

From 2b1198800370bba846bba91f5205e1f8f4b272bb Mon Sep 17 00:00:00 2001
From: Keyman Build Agent <buildagent@keyman.com>
Date: Tue, 14 Nov 2023 13:14:16 -0500
Subject: [PATCH 67/67] auto: increment master version to 17.0.211

---
 HISTORY.md | 5 +++++
 VERSION.md | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/HISTORY.md b/HISTORY.md
index e120a76c9aa..9d7716dcaa3 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,10 @@
 # Keyman Version History
 
+## 17.0.210 alpha 2023-11-14
+
+* docs(common): Update CODEOWNERS for web (#9997)
+* chore(core): Add additional API checks (#9867)
+
 ## 17.0.209 alpha 2023-11-13
 
 * docs(windows): update meson and emscripten details (#9933)
diff --git a/VERSION.md b/VERSION.md
index 100ad927f22..9c77e7b51c3 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-17.0.210
\ No newline at end of file
+17.0.211
\ No newline at end of file