Skip to content

Commit

Permalink
Merge pull request #12320 from keymanapp/chore/merge-master-into-mode…
Browse files Browse the repository at this point in the history
…l-encoding

chore: merge master into model-encoding
  • Loading branch information
mcdurdin authored Aug 30, 2024
2 parents 636a3ee + 52486e3 commit 53992ee
Show file tree
Hide file tree
Showing 213 changed files with 4,586 additions and 3,403 deletions.
38 changes: 38 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,43 @@
# Keyman Version History

## 18.0.100 alpha 2024-08-28

* fix(windows): check IM window will be in a visible location (#11967)

## 18.0.99 alpha 2024-08-27

* feat(web): import the generator for the pred-text wordbreaker's Unicode-property data-table (#10690)
* feat(web): optimize the wordbreaker data table for filesize and ease of first-load parsing (#10692)
* (#12297)
* (#12115)

## 18.0.98 alpha 2024-08-26

* change(ios): defer registration of fonts past initialization (#12190)
* refactor(ios): optimize font registration (#12210)
* test(mac): add unit tests to validate first calls to compliance check (#11724)
* fix(mac): limit short bundle version string to x.y.z format in info.plist (#12233)
* chore(developer): extend timeouts for lm compiler tests to 5 secs (#12273)
* fix(developer): find last matching key in LDML key bag when building KVK (#12278)
* chore(android): Cleanup stray debug statements in console (#12287)
* fix(developer): ensure call() detects invalid store in kmcmplib compiler (#12263)

## 18.0.97 alpha 2024-08-24

* refactor(linux): cleanup API of kvk2ldml.py (#12276)
* chore(common): adjust build settings for windows clean builds (#12264)
* chore(windows): remove remaining unused Makefiles (#12274)
* docs(developer): update build documentation to refer to build.sh (#12272)

## 18.0.96 alpha 2024-08-23

* fix(android): Fix navigation arrows in Info Activity for RTL (#12244)
* fix(web): fix documentation-keyboard spacebar-text scaling (#12232)
* fix(android): Use increment and decrement arrows on longpress delay menu (#12242)
* fix(android): Add RTL assets for adjusting keyboard height menu (#12261)
* chore(common): use `npm install` in emsdk update (#12269)
* docs: refresh windows.md (#12248)

## 18.0.95 alpha 2024-08-22

* chore(common): allow build agents to automatically select emsdk version, and enable support for 3.1.60+ (#12243)
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.0.96
18.0.101
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions android/KMEA/app/src/main/assets/android-host.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function notifyHost(event, params) {
function setLongpressDelay(delay) {
if (keyman.osk) {
keyman.osk.gestureParams.longpress.waitLength = delay;
console.debug('setLongpressDelay('+delay+')');
console_debug('setLongpressDelay('+delay+')');
} else {
window.console.log('setLongpressDelay error: keyman.osk undefined');
}
Expand Down Expand Up @@ -304,7 +304,7 @@ function updateKMSelectionRange(start, end) {

console_debug('result:\n' + build_context_string(context));
} else {
console.debug('range unchanged');
console_debug('range unchanged');
}
}

Expand Down
3 changes: 2 additions & 1 deletion common/models/wordbreakers/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build/
build/
src/main/default/data.inc.ts
22 changes: 17 additions & 5 deletions common/models/wordbreakers/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"

################################ Main script ################################

# Note: the raw text files used for data.inc.ts are found within
# /resources/standards-data/unicode-character-database.
builder_describe "Builds the predictive-text wordbreaker implementation module" \
"clean" \
"configure" \
Expand All @@ -20,16 +22,26 @@ builder_describe "Builds the predictive-text wordbreaker implementation module"
"--ci"

builder_describe_outputs \
configure /node_modules \
build build/obj/index.js
configure src/main/default/data.inc.ts \
build build/main/obj/index.js

builder_parse "$@"

function do_configure() {
verify_npm_setup

# This is a script used to build the data.inc.ts file needed by the
# default wordbreaker. We rarely update the backing data, but it
# is needed _before_ the `build` action's compilation step.
tsc -b tools/data-compiler/tsconfig.json
node ./build/tools/data-compiler/obj/index.js
}

function do_build() {
tsc -b
tsc -b ./tsconfig.json

# Declaration bundling.
tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts
tsc -p ./tsconfig.json --emitDeclarationOnly --outFile ./build/main/lib/index.d.ts
}

function do_test() {
Expand All @@ -40,7 +52,7 @@ function do_test() {
fi
}

builder_run_action configure verify_npm_setup
builder_run_action configure do_configure
builder_run_action clean rm -rf build/
builder_run_action build do_build
builder_run_action test do_test
18 changes: 12 additions & 6 deletions common/models/wordbreakers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@
],
"homepage": "https://github.com/keymanapp/keyman",
"license": "MIT",
"main": "build/obj/index.js",
"types": "build/obj/index.d.ts",
"main": "build/main/obj/index.js",
"types": "build/main/obj/index.d.ts",
"exports": {
".": {
"es6-bundling": "./src/index.ts",
"default": "./build/obj/index.js"
"es6-bundling": "./src/main/index.ts",
"default": "./build/main/obj/index.js"
},
"./lib": {
"types": "./build/lib/index.d.ts"
"types": "./build/main/lib/index.d.ts"
},
"./obj/*.js": "./build/obj/*.js"
"./obj/*.js": "./build/main/obj/*.js",
"./test-index": {
"default": "./build/main/obj/test-index.js"
},
"./README.md": {
"default": "./README.md"
}
},
"directories": {
"lib": "lib",
Expand Down
Loading

0 comments on commit 53992ee

Please sign in to comment.