diff --git a/.github/labeler.yml b/.github/labeler.yml index 5250e321935..19c858cc81d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -20,10 +20,8 @@ common/: - common/** - resources/** -common/models/: common/models/** -common/models/types/: common/models/types/** -common/models/templates/: common/models/templates/** -common/models/wordbreakers/: common/models/wordbreakers/** +common/models/templates/: web/src/engine/predictive-text/templates/** +common/models/wordbreakers/: web/src/engine/predictive-text/wordbreakers/** common/resources/: resources/** common/web/: common/web/** diff --git a/.github/workflows/api-verification.yml b/.github/workflows/api-verification.yml index 786e8ebad2d..6eeccdaccb0 100644 --- a/.github/workflows/api-verification.yml +++ b/.github/workflows/api-verification.yml @@ -1,4 +1,5 @@ name: "API Verification" +run-name: "API Verification for ${{ github.ref_name }}" on: workflow_run: workflows: [Ubuntu packaging] diff --git a/.gitignore b/.gitignore index 8534d172a9c..6c8fbfbec84 100644 --- a/.gitignore +++ b/.gitignore @@ -184,3 +184,5 @@ lcov.info /keyman*.changes /keyman*.tar.?z +# flag file for build script +.configured diff --git a/HISTORY.md b/HISTORY.md index 1afecba6497..9439ba6224d 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,152 @@ # Keyman Version History +## 18.0.122 alpha 2024-10-07 + +* feat(mac): both option keys generate right alt if no left alt mapping (#12458) +* chore(common): improve configuration detection for hextobin (#12481) + +## 18.0.121 alpha 2024-10-03 + +* docs(developer): Fix image links in help (#12488) +* fix(oem/fv): Update keyboard versions and names for fv_all.kmp 13.1 (#12486) +* feat(common): unified XML parser/writer (#12482) + +## 18.0.120 alpha 2024-10-02 + +* chore(common): Add note on troubleshooting website errors (#12487) +* docs(common): mention `KEYMAN_USE_NVM` in minimum versions doc (#12490) +* docs(web): fix paths to several help pages (#12491) +* docs(web): fix structure of test document (#12492) + +## 18.0.119 alpha 2024-09-28 + +* refactor(developer): copy dev 17.0 help into repo (#12427) +* fix(developer): warn before importing over touch layout (#12478) +* chore(linux): display branch name with API verification (#12480) +* docs(core): Update kmx-plus-file-format.md (#12479) + +## 18.0.118 alpha 2024-09-26 + +* chore(developer): add context/options (#11566) +* chore(deps-dev): bump rollup from 4.16.4 to 4.22.4 (#12462) +* fix(developer): ignore excess whitespace in `` attribute (#12468) +* refactor(common): move help into common prod/docs/help folders (#12424) +* fix(developer): publish developer-utils package during build (#12471) +* fix(linux): ignore additional C++ symbol in API check (#12474) + +## 18.0.117 alpha 2024-09-25 + +* docs(common): Document how to skip generating CDN on websites (#12446) +* fix(android): Remove toggle for "Always Show Banner" (#12430) +* fix(android): Hide suggestion banner on password fields (#12442) +* fix(developer): prevent invalid string ids (#12465) + +## 18.0.116 alpha 2024-09-20 + +* change(mac): remove verbose logging option (#12431) +* chore(common): Allow to build offline (#12439) + +## 18.0.115 alpha 2024-09-19 + +* chore(common): detect ssh remotes in git hooks (#12437) +* fix(common): add proper configure output for hextobin (#12440) +* fix(core): add missing dependency for core (#12438) +* chore(developer): remove .js output from LDML compiler (#12432) + +## 18.0.114 alpha 2024-09-17 + +* fix(developer): rewrite ldml visual keyboard compiler (#12402) +* fix(developer): check vars string usage before definition (#12404) +* change(mac): remove 'Always show OSK' option (#12355) + +## 18.0.113 alpha 2024-09-16 + +* test(developer): kmcmplib compiler unit tests 3 (#11990) + +## 18.0.112 alpha 2024-09-14 + +* chore(deps): bump express from 4.19.2 to 4.20.0 (#12396) + +## 18.0.111 alpha 2024-09-13 + +* chore(common): Update crowdin strings for Italian (#12408) +* fix(common): correct offsets in KMX+ spec (#12350) +* fix(android): Add gating to setLongpressDelay() (#12410) + +## 18.0.110 alpha 2024-09-12 + +* chore(common): Update to Unicode 16.0 (#12393) +* refactor(web): move `common/web/es-bundling` → `web/src/tools/es-bundling` (#12389) +* refactor(web): move `common/web/eslint` → `common/tools/eslint` (#12390) +* refactor(web): move sentry-manager → `web/src/engine/sentry-manager` (#12397) +* refactor(web): merge `device-detect` with `web/src/engine/main` (#12399) +* chore(web): allow to run unit tests in vscode test explorer (#12400) +* fix(developer): index() requires comma between parameters in kmcmplib compiler (#12328) + +## 18.0.109 alpha 2024-09-11 + +* chore(common): Update history with 17.0.329 stable (#12394) +* refactor(web): move `model/templates` to `web/src/engine/predictive/text` (#12382) +* refactor(web): move `common/models` to `web/src/engine/predictive-text` (#12383) +* refactor(web): move `common/web/utils` to `web/src/engine/common/web-utils/` (#12384) + +## 18.0.108 alpha 2024-09-10 + +* docs(android): Update help docs (#12367) +* fix(developer): fix building with Ubuntu 24.04 (#12379) +* refactor(android): Move build-publish.sh to builder script (#12351) +* fix(android): Separate `publishSentry` Gradle task to publish symbols to Sentry (#12358) +* refactor(web): move `model/types` to `web/types` (#12370) + +## 18.0.107 alpha 2024-09-09 + +* fix(android): Update Text Size menu icons for RTL support (#12290) + +## 18.0.106 alpha 2024-09-06 + +* feat(windows): add right modifier included in hotkey optional functionality (#12259) +* fix(android): Skip language counts for lexical-model packages (#12361) +* docs(web): fix link to documentation page (#12369) + +## 18.0.105 alpha 2024-09-05 + +* chore(common): Fix missing entries in HISTORY.md (#12352) +* docs(android): Add in-app help for adjusting longpress delay (#12359) +* fix(mac): avoid crash on startup with macOS 10.15 (Catalina) (#12354) +* chore(oem/fv): Update to fv_all 13.0 (#12362) +* feat(windows): Add two new strings for SIL Global name instead of SIL International (#12327) + +## 18.0.104 alpha 2024-09-03 + +* fix(mac): display package info after keyboard installation (#12326) + +## 18.0.103 alpha 2024-09-02 + +* feat(windows): Remove hotkey related feature flags (#12252) +* feat(windows): update SIL logo for Windows UI (#12250) + +## 18.0.102 alpha 2024-08-30 + +* docs(web): add documentation comments for touch layout interfaces (#12314) +* change(mac): store data in Library directory instead of Documents (#12106) +* change(mac): store partial path in UserDefaults (#12144) + +## 18.0.101 alpha 2024-08-29 + +* refactor(web): move `gesture-recognizer` → `gesture-processor` (#12194) +* docs(core): fix a typo in the KMX+ doc (#12302) +* chore(web): remove obsolete comment (#12304) +* chore(android,ios): Update FirstVoices keyboards to fv_all.kmp 12.15 (#12300) +* fix(developer): make LDML import path consistent for all bundlings of kmc (#12280) +* fix(core): properly support 'other' modifier state with `uint32_t` type (#12281) +* chore(windows): fix typo in environment.inc.sh (#12286) +* fix(android): Check in material-stepper as internal Maven dependency (#12267) +* docs(core): improve formatting of KMX+ doc (#12303) +* fix(android): Prioritize certain actions over multi-line for ENTER key (#12315) +* fix(linux): add `keymanFacename` to .ldml file (#12277) +* chore(common): Update crowdin strings for Czech (#12316) +* fix(web): prevent unintuitive space-output blocking for mid-context suggestions (#12313) + ## 18.0.100 alpha 2024-08-28 * fix(windows): check IM window will be in a visible location (#11967) @@ -8,8 +155,8 @@ * 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) +* fix(web): fixes wordbreaker test import path (#12297) +* feat(web): enable utf8 charset encoding for the build artifacts (#12115) ## 18.0.98 alpha 2024-08-26 @@ -54,11 +201,11 @@ ## 18.0.93 alpha 2024-08-20 -* (#12188) +* refactor(web): remove engine/interfaces dependency on engine/js-processor (#12188) * fix(web): fix malformed reversion display strings (#12201) * feat(android): Add menu to specify long-press delay (#12170) * feat(android): Pass longpress delay to KeymanWeb (#12185) -* (#12223) +* fix(core): set mac build version for meson cli build to 10.13 (#12223) ## 18.0.92 alpha 2024-08-19 @@ -714,6 +861,29 @@ * chore(common): move to 18.0 alpha (#10713) * chore: move to 18.0 alpha +## 17.0.329 stable 2024-09-09 + +* chore(android,ios): Add ojibwa ifinal/rdot keyboards to FirstVoices (#12020) +* change(web): revert #11174, which loads keyboards before initializing the OSK (#12040) +* fix(web): unrevert #11258, leaving OSK hidden before instructed to display (#12058) +* chore(common): use `nvm` to select version of node for builds (#12074) +* fix(developer): ignore scan code if zero in debugger (#12182) +* fix(developer): enforce presence of Version field when FollowKeyboardVersion is not set, in package compiler (#12206) +* fix(developer): enforce presence of kps Info.Description field in info compilers (#12207) +* fix(web): disable fat-finger data use when mayCorrect = false (#12226) +* chore(common): allow build agents to automatically select emsdk version, and enable support for 3.1.60+ (#12245) +* fix(web): fix documentation-keyboard spacebar-text scaling (#12240) +* fix(core): set mac build version for meson cli build to 10.13 (#12246) +* change(ios): defer registration of fonts past initialization (#12241) +* chore(android,ios): Update FirstVoices keyboards to 12.15 (#12301) +* fix(core): properly support 'other' modifier state with `uint32_t` type (#12285) +* fix(developer): find last matching key in LDML key bag when building KVK (#12284) +* fix(android): check in material-stepper as internal Maven dependency (#12324) +* fix(linux): add `keymanFacename` to .ldml file (#12283) +* chore(oem/fv): Update to fv_all 13.0 (#12363) +* fix(mac): avoid crash on startup with macOS 10.15 (Catalina) (#12364) +* fix(android): skip language counts for lexical-model packages (#12368) + ## 17.0.328 stable 2024-07-27 * fix(web): add nullish test in setOsk (#12041) diff --git a/VERSION.md b/VERSION.md index 5e9ac7140c0..fa985f788c5 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -18.0.101 \ No newline at end of file +18.0.123 \ No newline at end of file diff --git a/android/KMAPro/build-play-store-notes.inc.sh b/android/KMAPro/build-play-store-notes.inc.sh index 04fa8764179..56b9a92326e 100755 --- a/android/KMAPro/build-play-store-notes.inc.sh +++ b/android/KMAPro/build-play-store-notes.inc.sh @@ -24,7 +24,7 @@ function generateReleaseNotes() { # Pad release notes if whatsnew.md doesn't have any line items # Play Store release notes have a limit of 500 characters local DEFAULT_RELEASE_NOTE="* Additional bug fixes and improvements" - local FILTERED_LINES=$( grep '^\s*\*.*$' "$KEYMAN_ROOT/android/help/about/whatsnew.md" || [[ $? == 1 ]] ) # Continue if grep has no matches + local FILTERED_LINES=$( grep '^\s*\*.*$' "$KEYMAN_ROOT/android/docs/help/about/whatsnew.md" || [[ $? == 1 ]] ) # Continue if grep has no matches if [ -z "$FILTERED_LINES" ]; then FILTERED_LINES="$DEFAULT_RELEASE_NOTE" builder_warn "Warning: whatsnew.md empty so using default release note: '$FILTERED_LINES'" @@ -32,7 +32,7 @@ function generateReleaseNotes() { # Change IFS to new line local old_IFS="${IFS}" - IFS=$'\n' + IFS=$'\n' for line in $FILTERED_LINES do local CHARS_IN_RELEASE_NOTES=$( wc -m < "$PLAY_RELEASE_NOTES" ) diff --git a/android/KMAPro/build.gradle b/android/KMAPro/build.gradle index b1f2d240a72..5614fcae6a6 100644 --- a/android/KMAPro/build.gradle +++ b/android/KMAPro/build.gradle @@ -2,8 +2,10 @@ buildscript { repositories { google() - jcenter() mavenCentral() + flatDir { + dirs "kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/" + } } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' @@ -11,16 +13,16 @@ buildscript { classpath 'io.sentry:sentry-android-gradle-plugin:4.6.0' classpath 'name.remal:gradle-plugins:1.5.0' - // From jcenter() which could be sunset in future + // From jcenter() which was deprecated August 2024 // https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/ - classpath 'com.stepstone.stepper:material-stepper:4.3.1' + classpath 'com.stepstone.stepper:material-stepper:4.3.1@aar' } } allprojects { repositories { + maven { url uri("${projectDir}/libs") } google() - jcenter() mavenCentral() maven { url "https://jitpack.io" } } diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh index e9a51062106..1eafe1e6671 100755 --- a/android/KMAPro/build.sh +++ b/android/KMAPro/build.sh @@ -10,6 +10,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" . "$KEYMAN_ROOT/resources/build/build-help.inc.sh" . "$KEYMAN_ROOT/resources/build/build-download-resources.sh" +. "$KEYMAN_ROOT/android/KMAPro/build-play-store-notes.inc.sh" + # ################################ Main script ################################ # Definition of global compile constants @@ -25,6 +27,7 @@ builder_describe "Builds Keyman for Android app." \ "configure" \ "build" \ "test Runs lint and unit tests." \ + "publish Publishes symbols to Sentry and the APK to the Play Store." \ "--ci Don't start the Gradle daemon. For CI" \ "--upload-sentry Upload to sentry" @@ -109,3 +112,13 @@ if builder_start_action test; then builder_finish_action success test fi + +if builder_start_action publish; then + # Copy Release Notes + generateReleaseNotes + + # Publish symbols and Keyman for Android to Play Store + ./gradlew $DAEMON_FLAG publishSentry publishReleaseApk + + builder_finish_action success publish +fi diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle index 7eec37bcefa..11ec4efd2db 100644 --- a/android/KMAPro/kMAPro/build.gradle +++ b/android/KMAPro/kMAPro/build.gradle @@ -105,12 +105,17 @@ android { } // how to configure the sentry android gradle plugin -sentry { - // Disables or enables the automatic configuration of Native symbols - uploadNativeSymbols = true - - // Does or doesn't include the source code of native code for Sentry - includeNativeSources = true +task publishSentry { + doLast { + println 'Publishing Keyman symbols to Sentry' + sentry { + // Disables or enables the automatic configuration of Native symbols + uploadNativeSymbols = true + + // Does or doesn't include the source code of native code for Sentry + includeNativeSources = true + } + } } String env_keys_json_file = System.getenv("keys_json_file") @@ -145,7 +150,6 @@ repositories { dirs 'libs' } google() - jcenter() } dependencies { diff --git a/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1-javadoc.jar b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1-javadoc.jar new file mode 100644 index 00000000000..895d772c397 Binary files /dev/null and b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1-javadoc.jar differ diff --git a/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1-sources.jar b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1-sources.jar new file mode 100644 index 00000000000..a3c41483871 Binary files /dev/null and b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1-sources.jar differ diff --git a/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1.aar b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1.aar new file mode 100644 index 00000000000..9bc9a3f05cd Binary files /dev/null and b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1.aar differ diff --git a/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1.pom b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1.pom new file mode 100644 index 00000000000..5bd1fc5d399 --- /dev/null +++ b/android/KMAPro/kMAPro/libs/com/stepstone/stepper/material-stepper/4.3.1/material-stepper-4.3.1.pom @@ -0,0 +1,90 @@ + + + 4.0.0 + com.stepstone.stepper + material-stepper + 4.3.1 + aar + Android Material Stepper + This library allows to use Material steppers inside Android applications. + https://github.com/stepstone-tech/android-material-stepper + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + zawadz88 + Piotr Zawadzki + piotr.zawadzki@stepstone.com + + + + https://github.com/stepstone-tech/android-material-stepper.git + https://github.com/stepstone-tech/android-material-stepper.git + https://github.com/stepstone-tech/android-material-stepper + + + + com.android.support + appcompat-v7 + 25.4.0 + compile + + + junit + junit + 4.12 + test + + + org.mockito + mockito-core + 2.7.21 + test + + + com.squareup.assertj + assertj-android + 1.1.1 + test + + + org.robolectric + robolectric + 3.3.1 + test + + + httpclient + org.apache.httpcomponents + + + commons-logging + commons-logging + + + + + org.jetbrains.kotlin + kotlin-stdlib-jre7 + 1.1.4-3 + test + + + org.jetbrains.kotlin + kotlin-reflect + 1.1.4-3 + test + + + com.nhaarman + mockito-kotlin + 1.4.0 + test + + + diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java index 2ecf62fe099..e79cb917ff3 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java @@ -31,8 +31,6 @@ public class AdjustLongpressDelayActivity extends BaseActivity { // Keeps track of the adjusted longpress delay time for saving. // Internally use milliseconds, but GUI displays seconds private static int currentDelayTimeMS = KMManager.KMDefault_LongpressDelay; // ms - private static int minLongpressTime = 300; // ms - private static int maxLongpressTime = 1500; // ms private static int delayTimeIncrement = 200; // ms /** @@ -112,7 +110,7 @@ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { findViewById(R.id.delayTimeDownButton).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (currentDelayTimeMS > minLongpressTime) { + if (currentDelayTimeMS > KMManager.KMMinimum_LongpressDelay) { currentDelayTimeMS -= delayTimeIncrement; seekBar.setProgress(delayTimeToProgress()); } @@ -122,7 +120,7 @@ public void onClick(View v) { findViewById(R.id.delayTimeUpButton).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (currentDelayTimeMS < maxLongpressTime) { + if (currentDelayTimeMS < KMManager.KMMaximum_LongpressDelay) { currentDelayTimeMS += delayTimeIncrement; seekBar.setProgress(delayTimeToProgress()); } diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsActivity.java index 86494e929b0..7e6dcbe5b15 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsActivity.java @@ -10,7 +10,6 @@ public class KeymanSettingsActivity extends BaseActivity { protected static final String installedLanguagesKey = "InstalledLanguages"; protected static final String installKeyboardOrDictionaryKey = "InstallKeyboardOrDictionary"; - protected static final String showBannerKey = "ShowBanner"; protected static final String sendCrashReport = "SendCrashReport"; public static final String spacebarTextKey = "SpacebarText"; public static final String hapticFeedbackKey = "HapticFeedback"; diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java index 95bb7774b0b..59ac59e2f86 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsFragment.java @@ -178,12 +178,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { editor.putBoolean(KeymanSettingsActivity.showBannerKey, isChecked); as part of the default onClick() used by SwitchPreference. */ - SwitchPreference bannerPreference = new SwitchPreference(context); - bannerPreference.setKey(KeymanSettingsActivity.showBannerKey); - bannerPreference.setTitle(getString(R.string.show_banner)); - bannerPreference.setSummaryOn(getString(R.string.show_banner_on)); - bannerPreference.setSummaryOff(getString(R.string.show_banner_off)); - SwitchPreference getStartedPreference = new SwitchPreference(context); getStartedPreference.setKey(GetStartedActivity.showGetStartedKey); getStartedPreference.setTitle(String.format(getString(R.string.show_get_started), getString(R.string.get_started))); @@ -207,7 +201,6 @@ as part of the default onClick() used by SwitchPreference. screen.addPreference(spacebarTextPreference); screen.addPreference(hapticFeedbackPreference); - screen.addPreference(bannerPreference); screen.addPreference(getStartedPreference); screen.addPreference(sendCrashReportPreference); diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java index 3806d5f4b87..161d9663089 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java @@ -112,7 +112,8 @@ public void onCreate(Bundle savedInstanceState) { // Number of languages associated with the first keyboard in a keyboard package. // lexical-model packages will be 0 - final int languageCount = kmpProcessor.getLanguageCount(pkgInfo, PackageProcessor.PP_KEYBOARDS_KEY, 0); + final int languageCount = (keyboardCount > 0) ? + kmpProcessor.getLanguageCount(pkgInfo, PackageProcessor.PP_KEYBOARDS_KEY, 0) : 0; // Sanity check for keyboard packages if (pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS)) { diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/ic_light_action_textsize.png b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/ic_light_action_textsize.png index 3809ef23536..9c8e3354e6b 100644 Binary files a/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/ic_light_action_textsize.png and b/android/KMAPro/kMAPro/src/main/res/drawable-hdpi/ic_light_action_textsize.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-hdpi/ic_light_action_textsize.png b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-hdpi/ic_light_action_textsize.png new file mode 100644 index 00000000000..6764f528f29 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-hdpi/ic_light_action_textsize.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-mdpi/ic_light_action_textsize.png b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-mdpi/ic_light_action_textsize.png new file mode 100644 index 00000000000..a31690d1271 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-mdpi/ic_light_action_textsize.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-xhdpi/ic_light_action_textsize.png b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-xhdpi/ic_light_action_textsize.png new file mode 100644 index 00000000000..ca9829d1788 Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-xhdpi/ic_light_action_textsize.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-xxhdpi/ic_light_action_textsize.png b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-xxhdpi/ic_light_action_textsize.png new file mode 100644 index 00000000000..d15adad0acd Binary files /dev/null and b/android/KMAPro/kMAPro/src/main/res/drawable-ldrtl-xxhdpi/ic_light_action_textsize.png differ diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/textsize_decrease.xml b/android/KMAPro/kMAPro/src/main/res/drawable/textsize_decrease.xml new file mode 100644 index 00000000000..3e8ea253f78 --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/res/drawable/textsize_decrease.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/KMAPro/kMAPro/src/main/res/drawable/textsize_increase.xml b/android/KMAPro/kMAPro/src/main/res/drawable/textsize_increase.xml new file mode 100644 index 00000000000..b51b51139b5 --- /dev/null +++ b/android/KMAPro/kMAPro/src/main/res/drawable/textsize_increase.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml b/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml index c250b1bf072..cfd36374deb 100644 --- a/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml +++ b/android/KMAPro/kMAPro/src/main/res/layout/text_size_controller.xml @@ -15,7 +15,7 @@ android:layout_marginStart="5dp" android:layout_marginEnd="5dp" android:contentDescription="@string/ic_text_size_down" - android:src="@drawable/ic_action_decrement" /> + android:src="@drawable/textsize_decrease" /> + android:src="@drawable/textsize_increase" /> diff --git a/android/KMAPro/kMAPro/src/main/res/values-cs-rCZ/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-cs-rCZ/strings.xml index bec7931da85..97da3115df7 100644 --- a/android/KMAPro/kMAPro/src/main/res/values-cs-rCZ/strings.xml +++ b/android/KMAPro/kMAPro/src/main/res/values-cs-rCZ/strings.xml @@ -33,6 +33,8 @@ Velikost textu nahoru Velikost textu dolů + + Posuvník velikosti textu \nVeškerý text bude vymazán\n @@ -51,6 +53,7 @@ Pro instalaci balíčků klávesnice povolte klávesnici oprávnění ke čtení externího úložiště. Žádost o oprávnění k úložišti byla zamítnuta. Může selhat instalace balíčku klávesnice + Žádost o oprávnění k úložišti se nezdařila. Zkuste nastavení Keyman - Instalovat z místního souboru Nastavení @@ -67,6 +70,8 @@ Upravit výšku klávesnice + Upravit zpoždění dlouhého stisknutí + Titulek mezerníku Keyboard @@ -85,7 +90,7 @@ Nezobrazovat titulek v mezerníku - Vibrate when typing + Při psaní vibrovat Vždy zobrazovat banner @@ -122,6 +127,14 @@ Otočit zařízení pro nastavení na výšku a na šířku Obnovit výchozí nastavení + + Doba zpoždění: %1$.1f sekund + + Prodloužit dobu zpoždění + + Zkrátit dobu zpoždění + + Posuvník doby zpoždění dlouhého stisknutí Hledat nebo zadat URL @@ -157,7 +170,7 @@ Neplatná/chybějící metadata v balíčku - Keyboard requires a newer version of Keyman + Klávesnice vyžaduje novější verzi Keyman - Unable to launch web browser + Nelze spustit webový prohlížeč diff --git a/android/KMAPro/kMAPro/src/main/res/values-it-rIT/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-it-rIT/strings.xml index b3d15fc6317..a475ae37255 100644 --- a/android/KMAPro/kMAPro/src/main/res/values-it-rIT/strings.xml +++ b/android/KMAPro/kMAPro/src/main/res/values-it-rIT/strings.xml @@ -1,5 +1,6 @@ + Condividi @@ -32,6 +33,8 @@ Dimensione testo in alto Dimensione del testo giù + + Cursore dimensione testo \nTutto il testo sarà cancellato\n @@ -50,6 +53,7 @@ Per installare pacchetti di tastiera, consentire a Keyman di leggere la memoria esterna. La richiesta di autorizzazione all\'archiviazione è stata negata. Potrebbe non essere stato possibile installare il pacchetto tastiera + Richiesta di autorizzazione archiviazione non riuscita. Prova Impostazioni Keyman - Installa da file locale Impostazioni @@ -64,6 +68,8 @@ Regola altezza tastiera + Adjust longpress delay + Didascalia barra spaziatrice Keyboard @@ -82,7 +88,7 @@ Non mostrare la didascalia sulla barra spaziatrice - Vibrate when typing + Vibra durante la digitazione Mostra sempre il banner @@ -119,6 +125,14 @@ Ruota il dispositivo per regolare verticale e orizzontale Ripristina impostazioni predefinite + + Delay Time: %1$.1f seconds + + Delay time longer + + Delay time shorter + + Longpress delay time slider Cerca o digita URL @@ -154,7 +168,7 @@ Metadati non validi/mancanti nel pacchetto - Keyboard requires a newer version of Keyman + La tastiera richiede una nuova versione di Keyman - Unable to launch web browser + Impossibile avviare il browser web diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml index a1f9e7240d7..01546f91ba5 100644 --- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml +++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml @@ -147,13 +147,13 @@ Vibrate when typing - + Always show banner - + To be implemented - + When off, only shown when predictive text is enabled diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardWebViewClient.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardWebViewClient.java index b80f6766a33..1e28e4af0b3 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardWebViewClient.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardWebViewClient.java @@ -164,7 +164,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) { // appContext instead of context? SharedPreferences prefs = context.getSharedPreferences(context.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE); boolean modelPredictionPref = false; - if (KMManager.currentLexicalModel != null) { + if (!KMManager.getMayPredictOverride() && KMManager.currentLexicalModel != null) { modelPredictionPref = prefs.getBoolean(KMManager.getLanguagePredictionPreferenceKey(KMManager.currentLexicalModel.get(KMManager.KMKey_LanguageID)), true); } KMManager.setBannerOptions(modelPredictionPref); diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java index b921ac6c0ad..592f4be2a15 100644 --- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java +++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java @@ -310,8 +310,11 @@ public enum EnterModeType { public static final String KMDefault_DictionaryVersion = "0.1.4"; public static final String KMDefault_DictionaryKMP = KMDefault_DictionaryPackageID + FileUtils.MODELPACKAGE; - // Default KeymanWeb longpress delay in milliseconds + // Default KeymanWeb longpress delay constants in milliseconds public static final int KMDefault_LongpressDelay = 500; + public static final int KMMinimum_LongpressDelay = 300; + public static final int KMMaximum_LongpressDelay = 1500; + // Keyman files protected static final String KMFilename_KeyboardHtml = "keyboard.html"; @@ -1274,17 +1277,13 @@ public boolean accept(File pathname) { /** * Sets enterMode which specifies how the System keyboard ENTER key is handled * - * @param imeOptions EditorInfo.imeOptions - * @param inputType InputType + * @param imeOptions EditorInfo.imeOptions used to determine the action + * @param inputType InputType used to determine if the text field is multi-line */ public static void setEnterMode(int imeOptions, int inputType) { - if ((inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) != 0) { - enterMode = EnterModeType.NEWLINE; - return; - } - - int imeActions = imeOptions & EditorInfo.IME_MASK_ACTION; EnterModeType value = EnterModeType.DEFAULT; + int imeActions = imeOptions & EditorInfo.IME_MASK_ACTION; + boolean isMultiLine = (inputType & InputType.TYPE_TEXT_FLAG_MULTI_LINE) != 0; switch (imeActions) { case EditorInfo.IME_ACTION_GO: @@ -1296,7 +1295,8 @@ public static void setEnterMode(int imeOptions, int inputType) { break; case EditorInfo.IME_ACTION_SEND: - value = EnterModeType.SEND; + value = isMultiLine ? + EnterModeType.NEWLINE :EnterModeType.SEND; break; case EditorInfo.IME_ACTION_NEXT: @@ -1304,7 +1304,8 @@ public static void setEnterMode(int imeOptions, int inputType) { break; case EditorInfo.IME_ACTION_DONE: - value = EnterModeType.DONE; + value = isMultiLine ? + EnterModeType.NEWLINE : EnterModeType.DONE; break; case EditorInfo.IME_ACTION_PREVIOUS: @@ -1312,7 +1313,8 @@ public static void setEnterMode(int imeOptions, int inputType) { break; default: - value = EnterModeType.DEFAULT; + value = isMultiLine ? + EnterModeType.NEWLINE : EnterModeType.DEFAULT; } enterMode = value; @@ -2098,14 +2100,22 @@ public static int getLongpressDelay() { /** * Set the longpress delay (in milliseconds) as a stored preference. + * Valid range is 300 ms to 1500 ms. Returns true if the preference is successfully stored. * @param longpressDelay - int longpress delay in milliseconds + * @return boolean */ - public static void setLongpressDelay(int longpressDelay) { + public static boolean setLongpressDelay(int longpressDelay) { + if (longpressDelay < KMMinimum_LongpressDelay || longpressDelay > KMMaximum_LongpressDelay) { + return false; + } + SharedPreferences prefs = appContext.getSharedPreferences( appContext.getString(R.string.kma_prefs_name), Context.MODE_PRIVATE); SharedPreferences.Editor editor = prefs.edit(); editor.putInt(KMKey_LongpressDelay, longpressDelay); editor.commit(); + + return true; } /** diff --git a/android/KMEA/app/src/main/res/values-cs-rCZ/strings.xml b/android/KMEA/app/src/main/res/values-cs-rCZ/strings.xml index 1bcc7926603..db45a6706e0 100644 --- a/android/KMEA/app/src/main/res/values-cs-rCZ/strings.xml +++ b/android/KMEA/app/src/main/res/values-cs-rCZ/strings.xml @@ -49,7 +49,7 @@ Aktualizovat - No internet connection + Žádné připojení k internetu Nelze se připojit k Keyman serveru! @@ -88,7 +88,7 @@ Chyba v klávesnici %1$s:%2$s pro jazyk %3$s. Kontroluji související slovník ke stažení - Cannot connect to Keyman server to check for associated dictionary to download + Nelze se připojit ke Keyman serveru a zkontrolovat, zda je možné stáhnout přidružený slovník Chcete stáhnout nejnovější verzi tohoto slovníku? @@ -111,7 +111,7 @@ Stahování slovníku začalo na pozadí Vybraný slovník se již stahuje; zkuste to prosím za chvíli znovu! - + Stahování slovníku je dokončeno. Stahování se nezdařilo @@ -123,7 +123,7 @@ "Všechny zdroje jsou aktuální!" Aktualizace jednoho nebo více zdrojů selhala! - + Zdroje byly úspěšně aktualizovány! Verze slovníku @@ -132,11 +132,11 @@ Chcete odstranit tento slovník? - Dictionary deleted + Slovník smazán Klávesnice %1$s nainstalována - Keyboard deleted + Klávesnice smazána Povolit opravy @@ -144,14 +144,14 @@ Slovník - Dictionary - Dictionaries - Dictionaries - Dictionaries + Slovník + Slovníky + Slovníků + Slovníků Zkontrolovat dostupný slovník - Check for dictionaries online + Kouknout se na slovníky online Slovník: %1$s @@ -176,5 +176,5 @@ Klepnutím sem změníte klávesnici - Unable to launch web browser + Nelze spustit webový prohlížeč diff --git a/android/KMEA/app/src/main/res/values-it-rIT/strings.xml b/android/KMEA/app/src/main/res/values-it-rIT/strings.xml index 2b9c950cc67..da1e3531a2b 100644 --- a/android/KMEA/app/src/main/res/values-it-rIT/strings.xml +++ b/android/KMEA/app/src/main/res/values-it-rIT/strings.xml @@ -45,7 +45,7 @@ Aggiorna - No internet connection + Nessuna connessione internet Impossibile connettersi al server Keyman! @@ -84,7 +84,7 @@ Errore nella tastiera %1$s:%2$s per %3$s lingua. Controllo del dizionario associato da scaricare - Cannot connect to Keyman server to check for associated dictionary to download + Non è possibile connettersi al server Keyman per verificare dizionari associati da scaricare Vuoi scaricare l\'ultima versione di questo dizionario? @@ -107,7 +107,7 @@ Scaricamento del dizionario avviato in background Il dizionario selezionato è già in download; riprova tra un momento! - + Il download del dizionario è terminato. Download non riuscito @@ -119,7 +119,7 @@ "Tutte le risorse sono aggiornate!" Una o più risorse non sono state aggiornate! - + Risorse aggiornate con successo! Versione dizionario @@ -128,11 +128,11 @@ Vuoi eliminare questo dizionario? - Dictionary deleted + Dizionario eliminato %1$s tastiera installata - Keyboard deleted + Tastiera eliminata Abilita correzioni @@ -140,12 +140,12 @@ Dizionario - Dictionary - Dictionaries + Dizionario + Dizionari Controlla il dizionario disponibile - Check for dictionaries online + Controlla i dizionari online Dizionario: %1$s @@ -168,5 +168,5 @@ Tocca qui per cambiare la tastiera - Unable to launch web browser + Impossibile avviare il browser web diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh index 878b54797dc..29cb519cf56 100755 --- a/android/KMEA/build.sh +++ b/android/KMEA/build.sh @@ -23,7 +23,7 @@ JUNIT_RESULTS="##teamcity[importData type='junit' path='keyman\android\KMEA\app\ builder_describe "Builds Keyman Engine for Android." \ "@/web/src/app/webview" \ - "@/common/web/sentry-manager" \ + "@/web/src/engine/sentry-manager" \ "clean" \ "configure" \ "build" \ @@ -84,7 +84,7 @@ if builder_start_action build:engine; then cp "$KEYMAN_WEB_ROOT/build/app/resources/osk/keymanweb-osk.ttf" "$ENGINE_ASSETS/keymanweb-osk.ttf" cp "$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js" "$ENGINE_ASSETS/sentry.min.js" - cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js" + cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" "$ENGINE_ASSETS/keyman-sentry.js" echo "Copying es6-shim polyfill" cp "$KEYMAN_ROOT/node_modules/es6-shim/es6-shim.min.js" "$ENGINE_ASSETS/es6-shim.min.js" diff --git a/android/build-publish.sh b/android/build-publish.sh deleted file mode 100755 index 29c152c993d..00000000000 --- a/android/build-publish.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/usr/bin/env bash -# CI script to publish specified app APKs to the Play Store. -# The APKs should already have been built from a separate script - -# set -x: Debugging use, print each statement -# set -x - -## START STANDARD BUILD SCRIPT INCLUDE -# adjust relative paths as necessary -THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh" -## END STANDARD BUILD SCRIPT INCLUDE - -. "$KEYMAN_ROOT/android/KMAPro/build-play-store-notes.inc.sh" - -echo Publishing APKs to Play Store - -# -# Prevents 'clear' on exit of mingw64 bash shell -# -SHLVL=0 - -display_usage ( ) { - echo "build-publish.sh [-no-daemon] [-kmapro] [-fv]" - echo - echo "Publish app to the Play Store" - echo " -no-daemon Don't start the Gradle daemon. Use for CI" - echo " -kmapro Keyman for Android" - echo " -fv First Voices" - exit 1 -} - -NO_DAEMON=false -DO_KMAPRO=false -DO_FV=false - -# Parse args -while [[ $# -gt 0 ]] ; do - key="$1" - case $key in - -no-daemon) - NO_DAEMON=true - ;; - -kmapro) - DO_KMAPRO=true - ;; - -fv) - DO_FV=true - ;; - -h|-\?) - display_usage - ;; - esac - shift # past argument -done - -# Override JAVA_HOME to OpenJDK 11 -set_java_home - -echo -echo "NO_DAEMON: $NO_DAEMON" -echo "DO_KMAPRO: $DO_KMAPRO" -echo "DO_FV: $DO_FV" -echo - -if [ "$NO_DAEMON" = true ]; then - DAEMON_FLAG=--no-daemon -else - DAEMON_FLAG= -fi - -BUILD_FLAGS="publishReleaseApk" -echo "BUILD_FLAGS $BUILD_FLAGS" - -# Publish Keyman for Android -if [ "$DO_KMAPRO" = true ]; then - # Copy Release Notes - generateReleaseNotes - cd "$KEYMAN_ROOT/android/KMAPro/" - ./gradlew $DAEMON_FLAG $BUILD_FLAGS -fi - -# Publish FV app -if [ "$DO_FV" = true ]; then - cd "$KEYMAN_ROOT/oem/firstvoices/android/" - ./gradlew $DAEMON_FLAG $BUILD_FLAGS -fi diff --git a/android/build.sh b/android/build.sh index 88048c7aa30..d876d882d77 100755 --- a/android/build.sh +++ b/android/build.sh @@ -18,7 +18,7 @@ builder_describe \ configure \ build \ test \ - "publish Publishes the APKs to the Play Store." \ + "publish Publishes symbols to Sentry and the APKs to the Play Store." \ --ci+ \ --upload-sentry+ \ ":engine=KMEA Keyman Engine for Android" \ diff --git a/android/help/about/history.md b/android/docs/help/about/history.md similarity index 100% rename from android/help/about/history.md rename to android/docs/help/about/history.md diff --git a/android/help/about/index.md b/android/docs/help/about/index.md similarity index 100% rename from android/help/about/index.md rename to android/docs/help/about/index.md diff --git a/android/help/about/privacy.md b/android/docs/help/about/privacy.md similarity index 94% rename from android/help/about/privacy.md rename to android/docs/help/about/privacy.md index 6173d6c3c39..c3dbd000eee 100644 --- a/android/help/about/privacy.md +++ b/android/docs/help/about/privacy.md @@ -19,7 +19,7 @@ Keyman does not use user accounts, so we are unable to identify which crash repo ### Developer Information -Keyman is developed and published by SIL International. +Keyman is developed and published by SIL Global. You can contact SIL or provide any feedback using the app store. diff --git a/android/help/about/system-requirements.md b/android/docs/help/about/system-requirements.md similarity index 100% rename from android/help/about/system-requirements.md rename to android/docs/help/about/system-requirements.md diff --git a/android/help/about/welcome.md b/android/docs/help/about/welcome.md similarity index 100% rename from android/help/about/welcome.md rename to android/docs/help/about/welcome.md diff --git a/android/docs/help/about/whatsnew.md b/android/docs/help/about/whatsnew.md new file mode 100644 index 00000000000..500d0a9593b --- /dev/null +++ b/android/docs/help/about/whatsnew.md @@ -0,0 +1,9 @@ +--- +title: What's New +--- + +Here are some of the new features we have added to Keyman 18.0 for Android: + +* New menu to adjust longpress delay time (#12170, #12185) +* Support localizations for right-to-left languages (#12215) +* Handle additional actions for ENTER key (#12125, #12315) diff --git a/android/help/android_images/adjust-height.png b/android/docs/help/android_images/adjust-height.png similarity index 100% rename from android/help/android_images/adjust-height.png rename to android/docs/help/android_images/adjust-height.png diff --git a/android/help/android_images/backspace-ap.png b/android/docs/help/android_images/backspace-ap.png similarity index 100% rename from android/help/android_images/backspace-ap.png rename to android/docs/help/android_images/backspace-ap.png diff --git a/android/help/android_images/backspace-at.png b/android/docs/help/android_images/backspace-at.png similarity index 100% rename from android/help/android_images/backspace-at.png rename to android/docs/help/android_images/backspace-at.png diff --git a/android/help/android_images/blank-osk.png b/android/docs/help/android_images/blank-osk.png similarity index 100% rename from android/help/android_images/blank-osk.png rename to android/docs/help/android_images/blank-osk.png diff --git a/android/help/android_images/browser-a.png b/android/docs/help/android_images/browser-a.png similarity index 100% rename from android/help/android_images/browser-a.png rename to android/docs/help/android_images/browser-a.png diff --git a/android/help/android_images/confirm-english-dictionary-delete-ap.png b/android/docs/help/android_images/confirm-english-dictionary-delete-ap.png similarity index 100% rename from android/help/android_images/confirm-english-dictionary-delete-ap.png rename to android/docs/help/android_images/confirm-english-dictionary-delete-ap.png diff --git a/android/help/android_images/confirm-khmer-delete-ap.png b/android/docs/help/android_images/confirm-khmer-delete-ap.png similarity index 100% rename from android/help/android_images/confirm-khmer-delete-ap.png rename to android/docs/help/android_images/confirm-khmer-delete-ap.png diff --git a/android/help/android_images/delete-a.png b/android/docs/help/android_images/delete-a.png similarity index 100% rename from android/help/android_images/delete-a.png rename to android/docs/help/android_images/delete-a.png diff --git a/android/help/android_images/dist-file-browser-ap.png b/android/docs/help/android_images/dist-file-browser-ap.png similarity index 100% rename from android/help/android_images/dist-file-browser-ap.png rename to android/docs/help/android_images/dist-file-browser-ap.png diff --git a/android/help/android_images/dist-file-browser-at.png b/android/docs/help/android_images/dist-file-browser-at.png similarity index 100% rename from android/help/android_images/dist-file-browser-at.png rename to android/docs/help/android_images/dist-file-browser-at.png diff --git a/android/help/android_images/dist-install1-ap.png b/android/docs/help/android_images/dist-install1-ap.png similarity index 100% rename from android/help/android_images/dist-install1-ap.png rename to android/docs/help/android_images/dist-install1-ap.png diff --git a/android/help/android_images/dist-install1-at.png b/android/docs/help/android_images/dist-install1-at.png similarity index 100% rename from android/help/android_images/dist-install1-at.png rename to android/docs/help/android_images/dist-install1-at.png diff --git a/android/help/android_images/dist-storage-permission-ap.png b/android/docs/help/android_images/dist-storage-permission-ap.png similarity index 100% rename from android/help/android_images/dist-storage-permission-ap.png rename to android/docs/help/android_images/dist-storage-permission-ap.png diff --git a/android/help/android_images/dist-storage-permission-at.png b/android/docs/help/android_images/dist-storage-permission-at.png similarity index 100% rename from android/help/android_images/dist-storage-permission-at.png rename to android/docs/help/android_images/dist-storage-permission-at.png diff --git a/android/help/android_images/dist-url-screen-ap.png b/android/docs/help/android_images/dist-url-screen-ap.png similarity index 100% rename from android/help/android_images/dist-url-screen-ap.png rename to android/docs/help/android_images/dist-url-screen-ap.png diff --git a/android/help/android_images/dist-url-screen-at.png b/android/docs/help/android_images/dist-url-screen-at.png similarity index 100% rename from android/help/android_images/dist-url-screen-at.png rename to android/docs/help/android_images/dist-url-screen-at.png diff --git a/android/help/android_images/dl-success-ap.png b/android/docs/help/android_images/dl-success-ap.png similarity index 100% rename from android/help/android_images/dl-success-ap.png rename to android/docs/help/android_images/dl-success-ap.png diff --git a/android/help/android_images/english-dictionaries-ap.png b/android/docs/help/android_images/english-dictionaries-ap.png similarity index 100% rename from android/help/android_images/english-dictionaries-ap.png rename to android/docs/help/android_images/english-dictionaries-ap.png diff --git a/android/help/android_images/english-dictionary-info-ap.png b/android/docs/help/android_images/english-dictionary-info-ap.png similarity index 100% rename from android/help/android_images/english-dictionary-info-ap.png rename to android/docs/help/android_images/english-dictionary-info-ap.png diff --git a/android/help/android_images/english-settings-ap.png b/android/docs/help/android_images/english-settings-ap.png similarity index 100% rename from android/help/android_images/english-settings-ap.png rename to android/docs/help/android_images/english-settings-ap.png diff --git a/android/help/android_images/font-size-a.png b/android/docs/help/android_images/font-size-a.png similarity index 100% rename from android/help/android_images/font-size-a.png rename to android/docs/help/android_images/font-size-a.png diff --git a/android/help/android_images/get-started-a.png b/android/docs/help/android_images/get-started-a.png similarity index 100% rename from android/help/android_images/get-started-a.png rename to android/docs/help/android_images/get-started-a.png diff --git a/android/help/android_images/globe-ap.png b/android/docs/help/android_images/globe-ap.png similarity index 100% rename from android/help/android_images/globe-ap.png rename to android/docs/help/android_images/globe-ap.png diff --git a/android/help/android_images/globe-at.png b/android/docs/help/android_images/globe-at.png similarity index 100% rename from android/help/android_images/globe-at.png rename to android/docs/help/android_images/globe-at.png diff --git a/android/help/android_images/hide-keyboard-ap.png b/android/docs/help/android_images/hide-keyboard-ap.png similarity index 100% rename from android/help/android_images/hide-keyboard-ap.png rename to android/docs/help/android_images/hide-keyboard-ap.png diff --git a/android/help/android_images/hide-keyboard-at.png b/android/docs/help/android_images/hide-keyboard-at.png similarity index 100% rename from android/help/android_images/hide-keyboard-at.png rename to android/docs/help/android_images/hide-keyboard-at.png diff --git a/android/help/android_images/ic_cloud_download.png b/android/docs/help/android_images/ic_cloud_download.png similarity index 100% rename from android/help/android_images/ic_cloud_download.png rename to android/docs/help/android_images/ic_cloud_download.png diff --git a/android/help/android_images/ic_content_add.png b/android/docs/help/android_images/ic_content_add.png similarity index 100% rename from android/help/android_images/ic_content_add.png rename to android/docs/help/android_images/ic_content_add.png diff --git a/android/docs/help/android_images/ic_timelapse.png b/android/docs/help/android_images/ic_timelapse.png new file mode 100644 index 00000000000..9f948825b2c Binary files /dev/null and b/android/docs/help/android_images/ic_timelapse.png differ diff --git a/android/help/android_images/ic_translate_a.png b/android/docs/help/android_images/ic_translate_a.png similarity index 100% rename from android/help/android_images/ic_translate_a.png rename to android/docs/help/android_images/ic_translate_a.png diff --git a/android/help/android_images/info-a-gray.png b/android/docs/help/android_images/info-a-gray.png similarity index 100% rename from android/help/android_images/info-a-gray.png rename to android/docs/help/android_images/info-a-gray.png diff --git a/android/help/android_images/info-a.png b/android/docs/help/android_images/info-a.png similarity index 100% rename from android/help/android_images/info-a.png rename to android/docs/help/android_images/info-a.png diff --git a/android/help/android_images/keyman-storage-permission-34b.png b/android/docs/help/android_images/keyman-storage-permission-34b.png similarity index 100% rename from android/help/android_images/keyman-storage-permission-34b.png rename to android/docs/help/android_images/keyman-storage-permission-34b.png diff --git a/android/help/android_images/keyman-storage-permission-ap.png b/android/docs/help/android_images/keyman-storage-permission-ap.png similarity index 100% rename from android/help/android_images/keyman-storage-permission-ap.png rename to android/docs/help/android_images/keyman-storage-permission-ap.png diff --git a/android/help/android_images/keyman-storage-permission-at.png b/android/docs/help/android_images/keyman-storage-permission-at.png similarity index 100% rename from android/help/android_images/keyman-storage-permission-at.png rename to android/docs/help/android_images/keyman-storage-permission-at.png diff --git a/android/help/android_images/khmer-downloading-a.png b/android/docs/help/android_images/khmer-downloading-a.png similarity index 100% rename from android/help/android_images/khmer-downloading-a.png rename to android/docs/help/android_images/khmer-downloading-a.png diff --git a/android/help/android_images/khmer-install-a.png b/android/docs/help/android_images/khmer-install-a.png similarity index 100% rename from android/help/android_images/khmer-install-a.png rename to android/docs/help/android_images/khmer-install-a.png diff --git a/android/help/android_images/khmer-readme-a.png b/android/docs/help/android_images/khmer-readme-a.png similarity index 100% rename from android/help/android_images/khmer-readme-a.png rename to android/docs/help/android_images/khmer-readme-a.png diff --git a/android/help/android_images/khmer-search-a.png b/android/docs/help/android_images/khmer-search-a.png similarity index 100% rename from android/help/android_images/khmer-search-a.png rename to android/docs/help/android_images/khmer-search-a.png diff --git a/android/help/android_images/khmer-settings-ap.png b/android/docs/help/android_images/khmer-settings-ap.png similarity index 100% rename from android/help/android_images/khmer-settings-ap.png rename to android/docs/help/android_images/khmer-settings-ap.png diff --git a/android/help/android_images/khmer-welcome-a.png b/android/docs/help/android_images/khmer-welcome-a.png similarity index 100% rename from android/help/android_images/khmer-welcome-a.png rename to android/docs/help/android_images/khmer-welcome-a.png diff --git a/android/docs/help/android_images/longpress-slider.png b/android/docs/help/android_images/longpress-slider.png new file mode 100644 index 00000000000..f1ab61f7b3c Binary files /dev/null and b/android/docs/help/android_images/longpress-slider.png differ diff --git a/android/help/android_images/menu-icon-a.png b/android/docs/help/android_images/menu-icon-a.png similarity index 100% rename from android/help/android_images/menu-icon-a.png rename to android/docs/help/android_images/menu-icon-a.png diff --git a/android/help/android_images/other-input-methods.png b/android/docs/help/android_images/other-input-methods.png similarity index 100% rename from android/help/android_images/other-input-methods.png rename to android/docs/help/android_images/other-input-methods.png diff --git a/android/help/android_images/plus-a.png b/android/docs/help/android_images/plus-a.png similarity index 100% rename from android/help/android_images/plus-a.png rename to android/docs/help/android_images/plus-a.png diff --git a/android/help/android_images/reset-to-default.png b/android/docs/help/android_images/reset-to-default.png similarity index 100% rename from android/help/android_images/reset-to-default.png rename to android/docs/help/android_images/reset-to-default.png diff --git a/android/help/android_images/return-ap.png b/android/docs/help/android_images/return-ap.png similarity index 100% rename from android/help/android_images/return-ap.png rename to android/docs/help/android_images/return-ap.png diff --git a/android/help/android_images/return-at.png b/android/docs/help/android_images/return-at.png similarity index 100% rename from android/help/android_images/return-at.png rename to android/docs/help/android_images/return-at.png diff --git a/android/help/android_images/return.png b/android/docs/help/android_images/return.png similarity index 100% rename from android/help/android_images/return.png rename to android/docs/help/android_images/return.png diff --git a/android/help/android_images/select_language.png b/android/docs/help/android_images/select_language.png similarity index 100% rename from android/help/android_images/select_language.png rename to android/docs/help/android_images/select_language.png diff --git a/android/help/android_images/settings-2-installed-languages-ap.png b/android/docs/help/android_images/settings-2-installed-languages-ap.png similarity index 100% rename from android/help/android_images/settings-2-installed-languages-ap.png rename to android/docs/help/android_images/settings-2-installed-languages-ap.png diff --git a/android/help/android_images/settings-a.png b/android/docs/help/android_images/settings-a.png similarity index 100% rename from android/help/android_images/settings-a.png rename to android/docs/help/android_images/settings-a.png diff --git a/android/help/android_images/settings-download-dictionary-background-ap.png b/android/docs/help/android_images/settings-download-dictionary-background-ap.png similarity index 100% rename from android/help/android_images/settings-download-dictionary-background-ap.png rename to android/docs/help/android_images/settings-download-dictionary-background-ap.png diff --git a/android/help/android_images/settings-download-str-dictionary-ap.png b/android/docs/help/android_images/settings-download-str-dictionary-ap.png similarity index 100% rename from android/help/android_images/settings-download-str-dictionary-ap.png rename to android/docs/help/android_images/settings-download-str-dictionary-ap.png diff --git a/android/help/android_images/settings-khmer-info-ap.png b/android/docs/help/android_images/settings-khmer-info-ap.png similarity index 100% rename from android/help/android_images/settings-khmer-info-ap.png rename to android/docs/help/android_images/settings-khmer-info-ap.png diff --git a/android/help/android_images/settings-language-ap.png b/android/docs/help/android_images/settings-language-ap.png similarity index 100% rename from android/help/android_images/settings-language-ap.png rename to android/docs/help/android_images/settings-language-ap.png diff --git a/android/help/android_images/settings-languages-ap.png b/android/docs/help/android_images/settings-languages-ap.png similarity index 100% rename from android/help/android_images/settings-languages-ap.png rename to android/docs/help/android_images/settings-languages-ap.png diff --git a/android/docs/help/android_images/settings-screen-ap.png b/android/docs/help/android_images/settings-screen-ap.png new file mode 100644 index 00000000000..f83da380406 Binary files /dev/null and b/android/docs/help/android_images/settings-screen-ap.png differ diff --git a/android/help/android_images/settings-screen-install-keyboard-dictionary.png b/android/docs/help/android_images/settings-screen-install-keyboard-dictionary.png similarity index 100% rename from android/help/android_images/settings-screen-install-keyboard-dictionary.png rename to android/docs/help/android_images/settings-screen-install-keyboard-dictionary.png diff --git a/android/help/android_images/settings-str-dictionary-ap.png b/android/docs/help/android_images/settings-str-dictionary-ap.png similarity index 100% rename from android/help/android_images/settings-str-dictionary-ap.png rename to android/docs/help/android_images/settings-str-dictionary-ap.png diff --git a/android/help/android_images/settings-str-settings-ap.png b/android/docs/help/android_images/settings-str-settings-ap.png similarity index 100% rename from android/help/android_images/settings-str-settings-ap.png rename to android/docs/help/android_images/settings-str-settings-ap.png diff --git a/android/help/android_images/settings-suggestions-ap.png b/android/docs/help/android_images/settings-suggestions-ap.png similarity index 100% rename from android/help/android_images/settings-suggestions-ap.png rename to android/docs/help/android_images/settings-suggestions-ap.png diff --git a/android/help/android_images/settings-two-installed-languages-ap.png b/android/docs/help/android_images/settings-two-installed-languages-ap.png similarity index 100% rename from android/help/android_images/settings-two-installed-languages-ap.png rename to android/docs/help/android_images/settings-two-installed-languages-ap.png diff --git a/android/help/android_images/settings1-ap.png b/android/docs/help/android_images/settings1-ap.png similarity index 100% rename from android/help/android_images/settings1-ap.png rename to android/docs/help/android_images/settings1-ap.png diff --git a/android/help/android_images/settings1-at.png b/android/docs/help/android_images/settings1-at.png similarity index 100% rename from android/help/android_images/settings1-at.png rename to android/docs/help/android_images/settings1-at.png diff --git a/android/help/android_images/settings2-ap.png b/android/docs/help/android_images/settings2-ap.png similarity index 100% rename from android/help/android_images/settings2-ap.png rename to android/docs/help/android_images/settings2-ap.png diff --git a/android/help/android_images/settings2-at.png b/android/docs/help/android_images/settings2-at.png similarity index 100% rename from android/help/android_images/settings2-at.png rename to android/docs/help/android_images/settings2-at.png diff --git a/android/help/android_images/settings3-ap.png b/android/docs/help/android_images/settings3-ap.png similarity index 100% rename from android/help/android_images/settings3-ap.png rename to android/docs/help/android_images/settings3-ap.png diff --git a/android/help/android_images/settings3-at.png b/android/docs/help/android_images/settings3-at.png similarity index 100% rename from android/help/android_images/settings3-at.png rename to android/docs/help/android_images/settings3-at.png diff --git a/android/help/android_images/settings4-ap.png b/android/docs/help/android_images/settings4-ap.png similarity index 100% rename from android/help/android_images/settings4-ap.png rename to android/docs/help/android_images/settings4-ap.png diff --git a/android/help/android_images/settings4-at.png b/android/docs/help/android_images/settings4-at.png similarity index 100% rename from android/help/android_images/settings4-at.png rename to android/docs/help/android_images/settings4-at.png diff --git a/android/help/android_images/settings5-ap.png b/android/docs/help/android_images/settings5-ap.png similarity index 100% rename from android/help/android_images/settings5-ap.png rename to android/docs/help/android_images/settings5-ap.png diff --git a/android/help/android_images/settings5-at.png b/android/docs/help/android_images/settings5-at.png similarity index 100% rename from android/help/android_images/settings5-at.png rename to android/docs/help/android_images/settings5-at.png diff --git a/android/help/android_images/settings6-ap.png b/android/docs/help/android_images/settings6-ap.png similarity index 100% rename from android/help/android_images/settings6-ap.png rename to android/docs/help/android_images/settings6-ap.png diff --git a/android/help/android_images/settings6-at.png b/android/docs/help/android_images/settings6-at.png similarity index 100% rename from android/help/android_images/settings6-at.png rename to android/docs/help/android_images/settings6-at.png diff --git a/android/help/android_images/settings7-ap.png b/android/docs/help/android_images/settings7-ap.png similarity index 100% rename from android/help/android_images/settings7-ap.png rename to android/docs/help/android_images/settings7-ap.png diff --git a/android/help/android_images/settings7-at.png b/android/docs/help/android_images/settings7-at.png similarity index 100% rename from android/help/android_images/settings7-at.png rename to android/docs/help/android_images/settings7-at.png diff --git a/android/help/android_images/share-a.png b/android/docs/help/android_images/share-a.png similarity index 100% rename from android/help/android_images/share-a.png rename to android/docs/help/android_images/share-a.png diff --git a/android/help/android_images/shift-ap.png b/android/docs/help/android_images/shift-ap.png similarity index 100% rename from android/help/android_images/shift-ap.png rename to android/docs/help/android_images/shift-ap.png diff --git a/android/help/android_images/shift-at.png b/android/docs/help/android_images/shift-at.png similarity index 100% rename from android/help/android_images/shift-at.png rename to android/docs/help/android_images/shift-at.png diff --git a/android/help/android_images/spacebar-caption-ap.png b/android/docs/help/android_images/spacebar-caption-ap.png similarity index 100% rename from android/help/android_images/spacebar-caption-ap.png rename to android/docs/help/android_images/spacebar-caption-ap.png diff --git a/android/help/android_images/themed-banner.png b/android/docs/help/android_images/themed-banner.png similarity index 100% rename from android/help/android_images/themed-banner.png rename to android/docs/help/android_images/themed-banner.png diff --git a/android/help/android_images/touch-hold-ap.png b/android/docs/help/android_images/touch-hold-ap.png similarity index 100% rename from android/help/android_images/touch-hold-ap.png rename to android/docs/help/android_images/touch-hold-ap.png diff --git a/android/help/android_images/touch-hold-at.png b/android/docs/help/android_images/touch-hold-at.png similarity index 100% rename from android/help/android_images/touch-hold-at.png rename to android/docs/help/android_images/touch-hold-at.png diff --git a/android/help/android_images/uninstall-dictionary-notification-ap.png b/android/docs/help/android_images/uninstall-dictionary-notification-ap.png similarity index 100% rename from android/help/android_images/uninstall-dictionary-notification-ap.png rename to android/docs/help/android_images/uninstall-dictionary-notification-ap.png diff --git a/android/help/android_images/uninstall-notification-ap.png b/android/docs/help/android_images/uninstall-notification-ap.png similarity index 100% rename from android/help/android_images/uninstall-notification-ap.png rename to android/docs/help/android_images/uninstall-notification-ap.png diff --git a/android/help/android_images/uninstall-notification-at.png b/android/docs/help/android_images/uninstall-notification-at.png similarity index 100% rename from android/help/android_images/uninstall-notification-at.png rename to android/docs/help/android_images/uninstall-notification-at.png diff --git a/android/help/android_images/video.png b/android/docs/help/android_images/video.png similarity index 100% rename from android/help/android_images/video.png rename to android/docs/help/android_images/video.png diff --git a/android/help/basic/config/adjust-keyboard-height.md b/android/docs/help/basic/config/adjust-keyboard-height.md similarity index 100% rename from android/help/basic/config/adjust-keyboard-height.md rename to android/docs/help/basic/config/adjust-keyboard-height.md diff --git a/android/docs/help/basic/config/adjust-longpress-delay.md b/android/docs/help/basic/config/adjust-longpress-delay.md new file mode 100644 index 00000000000..0f3e740bdfc --- /dev/null +++ b/android/docs/help/basic/config/adjust-longpress-delay.md @@ -0,0 +1,13 @@ +--- +title: Adjust Longpress Delay - Keyman for Android Help +--- + +## Adjust Longpress Delay + +This menu is used to adjust the duration for triggering a longpress gesture. + +Drag the slider to set the delay between 0.3 seconds to 1.5 seconds. + +The default value is 0.5 seconds. + +![](../../android_images/longpress-slider.png) diff --git a/android/help/basic/config/index.md b/android/docs/help/basic/config/index.md similarity index 90% rename from android/help/basic/config/index.md rename to android/docs/help/basic/config/index.md index 1c45d27508e..96a3fb5e35c 100644 --- a/android/help/basic/config/index.md +++ b/android/docs/help/basic/config/index.md @@ -44,17 +44,17 @@ Click on this to bring up the Android system configuration for setting Keyman as Click on this to [adjust the keyboard height](adjust-keyboard-height). +## Adjust longpress delay +![](../../android_images/ic_timelapse.png) + +Click on this to [adjust the delay time](adjust-longpress-delay) for a longpress gesture. + ## Spacebar Caption Click on this to [change the displayed keyboard name](spacebar-caption) on the spacebar. ## Vibrate When Typing When enabled, the Keyman keyboard will provide haptic feedback (vibrate) when the user presses a key and generates output. The default preference is off. -## Always show banner -This toggle is reserved for future features. When off, the text suggestion banner is only displayed when -the dictionary is enabled. The language associated with the keyboard must match the language associated with -the dictionary. - ## Show "Get Started" on startup When enabled, the Keyman app will display the 'Get Started' screen on app startup. diff --git a/android/help/basic/config/install-keyboard-or-dictionary.md b/android/docs/help/basic/config/install-keyboard-or-dictionary.md similarity index 100% rename from android/help/basic/config/install-keyboard-or-dictionary.md rename to android/docs/help/basic/config/install-keyboard-or-dictionary.md diff --git a/android/help/basic/config/spacebar-caption.md b/android/docs/help/basic/config/spacebar-caption.md similarity index 100% rename from android/help/basic/config/spacebar-caption.md rename to android/docs/help/basic/config/spacebar-caption.md diff --git a/android/help/basic/index.md b/android/docs/help/basic/index.md similarity index 100% rename from android/help/basic/index.md rename to android/docs/help/basic/index.md diff --git a/android/help/basic/installing-custom-packages.md b/android/docs/help/basic/installing-custom-packages.md similarity index 100% rename from android/help/basic/installing-custom-packages.md rename to android/docs/help/basic/installing-custom-packages.md diff --git a/android/help/basic/installing-dictionaries.md b/android/docs/help/basic/installing-dictionaries.md similarity index 100% rename from android/help/basic/installing-dictionaries.md rename to android/docs/help/basic/installing-dictionaries.md diff --git a/android/help/basic/switching-between-keyboards.md b/android/docs/help/basic/switching-between-keyboards.md similarity index 100% rename from android/help/basic/switching-between-keyboards.md rename to android/docs/help/basic/switching-between-keyboards.md diff --git a/android/help/basic/uninstalling-dictionaries.md b/android/docs/help/basic/uninstalling-dictionaries.md similarity index 100% rename from android/help/basic/uninstalling-dictionaries.md rename to android/docs/help/basic/uninstalling-dictionaries.md diff --git a/android/help/basic/uninstalling-keyboards.md b/android/docs/help/basic/uninstalling-keyboards.md similarity index 100% rename from android/help/basic/uninstalling-keyboards.md rename to android/docs/help/basic/uninstalling-keyboards.md diff --git a/android/help/basic/using-the-banner.md b/android/docs/help/basic/using-the-banner.md similarity index 100% rename from android/help/basic/using-the-banner.md rename to android/docs/help/basic/using-the-banner.md diff --git a/android/help/context/gestures.md b/android/docs/help/context/gestures.md similarity index 100% rename from android/help/context/gestures.md rename to android/docs/help/context/gestures.md diff --git a/android/help/context/index.md b/android/docs/help/context/index.md similarity index 100% rename from android/help/context/index.md rename to android/docs/help/context/index.md diff --git a/android/help/context/menu-phone.md b/android/docs/help/context/menu-phone.md similarity index 100% rename from android/help/context/menu-phone.md rename to android/docs/help/context/menu-phone.md diff --git a/android/help/context/menu-tablet.md b/android/docs/help/context/menu-tablet.md similarity index 100% rename from android/help/context/menu-tablet.md rename to android/docs/help/context/menu-tablet.md diff --git a/android/help/index.md b/android/docs/help/index.md similarity index 100% rename from android/help/index.md rename to android/docs/help/index.md diff --git a/android/help/start/enabling-system-keyboard.md b/android/docs/help/start/enabling-system-keyboard.md similarity index 100% rename from android/help/start/enabling-system-keyboard.md rename to android/docs/help/start/enabling-system-keyboard.md diff --git a/android/help/start/index.md b/android/docs/help/start/index.md similarity index 100% rename from android/help/start/index.md rename to android/docs/help/start/index.md diff --git a/android/help/start/installing-keyboards.md b/android/docs/help/start/installing-keyboards.md similarity index 100% rename from android/help/start/installing-keyboards.md rename to android/docs/help/start/installing-keyboards.md diff --git a/android/help/troubleshooting/grant-storage-permission.md b/android/docs/help/troubleshooting/grant-storage-permission.md similarity index 100% rename from android/help/troubleshooting/grant-storage-permission.md rename to android/docs/help/troubleshooting/grant-storage-permission.md diff --git a/android/help/troubleshooting/index.md b/android/docs/help/troubleshooting/index.md similarity index 100% rename from android/help/troubleshooting/index.md rename to android/docs/help/troubleshooting/index.md diff --git a/android/help/troubleshooting/integrating.md b/android/docs/help/troubleshooting/integrating.md similarity index 100% rename from android/help/troubleshooting/integrating.md rename to android/docs/help/troubleshooting/integrating.md diff --git a/android/help/troubleshooting/keyboard-help.md b/android/docs/help/troubleshooting/keyboard-help.md similarity index 100% rename from android/help/troubleshooting/keyboard-help.md rename to android/docs/help/troubleshooting/keyboard-help.md diff --git a/android/help/about/whatsnew.md b/android/help/about/whatsnew.md deleted file mode 100644 index 96bd458a0c0..00000000000 --- a/android/help/about/whatsnew.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: What's New ---- - -Here are some of the new features we have added to Keyman 18.0 for Android: diff --git a/android/help/android_images/settings-screen-ap.png b/android/help/android_images/settings-screen-ap.png deleted file mode 100644 index ec85e24e81e..00000000000 Binary files a/android/help/android_images/settings-screen-ap.png and /dev/null differ diff --git a/common/cpp/km_u16.cpp b/common/cpp/km_u16.cpp index 84a6c4a75e7..78077202fc4 100644 --- a/common/cpp/km_u16.cpp +++ b/common/cpp/km_u16.cpp @@ -5,6 +5,7 @@ */ #include +#include #include "utfcodec.hpp" #include "km_u16.h" @@ -387,3 +388,43 @@ double u16tof(KMX_WCHAR* str16) { std::string str = string_from_u16string(str16); return strtof(str.c_str(), &pEnd); } + +/** + * @brief Trim whitespace from the start (left) of a string + * @param p Pointer to u16string + * @return Pointer to the string modified to remove leading whitespace + */ +KMX_WCHAR* u16ltrim(KMX_WCHAR* p) { + if (p && (u16len(p) > 0)) { + PKMX_WCHAR q = p; + while(iswspace(*q)) q++; + u16cpy(p, q); + } + return p; +} + +/** + * @brief Trim whitespace from the end (right) of a string + * @param p Pointer to u16string + * @return Pointer to the string modified to remove trailing whitespace + */ +KMX_WCHAR* u16rtrim(KMX_WCHAR *p) { + if (p && (u16len(p) > 0)) { + PKMX_WCHAR q = p + u16len(p) - 1; + if (iswspace(*q)) { + while (iswspace(*q) && q > p) q--; + if (!iswspace(*q)) q++; + *q = '\0'; // delete first following whitespace + } + } + return p; +} + +/** + * @brief Trim whitespace from both the start and end of a string + * @param p Pointer to u16string + * @return Pointer to the string modified to remove leading and trailing whitespace + */ +KMX_WCHAR* u16trim(KMX_WCHAR *p) { + return u16rtrim(u16ltrim(p)); +} \ No newline at end of file diff --git a/common/include/km_u16.h b/common/include/km_u16.h index f0c2c2d16c1..91df6b0eb92 100644 --- a/common/include/km_u16.h +++ b/common/include/km_u16.h @@ -74,3 +74,12 @@ KMX_CHAR* strrchr_slash(KMX_CHAR* Name); const KMX_WCHAR* u16rchr_slash(KMX_WCHAR const* Name); std::string toHex(int num1); + +/** @brief Trim whitespace from the start (left) of a string */ +KMX_WCHAR* u16ltrim(KMX_WCHAR* p); + +/** @brief Trim whitespace from the end (right) of a string */ +KMX_WCHAR* u16rtrim(KMX_WCHAR *p); + +/** @brief Trim whitespace from both the start and end of a string */ +KMX_WCHAR* u16trim(KMX_WCHAR *p); diff --git a/common/models/tsconfig.kmw-worker-base.json b/common/models/tsconfig.kmw-worker-base.json deleted file mode 100644 index 0b581af1be3..00000000000 --- a/common/models/tsconfig.kmw-worker-base.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../web/tsconfig.base.json", - - "compilerOptions": { - // To help better support legacy Android devices - "downlevelIteration": true, - // Facilitates & simplifies stitching together the worker sourcemaps during the polyfill-concatenation step. - "inlineSourceMap": true, - // May not be set at the same time as the prior setting. - "sourceMap": false - } -} diff --git a/common/models/types/.build-builder b/common/models/types/.build-builder deleted file mode 100644 index 6db097fddbb..00000000000 --- a/common/models/types/.build-builder +++ /dev/null @@ -1 +0,0 @@ -The presence of this file tells CI to use the new builder_ style parameters for build.sh. \ No newline at end of file diff --git a/common/models/types/.gitignore b/common/models/types/.gitignore deleted file mode 100644 index e113ad0abd6..00000000000 --- a/common/models/types/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Specifically here: -test.js - -node_modules/ -build/ diff --git a/common/models/types/README.md b/common/models/types/README.md deleted file mode 100644 index 3d7dbf7d595..00000000000 --- a/common/models/types/README.md +++ /dev/null @@ -1,68 +0,0 @@ -`@keymanapp/models-types` -========================= - -Declares TypeScript types and interfaces required to define **Lexical -Models**, **Word breaking functions**, and all things in between. - -Install -------- - -> (see below if you are working in the keymanapp/keyman repo!) - - npm install --save-dev @keymanapp/models-types - -Usage ------ - -Say you are creating a **custom lexical model**. Then import this module -in your lexical model file! - -```Typescript -// my-nifty-model.ts - -import "@keymanapp/models-types"; - -export class MyNiftyClass implements LexicalModel { - configure(capabilities: Capabilities): Configuration { - // TODO: implement me! - throw new Error("Method not implemented."); - } - predict(transform: Transform, context: Context): ProbabilityMass[] { - // TODO: implement me! - throw new Error("Method not implemented."); - } - wordbreak(context: Context): string { - // TODO: implement me! - throw new Error("Method not implemented."); - } - punctuation?: LexicalModelPunctuation; -} -``` - -If your are creating a **custom word breaker**, you would do the same: - -```typescript -import "@keymanapp/models-types"; - -export let myShinyWordBreaker: WordBreakingFunction; -myShinyWordBreaker = function (phrase: string): Span[] { - // TODO: implement me! - throw new Error("Function not implemented") -} -``` - -Look at [index.d.ts](./index.d.ts) for documentation on each and every -type! - - -Usage within keymanapp/keyman repo ----------------------------------- - -To use it in other subprojects within keymanapp/keyman, ensure that this package -is linked using `"*"`. Add this dependency to your subproject like so: - -```json - "dependencies": { - "@keymanapp/models-types": "*", - } -``` diff --git a/common/models/types/build.sh b/common/models/types/build.sh deleted file mode 100755 index 25bf4515c43..00000000000 --- a/common/models/types/build.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -# -# Packages the @keymanapp/models-types package. -# -## START STANDARD BUILD SCRIPT INCLUDE -# adjust relative paths as necessary -THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" -## END STANDARD BUILD SCRIPT INCLUDE - -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" -. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh" - -builder_describe "Keyman model types package" \ - "clean" \ - "configure" \ - "build" \ - "test" \ - "publish publish to npm" \ - "--npm-publish+ For publish, do a npm publish, not npm pack (only for CI)" \ - "--dry-run,-n don't actually publish, just dry run" - -builder_describe_outputs \ - configure /node_modules \ - build /common/models/types/build/common/models/types/tsconfig.tsbuildinfo - -builder_parse "$@" - -#------------------------------------------------------------------------------------------------------------------- - -builder_run_action clean rm -rf ./build/ -builder_run_action configure verify_npm_setup -builder_run_action build tsc --build -builder_run_action test tsc test.ts -lib es6 -builder_run_action publish builder_publish_npm diff --git a/common/models/types/package.json b/common/models/types/package.json deleted file mode 100644 index a9f68f4ea1e..00000000000 --- a/common/models/types/package.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "@keymanapp/models-types", - "description": "Type definitions in used in the modeling (lexical model/predictive text) component of Keyman.", - "types": "./index.d.ts", - "scripts": { - "test": "tsc test.ts -lib es6" - }, - "repository": { - "type": "git", - "url": "https://github.com/keymanapp/keyman" - }, - "keywords": [ - "lmlayer", - "keyman", - "predictive", - "text", - "types", - "typing", - "typescript" - ], - "author": "Marc Durdin (https://github.com/mcdurdin)", - "contributors": [ - "Eddie Antonio Santos (https://github.com/eddieantonio)", - "Joshua Horton" - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/keymanapp/keyman/issues" - }, - "homepage": "https://github.com/keymanapp/keyman/tree/master/common/models/types#readme", - "devDependencies": { - "typescript": "^5.4.5" - }, - "files": [ - "README.md", - "index.d.ts" - ] -} diff --git a/common/models/types/tsconfig.json b/common/models/types/tsconfig.json deleted file mode 100644 index ddd1c5b196a..00000000000 --- a/common/models/types/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.kmw-worker-base.json", - "compilerOptions": { - "declaration": true, - "outDir": "build/", - }, - "include": ["./*.ts"], - "exclude": ["test.ts"] -} diff --git a/common/web/eslint/eslintNoNodeImports.js b/common/tools/eslint/eslintNoNodeImports.js similarity index 100% rename from common/web/eslint/eslintNoNodeImports.js rename to common/tools/eslint/eslintNoNodeImports.js diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh index c1e2338e9d8..073b008bf2e 100755 --- a/common/tools/hextobin/build.sh +++ b/common/tools/hextobin/build.sh @@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" builder_describe "Build hextobin" clean configure build builder_describe_outputs \ - configure /node_modules \ + configure /common/tools/hextobin/.configured \ build /common/tools/hextobin/build/index.js builder_parse "$@" diff --git a/common/tools/hextobin/package.json b/common/tools/hextobin/package.json index fb651481f7a..708dace5028 100644 --- a/common/tools/hextobin/package.json +++ b/common/tools/hextobin/package.json @@ -15,5 +15,8 @@ "main": "build/index.js", "bin": { "hextobin": "build/hextobin.js" + }, + "scripts": { + "postinstall": "echo configured > .configured" } } diff --git a/common/web/build.sh b/common/web/build.sh index fbc015613fd..798db3b231f 100755 --- a/common/web/build.sh +++ b/common/web/build.sh @@ -8,15 +8,9 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" . "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE -# -# TODO: future modules may include -# :sentry-manager \ -# - builder_describe "Keyman common web modules" \ :keyman-version \ :types \ - :utils \ clean \ configure \ build \ diff --git a/common/web/tsconfig.kmw-main-base.json b/common/web/tsconfig.kmw-main-base.json deleted file mode 100644 index 0ed8703e5e2..00000000000 --- a/common/web/tsconfig.kmw-main-base.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "../../web/tsconfig.base.json" -} diff --git a/common/web/types/.eslintrc.cjs b/common/web/types/.eslintrc.cjs index 98db7f812e5..b28ba0941b1 100644 --- a/common/web/types/.eslintrc.cjs +++ b/common/web/types/.eslintrc.cjs @@ -14,7 +14,7 @@ module.exports = { overrides: [ { files: "src/**/*.ts", - extends: ["../../../common/web/eslint/eslintNoNodeImports.js"], + extends: ["../../../common/tools/eslint/eslintNoNodeImports.js"], }, ], rules: { diff --git a/common/web/types/package.json b/common/web/types/package.json index 20f84bc1409..1ba487aafdf 100644 --- a/common/web/types/package.json +++ b/common/web/types/package.json @@ -8,9 +8,11 @@ "unicode" ], "type": "module", + "types": "./build/src/main.d.ts", "exports": { ".": { "es6-bundling": "./src/main.ts", + "types": "./build/src/main.d.ts", "default": "./build/src/main.js" } }, @@ -68,6 +70,7 @@ "src/kmx/kmx-plus.ts", "src/kmx/kmx-builder.ts", "src/kmx/element-string.ts", + "src/lexical-model-types.ts", "src/kmx/string-list.ts", "src/ldml-keyboard/ldml-keyboard-testdata-xml.ts", "src/ldml-keyboard/unicodeset-parser-api.ts", diff --git a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts b/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts index 786d9213e2b..e24fd295c84 100644 --- a/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts +++ b/common/web/types/src/keyman-touch-layout/keyman-touch-layout-file.ts @@ -7,6 +7,11 @@ // writing // +/** + * On screen keyboard description consisting of specific layouts for tablet, phone, + * and desktop. Despite its name, this format is used for both touch layouts and + * hardware-style layouts. + */ export interface TouchLayoutFile { tablet?: TouchLayoutPlatform; phone?: TouchLayoutPlatform; @@ -17,6 +22,7 @@ export type TouchLayoutFont = string; export type TouchLayoutFontSize = string; export type TouchLayoutDefaultHint = "none"|"dot"|"longpress"|"multitap"|"flick"|"flick-n"|"flick-ne"|"flick-e"|"flick-se"|"flick-s"|"flick-sw"|"flick-w"|"flick-nw"; +/** touch layout specification for a specific platform like phone or tablet */ export interface TouchLayoutPlatform { font?: TouchLayoutFont; fontsize?: TouchLayoutFontSize; @@ -27,6 +33,7 @@ export interface TouchLayoutPlatform { export type TouchLayoutLayerId = string; // pattern = /^[a-zA-Z0-9_-]+$/ +/** a layer with rows of keys on a touch layout */ export interface TouchLayoutLayer { id: TouchLayoutLayerId; row: TouchLayoutRow[]; @@ -34,6 +41,7 @@ export interface TouchLayoutLayer { export type TouchLayoutRowId = number; +/** a row of keys on a touch layout */ export interface TouchLayoutRow { id: TouchLayoutRowId; key: TouchLayoutKey[]; @@ -62,22 +70,40 @@ export const PRIVATE_USE_IDS = [ * * Make sure that when one is updated, the other also is. TS types are compile-time only, * so the run-time-accessible mapping in activeLayout.ts cannot be auto-generated by TS. */ +/** defines a key on a touch layout */ export interface TouchLayoutKey { + /** key id: used to find key in VKDictionary, or a standard key from the K_ enumeration */ id?: TouchLayoutKeyId; + /** text to display on key cap */ text?: string; + /** + * the modifier combination (not layer) that should be used in key events, + * for this key, overriding the layer that the key is a part of. + */ layer?: TouchLayoutLayerId; + /** the next layer to switch to after this key is pressed */ nextlayer?: TouchLayoutLayerId; + /** font */ font?: TouchLayoutFont; + /** fontsize */ fontsize?: TouchLayoutFontSize; + /** the type of key */ sp?: TouchLayoutKeySp; + /** padding */ pad?: TouchLayoutKeyPad; + /** width of the key */ width?: TouchLayoutKeyWidth; + /** longpress keys, also known as subkeys */ sk?: TouchLayoutSubKey[]; + /** flicks */ flick?: TouchLayoutFlick; + /** multitaps */ multitap?: TouchLayoutSubKey[]; + /** hint e.g. for longpress */ hint?: string; }; +/** key type like regular key, framekeys, deadkeys, blank, etc. */ export const enum TouchLayoutKeySp { normal=0, /** A 'frame' key, such as Shift or Enter, which is styled accordingly; uses @@ -102,29 +128,54 @@ export const enum TouchLayoutKeySp { spacer=10 }; +/** padding for a key */ export type TouchLayoutKeyPad = number; // 0-100000 +/** width of a key */ export type TouchLayoutKeyWidth = number; // 0-100000 +/** defines a subkey */ export interface TouchLayoutSubKey { + /** key id: used to find key in VKDictionary, or a standard key from the K_ enumeration */ id: TouchLayoutKeyId; + /** text to display on key cap */ text?: string; + /** + * the modifier combination (not layer) that should be used in key events, + * for this key, overriding the layer that the key is a part of. + */ layer?: TouchLayoutLayerId; + /** the next layer to switch to after this key is pressed */ nextlayer?: TouchLayoutLayerId; + /** font */ font?: TouchLayoutFont; + /** fontsize */ fontsize?: TouchLayoutFontSize; + /** the type of key */ sp?: TouchLayoutKeySp; + /** padding */ pad?: TouchLayoutKeyPad; + /** width of the key */ width?: TouchLayoutKeyWidth; + /** use this subkey if no other selected */ default?: boolean; // Only used for longpress currently }; +/** defines all possible flicks for a key */ export interface TouchLayoutFlick { + /** flick up (north) */ n?: TouchLayoutSubKey; + /** flick down (south) */ s?: TouchLayoutSubKey; + /** flick right (east) */ e?: TouchLayoutSubKey; + /** flick left (west) */ w?: TouchLayoutSubKey; + /** flick up-right (north-east) */ ne?: TouchLayoutSubKey; + /** flick up-left (north-west) */ nw?: TouchLayoutSubKey; + /** flick down-right (south-east) */ se?: TouchLayoutSubKey; + /** flick down-left (south-west) */ sw?: TouchLayoutSubKey; }; diff --git a/common/web/types/src/kmx/kmx-plus/element-string.ts b/common/web/types/src/kmx/kmx-plus/element-string.ts index c7597b4f6ba..b389107ccee 100644 --- a/common/web/types/src/kmx/kmx-plus/element-string.ts +++ b/common/web/types/src/kmx/kmx-plus/element-string.ts @@ -1,7 +1,7 @@ import { constants } from '@keymanapp/ldml-keyboard-constants'; import { DependencySections, StrsItem, UsetItem } from './kmx-plus.js'; import { ElementParser, ElementSegment, ElementType } from '../../ldml-keyboard/pattern-parser.js'; -import { util } from '@keymanapp/common-types'; +import * as util from '../../util/util.js'; import MATCH_HEX_ESCAPE = util.MATCH_HEX_ESCAPE; import unescapeOneQuadString = util.unescapeOneQuadString; diff --git a/common/web/types/src/kmx/kmx-plus/kmx-plus.ts b/common/web/types/src/kmx/kmx-plus/kmx-plus.ts index 1d19cdd4d01..0cb49e527c7 100644 --- a/common/web/types/src/kmx/kmx-plus/kmx-plus.ts +++ b/common/web/types/src/kmx/kmx-plus/kmx-plus.ts @@ -2,8 +2,8 @@ import { constants } from '@keymanapp/ldml-keyboard-constants'; import * as r from 'restructure'; import { ElementString } from './element-string.js'; import { ListItem } from '../../ldml-keyboard/string-list.js'; -import { util } from '@keymanapp/common-types'; -import { KMX } from '@keymanapp/common-types'; +import * as util from '../../util/util.js'; +import * as KMX from '../kmx.js'; import { UnicodeSetParser, UnicodeSet } from '../../ldml-keyboard/unicodeset-parser-api.js'; import { VariableParser } from '../../ldml-keyboard/pattern-parser.js'; import { MarkerParser } from '../../ldml-keyboard/pattern-parser.js'; @@ -291,7 +291,7 @@ export class Vars extends Section { }); } findStringVariableValue(id: string): string { - return Vars.findVariable(this.strings, id)?.value?.value; // Unwrap: Variable, StrsItem + return Vars.findVariable(this.strings, id)?.value?.value ?? null; // Unwrap: Variable, StrsItem } substituteSetRegex(str: string, sections: DependencySections): string { return str.replaceAll(VariableParser.SET_REFERENCE, (_entire, id) => { diff --git a/common/models/types/index.d.ts b/common/web/types/src/lexical-model-types.ts similarity index 96% rename from common/models/types/index.d.ts rename to common/web/types/src/lexical-model-types.ts index 0d6223bc64a..7c5cfdf643f 100644 --- a/common/models/types/index.d.ts +++ b/common/web/types/src/lexical-model-types.ts @@ -15,14 +15,14 @@ * * See also: https://developer.mozilla.org/en-US/docs/Web/API/USVString */ -declare type USVString = string; +export type USVString = string; -declare type CasingForm = 'lower' | 'initial' | 'upper'; +export type CasingForm = 'lower' | 'initial' | 'upper'; /** * Represents one lexical entry and its probability.. */ -type TextWithProbability = { +export type TextWithProbability = { /** * A lexical entry (word) offered by the model. * @@ -42,7 +42,7 @@ type TextWithProbability = { * Used to facilitate edit-distance calculations by allowing the LMLayer to * efficiently search the model's lexicon in a Trie-like manner. */ -declare interface LexiconTraversal { +export interface LexiconTraversal { /** * Provides an iterable pattern used to search for words with a 'keyed' prefix matching * the current traversal state's prefix when a new character is appended. Iterating @@ -116,7 +116,7 @@ declare interface LexiconTraversal { /** * The model implementation, within the Worker. */ -declare interface LexicalModel { +export interface LexicalModel { /** * Processes `config` messages, configuring the newly-loaded model based on the host * platform's capability restrictions. @@ -263,7 +263,7 @@ declare interface LexicalModel { * first, you delete the specified amount amount from the left * and right, then you insert the provided text. */ -declare interface Transform { +export interface Transform { /** * Facilitates use of unique identifiers for tracking the Transform and * any related data from its original source, as the reference cannot be @@ -298,7 +298,7 @@ declare interface Transform { /** * A concrete suggestion */ -declare interface Suggestion { +export interface Suggestion { /** * Indicates the externally-supplied id of the Transform that prompted * the Suggestion. Automatically handled by the LMLayer; models should @@ -341,11 +341,11 @@ declare interface Suggestion { autoAccept?: boolean } -interface Reversion extends Suggestion { +export interface Reversion extends Suggestion { tag: 'revert'; } -interface Keep extends Suggestion { +export interface Keep extends Suggestion { tag: 'keep'; /** @@ -368,12 +368,12 @@ interface Keep extends Suggestion { * * If left undefined, the consumers will assume this is a prediction. */ -type SuggestionTag = undefined | 'keep' | 'revert' | 'correction' | 'emoji'; +export type SuggestionTag = undefined | 'keep' | 'revert' | 'correction' | 'emoji'; /** * The text and environment surrounding the insertion point (text cursor). */ -declare interface Context { +export interface Context { /** * Up to maxLeftContextCodeUnits code units of Unicode scalar value * (i. e., characters) to the left of the insertion point in the @@ -413,7 +413,7 @@ declare interface Context { * from ambiguous text sequences. Designed for use with fat-finger correction * and similar typing ambiguities. */ -interface ProbabilityMass { +export interface ProbabilityMass { /** * An individual sample from a Distribution over the same type. */ @@ -426,12 +426,12 @@ interface ProbabilityMass { p: number; } -declare type Distribution = ProbabilityMass[]; +export type Distribution = ProbabilityMass[]; /** * A type augmented with an optional probability. */ -type Outcome = T & { +export type Outcome = T & { /** * [optional] probability of this outcome. */ @@ -441,7 +441,7 @@ type Outcome = T & { /** * A type augmented with a probability. */ -type WithOutcome = T & { +export type WithOutcome = T & { /** * Probability of this outcome. */ @@ -458,7 +458,7 @@ type WithOutcome = T & { * prediction, as well as what operations the keyboard is allowed to do on the * underlying buffer. */ -declare interface Capabilities { +export interface Capabilities { /** * The maximum amount of UTF-16 code points that the keyboard will provide to * the left of the cursor, as an integer. @@ -482,7 +482,7 @@ declare interface Capabilities { /** * Configuration of the LMLayer, sent back to the keyboard. */ -declare interface Configuration { +export interface Configuration { /** * How many UTF-16 code units maximum to send as the context to the * left of the cursor ("left" in the Unicode character stream). @@ -538,14 +538,14 @@ declare interface Configuration { * @returns an array of spans from the phrase, in order as they appear in the * phrase, each span which representing a word. */ -declare interface WordBreakingFunction { +export interface WordBreakingFunction { // invariant: span[i].end <= span[i + 1].start // invariant: for all span[i] and span[i + 1], there does not exist a span[k] // where span[i].end <= span[k].start AND span[k].end <= span[i + 1].start (phrase: string): Span[]; } -declare interface CasingFunction { +export interface CasingFunction { (caseToApply: CasingForm, text: string, defaultApplyCasing?: CasingFunction): string; } @@ -553,7 +553,7 @@ declare interface CasingFunction { * A span of text in a phrase. This is usually meant to represent words from a * pharse. */ -declare interface Span { +export interface Span { // invariant: start < end (empty spans not allowed) readonly start: number; // invariant: end > end (empty spans not allowed) @@ -572,7 +572,7 @@ declare interface Span { /** * Options for various punctuation to use in suggestions. */ -interface LexicalModelPunctuation { +export interface LexicalModelPunctuation { /** * The quotes that appear in "keep" suggestions, e.g., keep what the user * typed verbatim. diff --git a/common/web/types/src/main.ts b/common/web/types/src/main.ts index 7e0dc2f7b22..df21b0fed35 100644 --- a/common/web/types/src/main.ts +++ b/common/web/types/src/main.ts @@ -29,3 +29,5 @@ export * as KMXPlus from './kmx/kmx-plus/kmx-plus.js'; export { UnicodeSetParser, UnicodeSet } from './ldml-keyboard/unicodeset-parser-api.js'; export { VariableParser, MarkerParser } from './ldml-keyboard/pattern-parser.js'; export { ElementString } from './kmx/kmx-plus/element-string.js'; + +export { USVString, CasingForm, CasingFunction, TextWithProbability, LexiconTraversal, LexicalModel, LexicalModelPunctuation, Transform, Suggestion, Reversion, Keep, SuggestionTag, Context, Distribution, Outcome, WithOutcome, ProbabilityMass, Configuration, Capabilities, WordBreakingFunction, Span } from './lexical-model-types.js'; diff --git a/common/models/types/test.ts b/common/web/types/test/lexical-model-types.tests.ts similarity index 54% rename from common/models/types/test.ts rename to common/web/types/test/lexical-model-types.tests.ts index a3607418091..8944342ed6e 100644 --- a/common/models/types/test.ts +++ b/common/web/types/test/lexical-model-types.tests.ts @@ -1,12 +1,12 @@ -/// - /** * This file "tests" the exports from the main module. - * + * * Since the exports are all types, the "test" here is that the type can be * imported and compiled without any compiler errors. */ +import { USVString, Transform, Suggestion, SuggestionTag, Context, Capabilities, Configuration, Distribution, WordBreakingFunction, Span, LexicalModelPunctuation, ElementString, KMXPlus } from '@keymanapp/common-types'; + export let u: USVString; export let l: Transform export let s: Suggestion; @@ -17,4 +17,9 @@ export let conf: Configuration; export let d: Distribution; export let wbf: WordBreakingFunction; export let sp: Span; -export let lmp: LexicalModelPunctuation; \ No newline at end of file +export let lmp: LexicalModelPunctuation; + + +// try some of the other types - that should still work +export let elemString: ElementString; +export let section: KMXPlus.Section; diff --git a/common/web/types/test/tsconfig.json b/common/web/types/test/tsconfig.json index b034236bd75..9678c49945f 100644 --- a/common/web/types/test/tsconfig.json +++ b/common/web/types/test/tsconfig.json @@ -11,11 +11,12 @@ }, "include": [ "**/test-*.ts", + "**/*.tests.ts", "./helpers/*.ts", ], "references": [ { "path": "../../keyman-version" }, { "path": "../../../../core/include/ldml/"}, { "path": "../" }, - ] + ], } diff --git a/common/windows/cpp/include/registry.h b/common/windows/cpp/include/registry.h index 67cdfc2f69e..2627d06522f 100644 --- a/common/windows/cpp/include/registry.h +++ b/common/windows/cpp/include/registry.h @@ -110,6 +110,10 @@ #define REGSZ_KeyboardHotkeysAreToggle "hotkeys are toggles" #define REGSZ_DeadkeyConversionMode "deadkey conversion mode" // CU // I4552 #define REGSZ_ZapVirtualKeyCode "zap virtual key code" // LM, defaults to 0x0E (_VK_PREFIX_DEFAULT) +/* Default is to only use left modifier in hotkeys trigger */ +#define REGSZ_AllowRightModifierHotKey "allow right modifier for hotkey" + + /* Debug flags These are all stored in HKCU\Software\Keyman\Debug @@ -121,13 +125,7 @@ #define REGSZ_Flag_ShouldSerializeInput "Flag_ShouldSerializeInput" -/* REGSZ_Keyman_Debug DWORD: Use old non-chiral Win32 API RegisterHotkey instead of left-only hotkeys */ - -#define REGSZ_Flag_UseRegisterHotkey "Flag_UseRegisterHotkey" - -/* REGSZ_Flag_UseCachedHotkeyModifierState DWORD: Use old cached modifier state when checking hotkeys; ignores UseRegisterHotkey if FALSE */ -#define REGSZ_Flag_UseCachedHotkeyModifierState "Flag_UseCachedHotkeyModifierState" /* DWORD: Enable/disable deep TSF integration, default enabled; 0 = disabled, 1 = enabled, 2 = default */ diff --git a/common/windows/delphi/general/RegistryKeys.pas b/common/windows/delphi/general/RegistryKeys.pas index 47e7df754a0..e351b3860ff 100644 --- a/common/windows/delphi/general/RegistryKeys.pas +++ b/common/windows/delphi/general/RegistryKeys.pas @@ -113,10 +113,11 @@ interface SRegValue_ShowWelcome = 'show welcome'; // CU SRegValue_UseAdvancedInstall = 'use advanced install'; // CU - SRegValue_AltGrCtrlAlt = 'simulate altgr'; // CU - SRegValue_KeyboardHotKeysAreToggle = 'hotkeys are toggles'; // CU + SRegValue_AltGrCtrlAlt = 'simulate altgr'; // CU + SRegValue_KeyboardHotKeysAreToggle = 'hotkeys are toggles'; // CU + SRegValue_AllowRightModifierHotKey = 'allow right modifier for hotkey'; // CU SRegValue_ReleaseShiftKeysAfterKeyPress = 'release shift keys after key press'; // CU - SRegValue_TestKeymanFunctioning = 'test keyman functioning'; // CU, default true + SRegValue_TestKeymanFunctioning = 'test keyman functioning'; // CU, default true SRegValue_CreateStartMenuAsSubfolders = 'create start menu as subfolders'; // CU SRegValue_CreateUninstallEntries = 'create uninstall entries'; // CU @@ -379,8 +380,6 @@ interface SRegKey_KeymanEngineDebug_CU = SRegKey_KeymanEngineRoot_CU + '\Debug'; - SRegValue_Flag_UseRegisterHotkey = 'Flag_UseRegisterHotkey'; - SRegValue_Flag_UseCachedHotkeyModifierState = 'Flag_UseCachedHotkeyModifierState'; SRegValue_Flag_ShouldSerializeInput = 'Flag_ShouldSerializeInput'; SRegValue_Flag_UseAutoStartTask = 'Flag_UseAutoStartTask'; SRegValue_Flag_SyncLanguagesToCloud = 'Flag_SyncLanguagesToCloud'; diff --git a/core/src/layout.hpp b/core/src/layout.hpp new file mode 100644 index 00000000000..2e3d2833b4a --- /dev/null +++ b/core/src/layout.hpp @@ -0,0 +1,185 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Keyman Keyboard Processor API - On-Screen Keyboard Layout Interfaces + */ + +#pragma once + +#include +#include +#include + +#include "keyman_core_api.h" + +#if defined(__cplusplus) +extern "C" { +#endif + +/** + * Possible directions of a flick + */ +enum keyboard_layout_flick_direction { + /** flick up (north) */ + n = 0, + /** flick down (south) */ + s = 1, + /** flick right (east) */ + e = 2, + /** flick left (west) */ + w = 3, + /** flick up-right (north-east) */ + ne = 4, + /** flick up-left (north-west) */ + nw = 5, + /** flick down-right (south-east) */ + se = 6, + /** flick down-left (south-west) */ + sw = 7 +}; + +/** + * key type like regular key, framekeys, deadkeys, blank, etc. + */ +enum keyboard_layout_key_type { + /** regular key */ + normal = 0, + /** A 'frame' key, such as Shift or Enter */ + special = 1, + /** A 'frame' key, such as Shift or Enter, which is is active, such as + * the shift key on a shift layer */ + specialActive = 2, + /** **KeymanWeb runtime private use:** a variant of `special` with the + * keyboard font rather than 'KeymanwebOsk' font */ + customSpecial = 3, + /** **KeymanWeb runtime private use:** a variant of `specialActive` with the + * keyboard font rather than 'KeymanwebOsk' font. */ + customSpecialActive = 4, + /** A deadkey */ + deadkey = 8, + /** A key which is rendered as a blank keycap, should block any interaction */ + blank = 9, + /** Renders the key only as a gap or spacer, should block any interaction */ + spacer = 10 +}; + +/** + * A key on a touch layout/on-screen keyboard + */ +struct keyboard_layout_key { + /** key id */ + std::u16string id; // TODO-WEB-CORE: perhaps necessary for special keys, Enter, etc? or can we get that from virtualKey? + /** the virtual key code */ + int virtualKey; // TODO-WEB-CORE: do we need this? both id and virtualKey? Or just one of them? + /** text to display on key cap */ + std::u16string display; + /** hint e.g. for longpress */ + std::u16string hint; + /** the type of key */ + keyboard_layout_key_type type; + + /** + * the modifier combination (not layer) that should be used in key events, + * for this key, overriding the layer that the key is a part of. + */ + int modifiersOverride; + /** the next layer to switch to after this key is pressed */ + std::u16string nextLayerId; + + // touch layouts only + + /** padding - space to the left of key (in what units?) */ + int gap; + /** width of the key (in what units?) */ + int width; + + /** longpress keys, also known as subkeys */ + std::vector longpresses; + /** multitaps */ + std::vector multiTaps; + /** flicks */ + std::map flicks; +}; + +/** + * a row of keys on a touch layout/on-screen keyboard + */ +struct keyboard_layout_row { + /** row id */ + int id; // TODO-WEB-CORE: do we need this? Web has it (`TouchLayoutRow`) + /** keys in this row */ + std::vector keys; +}; + +/** + * a layer with rows of keys on a touch layout/on-screen keyboard + */ +struct keyboard_layout_layer { + /** layer id */ + std::u16string id; + /** layer modifiers */ + // TODO-WEB-CORE: we added this during our discussion, but Web doesn't have it. + // Should be an enum if it's needed. + int modifiers; //? 0 = default, n = shift, etc. -1 = unspecified? + /** rows in this layer */ + std::vector rows; +}; + +/** + * layout specification for a specific platform like desktop, phone or tablet + */ +struct keyboard_layout_platform { + /** platform form factor, e.g. 'iso', 'touch', 'ansi', ... (see ldml spec) */ + std::u16string form; + /** width of screen for touch layout */ + int minWidthMm; // we don't have mobile vs tablet, instead use this + /** layers for this platform */ + std::vector layers; + + // TODO-WEB-CORE: Do we need these: + // Web additionally has: + // - font (should be in CSS; we have it in `keyboard_layout`) + // - fontsize (should be in CSS; we have it in `keyboard_layout`) + // - displayUnderlying + // - defaultHint ("none"|"dot"|"longpress"|"multitap"|"flick"|"flick-n"|"flick-ne"| + // "flick-e"|"flick-se"|"flick-s"|"flick-sw"|"flick-w"|"flick-nw") +}; + +/** + * On screen keyboard description consisting of specific layouts for different + * form factors. + */ +struct keyboard_layout { + /** layouts for different form factors */ + std::vector platforms; + /** font face name to use for key caps*/ + std::string fontFacename; + /** font size to use for key caps */ + int fontSizeEm; // TODO-WEB-CORE: em? px? something else? +}; + + +/** + * Get the on-screen keyboard layout for the specified keyboard. + * + * @param keyboard [in] The keyboard to get the layout for. + * @param layout [out] The on-screen keyboard layout. + * @return km_core_status `KM_CORE_STATUS_OK`: On success. + * `KM_CORE_STATUS_INVALID_ARGUMENT`: If `keyboard` is not a valid keyboard or `layout` is null. + */ +km_core_status +keyboard_get_layout( + km_core_keyboard const* keyboard, + keyboard_layout** layout +); + + +/** + * Dispose the on-screen keyboard layout. + */ +void +keyboard_layout_dispose(keyboard_layout* layout); + +#if defined(__cplusplus) +} +#endif diff --git a/core/src/mock/mock_processor.cpp b/core/src/mock/mock_processor.cpp index 564465f5c4c..570553264d6 100644 --- a/core/src/mock/mock_processor.cpp +++ b/core/src/mock/mock_processor.cpp @@ -3,7 +3,7 @@ Description: This is a test implementation of the keyboard processor API to enable testing API clients against a basic keyboard and give them something to link against and load. - TODO: Add a mecahnism to trigger output of PERSIST_OPT & + TODO: Add a mechanism to trigger output of PERSIST_OPT & RESET_OPT actions items, options support and context matching. Create Date: 17 Oct 2018 Authors: Tim Eves (TSE) diff --git a/core/tests/unit/ldml/test_unicode.cpp b/core/tests/unit/ldml/test_unicode.cpp index b36f1a3e385..937125d1727 100644 --- a/core/tests/unit/ldml/test_unicode.cpp +++ b/core/tests/unit/ldml/test_unicode.cpp @@ -171,8 +171,9 @@ const std::string &block_unicode_ver) { // the cxx_icu can come from the Ubuntu environment, so do not depend on it // for now. + // TODO: Resolve with ICU4C 76 in #12398 //assert_basic_equal(node_icu_unicode_major, cxx_icu_unicode_major); - assert_basic_equal(node_icu_unicode_major, block_ver_major); + //assert_basic_equal(node_icu_unicode_major, block_ver_major); // seems less important if the C++ ICU verison matches the Node.js ICU version. //assert_basic_equal(cxx_icu_major, node_icu_major); diff --git a/developer/docs/api/etc/kmc-model.api.md b/developer/docs/api/etc/kmc-model.api.md index df76354c238..51ea5dffb8d 100644 --- a/developer/docs/api/etc/kmc-model.api.md +++ b/developer/docs/api/etc/kmc-model.api.md @@ -4,7 +4,7 @@ ```ts -/// +/// import { CompilerCallbacks } from '@keymanapp/common-types'; import { CompilerEvent } from '@keymanapp/common-types'; diff --git a/developer/docs/help/context/about-tike.md b/developer/docs/help/context/about-tike.md new file mode 100644 index 00000000000..550a5d7410f --- /dev/null +++ b/developer/docs/help/context/about-tike.md @@ -0,0 +1,8 @@ +--- +title: About Dialog +--- + +![About dialog](../images/ui/frmAboutTike.png) + +The About dialog displays copyright and registration information for +Keyman Developer, and has a link to the Keyman website. \ No newline at end of file diff --git a/developer/docs/help/context/character-map.md b/developer/docs/help/context/character-map.md new file mode 100644 index 00000000000..d300455a2b4 --- /dev/null +++ b/developer/docs/help/context/character-map.md @@ -0,0 +1,136 @@ +--- +title: Using the Character Map +--- + +![Character Map tool](../images/ui/frmCharacterMapNew.png) + +To display the Character Map: + +- Press Ctrl + Shift + c +- Select **View** → **Character Map** + +The Character Map will appear by default docked to the right hand side +of the IDE but can be undocked or re-docked on any side of the window. + +### Using the Character Map + +To insert a character: +1. Position the text cursor where you want to insert the character +2. Locate the desired character in the Character Map and insert it by: + - selecting the character and pressing the Enter key, or + - double-clicking on the character, or + - right-clicking on the character and selecting Insert Character. + + > ### Note + If the Insert Mode is set to Code or Name, pressing Enter or + double-clicking on the character will insert the Unicode code or + name of the character, not the character itself. These options are + most useful when writing or editing keyboard source files (.KMN). + +### Insert Modes + +There are three insert modes: Code, Character and Name: + +- Code: inserts the character's Unicode code +- Character: inserts the character itself +- Name: inserts the character's Unicode name + +To change the insert mode: + +1. Right-click on the Character Map. +2. Highlight the Insert Mode submenu. +3. Choose the desired mode from the Insert Mode submenu. + +### Character Map Options + +When you right click on the Character Map, the following menu options +are displayed: + +Insert Character +: Inserts the selected character at the cursor position in your + document. + +Filter... +: Displays the Filter dialog box. See [Filtering](#toc-filtering) below. + +Goto... +: Displays the Goto dialog box. See Using [Goto](#toc-goto) below. + +Font... +: Allows you to choose a different font for viewing the Character Map.
+ Note: This does not affect the font being used in your document! + +Insert Mode +: Allows you to select the character insert mode you want. See [Insert + Modes](#toc-insert-modes) above. + +Display Quality +: Allows you to select a different font display quality for the + Character Map. The options are:
+ - Plain: no font smoothing + - Antialiased: uses the Windows standard font smoothing + - ClearType: uses the Windows ClearType font smoothing method + +### Characters and Fonts + +When a character is not available in the selected font, the Character +Map will fall back to **Code2000**, **Code2001**, **Code2002**, **Arial Unicode MS** and +**Lucida Sans Unicode** fonts. If the character is not found in these +fallback fonts, the Character Map will use font linking to attempt to +find a character from other fonts installed on the system, and as a last +resort, will show a square box if no suitable font can be found. + +If a character is not displayed from other than the selected font, it +will be shown in blue instead of black. + +### Filtering + +![Character Map Filter dialog](../images/ui/frmCharacterMapFilter.png) + +The Character Map can be filtered by Unicode character name or character +range. Filters can be entered in the Filter By field at the bottom of +the Character Map; a quick reference user interface dialog to help you +edit the filter is available by clicking the \[...\] button. + +When no filter is applied, the Character Map will show all characters +from the Unicode 8.0 standard. + +All filter strings are case insensitive. Character names use the letters +`A-Z`, numerals `0-9`, and punctuation underscore (`_`) and hyphen +(`-`). + +Spaces between words in the filter are represented either by underscore +(`_`) or space (` `) and can be used interchangeably. + +A filter can be for a range or on the Unicode Character Name. + +The filter format for a range is: `[U+]XXXX-[U+]YYYY`, where `U+` is +optional, `XXXX` is the starting Unicode value and `YYYY` is the +finishing Unicode value. + +The filtering options for Unicode Character Names are: + +### Examples + +| | | +|--------------------------|-------------------------| +| Filter | Result | +| `LATIN CAPITAL LETTER A` | Finds all Latin capital A variations | +| `LATIN * LETTER A` | finds all Latin capital and lower case A variations | +| `LATIN * LETTER [AEIOU]` | finds all Latin A,E,I,O or U vowel combinations | +| `LAO` | finds all characters with names starting in "LAO" in the current font | +| `YI_` | finds all characters with names starting in "YI " - you must use `_` (underscore) and not `( )` space at the end of a search string.
Note that without the `_`, this search also matches YIN_YANG. | +| `LATIN * LETTER A$` | finds only "a" and "A" | +| `1000-119F` | finds all characters between U+1000 and U+119F (inclusive) - the Myanmar alphabet in this case | + +### Goto + +The Goto tool can be used to move directly to a specific Unicode +character or value. + +1. Right click on a character and select Goto. The **Enter Unicode character value or name** dialog box will be displayed. +2. Enter the Unicode character value - e.g. `006B` or `U+006B` OR enter the start of the character name, e.g. `LAO_LETTER` will go + to **LAO_LETTER_KO**, being the first character that matches. You + can substitute spaces for underscores if you prefer. +3. Click OK. The character map will attempt to move to the character you specified. diff --git a/developer/docs/help/context/debug.md b/developer/docs/help/context/debug.md new file mode 100644 index 00000000000..07c3bb9e143 --- /dev/null +++ b/developer/docs/help/context/debug.md @@ -0,0 +1,165 @@ +--- +title: Debug Window +--- + +![Debug window - Debug State](../images/ui/frmKeymanWizard_Debug_State.png) + +The debug window is shown at the bottom of the keyboard editor when +debugging the keyboard. There are several user interface areas: The +debugger input window, the debugger status window, a debugger toolbar +(usually docked under the menu), and the status bar will show the +current debugger status. + +## Debugger input window + +![Debug window - Debug State](../images/ui/frmDebug.png) + +The debugger input window is used for typing input to test the keyboard. +In the top half of this window, input you type while testing your +keyboard will be displayed, exactly the same as in use, with one +exception: deadkeys will be shown visually with an +![OBJ](../images//ui/obj.gif) symbol. + +The lower half of the window shows a grid of the characters to the +virtual left of the insertion point, or the selected characters if you +make a selection. Deadkeys will be identified in the grid. The grid will +show characters in right-to-left scripts in backing store order, from +left to right. If there are more characters in your text than can fit on +the screen, then only those that fit will be shown in the grid. + +## Debug controls + +The debug menu and debug toolbar control the debugger. + +![Debug toolbar](../images/ui/Debug_Toolbar.png) + +![Debug menu](../images/ui/Debug_Menu.png) + +Set/Clear breakpoint +: A breakpoint can be put on a line of code to ask Keyman Developer to + stop and show what is happening in the keyboard layout when that + line is reached. Typically, you would put a breakpoint on a + particular rule, so you could debug an unexpected behaviour on that + rule. + +Start Debugging +: Starts the debugger + +Stop Debugger +: Stops the current debug session + +Single Step Mode +: When this option is active, you will step through every group and + rule that your keyboard applies when a keystroke is pressed. The + Step Forward and Run controls are only relevant in Single Step Mode. + +Step Forward +: Move to the next step in your keyboard code. + +Run +: Stop processing the current keystroke event in single step mode + (unless a breakpoint is hit). The next keystroke event will drop + into single step mode again. + +Pause +: Use the Pause button or press Shift + Esc to pause the debugger. When + the debugger is paused, it will not accept any input, and ordinary shortcut keys (Shift + F5, Alt + Tab, etc.) will function as usual. Press Pause again to resume debugging. + + + +## Debug State box + +The debug state box shows the internal state of the keyboard +interpreter. + +### State + +![Debug window - Debug State](../images/ui/frmKeymanWizard_Debug_State.png) + +This window shows the current keystroke state, and the sequence of +keystrokes that were typed to arrive at this state. Clearing the text in +the debug window will also clear the keystroke log; as will pressing the +Restart button. + +The Restart button is disabled while stepping through an event. + +### Elements + +![Debug window - Debug Elements](../images/ui/frmKeymanWizard_Debug_Elements.png) + +This shows the elements that make up rule currently being processed: the +context, the key, and also what the output will be. If the rule uses +stores, the contents of the store will be shown in the right-hand +column, with the matched letter in red. + +### Call Stack + +![Debug window - Debug Call stack](../images/ui/frmKeymanWizard_Debug_CallStack.png) + +Here all the lines that have been processed to this point are shown in a +list. You can double-click on any entry in the list to display the line +in the keyboard source. + +### Deadkeys + +![Debug window - Debug Deadkeys](../images/ui/frmKeymanWizard_Debug_Deadkeys.png) + +This lists all the deadkeys that are currently in the context. You can +select one from the list to see it highlighted in the debug input box. +This information can also be seen in the character grid in the lower +half of the debugger input window. + +### Regression Testing + +![Debug window - Debug Regression Test](../images/ui/frmKeymanWizard_Debug_RegressionTest.png) + +The idea in regression testing is to record a sequence of keystrokes and +the output the keyboard produced, in order to test for the same +behaviour when you make changes to the keyboard. + +Use Start Log/Stop Log to record the input and output. You can then use +Start Test to run the test again, or go the Options menu to clear the log, +or save or load a test, or use the batch mode to run several tests in a +row. + +If the output produced while running a test is different to that stored +when recording it, Keyman will halt the test on the line where the +failure occurred, and activate Single Step mode. + +### Status bar + +The input status is shown in the second pane of the status bar. It can +show one of the following messages: + +Ready for input +: The debugger is waiting for more input + +Focused for input +: The debugger is waiting for more input, and the Debug Input window + is active + +Paused +: The debugger is paused + +Receiving events +: The debugger is processing input + +Debugging +: The debugger is active during Single Step mode or after a breakpoint + +## Test mode + +Enter test mode by clicking the **Test Mode** +button on the debugger toolbar. + +The test mode lets you test your keyboard without the debugger being +active. This lets you test functionality that is not available within +the debugger - primarily [IMX code](../guides/develop/imx/). + +Once in test mode, no debugger controls are available. + +You can see the character codes for the current or selected characters +in the status bar, which can be useful when debugging your keyboard. diff --git a/developer/docs/help/context/edit-language-example.md b/developer/docs/help/context/edit-language-example.md new file mode 100644 index 00000000000..0a2307bf027 --- /dev/null +++ b/developer/docs/help/context/edit-language-example.md @@ -0,0 +1,44 @@ +--- +title: Add/Edit Language Example Dialog +--- + +![Add/Edit Language Example dialog](../images/ui/frmEditLanguageExample.png) + +This dialog allows you to create or edit example key sequences to demonstrate +how to use your keyboard. Examples should be relatively short -- one to five +words is ideal, but if possible, should demonstrate sequences that may be hard +for users to discover on their own. + +These language examples can be seen live, for example, on +[keymanweb.com](https://keymanweb.com). + +## Language tag + +Enter the BCP 47 language tag that this example corresponds to. It should be a +language tag that is listed in the package file. + +## Key sequence + +This is a space separated list of keys. For spacebar, use `space`. For modifier +key combinations, use the modifier key(s) followed by `+` and the key that they +are pressed together with, e.g. `right-alt+shift+A`. + +* modifiers indicated with "+" +* spacebar is "space" +* plus key is "shift+=" or "plus" on US English (all other punctuation as per + key cap). +* Hardware modifiers are: "shift", "ctrl", "alt", "left-ctrl", "right-ctrl", + "left-alt", "right-alt" +* Key caps should generally be their character for desktop (Latin script case + insensitive), or the actual key cap for touch +* Caps Lock should be indicated with "caps-on", "caps-off" + +## Expected text + +Here, put the actual output generated by the key sequence. + +## Note + +You may include a translation of the text or another note that highlights an +aspect of how the text is typed. + diff --git a/developer/docs/help/context/editor.md b/developer/docs/help/context/editor.md new file mode 100644 index 00000000000..79e98806c5c --- /dev/null +++ b/developer/docs/help/context/editor.md @@ -0,0 +1,23 @@ +--- +title: Editor Window +--- + +Editor windows in Keyman Developer supports standard Windows editing +keystrokes. Many file formats, including .kmn, .kps, .xml, .html, .js +and .json, support syntax highlighting. The text editor in Keyman uses +the Monaco component from Visual Studio Code, so all the functionality +available in that editor is also available here. + +## Special Functionality + +Aside from standard Windows keys, the following keystrokes are defined +for the editor: + +| Keystroke | Action | +|----------------|---------------| +| Ctrl + Shift + M | Toggle Message Window visibility | +| Ctrl + Shift + C | Open Character Map | +| Ctrl + Shift + I | Toggle Character Identifier visibility | +| Ctrl + F | Find text | +| Ctrl + H | Replace text | +| Ctrl + Shift + U | Convert the selection to/from characters to code values| \ No newline at end of file diff --git a/developer/docs/help/context/images/banner.png b/developer/docs/help/context/images/banner.png new file mode 100644 index 00000000000..b141413e345 Binary files /dev/null and b/developer/docs/help/context/images/banner.png differ diff --git a/developer/docs/help/context/images/character-grid.png b/developer/docs/help/context/images/character-grid.png new file mode 100644 index 00000000000..dbe78ceca33 Binary files /dev/null and b/developer/docs/help/context/images/character-grid.png differ diff --git a/developer/docs/help/context/images/config.png b/developer/docs/help/context/images/config.png new file mode 100644 index 00000000000..ad8a3710315 Binary files /dev/null and b/developer/docs/help/context/images/config.png differ diff --git a/developer/docs/help/context/images/device-menu.png b/developer/docs/help/context/images/device-menu.png new file mode 100644 index 00000000000..0c50b2e59af Binary files /dev/null and b/developer/docs/help/context/images/device-menu.png differ diff --git a/developer/docs/help/context/images/hamburger-menu.png b/developer/docs/help/context/images/hamburger-menu.png new file mode 100644 index 00000000000..d014314192a Binary files /dev/null and b/developer/docs/help/context/images/hamburger-menu.png differ diff --git a/developer/docs/help/context/images/keyboard-menu.png b/developer/docs/help/context/images/keyboard-menu.png new file mode 100644 index 00000000000..cb15d6d3469 Binary files /dev/null and b/developer/docs/help/context/images/keyboard-menu.png differ diff --git a/developer/docs/help/context/images/lexical-model-test.png b/developer/docs/help/context/images/lexical-model-test.png new file mode 100644 index 00000000000..4b434fc568f Binary files /dev/null and b/developer/docs/help/context/images/lexical-model-test.png differ diff --git a/developer/docs/help/context/images/model-menu.png b/developer/docs/help/context/images/model-menu.png new file mode 100644 index 00000000000..4572b234f6a Binary files /dev/null and b/developer/docs/help/context/images/model-menu.png differ diff --git a/developer/docs/help/context/images/on-screen-keyboard.png b/developer/docs/help/context/images/on-screen-keyboard.png new file mode 100644 index 00000000000..4aaf2aef520 Binary files /dev/null and b/developer/docs/help/context/images/on-screen-keyboard.png differ diff --git a/developer/docs/help/context/images/server-iphone.png b/developer/docs/help/context/images/server-iphone.png new file mode 100644 index 00000000000..d6ce6589034 Binary files /dev/null and b/developer/docs/help/context/images/server-iphone.png differ diff --git a/developer/docs/help/context/images/status-bar.png b/developer/docs/help/context/images/status-bar.png new file mode 100644 index 00000000000..7439322aab5 Binary files /dev/null and b/developer/docs/help/context/images/status-bar.png differ diff --git a/developer/docs/help/context/images/taskbar-menu.png b/developer/docs/help/context/images/taskbar-menu.png new file mode 100644 index 00000000000..3c352a24a7d Binary files /dev/null and b/developer/docs/help/context/images/taskbar-menu.png differ diff --git a/developer/docs/help/context/images/taskbar.png b/developer/docs/help/context/images/taskbar.png new file mode 100644 index 00000000000..8f4611fe2e3 Binary files /dev/null and b/developer/docs/help/context/images/taskbar.png differ diff --git a/developer/docs/help/context/images/text-area.png b/developer/docs/help/context/images/text-area.png new file mode 100644 index 00000000000..4255e550196 Binary files /dev/null and b/developer/docs/help/context/images/text-area.png differ diff --git a/developer/docs/help/context/index.md b/developer/docs/help/context/index.md new file mode 100644 index 00000000000..04028b35c1e --- /dev/null +++ b/developer/docs/help/context/index.md @@ -0,0 +1,59 @@ +--- +title: Context Help +--- + +[Project Window](project) + +[Keyboard Editor](keyboard-editor) + +[Model Editor](model-editor) + +[Debug Window](debug) + +[LDML Keyboard Debug Window](ldml-debug) + +[LDML Keyboard Editor](ldml-editor) + +[Package Editor](package-editor) + +[Add/Edit Language Example dialog](edit-language-example) + +[Text Editor](editor) + +[New File Dialog](new) + +[New Project Dialog](new-project) + +[New Project Parameters Dialog](new-project-parameters) + +[New Lexical Model Project Parameters Dialog](new-lm-project-parameters) + +[New LDML Project Parmaeters dialog](new-ldml-project-parameters) + +[About Dialog](about-tike) + +[Virtual Key Identifier](key-test) + +[Options Dialog](options) + +[KMComp Command-line Options](kmcomp) + +[KMConvert Command-line Options](kmconvert) + +[kmc Command-line Options](kmc) + +[kmlmc Command-line Options](kmlmc) + +[kmlmi Command-line Options](kmlmi) + +[kmlmp Command-line Options](kmlmp) + +[Character Map](character-map) + +[Message Window](messages) + +[Keyman Developer Server](server) (web test host) + +[Keyman Developer](keyman-developer) + +[Select Web fonts](select-web-fonts) diff --git a/developer/docs/help/context/key-test.md b/developer/docs/help/context/key-test.md new file mode 100644 index 00000000000..d51ed334372 --- /dev/null +++ b/developer/docs/help/context/key-test.md @@ -0,0 +1,21 @@ +--- +title: Virtual Key Identifier +--- + +![Virtual Key Identifier dialog](../images/ui/frmKeyTest.png) + +This dialog lets you check the virtual key code for any key combination +(except Window reserved key combinations such as +Alt + Tab). You can then +insert the virtual key code into the last active edit window at the +current cursor position. + +Press +Ctrl / Shift / Alt +and the key you wish to discover. You can see the virtual key codes for +left and right Ctrl / Alt combinations by checking the "Distinguish between left and right ctrl/alt" checkbox. + +To close the dialog, click the Close button or press +Shift + Esc. + +Press Shift + Enter to insert the current virtual key code into your source at the insertion point. \ No newline at end of file diff --git a/developer/docs/help/context/keyboard-editor.md b/developer/docs/help/context/keyboard-editor.md new file mode 100644 index 00000000000..ef43a9b4e87 --- /dev/null +++ b/developer/docs/help/context/keyboard-editor.md @@ -0,0 +1,632 @@ +--- +title: Keyboard Editor +--- + +The keyboard editor is the heart of Keyman Developer. This window allows +you to edit all aspects of a keyboard layout, from the visual layout of +the keyboard, to logic rules, to touch interactions, and more. + +The editor is divided into multiple tabs. Initially, only three tabs +will be visible: Details, Layout, and Build. A keyboard can have +multiple source files, which are all managed within this one editor. + +The following image shows the first tab of the editor, the Details tab, +for a brand new keyboard, with those three initial tabs. + +![Keyboard Editor - New file, Details tab](../images/ui/frmKeymanWizard_New.png) + +> ### Note +Users of earlier versions of Keyman Developer may initially have trouble +finding tabs such as the Icon tab or the On-Screen tab, as they are not +initially visible. The Features grid on the Details tab allows you to +add these extra features into the keyboard. + +## Keyboard component files + +A keyboard contains multiple source files. The following table lists the +file types and which tabs are used to edit them. The filenames shown are +defaults and can be modified, by editing the corresponding line in the +source file (and renaming the file). However, where possible the default +names should be used. + +| File type | Tabs | Feature | Store name | Description | +|-------------------|-----------------|--------------------|----------------------|------------------------| +| `file.kmn` | Details, Layout | | The primary keyboard source file. Required. | | +| `file.kvks` | On-Screen | Desktop On-Screen Keyboard | [`&visualkeyboard`](/developer/language/reference/visualkeyboard) | The visual presentation of the keyboard for desktop computers. | +| `file.ico`, `file.bmp` | Icon | Icon | [`&bitmap`](/developer/language/reference/bitmap) | An icon that represents the keyboard in the user interface on desktop computers. | +| `file.keyman-touch-layout` | Touch Layout | Touch-Optimised Keyboard | [`&layoutfile`](/developer/language/reference/layoutfile) | The touch layout visual description file | +| `file-code.js` | Embedded JS | Embedded Javascript | [`&kmw_embedjs`](/developer/language/reference/kmw_embedjs) | Additional Javascript code for [IMX](../guides/develop/imx) functionality | +| `file.css` | Embedded CSS | Embedded CSS | [`&kmw_embedcss`](/developer/language/reference/kmw_embedcss) | Additional CSS stylesheet for custom touch and web layout styling | +| `file-help.htm` | Web Help | Web Help | [`&kmw_helpfile`](/developer/language/reference/kmw_helpfile) | HTML file that replaces the On Screen Keyboard on desktop web layouts | +| `file-codes.txt` | Include Codes | Include Codes | [`&includecodes`](/developer/language/reference/includecodes) | Code dictionary for use with [named constants](/developer/language/guide/constants) | + +Three tabs include both visual and code editors: the Layout, Touch +Layout and JSON Metadata tabs. Changes to one view will be immediately +reflected in the other view. The code in the Layout tab is important +because that reflects both the Details and the Layout tab. + +## Details tab + +![Keyboard Editor - Details tab](../images/ui/frmKeymanWizard_Details.png) + +The Details tab grows as you add more options to a keyboard. The fields +here are: + +Name +: The name of the keyboard, corresponding to the [`&name` store](/developer/language/reference/name). + +Targets +: The intended target devices and operating systems, corresponding to + the [`&targets` store](/developer/language/reference/targets). + Changing the targets will hide or show parts of the Details and + Compile tabs. If no targets are selected, Keyman Developer will + treat the keyboard as a Windows-only keyboard, for backward + compatibility reasons. + +Copyright +: Enter the details of the copyright owner for the keyboard. + [`©right` store](/developer/language/reference/copyright). + +Message +: Enter a message that will be shown at install time for the keyboard + (on Windows, macOS). [`&message` store](/developer/language/reference/message). + +Keyboard is right-to-left +: Check this box to indicate that the keyboard is a right-to-left + keyboard, for web and touch layouts. [`&kmw_rtl` store](/developer/language/reference/kmw_rtl). + +Web Help Text +: A single line of text, with basic HTML allowed, shown at the bottom + of the desktop web On Screen Keyboard. [`&kmw_helptext` store](/developer/language/reference/kmw_helptext). + +Keyboard version +: The version of the keyboard. Read the reference documentation for + [`&keyboardversion` store](/developer/language/reference/keyboardversion) to understand + the legal values for this field. This is not the same as the + [`&version` store](/developer/language/reference/version), which + controls the Keyman (and Keyman Developer) version for which a + keyboard is designed. + +Comments +: This field corresponds to the first lines of comments in the + keyboard source, and is visible only to the keyboard designer. + +Features +: The Features grid controls which additional file components are + included in the keyboard, as listed in the Component Files section + above. Each of the features relates to a system store. Adding a + feature will add an extra tab to the editor, and add the + corresponding store to the keyboard source. Removing a feature will + not delete the component file, but will just remove the store from + the keyboard source. + +## Layout tab + +![Keyboard Editor - Layout tab, Design view](../images/ui/frmKeymanWizard_Layout_Design.png) + +The Layout tab gives you a simple interface to quickly create a keyboard +using a visual representation of a desktop/laptop computer keyboard. You +can drag and drop characters from the character map to create keyboard +layouts. You cannot access most of Keyman's more powerful features from +the Layout Design view, but it will be useful to get you started on your +design. + +Each key can have zero or more characters assigned to it. Each key can +be assigned a different set of characters for each shift state. You can +change the shift state by clicking on the Shift, Ctrl, and Alt keys. + +There are two ways to assign characters to the keys: + +- Click on a key, and then type the character's code into the Unicode + Character Value(s) field, or the type/paste the character itself + into the Output character(s) field. +- Select the character from the Character Map and drag and drop it + onto the appropriate key. This will set the key to output that + character. + +> ### Hint + To add the character to a key with existing characters, hold +Ctrl while dropping it onto the key. + + +> ### Note + Any key that does not have a character assigned to it will output what the selected Windows layout specifies. + +Distinguish between left and right Ctrl/Alt +: A Keyman keyboard can treat left and right Ctrl and Alt identically, + or it can distinguish between them. The Design view allows one or + the other mode (in Code view, you can use both interchangeably). + +Display 102nd Key (as on European keyboards) +: European keyboards have one extra key that is not on US keyboards. + This key is positioned to the right of the left shift key. Some + other keyboards have additional keys; these are not shown on the + layout designer. If you have a European layout selected as your + Windows layout, the 102nd key will always be visible in the + designer. When a European layout is selected as your Windows layout, + the shape of the Enter key will also change to take two rows, and + the backslash key will move down one row, but not otherwise change + in behaviour. + +You can press and release Ctrl to select +another key on the keyboard using your keyboard. + +
+ +![Keyboard Editor - Layout tab, Code view](../images/ui/frmKeymanWizard_Layout_Code.png) + +The Code view shows the source code of the keyboard file. This is where +all the information in the Details and Layout tab is stored, and +additional logic and complex keyboard layouts will be edited entirely in +the Code view. + +See the [Editor topic](editor) for more information on how to use the +editor shown within this view. + +## On-Screen tab + +![Keyboard Editor - On-Screen tab](../images/ui/OnScreenKeyboard.png) + +This tab allows you to edit the visual representation of your keyboard +layout. The content on this tab is stored in the .kvks file associated +with your keyboard. The visual representation is used only in desktop +and desktop web; however if no touch layout is defined, this layout will +be synthesized into a touch layout automatically. + +An On-Screen keyboard is optional but in most keyboards is recommended. +The On-Screen keyboard may not always match the actual layout +identically, because you may choose to hide some of the details of +encoding from the interface presented to the user. The user can also +choose to print the layout. + +This keyboard layout can also be printed or included in HTML or other +documentation. The editor allows you to export the file to HTML, PNG or +BMP formats. + +Fill from layout +: Compiles the keyboard file, and processes each possible keystroke in + the keyboard file to automatically generate an On-Screen Keyboard + that matches the layout. This can be used to effectively + pre-populate the On-Screen Keyboard and reduces the complexity of + designing it from scratch. + +Import +: Imports an On-Screen Keyboard from an XML file. + +Export +: Exports the On-Screen Keyboard to an XML file. + +Text +: The key cap for the selected key + +Bitmap +: A bitmap that is displayed on the selected key (not recommended, as + it will not scale cleanly) + +Display underlying layout characters +: If checked, then the base or underlying layout will show in small + letters at the top left of each key cap. This can be helpful to + provide users with a guide as to the position of each key on the + keyboard, especially for non-Latin scripts. + +Distinguish between left and right Ctrl/Alt +: If checked, treats the left and right Ctrl/Alt as separate layers + +Display 102nd Key (as on European keyboards) +: European keyboards have one extra key that is not on US keyboards. + This key is positioned to the right of the left shift key. Some + other keyboards have additional keys; these are not shown on the + layout designer. If you have a European layout selected as your + Windows layout, the 102nd key will always be visible in the + designer; ensure you select this checkbox if you want the 102nd key + to always be visible to end users of the layout, irrespective of + their selected base layout. When a European layout is selected as + your Windows layout, the shape of the Enter key will also change to + take two rows, and the backslash key will move down one row, but not + otherwise change in behaviour. + +Auto-fill underlying layout +: When the Fill from layout button is clicked, if this option is + checked, then keys without corresponding rules in the Layout will be + filled with the base layout character. + +## Touch Layout tab + +![Keyboard Editor - Touch Layout tab, Design view](../images/ui/TouchLayout_Design.png) + +The Touch Layout tab is used to create the visible representation of the +keyboard layout for touch devices. It works similarly to the On Screen +Keyboard Editor conceptually, but has a number of additional features +specific to touch. Keys on the touch layout trigger rules within the +normal Keyman keyboard; if no rule is defined for a given key, it will +be given output if it has a standard code beginning with `K_`, or if it +is a Unicode value code, starting with `U_`. + +Follow this +[guide](../guides/develop/touch-keyboard-tutorial/making-touch-keyboard) +for learning how to create a Touch Layout keyboard. + +In Design view, the editor can show a number of different device types, +including iPhone and iPad, in different orientations, to allow you to +visualize the keyboard layout before you load it onto a device. The +following image shows all aspects of the touch design view. + +![Keyboard Editor - Touch Layout tab, Design view closeup](../images/ui/TouchLayout_Design_2.png) + +### Left sidebar controls + +Template... +: The Template button allows you to choose a standard layout of keys + from a predefined set. These layouts move the standard set of keys + around and between layers to reduce the number of keys on each + layer, optimising for mobile phone or other sizes. When Keyman + Developer switches to a new template, it will transfer key + definitions to the new layout as far as possible, but if keys on the + current layout are not in the new template, their definitions will + be lost. Therefore, selecting an appropriate template early in the + development process is suggested. + +Import from On Screen +: If you have an existing On-Screen Keyboard for your keyboard layout, + importing the design from the On-Screen Keyboard can reduce the + development time considerably. Once you have imported, you will + probably want to select a new template to transform the + desktop-oriented design to a tablet or phone design automatically. + +View Controls +: This selector allows you to choose the simulated view of the + keyboard, either landscape or portrait, for a number of devices. The + presented keyboard may not be 100% identical to the final layout as + seen on the device, but this allows you to get a feel for the design + before testing. + +Platform +: The platform controls allow you to select and add or remove platform + support for a given layout. If a platform is not defined, then + Keyman Engine will transform the layout from another platform + automatically, so you don't necessarily need to define layouts for + each platform. If the 'Display underlying' checkbox is checked, then + the base or underlying layout will show in small letters at the top + left of each key cap. This can be helpful to provide users with a + guide as to the position of each key on the keyboard, especially for + non-Latin scripts. + +Layer +: Each layout for each platform is made up of one or more layers of + keys. Each layer can have a default shift state associated with it, + which allows keys to trigger specific rules in the Layout code. + +### Keyboard area + +On the right of the sidebar is the keyboard design area. This shows a device with +a presentation of the key layout. Within the key layout, you can click +on any key to edit it. There are a number of controls: + +Red circle with an X +: This button to the top right of the key will delete the key from the + row; if it is the last key on the row, the entire row will be + deleted. + +Green arrow with a + +: These buttons will insert a key to the left or right, or a single + key on a new row above or below the selected key. Adding extra keys + scales the entire keyboard. + +Dragging the right hand side of the key +: Dragging the right hand side of the key will resize the key; + resizing the key will rescale the entire keyboard so it still fits + within the device screen. + +Metrics +: The metrics displayed on the right hand side of the keyboard show + the virtual width of each row of the keyboard, and the number of + keys. For small devices, 10 keys is the maximum recommended number + in a row; each key has a standard width of 100. While each row can + be a different length, the last key in the row will be stretched to + balance the final design; 'spacer' keys can be used to leave a + visual gap on the right hand side of the keyboard. You should aim to + make each row the same total width for consistent results. + +### Right sidebar controls + +Next to the keyboard area is another control bar for editing details of +the selected key. + +Keycap Value +: Assign a type to a key. This is to specifies which keys are Text, AltGr, Shift, Menu, TabLeft, ZWSp and more. + +Text +: You can drop characters from Character Map directly into the key cap + edit box, or type directly. + +Text Unicode +: Clicking on a text unicode will focus the unicode edit box + instead of the text edit box. + +Hint and Hint Unicode +: Add any Unicode to indicate the presence of long-press keys for that key, and the hint will be visible in the top right corner of the key. + +Key Type +: The general appearance of each key is determined by the key type, + which is selected (in Keyman Developer 10) from a drop-down list: + + | Key Type | Description | + |----------------------|----------------------------| + | Default (normal) key | A standard letter or character key on the keyboard | + | Special (shift) key | The grey control type keys, layer shifts, Enter, Backspace, etc. | + | Special (Active) | A variation on the Special keys, which shows a highlight, typically used to indicate that a shift key for example is down. | + | Dead-key | While this key type has no difference in function to default keys, it will have a different style to indicate that it is different; the logic in the keyboard source may well be a deadkey, for example. | + | Blank | This type of key cannot be selected in use and shows as a blank key. | + | Spacer | Leaves a space in the keyboard at the point it is inserted, in the background colour of the keyboard area. | + +Modifier +: Determines the state that Keyman Engine will receive from the + key stroke, such as Default, Right-Alt, Shift, Right-Alt Shift, or Caps. This makes it simpler to design a single keyboard that works across both desktop and mobile interfaces. + +ID +: Each key must be given an identifying ID which is unique to + the key layer. ID by and large correspond to the virtual key + codes used when creating a keyboard program for a desktop keyboard, + and should start with `K_`, for keys mapped to standard Keyman + virtual key names, e.g. `K_HYPHEN`, and `T_` or `U_` for + user-defined names, e.g. `T_ZZZ`. + If keyboard rules exist matching the key code in context, then the output from the key will be + determined by the processing of those rules. It is usually best to + include explicit rules to manage the output from each key, but if no + rules matching the key code are included in the keyboard program, + and the key code matches the pattern `U_xxxx[_yyyy...]` + (where `xxxx` and `yyyy` are 4 to 6-digit hex strings), then the + Unicode characters `U+xxxx` and `U+yyyy` will be output. As of + Keyman 15, you can use more than one Unicode character value in the + id (earlier versions permitted only one). The ID is always + required, and a default code will usually be generated automatically + by Keyman Developer. + + - `K_xxxx` is used for a standard Keyman for Windows's key name, e.g. + `K_W`, `K_ENTER`. You cannot make up your own `K_xxxx` names. + Many of the `K_` ids have overloaded output behaviour, for + instance, if no rule is matched for `K_W`, Keyman will output + 'w' when it is touched. The standard key names are listed in + [Virtual Keys and Virtual Character Keys](/developer/language/guide/virtual-keys). Typically, + you would use only the "common" virtual ID. + - `T_xxxx` is used for any user defined names, e.g. `T_SCHWA`. + If you wanted to use it, `T_ENTER` would also be valid. If no + rule matches it, the key will have no output behaviour. + - `U_####[_####]` is used as a shortcut for a key that + will output those Unicode values, if no rule matches it. This is + similar to the overloaded behaviour for `K_` ids. Thus `####` + must be valid Unicode characters. E.g. `U_0259` would generate a + schwa if no rule matches. It is still valid to have a rule such + as `+ [U_0259] > ...` + +Padding Left +: Padding to the left of each key can be adjusted, and specified as a + percentage of the default key width (100). If not specified, a + standard padding of 15% of the key width is used between adjacent + keys. + +Width +: The layout is scaled to fit the widest row of keys in the device + width, assuming a default key width of 100 units. Keys that are to + be wider or narrower than the default width should have width + specified as a percentage of the default width. For any key row that + is narrower than the widest row, the width of the last key in the + row will be automatically increased to align the right hand side of + the key with the key with the right edge of the keyboard. However, + where this is not wanted, a "spacer" key can be inserted to leave a + visible space instead. As shown in the above layouts, where the + spacer key appears on the designer screen as a narrow key, but will + not be visible in actual use. + +Next layer +: The virtual keys `K_SHIFT`, `K_CONTROL`, `K_MENU`, etc. are normally + used to switch to another key layer, which is implied by the ID. The left and right variants of those ID, and also + additional layer-switching keys mentioned above (`K_NUMERALS`, + `K_SYMBOLS`, `K_CURRENCIES`, `K_ALTGR`) can also be used to + automatically switch to the appropriate key layer instead of + outputting a character. However, it is sometimes useful for a key to + output a character first, then switch to a new layer, for example, + switching back to the default keyboard layer after a punctuation key + on a secondary layer had been used. Specifying the `nextlayer` for a + key allows a different key layer to be selected automatically + following the output of the key. Of course, that can be manually + overridden by switching to a different layer if preferred. + +Drag and drop +: Keys can be moved around the keyboard by dragging them with the + mouse; a ghost landing box will appear beneath the key when it can + be dropped. If the key is dropped in an invalid area, no action will + occur. + +Double-click +: Double clicking on a key with a "Next Layer" defined will switch to + that layer. + +### Middle bar controls + +#### Long-press keys area + +The keys in the long press area cannot be resized but the controls +otherwise work the same as in the main keyboard area. The keys cannot be +dragged between the main keyboard area and the long press area. The bar +below the long press area contains the corresponding controls for the +long press keys. + +![Keyboard Editor - Touch Layout tab, Code view](../images/ui/frmKeymanWizard_TouchLayout_Code.png) + +The Code view allows you to edit the JSON source of the touch layout +file. This makes certain operations simpler, such as batched rearranging +of keys, or using another text editor to make bulk changes. The Code +view uses the standard [editor](editor). + +The format of the layout file is described in [Creating a touch keyboard layout guide](../guides/develop/creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty). + +#### Long-press, Flicks, and Multitaps controls + +Underneath the keyboard area is the Long-press, Flicks, and Multitaps controls. + +![Long-press, Flicks, and Multitaps layout](../images/ui/LongPress_Flicks_Multitaps.png) + +Red circle with an X +: This button to the top right of the key will delete the key from the + row; if it is the last key on the row, the entire row will be + deleted. + +Green arrow with a + *(Applies to Long-press and Multitaps)* +: These buttons will insert a key to the left or right, or a single + key on a new row above or below the selected key. Adding extra keys + scales the entire keyboard. + +Drag and drop *(Applies to Long-press and Multitaps)* +: Keys can be moved around the keyboard by dragging them with the + mouse; a ghost landing box will appear beneath the key when it can + be dropped. If the key is dropped in an invalid area, no action will + occur. + +#### Right sidebar controls + +Next to the three controls is another control bar for editing details of +the selected key for different Gesture Type. The only difference between this control and the [keyboard right sidebar](#toc-right-sidebar-controls) controls is: +* Include Gesture Type box and Default selection check box. +* **No** Hint, Hint Unicode, Padding Left, and Width. + +## Icon tab + +![Keyboard Editor - Icon tab](../images/ui/frmKeymanWizard_Icon.png) + +The icon tab allows you to edit the icon associated with the keyboard. An external icon editor will allow you to create more sophisticated icons with alpha transparency and multiple resolutions, but this will cover the standard 16x16 256 colour icon, which is all that many keyboards require. The controls at the top left are: + +Pencil +: Freehand drawing with the selected colour; use right mouse button + for secondary colour. + +Line +: Draw a straight line + +Open box +: Draw an outline box + +Filled box +: Draw a filled box in current colour + +Open circle +: Draw an outline circle or ellipse + +Filled circle +: Draw a filled circle or ellipse in the current colour + +Fill +: Fill from the current point all contiguous pixels of the same colour + +Text +: Use this tool to add a letter or letters to the icon. Click in the + lower left of the icon area and a window opens where you can type + the text you want. You can also change the quality of the font as + well as the font properties by clicking on the Change button. Note + that to change the color of the font, you need to change the color + setting in the font properties window. + +The icon can be exported or imported to/from various other formats. The +transparent colour is the top left colour in the grid with an X in the +box. The icon can be rotated in any direction with the arrow controls +below the toolbox; this will not lose data from the icon but will +instead rotate the edge moving off the grid to the other side of the +grid. + +## Embedded JS tab + +This tab allows you to edit JavaScript code in the file referenced by +the [`&kmw_embedjs`](/developer/language/reference/kmw_embedjs) store, +implementing [IMX functionality](../guides/develop/imx) of the keyboard. + +## Embedded CSS tab + +This tab allows you to edit the Cascading Style Sheet rules in the file +referenced by the +[`&kmw_embedcss`](/developer/language/reference/kmw_embedcss) store for +the keyboard. + +## Web Help tab + +This tab allows you to add a custom HTML snippet to replace the desktop +on screen keyboard, for example useful if the keyboard uses sequences of +keys to produce characters. + +## Include Codes tab + +This tab allows you to edit the [named constants](/developer/language/guide/constants) for the keyboard. + +## Build tab + +![Keyboard Editor - Build tab](../images/ui/BuildTab.png) + +A set of common controls is across the top of this tab: + +Compile Keyboard +: You can compile the keyboard for testing and installation by + clicking the Compile button, or + selecting Keyboard, Compile Keyboard. This will compile the keyboard + for all the selected Targets from the Details tab. + +Start Debugging +: To test your keyboard within Keyman Developer, press F5 to start the + [debugger](debug), or press the Start Debugging button. This is + suitable for testing desktop layouts. + +Open source, build, and project folder +: Opens the folder which contains the keyboard source, build, and project files. + + + +### Windows, macOS, and Linux Targets + +If your keyboard is designed to target Windows and macOS, then the +following buttons will also be visible: + +Install +: Installs the keyboard for use with Keyman Desktop on your computer + +Uninstall +: Uninstalls the keyboard from Keyman Desktop if previously installed + + + +### Web and Mobile Targets + +If your keyboard is designed to target KeymanWeb, mobile or tablet +devices, the following controls will also be visible: + +Test Keyboard on Web +: Starts the Keyman Developer Web Server for the current keyboard. This will list the various IP addresses and hostnames that Keyman Developer is listening on + +Configure... +: Pressing this allows the [Options](./options) dialog to pop-up. + +Open in browser +: Starts your default browser with the selected address to allow + testing of the keyboard directly + +Send to email +: Sends the list of web addresses as an email so that you can more + easily open the test site on your mobile device, or share with + someone else on your network. + +Copy link +: Once the IP addresses are shown, feel free to copy any one of the links. + +To test on other platforms, open one of the debug host addresses listed +on your device. Your device will need to be on the same network as the +Keyman Developer computer. + +You can test within the web browser on your device, or in the native app +if you have it installed: just click the Install button on the debugger +web page. + +The Send to email function makes it easier to open the addresses on your +mobile device without having to enter them manually. + +Learn more about [testing on the web and mobile devices](../guides/test/). \ No newline at end of file diff --git a/developer/docs/help/context/keyman-developer.md b/developer/docs/help/context/keyman-developer.md new file mode 100644 index 00000000000..38544801847 --- /dev/null +++ b/developer/docs/help/context/keyman-developer.md @@ -0,0 +1,5 @@ +--- +title: Keyman Developer Main Window +--- + +- [Project Window](project) \ No newline at end of file diff --git a/developer/docs/help/context/kmc.md b/developer/docs/help/context/kmc.md new file mode 100644 index 00000000000..088b04ca0d3 --- /dev/null +++ b/developer/docs/help/context/kmc.md @@ -0,0 +1,5 @@ +--- +title: kmc Command Line Compiler Toolset +--- + +* [kmc documentation](../reference/kmc) \ No newline at end of file diff --git a/developer/docs/help/context/kmcomp.md b/developer/docs/help/context/kmcomp.md new file mode 100644 index 00000000000..0a4b382bbce --- /dev/null +++ b/developer/docs/help/context/kmcomp.md @@ -0,0 +1,7 @@ +--- +title: kmcomp - Command Line Compiler (deprecated) +--- + +kmcomp has been replaced by [kmc](../reference/kmc). + +* [Migrate from kmcomp to kmc](../reference/kmc/cli/kmcomp-migration) \ No newline at end of file diff --git a/developer/docs/help/context/kmconvert.md b/developer/docs/help/context/kmconvert.md new file mode 100644 index 00000000000..d620841473d --- /dev/null +++ b/developer/docs/help/context/kmconvert.md @@ -0,0 +1,125 @@ +--- +title: KMConvert Command Line Keyboard Conversion Utility +--- + +KMConvert generates keyboards and models from templates, and converts keyboard +layouts between different formats. + +The [New Project dialog](new-project) in Keyman Developer provides a graphical +version of the functionality in KMConvert. + +In a default installation of Keyman Developer on Windows, it is located in +`%ProgramFiles(x86)%\Keyman\Keyman Developer`, and should be on your `PATH`. +KMConvert will generate a full Keyman template project from the imported layout +or data, in a new folder named with the ID of the keyboard. It will not +overwrite an existing folder. + +The following parameters are available: + +```shell +kmconvert import-windows -klid [additional-options] +kmconvert template -id [additional-options] +kmconvert lexical-model -id-author -id-language -id-uniq [additional-options] +``` + +### Available conversion modes + +The conversion mode must be specified as the first parameter. + +`import-windows` +: Imports a Windows keyboard into a new Keyman keyboard project. The `-klid` +parameter is required. This mode only functions on Windows platforms. + +`template` +: Creates a blank keyboard project in the repository template format. The `-id` +parameter is required. + +`lexical-model` +: Creates a wordlist lexical model project in the repository template format. +The `-id-author`, `-id-language`, and `-id-uniq` parameters are required. + +### General parameters + +`-author ` +: Name of author of the keyboard or model, no default. + +`-copyright ` +: Copyright string for the keyboard or model, defaults to `Copyright (C)`, + used everywhere except license file. + +`-full-copyright ` +: Longer copyright string for the keyboard or model, defaults to + `Copyright (C) yyyy`, used in license file. + +`-languages ` +: Space-separated list of BCP 47 tags, e.g. `en-US tpi-PG` + +`-name ` +: Name of the keyboard or model, e.g. `My First Keyboard`, `%s Basic`. Format +strings are only valid in `import-windows` mode; `%s` will be replaced with the +friendly English name of the imported keyboard. + +`-nologo` +: Don't show the program description and copyright banner + +`-o ` +: The target folder to write the keyboard project into, defaults to `.\` + +`-version ` +: Version number of the keyboard or model, defaults to `1.0` + +### `template` and `import-windows` parameters + +`-id ` +: The id of the keyboard to create. Required for `template`, optional for +`import-windows`, not valid for `-lexical-model`. In `import-windows` mode, you +can use a format string with the placeholder `%s` which will be replaced with +the source filename, e.g. `kbdus`. If not specified, then the source filename +will form the id of the generated keyboard. + +`-targets ` +: Space-separated list of [targets](/developer/language/reference/targets), e.g. +`linux windows phone` + +### `import-windows` parameters + +`-klid ` +: The KLID of the keyboard to import, per LoadKeyboardLayout. This must be an +eight digit hex identifier, such as `00000409` for English (US), kbdus.dll. This +parameter is only valid for `import-windows` conversion mode. + +### Lexical model parameters + +`-id-author ` +: Identifier for author of model + +`-id-language ` +: Single BCP 47 tag identifying primary language of model + +`-id-uniq ` +: Unique name for the model + +Note: model identifiers are constructed from parameters: +`..` + +The values for `-id-author` and `-id-uniq` must be valid tokens: lower case a-z, 0-9, and underscore. These should also start with a letter or underscore. + +### Examples + +Create a lexical model for Tok Pisin: + +```shell +kmconvert lexical-model -id-author james -id-language tpi-PG -id-uniq tokpisin -name "Tok Pisin" -languages tpi-PG +``` + +Create a keyboard for Javanese from a template: + +```shell +kmconvert template -id sample -author "James Example" -name "My Javanese Keyboard" -copyright "Copyright (C) James Example" -full-copyright "Copyright (C) 2021 James Example" -languages jv-java +``` + +Create a new keyboard based on the Windows German keyboard: + +```shell +kmconvert import-windows -klid 00000407 -id german_plus -name "German Plus" -copyright "Copyright (C) James Example" -full-copyright "Copyright (C) 2021 James Example" -author "James Example" +``` diff --git a/developer/docs/help/context/kmlmc.md b/developer/docs/help/context/kmlmc.md new file mode 100644 index 00000000000..33edf500f5c --- /dev/null +++ b/developer/docs/help/context/kmlmc.md @@ -0,0 +1,5 @@ +--- +title: kmlmc - Command Line Lexical Model Compiler (deprecated) +--- + +kmlmc has been replaced by [kmc](../reference/kmc). diff --git a/developer/docs/help/context/kmlmi.md b/developer/docs/help/context/kmlmi.md new file mode 100644 index 00000000000..dc47cbbc39a --- /dev/null +++ b/developer/docs/help/context/kmlmi.md @@ -0,0 +1,5 @@ +--- +title: kmlmi - Command Line Lexical Model model_info Compiler (deprecated) +--- + +kmlmi has been replaced by [kmc](../reference/kmc). diff --git a/developer/docs/help/context/kmlmp.md b/developer/docs/help/context/kmlmp.md new file mode 100644 index 00000000000..3442d8f1424 --- /dev/null +++ b/developer/docs/help/context/kmlmp.md @@ -0,0 +1,5 @@ +--- +title: kmlmp - Command Line Lexical Model Package Compiler (deprecated) +--- + +kmlmp has been replaced by [kmc](../reference/kmc). diff --git a/developer/docs/help/context/ldml-debug.md b/developer/docs/help/context/ldml-debug.md new file mode 100644 index 00000000000..e3eb2f717be --- /dev/null +++ b/developer/docs/help/context/ldml-debug.md @@ -0,0 +1,25 @@ +--- +title: LDML Keyboard Debug Window +--- + +The LDML keyboard debug window is shown at the bottom of an LDML keyboard editor +when testing the keyboard. In version 17.0, the LDML keyboard debug window is +a simple test window, without support for interactive debugging, unlike the +Keyman keyboard debug window. + +## Debugger input window + +![Debug window - Debug State](../images/ui/frmDebug.png) + +The debugger input window is used for typing input to test the keyboard. +In the top half of this window, input you type while testing your +keyboard will be displayed, exactly the same as in use, with one +exception: deadkeys will be shown visually with an +![OBJ](../images//ui/obj.gif) symbol. + +The lower half of the window shows a grid of the characters to the virtual left +of the insertion point, or the selected characters if you make a selection. +Markers will be identified in the grid, but only by numeric value in version +17.0. The grid will show characters in right-to-left scripts in backing store +order, from left to right. If there are more characters in your text than can +fit on the screen, then only those that fit will be shown in the grid. \ No newline at end of file diff --git a/developer/docs/help/context/ldml-editor.md b/developer/docs/help/context/ldml-editor.md new file mode 100644 index 00000000000..94eb3ecc45e --- /dev/null +++ b/developer/docs/help/context/ldml-editor.md @@ -0,0 +1,18 @@ +--- +title: LDML Keyboard Editor Window +--- + +![Keyboard Editor - New file, Details tab](../images/ui/frmLDMLEditor.png) + +The LDML Keyboard file format is new in Keyman Developer 17. It is an +XML file, and follows the specification at https://www.unicode.org/reports/tr35/tr35-keyboards.html + +The LDML editor in this release is very basic, supporting syntax highlighting +and basic editing, but specific support for the keyboard3 format is scheduled +for release in version 18.0. + +LDML keyboards can be tested by pressing F5. This opens the [LDML Debug window](ldml-debug). + +The text editor supports standard Windows editing keystrokes. It uses the Monaco +component from Visual Studio Code, so much of the functionality available in +that editor is also available here. diff --git a/developer/docs/help/context/messages.md b/developer/docs/help/context/messages.md new file mode 100644 index 00000000000..9c9ad133359 --- /dev/null +++ b/developer/docs/help/context/messages.md @@ -0,0 +1,18 @@ +--- +title: Message Window +--- + +![Message window](../images/ui/frmMessages.png) + +The message window appears at the bottom of the screen, or floating in a toolbar window. It contains a list of error and warning messages returned from a compilation session. + +You can double click or press Enter to select a +line corresponding to an error in the window. To open and close the +window, press Ctrl+Shift+M. +You can save the messages listed in the window, or clear them, through +the context menu available by clicking the right mouse button in the +window (or pressing the Context Menu key). + +You can undock and dock the window by dragging its title bar. + +The hotkeys for moving to next and previous messages in the list are F4 and Shift+F4, respectively. diff --git a/developer/docs/help/context/model-editor.md b/developer/docs/help/context/model-editor.md new file mode 100644 index 00000000000..2366eaeba9a --- /dev/null +++ b/developer/docs/help/context/model-editor.md @@ -0,0 +1,185 @@ +--- +title: Lexical Model Editor +--- + +The lexical model editor allows you to create and maintain lexical +models for predictive text. + +## Lexical model component files + +A lexical model can have multiple source files, all of which can be +managed in this one editor. The source files currently supported by the +editor are: + +| File type | Tabs | Description | +|-------------------|-----------------|-------------| +| `file.model.ts` | Details, Source | The primary lexical model source file, a TypeScript module. | +| `wordlist.tsv` | wordlist.tsv | One or more wordlists, UTF-8 format tab-separated value files. These files are referenced in the .model.ts source file. | + +## Details tab + +The following image shows the first tab of the editor, the Details tab. +Changes made to this tab are reflected immediately in the Source tab. + +![Model Editor - Details tab](../images/ui/frmModelEditor_Details.png) + +The fields here have corresponding definitions in the [.model.ts source file](../reference/file-types/model-ts), which can be seen in the +**Source** tab: + +Format +: The implementation of the lexical model. This can be either + **Wordlist** (`trie-1.0`), or **Custom** (`custom-1.0`). Corresponds + to the `format` property in the [.model.ts source file](../reference/file-types/model-ts). + +Word breaker +: What method is used to separate words in text. This can be one of + `default`, `ascii`, or `custom`. Corresponds to the `wordBreaker` + property in the [.model.ts source file](../reference/file-types/model-ts). + +Insert after word +: Many languages insert a space after a word. Some languages, like Thai or Khmer, do not use spaces. To suppress the space, you may set insertAfterWord to the empty string: + + ```keyman + punctuation: { + insertAfterWord: "", + }, + ``` + +[Read more](../guides/lexical-models/advanced/punctuation#toc-customizing-insertafterword) + +Quotation marks +: These are the quotation marks that surround the "keep" suggestion when it's displayed in the suggestion banner. [Read about Quotation marks here](../guides/lexical-models/advanced/punctuation#toc-customizing-quotesforkeepsuggestion). + +Right-to-left script +: Check this box to indicate that the lexical-model is for a right-to-left script. + +Language uses casing +: Tick this box for uppercase, capitalize, or any casing in the predicted word. + +Comments +: This field corresponds to the first lines of comments in the model + source, and is visible only to the model designer. + +Wordlists +: The Wordlists grid controls which additional wordlist files are + referenced by the model. Adding a wordlist file will add an extra + tab to the editor, and add the corresponding reference to the + lexical model source. Removing a wordlist will not delete the + component file, but will just remove the reference from the lexical + model source. Corresponds to the `sources` property in the + [.model.ts source file](../reference/file-types/model-ts). + +> ### Note +If the [.model.ts](../reference/file-types/model-ts) file cannot +be parsed by the model editor, the field shown here will be read only +and you will need to make changes only in the **Source** tab. This can +happen if the .model.ts contains more complex code. + +## Wordlist tabs + +Each [wordlist file](../reference/file-types/tsv) referenced in the +Wordlists grid is given its own tab. Wordlist tabs have two views: +Design, and Code. Changes to one view are reflected immedaitely in the +other view. [Learn more about wordlists](../guides/lexical-models/tutorial/step-3). + +Wordlist files should be stored in UTF-8 encoding (preferably without +BOM), and tab-separated format. Some applications, such as Microsoft +Excel, are unable to export in this format, so the compiler will also +accept UTF-16 encoded files, but this encoding is not recommended as it +is more difficult to manage in version control systems such as Git, +which is the system used by the Keyman Cloud lexical model repository. + +![Model Editor - Wordlist tab - Design view](../images/ui/frmModelEditor_Wordlist_Design.png) + +Every line of the tab-separated format file is shown here, and can be +edited directly. For most wordlists, it will be more effective to use an +external dictionary tool, such as SIL Fieldworks or SIL PrimerPrep to +generate the wordlist from a text corpus, and use this tab just to +preview the contents of the file. + +The **Sort by frequency** button has no effect on the functioning of the +wordlist, but can help you, the editor, by showing more common words +earlier in the list. + +![Model Editor - Wordlist tab - Code view](../images/ui/frmModelEditor_Wordlist_Code.png) + +> ### Note +The wordlist Code editor will accept the Tab key to insert a Tab +character. In other code editors in Keyman Developer, the Tab key +inserts spaces. + +## Source tab + +![Model Editor - Source tab](../images/ui/frmModelEditor_Source.png) + +This tab shows the source view of the model, written in the Typescript +programming language. The format of this file is documented in the +[Lexical Model File Format Reference](../reference/file-types/model-ts). + +## Build tab + +![Model Editor - Build tab](../images/ui/frmModelEditor_Build.png) + +A set of common controls is across the top of this tab: + +Compile Model +: You can compile the model for testing and installation by clicking + the **Compile Model** button, or + selecting Model, Compile Model. This will compile the model into a + single Javascript file, named as shown in the **Target filename** + field. + +Open source, build, and project folder +: Opens the folder which contains the model source, build, and project files. + + + +### Test Lexical Model in Web Browser + +Before distributing the lexical model, you can test it in a web browser. +[Learn more about testing lexical models](../guides/test/lexical-model). + +Keyboard for testing +: Allows you to select a compiled keyboard to provide input for + testing the lexical model. You can also choose to start testing a + keyboard directly from the keyboard source file and it will then be + available for use when testing the lexical model, until you restart + Keyman Developer. The keyboard must be a .js format keyboard with a + touch keyboard. + +Test Lexical Model +: Starts the Keyman Developer Web Server for the current lexical + model. This will list the various IP addresses and hostnames that Keyman Developer + is listening on + +Configure... +: Pressing this allows the [Options](./options) dialog to pop-up. + +Open in browser +: Starts your default browser with the selected address to allow + testing of the model directly + +Send to email... +: Sends the list of web addresses as an email so that you can more + easily open the test site on your mobile device, or share with + someone else on your network. + +Copy link +: Once the IP addresses are shown, feel free to copy any one of the links. + +To test on other platforms, open one of the debug host addresses listed +on your device. Your device will need to be on the same network as the +Keyman Developer computer. + +There is also a QR code which you can scan with your mobile device +camera to automatically load the selected site in the list of debug web +addresses. This is the quickest way to start testing on your mobile +device. + +The Send to email function is another way to open the addresses on your +mobile device without having to enter them manually. + +Learn more about [testing on the web and mobile devices](../guides/test/lexical-model). \ No newline at end of file diff --git a/developer/docs/help/context/new-ldml-project-parameters.md b/developer/docs/help/context/new-ldml-project-parameters.md new file mode 100644 index 00000000000..c1bf7cabb6c --- /dev/null +++ b/developer/docs/help/context/new-ldml-project-parameters.md @@ -0,0 +1,63 @@ +--- +title: New LDML Keyboard Project Parameters Dialog +--- + +Allows you to quickly fill in common parameters for a new LDML keyboard project, adding keyboard, package, documentation and metadata files, following the [file layout](/developer/keyboards/) used in the [Keyman keyboards repository](https://github.com/keymanapp/keyboards). + +Projects can also be created from the command line with [KMConvert](kmconvert). + +![Keyboard Editor - New file, Details tab](../images/ui/frmNewLDMLProjectParameters.png) + +### Parameters + +Keyboard Name + +: **Required.** The descriptive name of the keyboard. This will be set in the + ` + +Proxy Settings... +: Configure the HTTP proxy settings for online functionality within + Keyman Developer, such as uploading files to Tavultesoft. + +SMTP Settings... +: Configure your SMTP server settings for email functionality within + Keyman Developer, such as emailing debug URLs for the touch layout + debugger. + +## Editor tab + +![Options dialog - Editor tab](../images/ui/frmOptions_Editor.png) + +Use tab character +: Sets whether to use the Tab character or spaces for indents. + +Indent size +: The indent size, measured in number of spaces. + +Link quoted font size to primary font size +: If checked, the quoted font size will be the same as the default + font size. + +Default font +: Sets the font for ordinary text in the editor. + +Quoted font +: Sets the font for displaying comments text and strings in Keyman + source files in single or double quotes. + +Editor theme +: Sets the display theme and syntax highlighting options for the + editor. A [custom theme](../reference/editor-themes) can be defined + in a JSON file. + +## Debugger tab + +![Options dialog - Debugger tab](../images/ui/frmOptions_Debugger.png) + +Enable test window (from version 5.0) +: Enables the Keyman 5-style Test window instead of the debugger. + +Breakpoints fire also when exiting line +: Breakpoints will fire when a rule has finished being processed also. + +Turn on single step after breakpoint +: Activates single-step mode after a breakpoint fires. + +Show matched character offsets in stores +: Displays numeric indices of characters in stores + +Automatically recompile if no debug information available +: When the debugger starts, rebuild a keyboard without prompting if + the keyboard has no debug symbols included. + +Automatically reset debugger before recompiling +: If you are debugging a keyboard, make a change to the keyboard, and recompile it, + then the debugger needs to be reset in order to get access to the new keyboard. + Keyman Developer will normally prompt you to do this, but if you set this option, + then it will reset the debugger automatically instead. + +## Character Map tab + +![Options dialog - Character Map tab](../images/ui/frmOptions_CharacterMap.png) + +Find character under cursor automatically +: The character beneath the cursor in the edit window will be + highlighted in the Character Map. This will intelligently parse the + character data under the cursor so that a character code (e.g. + U+1234) will be highlighted correctly. + +Disable database lookups +: Disables looking characters up in the database. + +Update database +: Rebuilds the Unicode character database from source unicodedata.txt + and blocks.txt. These files can be downloaded from the Unicode + website at + [http://www.unicode.org/ucd/](http://www.unicode.org/ucd/). + This lets you update the character map with a newer version of Unicode. + Keyman Developer 17.0 was released with Unicode version 15.1 data. + +## Server tab + +![Options dialog - Server tab](../images/ui/frmOptions_Server.png) + +There are two configurations in the Keyman Developer Server section: +1. Configure Server... +2. List local URLs for Server + +Configure Server... + +: After clicking the button, a new window will pop-up + + ![Keyman Developer Server Options dialog](../images/ui/frmKeyman_Developer_Server_Options.png) + + You can customize the Keyman Developer server for testing the usability of your keyboard. Features of the Keyman Developer server include: + + * Seamless integration with the IDE (Start, Stop, Live reload, Recompile...) + * Port configuration + * Allow testing cross devices + * Wider range support for NGROK... + + [Find out more](https://github.com/keymanapp/keyman/pull/6073) + + Understanding the three tick boxes will enhance the usability of Keyman Developer: + - **Leave Server running after closing IDE**: allows keyboard testing on local URLs after closing Keyman Developer. + - **Use ngrok to provide public url for web debugger**: configure NGROK as instructed, once it looks something like this: + ![Keyman Developer NGROK](../images/ui/frmNGROK_Config.png) + + Please restart the machine, and the URL (*link ending in .ngrok-free.app*) will appear in the specified locations: + ![Keyman Developer NGROK URL 1](../images/ui/frmNGROK_Server_1.png) + ![Keyman Developer NGROK URL 2](../images/ui/frmNGROK_Server_2.png) + + Now, freely share it across multiple devices using the link or QR code. + ![Keyboard Test on Mobile](../images/ui/NGROK_Phone.png) + + - **Show server console window on start**: once ticked, Keyman Developer's server console will appear as an independent window as a node application with the default message: + `Starting Keyman Developer Server 17.0.290-beta, listening on port 8008.` + +List local URLs for Server +: Below Configure Server, untick the box, and it will quit displaying any local URLs for keyboard testing. + ![Keyman Developer Server Options dialog](../images/ui/frmList_Local_URLs.png) + +Explore more: [Keyman Developer Server](server#toc-configuring-keyman-developer-server) diff --git a/developer/docs/help/context/package-editor.md b/developer/docs/help/context/package-editor.md new file mode 100644 index 00000000000..38026732bc7 --- /dev/null +++ b/developer/docs/help/context/package-editor.md @@ -0,0 +1,194 @@ +--- +title: Package Editor +--- + +The Package Editor allows you to edit a .kps package source file, which will be +compiled into a .kmp package file. These files contain a set of keyboards, +documentation, fonts, and other related files, which make distribution and +installation of a keyboard in Keyman simple. + +## Files tab + +![Package Editor - Files tab](../images/ui/frmPackageEditor_Files.png) + +Use the Add... button to select the files to be included in the package, such +as .kmx and .js keyboard files, documentation, and related fonts; but you can +include any type of file here as well. + +If you add another .kmp package file, it will also be installed when this +package is installed, but will be managed separately and uninstalled separately. + +## Keyboards tab + +![Package Editor - Keyboards tab](../images/ui/frmPackageEditor_Keyboards.png) + +The Keyboards tab shows you some status information of keyboards you've added to +the package. There are also optional font dropdowns and a required "Languages" +section. The fields on the tab are: + +**Description** + +: The keyboard name (`&name` system store). + +**Files** + +: This shows the associated keyboard files (.kmx and .js files) + +**Version** + +: The keyboard version (`&keyboardversion` system store). + +**Is right-to-left** + +: Currently, this is only applicable to Android, iOS and Web (that is, .js + format) keyboards. This reflects the checkbox in the [Details tab](./keyboard-editor#details-fields) of the Keyboard editor. + +> ### Note + **Is right-to-left** will only be true if the following occur: + * "Keyboard is right-to-left" is checked in the Keyboard editor + * The compiled .js keyboard is added to the package + +**Keyboard font** + +: When font files are added to the package, this dropdown tells the Keyman apps + which font to use when rendering the On Screen Keyboard touch keyboard. + Optional. + +**Display font** + +: When font files are added to the package, this dropdown tells the Keyman apps + for iOS and Android which font to use in edit fields. It only applies within + the Keyman app and apps that support this functionality. Optional. + +**Web fonts** + +: It is possible now to specify additional font filenames that will be made + available to KeymanWeb, for example, providing fonts in WOFF or WOFF2 formats. + [More on web fonts](select-web-fonts) + +**Languages** + +: Because the language information in the .kmn source is deprecated, the + "Languages" section is required. Each language listed here is a [BCP 47 language tag](../reference/bcp-47). Use the **Add** button to + bring up the "Select BCP 47 Tag" dialog. When Keyman installs the keyboard + package, it will associate the keyboard with the language(s) you select here. + Required. + + ![Package Editor - Select BCP 47 Tag dialog](../images/ui/frmPackageEditor_Select_BCP_47_Tag.png) + +**Examples** + +: Examples allow you to provide short keystroke sequences to type sample text + with your keyboard. This can be the easiest way for a new user to start using + your keyboard, and is particularly helpful when your keyboard makes use of + keying sequences that may not be immediately obvious. + + As the keying examples may vary by language, you should include the BCP 47 tag + for each example, plus a short description (in English) of what the text is + about. + + The key sequence must list each key combination, separated by space. The + actual text for each key is reasonably arbitrary, to allow you to provide + examples for touch keyboards as well as desktop keyboards. There are three + special kinds of key strings: + * Modifier keys may be specified with the `+` character, e.g. `shift+e` or `right-alt+k`. Use lower case keys. The suggested standard modifiers are: `shift`, `ctrl`, `alt`, `left-alt`, `right-alt`, `left-ctrl`, `right-ctrl`, and `option` (mac). + * The space key itself may be specified with `space`. + * To avoid confusion with modifier keys, the + key can be specified with `plus`. + + For example, the key sequence x, j, m, Shift+e, r may be specified as `x j m shift+e r` or `x j m E r`. + + ![Package Editor - Edit Example dialog](../images/ui/frmPackageEditor_EditExample.png) + +## Details tab + +![Package Editor - Details tab](../images/ui/frmPackageEditor_Details.png) + +Enter the name of the package into the Package Name field; this will be +automatically filled from the name of the first keyboard you add to the package. + +Select a HTML readme file if you have one to include in the package; this will +be displayed before the package is installed as information about the package. + +Version numbers should be in the form `major.minor[.patch]`. Patch is optional +but is helpful for small bug fix releases. Each of the sections of the version +should be an integer. Keyman Desktop does integer comparisons on the version +number components, so, for example, version 2.04 is regarded as newer than +version 2.1. Alphabetic or date formats should be avoided as the installer for +the keyboard cannot determine which version is older reliably. + +You can also tick the checkbox labelled "Package version follows keyboard +version" to have the package version automatically track the keyboard version. + +The Copyright indicates the overall copyright of the package and all its +contents. + +Fill in the individual or organisation who authored the package in the Author +field, and a contact email address into the E-mail address field. These fields +are optional. + +A web site is encouraged and should be filled in the web site field, including +the initial "http://" or "https://". + +A package can optionally include a 140x250 JPEG or PNG image file to be shown +during installation. This image file must be added to the Files list in step 1, +then selected from the list here. + +### Related packages + +If a keyboard package is intended to replace an existing keyboard, or if there +are related packages, then the identifiers for these packages should be listed +here. + +There are two types of package relationships: + +* Deprecation: if the package replaces an existing package, ensure that you + select the 'Deprecated' check box. This information will be used on the Keyman + website, both to help users select the most recent version of a keyboard, and + also to offer upgrades to new packages for existing users of the package. + +* Related: if the 'Deprecated' check box is not selected, then this the + relationship information is used to provide links to the related packages on + the Keyman website. For example, you may create two keyboards for the same + language with different keying orders; then it would be appropriate to + cross-reference them with this field. + +![Package Editor - Edit Related Packages dialog](../images/ui/frmPackageEditor_EditRelatedPackage.png) + +## Shortcuts tab + +![Package Editor - Shortcuts tab](../images/ui/frmPackageEditor_Shortcuts.png) + +You can optionally have the package create a Start Menu folder, and populate it +with shortcuts to the files in the package, and optionally also a shortcut for +uninstallation. + +To add an entry, click New, and set the description, and choose a program or +document to load. + +An uninstall shortcut is no longer recommended; uninstall should be managed by +the user in Keyman Configuration. + +## Source tab + +![Package Editor - Source tab](../images/ui/frmPackageEditor_Source.png) + +The source of the .kps file in XML format. All details from previous tabs can be +seen in the Source tab, and changes in either the Source tab or the other tabs +will be reflected immediately in the other. + +## Compile tab + +![Package Editor - Compile tab](../images/ui/frmPackageEditor_Build.png) + +The final step is building the package. You must save the package file before +building, then choose Compile Package to build the package file. You can then +test the package to verify that it will install correctly with the Install +Package button. + +Once you are satisfied with your package, you should consider submitting the +keyboard to the [Keyman Cloud Keyboards Repository](/developer/keyboards/). + +## Package Installers + +As of Keyman Developer 17, bundled executable package installers for Keyman for +Windows can be created using [kmc](kmc), but cannot be created within the IDE. \ No newline at end of file diff --git a/developer/docs/help/context/project.md b/developer/docs/help/context/project.md new file mode 100644 index 00000000000..84bfb38722c --- /dev/null +++ b/developer/docs/help/context/project.md @@ -0,0 +1,36 @@ +--- +title: Project Window +--- + +The Project allows you to manage all the files that you are working on in Keyman Developer, and guides you on the steps to creating a keyboard solution. Changes to the project are automatically saved. + +You can open the Project window by pressing Ctrl+Shift+P, or selecting View, Project. + +## Welcome + +![Project window - Welcome tab](../images/ui/frmProject_Welcome.png) + + +This tab lists all the files that you have recently worked on. + +## Keyboards + +![Project window - Keyboards tab](../images/ui/frmProject_Keyboards.png) + + +This tab lists all the keyboard source files in your project. + +## Packaging + +![Project window - Packaging tab](../images/ui/frmProject_Packaging.png) + + +This tab lists all the package source files in your project. + +## Distribution + +![Project window - Distribution tab](../images/ui/frmProject_Distribution.png) + + +This tab lists all other files in your project, such as the +[.keyboard_info file used for uploading to the Keyboards repository](/developer/keyboards/). \ No newline at end of file diff --git a/developer/docs/help/context/select-web-fonts.md b/developer/docs/help/context/select-web-fonts.md new file mode 100644 index 00000000000..f03d437faf0 --- /dev/null +++ b/developer/docs/help/context/select-web-fonts.md @@ -0,0 +1,17 @@ +--- +title: Package Editor - Select Web Fonts +--- + +The Select Web Fonts dialog allows you to choose additional fonts that will be +made available as suggested fonts for KeymanWeb. These fonts should be included +in the package. + +Even though the fonts are included in the package, KeymanWeb will source the +fonts from its own infrastructure, so they will need to be shared in the Keyman +content delivery network repository +[s.keyman.com](https://github.com/keymanapp/s.keyman.com). + +Separate fonts can be specified for the On-Screen Keyboard and the recommended +Display font. + +![Select Web Fonts dialog](../images/ui/frmPackageEditor_SelectWebFonts.png) \ No newline at end of file diff --git a/developer/docs/help/context/server.md b/developer/docs/help/context/server.md new file mode 100644 index 00000000000..0a04d425d32 --- /dev/null +++ b/developer/docs/help/context/server.md @@ -0,0 +1,398 @@ +--- +title: Keyman Developer Server +--- + +# Introduction + +Keyman Developer Server provides a web-based front-end for testing and sharing +keyboards, lexical models and packages. + +The primary benefits of Keyman Developer Server are: + +* Test keyboards in a browser on your computer, including simulation of mobile + devices and touch keyboards +* Test lexical models in a browser on your computer +* Test keyboards, lexical models and packages on mobile devices +* Share keyboards, lexical models and packages to mobile devices and other users + +Keyman Developer Server was added in Keyman Developer 15, and replaces the old web +Test feature. + +![](images/server-iphone.png) + +# Installation and Startup + +## Windows + +Keyman Developer Server is always installed as a part of Keyman Developer. + +When you start Keyman Developer, Keyman Developer Server will start in the +background. + +> **Note:** The first time Keyman Developer Server starts, you may be presented +with a warning from your firewall or security software about Node.js Javascript +Runtime running from the Keyman Developer folder. This is the Keyman Developer +Server host process, and you should choose to allow Keyman Developer Server to +communicate at least on your local private network, or as your circumstances +dictate. + +By default, Keyman Developer Server will run when Keyman Developer is running, +and will shutdown when Keyman Developer is closed. However, you can also +configure Keyman Developer Server to stay running even after Keyman Developer is +closed. + +An icon will be displayed in the system notification area in the Taskbar +(it may be hidden in the expansion area): + +![](images/taskbar.png) + +Clicking on the icon opens a menu: + +![](images/taskbar-menu.png) + +The following menu items are available: + +**Open `http://localhost:8008` in browser** + +: Loads Keyman Developer Server home page in your default browser + +**Show console**, **Hide console** + +: Controls the visibility of the Node console for Keyman Developer Server. You + would only need to view the Node console if you were diagnosing issues with + Keyman Developer Server + +**Exit Keyman Developer Server** + +: Shuts down the Server. The Server can be restarted by closing and re-opening + Keyman Developer. + +## Linux and macOS + +Keyman Developer Server is included in the kmcomp.zip standalone distribution. +It requires nodeJS 16.0 or later, which should be installed according to your +platform's instructions. + +On macOS, if you use Homebrew, you can install nodeJS in Terminal: + +```shell +brew install node +``` + +You can download the latest kmcomp.zip with the following commands: + +```shell +mkdir kmcomp +cd kmcomp +curl -L https://keyman.com/go/download/kmcomp -o kmcomp.zip +unzip kmcomp.zip +``` + +To start the server, from the kmcomp folder you created earlier, run the +following command: + +```shell +cd server +npm run prod +``` + +You can stop the server at any time by pressing Ctrl+C +in the Terminal / shell. + +# Using Keyman Developer Server + +## Testing a Keyman keyboard in Keyman Developer Server + +In Keyman Developer, open a keyboard project, and load the keyboard .kmn file. +In the Build tab, click **Compile keyboard**, then click **Test keyboard on +web**. Finally, click **Open in browser** to access the keyboard in your +local Keyman Developer Server instance. + +You will be presented with the default page for Server. + +You will need to select your keyboard from the **Keyboard** menu. The keyboard will +be presented and you can test it either by typing using your hardware keyboard, +or interacting with the On-Screen Keyboard. + +![](images/server-iphone.png) + +When you make changes to your keyboard and recompile, the keyboard will be +reloaded instantly. There is no need to click the **Test keyboard on web** +button again. + +Keyman Developer Server remembers the ten most recent keyboards that you have +been testing, even after exiting and restarting. This makes it easier to switch +between projects in Keyman Developer. + +## Testing a lexical model in Keyman Developer Server + +In Keyman Developer, open a lexical model project, and load the model .model.ts +file. In the Build tab, click **Compile model**, then click **Test lexical +model**. Finally, click **Open in browser** to access the model in your local +Keyman Developer Server instance. + +You will be presented with the default page for Server. + +You will need to select a keyboard that works with the model from the +**Keyboard** menu, and also the model you have just started testing from the +**Model** menu. You will have the best results if you select a mobile device to +test the model. + +![](images/lexical-model-test.png) + +When you make changes to your model and recompile, the model will be reloaded +instantly. There is no need to click the **Test lexical model** button again. + +Keyman Developer Server remembers the ten most recent lexical models that you +have been testing, even after exiting and restarting. + +## Sharing a package to test from Keyman Developer + +In Keyman Developer, open either a keyboard or a lexical mdoel project, and load +the .kps file. In the Build tab, click **Compile package**, then click **Test +package on web**. Finally, click **Open in browser** to access the package in +your local Keyman Developer Server instance. + +The package will be available for install from the hamburger menu at the top +left of the banner. This is most useful when you access Server from another +device, as you can then easily install the package into Keyman on that device +without having to worry about copying files around manually. + +![](images/hamburger-menu.png) + +Keyman Developer Server remembers the ten most recent packages that you have +been testing, even after exiting and restarting. + +## Keyman Developer Server interface + +![](images/server-iphone.png) + +This describes the various elements of the Keyman Developer Server web interface. + +### Banner + +![](images/banner.png) + +On desktop devices, the top banner of Server includes four menus. On a mobile +device, the Device menu will not be visible, as the keyboard view will always be +the touch keyboard view at the bottom of the screen. + +### Status Bar + +![](images/status-bar.png) + +Below the banner, you will find a smaller status bar showing the currently +selected keyboard, model, and device. + +### Character Grid + +![](images/character-grid.png) + +Under this is a character preview grid, which shows you the underlying Unicode +values of the characters in your text area. This character grid also shows the +current cursor position and highlighted text, so you can easily correlate the +shaped characters with their underlying representation in Unicode. + +The example image above shows a Khmer keyboard with a sample string saying +"Khmer Language". Observe how the character preview grid shows the unshaped +underlying characters, how the order of characters stored in the text content +may differ from the presentation, and how diacritics and joined marks are +indicated with dotted circles. + +### Text Area + +![](images/text-area.png) + +The text area is immediately below this. You can enter text into this text area +using your hardware keyboard or using the On-Screen Keyboard. + +### On-Screen Keyboard + +![](images/on-screen-keyboard.png) + +The On-Screen Keyboard, shown directly below, is fully interactive, including +support for longpress and other gestures on touch, using your mouse on a +desktop device. The layout of the On Screen Keyboard and the device frame are +controlled from the **Device** menu. + +### Hamburger menu (three horizontal lines) + +![](images/hamburger-menu.png) + +**Download and install Keyman** + +: This is a shortcut to install Keyman for the current device. It detects + the type of device you are viewing this page on, and provides a direct + link to the install, whether that be a Windows executable, a Play Store + link, an App Store link or other method. + +**List of packages** + +: A list of up to ten most recent packages that you have been testing in + Keyman Developer. This will open the package in Keyman on the device, which + is most useful when testing on a mobile device or sharing the package to + other computers. + +**Upload file...** + +: Allows you to manually upload any compiled .js keyboard, compiled .model.js + lexical model, compiled .kmp file, or .ttf font to be available for testing. + This will be most useful when running Server on macOS or Linux, where + integration with the Keyman Developer IDE is not available. + + You can also drag and drop these same files onto the page. + +**Help...** + +: Opens this help site. + +**About Keyman Developer Server** + +: Provides information about the version of Keyman Developer Server. + +### Keyboard menu + +![](images/keyboard-menu.png) + +Lists up to ten keyboards that you have been testing most recently from Keyman +Developer. Select a keyboard to start testing it. + +If you select **(system keyboard)**, this disables testing of Keyman keyboards. + +### Model menu + +![](images/model-menu.png) + +Lists up to ten lexical models that you have been testing most recently from +Keyman Developer. Select a model to start testing it. Note that the +model/keyboard correlation is controlled by you within this view -- language +association is not available in Keyman Developer Server. + +While the desktop keyboard views will show predictions if a model is enabled, +this is not currently fully supported outside of Keyman Developer Server. You +will have better results selecting a touch device in the Device menu for testing +lexical models. + +If you select **(no model)**, this hides the predictions banner. + +### Device menu + +![](images/device-menu.png) + +This function is available only from desktop / laptop computers. On mobile +phones and tablets, the Device menu is hidden and only the device's default +Keyman keyboard form factor is available. + +When available, this allows you to simulate use of the devices shown, letting +you test the keyboard and/or model as you would see it and use it on that +device. The device selected changes the presentation of the keyboard, and is +reflected in the [`platform()` statement](/developer/language/reference/platform) +context as well. + +The devices listed are representative of the various types of platforms that +Keyman supports, to allow testing on each of the available form factors. + +## Making your Keyman Developer Server instance globally available with ngrok + +One of the fiddliest parts of testing keyboards and models with mobile devices +is transferring the files to your phone or tablet. Keyman Developer Server will +make files available on your local network for access, but it can be difficult +to configure firewalls and network settings successfully. + +To simplify testing, Keyman Developer Server integrates with a free tool called +[ngrok](https://ngrok.com) that provides a public URL to your instance of Keyman +Developer Server. This URL is dynamic and can change over time, and is only +available while Keyman Developer Server is running. This URL can be accessed +from any mobile device that is online, whether or not it is on your local +network. This means you can also quickly share keyboards, packages, and models +with other users, with a minimum of difficulty. + +**Warning:** While the ngrok service is running, your computer will be sharing +your Keyman Developer Server instance to anyone in the world. The Server +instance has read-only access to the keyboards that you have loaded into it, but +you may wish to turn ngrok support on only when you need it. + +ngrok does need a little bit of configuration. These steps will take you through +the process on Windows; on macOS and Linux, you will need to download and +configure ngrok manually. + +1. In Keyman Developer, open **Tools | Options**, select **Server** tab, and + click **Configure Server...**. You should be presented with a window similar + to this: + + ![](images/config.png) + +2. Tick the box **Use ngrok to provide public url for Server** +3. If ngrok is available, a version number will be shown to the right of the + **Download or update ngrok** button. Otherwise, click this button to download + the latest version. +4. You'll need a free ngrok account, so click the **Create free ngrok + account...** button to open the ngrok website, and follow the steps there + to finish the account creation process. +5. After creating the account, you should be presented with an authentication + token. You can also access this by clicking the **Get token** link in the + Keyman Developer Server Options dialog box. Paste this token into the + **Authentication token** edit box. +6. Select the most appropriate region for your location, to minimize the latency + (delay) when using the ngrok service. +7. Click **OK** to save changes, and start the ngrok service within Keyman + Developer Server. + +Once ngrok is configured, you should see an additional **Server** menu item in +Keyman Developer's **Tools** menu, with three items: + +**Open `https://some-url.ngrok.io` in browser** + +: Opens the public URL to your current Keyman Developer Server instance in the + default browser on your computer. + +**Copy URL to clipboard** + +: Copies the public URL to the clipboard so you can share it via email, instant + message, or other medium. + +**Configure...** + +: Opens the Keyman Developer Server Options dialog box. + +# Configuring Keyman Developer Server + +Keyman Developer Server has a number of configuration options. On Windows, using +Keyman Developer is the easiest way to manage these options. Open **Tools | +Options**, select **Server** tab, and click **Configure Server...**. + +![](images/config.png) + +## Configuration Files + +The configuration file `config.json` is stored in the following locations: +* Windows: `%appdata%\Keyman\Keyman Developer\Server\config.json` +* Linux: `~/.local/share/Keyman/Keyman Developer/Server/config.json` +* macOS: `~/Library/Preferences/Keyman/Keyman Developer/Server/config.json` + +## Configuration settings + +The value in parentheses is the name of the setting in `config.json`, where present. + +* **Default port** (`port`): specifies the port that Server listens on (http). + Defaults to `8008`. +* **Leave Server running after closing IDE**. This is off by default. If set, + Keyman Developer Server will start with Keyman Developer, and run until the + Windows session is finished by logging off or shutting down the computer. Keyman + Developer Server can be manually closed from the system notification area icon. +* **ngrok Settings** + * **Use ngrok to provide public url for Server** (`useNgrok`): Defaults to `false`. + Set to `true` if you want to enable use of ngrok tunnels. + * **Authentication token** (`ngrokToken`): the token provided by ngrok for setting + up a tunnel. + * **Region** (`ngrokRegion`): select the region in which you are located in order + to minimize latency through the tunnel. +* **Show Server console window on start**. This is off by default, and would only + normally be used for diagnostics or development of Keyman Developer itself. + +# Related Topics + +* [Keyboard Editor](keyboard-editor) +* [Model Editor](model-editor) +* [Package Editor](package-editor) +* [Options](options) diff --git a/developer/docs/help/guides/command-line.md b/developer/docs/help/guides/command-line.md new file mode 100644 index 00000000000..f4820281ce4 --- /dev/null +++ b/developer/docs/help/guides/command-line.md @@ -0,0 +1,9 @@ +--- +title: Keyman Developer command line tools guide +--- + +Keyman Developer has a set of command line tools for creating keyboards and +models. For more details see: + +* [`kmc` -- the Keyman command line compiler](../reference/kmc/) + diff --git a/developer/docs/help/guides/develop/advanced-keyboard-development-example.md b/developer/docs/help/guides/develop/advanced-keyboard-development-example.md new file mode 100644 index 00000000000..204d031a6a1 --- /dev/null +++ b/developer/docs/help/guides/develop/advanced-keyboard-development-example.md @@ -0,0 +1,236 @@ +--- +title: Advanced Keyboard Development Example +--- + +## Introduction + +Whenever you want to do much more in a keyboard than simple character +substitution, you will generally need to make use of advanced features +such as **stores**, **deadkeys**, and **multiple groups**. The [tutorial](tutorial) +has already shown some basic usage of stores and deadkeys, but has not +covered other possibilities of their use. In this topic we will examine +a keyboard that demonstrates some other uses of stores and deadkeys, and +introduces the use of multiple groups for complex processing. + +We recommend that you read the topics on +[groups](/developer/language/guide/groups), +[stores](/developer/language/guide/stores), and +[deadkeys](/developer/language/reference/deadkey) before continuing. + +The keyboard we will examine is **IPAMenu.kmn** (found in the Keyman +Developer Samples folder), which contains the beginnings of a menu-based +keyboard for using the International Phonetic Alphabet (IPA). You will +need a Unicode font with IPA characters (such as **Gentium**) to +properly use this keyboard, but you should be able to follow the code +even without. For more information about the IPA, see [The International +Phonetic +Association](https://www.internationalphoneticassociation.org/). + +Most of the IPA glyphs are derived from glyphs in the Latin alphabet, +used to represent differing sounds used in language. Because of this, it +seemed reasonable to place all glyphs derived from "a" on the "a" key, +and so on. We have implemented a few of the vowel symbols in this keyboard: + +![](../../images/ipa.gif) + + +## Overview of the Keyboard + +The basic operation of the keyboard is the displaying of a menu when a +key is pressed, followed by the output of a single character when the +user makes a selection from that menu with a number key. + +The first thing to notice is the organisation of most of the input and +output into stores: + +```keyman +store( choices ) '1234567890' +store( a_menu ) '[1æ 2a 3ɑ 4ɐ 5ʌ 6ɒ]' +store( e_menu ) '[1ɛ 2ɜ 3ə 4e 5ɘ 6ɚ 7ɝ 8ɞ]' +store( o_menu ) '[1o 2ø 3ɔ]' +store( a_chars ) 'æaɑɐʌɒ' dk(a_err) dk(a_err) dk(a_err) dk(a_err) +store( e_chars ) 'ɛɜəeɘɚɝɞ' dk(e_err) dk(e_err) +store( o_chars ) 'oøɔ' dk(o_err) dk(o_err) dk(o_err) dk(o_err) dk(o_err) dk(o_err) dk(o_err) +``` + +An important point to notice is the use of deadkeys in these stores: +we'll explain their purpose here later. + +The next thing that stands out is that the file has six separate groups, +four of which handle keystrokes and two which manipulate context only: + +```keyman +group( first ) + +group( main ) using keys + +group( final ) + +group( a_group ) using keys + +group( e_group ) using keys + +group( o_group ) using keys +``` + +## Full source + +The full keyboard source is shown below. Refer to this when following +the description after. + +```keyman +c IPAMenu.kmn +c +c Copyright ©2002 Tavultesoft. +c +c Demonstrates simple use of multiple groups to create a menu-based +c system for entering IPA characters, based on an example created +c by Peter E. Hauer's. +c +c A font with the IPA unicode characters defined must be used with this +c keyboard, for example, Code2000 or Lucida Sans Unicode +c +c Note that the stores pertaining to each letter could be placed in the +c group for that letter; the location of stores in the keyboard source +c has no effect on the final keyboard. + +Version 6.0 +Name "IPA Menu Example" + +c This keyboard should be independent of the user's +c system keyboard layout +store(&MnemonicLayout) '1' + +c ******************************************************************* +begin Unicode > use( first ) + +c keys used to choose menu items +store( choices ) '1234567890' + +c menu stores +store( a_menu ) '[1æ 2a 3ɑ 4ɐ 5ʌ 6ɒ]' +store( e_menu ) '[1ɛ 2ɜ 3ə 4e 5ɘ 6ɚ 7ɝ 8ɞ]' +store( o_menu ) '[1o 2ø 3ɔ]' +c add more menu stores here + +c character choice stores - error deadkeys are used to pad +c out the stores so they are the same length as the choices store +store( a_chars ) 'æaɑɐʌɒ' dk(a_err) dk(a_err) dk(a_err) dk(a_err) +store( e_chars ) 'ɛɜəeɘɚɝɞ' dk(e_err) dk(e_err) +store( o_chars ) 'oøɔ' dk(o_err) dk(o_err) dk(o_err) dk(o_err) dk(o_err) dk(o_err) dk(o_err) +c add more char stores here + +c ******************************************************************* +c first matches a menu in the context or passes processing to main +group( first ) + c match a menu on the context + outs(a_menu) > use(a_group) + outs(e_menu) > use(e_group) + outs(o_menu) > use(o_group) + c add more menus here + + c no menu was in the context, so process keys normally + nomatch > use(main) + +c ******************************************************************* +c main outputs the menus, and handles any other normal key processing +group( main ) using keys + c output a menu if appropriate + + 'a' > outs(a_menu) + + 'e' > outs(e_menu) + + 'o' > outs(o_menu) + c add more menu keys here + +c ******************************************************************* +c final matches error markers and finishes processing +group( final ) + dk(a_err) > beep outs(a_menu) + dk(e_err) > beep outs(e_menu) + dk(o_err) > beep outs(o_menu) + c add more error-marker handlers here + +c ******************************************************************* +c a_group handles the menu for a +group( a_group ) using keys + + any(choices) > index(a_chars, 1) use( final ) c output chosen character + + [K_BKSP] > nul c delete menu + nomatch > dk(a_err) use( final ) c invalid choice - error + +c ******************************************************************* +c e_group handles the menu for e +group( e_group ) using keys + + any(choices) > index(e_chars, 1) use( final ) c output chosen character + + [K_BKSP] > nul c delete menu + nomatch > dk(e_err) use( final ) c invalid choice - error + +c ******************************************************************* +c o_group handles the menu for o +group( o_group ) using keys + + any(choices) > index(o_chars, 1) use( final ) c output chosen character + + [K_BKSP] > nul c delete menu + nomatch > dk(o_err) use( final ) c invalid choice - error + +c add more menu groups here + +c End of file +``` + +## Primary Operation of the Keyboard + +When a key is pressed, execution begins at the group indicated by the +`begin` statement, in this case the `first` group. Because this group +does not specify `using keys`, it is limited to context manipulation +only: the output of this rule is dependent only on what came before the +current keystroke, and becomes the context for any further groups that +are called from this one. + +Let's suppose the a key has been pressed with no context. The `first` group will have nothing to match on, so the +`nomatch` rule fires and passes control to the `main` group. Here the +"a" key is matched, and the `a_menu` store is output, displaying the +menu of a-like characters. + +Now the user is presented with a menu of options to choose from. Suppose +he types 1 Once again the `first` group gains +control first, but this time matches the first rule, with the `a_menu` +string on the context, so control is passed to the `a_menu` group to +handle the keystroke. + +Here the 1 is matched as an entry in the `choices` store, and the corresponding character in the +`a_chars` store - in this case "æ" - is output. Finally, control goes +from here to the `final` group, which fails to match anything in the +context (which now includes the output from the previous group). + +## Error Handling + +One issue this keyboard has to deal with is if the user tries to select +an option that's not in the menu - when this happens, it should beep and +remain at the menu, so the user can try again. Also, if the user wants +to dismiss the menu, we should allow the use of Backspace to delete it - +this is simply done with a rule matching `[K_BKSP]` and outputting +`nul`. + +There are two rules which handle the user selecting a nonexistent +option: if the current menu has fewer than 10 entries, the user can +press a number key indicating a menu entry that is not there - this +situation will be matched by the `any(choices)` rule. The other occasion +is if the user presses any other key which is not valid for selecting a +menu option. This is handled by the `nomatch` rule in the group. For +both these cases we want the output to be the same: a `beep`, and remain +at the menu. To do this we will use deadkeys as error flags, one for +each menu. By padding the `a_char`, `e_char` and `o_char` stores to 10 +characters with these deadkeys, the output for this first situation will +be the error flag. Similarly, we can output these deadkeys in the +`nomatch` rules, to mark an error. + +The actual error handling is now done with the `final` group, which +matches the error flags on the output and outputs the `beep` and the +appropriate menu again. + +## Conclusion + +Although this example went nowhere near the limits of what can be done +with multiple groups, it gave a demonstration of some of the ways +multiple groups can be made to interact for more powerful processing. +You should now have some understanding of the use of advanced features +in Keyman Developer, and be able to begin using them to improve your +keyboards. \ No newline at end of file diff --git a/developer/docs/help/guides/develop/creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty.md b/developer/docs/help/guides/develop/creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty.md new file mode 100644 index 00000000000..21bf08df14b --- /dev/null +++ b/developer/docs/help/guides/develop/creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty.md @@ -0,0 +1,754 @@ +--- +title: Creating a Touch Keyboard Layout Part 2 +--- + +
+ + +
+ +This article will continue the guide to creating a touch keyboard layout. In +particular, we'll look in more detail at how keys are arranged, just what can be +specified for each key, and lastly, how this all looks in the JSON code used to +define the long press layout. + +## Key and Key Layer Organization + +There are two issues that are immediately apparent when considering key layout +on touch devices. + +First, on smaller touch devices, such as phones, if we try to display the same +arrangement of keys that is used for a typical desktop keyboard, the keys are so +small that it is difficult to reliably select the wanted key. If used in +'portrait' view, key widths are too narrow for our 'fat fingers': + +![](../../images/touch_amharic_keyboard_4.png) + +Or if in 'landscape' view, key heights are too small: + +![](../../images/touch_amharic_keyboard_5.png) + +The situation is improved markedly if we limit the number of keys per row to ten +and have no more than four key rows: + +![](../../images/touch_amharic_keyboard_6.png) + +and, in landscape view: + +![](../../images/touch_amharic_keyboard_7.png) + +So which keys can be eliminated, and which keys must be on the base (default) +layer? This brings us to the second point. When using phones and other touch +layout devices rather than desktop keyboards, text entry is most often +single-handed, which makes it best to avoid using the 'shift' layer for entering +normal text. Secondary keyboard layers will, of course, still be usually needed +for uppercase, numerals and symbols, but will be used much less frequently. + +Most desktop keyboards (for European languages, at least) are already laid out +with no more than ten letter (or digit) keys per row, with the remaining keys +being used for accented letters, punctuation and other non-letter input. So the +obvious choice is to move non-letter keys (and accented letters) either to a +secondary key layer, or to long press ('pop-up') keys. The GFF Amharic desktop +keyboard is fortunately also arranged with only ten letters per key row (other +keys being used for punctuation, etc.), as the many different characters in the +Amharic 'abugida' are generated by multi-letter sequences rather than being +displayed on separate keys. The Geez script does not have both upper-case and +lower-case forms, so those initial consonants that require use of the 'shift' +layer on the desktop keyboard have been added to the corresponding base-layer +key as long press keys: + +![](../../images/touch_amharic_keyboard_8.png) + +Arrangement of punctuation and other non-letter keys is more flexible as mobile +users are generally familiar with using long press keys or a secondary key layer +for finding and entering digits and special characters. However, some +punctuation characters are used so frequently that they need to be on the base +layer. For the GFF Amharic keyboard, the most frequently used punctuation +characters can be output from the base layer using standard or long press keys. +The Geez word space character, in particular, is so frequently used that it was +considered useful to add it to the bottom key, adjacent to the space bar, as is +sometimes done for other scripts, such as Japanese, on desktop (physical) +keyboards. + +## Arranging keys with the layout editor + +The Keyman Developer layout editor really makes it quite easy to try different +key layouts and choose what is best for your keyboard. The image below +highlights just how, for any selected key, using the clickable icons circled, a +key row can be added above (1) or below (2), a key added before (3) or after +(4), the selected key deleted (5), and how an array of long press keys +(sometimes called "subkeys") can be added (6). + +![](../../images/touch_amharic_keyboard_9.png) + +## Key properties + +For each visual key, the appearance and behaviour is determined by a number of +properties: + +### Key code + +Each key must be given an identifying key code which is unique to the key layer. +Key codes by and large correspond to the virtual key codes used when creating a +keyboard program for a desktop keyboard, and should start with `K_`, for keys +mapped to standard Keyman virtual key names, e.g. `K_HYPHEN`, and `T_` or `U_` +for user-defined names, e.g. `T_ZZZ`. If keyboard rules exist matching the key +code in context, then the output from the key will be determined by the +processing of those rules. It is usually best to include explicit rules to +manage the output from each key, but if no rules matching the key code are +included in the keyboard program, and the key code matches the pattern +`U_xxxx[_yyyy...]` (where `xxxx` and +`yyyy` are 4 to 6-digit hex strings), then the Unicode characters +`U+xxxx` and `U+yyyy` will be output. As of Keyman 15, you +can use more than one Unicode character value in the id (earlier versions +permitted only one). The key code is always required, and a default code will +usually be generated automatically by Keyman Developer. + +- `K_xxxx` is used for a standard Keyman Desktop key name, e.g. + `K_W`, `K_ENTER`. You cannot make up your own `K_xxxx` names. + Many of the `K_` ids have overloaded output behaviour, for instance, if no + rule is matched for `K_W`, Keyman will output 'w' when it is touched. The + standard key names are listed in [Virtual Keys and Virtual Character + Keys](/developer/language/guide/virtual-keys "Virtual Keys and Virtual +Character Keys"). Typically, you would use only the "common" virtual key + codes. + +- `T_xxxx` is used for any user defined names, e.g. `T_SCHWA`. If you wanted + to use it, `T_ENTER` would also be valid. If no rule matches it, the key + will have no output behaviour. + +- `U_####[_####]` is used as a shortcut for a key that will output those + Unicode values, if no rule matches it. This is similar to the overloaded + behaviour for `K_` ids. Thus `####` must be valid Unicode characters. E.g. + `U_0259` would generate a schwa if no rule matches. It is still valid to + have a rule such as `+ [U_0259] > ...` + +As noted above, some `K_xxxx` codes emit characters, if no rule is defined. +There are also some codes which have special functions: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdentifierMeaning
`K_ENTER`Submit a form, or add a new line (multi-line); the key action may vary depending on the situation.
`K_BKSP`Delete back a single character. This key, if held down, will repeat. It is the only key code which triggers + repeat behavior.
`K_LOPT`Open the language menu (aka Globe key).
`K_ROPT`Hide the on screen keyboard.
`K_TAB`, `K_TABBACK`, `K_TABFWD`Move to next or previous element in a form. Note that these key functions are normally + implemented outside the touch layout, so should not typically be used. `K_TAB` will go to previous + element if used with the `shift` modifier.
+ +Any key can be used to switch keyboard layers (see +[`nextlayer`](#toc-nextlayer)), but the following layer-switching key codes have +been added for switching to some commonly used secondary layers. Note that these +keys have no specific meaning; you must still set the `nextlayer` property on +the key. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdentifierMeaning
`K_NUMERALS`Switch to a numeric layer
`K_SYMBOLS`Switch to a symbol layer
`K_CURRENCIES`Switch to a currency layer
`K_SHIFTED`Switch to a shift layer
`K_ALTGR`Switch to a right-alt layer (desktop compatibility)
+ +### Key text + +The key text is simply the character (or characters) that you want to appear on +the key cap. This will usually be the same as the characters generated when the +key is touched, unless contextual rules are used to generate output according to +a multi-key sequence, as will be true for the GFF Amharic keyboard. Unicode +characters can be specified either as a string using a target font or using the +standard hex notation `\uxxxx`. This may be sometimes more convenient, for +example, for characters from an uninstalled font, or for diacritic characters +that do not render well alone. + +A number of special text labels are recognized as identifying special purpose +keys, such as Shift, Backspace, Enter, etc., for which icons are more +appropriately used than a text label. A special font including these icons is +included with Keyman and automatically embedded and used in any web page using +Keyman. The list of icons in the font will probably be extended in future, but +for now the following special labels are recognized: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Text StringKey CapKey Purpose
`*Shift*`Select Shift layer (inactive). Use on the Shift key to indicate that it switches to the shift layer.
`*Shifted*`Select Shift layer (active). Use on the Shift key on the shift layer to switch back to the default layer.
`*ShiftLock*`Switch to Caps layer (inactive). Not commonly used; generally double-tap on Shift key is used to access the + caps layer.
`*ShiftedLock*`Switch to Caps layer (active). Use on the Shift key on the caps layer to switch back to the default layer. +
`*Enter*` or Return or Enter key (shape determined by writing system direction)
`*LTREnter*`Return or Enter key (left-to-right script shape)
`*RTLEnter*`Return or Enter key (right-to-left script shape)
`*BkSp*` or Backspace key (shape determined by writing system direction)
`*LTRBkSp*`Backspace key (left-to-right script shape)
`*RTLBkSp*`Backspace key (right-to-left script shape)
`*Menu*`Globe key; display the language menu. Use on the `K_LOPT` key.
`*Hide*`Hide the on screen keyboard. Use on the `K_ROPT` key.
`*ABC*`Select alphabetic layer (Uppercase)
`*abc*`Select alphabetic layer (Lowercase)
`*123*`Select the numeric layer
`*Symbol*`Select the symbol layer
`*Currency*`Select the currency symbol layer
`*ZWNJ*` (iOS) or  (Android)Zero Width Non Joiner (shape determined by current platform)
`*ZWNJiOS*`Zero Width Non Joiner (iOS style shape)
`*ZWNJAndroid*`Zero Width Non Joiner (Android style shape)
`*ZWNJGeneric*`Zero Width Non Joiner (not platform-specific)
`*Sp*`Regular space
`*NBSp*`No-Break Space
`*NarNBSp*`Narrow No-Break Space
`*EnQ*`En Quad
`*EmQ*`Em Quad
`*EnSp*`En Space
`*EmSp*`Em Space
`*PunctSp*`Punctuation Space
`*ThSp*`Thin Space
`*HSp*`Hair Space
`*ZWSp*`Zero Width Space
`*ZWJ*`Zero Width Joiner
`*WJ*`Word Joiner
`*CGJ*`Combining Grapheme Joiner
`*LTRM*`Left-to-right Mark
`*RTLM*`Right-to-left Mark
`*SH*`Soft Hyphen
`*HTab*`Horizontal Tabulation
+ +The following additional symbols are also available, but intended for working +with legacy desktop layouts, and not recommended for general use: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Text StringKey CapKey Purpose
`*Tab*`Move to next input element in tab order
`*TabLeft*`Move to previous input element in tab order
`*Caps*`Select caps layer (legacy)
`*AltGr*`Select AltGr (Right-Alt) layer (desktop layout compatibility)
`*Alt*`Select Alt layer (desktop layout compatibility)
`*Ctrl*`Select Ctrl layer (desktop layout compatibility)
`*LAlt*`Select Left-Alt layer (desktop layout compatibility)
`*RAlt*`Select Right-Alt layer (desktop layout compatibility)
`*LCtrl*`Select Left-Ctrl layer (desktop layout compatibility)
`*RCtrl*`Select Right-Ctrl layer (desktop layout compatibility)
`*LAltCtrl*`Select Left-Alt-Ctrl layer (desktop layout compatibility)
`*RAltCtrl*`Select Right-Alt-Ctrl layer (desktop layout compatibility)
`*LAltCtrlShift*`Select Left-Alt-Ctrl-Shift layer (desktop layout compatibility)
`*RAltCtrlShift*`Select Right-Alt-Ctrl-Shift layer (desktop layout compatibility)
`*AltShift*`Select Alt-Shift layer (desktop layout compatibility)
`*CtrlShift*`Select Ctrl-Shift layer (desktop layout compatibility)
`*AltCtrlShift*`Select Alt-Ctrl-Shift layer (desktop layout compatibility)
`*LAltShift*`Select Left-Alt-Shift layer (desktop layout compatibility)
`*RAltShift*`Select Right-Alt-Shift layer (desktop layout compatibility)
`*LCtrlShift*`Select Left-Ctrl-Shift layer (desktop layout compatibility)
`*RCtrlShift*`Select Right-Ctrl-Shift layer (desktop layout compatibility)
+ +### Key type + +The general appearance of each key is determined by the key type, which is +selected (in Keyman Developer) from a drop-down list. While generally behavior +is not impacted by the key type, Spacer keys cannot be selected. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key TypeValueMeaning
Default`0`Any normal key that emits a character
Special`1`The frame keys such as Shift, Enter, BkSp.
Special (active)`2`A frame key which is currently active, such as the Shift key on the shift layer.
Deadkey`8`Does not impact behavior, but colors the key differently to indicate it has a special function, such as a + desktop-style deadkey.
Blank`9`A blank key, which may be used to maintain a layout shape. Usually colored differently. Does not impact + behavior.
Spacer`10`Does not render the key, but leaves a same-sized gap in its place. The key cannot be selected.
+ +The colour, shading and borders of each key type is actually set by a style +sheet which can be customized by the page developer. + +### font-family + +If a different font is required for a particular key text, the `font-family` +name can be specified. The font used to display icons for the special keys (as +mentioned above) does not need to be specified, as it will be automatically +applied to a key that uses any of the special key text labels. + +### font-size + +If a particular key cap text requires a different font size from the default for +the layout, it should be specified in em units. This can be helpful if a the key +text is either an unusually large character or, alternatively, a word or string +of several characters that would not normally fit on the key. + +### width + +The layout is scaled to fit the widest row of keys in the device width, assuming +a default key width of 100 units. Keys that are to be wider or narrower than the +default width should have width specified as a percentage of the default width. +For any key row that is narrower than the widest row, the width of the last key +in the row will be automatically increased to align the right hand side of the +key with the key with the right edge of the keyboard. However, where this is not +wanted, a "spacer" key can be inserted to leave a visible space instead. As +shown in the above layouts, where the spacer key appears on the designer screen +as a narrow key, but will not be visible in actual use. + +### pad + +Padding to the left of each key can be adjusted, and specified as a percentage +of the default key width. If not specified, a standard padding of 5% of the key +width is used between adjacent keys. + +### layer + +To simplify correspondence with desktop keyboards and avoid the need for using a +separate keyboard mapping program, touch layout keys can specify a desktop +keyboard layer that the keystroke should be interpreted as coming from. Layer +names of `shift`, `ctrl`, `alt`, `ctrlshift`, `altshift`, `ctrlalt` and +`ctrlaltshift` can be used to simulate use of the appropriate modifier keys when +processing rules. + +### nextlayer + +The virtual keys `K_SHIFT`, `K_CONTROL`, `K_MENU`, etc. are normally used to +switch to another key layer, which is implied by the key code. The left and +right variants of those key codes, and also additional layer-switching keys +mentioned above (`K_NUMERALS`, `K_SYMBOLS`, `K_CURRENCIES`, `K_ALTGR`) can also +be used to automatically switch to the appropriate key layer instead of +outputting a character. However, it is sometimes useful for a key to output a +character first, then switch to a new layer, for example, switching back to the +default keyboard layer after a punctuation key on a secondary layer had been +used. Specifying the `nextlayer` for a key allows a different key layer to be +selected automatically following the output of the key. Of course, that can be +manually overridden by switching to a different layer if preferred. + +Another way the `nextlayer` property can be used is for a non-standard layer +switching key. So, for example, for the GFF Amharic keyboard phone layout, +switching back to the base layer uses a `T_ALPHA` key code, in which `nextlayer` +is set as default. In this case, it is also necessary to add a rule to the +keyboard program: + +```keyman ++ [T_ALPHA] > nul +``` + +to ensure that the key's scan code is ignored by the keyboard mapping. + +When a key in a touch layout definition includes a **Next Layer** control, this +takes precedence over setting layer via the +[`layer`](/developer/language/reference/layer) store (as the **Next Layer** +control is applied once the rule has finished processing). + +### subkey + +Arrays of longpress 'subkeys' or pop-up keys can be defined for any key, and +will appear momentarily after the key is touched if not immediately released. +This provides a major advantage over physical desktop keyboards in that many +more keys can be made available from a single layer, without cluttering up the +basic appearance of the layout. For the GFF Amharic keyboard, we have already +noted how such subkey arrays are used to manage the extra keys that, on the +desktop keyboard, would appear in the shift layer. But they are also used to +provide another way to enter the two different types of each syllable-initial +vowels (glottal or pharyngeal), as a visual alternative to pressing the key +twice. + +The same properties that are defined for standard keys can also be specified for +each subkey except that the width of each key in a subkey array will always be +the same as the width of the key that causes the subkeys to be shown, and key +spacing always uses the default padding value. + +The GFF Amharic keyboard, like many others, is mnemonic, so it is useful to also +display the standard key cap letter that would appear on the key of a desktop +keyboard. This is enabled globally in the On-Screen layout editor and applies to +both the On-Screen keyboard and touch layouts. + +## Representing (and editing) the visual layout with JSON code + +In case you are wondering, 'Why do I need to know that?', the reason is that, +just as with keyboard mapping code, it is sometimes easier to edit a text +specification than to use the GUI layout design tool. Keyman Developer switches +seamlessly between the visual layout tool and the code editor, unless, of +course, careless editing of the code results in invalid JSON syntax! + +The GFF Amharic phone layout code starts as: + +```javascript + { + "phone": { + "font": "Tahoma", + "layer": [{ + "id": "default", + "row": [{ + "id": 1, + "key": [{ + "id": "K_Q", + "text": "ቅ", + "pad": "0" + }, { + "id": "K_W", + "text": "ው" + }, + + . . . +``` + +As long as standard JSON syntax is remembered - nested braces {…}, quoted +strings "…" for both element names and values, element or object arrays in +square brackets […], and no trailing comma after the last element in an array - +it is quite easy to understand a layout, which will usually comprise a list of +two separate JSON objects for tablet and phone. + +Now you're ready to create a great touch layout for your own Keyman keyboard! + +Other articles on developing touch layouts: + +- [Creating a touch keyboard layout for Amharic - part 1](creating-a-touch-keyboard-layout-for-amharic) +- [How to test your keyboard layout — touch and desktop](../test/keyboard-touch-and-desktop) + +You can distribute your keyboard to other users by following the instructions in +this article: + +- [Distribute keyboards to Keyman applications](../distribute/packages) diff --git a/developer/docs/help/guides/develop/creating-a-touch-keyboard-layout-for-amharic.md b/developer/docs/help/guides/develop/creating-a-touch-keyboard-layout-for-amharic.md new file mode 100644 index 00000000000..3dc96dfc950 --- /dev/null +++ b/developer/docs/help/guides/develop/creating-a-touch-keyboard-layout-for-amharic.md @@ -0,0 +1,124 @@ +--- +title: Creating a Touch Keyboard Layout Part 1 +--- + +This article describes the approach taken and some of the issues encountered when adapting the existing GFF‑AMH‑7 Amharic keyboard for easier use on phone and tablet touch screen devices. + +A widely used Keyman Desktop phonetic keyboard for Amharic (developed by Geez Frontier Foundation) was also compiled and made available for use with KeymanWeb. When used with web browsers on desktop computers, the behaviour of the keyboard was identical to use with Keyman Desktop, but use of the same Amharic keyboard on smart phones or other touch screen devices revealed a number of weaknesses in the layout. + +### Background + +The desktop layout has a default layer and a shift layer which are fairly similar: + +![](../../images/touch_amharic_keyboard.png) + + +Several keycaps have more than one Geez script letter, indicating that pressing the key twice changes the character output. Geez script is better understood as an Abugida, rather than an alphabet, since each consonant-vowel syllable is a modification of the original letter rather than having separate letters for consonant and vowel. So when entering Amharic, the form of a consonant changes from the default syllable form to the appropriate syllable character for the consonant and vowel pressed. However, as each vowel can also occur in stand-alone syllables as either pharyngeal or glottal forms, the two separate syllables for each vowel are shown on the "a", "e", "i", "o" and "u" keys. + +But what about the extra characters on the "s" and "h" keys? Amharic (like most Semitic languages) is rich in fricative sounds, and Geez has four separate, distinct phonemes that are roughly similar to the English +"s", and three similar to "h". The desktop layout handles this by using +repeated keystrokes in combination with shift to select the alternate +consonants (before typing the appropriate vowel). That works for a +desktop keyboard, but not for a touch screen device, for which it is +often impractical to hold a shift key while touching another key. + +Small format touch-screen devices such as phones have a further +difficulty in that if they display the full number of key rows and keys +in each row that appear in the desktop layout, the keys are too small +for convenient use. + +On the other hand, touch screen devices offer one very significant +advantage over layouts based on a physical keyboard - it is quite easy +to configure dynamic touch screen layouts to display contextually +appropriate character alternates in separate key windows as each key is +touched. + +### Design goals + +With the above background, the following design goals were set for +developing a touch screen layout for Amharic: +- Maintain the same basic phonetic layout functionality that users are familiar with. +- Instead of having "default" and "shift" layers, design the layout so that all alphabetic text and frequently used punctuation can be entered from a single layer, moving less commonly used punctuation and symbols to the second "symbol" layer. +- Use a dynamic window rather than the shift key to select the initial "s" or "h" consonant for a syllable. +- Use a separate key (adjacent to the space bar) for the Ethiopic word-space character, instead of requiring shift + space to be pressed. +- For tablet devices, increase key size slightly by removing most non-letter keys from each row, moving them either to dynamic ("pop-up") key windows, or to the symbol layer. +- For phones and other small-format devices, further increase the key size by not displaying the digits in the default (alphabetic) layer, and moving many of the less commonly used characters to dynamic windows, reducing the number of key rows by one for each layer. + +### Implementation + +Achieving the design goals required making a number of decisions for +each format (tablet and phone), in particular: + +- Which keys can be removed from the default layer? +- Which keys can be removed from the symbol layer? +- Which "pop-up" keys should be grouped with each base character? + +Keyman Developer 17's Touch Layout editor greatly simplifies the process +of developing the JSON layout file that specifies the touch layout for +each device, making it easy to move keys around, create pop-up key +arrays, and adjust key widths, labels and other parameters. While the +graphical interface does not allow moving entire key rows between layers +or device types, that is easily managed using the code window. + +To keep a keyboard compatible with the desktop version, it is important +to use the same key identifiers and "shift states". So, no matter +whether a particular character occurs in a visible row or in a pop-up +array, it should usually use the same code as on the original desktop +layout keyboard. + +Where a key did not occur in the original layout and does not correspond +to a desktop layout key, identifiers will usually be something like +T\_<name> where <name> will typically be a Unicode character +name, or an obvious contraction of it. Note that this is just a rule of +thumb and key identifiers can be anything that makes sense. Such keys +are distinct from the K\_<name> identifiers that are associated +with physical keys, and should normally have a mapping rule added +explicitly to the mapping program. If no rule is added, output will +default to the keycap text, but this is not recommended. + +All key "rotations" - pressing the same key repeatedly to select from +alternate output characters - in the original desktop keyboard program +are still supported, but have been supplemented by pop-up key arrays, +allowing a user to visually select the wanted character instead of +stepping through alternates. Similarly, Ethiopian numerals can be +selected from a pop-up key array attached to each numeral key, as well +as being output by pressing the single quote key before a digit key. + +The final tablet default keyboard layer, as displayed in the Touch +Layout editor in the previous release of Keyman Developer 10, now appears +as: + +![](../../images/touch_amharic_keyboard_2.png) + +Here the editor is shown with the "s" key selected, displaying the +pop-up key array with the four different Geez characters that can be +produced, each of which will combine as necessary with any subsequently +typed vowel. + +For the small format (e.g. iPhone) layout, the two keyboard layers are: + +![](../../images/touch_amharic_keyboard_3.png) + +For these layouts, the row length has been reduced to the minimum number +of ten keys, moving backspace to another row. The numerals only appear +on the second layer, as is usual with phone layouts. All less-frequently +used keys are now available only in pop-up key windows. + +### Summary + +With these principles guiding all the changes made, the Amharic keyboard +now adapts to various device form factors, making use of device-specific +usability factors, while retaining the same conceptual input model as +the original keyboard. This means that users can use the keyboard layout +on different devices with a minimum of difficulty. These methods should +be applicable to other keyboard layouts. + +Other articles on developing touch layouts: + +- [Creating a touch keyboard layout for Amharic - the nitty gritty](creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty) +- [How to test your keyboard layout — touch and desktop](../test/keyboard-touch-and-desktop) + +You can distribute your keyboard to other users by following the +instructions in this article: + +- [Distribute keyboards to Keyman applications](../distribute/packages) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/imx/imxdll.md b/developer/docs/help/guides/develop/imx/imxdll.md new file mode 100644 index 00000000000..8d4fe029bcd --- /dev/null +++ b/developer/docs/help/guides/develop/imx/imxdll.md @@ -0,0 +1,115 @@ +--- +title: DLL Exports +--- + +The DLL is called from Keyman with `LoadLibrary()`. All functions are +then found with `GetProcAddress()`. You must ensure that the function +exports do not have ordinals encoded in the names. The best way to +accomplish this in C/C++ is to use a .def file. + +## DLL group function exports + +The function declaration for the DLL group function is: + +```c +BOOL WINAPI KeyEvent(HWND hwndFocus, WORD KeyStroke, WCHAR KeyChar, DWORD ShiftFlags); +``` + +Note that `KeyEvent()` is a placeholder for any name that you wish to +use. You can have multiple exports for Keyman use in a single DLL. + +| | | +|------------|-------| +| hwndFocus | The currently focused window. You will probably never have a need to use this. | +| KeyStroke | The virtual key code for the current key. | +| KeyChar | The character code for the current key (based on US English layout).
This will be `0` if _KeyStroke_ does not generate a character (e.g. function keys). | +| ShiftFlags |The shift state for the current key. The following shift states are possible:
(see the table below) | + +| Flag | Value | Description | +|--------------|----------|----------------------------------------| +| LCTRLFLAG | `0x0001` | Left Control Flag | +| RCTRLFLAG | `0x0002` | Right Control Flag | +| LALTFLAG | `0x0005` | Left Alt Flag | +| RALTFLAG | `0x0008` | Right Alt Flag | +| K_SHIFTFLAG | `0x0010` | Shift flag | +| K_CTRLFLAG | `0x0020` | Ctrl flag (unused here; see l/r flags) | +| K_ALTFLAG | `0x0040` | Alt flag (unused here; see l/r flags) | +| CAPITALFLAG | `0x0100` | Caps lock on | +| NUMLOCKFLAG | `0x0400` | Num lock on | +| SCROLLFLAG | `0x1000` | Scroll lock on | +| ISVIRTUALKEY | `0x4000` | It is a Virtual Key Sequence | + +## Optional DLL Exports + +Keyman recognises a number of other exports, if they are defined in the +DLL. None of these are required. These functions will be called when a +keyboard that references the DLL is manipulated. They will not be called +for keyboards that do not reference the DLL. + +The following exports are available: + +### KeymanIMInit + +```c +BOOL WINAPI KeymanIMInit(PSTR keyboardname); +``` + +`KeymanIMInit()` is called once when the keyboard identified by +`keyboardname` is loaded for a given process. It is called for each +process in which the keyboard is loaded. + +### KeymanIMDestroy + +```c +BOOL WINAPI KeymanIMDestroy(PSTR keyboardname); +``` + +This is called once when the keyboard identified by `keyboardname` is +unloaded in a given process. It is called when the process exits +normally, or when Keyman refreshes its keyboard list after keyboards are +added or removed. If the keyboard is subsequently reloaded, +`KeymanIMInit()` will be called again. + +### KeymanIMActivate + +```c +BOOL WINAPI KeymanIMActivate(PSTR keyboardname); +``` + +This function is called whenever the user or a program activates the +keyboard. It is never called before `KeymanIMInit()` (unless +`KeymanIMInit()` is not exported). This is an appropriate place to +switch on permanently-visible IMC windows. `KeymanIMActivate()` can also +be called when switching processes and the target process has a related +keyboard already active. + +### KeymanIMDeactivate + +```c +BOOL WINAPI KeymanIMDeactivate(PSTR keyboardname); +``` + +This function is called when the user or a program switches off a +related keyboard. It is always called before `KeymanIMActivate()` for +the next keyboard. It will also be called when the user activates +another process, to give the DLL a chance to hide top-most IMC windows. + +### KeymanIMConfigure + +```c +BOOL WINAPI KeymanIMConfigure(PSTR keyboardname, HWND hwndParent); +``` + +`KeymanIMConfigure()` is called when the user clicks the Configure +button in Keyman Configuration to configure the DLL-specific +functionality for the keyboard. The appropriate behaviour is to display +a dialog box, and save the settings in the registry. + +This function is separate from all the other functions. It can be called +when there are no keyboards loaded, or even if Keyman itself is not +loaded. You should not attempt to call Keyman32.dll from this function. + +## See also + +- [DLL Interface for Keyman - Introduction](index) +- [The imlib.cpp library module](imxlib) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/imx/imxlib.md b/developer/docs/help/guides/develop/imx/imxlib.md new file mode 100644 index 00000000000..178ae0f3eff --- /dev/null +++ b/developer/docs/help/guides/develop/imx/imxlib.md @@ -0,0 +1,208 @@ +--- +title: The imlib.cpp library module +--- + +imlib.cpp, included in the development kit, contains a set of useful +functions for interfacing to Keyman. + +## PrepIM + +```c +BOOL PrepIM(void); +``` + +`PrepIM()` initialises the Keyman32 imports. You should not call any of +the Keyman imports without calling `PrepIM()` first. If `PrepIM()` +fails, you should exit without doing any processing. + +## IMDefWindowProc + +```c +BOOL IMDefWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lResult); +``` + +`IMDefWindowProc()` should be called from an IMC window procedure (see +section titled Input Method Composition windows). If it returns `TRUE` +you should return the value stored in `lResult` without any further +processing. `IMDefWindowProc()` mostly manages window activation and +movement. + +## Keyman Imports + +The DLL can call Keyman functions to interact with Keyman and the target +application. It should not attempt to directly control the application +as Keyman will be doing this. You should never call any of the functions +here from the `KeymanIMConfigure()` callback. + +You can use `PrepIM()`, declared in imlib.cpp to get access to the the +Keyman functions. When using imlib.cpp, the functions are declared as +pointers, so you need to dereference them to call them in C (e.g. for +KMGetContext, call `(*KMGetcontext)(buf,len);`) + +## KMGetContext + +```c +BOOL WINAPI KMGetContext(PWSTR buf, DWORD len); +``` + +`KMGetContext()` returns the last `len-1` UTF-16 codepoints of the +context stack. If there are not enough characters in the context stack, +it will return as many as it can. On success, the `buf` variable will be +null terminated. + +The context stack can contain a special code for deadkeys. See +`KMQueueAction()` for a way to output a deadkey. The code sequence for a +deadkey is (3 words): + +``` +UC_SENTINEL, CODE_DEADKEY, deadkeyID +``` + +`UC_SENTINEL` is `0xFFFF`; `CODE_DEADKEY` is `0x0008`; `deadkeyID` can +be any value from `0x0001` to `0xFFFE`. + +> ### Note +Changes in 8.0.333.0: a potential buffer overflow has been corrected. +The size of the buffer pointed to by `buf` should be `WCHAR[len+1]` +to allow for terminating null. Keyman now counts supplementary plane +characters as 2 UTF-16 codepoints rather than as a single codepoint. +Keyman no longer returns partial deadkey code sequences. + +## KMSetOutput + +```c +BOOL WINAPI KMSetOutput(PWSTR buf, DWORD backlen); +``` + +`KMSetOutput()` is a wrapper for `KMQueueAction()`. It simplifies the +process of deleting contextual characters and outputting a new string. +The results will not be output to the screen until the current function +returns. If called within the context of an IMC window, the results will +not be output to the screen until the window posts the +`wm_keymanim_close` message. + +`buf` is a pointer to a null-terminated string of characters to output. +`backlen` is the number of characters to backspace from the current +context before displaying `buf`. + +This function modifies the context returned from `KMGetContext()`, even +if the output is not yet on the screen. + +Internally, this function does the following: + +```c +while(backlen-- > 0) KMQueueAction(QIT_BACK, 0); +while(*buf) KMQueueAction(QIT_CHAR, *buf++); +``` + +## KMQueueAction + +```c +BOOL WINAPI KMQueueAction(int itemType, DWORD dwData); +``` + +`KMQueueAction()` lets you send any Keyman action to a target +application. This can be virtual keys, characters, shift keys up and +down, deadkeys, beeps, or backspaces (a special case of virtual keys). + +| | | +|------------------|----------------| +| itemType code | Description | +| `QIT_VKEYDOWN` | Simulate any key press on the keyboard; `dwData` is the virtual key code | +| `QIT_VKEYUP` | Simulate any key release on the keyboard; `dwData` is the virtual key code | +| `QIT_VSHIFTDOWN` | Simulate pressing a set of shift keys. `dwData` can be a combination of the following flags: `LCTRLFLAG, RCTRLFLAG, LALTFLAG, RALTFLAG, K_SHIFTFLAG, K_CTRLFLAG, K_ALTFLAG` | +| `QIT_VSHIFTUP` | Release the shift state, `dwData` is the same as the previous flags. | +| `QIT_CHAR` | `dwdata` is any `WCHAR`. | +| `QIT_DEADKEY` | `dwData` is any value from `0x0001` to `0xFFFE`. This can be matched in the context with `KMGetContext()`. | +| `QIT_BELL` | `dwData` should be zero (`0`). | +| `QIT_BACK` | `dwData` should be zero (`0`). | + +## KMHideIM + +```c +BOOL WINAPI KMHideIM(HWND hwndIM); +``` + +`KMHideIM()` hides the IMC window referred to by `hwndIM` and ensures +that Keyman processes input from the keyboard through the correct +method. You should call this rather than hiding the window manually with +`ShowWindow(hwnd, SW_HIDE);` or post the message `wm_keymanim_close` to +hide the window. + +## KMDisplayIM + +```c +BOOL WINAPI KMDisplayIM(HWND hwndIM, BOOL FCaptureAll); +``` + +`KMDisplayIM()` displays the IMC window referred to by `hwndIM`. It does +not do any movement of the window. If the `FCaptureAll` flag is set, all +keyboard input (character-generating keys only) will be redirected to +the IMC window until the message `wm_keymanim_close` is posted, +`KMHideIM()` is called, or `KMDisplayIM()` with `FCaptureAll` set to +`FALSE`. + +## KMGetKeyboardPath + +```c +BOOL WINAPI KMGetKeyboardPath(PSTR keyboardname, PWSTR dir, DWORD length); +``` + +This function returns the full path to the keyboard referred to by +`keyboardname`. The buffer `dir` should be 260 characters long. + +## KMGetActiveKeyboard + +```c +BOOL WINAPI KMGetActiveKeyboard(PSTR keyboardname, DWORD length); +``` + +This function can be called while processing to determine which is the +active keyboard. Alternatively, use the callbacks `KeymanIMActivate()` +and `KeymanIMDeactivate()`. + +## KMSendDebugString + +```c +BOOL WINAPI KMSendDebugString(PSTR str); +``` + +This function outputs the string `str` to the Keyman debug window or +debug log file (usually %USERPROFILE%\Desktop\keymanlog\system\*.log). + +## The Input Method Composition window + +The IMC window can be shown or hidden at any time that the associated +keyboard is active. This means that you can have an IMC window +permanently open or open at appropriate times. + +The keyboard IMSample included with Keyman is a good example of +manipulating the IMC display. + +The window should be created invisible, most probaly as a popup window. +The window can use `KMGetContext()`, `KMSetOutput()` at any time, but +output will not be put to the screen until it has posted (not sent) +`wm_keymanim_close` to itself. + +```c +PostMessage(hwnd, wm_keymanim_close, (WPARAM) FSuccess, (LPARAM) FActuallyClose); +``` + +Keyman will manage the window display, focus, and message loop. The +window procedure should set the position and size appropriately. + +Keyman will recognise this window and any child windows to be part of +the IM and will not attempt to process any input that goes through the +window. + +The IMC window must not take focus at any time. + +## Limitations + +- Clicks outside the window will cancel the IM and lose context. +- Switching applications will cancel the IM and lose context. + +## See also + +- [DLL Interface for Keyman - Introduction](index) +- [DLL Exports](imxdll) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/imx/index.md b/developer/docs/help/guides/develop/imx/index.md new file mode 100644 index 00000000000..6bc606b8f91 --- /dev/null +++ b/developer/docs/help/guides/develop/imx/index.md @@ -0,0 +1,101 @@ +--- +title: Input Method Extensions +--- + +Keyman's multiple group processing is powerful, but sometimes you need +to be able to do something a bit more complex, such as a dictionary +lookup. Keyman's DLL interface let you do this. You can call a function +in a DLL in the same way as you call another group. The function can +read the context, deadkeys and the current keystroke, and output +characters, deadkeys, virtual keys, beeps and other items. + +The DLL interface also allows you to create a popup Input Method +Composition (IMC) window. This window allows the user to select visually +the characters they are wishing to input. The window can be set to be +visible when the keyboard is active, or after an appropriate key +sequence. When the window is visible, it can be set to capture all +keyboard input, or be passive. + +## File locations + +The DLL should be placed in any of the following locations: + +- The same directory as the .kmx file (e.g. use a package to install it) +- The Keyman program directory (same place as keyman32.dll) +- Anywhere on the path (such as the Windows directory) + +The best option is the first, as you can then include the DLL in a +Keyman package for easy installation and uninstallation. + +Full x64 support for IMX DLLs was introduced in Keyman Desktop +8.0.333.0. An x64 version of the DLL may be included simply by giving it +the file extension .x64.dll, with the same base name as the x86 DLL. +Keyman will call the appropriate DLL. + +## General usage information + +DLL functions used in place of groups are called DLL group functions. + +All strings, apart from keyboard names, are passed as WCHAR, regardless +of whether the active window is a Unicode window or not. In Keyman 8 and +earlier, ANSI characters are represented as 16-bit WCHAR, with high bits +zeroed out. In Keyman 9, ANSI keyboards are translated to Unicode at +install time, through the CP-1252 code page. + +The DLL will be loaded for each process in which the keyboard is +activated. Remember that the DLL will not share memory between these +processes by default, so if you have large memory requirements, you +should use memory mapped files or possibly SHARDATA segments to minimize +the memory consumption. + +DLL group functions are called in a fairly time-critical environment. It +is important that you minimise the processing time in these functions. +It is essential that you avoid any window focus or activation – message +boxes are definitely out of the question. For debugging purposes, there +is a Keyman32.dll function exported for writing to the logfile (see the +section titled Keyman32 imports). + +DLLs can handle multiple keyboards at once. The keyboards are identified +by a name which is the filename of the keyboard, minus path and +extension. For example, given c:\keyman\imsample\imsample.kmx, the +keyboard name is imsample. These are the same names that Keyman uses +internally, for example in the registry and directory names. + +## Registry settings + +Parameters for the DLL can be stored in two locations in the registry. +They should always be stored under HKEY_CURRENT_USER, as the user will +not have permission to change machine-wide settings, and the settings +should not affect other users. The following locations are recommended: + +> HKEY_CURRENT_USER\Software\Tavultesoft\Keyman Engine\9.0\IMX\\[DLLName] + +> HKEY_CURRENT_USER\Software\Tavultesoft\Keyman Engine\9.0\Installed Keyboards\\[kbdname] + +The first key should be used for settings that pertain to any keyboard +associated with the DLL. The second key should be used for any +keyboard-specific settings. Values stored under the second key should be +prefixed with the name of the dll, so that they will not conflict with +Keyman or other dll values. + +## The .kmn interface + +Inside a .kmn file, you define the DLL group function interface as follows: + +```keyman +store(DLLFunction) "myfile.dll:KeyEvent" +``` + +You can use this anywhere where you would place the use statement +(except in the begin statement), with the call statement. For example, + +```keyman ++ 'a' > call(DLLFunction) +``` + +A single .kmn file can reference multiple DLL group functions, in a single or multiple DLLs. + +## See also + +- [DLL Exports](imxdll) +- [The imlib.cpp library module](imxlib) diff --git a/developer/docs/help/guides/develop/imx/web.md b/developer/docs/help/guides/develop/imx/web.md new file mode 100644 index 00000000000..fa98ba40321 --- /dev/null +++ b/developer/docs/help/guides/develop/imx/web.md @@ -0,0 +1,4 @@ +--- +title: IMX Interface for KeymanWeb +--- + \ No newline at end of file diff --git a/developer/docs/help/guides/develop/imx/web/index.md b/developer/docs/help/guides/develop/imx/web/index.md new file mode 100644 index 00000000000..9453c5a01de --- /dev/null +++ b/developer/docs/help/guides/develop/imx/web/index.md @@ -0,0 +1,5 @@ +--- +title: Guidelines for building IMX for KeymanWeb +--- + +* TODO: Write to fill requirements for .call_js, see call() statement for details. diff --git a/developer/docs/help/guides/develop/index.md b/developer/docs/help/guides/develop/index.md new file mode 100644 index 00000000000..8d8490c42c1 --- /dev/null +++ b/developer/docs/help/guides/develop/index.md @@ -0,0 +1,19 @@ +--- +title: Developing Keyboards +--- + +[Keyman keyboard tutorial](tutorial) + +[An advanced keyboard development example](advanced-keyboard-development-example) + +[Creating a simple touch keyboard layout](touch-keyboard-tutorial) + +[Creating a touch keyboard layout for Amharic - part 1](creating-a-touch-keyboard-layout-for-amharic) + +[Creating a touch keyboard layout for Amharic - part 2](creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty) + +[Input Method Extensions (IMX)](imx) + +------------------------------------------------------------------------ + +[Keyman Developer 16 Tutorial](https://lingtran.net/Keyman-Developer-16-Tutorial) (external on Lingtran.net) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/touch-keyboard-tutorial/index.md b/developer/docs/help/guides/develop/touch-keyboard-tutorial/index.md new file mode 100644 index 00000000000..bc7c8e792f2 --- /dev/null +++ b/developer/docs/help/guides/develop/touch-keyboard-tutorial/index.md @@ -0,0 +1,54 @@ +--- +title: Creating a Simple Touch keyboard +--- + +## Introduction and design + +If you have experience in designing Keyman keyboards for computers, the +interface for designing mobile keyboards looks very similar, but it +hides the reality of additional steps necessary for mobile keyboards. +This tutorial attempts to walk you through the process. + +The [Quick French tutorial](../tutorial/) shows how to create a simple +desktop keyboard for typing accented characters used in French and other +European languages. It is possible to create a touch screen format of +that keyboard, but it is probably unnecessary. The default keyboards for +both Android and iOS devices have a way to type these accented +characters. Press and hold on a vowel, and a popup menu will give you a +choice of accents to put on that letter. + +For this tutorial we will demonstrate something usable for the Fulfulde +language cluster spoken across many Sahelian countries of Africa. +Fulfulde is usually written using the Latin alphabet, but there are a +few characters added to the usual list of alphabetical characters. So +this is a useful example for any language wanting to add a few +characters to the standard Latin keyboard. Here are the characters we +are going to add, together with their Unicode values. + +| | | | | | | | | | +|-----|----------|-----|----------|-----|-----|----------|-----|----------| +| `ɓ` | `U+0253` | `Ɓ` | `U+0181` | | `ɗ` | `U+0257` | `Ɗ` | `U+018A` | +| `ŋ` | `U+014B` | `Ŋ` | `U+014A` | | `ƴ` | `U+01B4` | `Ƴ` | `U+01B3` | + +Here we will likely want to proceed differently than with the desktop +keyboard. The usual approach for a desktop keyboard is to create a +deadkey. The keyboards I have used for Fulfulde (going back to decades +ago) used the / key as the deadkey. +/b gave ɓ, +/d gave ɗ, and so on. + +It would be possible to use that desktop keyboard logic on touch +screens.  But your mobile device users will find these rules annoying. +Instead of two keys they would probably have to press four, since the +standard alphabetical keyboard on most touch devices does not have the +slash key. So they would have to press the key to switch to the numeric +keyboard, then press slash, then press the key to go back to the +alphabetical keyboard, then the letter. What touch screen users would +appreciate is something that uses the great feature of touch screens, +the long press or press and hold on a letter, to see analogous letters. +So we’ll set up a touch screen keyboard that lets you press and hold ‘d’ +to see the two hooked d characters, press and hold ‘b’ to see the hooked +b characters, and so on. + +[Next: Making, testing and distributing the touch +keyboard](making-touch-keyboard) diff --git a/developer/docs/help/guides/develop/touch-keyboard-tutorial/making-touch-keyboard.md b/developer/docs/help/guides/develop/touch-keyboard-tutorial/making-touch-keyboard.md new file mode 100644 index 00000000000..5039acb2624 --- /dev/null +++ b/developer/docs/help/guides/develop/touch-keyboard-tutorial/making-touch-keyboard.md @@ -0,0 +1,361 @@ +--- +title: Making a touchscreen keyboard +--- + +## Setting up your Keyman project + +This is a useful convention for keeping track of your files: + +1. Create a folder on your hard drive for all your Keyman developer + files +2. In that folder, create a folder for this project, named after the + language. Use all lowercase letters for compatibility with other + platforms. +3. Now create a project in Keyman Developer with the same name as the + new folder, and save it inside the new folder + +Now you will be able to use this project to organize and create any +files for desktop, mobile, web or other. It also facilitates uploading +the files to the Keyman website later on. + +## Add touch to an existing keyboard or create a new keyboard? + +You can add a mobile touchscreen keyboard to an existing desktop +keyboard, or you can create a new touchscreen keyboard from scratch. You +should be aware that there will be cross-over between mobile and desktop +keyboards. (In Keyman terms, "desktop" includes laptop computers or any +device with a physical keyboard). Your mobile device can have an +external keyboard, which will use the desktop Keyman keyboard. So the +Keyman strategy is to always bundle touch keyboards with desktop +keyboards to make them work on multiple platforms. + +If creating from scratch, you click the New icon in the Keyman Developer +toolbar (or select File > New from the menu), and specify the file +name for your keyboard. We recommend a name using only lowercase +letters, numbers and underscore. I’ll choose “mobile_fulfulde.kmn” . + +![choose new file +type](../../../images/simpleTouchKeyboard_1.png) + +## Adding the required metadata + +After creating the file, Keyman Developer will ask you to name the +keyboard. This name can include spaces and upper case letters if +desired. I’ll name this one “Fulfulde for Mobile”. + +![keyboard +metadata](../../../images/simpleTouchKeyboard_2.png) + +The first thing you need to do is to tell Keyman Developer this keyboard +will include some kind of mobile device.  You do this in the Targets +list just below the keyboard name. I’ll select “mobile ” in the list, +(towards the end). You see in the picture above that Keyman Developer +checked the “windows” box by default, I can uncheck that or leave it +checked if I am going to add a Windows keyboard to this set. + +![mobile target](../../../images/simpleTouchKeyboard_3.png ) + +This will include all mobile devices, both Android and iOS, both phones +and tablets. It is possible if needed to select Android only or iOS only +if needed, and to develop a different keyboard layout for tablets than +for phones, but for this example, with only a few characters needed to +be added to the default keyboards, there is no need for that kind of +complexity. + +(If you are adding a mobile layout to an existing keyboard file, you +would open that file in Keyman Developer, go to the Targets box and +check “mobile” or whatever mobile targets you wanted to specify, then +follow along from here). + +## Adding the touch optimized feature + +The next step is to add the touch-optimised feature to our keyboard +setup. If you scroll to the bottom of the details tab, there is the list +of features to add. I’ll click the Add button and choose “touch +optimised keyboard.” + +![touch-optimised](../../../images/simpleTouchKeyboard_4.png) + +Keyman developer asks me to choose one of three templates for the mobile +layout. + +![three templates](../../../images/simpleTouchKeyboard_5.png) + +The “template-latin” layout includes many accented characters, like the +default keyboards for Android and iOS do. The “template-basic” layout +has no extra characters, and the template-traditional has a few extra +characters (mostly punctuation symbols if you long-press period or full +stop). For this example, I’ll choose “template-basic” because accented +characters are not needed for Fulfulde. But if I knew that many eventual +users might want to be able to type French or other European languages +as well as Fulfulde, and wouldn’t like to have to switch the keyboard to +do so, I could choose “template-latin”. + +## Defining one or several touch layouts + +I select the template and click OK. Keyman Developer now adds a new tab +in the left column, the Touch Layout tab. + +![touch layout](../../../images/simpleTouchKeyboard_6.png) + +That is where we need to go now to add characters to our touch layout. +But before doing that, there is one important thing to take note of in +the touch layout. By default, Keyman Developer has created a layout for +phones and another layout for tablets. They all start out the same, but +as I add characters, I will have to make sure I add all the characters +to both layouts, or I’ll discover that my keyboard does not work for all +device sizes. + +In the image, you see in the Platform box that Keyman Developer is currently showing the +tablet layout. This box is where I’d choose which layout I’d design in. + +But I’m going to make this keyboard simple, and just have one layout for +both tablets and phones. So in the platform box, I am going to click +the “minus” button, to delete the tablet layout. When there is only one +mobile layout, Keyman Developer will compile that layout for all mobile +devices. (I could also have chosen to delete the phone layout and done +my layout design in the tablet layout). + +![platform list](../../../images/simpleTouchKeyboard_7.png) + +## Adding longpress characters + +Now I can start adding characters. I’ll click on the “y” key in the +layout, then I’ll look at the “longpress keys” area at the lower +left. + +![add longpress](../../../images/simpleTouchKeyboard_8.png) + +I click that, and Keyman Developer adds a new key below the keyboard +layout. + +![longpress added](../../../images/simpleTouchKeyboard_9.png) + +I'm going to use this key for the y with hook. I click inside it to make it active, then I’ll go look for my y +with hook character in the character map to the right. If I type “y +hook” in the search box, Keyman Developer shows the character I’m +looking for. + +![adding keycap](../../../images/simpleTouchKeyboard_10.png) + +If I double click on the lower case y with hook, that copies the character +to the keycap box of my new key. (I could also click and drag the character from the character map to the key). + +![keycap added](../../../images/simpleTouchKeyboard_11.png) + +## New key info + +There are several important pieces of information that got copied over. If we +look at the properties of the new key to the right, we see that this new key has +the “text” ƴ (what appears on the keycap), the “Unicode value” U+01B4 and the +“ID” U_01B4. All of these were copied from the character map. + +NOTE: If you copy one character from the character map to a new key, then +realize you copied the wrong character, dragging a second character may not +replace all the needed information into the key. If a key has a character in it +already, it works better to hold Ctrl as you drag the new character +into it. + +I could add the other three characters; hook b, hook d, and eng, as longpress +characters as well. I could select the regular letter I want to longpress, +click plus in the longpress keys area and copy the needed character. Here for +example is the b with hook: + +![keycap added](../../../images/simpleTouchKeyboard_12.png) + +After I have added my four lowercase characters as longpress keys, the keyboard +looks like this. Even when I don't have that letter selected, I can see which +keys have longpress keys by the dot beside the letter. + +![keycap added](../../../images/simpleTouchKeyboard_12-2.png) + +[See the Keyman Language guide on virtual keys](../../../../language/guide/virtual-keys#toc-virtual-keys-and-touch-layouts) + +## Adding uppercase characters + +I could do two different things for the upper case letters. I could add them as +longpress keys beside their lowercase equivalents, by pressing the plus key +again to add a second longpress character to each letter. + +This would mean users would not have to press Shift to be able to type the upper +case hook y. But since a user needs to press Shift for all the regular Latin +upper case letters, it might make more sense to put the uppercase letters into +the Shift layer. + +I can change to the shift layer by finding the layer box at lower left, and +choosing `shift` instead of `default`. + +![changing to shift layer](../../../images/simpleTouchKeyboard_13.png) + +Now I see the upper case letters on the keyboard, and I can add longpress +characters to these in the same way I did on the default layer. I click the +letter, then click `+` to add a key, then copy the character info from the +character map. Adding my upper case y hook to Y would look like this: + +![new key added to row](../../../images/simpleTouchKeyboard_14.png) + +(If I had clicked on the green triangle to the left of my first key, the +new key would be added to the left of that key). + +For this new key, I go through the same steps. I click in the empty box +on the new key, then double click the upper case y with hook in the +character map to put that in the keycap. I also change the code of this +new key to “U_01B3” + +![keycap and code added to new +key](../../../images/simpleTouchKeyboard_15.png) + +## Another option for upper case characters + +I might also add the upper case character to a longpress character on +the upper-case Y key, because some users will press the Shift key then +look for the letter to type. To do this, I change the layer at the top +of the tablet layout to "shift" from "default". + +![changing +layer](../../../images/simpleTouchKeyboard_15b.png) + +Now I click the Y key, and add a longpress character, then add the upper +case y with hook to the keycap and add the keycode as shown before. + +![key added to longpress +Y](../../../images/simpleTouchKeyboard_16b.png) + +You can design your keyboard either way, with the upper case characters +in the same longpress row as the lower case, or in a longpress row off +of the shift layer. The rest of this tutorial shows the upper case +characters in the same row as the lower case, but I don't mean to +present this as the best way. If you do put upper case characters in the +shift layer, you'll have to remember to change the layer back to +"default" when you want to add a lower case letter, then back to "shift" +when adding an upper case letter. You could put the upper case +characters in both places, if you think that best. + +Now I’ll add the two d hook characters as a longpress popup for the d +key. I click the d key in the layout, click “Add longpress popup”, add +the lower case hook d to the keycap and change the code to “U_0257”; +then click the plus sign to add a second key, add the upper case hook D +to the keycap and change its code to “U_018A”. The end result should +look like this: + +![longpress row on +d](../../../images/simpleTouchKeyboard_16.png) + +I’ll do the similar step to add two characters as a longpress popup for +“b” + +![longpress row on +b](../../../images/simpleTouchKeyboard_17.png) + +And two characters as a longpress popup for “n”. (Tip, to search for ŋ +in the character map, type “eng”). + +![longpress row on +n](../../../images/simpleTouchKeyboard_18.png) + +When no keys are selected in the keyboard layout, I can still see which +ones I have set up longpress popups for, because Keyman Developer shows +a faint gray line at the top right corner of the key. So you should have +a faint diagonal line on your y, d, b and n keys. + +![lines on longpress +keys](../../../images/simpleTouchKeyboard_19.png) + +## Replacing the Unicode and Code automatically + +1. Hold the Ctrl key while dragging and + dropping a character from the Character Map to the touch layout + editor, and it will replace the Code as well as the character. +2. Hold the Shift key while dropping, and it + will only add the character to the key. +3. Finally, hold + Ctrl+Shift, this + will add the character to the key AND update the Code to match the + full set of characters represented on the key. + +## Compiling your keyboard + +Now click Save to save your work, and compile the keyboard. (Keyboard +> Compile Keyboard, or press F7). Hopefully you’ll see it compiled +with no error messages: + +![successful +compile](../../../images/simpleTouchKeyboard_20.png) + +If you see a warning like: + +``` +Warning: line 0  warning 2092: Key " T_new_579" on layer "default", platform "phone", is a custom key but has no corresponding rule in the source. +``` + +This shows you forgot to enter the correct keycode for a new key you +added. Double check your longpress popup keys for one with a “T_new_NNN” +code, and add in the desired “U_NNNN” code. + +You might also see a message like + +``` +Error: line 0  error 405A: Key " U+0181" on "phone", layer "default" has an invalid identifier. +``` + +This shows you attempted to change the keycode but mistyped the code. +I’ve gotten this more than once, because I am used to typing `U+0181`to +refer to a Unicode value, but the correct syntax for a keycode in Keyman +Developer is `U_0181` + +# Testing your keyboard + +Other Keyman help pages describe how you can test your keyboard: + +- [On a virtual device in the Chrome web browser on your + computer](../../test/keyboard-touch-mobile-emulator) +- [On your own device accessing the keyboard over the + network](../../test/keyboard-touch-and-desktop) + +If your device cannot connect to your computer on the local network (for +instance if your computer is on a wired office network and your device +is on the wireless office network), the above technique for sharing may +not work. You can put your keyboard in a package and share it over the +Internet with your device, as described below. + +# Packaging and distributing your keyboard + +Another Keyman help file describes [how to build a package +file.](../../distribute/tutorial) + +## BCP 47 tags for Fulfulde + +[Step 3](../../distribute/tutorial/step-3) of the package building +tutorial describes adding the BCP 47 language tag to your package. When +I came to the step of adding a tag for Fulfulde, I had to do some +research. I naively thought "Fulfulde" was a clear enough label for the +language. It is not, since it is a language chain rather than one +language. The BCP 47 tag in many cases is the same as the [SIL +Ethnologue code](https://www.ethnologue.com), so that is where I had to +go to find the tags I needed. In the end I added four tags for four +Fulfulde languages: + +![BCP 47 tags](../../../images/simpleTouchKeyboard_36.png) + +I also added the script designator `Latn` for Latin script. This is +recommended for Windows, which sometimes fails to install the desktop +keyboard if there is not a script designator on the BCP 47 tag. We +recommend that you always put in the script tag unless there is a +specific reason not to. + +Some languages have only two letters in their BCP 47 tag. For instance, +the Hausa language has an Ethnologue code `hau` but the BCP 47 tag is +`ha`. Keyman Developer knows about this, and will change the tag to `ha` +if I put in the Ethnologue tag. + +# Next steps + +The two following articles on Amharic describe a more complex +touchscreen example where quite frequently two keys are pressed to get +one distinct character. (Amharic is a Abugida or syllabary script, where +one character can represent a consonant and following vowel). + +- [Creating a touch keyboard layout for Amharic - part + 1](../creating-a-touch-keyboard-layout-for-amharic) +- [Creating a touch keyboard layout for Amharic - part + 2](../creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/index.md b/developer/docs/help/guides/develop/tutorial/index.md new file mode 100644 index 00000000000..3642ddc1ed5 --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/index.md @@ -0,0 +1,56 @@ +--- +title: Keyboard Tutorial +--- + +[Step 1: Planning the Keyboard](step-1) + +[Step 2: Writing the Header](step-2) + +[Step 3: The Keyboard Header](step-3) + +[Step 4: The Keyboard Body](step-4) + +[Step 5: Rules with Context](step-5) + +[Step 6: Stores, 'any', and 'index'](step-6) + +[Step 7: Testing the Keyboard](step-7) + +[Step 8: Deadkeys](step-8) + +[Step 9: The Finished Keyboard](step-9) + +## Overview + +Welcome! In this tutorial, you will learn the basics of Keyman keyboards +and create a simple French keyboard which can be used with any physical +keyboard layout. + +The keyboard will use a basic English layout, and add some deadkeys to +define vowel diacritics and a few other characters. + +While this tutorial is based on a physical keyboard such as used on a +desktop or laptop computer, the principles of the keyboard language that +you will learn are applicable to developing touch layouts as well. + +This keyboard will use Unicode. Unicode is a character encoding standard +that supports most of the world's scripts, and includes support for +user-defined scripts. Unicode is the accepted standard for text encoding +in modern applications and operating systems. + +In Keyman Developer keyboard source files, Unicode characters are +specified with `U+xxxx`, where `xxxx` is a four-digit hexadecimal +number. + +At the bottom of each page in the tutorial, will be a link to both the +previous page and the next page. You can use these links to work your +way through the tutorial. You may also find links to reference +information, which you can select to learn more about a particular +aspect of creating Keyman keyboards. + +## Let's begin + +Let's get started! Move on to the next topic to begin the first step, +planning the keyboard. + +- [Continue with Step 1: Planning the Keyboard](step-1) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-1.md b/developer/docs/help/guides/develop/tutorial/step-1.md new file mode 100644 index 00000000000..642fa916bba --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-1.md @@ -0,0 +1,71 @@ +--- +title: Step 1: Planning the Keyboard +--- + +## Choosing the characters + +First of all, we need to decide which characters we want the keyboard to +produce. Next, we must find out the codes used to represent them, using +a program such as Character Map, or with the Character Map in Keyman +Developer (go to **View**, **Character Map**). + +French uses the same 26 letters as English, with some additions. As our +keyboard is based on English, we only need to work with these additional +letters. Note that for completeness, we will design our keyboard to +produce a few other accented vowels that are not used in French. Also, +we want our keyboard to include the angled quotes `«` and `»`. + +These characters, with both uppercase and lowercase forms, are listed in +the table below along with their Unicode codes. + +| | | | | | | | | | +|-----|----------|-----|----------|-----|-----|----------|-----|----------| +| `À` | `U+00C0` | `à` | `U+00E0` | | `Á` | `U+00C1` | `á` | `U+00E1` | +| `È` | `U+00C8` | `è` | `U+00E8` | | `É` | `U+00C9` | `é` | `U+00E9` | +| `Ì` | `U+00CC` | `ì` | `U+00EC` | | `Í` | `U+00CD` | `í` | `U+00ED` | +| `Ò` | `U+00D2` | `ò` | `U+00F2` | | `Ó` | `U+00D3` | `ó` | `U+00F3` | +| `Ù` | `U+00D9` | `ù` | `U+00F9` | | `Ú` | `U+00DA` | `ú` | `U+00FA` | +| `Â` | `U+00C2` | `â` | `U+00E2` | | `Ä` | `U+00C4` | `ä` | `U+00E4` | +| `Ê` | `U+00CA` | `ê` | `U+00EA` | | `Ë` | `U+00CB` | `ë` | `U+00EB` | +| `Î` | `U+00CE` | `î` | `U+00EE` | | `Ï` | `U+00CF` | `ï` | `U+00EF` | +| `Ô` | `U+00D4` | `ô` | `U+00F4` | | `Ö` | `U+00D6` | `ö` | `U+00F6` | +| `Û` | `U+00DB` | `û` | `U+00FB` | | `Ü` | `U+00DC` | `ü` | `U+00FC` | +| `Ý` | `U+00DD` | `ý` | `U+00FD` | | `Ç` | `U+00C7` | `ç` | `U+00E7` | +| `«` | `U+00AB` | `»` | `U+00BB` | | | | | | + +If you are not familiar with the hexadecimal (base-16) numbering system, +don't worry: you can use the Character Map in Keyman Developer to find +the character you want, and then drag-and-drop or copy-and-paste its +character code into your keyboard. + +Note that you must be careful to use the right character: The Unicode +standard has many characters with the same shape as another, but a +different meaning; an example of this is the Greek capital letter Sigma +(`U+03A3` Σ) and the mathematical summation symbol (`U+2211`, ∑). An application +supporting Unicode would treat these two characters differently. If in +doubt whether a character is the right one, you can look up the +reference tables at [www.unicode.org](http://www.unicode.org/). + +## Designing the layout + +After choosing the characters we want our keyboard to use, we must +decide how we want the user to be able to enter them. For some +languages, you might replace each letter on the English keyboard with a +letter from the language. In this case, however, most of the letters are +accented vowels, we will use two keystrokes for each: one for the +accent, and one for the vowel. + +| Character | Keystrokes | +|-------------|-------------------------------| +| `À, à, ...` | back-quote (`), then the vowel key. | +| `Á, á, ...` | quote ('), then the vowel key. | +| `Â, â, ...` | caret (^), then the vowel key. | +| `Ä, ä, ...` | double-quote ("), then the vowel key. | +| `Ç, ç` | quote ('), then lower- or uppercase C. | +| `«, »` | two less-than (<<) or greater-than (>>) symbols. | + +Now that we have decided which character to use and how the user can +enter them, we can start to write the keyboard. + +- [Continue with Step 2: Writing the Header](step-2) +- [Back to the Introduction](index) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-2.md b/developer/docs/help/guides/develop/tutorial/step-2.md new file mode 100644 index 00000000000..5867973fb39 --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-2.md @@ -0,0 +1,53 @@ +--- +title: Step 2: Writing the Header +--- + +## Overview of a keyboard file + +A keyboard file is divided into two sections: the **header** and the +**rules** section. The header section defines the name of the keyboard, +its bitmap, and other general settings. The rules are used to define how +the keyboard responds to keystrokes from the user, and are divided into +groups. We will start by writing the header. + +## The keyboard header + +The keyboard header is the first part of a keyboard; it consists of +statements that help Keyman identify the keyboard and set default +options for it. Each statement in the header must be on a separate line. +While there is no technical requirement to put header statements at the +start of a keyboard source file, keeping them there helps you identify +them easily, and keeps them consistent with keyboard programs other +people might write. + +We will begin to write the keyboard. If Keyman Developer is not already +running, start it now. Create a new keyboard file, navigate to the +**Layout** tab, and click on the **Code** tab at the bottom of the +screen to switch to the Code view. + +Type or paste the following code into the keyboard file. This is the +header of our keyboard file. + +```keyman +c Simplified French Keyboard for Keyman 9.0 +c +c This keyboard program uses a simplified set of keys +c for typing French, especially for those who don't know the +c standard French keyboard. +c +c NOTE: This keyboard was created from the Keyman keyboard +c programming tutorial. + +store(&Version) "9.0" c This keyboard is for use with Keyman 9.0 +store(&Name) "Quick French" +store(&Bitmap) "qfrench.ico" +store(&MnemonicLayout) "1" c This keyboard uses a mnemonic layout. + +begin Unicode > use(Main) +``` + +An explanation of the various parts of the header follows on the next +page. + +- [Continue with Step 3: The Keyboard Header](step-3) +- [Back to Step 1: Planning the Keyboard](step-1) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-3.md b/developer/docs/help/guides/develop/tutorial/step-3.md new file mode 100644 index 00000000000..81777aec6a0 --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-3.md @@ -0,0 +1,99 @@ +--- +title: Step 3: The Keyboard Header +--- + +## Comments + +```keyman +c Simplified French Keyboard for Keyman 9.0 +``` + +Most of the header in this example is made up of +[comments](/developer/language/guide/comments). A comment is used +to make notes about the keyboard, or to provide information on the +workings of the keyboard. The comments are readable by anyone looking at +the source code of the keyboard. + +A comment always starts with a lowercase `c`, followed by one or more +spaces, and continues to the end of the line. Keyman Developer will +ignore comments when compiling a keyboard. + +Comments can take up a whole line, or can start in the middle of the +line. The latter is useful for making short notes about individual +lines. As you can see we have used both kinds of comments in the header. + +## The `&Version` store + +```keyman +store(&Version) "9.0" c This keyboard is for use with Keyman 9.0 +``` + +The [`&Version` store](/developer/language/reference/version) +identifies the Keyman version for which this keyboard was written; this +keyboard is for use with Keyman 9.0. The `&Version` store is an optional +part of the keyboard header, but if present, it should be the first +store in the file. + +## The `&Name` store + +```keyman +store(&Name) "Quick French" +``` + +The [`&Name` store](/developer/language/reference/name) specifies +a descriptive name for the keyboard, which can be up to eighty +characters long. The name we have given to this keyboard is +`"Quick French"`. The `&Name` store is not required but is highly +recommended! + +## The `&Bitmap` store + +```keyman +store(&Bitmap) "qfrench.ico" +``` + +The optional [`&Bitmap` store](/developer/language/reference/bitmap) +tells Keyman which image to use for the keyboard's icon. The picture +should be in the standard Windows .ico format, and should contain at +least a single 16x16 pixel image. It can also contain higher resolution +images for high resolution "High DPI" displays. If you use a modern icon +editor, the icon can use alpha transparency. +For this keyboard we will be using the following bitmap: +![](../../../images/tutorial_keyboard_qfrench.gif); it is +found in the Keyman Developer folder, under +`Samples\Examples\qfrench.ico` - you should copy it into the same folder +in which you will save your keyboard. + +## The `&MnemonicLayout` store + +```keyman +store(&MnemonicLayout) "1" +``` + +The [`&MnemonicLayout` store](/developer/language/reference/mnemoniclayout) tells Keyman that +the layout is meant to conform to the user's keyboard layout; for +example, if the user presses the quote key ' on +their keyboard (whether they are using a US English, UK English, French, +German, Swedish, or other keyboard) it should work in the same way. The +opposite of this is a positional layout (which is the default if this +store omitted), which is intended for keyboards for which there is not +necessarily a correspondence between what is printed on the physical +keyboard and what is output when that key is pressed. + +## The `begin` statement + +```keyman +begin Unicode > use(Main) +``` + +The [`begin` statement](/developer/language/reference/begin) tells +Keyman which group of rules to process first when it receives a +keystroke. The use of multiple groups is an advanced feature, and +unnecessary for this tutorial, so we will use a single group, called +`Main`. The `begin` statement is required in every keyboard, and marks the +start of the keyboard body. The `begin` statement also tells Keyman +which encoding to use for the keyboard. Nearly all keyboards will use +`Unicode`, today. + +- [Continue with Step 4: The Keyboard Body](step-4) +- [Back to Step 2: Writing the Header](step-2) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-4.md b/developer/docs/help/guides/develop/tutorial/step-4.md new file mode 100644 index 00000000000..e8a861ae1cd --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-4.md @@ -0,0 +1,102 @@ +--- +title: Step 4: The Keyboard Body +--- + +The body of the keyboard is the most important part: it determines the +behaviour of the keyboard. The body consists of groups, which in turn +contain one or more rules which define the responses of the keyboard to +certain keystrokes. + +## Groups + +There are two types of groups: +* groups that process the keys pressed and the context. +* groups that process only the context. + +For simple keyboards, the latter type of group will not be required. A group begins +with a [`group` statement](/developer/language/reference/group), and +ends either at the start of another group, or at the end of the keyboard +file. + +We will only use one group in the Quick French keyboard, called `Main`. +We mark the start of it with the `group` statement below. Add this line +to the keyboard if it's not already there. + +```keyman +group(Main) using keys +``` + +The `using keys` clause tells Keyman that this group will process +keystrokes. + +## Basic Rules + +A rule tells Keyman the output to produce for a certain input. A rule +consists of three parts: the **context**, the **key**, and the +**output**. + +* The **context** specifies the conditions under which a rule will act. If +what is shown in the document to the left of the cursor matches the +context of a rule, the rule will be processed. +* The **key** specifies which keystroke the rule will act upon. +* The **output** determines the characters that are produced by a rule. +The output replaces the matched context in the document. + +## Simple rules + +The simplest rules in Keyman consist of just a key and output, as below. +(The examples in this section are just for illustration, and do not form +part of the Quick French keyboard). + +```keyman ++ "a" > "ä" +``` + +In this rule, the key is a, and the output is `"ä"`. A simple rule +begins with a plus sign, followed by the key, a greater-than symbol +(suggesting "becomes"), and finally the output. As you might guess, this +rule will change a lowercase a key typed by the +user into **ä**. + +The key and output can be written as a character in single or double +quotes (as above), or as its Unicode character code, or using a named +constant. The rule above could have also been written any of the +following ways, among others: + +```keyman ++ 'a' > 'ä' + ++ U+0061 > U+00E4 + +store(ADIERESIS) 'ä' ++ 'a' > $ADIERESIS +``` + +You can also write the key in one form and the context in another. + +## Rules with longer output + +The output of a rule is not limited to a single character. You could, +for example, write a rule such as the following: + +```keyman ++ "f" > "ph" +``` + +This would change any f keys typed into **ph**. +If the output of a rule consists of more than one character, you can +write the characters in different ways if necessary, with a space +separating each part. You can specify multiple characters in quotes, but +if you use the Unicode codes to write the characters, you must separate +each with a space: + +```keyman ++ "f" > U+0070 U+0068 + ++ "f" > U+0070 "h" +``` + +These rules are functionally identical to the one [further above](#toc-simple-rules). + +- [Continue with Step 5: Rules with Context](step-5) +- [Back to Step 3: The Keyboard Header](step-3) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-5.md b/developer/docs/help/guides/develop/tutorial/step-5.md new file mode 100644 index 00000000000..88a76bce340 --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-5.md @@ -0,0 +1,76 @@ +--- +title: Step 5: Rules with Context +--- + +## Rules with Context + +Very often we want a keyboard to produce different output based on more +than just the last keystroke. For example, in the Quick French keyboard, +we want the key e to produce one of è, é, +ë, ê, or just e, depending on what was typed immediately before +it. To do this we must make our rules look at the context. + +The context is the output from previous rules; that is, the characters +that are displayed on the screen. We can make a rule work with only +certain context by putting this before the plus sign in the rule: + +```keyman +"^" + "e" > "ê" +``` + +With this rule, whenever an e is typed, if it +was preceded by a caret (^), the output will be ê. It is important +to remember that the context consists of **output +from previous rules**, not the previous keystrokes. To emphasize +this point, consider the four rules below: + +```keyman ++ "a" > "b" ++ "b" > "c" +"b" + "c" > "d" +"c" + "d" > "e" +``` + +With these rules, typing b c would produce the +output `cc`, and not `d`, as you might initially expect. This is because +the key b is converted by the second rule into +the output `c`, while the third rule expects a context of b, and not +c; we would have to type a c to get `d`. + +However, if a key has no matching rule, the output will be the same as +the key: so the output `e` will be produced for either of the inputs c d (because c by itself has no rule), and b d. + +## Continuing the Quick French keyboard + +Now we know how to create context-dependent rules, we can continue +making the Quick French keyboard. Let's start with the rules for +acute-accented characters, using the ANSI codes from the table we +prepared earlier: + +```keyman +c lowercase characters with acute accent +"'" + "a" > U+00E1 +"'" + "e" > U+00E9 +"'" + "i" > U+00ED +"'" + "o" > U+00F3 +"'" + "u" > U+00FA +"'" + "y" > U+00FD + +c uppercase characters with acute accent +"'" + "A" > U+00C1 +"'" + "E" > U+00C9 +"'" + "I" > U+00CD +"'" + "O" > U+00D3 +"'" + "U" > U+00DA +"'" + "Y" > U+00DD +``` + +We can also create similar rules for the other thirty-odd accented +characters. + +As you can see, even for a simple keyboard like this we quickly end up +with a large number of rules, which makes for clumsiness. We can make +things simpler using stores, and the `any()` and `index()` statements. + +- [Continue with Step 6: Stores, `any()`, and `index()`](step-6) +- [Back to Step 4: The Keyboard Body](step-4) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-6.md b/developer/docs/help/guides/develop/tutorial/step-6.md new file mode 100644 index 00000000000..95ade8767c6 --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-6.md @@ -0,0 +1,116 @@ +--- +title: Step 6: Stores, any(), and index() +--- + +When we have many similar rules, as in the last example on the previous +page, we can group them together into one rule by using stores. A store +is a set of characters that are grouped under a single name. Stores are +used in rules with the [`any()`](/developer/language/reference/any) and +[`index()`](/developer/language/reference/index) statements. We create a +store with a [`store()` statement](/developer/language/reference/store): + +```keyman +store(vowels) "aeiou" +``` + +This creates a store called `vowels`, which contains the five lowercase +vowels. +> #### Note: +We could also have written the content of the store +using ANSI or Unicode character codes, in the same way as the output. + +The `any()` statement is used to match a character from a specific +store. For example, the following rule will replace any vowel with a +period, when used with the store above: + +```keyman ++ any(vowels) > "." +``` + +The `any()` statement can be used in the context or in the key part of a +rule. It cannot be used in the output. + +The second statement that is used with stores is the `index()` +statement. It is usually used in the output of a rule, and will output +the character from a particular store at the same position as the +character matched by a specified `any()` statement. This is best shown +with an example; this rule will convert all input to uppercase: + +```keyman +store(lowercase) "abcdefghijklmnopqrstuvwxyz" +store(uppercase) "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + ++ any(lowercase) > index(uppercase,1) +``` + +When a letter, such as j is typed, the `any()` +statement finds its position in the `lowercase` store; the `index()` +statement then gets this index from the `any()` statement, and outputs +the character at the same position in the `uppercase` store, in this +case `J`. + +The `index()` statement has two parts: the store from which it takes the +output character, and the offset of the `any()` statement that it gets +the character position from. This offset is found by counting the +characters and statements in the context and key parts of the rule up to +the `any()` statement. Again, a few examples may help to illustrate +this: + +```keyman +"a" + any(somestore) > index(otherstore,2) c The 'any' statement + c is character #2 +"ab" any(somestore) + "c" > index(otherstore,3) c The 'any' statement + c is character #3 + +c Here the 'index' statement references the second 'any' statement used, +c which is character #4 +U+0041 any(somestore) "B" + any(otherstore) > index(thirdstore,4) + +c You can have multiple 'index' statements in the output, which can +c reference the same or different 'any's +any(store1) + any(store2) > index(store1,2) index(store2,1) index(store3,2) +``` + +## Using stores in the Quick French keyboard + +We can now reduce the number of rules needed for the Quick French +keyboard by using stores. We will make five stores: one for the +unaccented vowels, and one each for vowels with acute accents, grave +accents, circumflexes, and diereses. For clarity, the `group()` +statement is repeated below: + +```keyman +group(Main) using keys + +store( plainvowels ) 'a' 'e' 'i' 'o' 'u' 'A' 'E' 'I' 'O' 'U' +store( acutevowels ) U+00E1 U+00E9 U+00ED U+00F3 U+00FA U+00C1 U+00C9 U+00CD U+00D3 U+00DA +store( gravevowels ) U+00E0 U+00E8 U+00EC U+00F2 U+00F9 U+00C0 U+00C8 U+00CC U+00D2 U+00D9 +store( circumvowels ) U+00E2 U+00EA U+00EE U+00F4 U+00FB U+00C2 U+00CA U+00CE U+00D4 U+00DB +store( dresisvowels ) U+00E4 U+00EB U+00EF U+00F6 U+00FC U+00C4 U+00CB U+00CF U+00D6 U+00DC + +"'" + any( plainvowels ) > index( acutevowels, 2 ) +"`" + any( plainvowels ) > index( gravevowels, 2 ) +"^" + any( plainvowels ) > index( circumvowels, 2 ) +'"' + any( plainvowels ) > index( dresisvowels, 2 ) +``` + +This is far clearer than the long list of rules that we used earlier. +Obviously we should add one or two more ordinary rules to produce uppercase +and lower-case ç, ý, and also the angled quotes « and ». Then we +will have almost finished the keyboard: + +```keyman +"'" + "y" > U+00FD c Acute-accented Y +"'" + "Y" > U+00DD + +"'" + "c" > U+00E7 c C-cedilla +"'" + "C" > U+00C7 + +"<" + "<" > U+00AB c Angled quotes +">" + ">" > U+00BB +``` + +All we need to do now is to test the keyboard. + +- [Continue with Step 7: Testing the Keyboard](step-7) +- [Back to Step 5: Rules with Context](step-5) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-7.md b/developer/docs/help/guides/develop/tutorial/step-7.md new file mode 100644 index 00000000000..2432bb76f4a --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-7.md @@ -0,0 +1,52 @@ +--- +title: Step 7: Testing the Keyboard +--- + +# Compiling the Keyboard + +Before we can test the keyboard, we must compile it. Choose +Keyboard, Compile +Keyboard or press F7 to compile the +keyboard. The Message window will display the results of the +compilation; if you have no typing errors, the keyboard should compile +successfully. + +If there are any mistakes, an error message will be displayed in the +Message window, which will tell you the line on which the error +occurred. + +## Compiling the Keyboard + +After compiling the keyboard successfully, we can start testing it. +Choose Debug, +Start Debugging or press +F5 to begin testing. The Keyboard debug window +will appear. + +Now we test that all the rules operate as expected. To test the rules, +we type the keystrokes that will give us the output; for example, we can +type a quote ' followed by one of +A, E, +I, O, +U, or Y to test the +uppercase acute-accented vowels. Similarly we can test the other +accents, and C-cedilla (`Ç`) and the angled quotes. If the rules are +correct, all this should work as we wanted. + +Testing the rules in isolation like this will show if the rules are +correct or not, but won't show other possible errors that might occur in +everyday usage of the keyboard. For example, look at what happens if you +type the following quote: + +> `'Alors Alice demande, "Où est mon chat ?"'` + +As you can see, it comes out incorrectly as: + +> `Álors Alice demande, Öù est mon chat ?"'` + +The problem occurs when we have a word in quotes that begins with a +vowel: the keyboard will convert it to an accented vowel. We will need +to come up with a solution to this problem. + +- [Continue with Step 8: Deadkeys](step-8) +- [Back to Step 6: Stores, `any()`, and `index()`](step-6) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-8.md b/developer/docs/help/guides/develop/tutorial/step-8.md new file mode 100644 index 00000000000..52f532ce76d --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-8.md @@ -0,0 +1,78 @@ +--- +title: Step 8: Deadkeys +--- + +## Solving the Problem + +Probably the easiest solution to the problem which we encountered on the +last page is to design the keyboard so that the user types a quote key +twice when they want to produce a quote, but once when they want to use +it as an accent. However, we cannot simply use the rule: + +```keyman +"'" + "'" > "'" +``` + +This will certainly produce a single quote after it's typed twice; +however it will still produce the same error, because the following +keystroke will continue to swallow the quote character from the context. +We need to distinguish between the output of this rule, when the user +wants a quote, and that of a single quote press, when the user wants to +place an accent on a vowel. To implement this behaviour, we use +[deadkeys](/developer/language/reference/deadkey). + +## Deadkeys + +A deadkey is like a character that is used in the context or output but +never appears on the screen. We use deadkeys like this: + +```keyman ++ "'" > deadkey(quote) + +c Handle acute accents +deadkey(quote) + any( plainvowels ) > index( acutevowels, 2 ) + +c Handle a single quote +deadkey(quote) + "'" > "'" +``` + +Note that for the sake of convenience, a deadkey can also be written in +a short form: + +```keyman +dk(quote) c This is identical to deadkey(quote) +``` + +Type the three rules above in place of the existing rule for acute +accents in the keyboard so far. If you test the keyboard now, you will +find that the error no longer occurs. This is because accented vowels +are only produced after the deadkey, and no deadkey is output if the +user types a quote key twice. + +But we've introduced another difference to the keyboard now: the quote +is no longer displayed before you type the vowel. This is because we are +converting the quote to a deadkey. If we prefer, we can still +distinguish between rules in the above manner and display the quote, if +we just add a quote before the deadkey, like this: + +```keyman ++ "'" > "'" dk(quote) + +c Handle acute accents +"'" dk(quote) + any( plainvowels ) > index( acutevowels, 3 ) + +c Handle a single quote +"'" dk(quote) + "'" > "'" +``` + +However, we will not use this technique for the Quick French keyboard. + +Now we can make changes so that all the other accents use deadkeys as +well, for consistency, and add rules to output the accent character by +typing the key twice. + +The Quick French keyboard is now complete. The full source is on the +next page. + +- [Continue with Step 9: The Finished Keyboard](step-9) +- [Back to Step 7: Testing the Keyboard](step-7) \ No newline at end of file diff --git a/developer/docs/help/guides/develop/tutorial/step-9.md b/developer/docs/help/guides/develop/tutorial/step-9.md new file mode 100644 index 00000000000..03e00a27870 --- /dev/null +++ b/developer/docs/help/guides/develop/tutorial/step-9.md @@ -0,0 +1,66 @@ +--- +title: Step 9: The Finished Keyboard +--- + +## The Quick French Keyboard + +Here is the completed keyboard: + +```keyman +c Simplified French Keyboard for Keyman 9.0 +c +c This keyboard program uses a simplified set of keys +c for typing French, especially for those who don't know the +c standard French keyboard. +c +c NOTE: This keyboard was created from the Keyman keyboard +c programming tutorial. + +store(&Version) "9.0" c This keyboard is for use with Keyman 9.0 +store(&Name) "Quick French" +store(&Bitmap) "qfrench.ico" +store(&MnemonicLayout) "1" c This keyboard uses a mnemonic layout. + +begin Unicode > use(Main) + +group( Main ) using keys + +c Store the upper and lowercase vowels with different accents +store( plainvowels ) 'a' 'e' 'i' 'o' 'u' 'A' 'E' 'I' 'O' 'U' +store( acutevowels ) U+00E1 U+00E9 U+00ED U+00F3 U+00FA U+00C1 U+00C9 U+00CD U+00D3 U+00DA +store( gravevowels ) U+00E0 U+00E8 U+00EC U+00F2 U+00F9 U+00C0 U+00C8 U+00CC U+00D2 U+00D9 +store( circumvowels ) U+00E2 U+00EA U+00EE U+00F4 U+00FB U+00C2 U+00CA U+00CE U+00D4 U+00DB +store( dresisvowels ) U+00E4 U+00EB U+00EF U+00F6 U+00FC U+00C4 U+00CB U+00CF U+00D6 U+00DC + +c Output deadkeys only for the accent keys pressed ++ "'" > dk(quote) c Quote for acute accent ++ "`" > dk(bkquote) c Backquote for grave accent ++ "^" > dk(caret) c Caret for circumflex ++ '"' > dk(dbquote) c Double-quote for dieresis + +c Rules for accented vowels +dk(quote) + any( plainvowels ) > index( acutevowels, 2 ) +dk(bkquote) + any( plainvowels ) > index( gravevowels, 2 ) +dk(caret) + any( plainvowels ) > index( circumvowels, 2 ) +dk(dbquote) + any( plainvowels ) > index( dresisvowels, 2 ) + +c Rules for other characters +dk(quote) + "y" > U+00FD c Acute-accented Y +dk(quote) + "Y" > U+00DD + +dk(quote) + "c" > U+00E7 c C-cedilla +dk(quote) + "C" > U+00C7 + +"<" + "<" > U+00AB c Angled quotes +">" + ">" > U+00BB + +c Rules for the accent character itself (type it twice) +dk(quote) + "'" > "'" c Quote +dk(bkquote) + "`" > "`" c Backquote +dk(caret) + "^" > "^" c Caret +dk(dbquote) + '"' > '"' c Double-quote + +c End of keyboard +``` + +- [Back to Step 8: Deadkeys](step-8) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/index.md b/developer/docs/help/guides/distribute/index.md new file mode 100644 index 00000000000..7b84bf472fd --- /dev/null +++ b/developer/docs/help/guides/distribute/index.md @@ -0,0 +1,10 @@ +--- +title: Distributing keyboards +--- + +- [Package development tutorial](tutorial) (Keyman Desktop, Keyman for macOS, Keyman for mobile apps) +- [Distribute keyboards to Keyman applications](packages) + +## See also + +- [Keyman Engine](/developer/engine/) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/install-kmp-android.md b/developer/docs/help/guides/distribute/install-kmp-android.md new file mode 100644 index 00000000000..bdba196c908 --- /dev/null +++ b/developer/docs/help/guides/distribute/install-kmp-android.md @@ -0,0 +1,78 @@ +--- +title: Installing Custom Keyboards to your Android Device +--- + +## Overview + +In [Keyman for Android 10.0](/products/android/10.0/), we added the ability to +easily download/share custom keyboards to your Android device. + +## Installing a custom keyboard + +To install a custom keyboard, you will need a link to download the +keyboard package. If you have already copied the kmp file onto the +Android device, skip to Step 2. + +If you want to build and dev your own keyboard, you will need some +technical skills for this, and can read our full step-by-step +instructional on how to do this [here](packages). + +Once you have a website or email with a link to the keyboard package, +follow these steps on your Android device to download and install the +keyboard package into the Keyman for Android application: + +## Step 1) Click the link to save your custom keyboard package file + +The link in this example is for Khmer Angkor keyboard. + +![](../../images/dist-url-screen-ap.png) + +## Step 2) Add Keyboard from Device + +Once the KMP file is on your device, you will need to browse to the KMP +file and select it. From the Keyman menu, select "Settings". From the +Keyman Settings menu, select "Add Keyboard from Device". + +![](../../images/settings-language-ap.png) + +The device will launch a file browser where you'll browse to the +directory of your KMP file. A common places to look is the "Downloads" +folder. + +![](../../images/dist-file-browser-ap.png) + +Selecting the KMP file should bring you to Step 3) + +## Step 3) Grant Keyman for Android access to storage (Android 6.0+ only) + +On Android 6.0 (Marshmallow) and higher, mobile apps need to request +permission to access storage. Keyman for Android needs access to read +storage for installing the KMP file. At the dialog, select "ALLOW". Once +authorized, Keyman for Android won't need to ask for storage permission +again, unless the user revokes or uninstalls the app. + +![](../../images/dist-storage-permission-ap.png) + +Older versions of Android grant Storage permissions at app installation +time, so those users can skip this step. + +## Step 4) Keyboard Package welcome screen + +Keyman for Android will parse the metadata in the package. If the +keyboard package includes a "welcome.htm" file, this will be displayed +at the confirmation to install the keyboard package + +![](../../images/dist-welcome-ap.png) + +If "welcome.htm" is not included, a generic page with the package ID and +package version will be shown. + +Click the left "Install" button to install the entire keyboard package + +## Step 5) The keyboard is successfully installed! + +All the keyboards in the package are installed as a group. In this +example, the package only has the "Khmer Angkor" keyboard, so it becomes +the active keyboard + +![](../../images/dist-install1-ap.png) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/install-kmp-ios.md b/developer/docs/help/guides/distribute/install-kmp-ios.md new file mode 100644 index 00000000000..de4d3a64cb5 --- /dev/null +++ b/developer/docs/help/guides/distribute/install-kmp-ios.md @@ -0,0 +1,53 @@ +--- +title: Installing Custom Keyboards to your iPhone or iPad +--- + +## Overview + +In version 10 of Keyman for iPhone and iPad, we added the ability to easily download custom keyboards to your iOS device. + +## Installing a custom keyboard + +To install a custom keyboard, you will first need a link to the keyboard +package on a website or in your email. + +If you want to build and dev your own keyboard, you will need some +technical skills for this, and can read our full step-by-step +instructional on how to do this [here](packages). + +Once you have a website or email with a link to the keyboard package, +follow these steps on your iPhone or iPad to download and install the +keyboard package into the Keyman for iPhone and iPad application: + +## Step 1) Click the link to your custom keyboard package file + +The link in this example is for GFF Amharic 7 keyboard. + +![](../../images/dist-url-screen-i.png) + +Safari will display an option to open the KMP file with Keyman + +![](../../images/dist-kmp-open-i.png) + +## Step 2) Click Open in "Keyman" + +Keyman for iPhone and iPad will parse the metadata in the package. If +the keyboard package includes a "welcome.htm" file, this will be +displayed at the confirmation to install the keyboard package + +![](../../images/dist-welcome-i.png) + +If "welcome.htm" is not included, a generic page with the package ID and +package version will be shown. + +## Step 3) Click the top right "Install" button + +The keyboard from the keyboard package is successfully installed! + +![](../../images/dist-kmp-success-i.png) + +All the keyboards in the package are installed as a group. In this +example, the package only has the "GFF Amharic 7" keyboard, so it +becomes the active keyboard + +![](../../images/dist-install1-i.png) diff --git a/developer/docs/help/guides/distribute/packages.md b/developer/docs/help/guides/distribute/packages.md new file mode 100644 index 00000000000..e3382220a30 --- /dev/null +++ b/developer/docs/help/guides/distribute/packages.md @@ -0,0 +1,131 @@ +--- +title: Distribute keyboards to Keyman Applications +--- + +## Overview + +Keyboard package files contain one or more keyboards, along with readme +files, fonts (if your keyboard requires a custom font), and any other +files you wish to include. You should create a package file to bundle +your keyboard with fonts and help into a simple, single file that is +easy for an end-user to install. + +Internally, as well as your own files, the package file will contain +metadata files "kmp.inf" and "kmp.json", which list the details Keyman +needs to install the package. The package file is a ZIP compatible +archive. + +> ### Tip +You can distribute keyboards and lexical models in package files, but +you can't include both in the same package file. + +#### Keyman Desktop + +Keyman Desktop can install package files, including installing fonts, +creating Start Menu shortcuts, and adding appropriate registry entries +for uninstallation. + +On Windows, the context menu for a package file has one additional +entry: "Install". + +#### Keyman for macOS + +Keyman for macOS can install package files with fonts and keyboards, and +shortcuts in the package will be available through the keyboard's entry +in Keyman Configuration. + +#### Keyman for Android and Keyman for iPhone and iPad + +Keyman mobile applications can install the same package files as Keyman +Desktop, as long as the package includes keyboards for touch layouts. + +## Package file contents + +A package can have a variety of different files contained within. The +following files and file types are recognized by the package installer: + +\*.kmx (Desktop and macOS only) +: Keyboard files. Each of these will be installed. Keyman + Configuration will not allow installation or uninstallation of a + single keyboard from a package. They will always be treated as a + group for installation and uninstallation. + +\*.kvk (Desktop and macOS only) +: On Screen Keyboard files, associated with each keyboard file. + +\*.js (mobile only) +: Touch layout Keyboard files. When Keyman mobile applications install + a keyboard package, all included keyboards will be installed as a + group. With Keyman Developer 10, the keyboard version information is + in kmp.json, and no longer within the JS file names. + +welcome.htm +: Introductory help for the keyboard, HTML format. This will normally + be displayed when the package is installed by the user, and is also + the entry point for help when accessed via Keyman's help system or + Keyman Configuration. + +readme.htm +: Displayed before a package is installed, together with brief + metadata about the package, to allow the user to determine if they + wish to continue installation of the package. + +kmp.inf (Legacy versions of Keyman) +: A Windows .ini format file that lists each of the files in the + package, together with metadata. + +kmp.json +: A JSON format file contains metadata for the keyboard package such + as package version, keyboard versions, and lists each of the files + in the package. For more explanation of the structure of the JSON + file, please read the + [metadata](../../reference/file-types/metadata) documentation. + +\*.ttf, \*.otf, \*.ttc +: Truetype font files that will be installed with the package, and + uninstalled when the package is removed. On mobile, these fonts will + be available only within the Keyman app and the on-screen-keyboard, + not in other apps. + +## Share the keyboard package file + +> ### Tip +Read [Step 2: Organizing the Keyboard Files](../../../keyboards/github/step-2) +to know which files to include or exclude in the keybord folder. + +Once the keyboard package .kmp file is created, you can share them via +external storage devices (USB drive, SD card, etc). You can also share +the package file via a cloud storage system (Google Drive, Dropbox or +similar service), then share the link to your device via text, note or +email. Alternatively, you can upload the .kmp file to a public facing +website. For this example, the keyboard package for Khmer Angkor is +being uploaded: + +1. khmer_angkor.kmp (the keyboard package .kmp file) + +## Putting the keyboard package on a website + +Once all the files have been uploaded, you will need to provide a link +to the keyboard package .kmp file for your device to download and +install. This can either be a link on a web page, or a link in an email. +In this tutorial, a very simple .html web page with a link to the +khmer_angkor.kmp file is created: + +``` markup + + + + + Custom Keyboard URL + + +``` + +The link must be in the format `http://` or `https://` + +Upload the web page to your public facing website. Once done, you can +install the keyboard package onto your mobile devices by following these +steps: + +- [Installing custom keyboards to your iPhone or iPad](install-kmp-ios) +- [Installing custom keyboards to your Android device](install-kmp-android) diff --git a/developer/docs/help/guides/distribute/tutorial/index.md b/developer/docs/help/guides/distribute/tutorial/index.md new file mode 100644 index 00000000000..ec57e57e100 --- /dev/null +++ b/developer/docs/help/guides/distribute/tutorial/index.md @@ -0,0 +1,36 @@ +--- +title: Package Tutorial +--- + +[Step 1: What do we include?](step-1) + +[Step 2: Creating Additional Files for the Package](step-2) + +[Step 3: Creating a package and adding files](step-3) + +[Step 4: Filling in package details](step-4) + +[Step 5: Shortcuts](step-5) + +[Step 6: Compiling, testing and distributing a Package](step-6) + +## Overview + +Welcome! In this tutorial, you will learn how to create a +[package](../../../reference/file-types/kmp). A package is a collection +of files, compressed into a single file, just like a ZIP file. It is +designed to make installation of keyboards, fonts and related +documentation straightforward for the end user. When done, the package +can be installed into Keyman Desktop through a simple dialog. Keyman for +mobile apps can also download and install keyboards through the keyboard +package. + +We will be creating a Khmer Angkor package. You can make your own +package based on the Quick French keyboard from the [keyboard tutorial](../../develop/tutorial). + +### Let's begin + +Let's get started! Move on to the next topic to begin the first step, +choosing what to include in the package. + +[Step 1: What do we include?](step-1) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/tutorial/step-1.md b/developer/docs/help/guides/distribute/tutorial/step-1.md new file mode 100644 index 00000000000..a18fce49ac9 --- /dev/null +++ b/developer/docs/help/guides/distribute/tutorial/step-1.md @@ -0,0 +1,35 @@ +--- +title: Step 1: What do we include? +--- + +What is the purpose of a package? To make installation of a keyboard, +fonts, documentation, and on screen keyboard as straightforward as +possible for the end user. + +We need to keep this goal in mind as we work on all the aspects of a +package. + +A good package will: + +1. Collect the keyboard and font files together for simple installation +2. Include Start Menu items for documentation + +A great package will also: + +1. Include a 'readme' visible before install. +2. Include a 'welcome.htm' file which is displayed after install. +3. Include an On Screen Keyboard if relevant. +4. Include documentation on use of the keyboard. + +Packages uploaded to the Tavultesoft website will get basic icon ratings +reflecting their ease of install/use: + +- ![](../../../images/tutorial_package_includesfonts.gif) includes fonts +- ![](../../../images/tutorial_package_includesdocs.gif) includes documentation +- ![](../../../images/tutorial_package_includesosk.gif) includes on screen keyboards +- ![](../../../images/tutorial_package_includeswelcome.gif) includes welcome.htm + +In general, the more icons that a package earns, the easier that end +users will find it to start using. + +[Step 2: Creating Additional Files for the Package](step-2) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/tutorial/step-2.md b/developer/docs/help/guides/distribute/tutorial/step-2.md new file mode 100644 index 00000000000..17dc613ba8d --- /dev/null +++ b/developer/docs/help/guides/distribute/tutorial/step-2.md @@ -0,0 +1,127 @@ +--- +title: Step 2: Creating Additional Files for the Package +--- + +You should create or select some additional files for a package. Below +are a list of the typical files that you would create for or include in +a package. + +readme.htm + +: A short description of the package, its use restrictions, and what + it includes. Try to keep the readme under 10 lines long. The readme + is displayed in the package install dialog and should be an html + file for optimal formatting. + + > ### Tip + As the package has not been installed at this stage, and you are using fonts that may not yet be available on the target device, you should use CSS @font-face declarations to ensure that the text is readable on all devices. + + Create the HTML file in any HTML editor. + + > ### Tip + If using Microsoft Word, choose HTML (clean) when saving to create a smaller file. + + Note, if your HTML editor puts images into a subfolder, you will need to edit the HTML source so that all files are in the same folder -- the package builder will not maintain subfolders. You can easily edit the HTML source in Keyman Developer. + + Also, if your welcome or readme files use embedded external images, stylesheets, javascript or other files, you will need to add these files to your package as well. + +welcome.htm + +: When including an introductory help file in your package, you must + name the file welcome.htm. This file will be detected during install + and displayed (in a window roughly two thirds of the user's screen + width) after the package install completes successfully. Make sure + that you design your HTML file so that it can be resized to fit the + user's screen - avoid extra wide tables or wide fixed width + elements. + + At this stage of the installation, fonts in the package have been installed, so you can include text that uses those fonts. + + Welcome.htm will also be accessible after installation from Keyman Configuration under the Package Options menu, and from the Keyboard Help item and On Screen Keyboard toolbar button. + + The intention of welcome.htm is to provide instructions on getting started with your keyboards. + + > ### Tip + Useful information to include in welcome.htm is: + - key sequences - especially for characters that may not be immediately obvious. + - names of fonts in the package. + - names of keyboards in the package. + - links to additional help on your website or more extensive documentation files in the package. + - a link to an official distribution site for your package (even + if it is the Keyman website) - so that users know where to find + the latest version of your package. + + You should avoid including instructions for the use of Keyman + itself - although a basic "click the Keyman icon and choose Quick + French" would be helpful. + + > ### Tip + If you want links to your website to open in the user's preferred + browser, preface the href link with `link:`, e.g. + `website` + The `link:` sceheme will open the referred file in the default + application - that is, a web browser for URLs and links, Notepad for + .txt files, Adobe Reader for PDFs. You can use `link:` to open any + of the files in the package, e.g. `link:docs.pdf` will open the file + docs.pdf in Adobe Reader or the default PDF reader on the system. + + To save you the effort of writing a welcome and readme file for the + Quick French example, we have placed some in the Samples/QFrench + folder. + + If you create documents in other formats, for example PDF or + printable documentation, you should link to that in the welcome.htm. + + > ### Tip + You can include multiple "welcome.htm" files for different languages + by appending a hyphen and the BCP 47 language code to the filename, + for example welcome-fr.htm for French. + +Fonts + +: A font is the single most important item to include with a keyboard + – if the characters of the language you are supporting are not in + fonts included with target operating systems. Installing fonts is + tedious, so make sure that your users don't have to locate and + install fonts themselves! + + .TTF, .OTF, and .TTC fonts will be installed by the package + installer, and uninstalled when the package is uninstalled. A list + of the fonts installed is displayed in the Install Package dialog. + +Keyboards + +: Add the .kmx compiled Keyman keyboards to the package. You can add + multiple keyboards to the package, but be judicious. + + > ### Tip + Don't forget to add the On Screen keyboard .KVK file associated with + your keyboard to the package. KVK files are not compiled into the + .KMX file -- although the .ICO/.BMP is. + + Add the .js compiled Keyman touch layout keyboards to the package. + +Documentation + +: The two preferred documentation formats are HTML and PDF. You should + avoid .DOC, .RTF, and other formats -- .DOC files in particular are + not recommended due to the possibility of macro viruses. + + Remember that HTML files can be displayed on any computer without + additional software. PDF files require Adobe Reader or a compatible + PDF viewer application. You may choose to include both and HTML + documentation - PDF documents often print better than HTML + documents, but HTML documentation is more accessible and translates + better to on-screen or web use. + + > ### Tip + If you use HTML, don't forget to also add all the included files + such as images and stylesheets! + +Splash Image +: The splash image is a 140x250 pixel image that is displayed when the + package is installed, at the left of the Package Install dialog. + Including a splash image makes your package look more professional + and polished, so a splash image is recommended! + +[Step 3: Creating a package and adding files](step-3) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/tutorial/step-3.md b/developer/docs/help/guides/distribute/tutorial/step-3.md new file mode 100644 index 00000000000..657f2cd02b5 --- /dev/null +++ b/developer/docs/help/guides/distribute/tutorial/step-3.md @@ -0,0 +1,31 @@ +--- +title: Step 3: Creating a package and adding files +--- + +We are finally ready to open up the Package Editor and create the new +package. + +- In the Project Window in Keyman Developer, click the **Packages** tab, and click **New Package...**. Enter the path and filename of the package you are creating. + +> ### Tip +This tutorial makes a package named `khmer_angkor.kps`, but you could call yours `qfrench.kps`. + +A package source file will have the extension .kps, and will be compiled in a file with extension .kmp. + +After you click OK, the Package Editor will open with the Files tab visible. + +![](../../../images/tutorial_distribute_keyboard_3_files.png) + +- In the Files tab, click **Add...** to add + all the files we discussed in the previous step to the package. You + can add multiple files at once, and from multiple folders. When the + package is compiled, all the files will be placed in the same folder + within the package. +- If your package includes .js touch layout keyboards, you can + associate fonts and languages in the Keyboards tab. A valid [BCP 47 language tag](../../../reference/bcp-47) must be set or the keyboard will not install on your mobile device. + +![](../../../images/tutorial_distribute_keyboard_3.png) + +You could stop here. This would be a completely valid package, but it would not be as good as it could be. So let's continue on to the next step, and fill in some descriptions of the package. + +[Step 4: Filling in package details](step-4) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/tutorial/step-4.md b/developer/docs/help/guides/distribute/tutorial/step-4.md new file mode 100644 index 00000000000..67c55fe66b8 --- /dev/null +++ b/developer/docs/help/guides/distribute/tutorial/step-4.md @@ -0,0 +1,63 @@ +--- +title: Step 4: Filling in package details +--- + +Click on the Details tab in the Package Editor. You should fill in as +many details as you can on this page. + +![](../../../images/tutorial_distribute_keyboard_details.png) + +Package Name + +: The Package Name will be displayed in the package install dialog, + and within Keyman Desktop Configuration, wherever the package is + referred to. + +Readme File + +: Select the readme file from the list of files you added in the + previous step. Remember that it should be a HTML file for optimum + clarity. + +Version + +: A version number for the package is important - it helps the your + users know that they are using the most recent update of your + package. The version format you should use is `1.0`. When making a + major change to your package or keyboards in your package, increment + the first part and set the second part to, e.g. `2.0`; when making a + bug fix or a minor update, increment the second part, e.g. `1.1`. + +Version numbers should be in the form `major.minor[.subversion]`. + Subversion is optional but is helpful for small bug fix releases. + Each of the sections of the version should be an integer. Keyman + Desktop does integer comparisons on the version numbers, so, for + example, version `2.01` is regarded as older than version `2.2`. + Alphabetic or date formats should be avoided as the installer for + the keyboard cannot determine which version is older reliably. + +Copyright + +: Enter copyright details for your package and keyboards. Keep this + reasonably short or it won't be clear for end users. + +Author + +: Enter your name or the name of your company. + +Email + +: Enter a contact email address where package users can contact you. + If you don't want to be contacted via email, leave this field empty + +Website + +: Enter the name of the website where you will have information about + this keyboard. If you want to host it on keyman.com, you could enter + `http://www.keyman.com/` + +Image file +: Select the splash image file that you created in Step 2 from the + list of files in your package. + +[Step 5: Shortcuts](step-5) diff --git a/developer/docs/help/guides/distribute/tutorial/step-5.md b/developer/docs/help/guides/distribute/tutorial/step-5.md new file mode 100644 index 00000000000..eb24d70f133 --- /dev/null +++ b/developer/docs/help/guides/distribute/tutorial/step-5.md @@ -0,0 +1,49 @@ +--- +title: Step 5: Shortcuts +--- + +Click on the Shortcuts tab in the Package Editor. + +![](../../../images/tutorial_distribute_keyboard_shortcuts.png) + +While it may be a good idea to include Start Menu shortcuts for your +package, on recent versions of Windows these are not very visible to end +users. This means that you should ensure that all instructions are +available through the **welcome.htm** file as well. The Start Menu +shortcuts were designed originally for Windows-based keyboard packages +and work slightly differently in macOS. + +You should consider adding the following items to the Start Menu: + +- Documentation shortcuts +- Welcome.htm shortcut + +> ### Note +While Keyman Developer 8.0 and earlier versions of the documentation +advised including an uninstall shortcut to the package, this is no +longer recommended. Users should uninstall your package from Keyman +Configuration. Adding an uninstall shortcut to the package adds +confusion to the Start Menu search on Windows, and is not compatible +with macOS keyboards. + +Click **New** to add a new shortcut to the +package. Enter a description for the shortcut, and select the program or +file to start from the Program list. Four predefined program entries +(Start Product), (Product Configuration), (Product Help) and (About +Product) will be translated into the appropriate shortcuts to start +Keyman Desktop tasks as described. + +> ### Note +In Keyman 6 and earlier, the predefined targets $KEYMAN\keyman.exe and +$KEYMAN\kmshell.exe were available. These are translated to (Start +Product) and (Product Configuration), respectively, in Keyman Desktop +7.0 and later versions. + + + +> ### Tip +Packages are not listed in the Control Panel Add/Remove Programs applet +with Keyman Desktop 7.0 and later versions. Packages can be uninstalled +through the Start Menu shortcut or from Keyman Desktop Configuration. + +[Step 6: Compiling, testing and distributing a Package](step-6) \ No newline at end of file diff --git a/developer/docs/help/guides/distribute/tutorial/step-6.md b/developer/docs/help/guides/distribute/tutorial/step-6.md new file mode 100644 index 00000000000..374584c3e1c --- /dev/null +++ b/developer/docs/help/guides/distribute/tutorial/step-6.md @@ -0,0 +1,68 @@ +--- +title: Step 6: Compiling, testing and distributing a Package +--- + +In the Package Editor, click on the **Compile** tab. + +![](../../../images/tutorial_distribute_keyboard_compile.png) + +Click **Compile Package** to compile the +package into a .kmp file. Compiling takes all the files listed for the +package, compresses them (using a .ZIP-compatible format) and adds the +package information, all into a single file. If any files are not +available, an error will be listed in the Messages window. + +After compiling, you can test the package installation in Keyman +Desktop, by clicking **Install Package**. You +should test that all the keyboards and fonts install successfully, that +the Readme and Welcome files are displayed during the install, and that +the documentation is accessible to the end user. Make sure that the On +Screen Keyboard installs with your keyboards, and that the shortcuts are +correctly listed and working in the Start Menu. + +> ### Advice +The distribution model for Keyman keyboards is changing. We now +recommend distributing source for keyboards through the [Keyman Cloud Keyboard Repository](/developer/keyboards/). The instructions here +remain, but the binary distribution model is deprecated. + +## Distributing a package on the Keyman Cloud Keyboard Repository + +Once you have tested the package to your satisfaction, it is time to +distribute it. We recommend uploading your keyboard package to the +[Keyman Cloud Keyboard Repository](/developer/keyboards/) + +## Distributing a package on your own website + +If you distribute a package on your own site, we have the following +recommendations: + +1. Ensure the MIME type on the web server or folder for .KMX and .KMP + files is set up to application/octet-stream. Without this, .KMP + files may be recognised as .ZIP files -- this is not helpful to the + end user as it will be opened in the wrong application. If you can't + make this change, consider hosting the keyboard package on the + Tavultesoft website to make things easier for your end user. +2. Avoid putting the .KMP file in an archive (e.g. .ZIP) or + self-expanding archive (.EXE) - this makes it harder for end users + to install. A .KMP file is already compressed (it is actually just a + ZIP archive file!) and you won't save much space by recompressing + it. +3. Include a link to the Keyman download page: + `http://keyman.com/desktop/` + +## Distributing a package by email + +Attaching the KMP file directly to an email may be blocked for security +reasons. As mentioned above, a KMP file is basically a ZIP file and +mobile keyboard data is in JavaScript, this is a combination that looks +suspicious to many email servers. You can upload it to a Google drive, +and email a link for downloading the file + +You may need to do some exploring to get your mobile device to load the +keyboard from the KMP file into Keyman. The device may not open the file +directly, claiming it is an unrecognized type. If you look for other +options to open the file, hopefully you can get it to Keyman. For +example, in iOS, I had to tap on the three dots to the right, then +choose "Open in" and then I could choose "Copy to Keyman." In Android, I +had to download the file to my device, then open the KMP file in a file +manager before I could install it in Keyman. \ No newline at end of file diff --git a/developer/docs/help/guides/index.md b/developer/docs/help/guides/index.md new file mode 100644 index 00000000000..55604780ad2 --- /dev/null +++ b/developer/docs/help/guides/index.md @@ -0,0 +1,13 @@ +--- +title: Keyman Developer Guides +--- + +Need help using Keyman Developer? You'll find everything you need here, including product documentation, frequently asked questions and tutorials. + +- [Introduction to Keyman Developer](intro) +- [Developing Keyman keyboards](develop/) +- [Testing Keyman keyboards](test/) +- [Distributing Keyman keyboards](distribute/) +- [Developing Keyman lexical models (for predictive text and autocorrect)](lexical-models/) +- [Distributing Keyman lexical models](lexical-models/distribute/) +- [Keyman Developer command line tools guide](command-line) \ No newline at end of file diff --git a/developer/docs/help/guides/intro.md b/developer/docs/help/guides/intro.md new file mode 100644 index 00000000000..fd72c898f91 --- /dev/null +++ b/developer/docs/help/guides/intro.md @@ -0,0 +1,43 @@ +--- +title: Introducing Keyman Developer +--- + +## Welcome to Keyman Developer + +Keyman Developer allows you to create your own keyboard layouts for use +on the Keyman platform. Keyman is a multi-platform input method solution +that runs on Windows, macOS, the web, mobile web, iOS and Android and +Linux. + +There are two core applications included in Keyman Developer: the Keyman +Developer IDE (formerly called TIKE), and the command line compiler kmc. + +[Watch a video](https://youtu.be/kwhgx_eX4Es) that highlights some of +the Keyman Developer features. + +## Keyman Developer IDE + +The Keyman Developer IDE is a complete environment for designing, +developing, testing, and packaging your keyboards for distribution. Some +of the major features of Keyman Developer IDE are: + +- Keyboard Editor, for creating keyboards visually for all platforms +- Touch Layout editor, for creating fluid touch layouts +- Package Editor, for creating a package of keyboard, fonts and files for distribution (used on all platforms except web) +- Lexical Model Editor, for creating predictive text models +- Integrated compiler, to compile keyboards, packages and models +- Fully interactive debugger for testing keyboards and models +- Character Map, which supports viewing Unicode fonts under all Windows versions +- On Screen Keyboard editor, for creating visual representations of keyboards +- Projects, for managing keyboard and lexical model development projects large and small + +Source files (except images!) are normally written in UTF-8 format, so +they can be opened with any text editor. However, the Keyman Developer +IDE provides much tooling to simplify editing each of the types of +files. The Keyman Developer IDE runs on Windows. + +## kmc, the command line compiler + + +kmc, the command-line compiler, is a comprehensive tool that lets you +compile keyboards, packages, models and projects from the command-line. diff --git a/developer/docs/help/guides/lexical-models/advanced/index.md b/developer/docs/help/guides/lexical-models/advanced/index.md new file mode 100644 index 00000000000..951df2fc48e --- /dev/null +++ b/developer/docs/help/guides/lexical-models/advanced/index.md @@ -0,0 +1,19 @@ +--- +title: Advanced Lexical Models Topics +--- + +> For the following topics, **knowledge of TypeScript or JavaScript is +required**. + +The Keyman lexical model engine is capable of much more sophisticated +lexical models than the one described in the [tutorial](../tutorial). To +make advanced models, you will need to modify the [model definition file](model-definition-file), also known as the [`.model.ts` file](../../../reference/file-types/model-ts). + +Once you understand how to change the model.ts file, you can attempt +these customizations to an existing wordlist project: + +[Changing the default punctuation](punctuation) + +[Creating a custom search key function](search-term-to-key) + +[Customizing the word breaker](word-breaker) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/advanced/model-definition-file.md b/developer/docs/help/guides/lexical-models/advanced/model-definition-file.md new file mode 100644 index 00000000000..97b207d8f32 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/advanced/model-definition-file.md @@ -0,0 +1,102 @@ +--- +title: The model definition file +--- + +This is a small [TypeScript](https://www.typescriptlang.org/) source +code file that tells us how to define our model. + +In the case of the **wordlist lexical models**, the model definition +file indicates where to find the [TSV source files](../../../reference/file-types/tsv), as well as gives us the option to tell the compiler a little bit more about our language’s spelling system or *orthography*. + +## The model definition template + +**Keyman Developer** provides a default model definition similar to the +following. If you want to create the file yourself, copy-paste the +following template, and save it as `model.ts`. Place this file in the +same folder as `wordlist.tsv`. + +```typescript +/* + sencoten 1.0 generated from template. + + This is a minimal lexical model source that uses a tab delimited wordlist. + See documentation online at https://help.keyman.com/developer/ for + additional parameters. +*/ + +const source: LexicalModelSource = { + format: 'trie-1.0', + wordBreaker: { + use: 'default', + }, + sources: ['wordlist.tsv'], +}; +export default source; +``` + +Let's step through this file, line-by-line. + +On the first line, we're declaring the source code of a new lexical +model. + +```typescript +const source: LexicalModelSource = { +``` + +On the second line, we're saying the lexical model will use the +`trie-1.0` format. The `trie` format creates a lexical model from one or +more word lists; the `trie` structures the lexical model such that it +can predict through thousands of words very quickly. + +```typescript + format: 'trie-1.0', +``` + +On lines 3–5, we're specifying the word breaking algorithm that we want +to use. Keyman supplies a default algorithm that conforms to the rules +expected for many languages. + +```typescript + wordBreaker: { + use: 'default', +}, +``` + +On the sixth line, we're telling the `trie` where to find our wordlist. + +```typescript + sources: ['wordlist.tsv'], +``` + +The seventh line marks the termination of the lexical model source code. +If we specify any customizations, they **must** be declared above this +line: + +```typescript +}; +``` + +The eighth line is necessary to allow external applications to read the +lexical model source code. + +```typescript +export default source; +``` + +## Customizing our lexical model + +The template, as described in the previous section, is a good starting +point, and may be all you need for your language. However, most language +require a few customizations. The `trie-1.0` wordlist model supports the +following customizations: + +[Punctuation](punctuation) +: How to define certain punctuation in your language. + +[Word breaker](word-breaker) +: How to determine when words start and end in the writing system. + +[Search term to key](search-term-to-key) +: How and when to ignore accents and letter case. + +To see all of the things possible in a model definition file, see the [`LexicalModelSource` interface](https://github.com/keymanapp/keyman/blob/stable-15.0/developer/js/source/lexical-model-compiler/lexical-model.ts#L95-L146). \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/advanced/punctuation.md b/developer/docs/help/guides/lexical-models/advanced/punctuation.md new file mode 100644 index 00000000000..a665f08e4d8 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/advanced/punctuation.md @@ -0,0 +1,73 @@ +--- +title: Punctuation +--- + +The lexical models use two different kinds of punctuation: + +- Quotation marks around the “keep” suggestion. +- What kind of space to insert after words, if any. + +Both of these can be customized by adding the punctuation to [model definition file](./model-definition-file). Here is a full example of a model definition file using default punctuation: + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + // CUSTOMIZE THIS: + punctuation: { + quotesForKeepSuggestion: { + open: "“", close: "”" + }, + insertAfterWord: " ", + }, + // other customizations go here: +}; + +export default source; +``` + +## Customizing `quotesForKeepSuggestion` + +These are the quotation marks that surrond the “keep” suggestion when +it's displayed in the suggestion bar. By defaut, the quotations used are +“smart” quotation marks used in English typography. Namely, the **open +quote** is `“` U+201C LEFT DOUBLE QUOTATION MARK, and the **close +quote** is `”` U+201D RIGHT DOUBLE QUOTATION MARK. + +Let's customize this to use `«` and `»` for the open and close quote, respectively. To do this, change the part labeled +`quotesForKeepSuggestion`: + +```typescript +punctuation: { + quotesForKeepSuggestion: { + open: "«", close: "»" + }, +}, +``` + +## Customizing `insertAfterWord` + +Many languages insert a space after a word. Some languages, like Thai or Khmer, do not use spaces. To suppress the space, you may set `insertAfterWord` to the empty string: + +```typescript +punctuation: { + insertAfterWord: "", +}, +``` + +You can even use an alternate spacing character, if required by your language: + +```typescript +punctuation: { + insertAfterWord: "\u200B", // U+200B ZERO WIDTH SPACE +}, +``` + +## See also + +[The TypeScript definition of +`LexicalModelPunctuation`](https://github.com/keymanapp/keyman/blob/4211b468949860b8fb4a4707710472ab9e33c581/common/lexical-model-types/index.d.ts#L328-L371) + +------------------------------------------------------------------------ + +[Return to “Advanced Lexical Model Topics”](./) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/advanced/search-term-to-key.md b/developer/docs/help/guides/lexical-models/advanced/search-term-to-key.md new file mode 100644 index 00000000000..086a9ca01cf --- /dev/null +++ b/developer/docs/help/guides/lexical-models/advanced/search-term-to-key.md @@ -0,0 +1,93 @@ +--- +title: Search term to key +--- + +To look up words quickly, the `trie` model creates a _search key_ +that takes the latest word (as determined by the +[word breaker](word-breaker)) and converts it into an internal form. The +purpose of this internal form is to make searching for a word work, as +expected, regardless of things such as **accents**, **diacritics**, +**letter case**, and minor **spelling variations**. The internal form is +called the _key_. Typically, the key is always in +lowercase, and lacks all accents and diacritics. For example, the key +for “naïve" is `naive` and the key for “Canada” is `canada`. + +The form of the word that is stored is “regularized” through the use of a _key function_, which you can define in TypeScript code. + +> ### Note: +This function runs both **on every word when the wordlist is compiled** and **on the input, whenever a suggestion is requested**. This way, whatever a user types is *matched* to something stored in the lexical model, without the user having to type things in a specific way. + +The key function takes a string which is the raw search term, and +returns a new string, being the “regularized” key. As an example, +consider the **default key function**; that is, the key function that is +used if you do not specify one: + +```typescript +searchTermToKey: function (term: string): string { + // Use this pattern to remove common diacritical marks (accents). + // See: https://www.compart.com/en/unicode/block/U+0300 + const COMBINING_DIACRITICAL_MARKS = /[\u0300-\u036f]/g; + + // Lowercase each letter in the string INDIVIDUALLY. + // Why individually? Some languages have context-sensitive lowercasing + // rules (e.g., Greek), which we would like to avoid. + // So we convert the string into an array of code points (Array.from(term)), + // convert each individual code point to lowercase (.map(c => c.toLowerCase())), + // and join the pieces back together again (.join('')) + let lowercasedTerm = Array.from(term).map(c => c.toLowerCase()).join(''); + + // Once it's lowercased, we convert it to NFKD normalization form + // This does many things, such as: + // + // - separating characters from their accents/diacritics + // e.g., "ï" -> "i" + "◌̈" + // - converting lookalike characters to a canonical ("regular") form + // e.g., ";" -> ";" (yes, those are two completely different characters!) + // - converting "compatible" characters to their canonical ("regular") form + // e.g., "𝔥𝔢𝔩𝔩𝔬" -> "hello" + let normalizedTerm = lowercasedTerm.normalize('NFKD'); + + // Now, using the pattern defined above, replace each accent and diacritic with the + // empty string. This effectively removes all accents and diacritics! + // + // e.g., "i" + "◌̈" -> "i" + let termWithoutDiacritics = normalizedTerm.replace(COMBINING_DIACRITICAL_MARKS, ''); + + // The resultant key is lowercased, and has no accents or diacritics. + return termWithoutDiacritics; +}, +``` + +This should be sufficient for most Latin-based writing systems. However, +there are cases, such as with SENĆOŦEN, where some characters do not +decompose into a base letter and a diacritic. In this case, it is +necessary to write your own key function. + +## Use in your model definition file + +To use this in your model definition file, provide a function as the `searchTermToKey` property of the lexical model source: + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + searchTermToKey: function (wordform: string): string { + // Your searchTermToKey function goes here! + let key = wordform.toLowerCase(); + return key; + }, + // other customizations go here: +}; + +export default source; +``` + +## Suggested customizations + +- For all writing systems, **normalize into NFKD** or **NFKC** form using `wordform = wordform.normalize('NFKD')`. +- For Latin-based scripts, **lowercase** the word, and **remove diacritics**. +- For scripts that use the U+200C zero-width joiner (ZWJ) and/or the U+200D zero-width non-joiner (ZWNJ) (e.g., Brahmic scripts), **remove the ZWJ or ZWNJ** from the **end** of the input with `wordform = wordform.replace(/[\u200C\u200D]+$/` + +------------------------------------------------------------------------ + +[Return to “Advanced Lexical Model Topics”](./) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/advanced/unicode-breaker-extension.md b/developer/docs/help/guides/lexical-models/advanced/unicode-breaker-extension.md new file mode 100644 index 00000000000..a9e4d3776cc --- /dev/null +++ b/developer/docs/help/guides/lexical-models/advanced/unicode-breaker-extension.md @@ -0,0 +1,539 @@ +--- +title: Customization and extension of the Unicode word breaker +--- + +> ### Note: +While this offers a great amount of flexibility and customization that may assist predictions for your language, note that this approach may get quite technical! + +As mentioned on the [main word breaker page](./word-breaker), +our currently-supported lexical models need to know what a word +is in running text. After all, it is quite difficult to look up a word in a +dictionary when unclear about what the start and end of that word even is. + +In languages using the Latin script—like, English, French, +and SENĆOŦEN—finding words is easy. Words are separated by spaces or +punctuation. The actual rules for where to find words can get quite tricky to +describe, but Keyman implements the [Unicode Standard Annex #29 §4.1 Default Word Boundary Specification](https://unicode.org/reports/tr29/#Word_Boundaries) which works well for most languages. + +This guide is about techniques that may be used to customize and extend +the behaviors of that specification to be better tailored to your language. +This is done by using similar patterns and structures to the rules found in +the specification itself. + +There are three ways - all of them optional - to extend and customize +the word-breaking rules themselves: + +* If you need to prevent splits in very specific scenarios and/or add splits in other specific scenarios, you may specify [context-based rules](#rules) to obtain the desired behavior. +* If certain characters are not handled appropriately for their role in + your language, you may [map characters](#map) to different + word-breaking character classes - including custom ones. This will + override the default property they are assigned by the default + implementation, with the new property applying for all word-breaking + rules. +* If the default word-breaking classes from the specification are + too general for certain aspects of your language, it is possible to + [define custom character classes](#define) for use in custom + rules. + +## A first example + +This example was designed to address the needs of a minority language in the country +of Cambodia. The majority language does not use spaces for wordbreaking, while the +minority language in question does use them. In addition, hyphens sometimes occur +within words. + +The word breaker function can be specified in the +[model definition file](./model-definition-file) as follows: + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + // CUSTOMIZE THIS: + wordBreaker: (text) => { + let customization = { + + /*** Definition of extra word-breaking rules ***/ + rules: [{ + match: (context) => { + if(context.propertyMatch(null, ["ALetter"], ["Hyphen"], ["ALetter"])) { + return true; + } else if(context.propertyMatch(["ALetter"], ["Hyphen"], ["ALetter"], null)) { + return true; + } else if(context.propertyMatch(null, ["ALetter"], ["Hyphen"], ["eot"])) { + return true; + } else { + return false; + } + }, + breakIfMatch: false + }], + + /*** Character class overrides for specific characters ***/ + propertyMapping: (char) => { + let hyphens = ['\u002d', '\u2010', '\u058a', '\u30a0']; + // treats Khmer consonants & independent vowels in the same manner + // as the basic latin-script based alphabet + if(char >= '\u1780' && char <= '\u17b3') { + return "ALetter"; + } else if(hyphens.includes(char)) { + return "Hyphen"; + } else { + // The other Khmer characters already have useful word-breaking + // property assignments. + return null; + } + }, + + /*** Declares any new, custom character classes to be recognized by the word-breaker ***/ + customProperties: ["Hyphen"] + }; + + /*** Connects all the pieces together for actual use ***/ + return wordBreakers['default'](text, customization); + }, + // ... +}; + +export default source; +``` + +This example's customization is designed to accomplish two goals: + +1. Unicode's wordbreaker does not map base Khmer consonants to any of the + [relevant wordbreaking character properties](https://unicode.org/reports/tr29/#Table_Word_Break_Property_Values), causing it to be treated as `"Other"`. + The minority language in question instead wishes for Latin-script-like word-breaking, + so mapping the consonants to the same property as Latin-script consonants allows + them to be treated similarly - in the manner they expect. + +2. By default, the wordbreaker will automatically insert word boundaries before + and after a hyphen. To allow mid-word hyphens, we need to remap them to + a different character property. + + While the specification itself mentions that we could + just map hyphens to `"MidLetter"`, this example opts to define + a custom-tailored property that ensures only hyphens are affected in order to add + a special, end-of-context rule that may be useful when typing - the rule above + referencing `"eot"`. + +More on the wordbreaking character properties will be covered later. + +## Custom word-breaking rules + +When defining additional rules for use in word-breaking, it is advisable to reference +the [rules of the Unicode Standard Annex #29 §4.1 Default Word Boundary Specification](https://unicode.org/reports/tr29/#Word_Boundary_Rules). + +Rules WB1 through WB4 of the specification will always apply first, before any +custom rules. Custom rules will then be applied in order of their definition within +the model, with them all being applied before the specification's rules labeled WB5 +and onward. + +Each rule should be of the following form: + +```typescript +{ + // A function that returns 'true' whenever the rule should apply + match: (context) => { + // ... + }, + // Whether to prevent (false) or to enforce (true) a boundary when the rule applies. + breakIfMatch: false +} +``` + +Toward this end, the `context` object received by match provides a function called +`propertyMatch` in order to define rules like those of the wordbreaker specification. +Let's take WB6 - "do not break letters across certain punctuation" - as an example. + +As written in the spec, WB6 reads **AHLetter x (MidLetter | MidNumLetQ) AHLetter**. + +This is simply a series of characters, up to two characters before and after a potential break point. To break that down: +- (implicit) **Any** -- accept any character in this position +- **AHLetter**: `ALetter` or `Hebrew_Letter` +- **x** - "do not break" +- (either) **MidLetter** or **MidNumLetQ**: one of `MidLetter`, `MidNumLet`, or `Single_Quote`. +- **AHLetter**: `ALetter` or `Hebrew_Letter` + +The expansions `MidNumLetQ` and `AHLetter` are defined at https://unicode.org/reports/tr29/#WB_Rule_Macros. + +If written as a custom rule, rule WB6 takes the following form. Note the use of the function `context.propertyMatch`, +which takes 4 parameters - two to match characters before and two to match characters after a potential boundary: + +```typescript +// Rule WB6 from the Unicode spec, as a custom rule: +{ + match: (context) => { + return context.propertyMatch(null, // no requirements set, so "Any" character may match + ["ALetter", "Hebrew_Letter"], + // x + ["MidLetter", "MidNumLet", "Single_Quote"], + ["ALetter", "Hebrew_Letter"]); + }, + breakIfMatch: false // do not break +} +``` + +Note that an empty array `[]` in any slot is not treated the same as `null` - +use of an empty `[]` will prevent the rule from matching. + +Almost all of the specification's rules are of this form. Again, up to two characters +before a potential boundary may be considered alongside up to two characters after +the potential boundary. + +### Word-breaking property names +The names used in each array must be defined in one of the following places: +* https://unicode.org/reports/tr29/#Table_Word_Break_Property_Values +* `customProperties` - your [declaration of any custom property types](#define) +* One of the special property types `"Other"`, `"sot"`, or `"eot"`: + * `Other`: a character without an associated word-breaking property value + * `sot`: "start of text" - a marker indicating the beginning of the string being word-broken + * `eot`: "end of text" - a marker indicating the end of the string being word-broken + +All rules use case-insensitive matching, so capitalization differences will not affect operation. + +### Rule-matching examples + +#### A successful rule application +As an example, when determining whether or not to break the English word `don't` when +applying WB6 as written above, this is what happens near the apostrophe: + +```typescript +{ + match: (context) => { + return context.propertyMatch(null, /* match any character */ // "o" - ALetter + ["ALetter", "Hebrew_Letter"], // "n" - ALetter + // x + ["MidLetter", "MidNumLet", "Single_Quote"], // "'" - Single_Quote + ["ALetter", "Hebrew_Letter"]); // "t" - ALetter + }, + breakIfMatch: false // do not wordbreak at any position where the rule matches. +} +``` + +The rule applies at the position between the `n` and the `'` of `don't`, telling the +word-breaker not to word-break if the rule matches at that location. + +#### An unsuccessful rule match + +Given the input `n't|` (where `|` is the caret), we can see that the rule will not match: +```typescript +{ + match: (context) => { + return context.propertyMatch(null, /* automatic match */ // "n" - ALetter + ["ALetter", "Hebrew_Letter"], // "'" - Single_Quote + // x + ["MidLetter", "MidNumLet", "Single_Quote"], // "t" - Single_Quote + ["ALetter", "Hebrew_Letter"]); // - eot + }, + breakIfMatch: false // do not break +} +``` + +The same rule does not apply between the `'` and the `t`, so it does not apply at this position in +the text. This is why the wordbreaking spec includes rule WB7 in addition to WB6 - some scenarios +require multiple context property-matching attempts. + +You may define any number of these rule objects in any order for use within the wordbreaker within +the `rules` array. + +> **Important note**: When no other rule successfully matches a potential word-boundary position, the spec's rule WB999 applies as a catch-all and will enforce a split. Preventing a word-break always requires a successfully-matching rule, though this is covered for most cases by the Unicode specification's ruleset. + +Defining custom rules is a powerful tool, but it is detailed work and may be somewhat tedious +to get right. Feel free to [ask for help at our Community Site](https://community.software.sil.org/c/keyman/19) for assistance. + +## Character property remapping + +Many writing systems in the world are shared by multiple languages, using most of the same +characters in common. However, sometimes there may be notable differences in how specific +languages wish to treat certain characters. In order to address these cases, we allow +overriding the "standard" word-breaking property that the Unicode specification gives the +character with one set by the lexical model. + +### Default character properties + +For reference, [this text file](https://www.unicode.org/Public/UCD/latest/ucd/auxiliary/WordBreakProperty.txt) +provides the standard word-breaking properties for all characters. This is one of many +files Unicode provides publicly here: https://www.unicode.org/reports/tr41/#Props0. + +That text file contains many lines of the following form: + +``` +0041..005A ; ALetter # L& [26] LATIN CAPITAL LETTER A..LATIN CAPITAL LETTER Z +``` + +This says that `0041` through `005A` - or rather, `\u0041` (the code for 'A') through +`\u005A` (the code for 'Z') - are assigned word-breaking property `ALetter`. That +range covers 26 (`[26]`) characters. (For our purposes here, the `L&` part is +irrelevant.) + +As noted at the top of the file: + +``` +# All code points not explicitly listed for Word_Break +# have the value Other (XX). + +# @missing: 0000..10FFFF; Other +``` + +### Redefining character properties + +Of note from [our first example](#example): + +```typescript +/*** Character class overrides for specific characters ***/ +propertyMapping: (char) => { + // ... + // treats Khmer consonants & independent vowels in the same manner + // as the basic latin-script based alphabet + if(char >= '\u1780' && char <= '\u17b3') { + return "ALetter"; + } // ... +}, +``` + +If you search the [property definition text file](https://www.unicode.org/Public/UCD/latest/ucd/auxiliary/WordBreakProperty.txt) +for `1780` or `17b3`, you will find neither. These correspond to many letters +from the Khmer character set - notably, the 'base' characters used in Khmer's +grapheme clusters. The other Khmer characters tend to attach at various positions +around these base characters. The majority language for the script - Khmer - +does not follow conventional word-breaking rules; most notably, they do not add +whitespace between each word. (There are other strategies that get utilized for +such scripts.) + +As breaks sometimes occur between the base characters while other times do not, +properties for these base characters were not explicitly defined and are thus +treated as class `Other`. +- As other Khmer characters tend to attach around the base characters, they do + have specified word-breaking properties - they `Extend` the grapheme cluster. +- Searching `17b4` in [the text file mentioned above](https://www.unicode.org/Public/UCD/latest/ucd/auxiliary/WordBreakProperty.txt) will show the closest results to the characters under discussion. + +However, there are minority languages that prefer to use whitespaces between words, +meaning that there should never be wordbreaks applied directly between neighboring +characters for their words. In such cases, we can map them to a pre-existing property +with the desired behavior - `ALetter`. + +```typescript +if(char >= '\u1780' && char <= '\u17b3') { + return "ALetter"; // Maps Khmer-script base characters to ALetter + // to allow Latin-script-like word-breaking. +} +``` + +For another example of character property remapping, consider the use of hyphens with +words (and/or names) in some languages. Default word-breaking behavior will split +hyphenated words and names apart, but by changing the property of hyphens, it is +possible to disable this behavior. + +Noting [rule WB6](#WB6) and WB7, the `MidLetter` class is designed to prevent +word-breaks from occurring when its characters lie directly between letters - +hence the property name. Assigning hyphens to this class can provide the +desired behavior. + +```typescript +let hyphens = ['\u002d', '\u2010', '\u058a', '\u30a0']; +// ... +if(hyphens.includes(char)) { + return "MidLetter"; +} // ... +``` + +## Defining and using new word-breaking properties + +There may be some cases in which none of the default character word-breaking +properties provide the exact behavior that you're wanting, or perhaps you +want only specific characters from that class to match custom rules. For such +cases, wordbreaker customization also allows definition of new word-breaking +properties. + +For one example, note how word-breaking operations affect predictions when +typing new words: + +- `can'`, with the intent to type `can't` +- `full-`, with the intent to type `full-scale` + +For the first example above, while `'` (property `Single_Quote`) is included within +WB6 and WB7, those rules only apply _between letters_. If there is no letter +on the right-hand side, `can'` will be interpreted as `can` + `'` by the +word-breaking algorithm. Similarly, even when remapping `-` to the `MidLetter` +property, `full-` will be remapped to `full` + `-` before additional text +is typed. + +Of course, this problem does alleviate itself once another `ALetter`-property +letter is typed, but suppose we wanted a rule to prevent word-breaking for +the second example above. (After all, `can'` could be the end of a quoted +phrase in English - `'sure you can'` - in which case we might want the split +to occur.) + +Revisiting [an earlier example](#example) and simplifying a little bit: + +```typescript +/*** Definition of extra word-breaking rules ***/ +{ + rules: [{ + match: (context) => { + if(context.propertyMatch(null, ["ALetter"], ["Hyphen"], ["eot"])) { + return true; + } else { + /* ... */ + } else { + return false; + } + }, + breakIfMatch: false + }], + + /*** Character class overrides for specific characters ***/ + propertyMapping: (char) => { + let hyphens = ['\u002d', '\u2010', '\u058a', '\u30a0']; + if(hyphens.includes(char)) { + return "Hyphen"; + } else { + // Use the default properties for anything else. + return null; + } + }, + + /*** Declares any new, custom character classes to be recognized by the word-breaker ***/ + customProperties: ["Hyphen"] +} +``` + +Let's walk through what this simplification is trying to achieve: + +1. Hyphens are mapped to their own distinct word-breaking property. +2. The custom rule prevents wordbreaking between a letter and a hyphen at the end of text. + - It does not include any of the `MidLetter` characters. + +Matching the rule against the end of text suggests that what follows the `Hyphen` character +is the point of text insertion. For this example, assuming that a user has just typed +`full-`, there will be no word-break on the hyphen until either more input is received or +the user changes the site of text entry. + +**Important note**: You must declare any custom properties within the `customProperties` array. +If any are missing, the missing custom properties will fail to match against any word-breaking rule. +Make sure you don't misspell it anywhere in your customization code! + +### Default rules + custom properties + +There is one notable issue with this example, though - whenever you remap a character to +a new property, it is no longer considered to have its old property, and so it will no +longer match rules based on its default property. This is why the original example +included a couple of extra rules: + +```typescript +{ + match: (context) => { + // Extend WB6 - allow "Hyphen" in the same place as "MidLetter" + if(context.propertyMatch(null, ["ALetter"], ["Hyphen"], ["ALetter"])) { + return true; + // Extend WB7 - allow "Hyphen" in the same place as "MidLetter" + } else if(context.propertyMatch(["ALetter"], ["Hyphen"], ["ALetter"], null)) { + return true; + // The same rule from above. + } else if(context.propertyMatch(null, ["ALetter"], ["Hyphen"], ["eot"])) { + return true; + } else { + return false; + } + }, + breakIfMatch: false +} +``` + +By replicating [WB6](#WB6) and WB7's structure and allowing `Hyphen` to match in the same +position as `MidLetter` in the original rules, we can prevent word-breaking splits +after additional text has been typed after a `Hyphen`-property character. This does not +_replace_ the behavior of WB6 and WB7 - it merely _extends_ it to include the new property. + +### A more complex case + +A meatier example may be found as [the specification's hypothetical rule WB5a](https://unicode.org/reports/tr29/#WB999): + +> "Break between apostrophe and vowels (French, Italian)" +> +> WB5a: **Apostrophe ÷ Vowels**. + +The idea of this rule is to allow words such as the French `l'objectif` to be split +into the article - `l'` and its following word - `objectif` while preserving other +cases that should still be treated as single words, such as `aujourd'hui`. + +To simplify the code needed for customization here somewhat, we will use `Single_Quote` +in place of `Apostrophe`, as well as a few extra simplifications. The new `Vowels` +property offers enough complexity as it is. + +```typescript +let customization = { + rules: [ + // WB5 extension - ensure `AVowel` is handled like `ALetter`. + { + match: (context) => { + if(context.propertyMatch(null, ["ALetter", "AVowel"], ["ALetter", "AVowel"], null)) { + return true; + } else { + return false; + } + }, + breakIfMatch: false + }, + // Our main goal WB5a + { + match: (context) => { + if(context.propertyMatch(null, ["Single_Quote"], ["AVowel"], null)) { + return true; + } else { + return false; + } + }, + breakIfMatch: true + }, + // WB6, 7 extension - ensure `AVowel` is handled like `ALetter` + { + match: (context) => { + if(context.propertyMatch(null, + ["ALetter", "AVowel"], + ["MidLetter", "MidNumLet", "Single_Quote"], + ["ALetter", "AVowel"])) { + return true; + } else if(context.propertyMatch(["ALetter", "AVowel"], + ["MidLetter", "MidNumLet", "Single_Quote"], + ["ALetter", "AVowel"], + null)) { + return true; + } else { + return false; + } + }, + breakIfMatch: false + } + // Similar extensions to WB9, 10, 13a, and 13b would also be needed for robustness. + // Note: we have left "Hebrew_Letter" out of the WB5, 6, and 7 rewrites to help + // simplify this example. + ], + propertyMapping: (char) => { + const vowels = ['a', 'e', 'i', 'o', 'u']; + // French and Italian allow accented vowels; this will strip off the accent and + // leave us with the base vowel. + const baseChar = char.normalize('NFD').charAt(0); + if(vowels.includes(baseChar)) { + return "AVowel"; + } + + return null; + }, + customProperties: ["AVowel"] +} +``` + +Note that we have left out some of the rule extensions that would help cover certain +less-frequently encountered cases. These may matter to some parts of a +language community, especially for models targeting a majority language. +Computer programmers in particular tend to care about the un-extended +rules (WB9, 10, 13a, and 13b) more than most. + +Remember, remapping characters to a new word-breaking property prevents any default +rule from handling them unless you add custom rules to re-include them as their +new property. + +------ + +[Return to “Advanced Lexical Model Topics”](./) diff --git a/developer/docs/help/guides/lexical-models/advanced/word-breaker.md b/developer/docs/help/guides/lexical-models/advanced/word-breaker.md new file mode 100644 index 00000000000..f8f321327ac --- /dev/null +++ b/developer/docs/help/guides/lexical-models/advanced/word-breaker.md @@ -0,0 +1,218 @@ +--- +title: Word breaker +--- + +The `trie` family of lexical models needs to know what a word is in +running text. In languages using the Latin script—like, English, French, +and SENĆOŦEN—finding words is easy. Words are separated by spaces or +punctuation. The actual rules for where to find words can get quite +tricky to describe, but Keyman implements the [Unicode Standard Annex #29 §4.1 Default Word Boundary Specification](https://unicode.org/reports/tr29/#Word_Boundaries) +which works well for most languages. + +However, in languages written in other scripts — especially East Asian +scripts like Chinese, Japanese, Khmer, Lao, and Thai — there are no obvious break in between words. For these languages, there must be special rules for determining when words start and stop. This is what a _word breaker function_ is responsible for. It is a little bit of code that looks at some text to determine where the words are. + +You can customize the word breaker in three ways: +- If your language uses its writing system in an unconventional way (e.g., use spaces to separate words in Thai, Lao, Burmese, or Khmer), you can [override the script's default behaviour](#overrides) +- If the default word breaker creates **too many splits**, you can [choose which strings join words together](#join). +- If the default word breaker creates **not enough splits**, you must [create your own word breaker function](#custom). +- Alternatively, you may choose to [customize and extend the wordbreaker's behavior](./unicode-breaker-extension) by adding extra rules and changing how it treats specific characters. + +## Overriding script defaults + +The default word breaker makes assumptions about how each +_script_ (alphabet, syllabary, or writing system) +works. You can override the defaults by specifying the +`overrideScriptDefaults` option. + +There is currently only one override: + +`'break-words-at-spaces'` +: Only breaks words at spaces for scripts that otherwise do not use spaces in between words. + +### Break words at spaces + +This applies only to languages that borrow the **Burmese**, **Khmer**, +**Lao**, or **Thai** scripts. The majority languages for these scripts +do *not* use spaces in between words; hence, the default word breaker +will produce undesired results when breaking words in these scripts. +However, if your language is written in one of these scripts and *does* +use spaces in between words, then you can set +`overrideScriptDefaults: 'break-words-at-spaces',` to ensure word breaks +do not occur in the middle of words, but instead, at spaces. + +Your model definition file should look like this: + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + wordBreaker: { + use: 'default', // we want to use the default word breaker, BUT! + // Override the default for Burmese, Khmer, Lao, or Thai: + overrideScriptDefaults: 'break-words-at-spaces', + } +}; + +export default source; +``` + +## Customize joining rules + +The default word breaker is very liberal in what it considers is a word. + +For instance, the default word breaker will split words at hyphens. +Consider the following Plains Cree example; this is a single word: + +: amiskwaciy-wâskahikan + +However, the default word breaker will produce three words: `amiskwaciy`, `-`, and `wâskahikan`. + +To **join words at hyphens and any other punctuation**, provide the +`joinWordsAt` option in the [model definition file](./model-definition-file): + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + wordBreaker: { + use: 'default', // we want to use the default word breaker, BUT! + // CUSTOMIZE THIS: + joinWordsAt: ['-'], // join words that contain hyphens + } +}; + +export default source; +``` + +You can specify one or more strings to join words at: + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + wordBreaker: { + use: 'default', + // CUSTOMIZE THIS: + joinWordsAt: ['-', ':', '@'], // join words at hyphens, colons, at-signs + } +}; + +export default source; +``` + +## Writing a custom word breaker function + +> **Note**: +If your language uses spaces to denote word breaks, the +default word breaker is probably sufficient. Only customize this if you +know the default word breaker really does not work for your language! + +The word breaker function can be specified in the [model definition file](./model-definition-file) as follows: + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + // CUSTOMIZE THIS: + wordBreaker: { + use: function(text: string): Span[] { + // Return zero or more **spans** of text: + return []; + }, + }, + // other customizations go here: +}; + +export default source; +``` + +The function must return zero or more `Span` objects. The spans, +representing an indivisible span of text, must be in ascending order of +their start point, and they must be non-overlapping. + +### A `Span` object + +A _span_ is an indivisible piece of a sentence. +This is typically a word, but it can also be a series of spaces, an +emoji, or a series of punctuation characters. **A span that looks like a word is treated like a word in the `trie-1.0` model**. + +A `span` has the following properties: + +```typescript +{ + start: number; + end: number; + length: number; + text: string; +} +``` + +The `start` and `end` properties are indices into the original string at +which the span begins, and the index at which the *next* span begins. + +`length` is `end - start`. + +`text` is the actual text of the string contained within the span. + +## Example for English + +Here is a full example of word breaker function that returns an array of +spans in an ASCII (English) string. + +> **Note** +This is just an example—please +use the default word breaker for English text! + +```typescript +const source: LexicalModelSource = { + format: 'trie-1.0', + sources: ['wordlist.tsv'], + // EXAMPLE BEGINS HERE: + wordBreaker: function(text: string): Span[] { + // A span derived from a JavaScript RegExp match array: + class RegExpDerivedSpan implements Span { + readonly text: string; + readonly start: number; + + constructor(text: string, start: number) { + this.text = text; + this.start = start; + } + + get length(): number { + return this.text.length; + } + + get end(): number { + return this.start + this.text.length; + } + } + + let matchWord = /[A-Za-z0-9']+/g; + let words: Span[] = []; + let match: RegExpExecArray; + while ((match = matchWord.exec(phrase)) !== null) { + words.push(new RegExpDerivedSpan(match[0], match.index)); + } + + return words; + }, + // other customizations go here: +}; + +export default source; +``` + +## See also + +- [The TypeScript definition of `WordBreakingFunction` and +`Span`](https://github.com/keymanapp/keyman/blob/4211b468949860b8fb4a4707710472ab9e33c581/common/lexical-model-types/index.d.ts#L286-L323) + +- [Extension and customization of the Unicode word-breaker](./unicode-breaker-extension) + +- [The Unicode Standard Annex \#29 §4.1 Default Word Boundary Specification](https://unicode.org/reports/tr29/#Word_Boundaries) + +------------------------------------------------------------------------ + +[Return to “Advanced Lexical Model Topics”](./) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/index.md b/developer/docs/help/guides/lexical-models/distribute/index.md new file mode 100644 index 00000000000..42f3741af17 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/index.md @@ -0,0 +1,6 @@ +--- +title: Distributing lexical models +--- + +- [Lexical model package development tutorial](tutorial/) (Keyman for mobile apps) +- [Distribute lexical models to Keyman applications](packages) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/packages.md b/developer/docs/help/guides/lexical-models/distribute/packages.md new file mode 100644 index 00000000000..92e61650308 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/packages.md @@ -0,0 +1,70 @@ +--- +title: Distribute lexical models to Keyman Applications +--- + +## Overview + +Lexical model package files contain one lexical model, along with readme +files, and any other files you wish to include. You must create a +package file to bundle your lexical model and help documentation into a +simple, single file that is easy for an end-user to install. + +The package file is a ZIP compatible archive. + +> ### Tip +You can distribute keyboards and lexical models in package files, but +you can't include both in the same package file. + +#### Keyman for Android and Keyman for iPhone and iPad + +Keyman mobile applications can install the same lexical model package +files. + +## Package file contents + +A package can have a variety of different files contained within. The +following files and file types are recognized by the package installer: + +\*.model.js +: Lexical model file. When Keyman mobile applications install a + lexical model package, the included model will be installed and + associated with the specified languages. + +welcome.htm +: Introductory help for the lexical model, HTML format. This will + normally be displayed when the package is installed by the user, and + is also the entry point for help when accessed via Keyman's help + system or Keyman Configuration. + +## Step 1) Share the lexical model package file + +Once the lexical model package .kmp file is created, you can share them +via external storage devices (USB drive, SD card, etc). If that is not +an option, you can upload the .kmp file to a public facing website. For +this example, the lexical model package for SENĆOŦEN is being uploaded: + +1. nrc.str.sencoten.model.kmp (the lexical model package .kmp file) + +## Step 2) Create a link to the KMP file + +Once all the files have been uploaded, you will need to provide a link +to the lexical model package .kmp file for your device to download and +install. This can either be a link on a web page, or a link in an email. +In this tutorial, a very simple .html web page with a link to the +nrc.str.sencoten.kmp file is created: + +```html + + + + + Sencoten Lexical Model Package + + +``` + +The link must be in the format `http://` or `https://` + +Upload the web page to your public facing website. Once done, you can +install the lexical model package onto your mobile devices by +downloading the .kmp from your device's internet browser. \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/tutorial/index.md b/developer/docs/help/guides/lexical-models/distribute/tutorial/index.md new file mode 100644 index 00000000000..fe4e0d039ec --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/tutorial/index.md @@ -0,0 +1,32 @@ +--- +title: Lexical Model Package Tutorial +--- + +[Step 1: What do we include?](step-1) + +[Step 2: Editing .htm files for the Package](step-2) + +[Step 3: Checking a package and adding files](step-3) + +[Step 4: Filling in package details](step-4) + +[Step 5: Compiling, testing and distributing a Package](step-5) + +## Overview + +Welcome! In this tutorial, you will learn how to create a lexical model +[package](../../../../reference/file-types/kmp). A package is a +collection of files, compressed into a single file, just like a ZIP +file. It is designed to make installation of a lexical model +straightforward for the end user. When done, Keyman for mobile apps can +download and install lexical models through the package. + +We will be creating a package for the SENĆOŦEN lexical model that was +made in [Developing a lexical model from a word list](../../tutorial/). + +### Let's begin + +Let's get started! Move on to the next topic to begin the first step, +choosing what to include in the package. + +[Step 1: What do we include?](step-1) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/tutorial/step-1.md b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-1.md new file mode 100644 index 00000000000..d27970b9e43 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-1.md @@ -0,0 +1,15 @@ +--- +title: Step 1: What do we include? +--- + +What is the purpose of a lexical model package? To make installation of +a lexical model as straightforward as possible for the end user. We need +to keep this goal in mind as we work on all the aspects of a package. + +A great package will: + +1. Include one lexical model to install. +2. Include a 'readme.htm' file which describes why the user would install this package. +3. Include a 'welcome.htm' file which is displayed before/after install. + +[Step 2: Editing .htm files for the package](step-2) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/tutorial/step-2.md b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-2.md new file mode 100644 index 00000000000..10a560fd194 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-2.md @@ -0,0 +1,72 @@ +--- +title: Step 2: Editing .htm files for the package +--- + +When Keyman Developer created your lexical model project, it will have +created some of these files to go in the package. You will still need to +edit some of these templated files for the package. + +readme.htm + +: A short description of the package, its use restrictions, and what + it includes. Try to keep the readme under 10 lines long. The readme + should be an html file for optimal formatting. + + The intention of readme.htm is to describe why a user would want to + install the lexical model. + + Create the HTML file in any HTML editor. + + > ### Tip + If using Microsoft Word, choose HTML (clean) when saving to create a + smaller file. + + Note, if your HTML editor puts images into a subfolder, you will + need to edit the HTML source so that all files are in the same + folder -- the package builder will not maintain subfolders. You can + easily edit the HTML source in Keyman Developer. + + Also, if your welcome or readme files use embedded external images, + stylesheets, javascript or other files, you will need to add these + files to your package as well. + +welcome.htm + +: When including an introductory help file in your package, you must + keep the name of the file "welcome.htm". This file will be displayed + before the lexical model is installed. Make sure that you design + your HTML file so that it can be viewed on a mobile device - avoid + extra wide tables or wide fixed width elements. + + After package installation, the welcome.htm will also be accessible + from the lexical model info pages. + + The intention of welcome.htm is to provide instructions on getting + started with your lexical model. + + > ### Tip + Useful information to include in welcome.htm is: + - names of languages associated with the lexical model. + - name of the lexical model in the package. + - links to additional help on your website or more extensive + documentation files in the package. + - a link to an official distribution site for your package (even + if it is the Keyman website) - so that users know where to find + the latest version of your package. + + + + > ### Tip + If you want links to your website to open in the user's preferred + browser, preface the href link with `link:`, e.g. + `website` + The `link:` sceheme will open the referred file in the default + application - that is, a web browser for URLs and links, Notepad for + .txt files, Adobe Reader for PDFs. You can use `link:` to open any + of the files in the package, e.g. `link:docs.pdf` will open the file + docs.pdf in Adobe Reader or the default PDF reader on the system. + + If you create documents in other formats, for example PDF or + printable documentation, you should link to that in the welcome.htm. + +[Step 3: Checking a package and adding files](step-3) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/tutorial/step-3.md b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-3.md new file mode 100644 index 00000000000..9d1ea260002 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-3.md @@ -0,0 +1,51 @@ +--- +title: Step 3: Checking a package and adding files +--- + +We are finally ready to open up the Package Editor and check the package +contents. In the Project Window in Keyman Developer, click the +**Packaging** tab. + +> ### Tip +This tutorial makes a package named `nrc.str.sencoten.model.kps`, but +you should substitute the name with your own model. + +A lexical model package source file will have the extension .model.kps, +and will be compiled in a file with extension .kmp. + +## Files + +In the Package Editor, click on the **Files** +tab. + +![Lexical Model Package Files](../../../../images/lm/tutorial_distribute_model_3_files.png) + +Keyman Developer already included your lexical model, welcome.htm, and +readme.htm files in your package. In the Files tab, click +**Add** to add all the additional files we +discussed in the previous step to the package. For example, if your +welcome or readme files use embedded files, include them in your +package. You can add multiple files at once, and from multiple folders. +When the package is compiled, all the files will be placed in the same +folder within the package. + +While keyboards can also be distributed in packages, do not include them +in a lexical model package. + +## Lexical Models + +In the Package Editor, click on the **Lexical Models** tab. + +![Lexical Model Info](../../../../images/lm/tutorial_distribute_model_3.png) + +Language Tag + +: A valid BCP 47 language tag must be set or the lexical model will + not install on your mobile device. Update the list of languages you + want to associate with your lexical model. + +You could stop here. This would be a completely valid package, but it +would not be as good as it could be. So let's continue on to the next +step, and fill in some descriptions of the package. + +[Step 4: Filling in package details](step-4) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/tutorial/step-4.md b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-4.md new file mode 100644 index 00000000000..bae0be8c676 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-4.md @@ -0,0 +1,55 @@ +--- +title: Step 4: Filling in package details +--- + +In the Package Editor, click on the **Details** tab. You should fill in as many details as you can on this page. + +![](../../../../images/lm/tutorial_distribute_model_details.png) + +Package Name + +: The Package Name will be displayed in the package install dialog and + wherever the package is referred to. + +Model Version + +: Update the version (intial version can default to 1.0). A version + number for the model and package is important - it helps your users + know that they are using the most recent update of your package. The + version format you should use is `1.0`. + + When making a major change to your lexical model package, increment + the first part and set the second part to `0`, e.g. from `1.0` to + `2.0`. + + When making a bug fix or a minor update, increment the second part, + e.g. from `1.0` to `1.1`. + + Version numbers should be in the form `major.minor[.subversion]`. + Subversion is optional but is helpful for small bug fix releases. + Each of the sections of the version should be an integer. Keyman + does integer comparisons on the version numbers, so, for example, + version `2.01` is regarded as older than version `2.2`. Alphabetic + or date formats should be avoided as the installer for the model + cannot determine which version is older reliably. + +Copyright + +: Enter copyright details for your lexical model package. Keep this + reasonably short or it won't be clear for end users. + +Author + +: Enter your name or the name of your company. + +Email + +: Enter a contact email address where package users can contact you. + If you don't want to be contacted via email, leave this field empty + +Website + +: Enter the name of the website where you will have information about + this lexical model. + +[Step 5: Compiling, testing and distributing a Package](step-5) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/distribute/tutorial/step-5.md b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-5.md new file mode 100644 index 00000000000..ed873c69cab --- /dev/null +++ b/developer/docs/help/guides/lexical-models/distribute/tutorial/step-5.md @@ -0,0 +1,55 @@ +--- +title: Step 5: Compiling, testing and distributing a Package +--- + +In the Package Editor, click on the **Compile** tab. + +![](../../../../images/lm/tutorial_distribute_model_compile.png) + +Click **Compile Package** to compile the +package into a .kmp file. Compiling takes all the files listed for the +package, compresses them (using a .ZIP-compatible format) and adds the +package information, all into a single file. If any files are not +available, an error will be listed in the Messages window. + +After compiling, you can test the package installation in the mobile +Keyman apps. You should test that all the model installs successfully, +that the Welcome file is displayed during the install, and that the +documentation is accessible to the end user. + +## Distributing a package on the Keyman Cloud Lexical Model Repository + +Once you have tested the package to your satisfaction, it is time to +distribute it. We recommend submitting your lexical model package to the +[Keyman Lexical Models Repository](https://github.com/keymanapp/lexical-models) + +## Distributing a package on your own website + +If you distribute a package on your own site, we have the following +recommendations: + +1. Ensure the MIME type on the web server or folder for .KMP files is + set up to application/octet-stream. Without this, .KMP files may be + recognised as .ZIP files -- this is not helpful to the end user as + it will be opened in the wrong application. +2. Avoid putting the .KMP file in an archive (e.g. .ZIP) or + self-expanding archive (.EXE) - this makes it harder for end users + to install. A .KMP file is already compressed (it is actually just a + ZIP archive file!) and you won't save much space by recompressing + it. +3. Include a link to the Keyman download page: + `http://keyman.com/downloads/` + +## Distributing a package by email + +- Attaching the KMP file directly to an email may be blocked for security +reasons. As mentioned above, a KMP file is basically a ZIP file and +lexical model data is in JavaScript, this is a combination that looks +suspicious to many email servers. You can upload it to a Google drive, +and email a link for downloading the file + +## Installing the lexical model package + +- The same method for installing custom keyboard packages to mobile +devices can be used for installing lexical model packages. Refer to +these pages for [Keyman for iPhone and iPad](../../../distribute/install-kmp-ios) and [Keyman for Android](../../../distribute/install-kmp-android). \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/index.md b/developer/docs/help/guides/lexical-models/index.md new file mode 100644 index 00000000000..e913ce7007c --- /dev/null +++ b/developer/docs/help/guides/lexical-models/index.md @@ -0,0 +1,22 @@ +--- +title: Developing lexical models (dictionaries) +--- + +A **lexical model** (Keyman apps use the term +**dictionary**) is what powers **predictive text** +and **autocorrect** for a language. If you want your keyboard to predict +and correct words in your language, you must create a lexical model that +generates suggestions for your language. + +[What is a lexical model? Or: how do I add prediction and autocorrection +to my keyboard?](intro) + +[Tutorial: Developing a lexical model from a word list](tutorial) + +[Advanced lexical models topics](advanced) + +[Distribute a lexical model](distribute) + +## Reference + +[Wordlist TSV format](../../reference/file-types/tsv) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/intro/index.md b/developer/docs/help/guides/lexical-models/intro/index.md new file mode 100644 index 00000000000..314a571ea52 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/intro/index.md @@ -0,0 +1,162 @@ +--- +title: What is a lexical model? +--- + +
+ +![Smartphone keyboard displaying suggestions for the English phrase ”on my w-”](../../../images/lm/whatis-on-my-w.png) + +##### Predictive text for English. + +
+ +Many mobile phone keyboards enjoy **predictive text** for their +languages. + +Predictive text is the feature on your keyboard that displays a series +of _predictions_, typically above your keyboard, +that try to guess the word or words that you are typing next. For +example, if I start typing the English phrase “On my w”, your keyboard’s +predictive text feature will infer, using its knowledge of the English +language, that the word you are typing is most likely “way”, followed by +other, less likely suggestions, such as “whole”, or “website”. + +The same feature that provides predictive text can also suggest +_corrections_ to what you are typing. For +example, if I start typing “thr” on my English keyboard, my keyboard +will suggest that I meant to type “the” instead. This **autocorrect** +feature is powered by your keyboard’s knowledge of the current language. + +The way your keyboard knows how to suggest **predictions** and +**corrections** for your language is through its **lexical model**. + +
+ +![diagram of the context ”on my w” used as input to the lexical model; the results of the lexical model are a list of suggestions.](../../../images/lm/overview.svg) + +##### How the lexical model is involved in generating suggestions. + +
+ +## Why should I create a lexical model for my language? + +### Words are difficult to type + +
+ +![Typing “n-a-i-v” on a smartphone. The keyboard suggests “naïve” for this input.](../../../images/lm/whatis-naiv.png) + +##### Typing “naiv” on a smartphone with predictive text. + +
+ +Some words have many accents, diacritics, or similar-looking forms. This +is not very common in the English language, however, this is quite +common in other languages. Predictive text can recognize forms without +the correct diacritics, or recognize forms that are simpler to type than +the orthographically correct version. This allows the typist to type +words quickly, with minimum effort. + +For example, in English, I want to type “naïve”, however, my keyboard +does not have the ï key present on its main +layout. Sure, if I use a keyboard that I can press-and-hold the +i key, it may pop-up additional characters, +and I can probably find ï nestled there +among the other options. However, I have to go out of my way to type the +correct variant, whereas the incorrect variant will be perfectly +understood. In most cases, I choose the option that is more economical +to type–“naive”—rather than the “correct” option. + +However, a **lexical model** that understands the English language will +see the word “naive” does not exist, but a similarly typed variant +“naïve” does exist. Therefore, when I type “naive”, the lexical model +will suggest “naïve”, and I can select it and have the correctly spelled +version without having to long-press and select the correct “ï”. Even +better than that, I can choose the suggestion right after typing “naiv”, +as there are relatively view English words that start with the prefix of +“naiv-” + +### Words are long + +
+ +![The top suggestion shows “incomprehensible”](../../../images/lm/whatis-incompr.png) + +Typing “incompr” on an English keyboard. + +
+ +Sometimes, the words are very long, but can be typed in far fewer +keystrokes if predictive text is used. For example, if in English, I +want to write the word “incomprehensible” (a 16-letter word), a lexical +model for English can predict it from the prefix “incompr” and save 8 +keystrokes! + +English is not prone to extraordinarily long words; the average word +length in English is about 9 letters. However, languages that are fond +of compounding, such as German (e.g., +_scheinwerferreinigungsanlage_ is a 28-letter word +which means “headlight washers”), or _polysynthetic +languages_ in which one word can have the meaning of a complete +sentence in English, such as Mohawk (e.g., +_sahonwanhotónkwahse_ is a 20-letter word which +means “she +opened the door for him again”). For these languages, predictive +text can save even more keystrokes than in English. + +### People make mistakes + +
+ +![The first suggestion is to write the word “the” instead.](../../../images/lm/whatis-correct-thr.png) + +##### Typing “thr” on an English keyboard. + +
+ +When typing quickly on a small phone screen, mistakes are inevitable. +Say I try to write the word “the” on my phone. I press +t, then h, but +as I try to type e, I press a few +millimeters to the right of the intended key and press +r instead. With a lexical model, the +predictive text feature understands that in English, “thr” is not a +complete word in-and-of-itself; however, a word that is typed quite +similarly, “the”, is a very common word. Therefore, the lexical model +provides enough information to assume that the user intended to type +“the” instead of “thr”. Thus, one of its **suggestions** is the +**correction** of “the” in place of “thr”. + +However, the predictive text feature is not overly presumptuous; what if +the typist really did want to type “thr”? As a result, “thr” is +suggested as a _keep suggestion_. When the typist +selects the “keep” suggestion, whatever they had originally typed is +kept, even if the lexical model suggests what it thinks is a far more +likely correction. + +## What do I need to make my own lexical model? + +To make a lexical model, you need some information about your language. +At bare minimum, you need a list of words in your language. Keyman +Developer supports importing a word list as a spreadsheet of words in +your language that you wish to use for predictions and corrections. This +will create a _word list lexical model_. + +If you have such a list of words, you can continue to the +[tutorial](../tutorial) to create a word list lexical model for your +language! + +However, to make a more accurate lexical model, you will need an idea of +how to rank suggestions relative to each other. For this, you may extend +the simple word list with **counts**. Each word has a count of how often +it has been seen in a representative collection of texts in your +language. For example, I could download articles from the English +language Wikipedia, and count how often Wikipedia contributors have +typed “rule” versus how many times they have typed “rupturewort”. This +will help us understand how to rank these two suggestions given the +context of “ru”. + +You can extend your spreadsheet with counts (placed in the second +column) to make a more accurate—and thus more useful—lexical model. + +[Next: Developing a lexical model from a word list](../tutorial) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/tutorial/index.md b/developer/docs/help/guides/lexical-models/tutorial/index.md new file mode 100644 index 00000000000..d6887656b3f --- /dev/null +++ b/developer/docs/help/guides/lexical-models/tutorial/index.md @@ -0,0 +1,29 @@ +--- +title: Tutorial: Developing a lexical model from a word list +--- + +[Step 1: Prerequisites for building a lexical model](step-1) + +[Step 2: Creating a lexical model project](step-2) + +[Step 3: Get some language data](step-3) + +[Step 4: Compile the lexical model](step-4) + +## Overview + +In this tutorial, will learn how to create a **word list lexical +model**. If you are not sure what a lexical model is, or why you would +make one, read [“What is a lexical model?”](../intro) first, then come +back here to follow this tutorial. + +## Let's begin + +Let's get started! Move on to the next topic to begin the first step. + +At the bottom of each page in the tutorial, will be a link to the next +step. You can use these links to work your way through the tutorial. You +may also find links to reference information, which you can select to +learn more about a particular aspect of creating Keyman keyboards. + +[Step 1: Prerequisites for building a lexical model](step-1) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/tutorial/step-1.md b/developer/docs/help/guides/lexical-models/tutorial/step-1.md new file mode 100644 index 00000000000..9bd7f84c86f --- /dev/null +++ b/developer/docs/help/guides/lexical-models/tutorial/step-1.md @@ -0,0 +1,22 @@ +--- +title: Step 1: Prerequisites for building a lexical model +--- + +To prepare a lexical model based on a word list, we will need a few +things: + +- Install [Keyman Developer](https://keyman.com/developer) 12.0 or greater (Windows only) +- A list of words in your language, stored in an spreadsheet, in dictionary-making software or, other means. + +> ### Note +Currently, lexical models work better with languages that use regular +spaces as word boundaries. For complex scripts such as Khmer, Thai, Lao, +etc, a pre-processing is required before getting it to work, i.e. word +segmentation has to be determined and/or configured. See the advanced +topic on making a custom [word breaker](../advanced/word-breaker). +This will be addressed in a future +[feature](https://github.com/keymanapp/keyman/issues/5025). + +Now to create a lexical model project! + +[Step 2: Creating a lexical model project](step-2) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/tutorial/step-2.md b/developer/docs/help/guides/lexical-models/tutorial/step-2.md new file mode 100644 index 00000000000..bdfb063ae46 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/tutorial/step-2.md @@ -0,0 +1,115 @@ +--- +title: Step 2: Creating a lexical model project +--- + +## Create the new project + +Start Keyman Developer. On the “Welcome” screen, click on +**New Project...**. The “New Project” dialog +will appear. Select “Wordlist Lexical Model” and press +**OK**. + +
+ +![“New Project” dialog](../../../images/ui/frmNewLMProject.png) + +###### The “New Project” dialog, with “Wordlist Lexical Model” selected. + +
+ +## Provide required information + +
+ +![New LM Project Parameters](../../../images/ui/frmNewLMProjectParameters.png) + +###### The New Lexical Model dialog box. + +
+ +The “New Wordlist Lexical Model Project” dialog will appear. + +To make sharing your lexical model easier, a project needs the following +information: + +Author Name +: This is either your **full name** or the **organization** you're + creating a model for. In this example, I am creating a lexical model + on behalf of my organization, the National Research Council Canada, + so I write that as the author name. + +Model Name +: We recommend the name of the **language**, **dialect**, or + **community** that this model is intended for. The name must be + written in all the Latin letters or Arabic numerals. In this + example, we're creating a language model for SENĆOŦEN, so we use the + model name `Sencoten`. + +### Provide auxiliary information + +The following information is also required, but most users will use +**default values**. + +Copyright +: Who owns the rights to this model and its data? This field should + contain the word "Copyright", the copyright symbol "©", and the full name of the rights + owner. Do not put the year of copyright in this field (see Full Copyright). Typically, + you can use the automatically generated default value: *Copyright © **Your Full + Name or Your Organization***. + +Version +: If this is the first time you've created a lexical model for you + language, you should leave the version as **1.0**. Otherwise, your + version number must conform to the following rules: A version string + made of `major revision number`.`minor revision number`. + +## Determine your language's BCP 47 language tag + +Keyman needs to know how to link your model to the appropriate keyboard +layout, so that they can both work together. To do this, Keyman utilizes +[BCP 47](../../../reference/bcp-47) language tags. + +To add a language tag, click the **Add** +button to bring up the “Select BCP 47 Tag” dialog box. + +
+ +![Select BCP 47 Tag dialog](../../../images/ui/frmNewLMProjectSelectLanguage.png) + +###### The “Select BCP 47 Tag” dialog box for SENĆOŦEN. + +
+ +Enter the BCP 47 language tag that you have selected. [Learn more about BCP 47 language tags](../../../reference/bcp-47) + +Once you are finished adding the primary language, click +**OK** to return to the **New Lexical Model +Project dialog**. + +## The Model ID + +Keyman will create a **model ID** which is how +Keyman sorts and organizes different lexical models. If you choose to +share your model publicly, the model ID is vital for both people and +Keyman to identify and use your lexical model! + +Keyman automatically generates a model ID for you, given all the +information already filled out. If you're satisfied with the generated +model ID, you can [skip to the next step](#toc-double-check-the-information). + +In this example, my generated model ID is +`national_research_council_canada.str.sencoten`, derived from my +organization name, the name of the primary language, and my model name. +However, I find the “author ID” part of the generated model ID +excessively long. I changed the author ID to `nrc`, and the model ID +automatically changes to the much more manageable `nrc.str.sencoten`. + +## Double-check the information + +Verify that all of the information is correct. Once all of the required +information has been filled in and verified, click +**OK** to create the project. + +Once we have created the project, we can begin to prepare the data! + +[Step 3: Get some language data](step-3) diff --git a/developer/docs/help/guides/lexical-models/tutorial/step-3.md b/developer/docs/help/guides/lexical-models/tutorial/step-3.md new file mode 100644 index 00000000000..88d9af90aec --- /dev/null +++ b/developer/docs/help/guides/lexical-models/tutorial/step-3.md @@ -0,0 +1,143 @@ +--- +title: Step 3: Get some language data +--- + +To predict words in your language, a lexical model needs to know the +words in your language! + +Keyman Developer understands how to read words in a [TSV file](../../../reference/file-types/tsv). This kind of file can be saved +from a **spreadsheet** application like [Google Sheets](https://sheets.google.com/) or [Microsoft Excel](https://products.office.com/en/excel). Other users may also use +**language data management software** like [SIL FieldWorks Language +Explorer (FLEx)](https://software.sil.org/fieldworks/) to export an +appropriate **TSV** file. + +One simple way to create your TSV file is to use the **PrimerPrep** +tool: + +1. Install PrimerPrep (info at + ) +2. Run PrimerPrep (note that on the first run it often takes a couple + of minutes; subsequent starts are faster) +3. Click on the Add Text(s) button; select one or more plain text + (UTF-8) files in the language to analyze +4. The word list with frequency counts appears in the pane to the right +5. From the File menu, select Save Word List… and specify the file name + and location (a .tsv extension is recommended) + +> **For advanced users**: Ultimately, what Keyman Developer requires is a +tab-separated values (TSV) file in a specfic format described in the +[file types reference](../../../reference/file-types/tsv). Refer to this +reference file if you are coding your own exporter. + +## Example Wordlist + +I have words in my language of choice, SENĆOŦEN. Here is my list of +words, with the count of how many times I’ve seen the word: + +List of ten SENĆOŦEN words, with counts + + +| Word | Count | +|-------|-------| +| TŦE | 13644 | +| E | 9134 | +| SEN | 4816 | +| Ȼ | 3479 | +| SW̱ | 2621 | +| NIȽ | 2314 | +| U¸ | 2298 | +| I¸ | 1988 | +| ȻSE | 1925 | +| I | 1884 | + + +## Editing the .TSV in Keyman Developer + +If you plan to only edit a few entries for your wordlist, you can use +the TSV editor in Keyman Developer. The project template created a +wordlist named **wordlist.tsv** that we will now edit. + +In Keyman Developer project view, select the Models tab and click on +wordlist.tsv. + +
+ +![Open TSV file in Keyman Developer](../../../images/lm/developer-open-tsv.png) + +##### Open a .tsv file in Keyman Developer + +
+ +Keyman Developer already generated a few example words when it created +the template wordlist.tsv file. + +
+ +![Example wordlist.tsv generated by template](../../../images/lm/template-tsv.png) + +##### Template wordlist.tsv + +
+ +We will replace these entries with SENĆOŦEN words from our wordlist. For +each row, edit the "Word Form" and "Count". Counts are optional for each +word: that is, some words may specify counts in the second column, while +other words may leave the second column blank. To create a new entry at +the bottom, click "Add word...". When you are finished, you'll have a +wordlist that looks like this: + +
+ +![Editing wordlist.tsv in Keyman Developer](../../../images/lm/edited-tsv.png) + +##### Edited wordlist.tsv for SENĆOŦEN + +
+ +After saving your wordlist file, you can move on to Step 4. + +## Editing the .TSV in Google Sheets + +Alternatively, you may want to use a different spreadsheet tool for +editing large wordlists. I’ve entered this information into my +spreadsheet of choice, [Google Sheets](https://sheets.google.com/). I’ve +shared this spreadsheet publicly +[here](https://docs.google.com/spreadsheets/d/10zhIc439BCSSooL_-HeJ6TUHd-ovkiXYcIGe-pHDTSg/edit?usp=sharing). +The order of the columns matters: + +The first column (column A) **must** be the “words”. If provided, the +second column (column B) **must** be the “counts”. Counts are optional +for each word: that is, some words may specify counts in the second +column, while other words may leave the second column blank. The third +column (column C) is always ignored. You may use this column as a +comment. The spreadsheet can be as simple as a single column of all of +the words in the language, with each word being separated by a line +break. + +This is what my word list looks like in Google Sheets: + +
+ +![screenshot of the word list in Google Sheets](../../../images/lm/sencoten-sheets-full.png) + +##### The word list, as it appears in Google Sheets + +
+ +Now, we download the spreadsheet in the [required format](../../../reference/file-types/tsv). To do this, in Google +Sheets, select “File” » “Download as” » “Tab-separated values (.tsv, +current sheet)”. + +
+ +![screenshot of “Save as…” menu in Google Sheets, selecting ”TSV”](../../../images/lm/sencoten-sheets-save-as.png) + +##### Exporting the TSV file from Google Sheets + +
+ +I’ll save mine as **wordlist.tsv**. + +Now that we have our word list, let's compile our model! + +[Step 4: Compiling the lexical model](step-4) \ No newline at end of file diff --git a/developer/docs/help/guides/lexical-models/tutorial/step-4.md b/developer/docs/help/guides/lexical-models/tutorial/step-4.md new file mode 100644 index 00000000000..28867a3afc9 --- /dev/null +++ b/developer/docs/help/guides/lexical-models/tutorial/step-4.md @@ -0,0 +1,34 @@ +--- +title: Step 4: Compile the lexical model +--- + +Before use the lexical model, we must compile it. In this step, the +`.tsv` wordlist and [the model definition file](../advanced/model-definition-file) get +_compiled_ into a single `.model.js` file. This +file is the one that Keyman uses internally to generate suggestions. +Later on, we will bundle the `.model.js` file into a lexical model +package so that Keyman apps can install the lexical model. + +## Models tab + +In Keyman Developer project view, select the "Models" tab. + +
+ +
+ +Click on the **Build models** button to +compile the lexical model. The Message window will display the results +of the compilation. If you have no typing errors, the lexical model +should compile successfully. If successful, this will create a +`.model.js` file in a build subdirectory of the lexical model project +directory. + +## Next steps + +This concludes the lexical model tutorial. Here's what's next: + +- Now that the model is built, we are ready to [distribute our lexical model](../distribute/packages). +- (*For advanced users*) We can do some [advanced customization](../advanced/) by modifying the [model definition file](../advanced/model-definition-file). Advanced customizations + require a some comfort with modifying code! \ No newline at end of file diff --git a/developer/docs/help/guides/test/index.md b/developer/docs/help/guides/test/index.md new file mode 100644 index 00000000000..4dac01ec933 --- /dev/null +++ b/developer/docs/help/guides/test/index.md @@ -0,0 +1,10 @@ +--- +title: Testing keyboards +--- + +- [How to test your keyboard layout — touch and + desktop](keyboard-touch-and-desktop) + +# Testing lexical models + +- [How to test your lexical model](lexical-model) diff --git a/developer/docs/help/guides/test/keyboard-touch-and-desktop.md b/developer/docs/help/guides/test/keyboard-touch-and-desktop.md new file mode 100644 index 00000000000..33900238911 --- /dev/null +++ b/developer/docs/help/guides/test/keyboard-touch-and-desktop.md @@ -0,0 +1,151 @@ +--- +title: How to test your keyboard layout — touch and desktop +--- + +Keyman Developer includes full touch layout editing tools. In the image +below I am editing a Khmer Angkor touch layout sample. + +[![Touch Editor - +Khmer](../../images/testing/touch-editor-khmer-800wi.png "Touch Editor - Khmer")](../../images/testing/touch-editor-khmer.png) + +Once you have created your keyboard layout, you need to test it. Your +keyboard layout may cover desktops as well as touch devices. The +**Build** tab of the keyboard editor gives you access to testing and +debugging commands for all platforms. + +[![Touch Editor - Build +tab](../../images/testing/touch-editor-build-800wi.png "Touch Editor - Build tab")](../../images/testing/touch-editor-build.png) + +Testing is easy on Windows: press the **Start Debugging** button on the +**Build** tab to test the rules in your keyboard layout with a [fully +interactive debugger](../../context/debug). This allows you to step +through complex rules, inspecting the contents of the stores referenced +in each rule, and examine the context, deadkey state and output at each +point. + +After validating your rules, you will want to test the [on screen +keyboard](../../context/keyboard-editor#toc-on-screen-tab) and how your +keyboard feels within other applications in Windows.  We recommend +[creating a package](../distribute/tutorial) in order to simplify the +installation of both the on screen keyboard and the keyboard (which are +stored as two separate files). Then click the **Install** button in +**Build** tab of the package wizard and you are done. + +## Preparing to test + +But how do you test your touch layout on your iPhone, iPad or Android +device? We've thought about this as well. Keyman Developer includes a +web server specifically for testing and installing keyboard layouts on +these devices. + +To start the web server and debugging session, on the **Build** tab of +your keyboard editor, click **Test Keyboard on web** (we may rename +these buttons in a later release to reflect the cross-platform targets +here). + +You may need to open up the host port on your local computer firewall; +most firewall software will prompt you at this point. The default port +that Keyman Developer uses is 8008. You can change this in the +**Tools**/**Options**/**Debugger** dialog if necessary. + +You will see a list of web addresses in the list box below the **Test +Keyboard on web** label. This lists all the computer and domain names +and IP addresses that Keyman Developer is listening on that we can find. +Why so many? Because of the variety of network setups, different users +will need to use different addresses; Keyman Developer leaves that up to +you! We call the list the **Debug Host List**. + +![KeymanWeb Debug +Host](../../images/testing/startdebugging-kd10.png "KeymanWeb Debug Host") + +## Testing your web keyboard on your desktop + +You can test your desktop layout by selecting an address in the debug +host list and clicking **Open debugger in local browser**.  This will +load the KeymanWeb Debug Host page in your browser, and you should be +able to select your keyboard from the list and start using it. + +## Testing your keyboard on a touch device + +To start testing on your mobile device, your device needs to be on the +same network as your PC. Then open your web browser on the device. Which +browser? On iOS, use Safari.  On Android devices, we recommend using +Chrome. We don't recommend the Android Browser, because its capabilities +vary dramatically depending on the Android version and the brand of your +device. + +Then you will need to pick an address from the debug host list in Keyman +Developer that your device can find. An IP address on the same network +is almost always going to work, but you may find that a canonical domain +name works as well, if you are in an environment with a name server. The +localhost and 127.0.0.1 addresses are local to your PC -- so don't try +those. + +Enter the address into the URL bar on your browser; don't forget to type +the **:8008** port at the end of the address you choose (on most devices +you can skip the **http://** at the start): + +Alternatively, you can click the **Send addresses to email...** button. +It sends a list of the debug host addresses to an email address of your +choice, so you can then just click the link in your email on your target +device. + +![Enter the debug host +URL](../../images/testing/frame/android-enter-debug-host.png "Enter the debug host URL") + +All going well, you should be presented with a page like this: + +![Viewing the debug host on +iPhone](../../images/testing/frame/android-debug-host.png "Viewing the debug host on iPhone") + +If you get a Host Not Found error, try different addresses from the +**KeymanWeb Debug Host** list, check your computer's firewall settings, +and make sure that both devices are on the same network. + +Now you can instantly test your layout in KeymanWeb Touch, by clicking +in the blank edit box: the touch layout will appear. If you make changes +in Keyman Developer, just recompile (**Compile Keyboard** button, or +F7), and reload on the touch device -- you don't need to click the +**Test Keyboard on web** button again. + +![Testing a keyboard on +iPhone](../../images/testing/frame/android-debug-keyboard.png "Testing a keyboard on iPhone") + +## Loading your keyboard into the native Keyman apps + +If you do not have Keyman currently installed on your target device, you +can click **Install Keyman for Android** or **Install Keyman for iOS** +to bring up the appropriate store for installing Keyman. + +Finally, you can also install your keyboard layout directly into Keyman +for Android or Keyman for iPhone and iPad by clicking the **Add keyboard +to Keyman for Android** button or **Add keyboard to Keyman for iOS** +button on the test page on your device. + +![Installing the keyboard into native +app](../../images/testing/frame/installing-native-keyboard-1.png "Installing the keyboard into native app") + +![Installing the keyboard into native +app](../../images/testing/frame/installing-native-keyboard-2.png "Installing the keyboard into native app") + +Now your keyboard layout is installed and available in the Keyman App, +and if you have the Keyman version with the system keyboard support +installed, across all apps. + +You can test multiple keyboards just by clicking **Test Keyboard on +web** in each keyboard editor. + +## Related articles + +Other articles on developing touch layouts: + +- [Creating a touch keyboard layout for Amharic - part + 1](../develop/creating-a-touch-keyboard-layout-for-amharic) +- [Creating a touch keyboard layout for Amharic - the nitty + gritty](../develop/creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty) + +You can distribute your keyboard to other users by following the +instructions in this article: + +- [Distribute keyboards to Keyman + applications](../distribute/packages) diff --git a/developer/docs/help/guides/test/keyboard-touch-mobile-emulator.md b/developer/docs/help/guides/test/keyboard-touch-mobile-emulator.md new file mode 100644 index 00000000000..fb68b11f2b2 --- /dev/null +++ b/developer/docs/help/guides/test/keyboard-touch-mobile-emulator.md @@ -0,0 +1,61 @@ +--- +title: How to test your touch layout in the Google Chrome mobile emulator +--- + +This post builds on knowledge in another article about [testing Keyman +touch layouts](keyboard-touch-and-desktop). Now, we provide an +alternative test platform for your keyboards, running on your desktop +computer rather than your touch device. + +Google Chrome includes a mobile emulator for web pages, for various +devices including iPhones, iPads and Androids. Recent builds of +KeymanWeb work well with this emulator and this provides a quicker and +easier way, in many cases, to get a feel for the layout of your keyboard +and do rapid testing. + +It is still essential to test your layout on a real device as well as +the emulator: the feel of clicking on keys with a mouse is very +different, and gestures such as longpress menus will feel awkward on the +emulator. We use both native mobile and emulator testing when building +our layouts, switching between the two frequently. Some of the emulated +devices emulated may or not work as well a real device. + +## Test Process + +1. Start testing your keyboard with the [original steps on testing + touch keyboards](keyboard-touch-and-desktop). + ![](../../images/testing/startdebugging-kd10.png "StartDebugging") +2. Open Chrome, navigate to the debug host page for your keyboard, and + press F12. + ![Chrome1](../../images/testing/chrome1.png "Chrome1") +3. In the Developer Tools window, click the mobile icon: + ![Chrome2](../../images/testing/chrome2.png "Chrome2") +4. Back in the debug host page, select the appropriate device from the + mobile emulation toolbar, then press F5 to reload and enable the + touch mode. Some recommended devices are iPad or iPad Pro for tablet + testing, and iPhone X or Nexus 6P for mobile testing. Do not select + "Responsive". + ![Chrome3](../../images/testing/chrome3.png "Chrome3") +5. At this point, you should see a simulation of selected device's + screen, and KeymanWeb should be presenting its touch keyboard rather + than the desktop equivalent. You'll also see the mouse cursor has + turned into a fuzzy circle, to simulate a fingertip instead of a + precise arrow. + ![Chrome4"](../../images/testing/chrome4.png "Chrome4") + +You can now test the keyboard layout and get an idea of how it will feel +on a real touch device. Rotation, or changing device types will require +a page load (F5) in order to render correctly. + +- [Creating a touch keyboard layout for Amharic - part + 1](../develop/creating-a-touch-keyboard-layout-for-amharic) +- [Creating a touch keyboard layout for Amharic - the nitty + gritty](../develop/creating-a-touch-keyboard-layout-for-amharic-the-nitty-gritty) +- [How to test your keyboard layout — touch and + desktop](keyboard-touch-and-desktop) + +You can distribute your keyboard to other users by following the +instructions in this article: + +- [Distribute keyboards to Keyman + applications](../distribute/packages) diff --git a/developer/docs/help/guides/test/lexical-model.md b/developer/docs/help/guides/test/lexical-model.md new file mode 100644 index 00000000000..e46d9a262dd --- /dev/null +++ b/developer/docs/help/guides/test/lexical-model.md @@ -0,0 +1,67 @@ +--- +title: How to test your lexical model +--- + +It is helpful to be familiar with processes for testing touch keyboards +before starting to test a lexical model. This tutorial builds on +knowledge found in the following two articles: + +- [Testing keyboard layouts on devices](keyboard-touch-and-desktop) + +## Test Process + +Lexical models are tested in Keyman Developer's web testing environment. +They can be loaded on any device that can access the testing web site, +in the same way as testing a keyboard layout. + +A lexical model must be tested in conjunction with a keyboard. The +keyboard provides the input, and the lexical model will present +suggestions based on that input. In normal use, a lexical model is +linked to a keyboard by the BCP 47 language code with which they are +both registered. However, within the debug environment, any lexical +model can be tested with any keyboard -- but of course an Arabic lexical +model will not provide useful suggestions with a Hindi keyboard, so you +still need a keyboard which will provide sensible input to the model. + +There are two ways to load a lexical model in the web-based test +environment: + +1. The first option is to start testing a keyboard as you would, in the + web test environment. The keyboard will remain available within the + web test environment until Keyman Developer is restarted, even if + you switch projects. +2. The second way is to specify a compiled .js keyboard file for the + lexical model test to load when you start testing, in the **Build** + tab of the Lexical Model Editor. This keyboard can be selected once + and remains saved in your project user settings for future tests. + +To start testing a lexical model, follow the steps below: + +1. Ensure the model is compiled by pressing F7 within the lexical model + editor, or pressing the **Compile Model** button within the + **Build** tab. +2. Prepare the associated keyboard for testing as you normally would, + and load it in the web test environment following the instructions + above. In the example below, I have selected the fv_sencoten + keyboard to use during my lexical model test (you may alternatively + choose to load the keyboard project and start testing from there). + ![](../../images/lm/test-model.png "model-test-page") +3. Choose the URL in the web addresses list as shown in the image + above. Keyman Developer lists all the addresses on your computer + that it can find; some will be addressable by other devices, where + as addresses such as 'localhost' or '127.0.0.1' are only visible on + the local computer. Typically, any other device must still be on the + same network, and you must make sure you allow Keyman Developer + through your local computer firewall for port 8008 (the default + debugging port). +4. Once you start testing, you can swap between models from the + **Models** menu in the test web page. As you type on the touch + keyboard, you should see suggestions change in the banner, and you + should be able to select the suggestions. You can also do the same + testing in a web browser on a mobile device. Note: you can point + your mobile device camera at the QRCode on screen to quickly load + the selected URL on your mobile device. + +In order to test the lexical model inside Keyman on a mobile device, you +will need to [prepare the model file for +distribution](../lexical-models/distribute). diff --git a/developer/docs/help/images/app/dist-file-browser-ap.png b/developer/docs/help/images/app/dist-file-browser-ap.png new file mode 100644 index 00000000000..e0957ac4dfe Binary files /dev/null and b/developer/docs/help/images/app/dist-file-browser-ap.png differ diff --git a/developer/docs/help/images/app/dist-install1-ap.png b/developer/docs/help/images/app/dist-install1-ap.png new file mode 100644 index 00000000000..9150ea481a7 Binary files /dev/null and b/developer/docs/help/images/app/dist-install1-ap.png differ diff --git a/developer/docs/help/images/app/dist-install1-i.png b/developer/docs/help/images/app/dist-install1-i.png new file mode 100644 index 00000000000..e4632eafc93 Binary files /dev/null and b/developer/docs/help/images/app/dist-install1-i.png differ diff --git a/ios/help/ios_images/dist-kmp-open-i.png b/developer/docs/help/images/app/dist-kmp-open-i.png similarity index 100% rename from ios/help/ios_images/dist-kmp-open-i.png rename to developer/docs/help/images/app/dist-kmp-open-i.png diff --git a/ios/help/ios_images/dist-kmp-success-i.png b/developer/docs/help/images/app/dist-kmp-success-i.png similarity index 100% rename from ios/help/ios_images/dist-kmp-success-i.png rename to developer/docs/help/images/app/dist-kmp-success-i.png diff --git a/developer/docs/help/images/app/dist-storage-permission-ap.png b/developer/docs/help/images/app/dist-storage-permission-ap.png new file mode 100644 index 00000000000..0deb5cf41af Binary files /dev/null and b/developer/docs/help/images/app/dist-storage-permission-ap.png differ diff --git a/developer/docs/help/images/app/dist-url-screen-ap.png b/developer/docs/help/images/app/dist-url-screen-ap.png new file mode 100644 index 00000000000..bf15950a5b1 Binary files /dev/null and b/developer/docs/help/images/app/dist-url-screen-ap.png differ diff --git a/ios/help/ios_images/dist-url-screen-i.png b/developer/docs/help/images/app/dist-url-screen-i.png similarity index 100% rename from ios/help/ios_images/dist-url-screen-i.png rename to developer/docs/help/images/app/dist-url-screen-i.png diff --git a/developer/docs/help/images/app/dist-welcome-ap.png b/developer/docs/help/images/app/dist-welcome-ap.png new file mode 100644 index 00000000000..39dadf470d2 Binary files /dev/null and b/developer/docs/help/images/app/dist-welcome-ap.png differ diff --git a/ios/help/ios_images/dist-welcome-i.png b/developer/docs/help/images/app/dist-welcome-i.png similarity index 100% rename from ios/help/ios_images/dist-welcome-i.png rename to developer/docs/help/images/app/dist-welcome-i.png diff --git a/developer/docs/help/images/app/settings-language-ap.png b/developer/docs/help/images/app/settings-language-ap.png new file mode 100644 index 00000000000..e6b2ac4c9d0 Binary files /dev/null and b/developer/docs/help/images/app/settings-language-ap.png differ diff --git a/developer/docs/help/images/dist-file-browser-ap.png b/developer/docs/help/images/dist-file-browser-ap.png new file mode 100644 index 00000000000..e0957ac4dfe Binary files /dev/null and b/developer/docs/help/images/dist-file-browser-ap.png differ diff --git a/developer/docs/help/images/dist-install1-ap.png b/developer/docs/help/images/dist-install1-ap.png new file mode 100644 index 00000000000..9150ea481a7 Binary files /dev/null and b/developer/docs/help/images/dist-install1-ap.png differ diff --git a/developer/docs/help/images/dist-install1-i.png b/developer/docs/help/images/dist-install1-i.png new file mode 100644 index 00000000000..e4632eafc93 Binary files /dev/null and b/developer/docs/help/images/dist-install1-i.png differ diff --git a/developer/docs/help/images/dist-kmp-open-i.png b/developer/docs/help/images/dist-kmp-open-i.png new file mode 100644 index 00000000000..a6220a38562 Binary files /dev/null and b/developer/docs/help/images/dist-kmp-open-i.png differ diff --git a/developer/docs/help/images/dist-kmp-success-i.png b/developer/docs/help/images/dist-kmp-success-i.png new file mode 100644 index 00000000000..af1108946b9 Binary files /dev/null and b/developer/docs/help/images/dist-kmp-success-i.png differ diff --git a/developer/docs/help/images/dist-storage-permission-ap.png b/developer/docs/help/images/dist-storage-permission-ap.png new file mode 100644 index 00000000000..0deb5cf41af Binary files /dev/null and b/developer/docs/help/images/dist-storage-permission-ap.png differ diff --git a/developer/docs/help/images/dist-url-screen-ap.png b/developer/docs/help/images/dist-url-screen-ap.png new file mode 100644 index 00000000000..bf15950a5b1 Binary files /dev/null and b/developer/docs/help/images/dist-url-screen-ap.png differ diff --git a/developer/docs/help/images/dist-url-screen-i.png b/developer/docs/help/images/dist-url-screen-i.png new file mode 100644 index 00000000000..1c002964675 Binary files /dev/null and b/developer/docs/help/images/dist-url-screen-i.png differ diff --git a/developer/docs/help/images/dist-welcome-ap.png b/developer/docs/help/images/dist-welcome-ap.png new file mode 100644 index 00000000000..8d753979b12 Binary files /dev/null and b/developer/docs/help/images/dist-welcome-ap.png differ diff --git a/developer/docs/help/images/dist-welcome-i.png b/developer/docs/help/images/dist-welcome-i.png new file mode 100644 index 00000000000..cfa0cc725fc Binary files /dev/null and b/developer/docs/help/images/dist-welcome-i.png differ diff --git a/developer/docs/help/images/ipa.gif b/developer/docs/help/images/ipa.gif new file mode 100644 index 00000000000..9d861961f17 Binary files /dev/null and b/developer/docs/help/images/ipa.gif differ diff --git a/developer/docs/help/images/lm/developer-open-tsv.png b/developer/docs/help/images/lm/developer-open-tsv.png new file mode 100644 index 00000000000..4a13865b76b Binary files /dev/null and b/developer/docs/help/images/lm/developer-open-tsv.png differ diff --git a/developer/docs/help/images/lm/edited-tsv.png b/developer/docs/help/images/lm/edited-tsv.png new file mode 100644 index 00000000000..e60c291eb29 Binary files /dev/null and b/developer/docs/help/images/lm/edited-tsv.png differ diff --git a/developer/docs/help/images/lm/overview.svg b/developer/docs/help/images/lm/overview.svg new file mode 100644 index 00000000000..5259abfd5c3 --- /dev/null +++ b/developer/docs/help/images/lm/overview.svg @@ -0,0 +1 @@ +Lexical Modelknowledge of your languageand its spelling ruleson my wcontextway website “w”suggestions \ No newline at end of file diff --git a/developer/docs/help/images/lm/sencoten-sheets-full.png b/developer/docs/help/images/lm/sencoten-sheets-full.png new file mode 100644 index 00000000000..9ac2d487ff6 Binary files /dev/null and b/developer/docs/help/images/lm/sencoten-sheets-full.png differ diff --git a/developer/docs/help/images/lm/sencoten-sheets-save-as.png b/developer/docs/help/images/lm/sencoten-sheets-save-as.png new file mode 100644 index 00000000000..dcb879551d7 Binary files /dev/null and b/developer/docs/help/images/lm/sencoten-sheets-save-as.png differ diff --git a/developer/docs/help/images/lm/template-tsv.png b/developer/docs/help/images/lm/template-tsv.png new file mode 100644 index 00000000000..d480c29912a Binary files /dev/null and b/developer/docs/help/images/lm/template-tsv.png differ diff --git a/developer/docs/help/images/lm/test-model.png b/developer/docs/help/images/lm/test-model.png new file mode 100644 index 00000000000..740bc648b0c Binary files /dev/null and b/developer/docs/help/images/lm/test-model.png differ diff --git a/developer/docs/help/images/lm/tutorial_distribute_model_3.png b/developer/docs/help/images/lm/tutorial_distribute_model_3.png new file mode 100644 index 00000000000..2bc7bbad8c4 Binary files /dev/null and b/developer/docs/help/images/lm/tutorial_distribute_model_3.png differ diff --git a/developer/docs/help/images/lm/tutorial_distribute_model_3_files.png b/developer/docs/help/images/lm/tutorial_distribute_model_3_files.png new file mode 100644 index 00000000000..417a9dd49e8 Binary files /dev/null and b/developer/docs/help/images/lm/tutorial_distribute_model_3_files.png differ diff --git a/developer/docs/help/images/lm/tutorial_distribute_model_compile.png b/developer/docs/help/images/lm/tutorial_distribute_model_compile.png new file mode 100644 index 00000000000..b302e26e9b4 Binary files /dev/null and b/developer/docs/help/images/lm/tutorial_distribute_model_compile.png differ diff --git a/developer/docs/help/images/lm/tutorial_distribute_model_details.png b/developer/docs/help/images/lm/tutorial_distribute_model_details.png new file mode 100644 index 00000000000..bf506cac906 Binary files /dev/null and b/developer/docs/help/images/lm/tutorial_distribute_model_details.png differ diff --git a/developer/docs/help/images/lm/whatis-correct-thr.png b/developer/docs/help/images/lm/whatis-correct-thr.png new file mode 100644 index 00000000000..28bf1fa82c1 Binary files /dev/null and b/developer/docs/help/images/lm/whatis-correct-thr.png differ diff --git a/developer/docs/help/images/lm/whatis-incompr.png b/developer/docs/help/images/lm/whatis-incompr.png new file mode 100644 index 00000000000..02d680a7c61 Binary files /dev/null and b/developer/docs/help/images/lm/whatis-incompr.png differ diff --git a/developer/docs/help/images/lm/whatis-naiv.png b/developer/docs/help/images/lm/whatis-naiv.png new file mode 100644 index 00000000000..e8061682337 Binary files /dev/null and b/developer/docs/help/images/lm/whatis-naiv.png differ diff --git a/developer/docs/help/images/lm/whatis-on-my-w.png b/developer/docs/help/images/lm/whatis-on-my-w.png new file mode 100644 index 00000000000..d01d216ed68 Binary files /dev/null and b/developer/docs/help/images/lm/whatis-on-my-w.png differ diff --git a/developer/docs/help/images/settings-language-ap.png b/developer/docs/help/images/settings-language-ap.png new file mode 100644 index 00000000000..e6b2ac4c9d0 Binary files /dev/null and b/developer/docs/help/images/settings-language-ap.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_1.png b/developer/docs/help/images/simpleTouchKeyboard_1.png new file mode 100644 index 00000000000..1f5610d6541 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_1.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_10.png b/developer/docs/help/images/simpleTouchKeyboard_10.png new file mode 100644 index 00000000000..460e1dbae97 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_10.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_11.png b/developer/docs/help/images/simpleTouchKeyboard_11.png new file mode 100644 index 00000000000..25af1e721f0 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_11.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_12-2.png b/developer/docs/help/images/simpleTouchKeyboard_12-2.png new file mode 100644 index 00000000000..946fc499008 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_12-2.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_12.png b/developer/docs/help/images/simpleTouchKeyboard_12.png new file mode 100644 index 00000000000..4b945093a14 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_12.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_13.png b/developer/docs/help/images/simpleTouchKeyboard_13.png new file mode 100644 index 00000000000..5277c515886 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_13.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_14.png b/developer/docs/help/images/simpleTouchKeyboard_14.png new file mode 100644 index 00000000000..b73483c39b4 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_14.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_15.png b/developer/docs/help/images/simpleTouchKeyboard_15.png new file mode 100644 index 00000000000..a1b619e318b Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_15.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_15b.png b/developer/docs/help/images/simpleTouchKeyboard_15b.png new file mode 100644 index 00000000000..86d1c67d9a0 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_15b.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_16.png b/developer/docs/help/images/simpleTouchKeyboard_16.png new file mode 100644 index 00000000000..4e730d33695 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_16.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_16b.png b/developer/docs/help/images/simpleTouchKeyboard_16b.png new file mode 100644 index 00000000000..7dd5feab6b9 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_16b.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_17.png b/developer/docs/help/images/simpleTouchKeyboard_17.png new file mode 100644 index 00000000000..621809ce215 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_17.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_18.png b/developer/docs/help/images/simpleTouchKeyboard_18.png new file mode 100644 index 00000000000..31c10b444b9 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_18.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_19.png b/developer/docs/help/images/simpleTouchKeyboard_19.png new file mode 100644 index 00000000000..b547473cf33 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_19.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_2.png b/developer/docs/help/images/simpleTouchKeyboard_2.png new file mode 100644 index 00000000000..763ca83a0c7 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_2.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_20.png b/developer/docs/help/images/simpleTouchKeyboard_20.png new file mode 100644 index 00000000000..82d06a8cc05 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_20.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_3.png b/developer/docs/help/images/simpleTouchKeyboard_3.png new file mode 100644 index 00000000000..6779461e05d Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_3.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_36.png b/developer/docs/help/images/simpleTouchKeyboard_36.png new file mode 100644 index 00000000000..ae690484cec Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_36.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_4.png b/developer/docs/help/images/simpleTouchKeyboard_4.png new file mode 100644 index 00000000000..023bd944e55 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_4.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_5.png b/developer/docs/help/images/simpleTouchKeyboard_5.png new file mode 100644 index 00000000000..7038dc0515c Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_5.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_6.png b/developer/docs/help/images/simpleTouchKeyboard_6.png new file mode 100644 index 00000000000..85b461e8c4b Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_6.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_7.png b/developer/docs/help/images/simpleTouchKeyboard_7.png new file mode 100644 index 00000000000..6b2d2c06750 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_7.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_8.png b/developer/docs/help/images/simpleTouchKeyboard_8.png new file mode 100644 index 00000000000..a161a657c54 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_8.png differ diff --git a/developer/docs/help/images/simpleTouchKeyboard_9.png b/developer/docs/help/images/simpleTouchKeyboard_9.png new file mode 100644 index 00000000000..b246c832199 Binary files /dev/null and b/developer/docs/help/images/simpleTouchKeyboard_9.png differ diff --git a/developer/docs/help/images/testing/chrome1.png b/developer/docs/help/images/testing/chrome1.png new file mode 100644 index 00000000000..3adbe9cde85 Binary files /dev/null and b/developer/docs/help/images/testing/chrome1.png differ diff --git a/developer/docs/help/images/testing/chrome2.png b/developer/docs/help/images/testing/chrome2.png new file mode 100644 index 00000000000..713019ce2c2 Binary files /dev/null and b/developer/docs/help/images/testing/chrome2.png differ diff --git a/developer/docs/help/images/testing/chrome3.png b/developer/docs/help/images/testing/chrome3.png new file mode 100644 index 00000000000..76df121c401 Binary files /dev/null and b/developer/docs/help/images/testing/chrome3.png differ diff --git a/developer/docs/help/images/testing/chrome4.png b/developer/docs/help/images/testing/chrome4.png new file mode 100644 index 00000000000..8e3d70fc50d Binary files /dev/null and b/developer/docs/help/images/testing/chrome4.png differ diff --git a/developer/docs/help/images/testing/frame/android-debug-host.png b/developer/docs/help/images/testing/frame/android-debug-host.png new file mode 100644 index 00000000000..2783af508c9 Binary files /dev/null and b/developer/docs/help/images/testing/frame/android-debug-host.png differ diff --git a/developer/docs/help/images/testing/frame/android-debug-keyboard.png b/developer/docs/help/images/testing/frame/android-debug-keyboard.png new file mode 100644 index 00000000000..a112a881aa9 Binary files /dev/null and b/developer/docs/help/images/testing/frame/android-debug-keyboard.png differ diff --git a/developer/docs/help/images/testing/frame/android-enter-debug-host.png b/developer/docs/help/images/testing/frame/android-enter-debug-host.png new file mode 100644 index 00000000000..13070f46800 Binary files /dev/null and b/developer/docs/help/images/testing/frame/android-enter-debug-host.png differ diff --git a/developer/docs/help/images/testing/frame/installing-native-keyboard-1.png b/developer/docs/help/images/testing/frame/installing-native-keyboard-1.png new file mode 100644 index 00000000000..b115fdbec82 Binary files /dev/null and b/developer/docs/help/images/testing/frame/installing-native-keyboard-1.png differ diff --git a/developer/docs/help/images/testing/frame/installing-native-keyboard-2.png b/developer/docs/help/images/testing/frame/installing-native-keyboard-2.png new file mode 100644 index 00000000000..448c2d20bef Binary files /dev/null and b/developer/docs/help/images/testing/frame/installing-native-keyboard-2.png differ diff --git a/developer/docs/help/images/testing/startdebugging-kd10.png b/developer/docs/help/images/testing/startdebugging-kd10.png new file mode 100644 index 00000000000..197d0b9c7b8 Binary files /dev/null and b/developer/docs/help/images/testing/startdebugging-kd10.png differ diff --git a/developer/docs/help/images/testing/touch-editor-build-800wi.png b/developer/docs/help/images/testing/touch-editor-build-800wi.png new file mode 100644 index 00000000000..99a9c4c690a Binary files /dev/null and b/developer/docs/help/images/testing/touch-editor-build-800wi.png differ diff --git a/developer/docs/help/images/testing/touch-editor-build.png b/developer/docs/help/images/testing/touch-editor-build.png new file mode 100644 index 00000000000..26f1f6ec759 Binary files /dev/null and b/developer/docs/help/images/testing/touch-editor-build.png differ diff --git a/developer/docs/help/images/testing/touch-editor-khmer-800wi.png b/developer/docs/help/images/testing/touch-editor-khmer-800wi.png new file mode 100644 index 00000000000..26ad7b4936f Binary files /dev/null and b/developer/docs/help/images/testing/touch-editor-khmer-800wi.png differ diff --git a/developer/docs/help/images/testing/touch-editor-khmer.png b/developer/docs/help/images/testing/touch-editor-khmer.png new file mode 100644 index 00000000000..5658e0f9f73 Binary files /dev/null and b/developer/docs/help/images/testing/touch-editor-khmer.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard.png b/developer/docs/help/images/touch_amharic_keyboard.png new file mode 100644 index 00000000000..57a9693a1bc Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_2.png b/developer/docs/help/images/touch_amharic_keyboard_2.png new file mode 100644 index 00000000000..a0e2fcb3764 Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_2.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_3.png b/developer/docs/help/images/touch_amharic_keyboard_3.png new file mode 100644 index 00000000000..bf6bc5a4091 Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_3.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_4.png b/developer/docs/help/images/touch_amharic_keyboard_4.png new file mode 100644 index 00000000000..689ab500a64 Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_4.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_5.png b/developer/docs/help/images/touch_amharic_keyboard_5.png new file mode 100644 index 00000000000..1d06fc3ef3f Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_5.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_6.png b/developer/docs/help/images/touch_amharic_keyboard_6.png new file mode 100644 index 00000000000..a9979426b6a Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_6.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_7.png b/developer/docs/help/images/touch_amharic_keyboard_7.png new file mode 100644 index 00000000000..454a73bf200 Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_7.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_8.png b/developer/docs/help/images/touch_amharic_keyboard_8.png new file mode 100644 index 00000000000..2c7e5a297cf Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_8.png differ diff --git a/developer/docs/help/images/touch_amharic_keyboard_9.png b/developer/docs/help/images/touch_amharic_keyboard_9.png new file mode 100644 index 00000000000..205e428d73f Binary files /dev/null and b/developer/docs/help/images/touch_amharic_keyboard_9.png differ diff --git a/developer/docs/help/images/tutorial_distribute_keyboard_3.png b/developer/docs/help/images/tutorial_distribute_keyboard_3.png new file mode 100644 index 00000000000..33e7cdf336a Binary files /dev/null and b/developer/docs/help/images/tutorial_distribute_keyboard_3.png differ diff --git a/developer/docs/help/images/tutorial_distribute_keyboard_3_files.png b/developer/docs/help/images/tutorial_distribute_keyboard_3_files.png new file mode 100644 index 00000000000..561931522f3 Binary files /dev/null and b/developer/docs/help/images/tutorial_distribute_keyboard_3_files.png differ diff --git a/developer/docs/help/images/tutorial_distribute_keyboard_compile.png b/developer/docs/help/images/tutorial_distribute_keyboard_compile.png new file mode 100644 index 00000000000..865fa186e55 Binary files /dev/null and b/developer/docs/help/images/tutorial_distribute_keyboard_compile.png differ diff --git a/developer/docs/help/images/tutorial_distribute_keyboard_details.png b/developer/docs/help/images/tutorial_distribute_keyboard_details.png new file mode 100644 index 00000000000..08dd9ec0123 Binary files /dev/null and b/developer/docs/help/images/tutorial_distribute_keyboard_details.png differ diff --git a/developer/docs/help/images/tutorial_distribute_keyboard_shortcuts.png b/developer/docs/help/images/tutorial_distribute_keyboard_shortcuts.png new file mode 100644 index 00000000000..8084a3797a4 Binary files /dev/null and b/developer/docs/help/images/tutorial_distribute_keyboard_shortcuts.png differ diff --git a/developer/docs/help/images/tutorial_keyboard_qfrench.gif b/developer/docs/help/images/tutorial_keyboard_qfrench.gif new file mode 100644 index 00000000000..99e274b4548 Binary files /dev/null and b/developer/docs/help/images/tutorial_keyboard_qfrench.gif differ diff --git a/developer/docs/help/images/tutorial_package_includesdocs.gif b/developer/docs/help/images/tutorial_package_includesdocs.gif new file mode 100644 index 00000000000..6eebbb9fc0c Binary files /dev/null and b/developer/docs/help/images/tutorial_package_includesdocs.gif differ diff --git a/developer/docs/help/images/tutorial_package_includesfonts.gif b/developer/docs/help/images/tutorial_package_includesfonts.gif new file mode 100644 index 00000000000..cbeca7bd533 Binary files /dev/null and b/developer/docs/help/images/tutorial_package_includesfonts.gif differ diff --git a/developer/docs/help/images/tutorial_package_includesosk.gif b/developer/docs/help/images/tutorial_package_includesosk.gif new file mode 100644 index 00000000000..5db43bf1b95 Binary files /dev/null and b/developer/docs/help/images/tutorial_package_includesosk.gif differ diff --git a/developer/docs/help/images/tutorial_package_includeswelcome.gif b/developer/docs/help/images/tutorial_package_includeswelcome.gif new file mode 100644 index 00000000000..9313bd04812 Binary files /dev/null and b/developer/docs/help/images/tutorial_package_includeswelcome.gif differ diff --git a/developer/docs/help/images/ui/BuildTab.png b/developer/docs/help/images/ui/BuildTab.png new file mode 100644 index 00000000000..5fe027dcc69 Binary files /dev/null and b/developer/docs/help/images/ui/BuildTab.png differ diff --git a/developer/docs/help/images/ui/Debug_Menu.png b/developer/docs/help/images/ui/Debug_Menu.png new file mode 100644 index 00000000000..61e749cfa6d Binary files /dev/null and b/developer/docs/help/images/ui/Debug_Menu.png differ diff --git a/developer/docs/help/images/ui/Debug_Toolbar.png b/developer/docs/help/images/ui/Debug_Toolbar.png new file mode 100644 index 00000000000..0fc598f2f8a Binary files /dev/null and b/developer/docs/help/images/ui/Debug_Toolbar.png differ diff --git a/developer/docs/help/images/ui/LongPress_Flicks_Multitaps.png b/developer/docs/help/images/ui/LongPress_Flicks_Multitaps.png new file mode 100644 index 00000000000..ba398273d1e Binary files /dev/null and b/developer/docs/help/images/ui/LongPress_Flicks_Multitaps.png differ diff --git a/developer/docs/help/images/ui/NGROK_Phone.png b/developer/docs/help/images/ui/NGROK_Phone.png new file mode 100644 index 00000000000..b33ef1e3166 Binary files /dev/null and b/developer/docs/help/images/ui/NGROK_Phone.png differ diff --git a/developer/docs/help/images/ui/OnScreenKeyboard.png b/developer/docs/help/images/ui/OnScreenKeyboard.png new file mode 100644 index 00000000000..cb827878b01 Binary files /dev/null and b/developer/docs/help/images/ui/OnScreenKeyboard.png differ diff --git a/developer/docs/help/images/ui/TouchLayout_Design.png b/developer/docs/help/images/ui/TouchLayout_Design.png new file mode 100644 index 00000000000..3e073e812ff Binary files /dev/null and b/developer/docs/help/images/ui/TouchLayout_Design.png differ diff --git a/developer/docs/help/images/ui/TouchLayout_Design_2.png b/developer/docs/help/images/ui/TouchLayout_Design_2.png new file mode 100644 index 00000000000..6bae06255f9 Binary files /dev/null and b/developer/docs/help/images/ui/TouchLayout_Design_2.png differ diff --git a/developer/docs/help/images/ui/frmAboutTike.png b/developer/docs/help/images/ui/frmAboutTike.png new file mode 100644 index 00000000000..240f1ce87b0 Binary files /dev/null and b/developer/docs/help/images/ui/frmAboutTike.png differ diff --git a/developer/docs/help/images/ui/frmCharacterMapFilter.png b/developer/docs/help/images/ui/frmCharacterMapFilter.png new file mode 100644 index 00000000000..52efac91d70 Binary files /dev/null and b/developer/docs/help/images/ui/frmCharacterMapFilter.png differ diff --git a/developer/docs/help/images/ui/frmCharacterMapNew.png b/developer/docs/help/images/ui/frmCharacterMapNew.png new file mode 100644 index 00000000000..4a933022f75 Binary files /dev/null and b/developer/docs/help/images/ui/frmCharacterMapNew.png differ diff --git a/developer/docs/help/images/ui/frmDebug.png b/developer/docs/help/images/ui/frmDebug.png new file mode 100644 index 00000000000..1aa67a4036a Binary files /dev/null and b/developer/docs/help/images/ui/frmDebug.png differ diff --git a/developer/docs/help/images/ui/frmEditLanguageExample.png b/developer/docs/help/images/ui/frmEditLanguageExample.png new file mode 100644 index 00000000000..352da90d8a9 Binary files /dev/null and b/developer/docs/help/images/ui/frmEditLanguageExample.png differ diff --git a/developer/docs/help/images/ui/frmKeyTest.png b/developer/docs/help/images/ui/frmKeyTest.png new file mode 100644 index 00000000000..583bc16793c Binary files /dev/null and b/developer/docs/help/images/ui/frmKeyTest.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Debug_CallStack.png b/developer/docs/help/images/ui/frmKeymanWizard_Debug_CallStack.png new file mode 100644 index 00000000000..aff2c122322 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Debug_CallStack.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Debug_Deadkeys.png b/developer/docs/help/images/ui/frmKeymanWizard_Debug_Deadkeys.png new file mode 100644 index 00000000000..4b48d4f61f3 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Debug_Deadkeys.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Debug_Elements.png b/developer/docs/help/images/ui/frmKeymanWizard_Debug_Elements.png new file mode 100644 index 00000000000..fc78a911958 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Debug_Elements.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Debug_RegressionTest.png b/developer/docs/help/images/ui/frmKeymanWizard_Debug_RegressionTest.png new file mode 100644 index 00000000000..bebe3ac569c Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Debug_RegressionTest.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Debug_State.png b/developer/docs/help/images/ui/frmKeymanWizard_Debug_State.png new file mode 100644 index 00000000000..d14ed69a4f3 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Debug_State.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Details.png b/developer/docs/help/images/ui/frmKeymanWizard_Details.png new file mode 100644 index 00000000000..d21db5f87f6 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Details.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Icon.png b/developer/docs/help/images/ui/frmKeymanWizard_Icon.png new file mode 100644 index 00000000000..92a621ac93f Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Icon.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Layout_Code.png b/developer/docs/help/images/ui/frmKeymanWizard_Layout_Code.png new file mode 100644 index 00000000000..2fbe3991e59 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Layout_Code.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_Layout_Design.png b/developer/docs/help/images/ui/frmKeymanWizard_Layout_Design.png new file mode 100644 index 00000000000..5d3b570555b Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_Layout_Design.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_New.png b/developer/docs/help/images/ui/frmKeymanWizard_New.png new file mode 100644 index 00000000000..7fdb5ac14a0 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_New.png differ diff --git a/developer/docs/help/images/ui/frmKeymanWizard_TouchLayout_Code.png b/developer/docs/help/images/ui/frmKeymanWizard_TouchLayout_Code.png new file mode 100644 index 00000000000..b20f0bd2852 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeymanWizard_TouchLayout_Code.png differ diff --git a/developer/docs/help/images/ui/frmKeyman_Developer_Server_Options.png b/developer/docs/help/images/ui/frmKeyman_Developer_Server_Options.png new file mode 100644 index 00000000000..6f0c8313085 Binary files /dev/null and b/developer/docs/help/images/ui/frmKeyman_Developer_Server_Options.png differ diff --git a/developer/docs/help/images/ui/frmLDMLEditor.png b/developer/docs/help/images/ui/frmLDMLEditor.png new file mode 100644 index 00000000000..c3f887ab641 Binary files /dev/null and b/developer/docs/help/images/ui/frmLDMLEditor.png differ diff --git a/developer/docs/help/images/ui/frmList_Local_URLs.png b/developer/docs/help/images/ui/frmList_Local_URLs.png new file mode 100644 index 00000000000..18917dfc8f8 Binary files /dev/null and b/developer/docs/help/images/ui/frmList_Local_URLs.png differ diff --git a/developer/docs/help/images/ui/frmMessages.png b/developer/docs/help/images/ui/frmMessages.png new file mode 100644 index 00000000000..377e9290344 Binary files /dev/null and b/developer/docs/help/images/ui/frmMessages.png differ diff --git a/developer/docs/help/images/ui/frmModelEditor_Build.png b/developer/docs/help/images/ui/frmModelEditor_Build.png new file mode 100644 index 00000000000..b437544518f Binary files /dev/null and b/developer/docs/help/images/ui/frmModelEditor_Build.png differ diff --git a/developer/docs/help/images/ui/frmModelEditor_Details.png b/developer/docs/help/images/ui/frmModelEditor_Details.png new file mode 100644 index 00000000000..a9eb7163c8c Binary files /dev/null and b/developer/docs/help/images/ui/frmModelEditor_Details.png differ diff --git a/developer/docs/help/images/ui/frmModelEditor_Source.png b/developer/docs/help/images/ui/frmModelEditor_Source.png new file mode 100644 index 00000000000..d887196e510 Binary files /dev/null and b/developer/docs/help/images/ui/frmModelEditor_Source.png differ diff --git a/developer/docs/help/images/ui/frmModelEditor_Wordlist_Code.png b/developer/docs/help/images/ui/frmModelEditor_Wordlist_Code.png new file mode 100644 index 00000000000..f853f76fc36 Binary files /dev/null and b/developer/docs/help/images/ui/frmModelEditor_Wordlist_Code.png differ diff --git a/developer/docs/help/images/ui/frmModelEditor_Wordlist_Design.png b/developer/docs/help/images/ui/frmModelEditor_Wordlist_Design.png new file mode 100644 index 00000000000..d0770cd804e Binary files /dev/null and b/developer/docs/help/images/ui/frmModelEditor_Wordlist_Design.png differ diff --git a/developer/docs/help/images/ui/frmModelsCompile.png b/developer/docs/help/images/ui/frmModelsCompile.png new file mode 100644 index 00000000000..d02fdf1eba9 Binary files /dev/null and b/developer/docs/help/images/ui/frmModelsCompile.png differ diff --git a/developer/docs/help/images/ui/frmNGROK_Config.png b/developer/docs/help/images/ui/frmNGROK_Config.png new file mode 100644 index 00000000000..ffbbecef230 Binary files /dev/null and b/developer/docs/help/images/ui/frmNGROK_Config.png differ diff --git a/developer/docs/help/images/ui/frmNGROK_Server_1.png b/developer/docs/help/images/ui/frmNGROK_Server_1.png new file mode 100644 index 00000000000..e617f9313dd Binary files /dev/null and b/developer/docs/help/images/ui/frmNGROK_Server_1.png differ diff --git a/developer/docs/help/images/ui/frmNGROK_Server_2.png b/developer/docs/help/images/ui/frmNGROK_Server_2.png new file mode 100644 index 00000000000..b8b3e571d9d Binary files /dev/null and b/developer/docs/help/images/ui/frmNGROK_Server_2.png differ diff --git a/developer/docs/help/images/ui/frmNew.png b/developer/docs/help/images/ui/frmNew.png new file mode 100644 index 00000000000..6748baf7d82 Binary files /dev/null and b/developer/docs/help/images/ui/frmNew.png differ diff --git a/developer/docs/help/images/ui/frmNewLDMLProjectParameters.png b/developer/docs/help/images/ui/frmNewLDMLProjectParameters.png new file mode 100644 index 00000000000..6002ea9943d Binary files /dev/null and b/developer/docs/help/images/ui/frmNewLDMLProjectParameters.png differ diff --git a/developer/docs/help/images/ui/frmNewLMProject.png b/developer/docs/help/images/ui/frmNewLMProject.png new file mode 100644 index 00000000000..6e1b096f51d Binary files /dev/null and b/developer/docs/help/images/ui/frmNewLMProject.png differ diff --git a/developer/docs/help/images/ui/frmNewLMProjectParameters.png b/developer/docs/help/images/ui/frmNewLMProjectParameters.png new file mode 100644 index 00000000000..d58b569064c Binary files /dev/null and b/developer/docs/help/images/ui/frmNewLMProjectParameters.png differ diff --git a/developer/docs/help/images/ui/frmNewLMProjectSelectLanguage.png b/developer/docs/help/images/ui/frmNewLMProjectSelectLanguage.png new file mode 100644 index 00000000000..8767a2d2670 Binary files /dev/null and b/developer/docs/help/images/ui/frmNewLMProjectSelectLanguage.png differ diff --git a/developer/docs/help/images/ui/frmNewProject.png b/developer/docs/help/images/ui/frmNewProject.png new file mode 100644 index 00000000000..8fc13cd763f Binary files /dev/null and b/developer/docs/help/images/ui/frmNewProject.png differ diff --git a/developer/docs/help/images/ui/frmNewProjectParameters.png b/developer/docs/help/images/ui/frmNewProjectParameters.png new file mode 100644 index 00000000000..df93ecac2f2 Binary files /dev/null and b/developer/docs/help/images/ui/frmNewProjectParameters.png differ diff --git a/developer/docs/help/images/ui/frmOptions_CharacterMap.png b/developer/docs/help/images/ui/frmOptions_CharacterMap.png new file mode 100644 index 00000000000..75c8fc38433 Binary files /dev/null and b/developer/docs/help/images/ui/frmOptions_CharacterMap.png differ diff --git a/developer/docs/help/images/ui/frmOptions_Debugger.png b/developer/docs/help/images/ui/frmOptions_Debugger.png new file mode 100644 index 00000000000..adb2f56c20f Binary files /dev/null and b/developer/docs/help/images/ui/frmOptions_Debugger.png differ diff --git a/developer/docs/help/images/ui/frmOptions_Editor.png b/developer/docs/help/images/ui/frmOptions_Editor.png new file mode 100644 index 00000000000..ae8d858d30c Binary files /dev/null and b/developer/docs/help/images/ui/frmOptions_Editor.png differ diff --git a/developer/docs/help/images/ui/frmOptions_General.png b/developer/docs/help/images/ui/frmOptions_General.png new file mode 100644 index 00000000000..514c04a5f71 Binary files /dev/null and b/developer/docs/help/images/ui/frmOptions_General.png differ diff --git a/developer/docs/help/images/ui/frmOptions_Server.png b/developer/docs/help/images/ui/frmOptions_Server.png new file mode 100644 index 00000000000..47b4beb8193 Binary files /dev/null and b/developer/docs/help/images/ui/frmOptions_Server.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_Build.png b/developer/docs/help/images/ui/frmPackageEditor_Build.png new file mode 100644 index 00000000000..953f1b60662 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_Build.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_Details.png b/developer/docs/help/images/ui/frmPackageEditor_Details.png new file mode 100644 index 00000000000..be071b7e294 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_Details.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_EditExample.png b/developer/docs/help/images/ui/frmPackageEditor_EditExample.png new file mode 100644 index 00000000000..96c70237a9a Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_EditExample.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_EditRelatedPackage.png b/developer/docs/help/images/ui/frmPackageEditor_EditRelatedPackage.png new file mode 100644 index 00000000000..977fb822432 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_EditRelatedPackage.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_Files.png b/developer/docs/help/images/ui/frmPackageEditor_Files.png new file mode 100644 index 00000000000..6b9b6a4cef4 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_Files.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_Keyboards.png b/developer/docs/help/images/ui/frmPackageEditor_Keyboards.png new file mode 100644 index 00000000000..fc252413d57 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_Keyboards.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_SelectWebFonts.png b/developer/docs/help/images/ui/frmPackageEditor_SelectWebFonts.png new file mode 100644 index 00000000000..64d284dc458 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_SelectWebFonts.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_Select_BCP_47_Tag.png b/developer/docs/help/images/ui/frmPackageEditor_Select_BCP_47_Tag.png new file mode 100644 index 00000000000..5895b452901 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_Select_BCP_47_Tag.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_Shortcuts.png b/developer/docs/help/images/ui/frmPackageEditor_Shortcuts.png new file mode 100644 index 00000000000..e9fe8c2fc45 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_Shortcuts.png differ diff --git a/developer/docs/help/images/ui/frmPackageEditor_Source.png b/developer/docs/help/images/ui/frmPackageEditor_Source.png new file mode 100644 index 00000000000..3ab4d8406f6 Binary files /dev/null and b/developer/docs/help/images/ui/frmPackageEditor_Source.png differ diff --git a/developer/docs/help/images/ui/frmProject_Distribution.png b/developer/docs/help/images/ui/frmProject_Distribution.png new file mode 100644 index 00000000000..5f05db0747e Binary files /dev/null and b/developer/docs/help/images/ui/frmProject_Distribution.png differ diff --git a/developer/docs/help/images/ui/frmProject_Keyboards.png b/developer/docs/help/images/ui/frmProject_Keyboards.png new file mode 100644 index 00000000000..7d9e6ef36e0 Binary files /dev/null and b/developer/docs/help/images/ui/frmProject_Keyboards.png differ diff --git a/developer/docs/help/images/ui/frmProject_Packaging.png b/developer/docs/help/images/ui/frmProject_Packaging.png new file mode 100644 index 00000000000..6b7db832371 Binary files /dev/null and b/developer/docs/help/images/ui/frmProject_Packaging.png differ diff --git a/developer/docs/help/images/ui/frmProject_Welcome.png b/developer/docs/help/images/ui/frmProject_Welcome.png new file mode 100644 index 00000000000..7b899c4fe6e Binary files /dev/null and b/developer/docs/help/images/ui/frmProject_Welcome.png differ diff --git a/developer/docs/help/images/ui/obj.gif b/developer/docs/help/images/ui/obj.gif new file mode 100644 index 00000000000..455e0b330a9 Binary files /dev/null and b/developer/docs/help/images/ui/obj.gif differ diff --git a/developer/docs/help/index.md b/developer/docs/help/index.md new file mode 100644 index 00000000000..9e9c250abb3 --- /dev/null +++ b/developer/docs/help/index.md @@ -0,0 +1,38 @@ +--- +title: Keyman Developer 18.0 User Guide +--- + +Need help using Keyman Developer to create your keyboard layouts? You'll +find everything you need here, including product documentation, guides +and tutorials, and full reference information. + +## Guides and Tutorials +- [What is Keyman Developer?](guides/intro) +- [What's new in 18.0](whats-new) +- [Developing Keyman keyboard layouts](guides/develop) +- [Testing Keyman keyboards](guides/test) +- [Distributing Keyman keyboards](guides/distribute) +- [What is a lexical model?](guides/lexical-models) +- [Developing a lexical model](guides/lexical-models/tutorial) + +## Reference +- [Keyman keyboard language reference](../language/reference) +- [Keyman keyboard language guide](../language/guide) +- [Customising Keyman Engine for Desktop](../engine/desktop) +- [Error codes, File types and Tools](reference/) +- [Keyman Developer user interface](context/) +- [Additional Notes](main/) +- [Version History](../version-history/) + +## Ask for Help +- [Ask other users in the SIL Keyman Community](https://community.software.sil.org/c/keyman) + +## Other Resources + +- [Keyboard Quality White Paper](/developer/whitepaper1.1.pdf) +- [Knowledge Base](/kb) +- [Keyman Desktop Help](/products/desktop) +- [Keyman Engine for Desktop](/developer/engine/desktop/current-version/) +- [Keyman Engine for Web](/developer/engine/web/) +- [Keyman Engine for iPhone and iPad](/developer/engine/iphone-and-ipad/current-version/) +- [Keyman Engine for Android](/developer/engine/android/current-version/) \ No newline at end of file diff --git a/developer/docs/help/main/credits.md b/developer/docs/help/main/credits.md new file mode 100644 index 00000000000..f2c8a027c5b --- /dev/null +++ b/developer/docs/help/main/credits.md @@ -0,0 +1,7 @@ +--- +title: Additional Credits +--- + +## Code2000, Code2001 and Code2002 fonts + +© 2006 James Kass. diff --git a/developer/docs/help/main/index.md b/developer/docs/help/main/index.md new file mode 100644 index 00000000000..6e309aa46e0 --- /dev/null +++ b/developer/docs/help/main/index.md @@ -0,0 +1,9 @@ +--- +title: Keyman Developer Additional Notes +--- + +[Keyman Developer Version History](../../version-history) + +[Keyman® Developer End User Licence and Services Agreement](license) + +[Additional Credits](credits) diff --git a/developer/docs/help/main/license.md b/developer/docs/help/main/license.md new file mode 100644 index 00000000000..73b788f9000 --- /dev/null +++ b/developer/docs/help/main/license.md @@ -0,0 +1,26 @@ +--- +title: Keyman® Developer License +--- + +MIT License + +Copyright (c) 1994-2018 SIL International + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/developer/docs/help/reference/api/index.md b/developer/docs/help/reference/api/index.md new file mode 100644 index 00000000000..caac7457fed --- /dev/null +++ b/developer/docs/help/reference/api/index.md @@ -0,0 +1,18 @@ + + +[Home](./index.md) + +## API Reference + +## Packages + +| Package | Description | +| --- | --- | +| [@keymanapp/kmc-analyze](./kmc-analyze.md) | kmc-analyze - keyboard analysis classes, including tools for &displayMap. | +| [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) | | +| [@keymanapp/kmc-kmn](./kmc-kmn.md) | kmc-kmn - Keyman keyboard compiler | +| [@keymanapp/kmc-ldml](./kmc-ldml.md) | | +| [@keymanapp/kmc-model](./kmc-model.md) | | +| [@keymanapp/kmc-model-info](./kmc-model-info.md) | | +| [@keymanapp/kmc-package](./kmc-package.md) | | + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse._constructor_.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse._constructor_.md new file mode 100644 index 00000000000..b2270b6c17b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse._constructor_.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) > [(constructor)](./kmc-analyze.analyzeoskcharacteruse._constructor_.md) + +## AnalyzeOskCharacterUse.(constructor) + +Constructs a new instance of the `AnalyzeOskCharacterUse` class + +**Signature:** + +```typescript +constructor(callbacks: CompilerCallbacks, options?: AnalyzeOskCharacterUseOptions); +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | | +| options | [AnalyzeOskCharacterUseOptions](./kmc-analyze.analyzeoskcharacteruseoptions.md) | _(Optional)_ | + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.analyze.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.analyze.md new file mode 100644 index 00000000000..b4e8732921d --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.analyze.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) > [analyze](./kmc-analyze.analyzeoskcharacteruse.analyze.md) + +## AnalyzeOskCharacterUse.analyze() method + +Analyzes a single source file for Unicode character usage. Can parse .kmn, .kvks, .keyman-touch-layout file formats. Can be called multiple times to collect results from more than one file. Use [AnalyzeOskCharacterUse.getStrings()](./kmc-analyze.analyzeoskcharacteruse.getstrings.md) to retrieve results. + +Note: `analyze()` collects key cap data, so calling this for a .kmn file will retrieve the key caps from the .kvks and .keyman-touch-layout files that it references, rather than key cap data from the .kmn file itself. + +**Signature:** + +```typescript +analyze(file: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| file | string | relative or absolute path to a Keyman source file | + +**Returns:** + +Promise<boolean> + +true if the file is successfully loaded and parsed + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.clear.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.clear.md new file mode 100644 index 00000000000..0c8cee7b99f --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.clear.md @@ -0,0 +1,17 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) > [clear](./kmc-analyze.analyzeoskcharacteruse.clear.md) + +## AnalyzeOskCharacterUse.clear() method + +Clears analysis data collected from previous calls to [AnalyzeOskCharacterUse.analyze()](./kmc-analyze.analyzeoskcharacteruse.analyze.md) + +**Signature:** + +```typescript +clear(): void; +``` +**Returns:** + +void + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.getstrings.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.getstrings.md new file mode 100644 index 00000000000..c01f1a76d9f --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.getstrings.md @@ -0,0 +1,34 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) > [getStrings](./kmc-analyze.analyzeoskcharacteruse.getstrings.md) + +## AnalyzeOskCharacterUse.getStrings() method + +Returns the collected results from earlier calls to [AnalyzeOskCharacterUse.analyze()](./kmc-analyze.analyzeoskcharacteruse.analyze.md). This generates a mapping from a key cap (one or more characters) to a PUA code, for use with `&displayMap`. + +Three output formats are supported: + +- .txt: tab-separated string format, with three columns: PUA, Key Cap, and plain string. The PUA and Key Cap columns are formatted as Unicode Scalar Values, e.g. U+0061, and the plain string is the original key cap string. + +- .md: formatted for documentation purposes. Generates a Markdown table (GFM) with PUA, Key Cap, and plain string. The PUA and Key Cap columns are formatted as Unicode Scalar Values, e.g. U+0061, and the plain string is the original key cap string. + +- .json: returns the final aggregated data as an array of strings, which can be joined to form a JSON blob of an object with a single member, `map`, which is an array of objects. + +**Signature:** + +```typescript +getStrings(format?: '.txt' | '.md' | '.json'): string[]; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| format | '.txt' \| '.md' \| '.json' | _(Optional)_ file format to return - can be '.txt', '.md', or '.json' | + +**Returns:** + +string\[\] + +an array of strings, formatted according to the `format` parameter. + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.md new file mode 100644 index 00000000000..72302bc73c4 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruse.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) + +## AnalyzeOskCharacterUse class + +Analyze the characters used in On Screen Keyboard files (.kvks, .keyman-touch-layout) for use with `&displayMap`. + +**Signature:** + +```typescript +export declare class AnalyzeOskCharacterUse +``` + +## Constructors + +| Constructor | Modifiers | Description | +| --- | --- | --- | +| [(constructor)(callbacks, options)](./kmc-analyze.analyzeoskcharacteruse._constructor_.md) | | Constructs a new instance of the AnalyzeOskCharacterUse class | + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [analyze(file)](./kmc-analyze.analyzeoskcharacteruse.analyze.md) | |

Analyzes a single source file for Unicode character usage. Can parse .kmn, .kvks, .keyman-touch-layout file formats. Can be called multiple times to collect results from more than one file. Use [AnalyzeOskCharacterUse.getStrings()](./kmc-analyze.analyzeoskcharacteruse.getstrings.md) to retrieve results.

Note: analyze() collects key cap data, so calling this for a .kmn file will retrieve the key caps from the .kvks and .keyman-touch-layout files that it references, rather than key cap data from the .kmn file itself.

| +| [clear()](./kmc-analyze.analyzeoskcharacteruse.clear.md) | | Clears analysis data collected from previous calls to [AnalyzeOskCharacterUse.analyze()](./kmc-analyze.analyzeoskcharacteruse.analyze.md) | +| [getStrings(format)](./kmc-analyze.analyzeoskcharacteruse.getstrings.md) | |

Returns the collected results from earlier calls to [AnalyzeOskCharacterUse.analyze()](./kmc-analyze.analyzeoskcharacteruse.analyze.md). This generates a mapping from a key cap (one or more characters) to a PUA code, for use with &displayMap.

Three output formats are supported:

- .txt: tab-separated string format, with three columns: PUA, Key Cap, and plain string. The PUA and Key Cap columns are formatted as Unicode Scalar Values, e.g. U+0061, and the plain string is the original key cap string.

- .md: formatted for documentation purposes. Generates a Markdown table (GFM) with PUA, Key Cap, and plain string. The PUA and Key Cap columns are formatted as Unicode Scalar Values, e.g. U+0061, and the plain string is the original key cap string.

- .json: returns the final aggregated data as an array of strings, which can be joined to form a JSON blob of an object with a single member, map, which is an array of objects.

| + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.includecounts.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.includecounts.md new file mode 100644 index 00000000000..e105b24b29d --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.includecounts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUseOptions](./kmc-analyze.analyzeoskcharacteruseoptions.md) > [includeCounts](./kmc-analyze.analyzeoskcharacteruseoptions.includecounts.md) + +## AnalyzeOskCharacterUseOptions.includeCounts property + +If true, reports number of references to each character found in each source file + +**Signature:** + +```typescript +includeCounts?: boolean; +``` diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.md new file mode 100644 index 00000000000..cfaa60ffb34 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.md @@ -0,0 +1,22 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUseOptions](./kmc-analyze.analyzeoskcharacteruseoptions.md) + +## AnalyzeOskCharacterUseOptions interface + +Options for character analysis + +**Signature:** + +```typescript +export interface AnalyzeOskCharacterUseOptions +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [includeCounts?](./kmc-analyze.analyzeoskcharacteruseoptions.includecounts.md) | | boolean | _(Optional)_ If true, reports number of references to each character found in each source file | +| [puaBase?](./kmc-analyze.analyzeoskcharacteruseoptions.puabase.md) | | number | _(Optional)_ First character to use in PUA for remapping with &displayMap, defaults to U+F100 | +| [stripDottedCircle?](./kmc-analyze.analyzeoskcharacteruseoptions.stripdottedcircle.md) | | boolean | _(Optional)_ If true, strips U+25CC from the key cap before further analysis | + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.puabase.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.puabase.md new file mode 100644 index 00000000000..e1ff19b2184 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.puabase.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUseOptions](./kmc-analyze.analyzeoskcharacteruseoptions.md) > [puaBase](./kmc-analyze.analyzeoskcharacteruseoptions.puabase.md) + +## AnalyzeOskCharacterUseOptions.puaBase property + +First character to use in PUA for remapping with &displayMap, defaults to U+F100 + +**Signature:** + +```typescript +puaBase?: number; +``` diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.stripdottedcircle.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.stripdottedcircle.md new file mode 100644 index 00000000000..db975bf710d --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskcharacteruseoptions.stripdottedcircle.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskCharacterUseOptions](./kmc-analyze.analyzeoskcharacteruseoptions.md) > [stripDottedCircle](./kmc-analyze.analyzeoskcharacteruseoptions.stripdottedcircle.md) + +## AnalyzeOskCharacterUseOptions.stripDottedCircle property + +If true, strips U+25CC from the key cap before further analysis + +**Signature:** + +```typescript +stripDottedCircle?: boolean; +``` diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua._constructor_.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua._constructor_.md new file mode 100644 index 00000000000..a0d5f23e35c --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua._constructor_.md @@ -0,0 +1,20 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskRewritePua](./kmc-analyze.analyzeoskrewritepua.md) > [(constructor)](./kmc-analyze.analyzeoskrewritepua._constructor_.md) + +## AnalyzeOskRewritePua.(constructor) + +Constructs a new instance of the `AnalyzeOskRewritePua` class + +**Signature:** + +```typescript +constructor(callbacks: CompilerCallbacks); +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | | + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.analyze.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.analyze.md new file mode 100644 index 00000000000..7cdaa00da60 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.analyze.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskRewritePua](./kmc-analyze.analyzeoskrewritepua.md) > [analyze](./kmc-analyze.analyzeoskrewritepua.analyze.md) + +## AnalyzeOskRewritePua.analyze() method + +Analyze a keyboard file or files, and provide a remapped output. Accepts a .kmn, .kvks, .keyman-touch-layout file formats. For .kmn, will rewrite associated On Screen Keyboard file formats. Can be called multiple times to rewrite multiple files. Use the [AnalyzeOskRewritePua.data](./kmc-analyze.analyzeoskrewritepua.data.md) property to retrieve the output file content for writing. This does not modify the source file. + +**Signature:** + +```typescript +analyze(file: string, mapping: Osk.StringResult[]): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| file | string | relative or absolute path to a Keyman source file | +| mapping | Osk.StringResult\[\] | OSK keycap map provided by [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) | + +**Returns:** + +Promise<boolean> + +true if the file is successfully loaded and rewritten + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.clear.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.clear.md new file mode 100644 index 00000000000..001d0c494b2 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.clear.md @@ -0,0 +1,17 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskRewritePua](./kmc-analyze.analyzeoskrewritepua.md) > [clear](./kmc-analyze.analyzeoskrewritepua.clear.md) + +## AnalyzeOskRewritePua.clear() method + +Clears data collected from previous calls to [AnalyzeOskRewritePua.analyze()](./kmc-analyze.analyzeoskrewritepua.analyze.md) + +**Signature:** + +```typescript +clear(): void; +``` +**Returns:** + +void + diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.data.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.data.md new file mode 100644 index 00000000000..9e3091ca7cb --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.data.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskRewritePua](./kmc-analyze.analyzeoskrewritepua.md) > [data](./kmc-analyze.analyzeoskrewritepua.data.md) + +## AnalyzeOskRewritePua.data property + +Returns the file data for OSK files rewritten with PUA characters, for use with `&displayMap`. + +**Signature:** + +```typescript +get data(): { + [index: string]: Uint8Array; + }; +``` diff --git a/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.md b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.md new file mode 100644 index 00000000000..731b90bfb64 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.analyzeoskrewritepua.md @@ -0,0 +1,33 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) > [AnalyzeOskRewritePua](./kmc-analyze.analyzeoskrewritepua.md) + +## AnalyzeOskRewritePua class + +Rewrite On Screen Keyboard files (.kvks, .keyman-touch-layout) with PUA codepoints, based on analysis provided by [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) class. + +**Signature:** + +```typescript +export declare class AnalyzeOskRewritePua +``` + +## Constructors + +| Constructor | Modifiers | Description | +| --- | --- | --- | +| [(constructor)(callbacks)](./kmc-analyze.analyzeoskrewritepua._constructor_.md) | | Constructs a new instance of the AnalyzeOskRewritePua class | + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [data](./kmc-analyze.analyzeoskrewritepua.data.md) | readonly | { \[index: string\]: Uint8Array; } | Returns the file data for OSK files rewritten with PUA characters, for use with &displayMap. | + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [analyze(file, mapping)](./kmc-analyze.analyzeoskrewritepua.analyze.md) | | Analyze a keyboard file or files, and provide a remapped output. Accepts a .kmn, .kvks, .keyman-touch-layout file formats. For .kmn, will rewrite associated On Screen Keyboard file formats. Can be called multiple times to rewrite multiple files. Use the [AnalyzeOskRewritePua.data](./kmc-analyze.analyzeoskrewritepua.data.md) property to retrieve the output file content for writing. This does not modify the source file. | +| [clear()](./kmc-analyze.analyzeoskrewritepua.clear.md) | | Clears data collected from previous calls to [AnalyzeOskRewritePua.analyze()](./kmc-analyze.analyzeoskrewritepua.analyze.md) | + diff --git a/developer/docs/help/reference/api/kmc-analyze.md b/developer/docs/help/reference/api/kmc-analyze.md new file mode 100644 index 00000000000..3b514bcf962 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-analyze.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-analyze](./kmc-analyze.md) + +## kmc-analyze package + +kmc-analyze - keyboard analysis classes, including tools for `&displayMap`. + +## Classes + +| Class | Description | +| --- | --- | +| [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) | Analyze the characters used in On Screen Keyboard files (.kvks, .keyman-touch-layout) for use with &displayMap. | +| [AnalyzeOskRewritePua](./kmc-analyze.analyzeoskrewritepua.md) | Rewrite On Screen Keyboard files (.kvks, .keyman-touch-layout) with PUA codepoints, based on analysis provided by [AnalyzeOskCharacterUse](./kmc-analyze.analyzeoskcharacteruse.md) class. | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [AnalyzeOskCharacterUseOptions](./kmc-analyze.analyzeoskcharacteruseoptions.md) | Options for character analysis | + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler._constructor_.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler._constructor_.md new file mode 100644 index 00000000000..0196e3ca32f --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler._constructor_.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompiler](./kmc-keyboard-info.keyboardinfocompiler.md) > [(constructor)](./kmc-keyboard-info.keyboardinfocompiler._constructor_.md) + +## KeyboardInfoCompiler.(constructor) + +Constructs a new instance of the `KeyboardInfoCompiler` class + +**Signature:** + +```typescript +constructor(); +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.init.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.init.md new file mode 100644 index 00000000000..fb9b1460444 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.init.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompiler](./kmc-keyboard-info.keyboardinfocompiler.md) > [init](./kmc-keyboard-info.keyboardinfocompiler.init.md) + +## KeyboardInfoCompiler.init() method + +Initialize the compiler. Copies options. + +**Signature:** + +```typescript +init(callbacks: CompilerCallbacks, options: KeyboardInfoCompilerOptions): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | Callbacks for external interfaces, including message reporting and file io | +| options | [KeyboardInfoCompilerOptions](./kmc-keyboard-info.keyboardinfocompileroptions.md) | Compiler options | + +**Returns:** + +Promise<boolean> + +false if initialization fails + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.md new file mode 100644 index 00000000000..8bca9bd0e32 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.md @@ -0,0 +1,29 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompiler](./kmc-keyboard-info.keyboardinfocompiler.md) + +## KeyboardInfoCompiler class + +Compiles source data from a keyboard project to a .keyboard\_info. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. + +**Signature:** + +```typescript +export declare class KeyboardInfoCompiler implements KeymanCompiler +``` +**Implements:** KeymanCompiler + +## Constructors + +| Constructor | Modifiers | Description | +| --- | --- | --- | +| [(constructor)()](./kmc-keyboard-info.keyboardinfocompiler._constructor_.md) | | Constructs a new instance of the KeyboardInfoCompiler class | + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [init(callbacks, options)](./kmc-keyboard-info.keyboardinfocompiler.init.md) | | Initialize the compiler. Copies options. | +| [run(inputFilename, outputFilename)](./kmc-keyboard-info.keyboardinfocompiler.run.md) | |

Builds a .keyboard\_info file with metadata from the keyboard and package source file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [KeyboardInfoCompiler.init()](./kmc-keyboard-info.keyboardinfocompiler.init.md) function to read any input files by disk.

This function is intended for use within the keyboards repository. While many of the parameters could be deduced from each other, they are specified here to reduce the number of places the filenames are constructed. For full documentation, see: https://help.keyman.com/developer/cloud/keyboard\_info/

| +| [write(artifacts)](./kmc-keyboard-info.keyboardinfocompiler.write.md) | |

Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include:

- .keyboard\_info file - metadata file used by keyman.com

| + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.run.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.run.md new file mode 100644 index 00000000000..711d8948648 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.run.md @@ -0,0 +1,29 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompiler](./kmc-keyboard-info.keyboardinfocompiler.md) > [run](./kmc-keyboard-info.keyboardinfocompiler.run.md) + +## KeyboardInfoCompiler.run() method + +Builds a .keyboard\_info file with metadata from the keyboard and package source file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [KeyboardInfoCompiler.init()](./kmc-keyboard-info.keyboardinfocompiler.init.md) function to read any input files by disk. + +This function is intended for use within the keyboards repository. While many of the parameters could be deduced from each other, they are specified here to reduce the number of places the filenames are constructed. For full documentation, see: https://help.keyman.com/developer/cloud/keyboard\_info/ + +**Signature:** + +```typescript +run(inputFilename: string, outputFilename?: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| inputFilename | string | | +| outputFilename | string | _(Optional)_ | + +**Returns:** + +Promise<[KeyboardInfoCompilerResult](./kmc-keyboard-info.keyboardinfocompilerresult.md)> + +Binary artifacts on success, null on failure. + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.write.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.write.md new file mode 100644 index 00000000000..9ac5bf1b336 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompiler.write.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompiler](./kmc-keyboard-info.keyboardinfocompiler.md) > [write](./kmc-keyboard-info.keyboardinfocompiler.write.md) + +## KeyboardInfoCompiler.write() method + +Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include: + +- .keyboard\_info file - metadata file used by keyman.com + +**Signature:** + +```typescript +write(artifacts: KeyboardInfoCompilerArtifacts): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| artifacts | [KeyboardInfoCompilerArtifacts](./kmc-keyboard-info.keyboardinfocompilerartifacts.md) | object containing artifact binary data to write out | + +**Returns:** + +Promise<boolean> + +true on success + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerartifacts.keyboard_info.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerartifacts.keyboard_info.md new file mode 100644 index 00000000000..e3b46d10e55 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerartifacts.keyboard_info.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompilerArtifacts](./kmc-keyboard-info.keyboardinfocompilerartifacts.md) > [keyboard\_info](./kmc-keyboard-info.keyboardinfocompilerartifacts.keyboard_info.md) + +## KeyboardInfoCompilerArtifacts.keyboard\_info property + +Binary keyboard info filedata and filename - used by keyman.com + +**Signature:** + +```typescript +keyboard_info: KeymanCompilerArtifact; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerartifacts.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerartifacts.md new file mode 100644 index 00000000000..fcfa258df4b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerartifacts.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompilerArtifacts](./kmc-keyboard-info.keyboardinfocompilerartifacts.md) + +## KeyboardInfoCompilerArtifacts interface + +Internal in-memory build artifacts from a successful compilation + +**Signature:** + +```typescript +export interface KeyboardInfoCompilerArtifacts extends KeymanCompilerArtifacts +``` +**Extends:** KeymanCompilerArtifacts + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [keyboard\_info](./kmc-keyboard-info.keyboardinfocompilerartifacts.keyboard_info.md) | | KeymanCompilerArtifact | Binary keyboard info filedata and filename - used by keyman.com | + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompileroptions.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompileroptions.md new file mode 100644 index 00000000000..63f1279300e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompileroptions.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompilerOptions](./kmc-keyboard-info.keyboardinfocompileroptions.md) + +## KeyboardInfoCompilerOptions interface + +Options for the .keyboard\_info compiler + +**Signature:** + +```typescript +export interface KeyboardInfoCompilerOptions extends CompilerOptions +``` +**Extends:** CompilerOptions + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [sources](./kmc-keyboard-info.keyboardinfocompileroptions.sources.md) | | [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) | Description of sources and metadata required to build a .keyboard\_info file | + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompileroptions.sources.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompileroptions.sources.md new file mode 100644 index 00000000000..371f1734776 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompileroptions.sources.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompilerOptions](./kmc-keyboard-info.keyboardinfocompileroptions.md) > [sources](./kmc-keyboard-info.keyboardinfocompileroptions.sources.md) + +## KeyboardInfoCompilerOptions.sources property + +Description of sources and metadata required to build a .keyboard\_info file + +**Signature:** + +```typescript +sources: KeyboardInfoSources; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerresult.artifacts.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerresult.artifacts.md new file mode 100644 index 00000000000..0554d415c53 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerresult.artifacts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompilerResult](./kmc-keyboard-info.keyboardinfocompilerresult.md) > [artifacts](./kmc-keyboard-info.keyboardinfocompilerresult.artifacts.md) + +## KeyboardInfoCompilerResult.artifacts property + +Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [KeyboardInfoCompiler.write()](./kmc-keyboard-info.keyboardinfocompiler.write.md) + +**Signature:** + +```typescript +artifacts: KeyboardInfoCompilerArtifacts; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerresult.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerresult.md new file mode 100644 index 00000000000..96de0472e3b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfocompilerresult.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoCompilerResult](./kmc-keyboard-info.keyboardinfocompilerresult.md) + +## KeyboardInfoCompilerResult interface + +Build artifacts from the .keyboard\_info compiler + +**Signature:** + +```typescript +export interface KeyboardInfoCompilerResult extends KeymanCompilerResult +``` +**Extends:** KeymanCompilerResult + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [artifacts](./kmc-keyboard-info.keyboardinfocompilerresult.artifacts.md) | | [KeyboardInfoCompilerArtifacts](./kmc-keyboard-info.keyboardinfocompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [KeyboardInfoCompiler.write()](./kmc-keyboard-info.keyboardinfocompiler.write.md) | + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.forpublishing.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.forpublishing.md new file mode 100644 index 00000000000..5eb9fe6d6f9 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.forpublishing.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) > [forPublishing](./kmc-keyboard-info.keyboardinfosources.forpublishing.md) + +## KeyboardInfoSources.forPublishing property + +Return an error if project does not meet requirements of keyboards repository + +**Signature:** + +```typescript +forPublishing: boolean; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.jsfilename.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.jsfilename.md new file mode 100644 index 00000000000..15e0557724b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.jsfilename.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) > [jsFilename](./kmc-keyboard-info.keyboardinfosources.jsfilename.md) + +## KeyboardInfoSources.jsFilename property + +The compiled keyboard filename and relative path (.js only) + +**Signature:** + +```typescript +jsFilename?: string; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.kmpfilename.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.kmpfilename.md new file mode 100644 index 00000000000..53689423218 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.kmpfilename.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) > [kmpFilename](./kmc-keyboard-info.keyboardinfosources.kmpfilename.md) + +## KeyboardInfoSources.kmpFilename property + +The compiled package filename and relative path (.kmp) + +**Signature:** + +```typescript +kmpFilename: string; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.kpsfilename.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.kpsfilename.md new file mode 100644 index 00000000000..577820f1454 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.kpsfilename.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) > [kpsFilename](./kmc-keyboard-info.keyboardinfosources.kpsfilename.md) + +## KeyboardInfoSources.kpsFilename property + +The source package filename and relative path (.kps) + +**Signature:** + +```typescript +kpsFilename: string; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.lastcommitdate.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.lastcommitdate.md new file mode 100644 index 00000000000..398a0ab9552 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.lastcommitdate.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) > [lastCommitDate](./kmc-keyboard-info.keyboardinfosources.lastcommitdate.md) + +## KeyboardInfoSources.lastCommitDate property + +Last modification date for files in the project folder 'YYYY-MM-DDThh:mm:ssZ' + +**Signature:** + +```typescript +lastCommitDate?: string; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.md new file mode 100644 index 00000000000..5a6caf26d68 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.md @@ -0,0 +1,25 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) + +## KeyboardInfoSources interface + +Description of sources and metadata required to build a .keyboard\_info file + +**Signature:** + +```typescript +export interface KeyboardInfoSources +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [forPublishing](./kmc-keyboard-info.keyboardinfosources.forpublishing.md) | | boolean | Return an error if project does not meet requirements of keyboards repository | +| [jsFilename?](./kmc-keyboard-info.keyboardinfosources.jsfilename.md) | | string | _(Optional)_ The compiled keyboard filename and relative path (.js only) | +| [kmpFilename](./kmc-keyboard-info.keyboardinfosources.kmpfilename.md) | | string | The compiled package filename and relative path (.kmp) | +| [kpsFilename](./kmc-keyboard-info.keyboardinfosources.kpsfilename.md) | | string | The source package filename and relative path (.kps) | +| [lastCommitDate?](./kmc-keyboard-info.keyboardinfosources.lastcommitdate.md) | | string | _(Optional)_ Last modification date for files in the project folder 'YYYY-MM-DDThh:mm:ssZ' | +| [sourcePath](./kmc-keyboard-info.keyboardinfosources.sourcepath.md) | | string | The path in the keymanapp/keyboards repo where this keyboard may be found | + diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.sourcepath.md b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.sourcepath.md new file mode 100644 index 00000000000..197a5d123be --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.keyboardinfosources.sourcepath.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) > [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) > [sourcePath](./kmc-keyboard-info.keyboardinfosources.sourcepath.md) + +## KeyboardInfoSources.sourcePath property + +The path in the keymanapp/keyboards repo where this keyboard may be found + +**Signature:** + +```typescript +sourcePath: string; +``` diff --git a/developer/docs/help/reference/api/kmc-keyboard-info.md b/developer/docs/help/reference/api/kmc-keyboard-info.md new file mode 100644 index 00000000000..403add9e832 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-keyboard-info.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-keyboard-info](./kmc-keyboard-info.md) + +## kmc-keyboard-info package + +## Classes + +| Class | Description | +| --- | --- | +| [KeyboardInfoCompiler](./kmc-keyboard-info.keyboardinfocompiler.md) | Compiles source data from a keyboard project to a .keyboard\_info. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [KeyboardInfoCompilerArtifacts](./kmc-keyboard-info.keyboardinfocompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation | +| [KeyboardInfoCompilerOptions](./kmc-keyboard-info.keyboardinfocompileroptions.md) | Options for the .keyboard\_info compiler | +| [KeyboardInfoCompilerResult](./kmc-keyboard-info.keyboardinfocompilerresult.md) | Build artifacts from the .keyboard\_info compiler | +| [KeyboardInfoSources](./kmc-keyboard-info.keyboardinfosources.md) | Description of sources and metadata required to build a .keyboard\_info file | + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompiler._constructor_.md b/developer/docs/help/reference/api/kmc-kmn.kmncompiler._constructor_.md new file mode 100644 index 00000000000..42a1cd666cb --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompiler._constructor_.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompiler](./kmc-kmn.kmncompiler.md) > [(constructor)](./kmc-kmn.kmncompiler._constructor_.md) + +## KmnCompiler.(constructor) + +Constructs a new instance of the `KmnCompiler` class + +**Signature:** + +```typescript +constructor(); +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompiler.init.md b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.init.md new file mode 100644 index 00000000000..5d2698b5443 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.init.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompiler](./kmc-kmn.kmncompiler.md) > [init](./kmc-kmn.kmncompiler.init.md) + +## KmnCompiler.init() method + +Initialize the compiler, including loading the WASM host for kmcmplib. Copies options. + +**Signature:** + +```typescript +init(callbacks: CompilerCallbacks, options: KmnCompilerOptions): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | Callbacks for external interfaces, including message reporting and file io | +| options | [KmnCompilerOptions](./kmc-kmn.kmncompileroptions.md) | Compiler options | + +**Returns:** + +Promise<boolean> + +false if initialization fails + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompiler.md b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.md new file mode 100644 index 00000000000..d41c05fc2e3 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.md @@ -0,0 +1,30 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompiler](./kmc-kmn.kmncompiler.md) + +## KmnCompiler class + +Compiles a .kmn file to a .kmx, .kvk, and/or .js. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. + +**Signature:** + +```typescript +export declare class KmnCompiler implements KeymanCompiler, UnicodeSetParser +``` +**Implements:** KeymanCompiler, UnicodeSetParser + +## Constructors + +| Constructor | Modifiers | Description | +| --- | --- | --- | +| [(constructor)()](./kmc-kmn.kmncompiler._constructor_.md) | | Constructs a new instance of the KmnCompiler class | + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [init(callbacks, options)](./kmc-kmn.kmncompiler.init.md) | | Initialize the compiler, including loading the WASM host for kmcmplib. Copies options. | +| [run(infile, outfile)](./kmc-kmn.kmncompiler.run.md) | | Compiles a .kmn file to .kmx, .kvk, and/or .js files. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [KmnCompiler.init()](./kmc-kmn.kmncompiler.init.md) function to read any input files by disk. | +| [verifyInitialized()](./kmc-kmn.kmncompiler.verifyinitialized.md) | | Verify that wasm is spun up OK. | +| [write(artifacts)](./kmc-kmn.kmncompiler.write.md) | |

Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include:

- .kmx file - binary keyboard used by Keyman on desktop platforms - .kvk file - binary on screen keyboard used by Keyman on desktop platforms - .js file - Javascript keyboard for web and touch platforms

| + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompiler.run.md b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.run.md new file mode 100644 index 00000000000..a97f40ab962 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.run.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompiler](./kmc-kmn.kmncompiler.md) > [run](./kmc-kmn.kmncompiler.run.md) + +## KmnCompiler.run() method + +Compiles a .kmn file to .kmx, .kvk, and/or .js files. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [KmnCompiler.init()](./kmc-kmn.kmncompiler.init.md) function to read any input files by disk. + +**Signature:** + +```typescript +run(infile: string, outfile: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| infile | string | Path to source file. Path will be parsed to find relative references in the .kmn file, such as icon or On Screen Keyboard file | +| outfile | string | Path to output file. The file will not be written to, but will be included in the result for use by [KmnCompiler.write()](./kmc-kmn.kmncompiler.write.md). | + +**Returns:** + +Promise<[KmnCompilerResult](./kmc-kmn.kmncompilerresult.md)> + +Binary artifacts on success, null on failure. + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompiler.verifyinitialized.md b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.verifyinitialized.md new file mode 100644 index 00000000000..f2d38795172 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.verifyinitialized.md @@ -0,0 +1,19 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompiler](./kmc-kmn.kmncompiler.md) > [verifyInitialized](./kmc-kmn.kmncompiler.verifyinitialized.md) + +## KmnCompiler.verifyInitialized() method + +Verify that wasm is spun up OK. + +**Signature:** + +```typescript +verifyInitialized(): boolean; +``` +**Returns:** + +boolean + +true if OK + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompiler.write.md b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.write.md new file mode 100644 index 00000000000..ebc1b8d8437 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompiler.write.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompiler](./kmc-kmn.kmncompiler.md) > [write](./kmc-kmn.kmncompiler.write.md) + +## KmnCompiler.write() method + +Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include: + +- .kmx file - binary keyboard used by Keyman on desktop platforms - .kvk file - binary on screen keyboard used by Keyman on desktop platforms - .js file - Javascript keyboard for web and touch platforms + +**Signature:** + +```typescript +write(artifacts: KmnCompilerArtifacts): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| artifacts | [KmnCompilerArtifacts](./kmc-kmn.kmncompilerartifacts.md) | object containing artifact binary data to write out | + +**Returns:** + +Promise<boolean> + +true on success + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.js.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.js.md new file mode 100644 index 00000000000..12706601f1e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.js.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerArtifacts](./kmc-kmn.kmncompilerartifacts.md) > [js](./kmc-kmn.kmncompilerartifacts.js.md) + +## KmnCompilerArtifacts.js property + +Javascript keyboard filedata and filename - installable into KeymanWeb, Keyman mobile products + +**Signature:** + +```typescript +js?: KeymanCompilerArtifactOptional; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.kmx.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.kmx.md new file mode 100644 index 00000000000..c850b6d036b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.kmx.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerArtifacts](./kmc-kmn.kmncompilerartifacts.md) > [kmx](./kmc-kmn.kmncompilerartifacts.kmx.md) + +## KmnCompilerArtifacts.kmx property + +Binary keyboard filedata and filename - installable into Keyman desktop projects + +**Signature:** + +```typescript +kmx?: KeymanCompilerArtifactOptional; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.kvk.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.kvk.md new file mode 100644 index 00000000000..4a6bb87d65a --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.kvk.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerArtifacts](./kmc-kmn.kmncompilerartifacts.md) > [kvk](./kmc-kmn.kmncompilerartifacts.kvk.md) + +## KmnCompilerArtifacts.kvk property + +Binary on screen keyboard filedata and filename - installable into Keyman desktop projects alongside .kmx + +**Signature:** + +```typescript +kvk?: KeymanCompilerArtifactOptional; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.md new file mode 100644 index 00000000000..37561d34a02 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerartifacts.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerArtifacts](./kmc-kmn.kmncompilerartifacts.md) + +## KmnCompilerArtifacts interface + +Internal in-memory build artifacts from a successful compilation + +**Signature:** + +```typescript +export interface KmnCompilerArtifacts extends KeymanCompilerArtifacts +``` +**Extends:** KeymanCompilerArtifacts + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [js?](./kmc-kmn.kmncompilerartifacts.js.md) | | KeymanCompilerArtifactOptional | _(Optional)_ Javascript keyboard filedata and filename - installable into KeymanWeb, Keyman mobile products | +| [kmx?](./kmc-kmn.kmncompilerartifacts.kmx.md) | | KeymanCompilerArtifactOptional | _(Optional)_ Binary keyboard filedata and filename - installable into Keyman desktop projects | +| [kvk?](./kmc-kmn.kmncompilerartifacts.kvk.md) | | KeymanCompilerArtifactOptional | _(Optional)_ Binary on screen keyboard filedata and filename - installable into Keyman desktop projects alongside .kmx | + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompileroptions.md b/developer/docs/help/reference/api/kmc-kmn.kmncompileroptions.md new file mode 100644 index 00000000000..1591a9313b6 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompileroptions.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerOptions](./kmc-kmn.kmncompileroptions.md) + +## KmnCompilerOptions interface + +Options for the .kmn compiler + +**Signature:** + +```typescript +export interface KmnCompilerOptions extends CompilerOptions +``` +**Extends:** CompilerOptions + diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.artifacts.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.artifacts.md new file mode 100644 index 00000000000..12a4dac8596 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.artifacts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerResult](./kmc-kmn.kmncompilerresult.md) > [artifacts](./kmc-kmn.kmncompilerresult.artifacts.md) + +## KmnCompilerResult.artifacts property + +Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [KmnCompiler.write()](./kmc-kmn.kmncompiler.write.md) + +**Signature:** + +```typescript +artifacts: KmnCompilerArtifacts; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.displaymap.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.displaymap.md new file mode 100644 index 00000000000..cdf6cbe9a4f --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.displaymap.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerResult](./kmc-kmn.kmncompilerresult.md) > [displayMap](./kmc-kmn.kmncompilerresult.displaymap.md) + +## KmnCompilerResult.displayMap property + +Mapping data for `&displayMap`, intended for use by kmc-analyze + +**Signature:** + +```typescript +displayMap?: Osk.PuaMap; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.extra.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.extra.md new file mode 100644 index 00000000000..9263bb78037 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.extra.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerResult](./kmc-kmn.kmncompilerresult.md) > [extra](./kmc-kmn.kmncompilerresult.extra.md) + +## KmnCompilerResult.extra property + +Internal additional metadata used by secondary compile phases such as KmwCompiler, not intended for external use + +**Signature:** + +```typescript +extra: KmnCompilerResultExtra; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.md b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.md new file mode 100644 index 00000000000..b50a6025b41 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.kmncompilerresult.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [KmnCompilerResult](./kmc-kmn.kmncompilerresult.md) + +## KmnCompilerResult interface + +Build artifacts from the .kmn compiler + +**Signature:** + +```typescript +export interface KmnCompilerResult extends KeymanCompilerResult +``` +**Extends:** KeymanCompilerResult + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [artifacts](./kmc-kmn.kmncompilerresult.artifacts.md) | | [KmnCompilerArtifacts](./kmc-kmn.kmncompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [KmnCompiler.write()](./kmc-kmn.kmncompiler.write.md) | +| [displayMap?](./kmc-kmn.kmncompilerresult.displaymap.md) | | [Osk.PuaMap](./kmc-kmn.osk.puamap.md) | _(Optional)_ Mapping data for &displayMap, intended for use by kmc-analyze | +| [extra](./kmc-kmn.kmncompilerresult.extra.md) | | KmnCompilerResultExtra | Internal additional metadata used by secondary compile phases such as KmwCompiler, not intended for external use | + diff --git a/developer/docs/help/reference/api/kmc-kmn.md b/developer/docs/help/reference/api/kmc-kmn.md new file mode 100644 index 00000000000..253dbbac62b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) + +## kmc-kmn package + +kmc-kmn - Keyman keyboard compiler + +## Classes + +| Class | Description | +| --- | --- | +| [KmnCompiler](./kmc-kmn.kmncompiler.md) | Compiles a .kmn file to a .kmx, .kvk, and/or .js. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [KmnCompilerArtifacts](./kmc-kmn.kmncompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation | +| [KmnCompilerOptions](./kmc-kmn.kmncompileroptions.md) | Options for the .kmn compiler | +| [KmnCompilerResult](./kmc-kmn.kmncompilerresult.md) | Build artifacts from the .kmn compiler | + +## Namespaces + +| Namespace | Description | +| --- | --- | +| [Osk](./kmc-kmn.osk.md) | | + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.md b/developer/docs/help/reference/api/kmc-kmn.osk.md new file mode 100644 index 00000000000..7257d523fec --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) + +## Osk namespace + +## Functions + +| Function | Description | +| --- | --- | +| [parseMapping(mapping)](./kmc-kmn.osk.parsemapping.md) | | +| [remapTouchLayout(source, map)](./kmc-kmn.osk.remaptouchlayout.md) | | +| [remapVisualKeyboard(vk, map)](./kmc-kmn.osk.remapvisualkeyboard.md) | | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [StringRef](./kmc-kmn.osk.stringref.md) | | +| [StringRefUsage](./kmc-kmn.osk.stringrefusage.md) | | +| [StringResult](./kmc-kmn.osk.stringresult.md) | Represents a single key cap found by AnalyzeOskCharacterUse | + +## Type Aliases + +| Type Alias | Description | +| --- | --- | +| [PuaMap](./kmc-kmn.osk.puamap.md) | | + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.parsemapping.md b/developer/docs/help/reference/api/kmc-kmn.osk.parsemapping.md new file mode 100644 index 00000000000..d2dbbdffe50 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.parsemapping.md @@ -0,0 +1,22 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [parseMapping](./kmc-kmn.osk.parsemapping.md) + +## Osk.parseMapping() function + +**Signature:** + +```typescript +export declare function parseMapping(mapping: any): PuaMap; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| mapping | any | | + +**Returns:** + +[PuaMap](./kmc-kmn.osk.puamap.md) + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.puamap.md b/developer/docs/help/reference/api/kmc-kmn.osk.puamap.md new file mode 100644 index 00000000000..4a56d392123 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.puamap.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [PuaMap](./kmc-kmn.osk.puamap.md) + +## Osk.PuaMap type + +**Signature:** + +```typescript +export type PuaMap = { + [index: string]: string; +}; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.remaptouchlayout.md b/developer/docs/help/reference/api/kmc-kmn.osk.remaptouchlayout.md new file mode 100644 index 00000000000..b6c8c76239f --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.remaptouchlayout.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [remapTouchLayout](./kmc-kmn.osk.remaptouchlayout.md) + +## Osk.remapTouchLayout() function + +**Signature:** + +```typescript +export declare function remapTouchLayout(source: TouchLayout.TouchLayoutFile, map: PuaMap): boolean; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| source | TouchLayout.TouchLayoutFile | | +| map | [PuaMap](./kmc-kmn.osk.puamap.md) | | + +**Returns:** + +boolean + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.remapvisualkeyboard.md b/developer/docs/help/reference/api/kmc-kmn.osk.remapvisualkeyboard.md new file mode 100644 index 00000000000..b6c41d28032 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.remapvisualkeyboard.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [remapVisualKeyboard](./kmc-kmn.osk.remapvisualkeyboard.md) + +## Osk.remapVisualKeyboard() function + +**Signature:** + +```typescript +export declare function remapVisualKeyboard(vk: VisualKeyboard.VisualKeyboard, map: PuaMap): boolean; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| vk | VisualKeyboard.VisualKeyboard | | +| map | [PuaMap](./kmc-kmn.osk.puamap.md) | | + +**Returns:** + +boolean + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringref.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringref.md new file mode 100644 index 00000000000..24e66ec891a --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringref.md @@ -0,0 +1,19 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringRef](./kmc-kmn.osk.stringref.md) + +## Osk.StringRef interface + +**Signature:** + +```typescript +export interface StringRef +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [str](./kmc-kmn.osk.stringref.str.md) | | string | | +| [usages](./kmc-kmn.osk.stringref.usages.md) | | [StringRefUsage](./kmc-kmn.osk.stringrefusage.md)\[\] | | + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringref.str.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringref.str.md new file mode 100644 index 00000000000..85e45efa043 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringref.str.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringRef](./kmc-kmn.osk.stringref.md) > [str](./kmc-kmn.osk.stringref.str.md) + +## Osk.StringRef.str property + +**Signature:** + +```typescript +str: string; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringref.usages.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringref.usages.md new file mode 100644 index 00000000000..8e6c209879a --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringref.usages.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringRef](./kmc-kmn.osk.stringref.md) > [usages](./kmc-kmn.osk.stringref.usages.md) + +## Osk.StringRef.usages property + +**Signature:** + +```typescript +usages: StringRefUsage[]; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.count.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.count.md new file mode 100644 index 00000000000..73cbde62ebd --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.count.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringRefUsage](./kmc-kmn.osk.stringrefusage.md) > [count](./kmc-kmn.osk.stringrefusage.count.md) + +## Osk.StringRefUsage.count property + +**Signature:** + +```typescript +count: number; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.filename.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.filename.md new file mode 100644 index 00000000000..f199327033d --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.filename.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringRefUsage](./kmc-kmn.osk.stringrefusage.md) > [filename](./kmc-kmn.osk.stringrefusage.filename.md) + +## Osk.StringRefUsage.filename property + +**Signature:** + +```typescript +filename: string; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.md new file mode 100644 index 00000000000..403b0af7fe0 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringrefusage.md @@ -0,0 +1,19 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringRefUsage](./kmc-kmn.osk.stringrefusage.md) + +## Osk.StringRefUsage interface + +**Signature:** + +```typescript +export interface StringRefUsage +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [count](./kmc-kmn.osk.stringrefusage.count.md) | | number | | +| [filename](./kmc-kmn.osk.stringrefusage.filename.md) | | string | | + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.md new file mode 100644 index 00000000000..1e5a6d10194 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringResult](./kmc-kmn.osk.stringresult.md) + +## Osk.StringResult interface + +Represents a single key cap found by `AnalyzeOskCharacterUse` + +**Signature:** + +```typescript +export interface StringResult +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [pua](./kmc-kmn.osk.stringresult.pua.md) | | string | hexadecimal single character in PUA range, without 'U+' prefix, e.g. 'F100' | +| [str](./kmc-kmn.osk.stringresult.str.md) | | string | the key cap string | +| [unicode](./kmc-kmn.osk.stringresult.unicode.md) | | string | unicode code points in for reference, without 'U+' prefix, e.g. '0061 0301' | +| [usages](./kmc-kmn.osk.stringresult.usages.md) | | [StringRefUsage](./kmc-kmn.osk.stringrefusage.md)\[\] \| string\[\] | files in which the string is referenced; will be an array of if includeCounts is true, otherwise will be an array of strings listing files in which the key cap may be found | + diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.pua.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.pua.md new file mode 100644 index 00000000000..84b2880dc0e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.pua.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringResult](./kmc-kmn.osk.stringresult.md) > [pua](./kmc-kmn.osk.stringresult.pua.md) + +## Osk.StringResult.pua property + +hexadecimal single character in PUA range, without 'U+' prefix, e.g. 'F100' + +**Signature:** + +```typescript +pua: string; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.str.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.str.md new file mode 100644 index 00000000000..e24371b1d89 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.str.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringResult](./kmc-kmn.osk.stringresult.md) > [str](./kmc-kmn.osk.stringresult.str.md) + +## Osk.StringResult.str property + +the key cap string + +**Signature:** + +```typescript +str: string; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.unicode.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.unicode.md new file mode 100644 index 00000000000..92c8a789d50 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.unicode.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringResult](./kmc-kmn.osk.stringresult.md) > [unicode](./kmc-kmn.osk.stringresult.unicode.md) + +## Osk.StringResult.unicode property + +unicode code points in for reference, without 'U+' prefix, e.g. '0061 0301' + +**Signature:** + +```typescript +unicode: string; +``` diff --git a/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.usages.md b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.usages.md new file mode 100644 index 00000000000..0010cc8cb89 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-kmn.osk.stringresult.usages.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-kmn](./kmc-kmn.md) > [Osk](./kmc-kmn.osk.md) > [StringResult](./kmc-kmn.osk.stringresult.md) > [usages](./kmc-kmn.osk.stringresult.usages.md) + +## Osk.StringResult.usages property + +files in which the string is referenced; will be an array of if includeCounts is true, otherwise will be an array of strings listing files in which the key cap may be found + +**Signature:** + +```typescript +usages: StringRefUsage[] | string[]; +``` diff --git a/developer/docs/help/reference/api/kmc-ldml.ldmlcompileroptions.md b/developer/docs/help/reference/api/kmc-ldml.ldmlcompileroptions.md new file mode 100644 index 00000000000..3ee68592870 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-ldml.ldmlcompileroptions.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-ldml](./kmc-ldml.md) > [LdmlCompilerOptions](./kmc-ldml.ldmlcompileroptions.md) + +## LdmlCompilerOptions interface + +Options for the .xml LDML keyboard compiler + +**Signature:** + +```typescript +export interface LdmlCompilerOptions extends CompilerOptions +``` +**Extends:** CompilerOptions + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [readerOptions](./kmc-ldml.ldmlcompileroptions.readeroptions.md) | | LDMLKeyboardXMLSourceFileReaderOptions | Paths and other options required for reading .xml files | + diff --git a/developer/docs/help/reference/api/kmc-ldml.ldmlcompileroptions.readeroptions.md b/developer/docs/help/reference/api/kmc-ldml.ldmlcompileroptions.readeroptions.md new file mode 100644 index 00000000000..59e3f53b736 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-ldml.ldmlcompileroptions.readeroptions.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-ldml](./kmc-ldml.md) > [LdmlCompilerOptions](./kmc-ldml.ldmlcompileroptions.md) > [readerOptions](./kmc-ldml.ldmlcompileroptions.readeroptions.md) + +## LdmlCompilerOptions.readerOptions property + +Paths and other options required for reading .xml files + +**Signature:** + +```typescript +readerOptions: LDMLKeyboardXMLSourceFileReaderOptions; +``` diff --git a/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.init.md b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.init.md new file mode 100644 index 00000000000..6fd83e9d463 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.init.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-ldml](./kmc-ldml.md) > [LdmlKeyboardCompiler](./kmc-ldml.ldmlkeyboardcompiler.md) > [init](./kmc-ldml.ldmlkeyboardcompiler.init.md) + +## LdmlKeyboardCompiler.init() method + +Initialize the compiler, including loading the WASM host for uset parsing. Copies options. + +**Signature:** + +```typescript +init(callbacks: CompilerCallbacks, options: LdmlCompilerOptions): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | Callbacks for external interfaces, including message reporting and file io | +| options | [LdmlCompilerOptions](./kmc-ldml.ldmlcompileroptions.md) | Compiler options | + +**Returns:** + +Promise<boolean> + +false if initialization fails + diff --git a/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.md b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.md new file mode 100644 index 00000000000..fdd5d32c16b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-ldml](./kmc-ldml.md) > [LdmlKeyboardCompiler](./kmc-ldml.ldmlkeyboardcompiler.md) + +## LdmlKeyboardCompiler class + +Compiles a LDML keyboard .xml file to a .kmx (KMXPlus), .kvk, and/or .js. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. + +**Signature:** + +```typescript +export declare class LdmlKeyboardCompiler implements KeymanCompiler +``` +**Implements:** KeymanCompiler + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [init(callbacks, options)](./kmc-ldml.ldmlkeyboardcompiler.init.md) | | Initialize the compiler, including loading the WASM host for uset parsing. Copies options. | +| [run(inputFilename, outputFilename)](./kmc-ldml.ldmlkeyboardcompiler.run.md) | | Compiles a LDML keyboard .xml file to .kmx, .kvk, and/or .js files. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [LdmlKeyboardCompiler.init()](./kmc-ldml.ldmlkeyboardcompiler.init.md) function to read any input files by disk. | +| [write(artifacts)](./kmc-ldml.ldmlkeyboardcompiler.write.md) | |

Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include:

- .kmx file - binary keyboard used by Keyman on desktop platforms - .kvk file - binary on screen keyboard used by Keyman on desktop platforms - .js file - Javascript keyboard for web and touch platforms

| + diff --git a/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.run.md b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.run.md new file mode 100644 index 00000000000..cb0e9eaa7f4 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.run.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-ldml](./kmc-ldml.md) > [LdmlKeyboardCompiler](./kmc-ldml.ldmlkeyboardcompiler.md) > [run](./kmc-ldml.ldmlkeyboardcompiler.run.md) + +## LdmlKeyboardCompiler.run() method + +Compiles a LDML keyboard .xml file to .kmx, .kvk, and/or .js files. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [LdmlKeyboardCompiler.init()](./kmc-ldml.ldmlkeyboardcompiler.init.md) function to read any input files by disk. + +**Signature:** + +```typescript +run(inputFilename: string, outputFilename?: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| inputFilename | string | | +| outputFilename | string | _(Optional)_ | + +**Returns:** + +Promise<LdmlKeyboardCompilerResult> + +Binary artifacts on success, null on failure. + diff --git a/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.write.md b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.write.md new file mode 100644 index 00000000000..434b463adb4 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-ldml.ldmlkeyboardcompiler.write.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-ldml](./kmc-ldml.md) > [LdmlKeyboardCompiler](./kmc-ldml.ldmlkeyboardcompiler.md) > [write](./kmc-ldml.ldmlkeyboardcompiler.write.md) + +## LdmlKeyboardCompiler.write() method + +Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include: + +- .kmx file - binary keyboard used by Keyman on desktop platforms - .kvk file - binary on screen keyboard used by Keyman on desktop platforms - .js file - Javascript keyboard for web and touch platforms + +**Signature:** + +```typescript +write(artifacts: LdmlKeyboardCompilerArtifacts): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| artifacts | LdmlKeyboardCompilerArtifacts | object containing artifact binary data to write out | + +**Returns:** + +Promise<boolean> + +true on success + diff --git a/developer/docs/help/reference/api/kmc-ldml.md b/developer/docs/help/reference/api/kmc-ldml.md new file mode 100644 index 00000000000..ca921083a22 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-ldml.md @@ -0,0 +1,18 @@ + + +[Home](./index.md) > [@keymanapp/kmc-ldml](./kmc-ldml.md) + +## kmc-ldml package + +## Classes + +| Class | Description | +| --- | --- | +| [LdmlKeyboardCompiler](./kmc-ldml.ldmlkeyboardcompiler.md) | Compiles a LDML keyboard .xml file to a .kmx (KMXPlus), .kvk, and/or .js. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [LdmlCompilerOptions](./kmc-ldml.ldmlcompileroptions.md) | Options for the .xml LDML keyboard compiler | + diff --git a/developer/docs/help/reference/api/kmc-model-info.md b/developer/docs/help/reference/api/kmc-model-info.md new file mode 100644 index 00000000000..f7cbd6d4631 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) + +## kmc-model-info package + +## Classes + +| Class | Description | +| --- | --- | +| [ModelInfoCompiler](./kmc-model-info.modelinfocompiler.md) | Compiles source data from a lexical model project to a .model\_info. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. | +| [ModelInfoSources](./kmc-model-info.modelinfosources.md) | Description of sources and metadata required to build a .model\_info file | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [ModelInfoCompilerArtifacts](./kmc-model-info.modelinfocompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation | +| [ModelInfoCompilerOptions](./kmc-model-info.modelinfocompileroptions.md) | Options for the .model\_info compiler | +| [ModelInfoCompilerResult](./kmc-model-info.modelinfocompilerresult.md) | Build artifacts from the .model\_info compiler | + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler._constructor_.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler._constructor_.md new file mode 100644 index 00000000000..9aadd791a08 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler._constructor_.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompiler](./kmc-model-info.modelinfocompiler.md) > [(constructor)](./kmc-model-info.modelinfocompiler._constructor_.md) + +## ModelInfoCompiler.(constructor) + +Constructs a new instance of the `ModelInfoCompiler` class + +**Signature:** + +```typescript +constructor(); +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.init.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.init.md new file mode 100644 index 00000000000..ff8383bb27e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.init.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompiler](./kmc-model-info.modelinfocompiler.md) > [init](./kmc-model-info.modelinfocompiler.init.md) + +## ModelInfoCompiler.init() method + +Initialize the compiler. Copies options. + +**Signature:** + +```typescript +init(callbacks: CompilerCallbacks, options: ModelInfoCompilerOptions): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | Callbacks for external interfaces, including message reporting and file io | +| options | [ModelInfoCompilerOptions](./kmc-model-info.modelinfocompileroptions.md) | Compiler options | + +**Returns:** + +Promise<boolean> + +false if initialization fails + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.md new file mode 100644 index 00000000000..05b0c58ba68 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.md @@ -0,0 +1,29 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompiler](./kmc-model-info.modelinfocompiler.md) + +## ModelInfoCompiler class + +Compiles source data from a lexical model project to a .model\_info. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. + +**Signature:** + +```typescript +export declare class ModelInfoCompiler implements KeymanCompiler +``` +**Implements:** KeymanCompiler + +## Constructors + +| Constructor | Modifiers | Description | +| --- | --- | --- | +| [(constructor)()](./kmc-model-info.modelinfocompiler._constructor_.md) | | Constructs a new instance of the ModelInfoCompiler class | + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [init(callbacks, options)](./kmc-model-info.modelinfocompiler.init.md) | | Initialize the compiler. Copies options. | +| [run(inputFilename, outputFilename)](./kmc-model-info.modelinfocompiler.run.md) | |

Builds .model\_info file with metadata from the model and package source file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [ModelInfoCompiler.init()](./kmc-model-info.modelinfocompiler.init.md) function to read any input files by disk.

This function is intended for use within the lexical-models repository. While many of the parameters could be deduced from each other, they are specified here to reduce the number of places the filenames are constructed.

| +| [write(artifacts)](./kmc-model-info.modelinfocompiler.write.md) | |

Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include:

- .model\_info file - metadata file used by keyman.com

| + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.run.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.run.md new file mode 100644 index 00000000000..ead3fa50032 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.run.md @@ -0,0 +1,29 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompiler](./kmc-model-info.modelinfocompiler.md) > [run](./kmc-model-info.modelinfocompiler.run.md) + +## ModelInfoCompiler.run() method + +Builds .model\_info file with metadata from the model and package source file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [ModelInfoCompiler.init()](./kmc-model-info.modelinfocompiler.init.md) function to read any input files by disk. + +This function is intended for use within the lexical-models repository. While many of the parameters could be deduced from each other, they are specified here to reduce the number of places the filenames are constructed. + +**Signature:** + +```typescript +run(inputFilename: string, outputFilename?: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| inputFilename | string | | +| outputFilename | string | _(Optional)_ | + +**Returns:** + +Promise<[ModelInfoCompilerResult](./kmc-model-info.modelinfocompilerresult.md)> + +Binary artifacts on success, null on failure. + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.write.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.write.md new file mode 100644 index 00000000000..e2d2e5fd27e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompiler.write.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompiler](./kmc-model-info.modelinfocompiler.md) > [write](./kmc-model-info.modelinfocompiler.write.md) + +## ModelInfoCompiler.write() method + +Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include: + +- .model\_info file - metadata file used by keyman.com + +**Signature:** + +```typescript +write(artifacts: ModelInfoCompilerArtifacts): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| artifacts | [ModelInfoCompilerArtifacts](./kmc-model-info.modelinfocompilerartifacts.md) | object containing artifact binary data to write out | + +**Returns:** + +Promise<boolean> + +true on success + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerartifacts.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerartifacts.md new file mode 100644 index 00000000000..1c7e2e7df65 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerartifacts.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompilerArtifacts](./kmc-model-info.modelinfocompilerartifacts.md) + +## ModelInfoCompilerArtifacts interface + +Internal in-memory build artifacts from a successful compilation + +**Signature:** + +```typescript +export interface ModelInfoCompilerArtifacts extends KeymanCompilerArtifacts +``` +**Extends:** KeymanCompilerArtifacts + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [model\_info](./kmc-model-info.modelinfocompilerartifacts.model_info.md) | | KeymanCompilerArtifact | Binary model info filedata and filename - used by keyman.com | + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerartifacts.model_info.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerartifacts.model_info.md new file mode 100644 index 00000000000..1f66e96f344 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerartifacts.model_info.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompilerArtifacts](./kmc-model-info.modelinfocompilerartifacts.md) > [model\_info](./kmc-model-info.modelinfocompilerartifacts.model_info.md) + +## ModelInfoCompilerArtifacts.model\_info property + +Binary model info filedata and filename - used by keyman.com + +**Signature:** + +```typescript +model_info: KeymanCompilerArtifact; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompileroptions.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompileroptions.md new file mode 100644 index 00000000000..984d9bf70a7 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompileroptions.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompilerOptions](./kmc-model-info.modelinfocompileroptions.md) + +## ModelInfoCompilerOptions interface + +Options for the .model\_info compiler + +**Signature:** + +```typescript +export interface ModelInfoCompilerOptions extends CompilerOptions +``` +**Extends:** CompilerOptions + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [sources](./kmc-model-info.modelinfocompileroptions.sources.md) | | [ModelInfoSources](./kmc-model-info.modelinfosources.md) | Description of sources and metadata required to build a .model\_info file | + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompileroptions.sources.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompileroptions.sources.md new file mode 100644 index 00000000000..40c986596e9 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompileroptions.sources.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompilerOptions](./kmc-model-info.modelinfocompileroptions.md) > [sources](./kmc-model-info.modelinfocompileroptions.sources.md) + +## ModelInfoCompilerOptions.sources property + +Description of sources and metadata required to build a .model\_info file + +**Signature:** + +```typescript +sources: ModelInfoSources; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerresult.artifacts.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerresult.artifacts.md new file mode 100644 index 00000000000..9dc3bdf6ea4 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerresult.artifacts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompilerResult](./kmc-model-info.modelinfocompilerresult.md) > [artifacts](./kmc-model-info.modelinfocompilerresult.artifacts.md) + +## ModelInfoCompilerResult.artifacts property + +Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [ModelInfoCompiler.write()](./kmc-model-info.modelinfocompiler.write.md) + +**Signature:** + +```typescript +artifacts: ModelInfoCompilerArtifacts; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerresult.md b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerresult.md new file mode 100644 index 00000000000..0980afd7f76 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfocompilerresult.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoCompilerResult](./kmc-model-info.modelinfocompilerresult.md) + +## ModelInfoCompilerResult interface + +Build artifacts from the .model\_info compiler + +**Signature:** + +```typescript +export interface ModelInfoCompilerResult extends KeymanCompilerResult +``` +**Extends:** KeymanCompilerResult + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [artifacts](./kmc-model-info.modelinfocompilerresult.artifacts.md) | | [ModelInfoCompilerArtifacts](./kmc-model-info.modelinfocompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [ModelInfoCompiler.write()](./kmc-model-info.modelinfocompiler.write.md) | + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.forpublishing.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.forpublishing.md new file mode 100644 index 00000000000..0877529d209 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.forpublishing.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [forPublishing](./kmc-model-info.modelinfosources.forpublishing.md) + +## ModelInfoSources.forPublishing property + +Return an error if project does not meet requirements of lexical-models repository + +**Signature:** + +```typescript +forPublishing: boolean; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kmpfilename.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kmpfilename.md new file mode 100644 index 00000000000..4d47a8ea9a4 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kmpfilename.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [kmpFileName](./kmc-model-info.modelinfosources.kmpfilename.md) + +## ModelInfoSources.kmpFileName property + +The compiled package filename and relative path (.kmp) + +**Signature:** + +```typescript +kmpFileName: string; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kmpjsondata.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kmpjsondata.md new file mode 100644 index 00000000000..d0fbf7ebb7a --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kmpjsondata.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [kmpJsonData](./kmc-model-info.modelinfosources.kmpjsondata.md) + +## ModelInfoSources.kmpJsonData property + +The data from the .kps file, transformed to kmp.json + +**Signature:** + +```typescript +kmpJsonData: KmpJsonFile.KmpJsonFile; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kpsfilename.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kpsfilename.md new file mode 100644 index 00000000000..c80e6755afe --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.kpsfilename.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [kpsFilename](./kmc-model-info.modelinfosources.kpsfilename.md) + +## ModelInfoSources.kpsFilename property + +The source package filename and relative path (.kps) + +**Signature:** + +```typescript +kpsFilename: string; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.lastcommitdate.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.lastcommitdate.md new file mode 100644 index 00000000000..c78c7d5b9db --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.lastcommitdate.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [lastCommitDate](./kmc-model-info.modelinfosources.lastcommitdate.md) + +## ModelInfoSources.lastCommitDate property + +Last modification date for files in the project folder 'YYYY-MM-DDThh:mm:ssZ' + +**Signature:** + +```typescript +lastCommitDate?: string; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.md new file mode 100644 index 00000000000..c74ab3cafd6 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) + +## ModelInfoSources class + +Description of sources and metadata required to build a .model\_info file + +**Signature:** + +```typescript +export declare class ModelInfoSources +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [forPublishing](./kmc-model-info.modelinfosources.forpublishing.md) | | boolean | Return an error if project does not meet requirements of lexical-models repository | +| [kmpFileName](./kmc-model-info.modelinfosources.kmpfilename.md) | | string | The compiled package filename and relative path (.kmp) | +| [kmpJsonData](./kmc-model-info.modelinfosources.kmpjsondata.md) | | KmpJsonFile.KmpJsonFile | The data from the .kps file, transformed to kmp.json | +| [kpsFilename](./kmc-model-info.modelinfosources.kpsfilename.md) | | string | The source package filename and relative path (.kps) | +| [lastCommitDate?](./kmc-model-info.modelinfosources.lastcommitdate.md) | | string | _(Optional)_ Last modification date for files in the project folder 'YYYY-MM-DDThh:mm:ssZ' | +| [model\_id](./kmc-model-info.modelinfosources.model_id.md) | | string | The identifier for the model | +| [modelFileName](./kmc-model-info.modelinfosources.modelfilename.md) | | string | The compiled model filename and relative path (.js) | +| [sourcePath](./kmc-model-info.modelinfosources.sourcepath.md) | | string | The path in the keymanapp/lexical-models repo where this model may be found | + diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.model_id.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.model_id.md new file mode 100644 index 00000000000..d0d40cde82b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.model_id.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [model\_id](./kmc-model-info.modelinfosources.model_id.md) + +## ModelInfoSources.model\_id property + +The identifier for the model + +**Signature:** + +```typescript +model_id: string; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.modelfilename.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.modelfilename.md new file mode 100644 index 00000000000..2f4567e44fe --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.modelfilename.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [modelFileName](./kmc-model-info.modelinfosources.modelfilename.md) + +## ModelInfoSources.modelFileName property + +The compiled model filename and relative path (.js) + +**Signature:** + +```typescript +modelFileName: string; +``` diff --git a/developer/docs/help/reference/api/kmc-model-info.modelinfosources.sourcepath.md b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.sourcepath.md new file mode 100644 index 00000000000..7df6ad03e57 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model-info.modelinfosources.sourcepath.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model-info](./kmc-model-info.md) > [ModelInfoSources](./kmc-model-info.modelinfosources.md) > [sourcePath](./kmc-model-info.modelinfosources.sourcepath.md) + +## ModelInfoSources.sourcePath property + +The path in the keymanapp/lexical-models repo where this model may be found + +**Signature:** + +```typescript +sourcePath: string; +``` diff --git a/developer/docs/help/reference/api/kmc-model.casedwordformtokeyspec.md b/developer/docs/help/reference/api/kmc-model.casedwordformtokeyspec.md new file mode 100644 index 00000000000..5403c6f0c5b --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.casedwordformtokeyspec.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [CasedWordformToKeySpec](./kmc-model.casedwordformtokeyspec.md) + +## CasedWordformToKeySpec type + +Simplifies input text to facilitate finding entries within a lexical model's lexicon, using the model's `applyCasing` function to assist in the keying process. 14.0 + +**Signature:** + +```typescript +export type CasedWordformToKeySpec = (term: string, applyCasing?: CasingFunction) => string; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.init.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.init.md new file mode 100644 index 00000000000..56e6fc5c9bc --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.init.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompiler](./kmc-model.lexicalmodelcompiler.md) > [init](./kmc-model.lexicalmodelcompiler.init.md) + +## LexicalModelCompiler.init() method + +Initialize the compiler. There are currently no options specific to the lexical model compiler + +**Signature:** + +```typescript +init(callbacks: CompilerCallbacks, _options: CompilerOptions): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | Callbacks for external interfaces, including message reporting and file io | +| \_options | CompilerOptions | | + +**Returns:** + +Promise<boolean> + +always succeeds and returns true + diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.md new file mode 100644 index 00000000000..c7cab5b8f1c --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompiler](./kmc-model.lexicalmodelcompiler.md) + +## LexicalModelCompiler class + +Compiles a .model.ts file to a .model.js. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. + +**Signature:** + +```typescript +export declare class LexicalModelCompiler implements KeymanCompiler +``` +**Implements:** KeymanCompiler + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [init(callbacks, \_options)](./kmc-model.lexicalmodelcompiler.init.md) | | Initialize the compiler. There are currently no options specific to the lexical model compiler | +| [run(inputFilename, outputFilename)](./kmc-model.lexicalmodelcompiler.run.md) | | Compiles a .model.ts file to .model.js. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [LexicalModelCompiler.init()](./kmc-model.lexicalmodelcompiler.init.md) function to read any input files by disk. | +| [write(artifacts)](./kmc-model.lexicalmodelcompiler.write.md) | |

Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include:

- .model.js file - Javascript lexical model for web and touch platforms

| + diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.run.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.run.md new file mode 100644 index 00000000000..e96c22038a8 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.run.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompiler](./kmc-model.lexicalmodelcompiler.md) > [run](./kmc-model.lexicalmodelcompiler.run.md) + +## LexicalModelCompiler.run() method + +Compiles a .model.ts file to .model.js. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [LexicalModelCompiler.init()](./kmc-model.lexicalmodelcompiler.init.md) function to read any input files by disk. + +**Signature:** + +```typescript +run(inputFilename: string, outputFilename?: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| inputFilename | string | | +| outputFilename | string | _(Optional)_ | + +**Returns:** + +Promise<[LexicalModelCompilerResult](./kmc-model.lexicalmodelcompilerresult.md)> + +Binary artifacts on success, null on failure. + diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.write.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.write.md new file mode 100644 index 00000000000..c3fd2f6934c --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompiler.write.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompiler](./kmc-model.lexicalmodelcompiler.md) > [write](./kmc-model.lexicalmodelcompiler.write.md) + +## LexicalModelCompiler.write() method + +Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include: + +- .model.js file - Javascript lexical model for web and touch platforms + +**Signature:** + +```typescript +write(artifacts: LexicalModelCompilerArtifacts): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| artifacts | [LexicalModelCompilerArtifacts](./kmc-model.lexicalmodelcompilerartifacts.md) | object containing artifact binary data to write out | + +**Returns:** + +Promise<boolean> + +always returns true + diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerartifacts.js.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerartifacts.js.md new file mode 100644 index 00000000000..99f75d6a584 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerartifacts.js.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompilerArtifacts](./kmc-model.lexicalmodelcompilerartifacts.md) > [js](./kmc-model.lexicalmodelcompilerartifacts.js.md) + +## LexicalModelCompilerArtifacts.js property + +Javascript model filedata and filename - installable into KeymanWeb, Keyman mobile products + +**Signature:** + +```typescript +js: KeymanCompilerArtifact; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerartifacts.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerartifacts.md new file mode 100644 index 00000000000..903a3948a7d --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerartifacts.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompilerArtifacts](./kmc-model.lexicalmodelcompilerartifacts.md) + +## LexicalModelCompilerArtifacts interface + +Internal in-memory build artifacts from a successful compilation + +**Signature:** + +```typescript +export interface LexicalModelCompilerArtifacts extends KeymanCompilerArtifacts +``` +**Extends:** KeymanCompilerArtifacts + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [js](./kmc-model.lexicalmodelcompilerartifacts.js.md) | | KeymanCompilerArtifact | Javascript model filedata and filename - installable into KeymanWeb, Keyman mobile products | + diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerresult.artifacts.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerresult.artifacts.md new file mode 100644 index 00000000000..2d4259416db --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerresult.artifacts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompilerResult](./kmc-model.lexicalmodelcompilerresult.md) > [artifacts](./kmc-model.lexicalmodelcompilerresult.artifacts.md) + +## LexicalModelCompilerResult.artifacts property + +Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [LexicalModelCompiler.write()](./kmc-model.lexicalmodelcompiler.write.md) + +**Signature:** + +```typescript +artifacts: LexicalModelCompilerArtifacts; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerresult.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerresult.md new file mode 100644 index 00000000000..eb541fc46a9 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelcompilerresult.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelCompilerResult](./kmc-model.lexicalmodelcompilerresult.md) + +## LexicalModelCompilerResult interface + +Build artifacts from the lexical model compiler + +**Signature:** + +```typescript +export interface LexicalModelCompilerResult extends KeymanCompilerResult +``` +**Extends:** KeymanCompilerResult + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [artifacts](./kmc-model.lexicalmodelcompilerresult.artifacts.md) | | [LexicalModelCompilerArtifacts](./kmc-model.lexicalmodelcompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [LexicalModelCompiler.write()](./kmc-model.lexicalmodelcompiler.write.md) | + diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.applycasing.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.applycasing.md new file mode 100644 index 00000000000..fb8f9c11005 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.applycasing.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) > [applyCasing](./kmc-model.lexicalmodelsource.applycasing.md) + +## LexicalModelSource.applyCasing property + +Specifies the casing rules for a language. Should implement three casing forms: - 'lower' -- a fully-lowercased version of the text appropriate for the language's use of the writing system. - 'upper' -- a fully-uppercased version of the text - 'initial' -- a version preserving the input casing aside from the initial character, which is uppercased (like with proper nouns and sentence-initial words in English sentences.) + +This is only utilized if `languageUsesCasing` is defined and set to `true`. 14.0 + +**Signature:** + +```typescript +readonly applyCasing?: CasingFunction; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.languageusescasing.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.languageusescasing.md new file mode 100644 index 00000000000..51d899d4748 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.languageusescasing.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) > [languageUsesCasing](./kmc-model.lexicalmodelsource.languageusescasing.md) + +## LexicalModelSource.languageUsesCasing property + +When set to `true`, suggestions will attempt to match the case of the input text even if the lexicon entries use a different casing scheme due to search term keying effects. 14.0 + +**Signature:** + +```typescript +readonly languageUsesCasing?: boolean; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.md new file mode 100644 index 00000000000..f3f88cfd6fe --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) + +## LexicalModelSource interface + +Base interface for a lexical model source definition + +**Signature:** + +```typescript +export interface LexicalModelSource extends LexicalModelDeclaration +``` +**Extends:** LexicalModelDeclaration + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [applyCasing?](./kmc-model.lexicalmodelsource.applycasing.md) | readonly | CasingFunction |

_(Optional)_ Specifies the casing rules for a language. Should implement three casing forms: - 'lower' -- a fully-lowercased version of the text appropriate for the language's use of the writing system. - 'upper' -- a fully-uppercased version of the text - 'initial' -- a version preserving the input casing aside from the initial character, which is uppercased (like with proper nouns and sentence-initial words in English sentences.)

This is only utilized if languageUsesCasing is defined and set to true. 14.0

| +| [languageUsesCasing?](./kmc-model.lexicalmodelsource.languageusescasing.md) | readonly | boolean | _(Optional)_ When set to true, suggestions will attempt to match the case of the input text even if the lexicon entries use a different casing scheme due to search term keying effects. 14.0 | +| [punctuation?](./kmc-model.lexicalmodelsource.punctuation.md) | readonly | LexicalModelPunctuation | _(Optional)_ Punctuation and spacing suggested by the model. | +| [rootClass?](./kmc-model.lexicalmodelsource.rootclass.md) | readonly | string | _(Optional)_ The name of the type to instantiate (without parameters) as the base object for a custom predictive model. | +| [searchTermToKey?](./kmc-model.lexicalmodelsource.searchtermtokey.md) | readonly | [WordformToKeySpec](./kmc-model.wordformtokeyspec.md) | _(Optional)_ How to simplify words, to convert them into simplified search keys This often involves removing accents, lowercasing, etc. | +| [sources](./kmc-model.lexicalmodelsource.sources.md) | readonly | Array<string> | | +| [wordBreaker?](./kmc-model.lexicalmodelsource.wordbreaker.md) | readonly | [WordBreakerSpec](./kmc-model.wordbreakerspec.md) \| [SimpleWordBreakerSpec](./kmc-model.simplewordbreakerspec.md) |

_(Optional)_ Which word breaker to use. Choose from:

- 'default' -- breaks according to Unicode UAX \#29 §4.1 Default Word Boundary Specification, which works well for \*most\* languages. - 'ascii' -- a very simple word breaker, for demonstration purposes only. - word breaking function -- provide your own function that breaks words. - class-based word-breaker - may be supported in the future.

| + diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.punctuation.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.punctuation.md new file mode 100644 index 00000000000..be062d49237 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.punctuation.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) > [punctuation](./kmc-model.lexicalmodelsource.punctuation.md) + +## LexicalModelSource.punctuation property + +Punctuation and spacing suggested by the model. + +**Signature:** + +```typescript +readonly punctuation?: LexicalModelPunctuation; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.rootclass.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.rootclass.md new file mode 100644 index 00000000000..2e4371eed16 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.rootclass.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) > [rootClass](./kmc-model.lexicalmodelsource.rootclass.md) + +## LexicalModelSource.rootClass property + +The name of the type to instantiate (without parameters) as the base object for a custom predictive model. + +**Signature:** + +```typescript +readonly rootClass?: string; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.searchtermtokey.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.searchtermtokey.md new file mode 100644 index 00000000000..ca9d0d8ae8e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.searchtermtokey.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) > [searchTermToKey](./kmc-model.lexicalmodelsource.searchtermtokey.md) + +## LexicalModelSource.searchTermToKey property + +How to simplify words, to convert them into simplified search keys This often involves removing accents, lowercasing, etc. + +**Signature:** + +```typescript +readonly searchTermToKey?: WordformToKeySpec; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.sources.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.sources.md new file mode 100644 index 00000000000..6d11c0d372f --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.sources.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) > [sources](./kmc-model.lexicalmodelsource.sources.md) + +## LexicalModelSource.sources property + +**Signature:** + +```typescript +readonly sources: Array; +``` diff --git a/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.wordbreaker.md b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.wordbreaker.md new file mode 100644 index 00000000000..c8f9053d263 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.lexicalmodelsource.wordbreaker.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [LexicalModelSource](./kmc-model.lexicalmodelsource.md) > [wordBreaker](./kmc-model.lexicalmodelsource.wordbreaker.md) + +## LexicalModelSource.wordBreaker property + +Which word breaker to use. Choose from: + +- 'default' -- breaks according to Unicode UAX \#29 §4.1 Default Word Boundary Specification, which works well for \*most\* languages. - 'ascii' -- a very simple word breaker, for demonstration purposes only. - word breaking function -- provide your own function that breaks words. - class-based word-breaker - may be supported in the future. + +**Signature:** + +```typescript +readonly wordBreaker?: WordBreakerSpec | SimpleWordBreakerSpec; +``` diff --git a/developer/docs/help/reference/api/kmc-model.md b/developer/docs/help/reference/api/kmc-model.md new file mode 100644 index 00000000000..fa0d8688436 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.md @@ -0,0 +1,30 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) + +## kmc-model package + +## Classes + +| Class | Description | +| --- | --- | +| [LexicalModelCompiler](./kmc-model.lexicalmodelcompiler.md) | Compiles a .model.ts file to a .model.js. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [LexicalModelCompilerArtifacts](./kmc-model.lexicalmodelcompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation | +| [LexicalModelCompilerResult](./kmc-model.lexicalmodelcompilerresult.md) | Build artifacts from the lexical model compiler | +| [LexicalModelSource](./kmc-model.lexicalmodelsource.md) | Base interface for a lexical model source definition | +| [WordBreakerSpec](./kmc-model.wordbreakerspec.md) |

Keyman 14.0+ word breaker specification:

Can support all old word breaking specification, but can also be extended with options.

14.0

| + +## Type Aliases + +| Type Alias | Description | +| --- | --- | +| [CasedWordformToKeySpec](./kmc-model.casedwordformtokeyspec.md) | Simplifies input text to facilitate finding entries within a lexical model's lexicon, using the model's applyCasing function to assist in the keying process. 14.0 | +| [SimpleWordBreakerSpec](./kmc-model.simplewordbreakerspec.md) |

Simplified word breaker specification.

11.0

| +| [SimpleWordformToKeySpec](./kmc-model.simplewordformtokeyspec.md) | Simplifies input text to facilitate finding entries within a lexical model's lexicon. 11.0 | +| [WordformToKeySpec](./kmc-model.wordformtokeyspec.md) | Simplifies input text to facilitate finding entries within a lexical model's lexicon. | + diff --git a/developer/docs/help/reference/api/kmc-model.simplewordbreakerspec.md b/developer/docs/help/reference/api/kmc-model.simplewordbreakerspec.md new file mode 100644 index 00000000000..420a61218ea --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.simplewordbreakerspec.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [SimpleWordBreakerSpec](./kmc-model.simplewordbreakerspec.md) + +## SimpleWordBreakerSpec type + +Simplified word breaker specification. + + 11.0 + +**Signature:** + +```typescript +export type SimpleWordBreakerSpec = 'default' | 'ascii' | WordBreakingFunction; +``` diff --git a/developer/docs/help/reference/api/kmc-model.simplewordformtokeyspec.md b/developer/docs/help/reference/api/kmc-model.simplewordformtokeyspec.md new file mode 100644 index 00000000000..65e1cfb656d --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.simplewordformtokeyspec.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [SimpleWordformToKeySpec](./kmc-model.simplewordformtokeyspec.md) + +## SimpleWordformToKeySpec type + +Simplifies input text to facilitate finding entries within a lexical model's lexicon. 11.0 + +**Signature:** + +```typescript +export type SimpleWordformToKeySpec = (term: string) => string; +``` diff --git a/developer/docs/help/reference/api/kmc-model.wordbreakerspec.joinwordsat.md b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.joinwordsat.md new file mode 100644 index 00000000000..8a5c7d7e683 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.joinwordsat.md @@ -0,0 +1,17 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [WordBreakerSpec](./kmc-model.wordbreakerspec.md) > [joinWordsAt](./kmc-model.wordbreakerspec.joinwordsat.md) + +## WordBreakerSpec.joinWordsAt property + +If present, joins words that were split by the word breaker together at the given strings. e.g., + +joinWordsAt: \['-'\] // to keep hyphenated items together + + 14.0 + +**Signature:** + +```typescript +readonly joinWordsAt?: string[]; +``` diff --git a/developer/docs/help/reference/api/kmc-model.wordbreakerspec.md b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.md new file mode 100644 index 00000000000..564f4ee8d57 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.md @@ -0,0 +1,26 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [WordBreakerSpec](./kmc-model.wordbreakerspec.md) + +## WordBreakerSpec interface + +Keyman 14.0+ word breaker specification: + +Can support all old word breaking specification, but can also be extended with options. + + 14.0 + +**Signature:** + +```typescript +export interface WordBreakerSpec +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [joinWordsAt?](./kmc-model.wordbreakerspec.joinwordsat.md) | readonly | string\[\] |

_(Optional)_ If present, joins words that were split by the word breaker together at the given strings. e.g.,

joinWordsAt: \['-'\] // to keep hyphenated items together

14.0

| +| [overrideScriptDefaults?](./kmc-model.wordbreakerspec.overridescriptdefaults.md) | readonly | OverrideScriptDefaults |

_(Optional)_ Overrides word splitting behaviour for certain scripts. For example, specifing that spaces break words in certain South-East Asian scripts that otherwise do not use spaces.

14.0

| +| [use](./kmc-model.wordbreakerspec.use.md) | readonly | [SimpleWordBreakerSpec](./kmc-model.simplewordbreakerspec.md) | | + diff --git a/developer/docs/help/reference/api/kmc-model.wordbreakerspec.overridescriptdefaults.md b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.overridescriptdefaults.md new file mode 100644 index 00000000000..4c21721cc9c --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.overridescriptdefaults.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [WordBreakerSpec](./kmc-model.wordbreakerspec.md) > [overrideScriptDefaults](./kmc-model.wordbreakerspec.overridescriptdefaults.md) + +## WordBreakerSpec.overrideScriptDefaults property + +Overrides word splitting behaviour for certain scripts. For example, specifing that spaces break words in certain South-East Asian scripts that otherwise do not use spaces. + + 14.0 + +**Signature:** + +```typescript +readonly overrideScriptDefaults?: OverrideScriptDefaults; +``` diff --git a/developer/docs/help/reference/api/kmc-model.wordbreakerspec.use.md b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.use.md new file mode 100644 index 00000000000..5e3844226ad --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.wordbreakerspec.use.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [WordBreakerSpec](./kmc-model.wordbreakerspec.md) > [use](./kmc-model.wordbreakerspec.use.md) + +## WordBreakerSpec.use property + +**Signature:** + +```typescript +readonly use: SimpleWordBreakerSpec; +``` diff --git a/developer/docs/help/reference/api/kmc-model.wordformtokeyspec.md b/developer/docs/help/reference/api/kmc-model.wordformtokeyspec.md new file mode 100644 index 00000000000..5a2b4951a3e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-model.wordformtokeyspec.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-model](./kmc-model.md) > [WordformToKeySpec](./kmc-model.wordformtokeyspec.md) + +## WordformToKeySpec type + +Simplifies input text to facilitate finding entries within a lexical model's lexicon. + +**Signature:** + +```typescript +export type WordformToKeySpec = SimpleWordformToKeySpec | CasedWordformToKeySpec; +``` +**References:** [SimpleWordformToKeySpec](./kmc-model.simplewordformtokeyspec.md), [CasedWordformToKeySpec](./kmc-model.casedwordformtokeyspec.md) + diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompiler.init.md b/developer/docs/help/reference/api/kmc-package.kmpcompiler.init.md new file mode 100644 index 00000000000..c1010a494ee --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompiler.init.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompiler](./kmc-package.kmpcompiler.md) > [init](./kmc-package.kmpcompiler.init.md) + +## KmpCompiler.init() method + +Initialize the compiler. Copies options. + +**Signature:** + +```typescript +init(callbacks: CompilerCallbacks, options: KmpCompilerOptions): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | Callbacks for external interfaces, including message reporting and file io | +| options | [KmpCompilerOptions](./kmc-package.kmpcompileroptions.md) | Compiler options | + +**Returns:** + +Promise<boolean> + +false if initialization fails + diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompiler.md b/developer/docs/help/reference/api/kmc-package.kmpcompiler.md new file mode 100644 index 00000000000..f23b5025fa0 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompiler.md @@ -0,0 +1,29 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompiler](./kmc-package.kmpcompiler.md) + +## KmpCompiler class + +Compiles a .kps file to a .kmp archive. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. + +**Signature:** + +```typescript +export declare class KmpCompiler implements KeymanCompiler +``` +**Implements:** KeymanCompiler + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [normalizePath](./kmc-package.kmpcompiler.normalizepath.md) | readonly | (path: string) => string | | + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [init(callbacks, options)](./kmc-package.kmpcompiler.init.md) | | Initialize the compiler. Copies options. | +| [run(inputFilename, outputFilename)](./kmc-package.kmpcompiler.run.md) | | Compiles a .kps file to .kmp file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [KmpCompiler.init()](./kmc-package.kmpcompiler.init.md) function to read any input files by disk. | +| [write(artifacts)](./kmc-package.kmpcompiler.write.md) | |

Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include:

- .kmp file - binary keyboard package used by Keyman on desktop and touch platforms

| + diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompiler.normalizepath.md b/developer/docs/help/reference/api/kmc-package.kmpcompiler.normalizepath.md new file mode 100644 index 00000000000..cf754363740 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompiler.normalizepath.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompiler](./kmc-package.kmpcompiler.md) > [normalizePath](./kmc-package.kmpcompiler.normalizepath.md) + +## KmpCompiler.normalizePath property + +**Signature:** + +```typescript +readonly normalizePath: (path: string) => string; +``` diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompiler.run.md b/developer/docs/help/reference/api/kmc-package.kmpcompiler.run.md new file mode 100644 index 00000000000..4b584dd7979 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompiler.run.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompiler](./kmc-package.kmpcompiler.md) > [run](./kmc-package.kmpcompiler.run.md) + +## KmpCompiler.run() method + +Compiles a .kps file to .kmp file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [KmpCompiler.init()](./kmc-package.kmpcompiler.init.md) function to read any input files by disk. + +**Signature:** + +```typescript +run(inputFilename: string, outputFilename?: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| inputFilename | string | | +| outputFilename | string | _(Optional)_ | + +**Returns:** + +Promise<[KmpCompilerResult](./kmc-package.kmpcompilerresult.md)> + +Binary artifacts on success, null on failure. + diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompiler.write.md b/developer/docs/help/reference/api/kmc-package.kmpcompiler.write.md new file mode 100644 index 00000000000..c4878571df5 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompiler.write.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompiler](./kmc-package.kmpcompiler.md) > [write](./kmc-package.kmpcompiler.write.md) + +## KmpCompiler.write() method + +Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include: + +- .kmp file - binary keyboard package used by Keyman on desktop and touch platforms + +**Signature:** + +```typescript +write(artifacts: KmpCompilerArtifacts): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| artifacts | [KmpCompilerArtifacts](./kmc-package.kmpcompilerartifacts.md) | object containing artifact binary data to write out | + +**Returns:** + +Promise<boolean> + +true on success + diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompilerartifacts.kmp.md b/developer/docs/help/reference/api/kmc-package.kmpcompilerartifacts.kmp.md new file mode 100644 index 00000000000..612daab90f5 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompilerartifacts.kmp.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompilerArtifacts](./kmc-package.kmpcompilerartifacts.md) > [kmp](./kmc-package.kmpcompilerartifacts.kmp.md) + +## KmpCompilerArtifacts.kmp property + +Binary keyboard package filedata and filename - installable into Keyman desktop and mobile projects + +**Signature:** + +```typescript +kmp: KeymanCompilerArtifact; +``` diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompilerartifacts.md b/developer/docs/help/reference/api/kmc-package.kmpcompilerartifacts.md new file mode 100644 index 00000000000..1a7f6f883ea --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompilerartifacts.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompilerArtifacts](./kmc-package.kmpcompilerartifacts.md) + +## KmpCompilerArtifacts interface + +Internal in-memory build artifacts from a successful compilation + +**Signature:** + +```typescript +export interface KmpCompilerArtifacts extends KeymanCompilerArtifacts +``` +**Extends:** KeymanCompilerArtifacts + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [kmp](./kmc-package.kmpcompilerartifacts.kmp.md) | | KeymanCompilerArtifact | Binary keyboard package filedata and filename - installable into Keyman desktop and mobile projects | + diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompileroptions.md b/developer/docs/help/reference/api/kmc-package.kmpcompileroptions.md new file mode 100644 index 00000000000..763eb040004 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompileroptions.md @@ -0,0 +1,15 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompilerOptions](./kmc-package.kmpcompileroptions.md) + +## KmpCompilerOptions interface + +Options for the .kps compiler + +**Signature:** + +```typescript +export interface KmpCompilerOptions extends CompilerOptions +``` +**Extends:** CompilerOptions + diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompilerresult.artifacts.md b/developer/docs/help/reference/api/kmc-package.kmpcompilerresult.artifacts.md new file mode 100644 index 00000000000..4905af4ac7c --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompilerresult.artifacts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompilerResult](./kmc-package.kmpcompilerresult.md) > [artifacts](./kmc-package.kmpcompilerresult.artifacts.md) + +## KmpCompilerResult.artifacts property + +Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [KmpCompiler.write()](./kmc-package.kmpcompiler.write.md) + +**Signature:** + +```typescript +artifacts: KmpCompilerArtifacts; +``` diff --git a/developer/docs/help/reference/api/kmc-package.kmpcompilerresult.md b/developer/docs/help/reference/api/kmc-package.kmpcompilerresult.md new file mode 100644 index 00000000000..3371a01f9ef --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.kmpcompilerresult.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [KmpCompilerResult](./kmc-package.kmpcompilerresult.md) + +## KmpCompilerResult interface + +Build artifacts from the .kps compiler + +**Signature:** + +```typescript +export interface KmpCompilerResult extends KeymanCompilerResult +``` +**Extends:** KeymanCompilerResult + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [artifacts](./kmc-package.kmpcompilerresult.artifacts.md) | | [KmpCompilerArtifacts](./kmc-package.kmpcompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [KmpCompiler.write()](./kmc-package.kmpcompiler.write.md) | + diff --git a/developer/docs/help/reference/api/kmc-package.md b/developer/docs/help/reference/api/kmc-package.md new file mode 100644 index 00000000000..53ab00c1907 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.md @@ -0,0 +1,25 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) + +## kmc-package package + +## Classes + +| Class | Description | +| --- | --- | +| [KmpCompiler](./kmc-package.kmpcompiler.md) | Compiles a .kps file to a .kmp archive. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. | +| [WindowsPackageInstallerCompiler](./kmc-package.windowspackageinstallercompiler.md) | Compiles a .kps file to a .exe installer. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. | + +## Interfaces + +| Interface | Description | +| --- | --- | +| [KmpCompilerArtifacts](./kmc-package.kmpcompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation | +| [KmpCompilerOptions](./kmc-package.kmpcompileroptions.md) | Options for the .kps compiler | +| [KmpCompilerResult](./kmc-package.kmpcompilerresult.md) | Build artifacts from the .kps compiler | +| [WindowsPackageInstallerCompilerArtifacts](./kmc-package.windowspackageinstallercompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation | +| [WindowsPackageInstallerCompilerOptions](./kmc-package.windowspackageinstallercompileroptions.md) | Options for the .kps Windows package installer compiler | +| [WindowsPackageInstallerCompilerResult](./kmc-package.windowspackageinstallercompilerresult.md) | Build artifacts from the .kps Windows package installer compiler | +| [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) | Sources and metadata for the Windows package installer compiler | + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.init.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.init.md new file mode 100644 index 00000000000..160d3265414 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.init.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompiler](./kmc-package.windowspackageinstallercompiler.md) > [init](./kmc-package.windowspackageinstallercompiler.init.md) + +## WindowsPackageInstallerCompiler.init() method + +Initialize the compiler. Copies options. + +**Signature:** + +```typescript +init(callbacks: CompilerCallbacks, options: WindowsPackageInstallerCompilerOptions): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| callbacks | CompilerCallbacks | Callbacks for external interfaces, including message reporting and file io | +| options | [WindowsPackageInstallerCompilerOptions](./kmc-package.windowspackageinstallercompileroptions.md) | Compiler options | + +**Returns:** + +Promise<boolean> + +false if initialization fails + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.md new file mode 100644 index 00000000000..c691fece706 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.md @@ -0,0 +1,23 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompiler](./kmc-package.windowspackageinstallercompiler.md) + +## WindowsPackageInstallerCompiler class + +Compiles a .kps file to a .exe installer. The compiler does not read or write from filesystem or network directly, but relies on callbacks for all external IO. + +**Signature:** + +```typescript +export declare class WindowsPackageInstallerCompiler implements KeymanCompiler +``` +**Implements:** KeymanCompiler + +## Methods + +| Method | Modifiers | Description | +| --- | --- | --- | +| [init(callbacks, options)](./kmc-package.windowspackageinstallercompiler.init.md) | | Initialize the compiler. Copies options. | +| [run(inputFilename, outputFilename)](./kmc-package.windowspackageinstallercompiler.run.md) | | Compiles a .kps file to .exe Windows package installer file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [WindowsPackageInstallerCompiler.init()](./kmc-package.windowspackageinstallercompiler.init.md) function to read any input files by disk. | +| [write(artifacts)](./kmc-package.windowspackageinstallercompiler.write.md) | |

Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include:

- .exe file - binary Windows package installer executable file

| + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.run.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.run.md new file mode 100644 index 00000000000..1e79d3d9124 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.run.md @@ -0,0 +1,27 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompiler](./kmc-package.windowspackageinstallercompiler.md) > [run](./kmc-package.windowspackageinstallercompiler.run.md) + +## WindowsPackageInstallerCompiler.run() method + +Compiles a .kps file to .exe Windows package installer file. Returns an object containing binary artifacts on success. The files are passed in by name, and the compiler will use callbacks as passed to the [WindowsPackageInstallerCompiler.init()](./kmc-package.windowspackageinstallercompiler.init.md) function to read any input files by disk. + +**Signature:** + +```typescript +run(inputFilename: string, outputFilename?: string): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| inputFilename | string | | +| outputFilename | string | _(Optional)_ | + +**Returns:** + +Promise<[WindowsPackageInstallerCompilerResult](./kmc-package.windowspackageinstallercompilerresult.md)> + +Binary artifacts on success, null on failure. + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.write.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.write.md new file mode 100644 index 00000000000..487696c5292 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompiler.write.md @@ -0,0 +1,28 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompiler](./kmc-package.windowspackageinstallercompiler.md) > [write](./kmc-package.windowspackageinstallercompiler.write.md) + +## WindowsPackageInstallerCompiler.write() method + +Write artifacts from a successful compile to disk, via callbacks methods. The artifacts written may include: + +- .exe file - binary Windows package installer executable file + +**Signature:** + +```typescript +write(artifacts: WindowsPackageInstallerCompilerArtifacts): Promise; +``` + +## Parameters + +| Parameter | Type | Description | +| --- | --- | --- | +| artifacts | [WindowsPackageInstallerCompilerArtifacts](./kmc-package.windowspackageinstallercompilerartifacts.md) | object containing artifact binary data to write out | + +**Returns:** + +Promise<boolean> + +true on success + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerartifacts.exe.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerartifacts.exe.md new file mode 100644 index 00000000000..1fd3e8e522e --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerartifacts.exe.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompilerArtifacts](./kmc-package.windowspackageinstallercompilerartifacts.md) > [exe](./kmc-package.windowspackageinstallercompilerartifacts.exe.md) + +## WindowsPackageInstallerCompilerArtifacts.exe property + +Binary package installer filedata and filename - installable into Keyman desktop and mobile projects + +**Signature:** + +```typescript +exe: KeymanCompilerArtifact; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerartifacts.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerartifacts.md new file mode 100644 index 00000000000..2a21d3a3116 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerartifacts.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompilerArtifacts](./kmc-package.windowspackageinstallercompilerartifacts.md) + +## WindowsPackageInstallerCompilerArtifacts interface + +Internal in-memory build artifacts from a successful compilation + +**Signature:** + +```typescript +export interface WindowsPackageInstallerCompilerArtifacts extends KeymanCompilerArtifacts +``` +**Extends:** KeymanCompilerArtifacts + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [exe](./kmc-package.windowspackageinstallercompilerartifacts.exe.md) | | KeymanCompilerArtifact | Binary package installer filedata and filename - installable into Keyman desktop and mobile projects | + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompileroptions.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompileroptions.md new file mode 100644 index 00000000000..b0aed5a5052 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompileroptions.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompilerOptions](./kmc-package.windowspackageinstallercompileroptions.md) + +## WindowsPackageInstallerCompilerOptions interface + +Options for the .kps Windows package installer compiler + +**Signature:** + +```typescript +export interface WindowsPackageInstallerCompilerOptions extends KmpCompilerOptions +``` +**Extends:** [KmpCompilerOptions](./kmc-package.kmpcompileroptions.md) + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [sources](./kmc-package.windowspackageinstallercompileroptions.sources.md) | | [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) | Sources and metadata for the Windows package installer compiler | + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompileroptions.sources.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompileroptions.sources.md new file mode 100644 index 00000000000..de1b74dbd7a --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompileroptions.sources.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompilerOptions](./kmc-package.windowspackageinstallercompileroptions.md) > [sources](./kmc-package.windowspackageinstallercompileroptions.sources.md) + +## WindowsPackageInstallerCompilerOptions.sources property + +Sources and metadata for the Windows package installer compiler + +**Signature:** + +```typescript +sources: WindowsPackageInstallerSources; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerresult.artifacts.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerresult.artifacts.md new file mode 100644 index 00000000000..d1ea7e4a5a3 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerresult.artifacts.md @@ -0,0 +1,13 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompilerResult](./kmc-package.windowspackageinstallercompilerresult.md) > [artifacts](./kmc-package.windowspackageinstallercompilerresult.artifacts.md) + +## WindowsPackageInstallerCompilerResult.artifacts property + +Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [WindowsPackageInstallerCompiler.write()](./kmc-package.windowspackageinstallercompiler.write.md) + +**Signature:** + +```typescript +artifacts: WindowsPackageInstallerCompilerArtifacts; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerresult.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerresult.md new file mode 100644 index 00000000000..de9701b148c --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallercompilerresult.md @@ -0,0 +1,21 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerCompilerResult](./kmc-package.windowspackageinstallercompilerresult.md) + +## WindowsPackageInstallerCompilerResult interface + +Build artifacts from the .kps Windows package installer compiler + +**Signature:** + +```typescript +export interface WindowsPackageInstallerCompilerResult extends KeymanCompilerResult +``` +**Extends:** KeymanCompilerResult + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [artifacts](./kmc-package.windowspackageinstallercompilerresult.artifacts.md) | | [WindowsPackageInstallerCompilerArtifacts](./kmc-package.windowspackageinstallercompilerartifacts.md) | Internal in-memory build artifacts from a successful compilation. Caller can write these to disk with [WindowsPackageInstallerCompiler.write()](./kmc-package.windowspackageinstallercompiler.write.md) | + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.appname.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.appname.md new file mode 100644 index 00000000000..ca6069c3802 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.appname.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) > [appName](./kmc-package.windowspackageinstallersources.appname.md) + +## WindowsPackageInstallerSources.appName property + +**Signature:** + +```typescript +appName?: string; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.licensefilename.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.licensefilename.md new file mode 100644 index 00000000000..d96a5a29757 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.licensefilename.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) > [licenseFilename](./kmc-package.windowspackageinstallersources.licensefilename.md) + +## WindowsPackageInstallerSources.licenseFilename property + +**Signature:** + +```typescript +licenseFilename: string; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.md new file mode 100644 index 00000000000..0130266bad5 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.md @@ -0,0 +1,26 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) + +## WindowsPackageInstallerSources interface + +Sources and metadata for the Windows package installer compiler + +**Signature:** + +```typescript +export interface WindowsPackageInstallerSources +``` + +## Properties + +| Property | Modifiers | Type | Description | +| --- | --- | --- | --- | +| [appName?](./kmc-package.windowspackageinstallersources.appname.md) | | string | _(Optional)_ | +| [licenseFilename](./kmc-package.windowspackageinstallersources.licensefilename.md) | | string | | +| [msiFilename](./kmc-package.windowspackageinstallersources.msifilename.md) | | string | | +| [setupExeFilename](./kmc-package.windowspackageinstallersources.setupexefilename.md) | | string | | +| [startDisabled](./kmc-package.windowspackageinstallersources.startdisabled.md) | | boolean | | +| [startWithConfiguration](./kmc-package.windowspackageinstallersources.startwithconfiguration.md) | | boolean | | +| [titleImageFilename?](./kmc-package.windowspackageinstallersources.titleimagefilename.md) | | string | _(Optional)_ | + diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.msifilename.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.msifilename.md new file mode 100644 index 00000000000..f6cc53efbc1 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.msifilename.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) > [msiFilename](./kmc-package.windowspackageinstallersources.msifilename.md) + +## WindowsPackageInstallerSources.msiFilename property + +**Signature:** + +```typescript +msiFilename: string; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.setupexefilename.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.setupexefilename.md new file mode 100644 index 00000000000..8e00113ffa5 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.setupexefilename.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) > [setupExeFilename](./kmc-package.windowspackageinstallersources.setupexefilename.md) + +## WindowsPackageInstallerSources.setupExeFilename property + +**Signature:** + +```typescript +setupExeFilename: string; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.startdisabled.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.startdisabled.md new file mode 100644 index 00000000000..89ba631c164 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.startdisabled.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) > [startDisabled](./kmc-package.windowspackageinstallersources.startdisabled.md) + +## WindowsPackageInstallerSources.startDisabled property + +**Signature:** + +```typescript +startDisabled: boolean; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.startwithconfiguration.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.startwithconfiguration.md new file mode 100644 index 00000000000..6ec14bae7a6 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.startwithconfiguration.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) > [startWithConfiguration](./kmc-package.windowspackageinstallersources.startwithconfiguration.md) + +## WindowsPackageInstallerSources.startWithConfiguration property + +**Signature:** + +```typescript +startWithConfiguration: boolean; +``` diff --git a/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.titleimagefilename.md b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.titleimagefilename.md new file mode 100644 index 00000000000..c663ba44d06 --- /dev/null +++ b/developer/docs/help/reference/api/kmc-package.windowspackageinstallersources.titleimagefilename.md @@ -0,0 +1,11 @@ + + +[Home](./index.md) > [@keymanapp/kmc-package](./kmc-package.md) > [WindowsPackageInstallerSources](./kmc-package.windowspackageinstallersources.md) > [titleImageFilename](./kmc-package.windowspackageinstallersources.titleimagefilename.md) + +## WindowsPackageInstallerSources.titleImageFilename property + +**Signature:** + +```typescript +titleImageFilename?: string; +``` diff --git a/developer/docs/help/reference/bcp-47.md b/developer/docs/help/reference/bcp-47.md new file mode 100644 index 00000000000..f5c8a49539e --- /dev/null +++ b/developer/docs/help/reference/bcp-47.md @@ -0,0 +1,113 @@ +--- +title: BCP 47 language tags +--- + +Packages and lexical models may reference a [BCP 47 language tag][1]. A BCP +47 tag is a standard way of referencing a language, used widely in the computer +industry. Keyman uses BCP 47 tags in a number of areas, including: + +* providing language metadata about installed keyboards to the operating system + and to applications, so that, for example, spell checking has the correct + language, through [package metadata](../guides/distribute/) +* [linking lexical models to keyboard layouts](../guides/lexical-models/) +* facilitating searches for keyboards and lexical models on the Keyman site, + through a [.keyboard_info file](/developer/cloud/keyboard_info) + +A BCP 47 language tag is made up of multiple subtags. There are many possible +subtags, but only three types are currently used in most places in Keyman +Developer: + +* [language subtag](#toc-the-language-subtag) +* [script subtag](#toc-the-script-subtag) +* [region subtag](#toc-the-region-subtag) + +BCP 47 tags are case insensitive, but there are conventions for casing which you +should use for readability; see the subtag descriptions for details. + +The following are all examples of valid BCP 47 tags: + +* `en`: English +* `en-US`: English, in United States +* `km-Khmr-KH`: Khmer, written in the Khmer script, in Cambodia +* `km-fonipa`: Khmer, transcribed in IPA + +### The language subtag + +The only required option is the Language subtag, which is an [ISO 639-1][2] or +[ISO 639-3][3] code. + +ISO 639-1 tags are a two-letter code. ISO 639-3 tags are a three-letter code. +First, try to find your language on the list of two-letter ISO 639-1 codes. +[This Wikipedia page][4] lists all of the two-letter codes. + +If you can't find a two-letter code, you'll need to find the closest +three-letter code. You can use [Glottolog][5] to search for your language, and +it will give you an appropriate code. In this example, I searched Glottolog for +“[Saanich][6]” (name of the First Nations that speak SENĆOŦEN) and found `str` +as the code for all Straits Salish languages. + +The Language subtag is conventionally written in lower case. + +The next two subtags are **optional**, however, they allow you to be more +specific about your language. + +### The script subtag + +The Script subtag allows you to specify the writing system used in your language +model or keyboard. If your language only uses one writing system, omit the +Script subtag. + +Otherwise, in cases where a language can be written in many different writing +systems, you can choose the four letter [ISO 15924][7] script tag that your +keyboard or lexical model produces. + +For example, Plains Cree can either be written in _standard Roman orthography_, +a **Latin** derived script, or it can be written in _syllabics_, which is part +of the **Canadian Aboriginal syllabics** family of writing systems. If I wrote a +keyboard or lexical model that produced syllabics, I would choose `Cans`, as +that is the **ISO 15924** tag for Canadian Aboriginal syllabics. + +The Script subtag is conventionally written in title case - first letter +capitalized. + +### The region subtag + +The Region subtag allows you to specify the region your language or dialect is +spoken in. If your language is only spoken in one region, omit the Region +subtag. + +Otherwise, some languages vary between different regions and countries. In our +example, SENĆOŦEN describes the language that covers entire W̱SÁNEĆ region, so +this field may be left blank. + +However, large languages, like English, Spanish, or French have quite different +vocabulary and even different grammatical rules from region to region and +country to country. For example, the variety of Spanish spoken in Spain +regularly uses words that are uncommon or even vulgar in both in Mexico, and in +Latin America. Additionally, regions may have vocabulary that doesn't exist in +the other regions where the language is spoken. + +If I were working with a language specific to one country, I would use the [ISO +3166-1 alpha-2][8] country code for the region subtag. For example, `ES` for +Spain or `MX` for Mexico. + +However, if I were working with Latin American Spanish (a group of countries), I +would need to specify Latin America's [UN M49][9] region code. For Latin +America, its code is `419`. My lexical model would not suggest words that are +common in Spain, but vulgar in Latin America, however it would predict words +like "pupupsas" and "chuchitos", which are words that are uncommon in both Spain +and Mexico. + +Another common UN M49 region code is `001` for the whole world. + +Alphabetic region subtags are conventionally written in upper case. + +[1]: https://en.wikipedia.org/wiki/IETF_language_tag +[2]: https://en.wikipedia.org/wiki/ISO_639-1 +[3]: https://en.wikipedia.org/wiki/ISO_639-3 +[4]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes +[5]: https://glottolog.org/glottolog/language +[6]: https://glottolog.org/resource/languoid/id/saan1246 +[7]: https://en.wikipedia.org/wiki/ISO_15924 +[8]: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 +[9]: https://en.wikipedia.org/wiki/UN_M49 diff --git a/developer/docs/help/reference/editor-themes.md b/developer/docs/help/reference/editor-themes.md new file mode 100644 index 00000000000..3a624c923fc --- /dev/null +++ b/developer/docs/help/reference/editor-themes.md @@ -0,0 +1,46 @@ +--- +title: Custom Editor Themes +--- + +Keyman Developer embeds the Monaco open source text editor. The +highlighting and styles for the text editor are customisable with a JSON +file configured in the [Options dialog](../context/options). The JSON +file must be a valid [Monaco theme](https://microsoft.github.io/monaco-editor/playground.html#customizing-the-appearence-tokens-and-colors) +(passed as second parameter to `monaco.editor.defineTheme`). + +## Example + +```js +{ + "base": "vs-dark", + "inherit": true, + "rules": [ + { "token": "comment", "foreground": "ffa500", "background": "303030", "fontStyle": "italic underline" }, + { "token": "comment.js", "foreground": "008800", "fontStyle": "bold" }, + { "token": "comment.css", "foreground": "0000ff", "fontStyle": "bold", "inherit": false, "background": "808080" } + ] +} +``` + +## Keyman keyboard language tokens + +The Keyman keyboard language highlighting uses the following token +names: + +| Token | Source Element | +|----------------|-------------------------------------------------| +| annotation | System store names | +| bracket | | +| comment | Comments | +| identifier | Store and Group names | +| invalid | Invalid code | +| keyword | Keywords such as `begin`, `any` | +| number | Decimal character codes, deprecated, e.g. `d65` | +| number.hex | Unicode character codes, e.g. `U+1234` | +| number.octal | Character codes expressed in octal | +| operator | `+`, `>` and other operators | +| string | Strings | +| string.invalid | Unterminated strings | +| string.quote | `'` and `"` characters | +| tag | Virtual keys | +| white | | \ No newline at end of file diff --git a/developer/docs/help/reference/errors/index.md b/developer/docs/help/reference/errors/index.md new file mode 100644 index 00000000000..c5e8acc3680 --- /dev/null +++ b/developer/docs/help/reference/errors/index.md @@ -0,0 +1,4 @@ +--- +title: Errors +redirect: ../messages +--- diff --git a/developer/docs/help/reference/file-layout.md b/developer/docs/help/reference/file-layout.md new file mode 100644 index 00000000000..e466d7c05b0 --- /dev/null +++ b/developer/docs/help/reference/file-layout.md @@ -0,0 +1,131 @@ +--- +title: Keyman Developer structure for standard keyboard source file folders +--- + +Keyman Developer generates keyboard project files in a standard layout. [Keyman +Cloud](/developer/keyboards/) uses this file layout. It is highly recommended to +adhere to this file layout. + +## About the source files + +When you create and build a project, you'll end up with the following structure. +Some files may be not be present, depending on the targets you specify. + +```plain +sample +│ HISTORY.md +│ LICENSE.md +│ README.md +│ sample.kpj +│ sample.kpj.user +│ +├───build +| sample.keyboard_info +│ sample.kmp +│ sample.kmx +│ sample.kvk +│ sample.js +│ +└───source + readme.htm + sample.keyman-touch-layout + sample.kmn + sample.kps + sample.kvks + welcome.htm +``` + +Now that probably seems like a whole lot of files! But each file has a purpose. + +### Root folder + +`sample.kpj` +: The main project file. This contains references to all the components: + keyboards, models, and packages. + +`sample.kpj.user` + +: A user preference file. You can safely delete it at any time (you'll lose some + remembered settings from Keyman Developer, but nothing consequential) and it + should not be shared in a git repository. + +Some of these files are metadata files: information about your keyboard project +that will help you and others maintain your keyboard project in the future. + +For example, you may wish to make your keyboard project into a git repository +and push it an online public git host such as GitHub or GitLab. + +`README.md` +: Provides an introduction to the keyboard project when others stumble across + it. This file is in [Markdown](https://commonmark.org) format. + +`LICENSE.md` +: Explains the rights that you give to others (by default, it will be the MIT + license -- which is what we require for Keyman Cloud -- but you can change + that to any license you wish). This file is in + [Markdown](https://commonmark.org) format. + +`HISTORY.md` +: A place to record changes you make to the project over time. This file is in +[Markdown](https://commonmark.org) format. + +* Note: Keyman Developer 16 included a .keyboard_info file in this folder. This + file is no longer required, as the required metadata can be generated from + the keyboard source files instead. + +### Source folder + +The files in the source folder are more fully described in the Keyman Developer +[user guide](../..). + +[`source/sample.kmn`](/developer/language) +: Your keyboard source. It will compile to a `.kmx` (desktop targets) or a `.js` + (web / touch targets). + +[`source/sample.kps`](../reference/file-types/kps) +: The package source, which is used to create a compressed `.kmp` archive of the + files needed for distribution. + +`source/readme.htm` +: Introductory web page for end users of your keyboard, shown before they + install it, so they know what it is used for. + +`source/welcome.htm` +: A web page which describes how to use your keyboard, ideally with examples. + +[`source/sample.keyman-touch-layout`](../reference/file-types/keyman-touch-layout) +: This touch layout file description is in JSON format and most easily visually + edited with the Keyman Developer touch layout editor. This file is optional; + remove the reference from the keyboard source if you don't wish to use it. + +[`source/sample.kvks`](../reference/file-types/kvks): +: The on screen keyboard template for desktop platforms. It is in XML format and + most easily visually edited with the Keyman Developer on screen keyboard + editor. This file is optional; remove the reference from the keyboard source + if you don't wish to use it. + +### Build folder + +All of the files in the build folder are generated by the `kmc` compiler. None +of these files should be included in a git repository. + +`build/sample.keyboard_info` +: A [metadata file](/developer/cloud/keyboard_info) detailing the + keyboard's origin, version, requirements, and capabilities. + This file is built automatically by the kmc compiler. Please see + [.keyboard_info specification](/developer/cloud/keyboard_info) for more + details. + +`build/sample.kmp` +: The installable package file -- installable in all Keyman end user products + +`build/sample.js` +: The keyboard compiled to Javascript for use with KeymanWeb + +`build/sample.kvk` +: The compiled on screen keyboard. This intermediate file should not be + distributed; it is included in the compiled package. + +`build/sample.kmx` +: The compiled keyboard. This intermediate file should not be distributed; it is + included in the compiled package. diff --git a/developer/docs/help/reference/file-types/ico.md b/developer/docs/help/reference/file-types/ico.md new file mode 100644 index 00000000000..33331318781 --- /dev/null +++ b/developer/docs/help/reference/file-types/ico.md @@ -0,0 +1,20 @@ +--- +title: ICO files +--- + +Used by: +: Keyman Desktop, + Keyman Developer. + +Description: +: An .ICO file is a standard Windows + [icon](https://en.wikipedia.org/wiki/ICO_(file_format)) file. + +Details: +: An .ICO file is an icon which is used in the user interface to + indicate that the keyboard is active. See the [bitmap + store](../../../language/reference/bitmap) + +Distributed with keyboard: +: An .ICO file is associated with a specific keyboard. A generic + keyboard icon will be displayed if no icon is specified. diff --git a/developer/docs/help/reference/file-types/index.md b/developer/docs/help/reference/file-types/index.md new file mode 100644 index 00000000000..a4a47591bf4 --- /dev/null +++ b/developer/docs/help/reference/file-types/index.md @@ -0,0 +1,45 @@ +--- +title: File Types +--- + +[ICO files](ico) +: Keyboard icon files (binary file format) + +[KMN files](kmn) +: Keyboard source files (text file format) + +[KMP files](kmp) +: Keyboard package files (zip file format) + +[KMX files](kmx) +: Keyboard files (binary file format) + +[KPJ files](kpj) +: Keyman Developer Project files (XML file format) + +[KPS files](kps) +: Keyboard package source files (XML file format) + +[KVK files](kvk) +: Visual keyboard files (binary file format) + +[KVKS files](kvks) +: Visual keyboard source files (XML file format) + +[MODEL.JS files](model-js) +: Lexical model files (text file format) + +[MODEL.TS files](model-ts) +: Lexical model definition files (text file format) + +[TSV files](tsv) +: Word list source files (tab-separated values file format) + +[TTF files](ttf) +: TrueType font files (binary file format) + +[keyman-touch-layout files](keyman-touch-layout) +: Keyman touch layout source files (JSON file format) + +[XML files](xml) +: LDML keyboard source files (XML file format) diff --git a/developer/docs/help/reference/file-types/keyman-touch-layout.md b/developer/docs/help/reference/file-types/keyman-touch-layout.md new file mode 100644 index 00000000000..8fa7312808e --- /dev/null +++ b/developer/docs/help/reference/file-types/keyman-touch-layout.md @@ -0,0 +1,847 @@ +--- +title: keyman-touch-layout files +--- + +Used by: +: Keyman Developer. + +Description: +: A .keyman-touch-layout file is a JSON format file that describes a + keyboard layout for touch devices. + +Details: +: Referenced by a Keyman keyboard ([.KMN](kmn)) and compiles into the + target keyboard .js file. + +Distributed with keyboard: +: This is a keyboard development file and should not be distributed + with your package. + +--- + +## Sample JSON + +This cut-down sample shows just a single key, with the key cap "ឆ", and a single longpress key under it with the key cap "ឈ". + +```json +{ + "phone": { + "displayUnderlying": false, + "font": "Khmer Busra Kbd", + "fontsize": "0.8em", + "layer": [ { + "id": "default", + "row": [ { + "id": 1, + "key": [ { + "id": "K_Q", "text": "ឆ", + "sk": [ { "text": "ឈ", "id": "K_Q", "layer": "shift" } ] + } ] + } ] + } ] + } +} +``` + +
+ +
+ +## Key properties + +For each visual key, the appearance and behaviour is determined by a number of +properties: + +### Key code + +Each key must be given an identifying key code which is unique to the key layer. +Key codes by and large correspond to the virtual key codes used when creating a +keyboard program for a desktop keyboard, and should start with `K_`, for keys +mapped to standard Keyman virtual key names, e.g. `K_HYPHEN`, and `T_` or `U_` +for user-defined names, e.g. `T_ZZZ`. If keyboard rules exist matching the key +code in context, then the output from the key will be determined by the +processing of those rules. It is usually best to include explicit rules to +manage the output from each key, but if no rules matching the key code are +included in the keyboard program, and the key code matches the pattern +`U_xxxx[_yyyy...]` (where `xxxx` and +`yyyy` are 4 to 6-digit hex strings), then the Unicode characters +`U+xxxx` and `U+yyyy` will be output. As of Keyman 15, you +can use more than one Unicode character value in the id (earlier versions +permitted only one). The key code is always required, and a default code will +usually be generated automatically by Keyman Developer. + +- `K_xxxx` is used for a standard Keyman Desktop key name, e.g. + `K_W`, `K_ENTER`. You cannot make up your own `K_xxxx` names. + Many of the `K_` ids have overloaded output behaviour, for instance, if no + rule is matched for `K_W`, Keyman will output 'w' when it is touched. The + standard key names are listed in [Virtual Keys and Virtual Character + Keys](/developer/language/guide/virtual-keys "Virtual Keys and Virtual +Character Keys"). Typically, you would use only the "common" virtual key + codes. + +- `T_xxxx` is used for any user defined names, e.g. `T_SCHWA`. If you wanted + to use it, `T_ENTER` would also be valid. If no rule matches it, the key + will have no output behaviour. + +- `U_####[_####]` is used as a shortcut for a key that will output those + Unicode values, if no rule matches it. This is similar to the overloaded + behaviour for `K_` ids. Thus `####` must be valid Unicode characters. E.g. + `U_0259` would generate a schwa if no rule matches. It is still valid to + have a rule such as `+ [U_0259] > ...` + +As noted above, some `K_xxxx` codes emit characters, if no rule is defined. +There are also some codes which have special functions: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdentifierMeaning
`K_ENTER`Submit a form, or add a new line (multi-line); the key action may vary depending on the situation.
`K_BKSP`Delete back a single character. This key, if held down, will repeat. It is the only key code which triggers + repeat behavior.
`K_LOPT`Open the language menu (aka Globe key).
`K_ROPT`Hide the on screen keyboard.
`K_TAB`, `K_TABBACK`, `K_TABFWD`Move to next or previous element in a form. Note that these key functions are normally + implemented outside the touch layout, so should not typically be used. `K_TAB` will go to previous + element if used with the `shift` modifier.
+ +Any key can be used to switch keyboard layers (see +[`nextlayer`](#toc-nextlayer)), but the following layer-switching key codes have +been added for switching to some commonly used secondary layers. Note that these +keys have no specific meaning; you must still set the `nextlayer` property on +the key. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IdentifierMeaning
`K_NUMERALS`Switch to a numeric layer
`K_SYMBOLS`Switch to a symbol layer
`K_CURRENCIES`Switch to a currency layer
`K_SHIFTED`Switch to a shift layer
`K_ALTGR`Switch to a right-alt layer (desktop compatibility)
+ +### Key text + +The key text is simply the character (or characters) that you want to appear on +the key cap. This will usually be the same as the characters generated when the +key is touched, unless contextual rules are used to generate output according to +a multi-key sequence, as will be true for the GFF Amharic keyboard. Unicode +characters can be specified either as a string using a target font or using the +standard hex notation `\uxxxx`. This may be sometimes more convenient, for +example, for characters from an uninstalled font, or for diacritic characters +that do not render well alone. + +A number of special text labels are recognized as identifying special purpose +keys, such as Shift, Backspace, Enter, etc., for which icons are more +appropriately used than a text label. A special font including these icons is +included with Keyman and automatically embedded and used in any web page using +Keyman. The list of icons in the font will probably be extended in future, but +for now the following special labels are recognized: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Text StringKey CapKey Purpose
`*Shift*`Select Shift layer (inactive). Use on the Shift key to indicate that it switches to the shift layer.
`*Shifted*`Select Shift layer (active). Use on the Shift key on the shift layer to switch back to the default layer.
`*ShiftLock*`Switch to Caps layer (inactive). Not commonly used; generally double-tap on Shift key is used to access the + caps layer.
`*ShiftedLock*`Switch to Caps layer (active). Use on the Shift key on the caps layer to switch back to the default layer. +
`*Enter*` or Return or Enter key (shape determined by writing system direction)
`*LTREnter*`Return or Enter key (left-to-right script shape)
`*RTLEnter*`Return or Enter key (right-to-left script shape)
`*BkSp*` or Backspace key (shape determined by writing system direction)
`*LTRBkSp*`Backspace key (left-to-right script shape)
`*RTLBkSp*`Backspace key (right-to-left script shape)
`*Menu*`Globe key; display the language menu. Use on the `K_LOPT` key.
`*Hide*`Hide the on screen keyboard. Use on the `K_ROPT` key.
`*ABC*`Select alphabetic layer (Uppercase)
`*abc*`Select alphabetic layer (Lowercase)
`*123*`Select the numeric layer
`*Symbol*`Select the symbol layer
`*Currency*`Select the currency symbol layer
`*ZWNJ*` (iOS) or  (Android)Zero Width Non Joiner (shape determined by current platform)
`*ZWNJiOS*`Zero Width Non Joiner (iOS style shape)
`*ZWNJAndroid*`Zero Width Non Joiner (Android style shape)
`*ZWNJGeneric*`Zero Width Non Joiner (not platform-specific)
`*Sp*`Regular space
`*NBSp*`No-Break Space
`*NarNBSp*`Narrow No-Break Space
`*EnQ*`En Quad
`*EmQ*`Em Quad
`*EnSp*`En Space
`*EmSp*`Em Space
`*PunctSp*`Punctuation Space
`*ThSp*`Thin Space
`*HSp*`Hair Space
`*ZWSp*`Zero Width Space
`*ZWJ*`Zero Width Joiner
`*WJ*`Word Joiner
`*CGJ*`Combining Grapheme Joiner
`*LTRM*`Left-to-right Mark
`*RTLM*`Right-to-left Mark
`*SH*`Soft Hyphen
`*HTab*`Horizontal Tabulation
+ +The following additional symbols are also available, but intended for working +with legacy desktop layouts, and not recommended for general use: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Text StringKey CapKey Purpose
`*Tab*`Move to next input element in tab order
`*TabLeft*`Move to previous input element in tab order
`*Caps*`Select caps layer (legacy)
`*AltGr*`Select AltGr (Right-Alt) layer (desktop layout compatibility)
`*Alt*`Select Alt layer (desktop layout compatibility)
`*Ctrl*`Select Ctrl layer (desktop layout compatibility)
`*LAlt*`Select Left-Alt layer (desktop layout compatibility)
`*RAlt*`Select Right-Alt layer (desktop layout compatibility)
`*LCtrl*`Select Left-Ctrl layer (desktop layout compatibility)
`*RCtrl*`Select Right-Ctrl layer (desktop layout compatibility)
`*LAltCtrl*`Select Left-Alt-Ctrl layer (desktop layout compatibility)
`*RAltCtrl*`Select Right-Alt-Ctrl layer (desktop layout compatibility)
`*LAltCtrlShift*`Select Left-Alt-Ctrl-Shift layer (desktop layout compatibility)
`*RAltCtrlShift*`Select Right-Alt-Ctrl-Shift layer (desktop layout compatibility)
`*AltShift*`Select Alt-Shift layer (desktop layout compatibility)
`*CtrlShift*`Select Ctrl-Shift layer (desktop layout compatibility)
`*AltCtrlShift*`Select Alt-Ctrl-Shift layer (desktop layout compatibility)
`*LAltShift*`Select Left-Alt-Shift layer (desktop layout compatibility)
`*RAltShift*`Select Right-Alt-Shift layer (desktop layout compatibility)
`*LCtrlShift*`Select Left-Ctrl-Shift layer (desktop layout compatibility)
`*RCtrlShift*`Select Right-Ctrl-Shift layer (desktop layout compatibility)
+ +### Key type + +The general appearance of each key is determined by the key type, which is +selected (in Keyman Developer) from a drop-down list. While generally behavior +is not impacted by the key type, Spacer keys cannot be selected. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key TypeValueMeaning
Default`0`Any normal key that emits a character
Special`1`The frame keys such as Shift, Enter, BkSp.
Special (active)`2`A frame key which is currently active, such as the Shift key on the shift layer.
Deadkey`8`Does not impact behavior, but colors the key differently to indicate it has a special function, such as a + desktop-style deadkey.
Blank`9`A blank key, which may be used to maintain a layout shape. Usually colored differently. Does not impact + behavior.
Spacer`10`Does not render the key, but leaves a same-sized gap in its place. The key cannot be selected.
+ +The colour, shading and borders of each key type is actually set by a style +sheet which can be customized by the page developer. + +### font-family + +If a different font is required for a particular key text, the `font-family` +name can be specified. The font used to display icons for the special keys (as +mentioned above) does not need to be specified, as it will be automatically +applied to a key that uses any of the special key text labels. + +### font-size + +If a particular key cap text requires a different font size from the default for +the layout, it should be specified in em units. This can be helpful if a the key +text is either an unusually large character or, alternatively, a word or string +of several characters that would not normally fit on the key. + +### width + +The layout is scaled to fit the widest row of keys in the device width, assuming +a default key width of 100 units. Keys that are to be wider or narrower than the +default width should have width specified as a percentage of the default width. +For any key row that is narrower than the widest row, the width of the last key +in the row will be automatically increased to align the right hand side of the +key with the key with the right edge of the keyboard. However, where this is not +wanted, a "spacer" key can be inserted to leave a visible space instead. As +shown in the above layouts, where the spacer key appears on the designer screen +as a narrow key, but will not be visible in actual use. + +### pad + +Padding to the left of each key can be adjusted, and specified as a percentage +of the default key width. If not specified, a standard padding of 5% of the key +width is used between adjacent keys. + +### layer + +To simplify correspondence with desktop keyboards and avoid the need for using a +separate keyboard mapping program, touch layout keys can specify a desktop +keyboard layer that the keystroke should be interpreted as coming from. Layer +names of `shift`, `ctrl`, `alt`, `ctrlshift`, `altshift`, `ctrlalt` and +`ctrlaltshift` can be used to simulate use of the appropriate modifier keys when +processing rules. + +### nextlayer + +The virtual keys `K_SHIFT`, `K_CONTROL`, `K_MENU`, etc. are normally used to +switch to another key layer, which is implied by the key code. The left and +right variants of those key codes, and also additional layer-switching keys +mentioned above (`K_NUMERALS`, `K_SYMBOLS`, `K_CURRENCIES`, `K_ALTGR`) can also +be used to automatically switch to the appropriate key layer instead of +outputting a character. However, it is sometimes useful for a key to output a +character first, then switch to a new layer, for example, switching back to the +default keyboard layer after a punctuation key on a secondary layer had been +used. Specifying the `nextlayer` for a key allows a different key layer to be +selected automatically following the output of the key. Of course, that can be +manually overridden by switching to a different layer if preferred. + +Another way the `nextlayer` property can be used is for a non-standard layer +switching key. So, for example, for the GFF Amharic keyboard phone layout, +switching back to the base layer uses a `T_ALPHA` key code, in which `nextlayer` +is set as default. In this case, it is also necessary to add a rule to the +keyboard program: + +```keyman ++ [T_ALPHA] > nul +``` + +to ensure that the key's scan code is ignored by the keyboard mapping. + +When a key in a touch layout definition includes a **Next Layer** control, this +takes precedence over setting layer via the +[`layer`](/developer/language/reference/layer) store (as the **Next Layer** +control is applied once the rule has finished processing). + +### subkey + +Arrays of longpress 'subkeys' or pop-up keys can be defined for any key, and +will appear momentarily after the key is touched if not immediately released. +This provides a major advantage over physical desktop keyboards in that many +more keys can be made available from a single layer, without cluttering up the +basic appearance of the layout. For the GFF Amharic keyboard, we have already +noted how such subkey arrays are used to manage the extra keys that, on the +desktop keyboard, would appear in the shift layer. But they are also used to +provide another way to enter the two different types of each syllable-initial +vowels (glottal or pharyngeal), as a visual alternative to pressing the key +twice. + +The same properties that are defined for standard keys can also be specified for +each subkey except that the width of each key in a subkey array will always be +the same as the width of the key that causes the subkeys to be shown, and key +spacing always uses the default padding value. + +The GFF Amharic keyboard, like many others, is mnemonic, so it is useful to also +display the standard key cap letter that would appear on the key of a desktop +keyboard. This is enabled globally in the On-Screen layout editor and applies to +both the On-Screen keyboard and touch layouts. + +## JSON Schema + +```json +{ + "$schema": "http://json-schema.org/schema#", + "$ref": "#/definitions/touch-layout", + "$comment": "Version: 16.0", + "description": "A Keyman Touch Layout file, per version 16.0, clean spec, no legacy data or types", + + "definitions": { + "touch-layout": { + "type": "object", + "properties": { + "tablet": { "$ref": "#/definitions/platform" }, + "phone": { "$ref": "#/definitions/platform" }, + "desktop": { "$ref": "#/definitions/platform" } + }, + "minProperties": 1, + "additionalProperties": false + }, + + "platform": { + "type": "object", + "properties": { + "font": { "$ref": "#/definitions/font-spec" }, + "fontsize": { "$ref": "#/definitions/fontsize-spec" }, + "layer": { "$ref": "#/definitions/layers" }, + "displayUnderlying": { "type": "boolean" }, + "defaultHint": { "type": "string", "enum": ["none","dot","longpress","multitap","flick","flick-n","flick-ne","flick-e","flick-se","flick-s","flick-sw","flick-w","flick-nw"] } + }, + "required": ["layer"], + "additionalProperties": false + }, + + "layers": { + "type": "array", + "items": { "$ref": "#/definitions/layer" }, + "minItems": 1 + }, + + "layer": { + "type": "object", + "properties": { + "id": { "$ref": "#/definitions/layer-id" }, + "row": { "$ref": "#/definitions/rows" } + }, + "required": ["id", "row"], + "additionalProperties": false + }, + + "layer-id": { + "type": "string", + "pattern": "^[a-zA-Z0-9_-]+$" + }, + + "rows": { + "type": "array", + "items": { "$ref": "#/definitions/row" }, + "minItems": 1 + }, + + "row": { + "type": "object", + "properties": { + "id": { "$ref": "#/definitions/row-id" }, + "key": { "$ref": "#/definitions/keys" } + }, + "required": ["id", "key"], + "additionalProperties": false + }, + + "row-id": { + "type": "integer", + "minimum": 0, + "maximum": 100 + }, + + "keys": { + "type": "array", + "items": { "$ref": "#/definitions/key" }, + "minItems": 1 + }, + + "key": { + "type": "object", + "properties": { + "id": { "$ref": "#/definitions/key-id" }, + "text": { "type": "string" }, + "layer": { "$ref": "#/definitions/layer-id" }, + "nextlayer": { "$ref": "#/definitions/layer-id" }, + "font": { "$ref": "#/definitions/font-spec" }, + "fontsize": { "$ref": "#/definitions/fontsize-spec" }, + "sp": { "$ref": "#/definitions/key-sp" }, + "pad": { "$ref" : "#/definitions/key-pad" }, + "width": { "$ref" : "#/definitions/key-width" }, + "sk": { "$ref": "#/definitions/subkeys" }, + "flick": { "$ref": "#/definitions/flick" }, + "multitap": { "$ref": "#/definitions/subkeys" }, + "hint": { "type": "string" } + }, + "anyOf": [ + {"required": ["id"]}, + {"required": ["sp"]}, + {"required": ["sk"]}, + {"required": ["flick"]}, + {"required": ["multitap"]} + ], + "additionalProperties": false + }, + + "key-id": { + "type": "string", + "pattern": "^[TKUtku]_[a-zA-Z0-9_]+$" + }, + + "key-sp": { + "type": "integer", + "enum": [0, 1, 2, 8, 9, 10] + }, + + "key-pad": { + "type": "number", + "minimum": 0, + "maximum": 100000 + }, + + "key-width": { + "type": "number", + "minimum": 0, + "maximum": 100000 + }, + + "subkeys": { + "type": "array", + "items": { "$ref": "#/definitions/subkey" }, + "minItems": 1 + }, + + "subkey": { + "type": "object", + "properties": { + "id": { "$ref": "#/definitions/key-id" }, + "text": { "type": "string" }, + "layer": { "$ref": "#/definitions/layer-id" }, + "nextlayer": { "$ref": "#/definitions/layer-id" }, + "font": { "$ref": "#/definitions/font-spec" }, + "fontsize": { "$ref": "#/definitions/fontsize-spec" }, + "sp": { "$ref": "#/definitions/key-sp" }, + "pad": { "$ref" : "#/definitions/key-pad" }, + "width": { "$ref" : "#/definitions/key-width" } + }, + "required": ["id"], + "additionalProperties": false + }, + + "flick": { + "type": "object", + "patternProperties": { + "^(n|s|e|w|ne|nw|se|sw)$": { "$ref": "#/definitions/subkey" } + }, + "minProperties": 1, + "additionalProperties": false + }, + + "font-spec": { + "type": "string" + }, + + "fontsize-spec": { + "type": "string" + } + } +} +``` diff --git a/developer/docs/help/reference/file-types/kmn.md b/developer/docs/help/reference/file-types/kmn.md new file mode 100644 index 00000000000..0bf386607ce --- /dev/null +++ b/developer/docs/help/reference/file-types/kmn.md @@ -0,0 +1,21 @@ +--- +title: KMN files +--- + +Used by: +: Keyman Developer. + +Description: +: A .KMN file is a keyboard source file. This holds all the code used + by a Keyman Desktop keyboard, in plain text. + +Details: +: Compiles into a Keyman keyboard ([.KMX](kmx)) file. + +Distributed with keyboard: +: This is a keyboard development file and should only be distributed + with your package if you want to make the keyboard source code + available. + +Reference: +: [Keyman keyboard language](/developer/language/) diff --git a/developer/docs/help/reference/file-types/kmp.md b/developer/docs/help/reference/file-types/kmp.md new file mode 100644 index 00000000000..b79bd663be4 --- /dev/null +++ b/developer/docs/help/reference/file-types/kmp.md @@ -0,0 +1,37 @@ +--- +title: KMP files +--- + +Used by: +: All Keyman and custom Keyman Engine products can use keyboard + packages. +: Keyman for Android and Keyman for iPhone and iPad can use lexical + model packages. + +Description: +: A .KMP file is a Keyman Package file for distributing keyboards or + lexical models. + +Details: +: A .KMP file is compiled from a Keyman Package source file + ([.KPS](kps)) using the Package Editor in + Keyman Developer. Normal contents + of a Keyman keyboard Package are one or more keyboards with fonts, + documentation, and On Screen Keyboard ([.KVK](kvk)) files. Keyman + Developer will also include a [metadata](metadata) file in the + package. Lexical model packages contain one lexical model instead of + keyboards. + +Distributed with keyboard: +: A Keyman keyboard Package file (.KMP) can include keyboard files + ([.KMX](kmx)/.JS), fonts, documentation, and On Screen Keyboard + ([.KVK](kvk)) files. Do not include source files ([.KMN](kmn)/.KVKS) + in the Package. The Keyman Package is normally distributed instead + of the plain keyboard file ([.KMX](kmx)) in order to include the + extra files. + +Distributed with lexical model: +: A Keyman lexical model Package file (.KMP) includes one lexical + model file ([.MODEL.JS)](model-js), and documentation files. Do not + include lexical model source files ([.MODEL.TS](model-ts) or + [.TSV](tsv)) in the Package. diff --git a/developer/docs/help/reference/file-types/kmx.md b/developer/docs/help/reference/file-types/kmx.md new file mode 100644 index 00000000000..a4351688a52 --- /dev/null +++ b/developer/docs/help/reference/file-types/kmx.md @@ -0,0 +1,26 @@ +--- +title: KMX files +--- + +Used by: +: Keyman Desktop, + Keyman for macOS, and + Keyman for Linux. + +Description: +: A .KMX file is a compiled keyboard file. + +Details: +: A .KMX file is compiled in Keyman + Developer from the Keyman source file ([.KMN](kmn)) and icon + for the keyboard (.ICO/.BMP). Note that .KMX files are not used for + Keyman for Android and + Keyman for iPhone and iPad. + +Distributed with keyboard: +: This is the keyboard file. It must be distributed with your package + to allow people to type using the keyboard you have developed. + +Reference: +* [KMX binary file format specification](https://github.com/keymanapp/keyman/blob/master/docs/file-formats/kmx-file-format.md) +* [KMX+ binary file format specification](https://github.com/keymanapp/keyman/blob/master/docs/file-formats/kmx-plus-file-format.md) diff --git a/developer/docs/help/reference/file-types/kpj.md b/developer/docs/help/reference/file-types/kpj.md new file mode 100644 index 00000000000..f990fb98198 --- /dev/null +++ b/developer/docs/help/reference/file-types/kpj.md @@ -0,0 +1,17 @@ +--- +title: KPJ files +--- + +Used by: +: Keyman Developer. + +Description: +: A .KPJ file is a Keyman Developer Project file. + +Details: +: .KPJ files are used in Keyman + Developer to organise keyboards and other files currently in + development. + +Distributed with keyboard: +: No. This is a development file and should not be distributed. diff --git a/developer/docs/help/reference/file-types/kps.md b/developer/docs/help/reference/file-types/kps.md new file mode 100644 index 00000000000..ef4095d9aee --- /dev/null +++ b/developer/docs/help/reference/file-types/kps.md @@ -0,0 +1,27 @@ +--- +title: KPS files +--- + +Used by: +: Keyman Developer. + +Description: +: A .KPS file is a Keyman package source file. + +Details: +: A .KPS file is created using the Package Editor in + Keyman Developer. It specifies what + files are to be included in the package. It is compiled into a + Keyman Package file ([.KMP](kmp)). + +Distributed with keyboard: +: No. This is a development file and should not be distributed. + +## File format + +The optional `` section of the file can be included to +customise the text in the bootstrap installer. The default strings are +found in the file: +[strings.xml](https://github.com/keymanapp/keyman/blob/stable-14.0/windows/src/desktop/setup/locale/en/strings.xml). +You can add your own strings for a given package which are used when +compiling as a bundled installer. diff --git a/developer/docs/help/reference/file-types/kvk.md b/developer/docs/help/reference/file-types/kvk.md new file mode 100644 index 00000000000..77039aa4c1b --- /dev/null +++ b/developer/docs/help/reference/file-types/kvk.md @@ -0,0 +1,21 @@ +--- +title: KVK files +--- + +Used by: +: Keyman Desktop. + +Description: +: A .KVK file is a Keyman On Screen Keyboard file. + +Details: +: A .KVK file is created in Keyman + Developer from the Keyman On Screen Keyboard source file + ([.KVKS](kvks)). Web, Android and iOS keyboards, when compiled, + embed the .KVK content into the output file, but desktop keyboards + (Windows and macOS) require the .KVK file to be included with the + keyboard at distribution time. + +Distributed with keyboard: +: A .KVK file is associated with a specific keyboard, and must be + distributed with that keyboard to be usable. diff --git a/developer/docs/help/reference/file-types/kvks.md b/developer/docs/help/reference/file-types/kvks.md new file mode 100644 index 00000000000..cefd6f6643a --- /dev/null +++ b/developer/docs/help/reference/file-types/kvks.md @@ -0,0 +1,18 @@ +--- +title: KVKS files +--- + +Used by: +: Keyman Developer. + +Description: +: A .KVKS file is a Keyman On Screen Keyboard source file. + +Details: +: A .KVKS file is edited with the Keyboard Editor in + Keyman Developer during the + keyboard creation process. The file is XML format with UTF-8 + encoding. + +Distributed with keyboard: +: No. This is a development file and should not be distributed. diff --git a/developer/docs/help/reference/file-types/metadata.md b/developer/docs/help/reference/file-types/metadata.md new file mode 100644 index 00000000000..8a3e50deaec --- /dev/null +++ b/developer/docs/help/reference/file-types/metadata.md @@ -0,0 +1,294 @@ +--- +title: Keyman Package Metadata files +--- + +Used by: +: Keyman applications on all platforms except web. + +Description: +: The files `kmp.inf` and `kmp.json` are metadata for a Keyman package file. + +Details: + +: When Keyman Developer compiles a Keyman package source file ([.kps](kps)), it + creates and automatically adds `kmp.inf` and `kmp.json` into the Keyman + Package file ([.kmp](kmp)). + + Keyman on all platforms now use `kmp.json` to install the keyboards + ([.kmx](kmx)) in the package. + + Older versions of Keyman Desktop for Windows use `kmp.inf`, a parallel format + of the package metadata. Note: the lexical model compiler does not add + `kmp.inf`, and new functionality is not included. Future versions of Keyman + Developer will stop supporting `kmp.inf`. + +Package purposes: + +: A Keyman Package file can be used to distribute keyboards (most common), + lexical models, or user interface localizations for Keyman Desktop. + +KMP.JSON +-------- + +### The package object + +The kmp.json file is a base object described as + +`system` + +: `Object` + + [`System`](#obj-system) object. + +`options` + +: `Object` + + An [`Options`](#obj-options) object. + +`startMenu` + +: `Object` + + [`Start Menu`](#obj-startMenu) object. + +`info` + +: `Object` + + [`Info`](#obj-info) object. + +`files` + +: `Object` + + Array of objects, each containing a name and description of each file in in + the package + +`keyboards` + +: `Object` + + Array of [`Keyboard`](#obj-keyboard) objects. + +`lexicalModels` + +: `Object` + + Array of [`LexicalModel`](#obj-lexicalModel) objects. + +### The System object + +The `System` object is used by Keyman Desktop to install keyboards + +`keymanDeveloperVersion` + +: `string` + + The version of Keyman Developer used to create the package file. If undefined, + use `'0.0.0.0'` + +`fileVersion,` + +: `string` + +### The Options object + +The `Options` object is used by Keyman Desktop to install keyboards + +`readmeFile` + +: `string` + + A reference to the HTML file in the package for the keyboard package readme, + presented before the package is installed. + +`graphicFile` + +: `string` + + A reference to an image file, .png or .jpeg recommended formats, associated + with the keyboard package, and shown at package installation time. + +`welcomeFile` + +: `string` + + A reference to the HTML file containing keyboard package documentation, + available through the help interfaces in Keyman, and shown once after the + package is successfully installed. In the past, this file was always called + welcome.htm. + +`licenseFile` + +: `string` + + A HTML file containing the package license. + +### The Start Menu object + +The `StartMenu` object is used by Keyman Desktop to install windows + +`folder` + +: `string` + + The folder that Keyman Desktop will create + +`items` + +: `Array` + + An array of [Item](#obj-item) objects + +### The Item Object + +The `Item` object + +`name` + +: `string` + + The item name + +`filename` + +: `string` + + The filename of the item + +`location` + +: `string` + + The location for Keyman Desktop to place the item + +### The Info object + +The `Info` object describes the Keyman package + +`name` + +: `string` + + The Keyman package name + +`version` + +: `string` + + The version number of the package in dotted number format. Defaults to `'1.0'` if missing + +`copyright` + +: `string` optional + + Copyright information + +`author` + +: `string` optional + + The Keyman package author and email address + +`website` + +: `string` optional + + Description and URL for additional Keyboard package documentation + +### The Keyboard object + +The `Keyboard` object describes an individual keyboard in the Keyman package. A package cannot contain both lexical models and keyboards. + +`name` + +: `string` + + Name of keyboard + +`id` + +: `string` + + ID of the keyboard, always matches the filename of the keyboard + +`rtl` + +: `boolean` optional + + `true` if the keyboard targets a right-to-left script. `false` if absent. + +`version` + +: `string` + + version number of the keyboard in dotted number format. Defaults to `'1.0'` if missing + +`languages` + +: `Array` + + An array of [`Language`](#obj-language) objects linked to the keyboard. + +`displayFont` + +: `string` optional + + The filename of the font for input fields (and OSK, if `oskFont` is not present). + +`oskFont` + +: `string` optional + + The filename of the font for the OSK + +### The Language object + +The `Language` object describes the language that can be typed with the keyboard + +`name` + +: `string` + + The name of the language + +`id` + +: `string` + + [BCP 47 language code](../bcp-47) + +### The LexicalModel object + +The `LexicalModel` object describes an individual model in the Keyman package. A package cannot contain both lexical models and keyboards. + +`name` + +: `string` + + Name of model + +`id` + +: `string` + + ID of the model, always matches the filename of the model + +`rtl` + +: `boolean` optional + + `true` if the model targets a right-to-left script. `false` if absent. + +`version` + +: `string` + + version number of the model in dotted number format. + +`languages` + +: `Array` + + An array of [`Language`](#obj-language) objects linked to the model. diff --git a/developer/docs/help/reference/file-types/model-js.md b/developer/docs/help/reference/file-types/model-js.md new file mode 100644 index 00000000000..e8f3cbb2c4b --- /dev/null +++ b/developer/docs/help/reference/file-types/model-js.md @@ -0,0 +1,23 @@ +--- +title: MODEL.JS files +--- + +Used by: +: Keyman for Android and + Keyman for iPhone and iPad. + +Description: +: A .MODEL.JS file is a compiled lexical model file. + +Details: +: A .MODEL.JS file is compiled in Keyman + Developer from the Keyman lexical model source + ([.MODEL.TS](model-ts)) file and ([.TSV](tsv)) wordlist. Note that + .MODEL.JS files are only currently supported in + Keyman for Android and + Keyman for iPhone and iPad. + +Distributed with lexical model: +: This is the lexical model file. It must be distributed as a part of + your package to allow people to use the lexical model you have + developed. diff --git a/developer/docs/help/reference/file-types/model-ts.md b/developer/docs/help/reference/file-types/model-ts.md new file mode 100644 index 00000000000..98447d0283e --- /dev/null +++ b/developer/docs/help/reference/file-types/model-ts.md @@ -0,0 +1,210 @@ +--- +title: MODEL.TS files +--- + +Used by: +: Keyman Developer. + +Description: +: A .MODEL.TS file is a [lexical model](../../guides/lexical-models) + definition source file. This holds all the code used by a Keyman + lexical model, in plain text. + +Details: +: A .MODEL.TS file is written in the + [TypeScript](https://www.typescriptlang.org/) language. + Keyman Developer compiles this + Keyman lexical model source file which can also reference a + ([.TSV](tsv)) wordlist to make a lexical model + ([.MODEL.JS](model-js)) file. + +## Reference + +This is a small [TypeScript](https://www.typescriptlang.org/) source +code file that tells us where to find the word list file, as well as +gives us the option to tell the compiler a little bit more about our +language’s spelling system or *orthography*. + +## The model definition template + +**Keyman Developer** will provide you with a model definition similar to +the following. + +``` typescript +/* + sencoten 1.0 generated from template. + + This is a minimal lexical model source that uses a tab delimited wordlist. + See documentation online at https://help.keyman.com/developer/ for + additional parameters. +*/ + + +const source: LexicalModelSource = { + format: 'trie-1.0', + wordBreaker: { + use: 'default', + }, + sources: ['wordlist.tsv'], +}; +export default source; +``` + +Let's step through this file, line-by-line. + +On the first line, we're declaring the source code of a new lexical +model. + +``` typescript +const source: LexicalModelSource = { +``` + +On the second line, we're saying the lexical model will use the +`trie-1.0` format. The `trie` format creates a lexical model from one or +more word lists; the `trie` structures the lexical model such that it +can predict through thousands of words very quickly. + +``` typescript + format: 'trie-1.0', +``` + +On lines 3–5, we're specifying the word breaking algorithm that we want +to use. Keyman supplies a default algorithm that conforms to the rules +expected for many Latin-script languages. + +``` typescript + wordBreaker: { + use: 'default', + }, +``` + +On the sixth line, we're telling the `trie` where to find our wordlist. + +``` typescript + sources: ['wordlist.tsv'], +``` + +The seventh line marks the termination of the lexical model source code. +If we specify any customizations, they **must** be declared above this +line: + +``` typescript +}; +``` + +The eighth line is necessary to allow external applications to read the +lexical model source code. + +``` typescript +export default source; +``` + +## Customizing our lexical model + +The template, as described in the previous section, is a good starting +point, and may be all you need for you language. However, most language +require a few customizations. The `trie` model supports the following +customizations: + +word breaking +: How to determine when words start and end in the writing system. + +search term to key +: How and when to ignore accents and lettercase + +### Word breaking + +The `trie` family of lexical models needs to know what a word is in +running text. In language using the Latin script—like, English, French, +and SENĆOŦEN—finding words is easy. Words are separated by spaces or +punctuation. The actual rules for where to find words can get quite +tricky to describe, but Keyman implements the [Unicode Standard Annex +\#29 §4.1 Default Word Boundary +Specification](https://unicode.org/reports/tr29/#Word_Boundaries) which +works well for most languages. If the default doesn't *quite* work for +your language, you can [tweak +it](../../guides/lexical-models/advanced/word-breaker#join). + +However, in languages written in other scripts—especially East Asian +scripts like Chinese, Japanese, Khmer, Lao, and Thai—there are no +obvious break in between words. For these languages, there must be +special rules for determining when words start and stop. This is what a +word breaking function is responsible for. It +is a little bit of code that looks at some text to determine where the +words are. + +### Search term to key + +To look up words quickly, the `trie` model creates a +search key that takes the latest word (as determined by the +[word breaking](#toc-word-breaking) and converts it into a “regular” +form. The purpose of this “regular” form is to make searching for a word +work, regardless of things such as **accents**, **diacritics**, +**lettercase**, and minor **spelling variations**. The ”regular” form is +called the key. Typically, the key is always in +lowercase, and lacks all accents and diacritics. For example, the key of +“naïve" is "naive" and the key of Canada is “canada”. + +The form of the word that is stored is “regularized” through the use of +a key function, which you can define in +TypeScript code. + +The key function takes a string, the raw search term, and returns a +string, being the “regular” key. As an example, consider the **default +key function**; that is, the key function that is used if you do not +specify one: + +``` +searchTermToKey: function (term) { + // Use this pattern to remove common diacritical marks (accents). + // See: https://www.compart.com/en/unicode/block/U+0300 + const COMBINING_DIACRITICAL_MARKS = /[\u0300-\u036f]/g; + + // Lowercase each letter in the string INDIVIDUALLY. + // Why individually? Some languages have context-sensitive lowercasing + // rules (e.g., Greek), which we would like to avoid. + // So we convert the string into an array of code points (Array.from(term)), + // convert each individual code point to lowercase (.map(c => c.toLowerCase())), + // and join the pieces back together again (.join('')) + let lowercasedTerm = Array.from(term).map(c => c.toLowerCase()).join(''); + + // Once it's lowercased, we convert it to NFKD normalization form + // This does many things, such as: + // + // - separating characters from their accents/diacritics + // e.g., "ï" -> "i" + "¨" (U+0308) + // - converting lookalike characters to a canonical ("regular") form + // e.g., ";" -> ";" (yes, those are two completely different characters -- U+037E and U+003B!) + // - converting "compatible" characters to their canonical ("regular") form + // e.g., "𝔥𝔢𝔩𝔩𝔬" -> "hello" + let normalizedTerm = lowercasedTerm.normalize('NFKD'); + + // Now, using the pattern defined above, replace each accent and diacritic with the + // empty string. This effectively removes all accents and diacritics! + // + // e.g., "i" + "¨" (U+0308) -> "i" + let termWithoutDiacritics = normalizedTerm.replace(COMBINING_DIACRITICAL_MARKS, ''); + + // The resultant key is lowercased, and has no accents or diacritics. + return termWithoutDiacritics; +}, +``` + +This should be sufficient for most Latin-based writing systems. However, +there are cases, such as with SENĆOŦEN, where some characters do not +decompose into a base letter and a diacritic. In this case, it is +necessary to write your own key function. + +## Version History + +Keyman 12 +: **Added**: the `.model.ts` file type. + +Keyman 13 +: *No changes.* + +Keyman 14 +: **Added**: an alternative syntax for specifying word breakers: + `wordBreaker: { 'use': ... }`. +: **Added**: specify which characters should be used to join with word + breakers: `wordBreaker: { 'joinWordsAt': ... }`. diff --git a/developer/docs/help/reference/file-types/tsv.md b/developer/docs/help/reference/file-types/tsv.md new file mode 100644 index 00000000000..b926ed95725 --- /dev/null +++ b/developer/docs/help/reference/file-types/tsv.md @@ -0,0 +1,60 @@ +--- +title: TSV files +--- + +Used by: +: Keyman Developer and + Lexical Model compiler. + +Description: +: A .tsv file or a tab-separated values file + contains a word list. This word list is used to predict and correct + words using the predictive text functionality. + +Details: +: A .tsv file is a plain-text file containing of tabular data. + Spreadsheet programs such as Microsoft Excel and Google Sheets can + export into TSV format. TSVs can also be programmatically generated + from other data sources. For advanced users, see [File + Format](#file-format) for more details. + +Distributed with lexical model: +: No. This is a development file and should not be distributed. + +## File format + +**For advanced users only**: this documentation is intended for users +who wish to develop their own word list exporters. Most users can use +existing word list exporters. + +The **lexical model compiler** expects word lists to abide by the +following **tab-separated values** (TSV) format: + +- the file is a **UTF-8** encoded text file +- newlines are either **LF** or **CRLF** +- the file **MAY** start with the UTF-8 **byte-order mark** (BOM); + that is, if the first three bytes of the file are `EF BB BF`, these + will be interpreted as the BOM and will be ignored. +- the file either consists of a **comment** or an **entry** +- **comment** lines MUST start with the `#` character on the very + first column +- **entries** are one to three columns, separated by the (horizontal) + **tab character** (U+0009) +- column 1 (**REQUIRED**): the **word form**: can have any character + except tab, CR, or LF. Surrounding whitespace characters are + trimmed. Quote characters (`'` or `"`) are **NOT** required to + surround the text and are **NOT** parsed in any special manner. +- column 2 (*optional*): the **count**: a non-negative integer + specifying how many times this entry has appeared in the corpus. + Blank means ‘indeterminate’, and is treated as if the word exists in + the corpus, but will be predicted at the lowest possible priority. +- column 3 (*optional*): **comment**: an informative comment, ignored + by this tool. + +Source: +[build-trie.js@029fb7c8](https://github.com/keymanapp/keyman/blob/029fb7c822c5a5619eaca845ecd2e5a2497d3056/developer/js/lexical-model-compiler/build-trie.ts#L21-L40) + +## Additional notes + +Exporting a spreadsheet from Google Sheets as a TSV will produce +properly formatted output. diff --git a/developer/docs/help/reference/file-types/ttf.md b/developer/docs/help/reference/file-types/ttf.md new file mode 100644 index 00000000000..870a5201788 --- /dev/null +++ b/developer/docs/help/reference/file-types/ttf.md @@ -0,0 +1,22 @@ +--- +title: TTF files +--- + +Used by: +: Keyman Developer. + +Description: +: A .ttf file is a TrueType font file. This file is distributed with a + keyboard package to be used as a keyboard font or display font. This + file is optional; many languages and keyboards do not need to + include a font because there will be a font supplied by the + operating system. + +Details: +: A .ttf file is a binary file. It is included using the Package + Editor in Keyman Developer. Keyman Developer does not create font + files. + +Distributed with keyboard: +: This is a font file. It should be distributed with your keyboard + package to allow people to see the keyboard output characters. diff --git a/developer/docs/help/reference/file-types/xml.md b/developer/docs/help/reference/file-types/xml.md new file mode 100644 index 00000000000..78d24749528 --- /dev/null +++ b/developer/docs/help/reference/file-types/xml.md @@ -0,0 +1,18 @@ +--- +title: XML files +--- + +Used by: +: Keyman Developer. + +Description: +: A .XML file can be many different things. For Keyman Developer, XML files + are typically LDML keyboards which are authored in XML. This file holds all + the code used by a LDML format keyboard, in XML format. + +Details: +: Compiles into a Keyman keyboard ([.KMX](kmx)) file. + +Distributed with keyboard: +: This is a keyboard development file and should not usually be distributed + with your package. diff --git a/developer/docs/help/reference/index.md b/developer/docs/help/reference/index.md new file mode 100644 index 00000000000..04ba82a125e --- /dev/null +++ b/developer/docs/help/reference/index.md @@ -0,0 +1,13 @@ +--- +title: Keyman Developer Reference +--- + +* [Keyman keyboard language guide and reference](/developer/language) +* [Command line compiler - kmc](kmc) +* [Compiler messages](messages) +* [Keyman keyboard source file layout](file-layout) +* [File types](file-types) +* [BCP 47 language codes](bcp-47) +* [Tools](tools) +* [Custom editor themes](editor-themes) +* [User settings](user-settings) \ No newline at end of file diff --git a/developer/docs/help/reference/kmc/api/index.md b/developer/docs/help/reference/kmc/api/index.md new file mode 100644 index 00000000000..e39a04f8aa6 --- /dev/null +++ b/developer/docs/help/reference/kmc/api/index.md @@ -0,0 +1,43 @@ +--- +title: kmc API Reference +--- + +kmc is implemented in Typescript as a set of compiler modules. Each module has a +public API, documented in README.md in the corresponding repository folder. + +This section is intended for software developers who want to integrate kmc into +their own toolchains. For documentation on using `kmc`, see [kmc command line +compiler](../cli). + +# Modules + +Module Name | NPM Package | GitHub Source | Description +-------------------------------------------------|-------------------------------------------------------|------------------------------------|--------------- +[kmc](../cli) | [@keymanapp/kmc][kmc-npm] | [GitHub][kmc-github] | The official command-line interface for all of the various compilers in Keyman Developer. +[kmc-analyze](../../api/kmc-analyze) | [@keymanapp/kmc-analyze][kmc-analyze-npm] | [GitHub][kmc-analyze-github] | Provides Keyman keyboard analysis tools. +[kmc-keyboard-info](../../api/kmc-keyboard-info) | [@keymanapp/kmc-keyboard-info][kmc-keyboard-info-npm] | [GitHub][kmc-keyboard-info-github] | Builds a .keyboard_info file from a Keyman keyboard project. +[kmc-kmn](../../api/kmc-kmn) | [@keymanapp/kmc-kmn][kmc-kmn-npm] | [GitHub][kmc-kmn-github] | Builds .kmn keyboards into .kmx binary keyboard files. +[kmc-ldml](../../api/kmc-ldml) | [@keymanapp/kmc-ldml][kmc-ldml-npm] | [GitHub][kmc-ldml-github] | Builds LDML .xml keyboards into Keyman .kmx binary keyboard files. +[kmc-model](../../api/kmc-model) | [@keymanapp/kmc-model][kmc-model-npm] | [GitHub][kmc-model-github] | Builds .model.ts lexical models into .model.js files. +[kmc-model-info](../../api/kmc-model-info) | [@keymanapp/kmc-model-info][kmc-model-info-npm] | [GitHub][kmc-model-info-github] | Builds a .model_info file from a Keyman lexical model project. +[kmc-package](../../api/kmc-package) | [@keymanapp/kmc-package][kmc-package-npm] | [GitHub][kmc-package-github] | Builds .kps Keyman package source files into binary .kmp Keyman package files. + +[kmc-npm]: https://npmjs.com/package/@keymanapp/kmc +[kmc-analyze-npm]: https://npmjs.com/package/@keymanapp/kmc-analyze +[kmc-keyboard-info-npm]: https://npmjs.com/package/@keymanapp/kmc-keyboard-info +[kmc-kmn-npm]: https://npmjs.com/package/@keymanapp/kmc-kmn +[kmc-ldml-npm]: https://npmjs.com/package/@keymanapp/kmc-ldml +[kmc-model-npm]: https://npmjs.com/package/@keymanapp/kmc-model +[kmc-model-info-npm]: https://npmjs.com/package/@keymanapp/kmc-model-info +[kmc-package-npm]: https://npmjs.com/package/@keymanapp/kmc-package +[common-types-npm]: https://npmjs.com/package/@keymanapp/common-types + +[kmc-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc +[kmc-analyze-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc-analyze +[kmc-keyboard-info-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc-keyboard-info +[kmc-kmn-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc-kmn +[kmc-ldml-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc-ldml +[kmc-model-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc-model +[kmc-model-info-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc-model-info +[kmc-package-github]: https://github.com/keymanapp/keyman/tree/master/developer/src/kmc-package +[common-types-github]: https://github.com/keymanapp/keyman/tree/master/common/web/types diff --git a/developer/docs/help/reference/kmc/cli/get-started.md b/developer/docs/help/reference/kmc/cli/get-started.md new file mode 100644 index 00000000000..9147eebda25 --- /dev/null +++ b/developer/docs/help/reference/kmc/cli/get-started.md @@ -0,0 +1,164 @@ +--- +title: Get started with kmc +--- + +This package provides a command-line interface to the Keyman Developer compiler +toolchain, `kmc`. + +## Install kmc + +`kmc` is available as: +* a part of Keyman Developer (Windows) +* an npm package, and +* a zip download + +Hint: Unlike previous versions of Keyman Developer, version 17 of kmc does not +require WINE to run the command line tools on Linux or macOS. + +### Keyman Developer integration (Windows only) + +kmc is included with a default installation of Keyman Developer, including a +runtime of node.js, and will be on the system path by default. No additional +configuration or installation is required. + +### npm (Windows, macOS, and Linux) + +kmc is also available as an npm package, +[@keymanapp/kmc](https://npmjs.com/package/@keymanapp/kmc). + +You'll need [node.js](https://nodejs.org/), version 18.0 or later. + +```shell +npm install -g @keymanapp/kmc +``` + +### Zip download (Windows, macOS, and Linux) + +kmc is also available as a zip download from +[keyman.com/developer/download](https://keyman.com/developer/download), +or can be installed from the command line (`curl` and `unzip` required): + +```shell +# To build keyboards and packages: +mkdir kmc +cd kmc +# hint: the download is currently called 'kmcomp', although the +# compiler is now called 'kmc'. +curl -L https://keyman.com/go/download/kmcomp -o kmc.zip +unzip kmc.zip +# Optionally, add kmc to your PATH +``` + +## The five minute quick start + +### 1. Download a sample keyboard project + + + +We'll download a sample project from GitHub for Khmer. If you do not have the +command-line git tools installed, you can visit the [repository +website](https://github.com/keyman-keyboards/khmer_angkor) and download it as a +zip file instead. + +```shell +git clone https://github.com/keyman-keyboards/khmer_angkor +``` + +This will have created a new folder called `khmer_angkor/`. + +### 2. Build the project + +Now, we'll build our keyboard project with kmc. + +```shell +cd khmer_angkor +kmc build . +``` + +And... that's it! We'll now have a compiled keyboard and package in the `build/` +subfolder. The file `build/khmer_angkor.kmp` can be installed into any of the +Keyman apps, and `build/khmer_angkor.js` can be added to KeymanWeb. + +### 3. Install the keyboard + +**Windows**: we can install this keyboard using [`kmshell`][windows-install-keyboard]: + +```cmd +"%ProgramFiles(x86)%\Keyman\Keyman Desktop\kmshell" -i build\khmer_angkor.kmp -s +``` + +Alternatively you can double-click the .kmp package file in Windows Explorer to +install it. + +**Linux**: we'd use the following +[`km-package-install`][linux-install-keyboard] +command: + +```shell +km-package-install -f build/khmer_angkor.kmp +``` + +**macOS**: open Keyman Configuration and drop the package khmer_angkor.kmp file +onto the Keyman Configuration window. + +**Android**: send khmer_angkor.kmp to your Android device, and install it from the +hamburger menu in the Keyman app. + +**iOS**: send khmer_angkor.kmp to your iOS device, and install it from the +hamburger menu in the Keyman app. + +**Web**: copy khmer_angkor.js to your website, then [load it with KeymanWeb][load-keymanweb-keyboard]: + +```js +keyman.addKeyboards({ + id:'khmer_angkor', // The keyboard's unique identification code. + name:'Khmer Angkor', // The keyboard's user-readable name. + language:{ + id:'km', // A BCP 47 code uniquely identifying the language. + name:'Khmer' // The language's name. + }, + filename:'./khmer-angkor.js', +}); +``` + +## File layout + +See [file layout][file-layout] for details on the standard source file layout +that Keyman Developer works best with. + +## Reference and Examples + +### kmc - command line compiler + +[kmc][kmc] is the command line compiler. You can use it to compile +all Keyman files. + +The most common command will be `kmc build`: + +`kmc build project.kpj` +: Compile all components of a keyboard or model project named `project.kpj` +KMComp will respect the path settings within the project file. This is the +recommended way to build, as it will build keyboards, models and packages all in +one step. You can also call `kmc build ` to build the project in the +referenced folder, e.g. `kmc build .`. + +* [kmc reference][kmc] + +### KMConvert + +[KMConvert](../../../context/kmconvert) generates keyboards and models from templates, +and converts keyboard layouts between different formats. + +The [New Project dialog](../../../context/new-project) in Keyman Developer provides a +graphical version of the most common functionality in KMConvert. + +* [KMConvert reference](../../../context/kmconvert) + +**Note:** KMConvert is currently a Windows executable, and will be integrated +into kmc in an upcoming version of Keyman. + +[kmc]: ./reference +[file-layout]: ../../file-layout +[load-keymanweb-keyboard]: /developer/engine/web/current-version/guide/adding-keyboards +[linux-install-keyboard]: /products/linux/current-version/reference/km-package-install +[windows-install-keyboard]: /knowledge-base/98 diff --git a/developer/docs/help/reference/kmc/cli/index.md b/developer/docs/help/reference/kmc/cli/index.md new file mode 100644 index 00000000000..808e053a2f8 --- /dev/null +++ b/developer/docs/help/reference/kmc/cli/index.md @@ -0,0 +1,7 @@ +--- +title: Command line compiler - kmc +--- + +* [Get started with kmc](get-started) +* [kmc command line reference](reference) +* [Migrating from kmcomp to kmc](kmcomp-migration) diff --git a/developer/docs/help/reference/kmc/cli/kmcomp-migration.md b/developer/docs/help/reference/kmc/cli/kmcomp-migration.md new file mode 100644 index 00000000000..c864e1bc901 --- /dev/null +++ b/developer/docs/help/reference/kmc/cli/kmcomp-migration.md @@ -0,0 +1,125 @@ +--- +title: Migrating from kmcomp to kmc +--- + +`kmcomp` was the command-line compiler for Keyman Developer through version +16.0. Version 17.0 replaces `kmcomp` with `kmc`. + +The lexical model command-line tooling, `kmlmc`, `kmlmp`, and `kmlmi`, are all +still present in version 17, but are deprecated, as the same tasks can be +performed with `kmc`. + +## Benefits + +* Unlike `kmcomp`, which was a Windows-only console application, `kmc` is a + cross-platform application, running on Windows, Linux, and macOS, built in + node.js. +* `kmc` parameters have been redesigned to be more consistent, and easily + extensible for new functionality. +* `kmc` can run in a batch mode that is up to 100x faster than `kmcomp`. +* `kmc` can be easily integrated into GitHub Actions and other continuous + integration tooling. + +## Compiling a project + +To compile a project, `kmcomp` used a command line such as: + +```bash +kmcomp path\to\my_keyboard.kpj +``` + +With `kmc`, you would use: + +```bash +kmc build path/to/my_keyboard.kpj +# or you can specify just the folder: +kmc build path/to/ +# If you are in the same folder as the .kpj: +kmc build . +``` + +This is the recommended way of using `kmc` -- always build an entire project, +rather than just the keyboard. + +## Compiling a keyboard + +To compile a keyboard, `kmcomp` builds used command lines such as: + +```bash +# building a .kmx +kmcomp my_keyboard.kmn my_keyboard.kmx +# building a .js (for KeymanWeb) +kmcomp my_keyboard.kmn my_keyboard.js +``` + +With `kmc`, you would use: + +```bash +# building all outputs +kmc build my_keyboard.kmn +# or to specify output files (.js inferred from .kmx, and always built) +kmc build my_keyboard.kmn -o my_keyboard.kmx +``` + +## Compiling a package + +To compile a package, `kmcomp` builds used command lines such as: + +```bash +kmcomp my_keyboard.kps +``` + +With `kmc`, you would use: + +```bash +kmc build my_keyboard.kps +# to specify output file or path +kmc build my_keyboard.kps -o path/to/my_keyboard.kmp +``` + +## Map of parameters + +The following table lists common parameters in `kmcomp`, and the corresponding +parameter in `kmc`: + +kmcomp | kmc | notes +-----------------------|---------------------------------------|------------- +`-h`, `-help` | `-h`, `--help` | Note that `kmc --help` can be used for further detail on subcommands, e.g. `kmc build --help` +`-s` | `-l warn`, `--log-level warn` | Silent option, suppresses informational and hint-level messages +`-ss` | `-l silent`, `--log-level silent` | Super-silent option, suppresses all messages, except fatal internal errors +`-nologo` | not required | `kmc` does not emit a compiler description +`-c` | N/A | `kmc` does not currently support the `clean` command, this will be supported in future versions +`-d` | `-d`, `--debug` | Include debug information in output files +`-w` | `-w`, `--compiler-warnings-as-errors` | Causes warnings to fail the build; overrides project-level option +`-cfc` | not required | Filename convention checks are now standard hints/warnings in the build +`-t` | N/A | Build specified target from .kpj, not supported in kmc +`-color` | `--color` | Force colorization for log messages +`-no-color` | `--no-color` | No colorization for log messages +`-no-compiler-version` | `--no-compiler-version` | Exclude compiler version metadata from output files + +## Compiling a lexical model + +`kmlmc` and `kmlmp` were separate tools in earlier versions of Keyman Developer, +for compiling lexical models and lexical model packages. They have both been +replaced with `kmc`. + +Old method, using kmlmc and kmlmp: + +```bash +kmlmc file.model.ts +# or specifying output filename +kmlmc -o output/path/file.model.js file.model.ts +kmlmp file.model.kps +``` + +New method, using kmc: + +```bash +# recommended, build the model project: +kmc build . +# building single files: +kmc build file.model.ts +kmc build file.model.ts -o output/path/file.model.js +kmc build file.model.kps +``` + diff --git a/developer/docs/help/reference/kmc/cli/messages/index.md b/developer/docs/help/reference/kmc/cli/messages/index.md new file mode 100644 index 00000000000..1655e0f4888 --- /dev/null +++ b/developer/docs/help/reference/kmc/cli/messages/index.md @@ -0,0 +1,6 @@ +--- +title: kmc Compiler Messages +--- + +This section lists messages that the kmc compiler may generate in use, describes +circumstances that cause the messages to arise, and how to resolve them. diff --git a/developer/docs/help/reference/kmc/cli/reference.md b/developer/docs/help/reference/kmc/cli/reference.md new file mode 100644 index 00000000000..bff696d0d0d --- /dev/null +++ b/developer/docs/help/reference/kmc/cli/reference.md @@ -0,0 +1,324 @@ +--- +title: kmc command line reference +--- + +kmc is the command line compiler toolset for Keyman 17.0 and later versions. +In Keyman Developer, it is located in `%ProgramFiles(x86)%\Keyman\Keyman Developer`. +kmc is also available as an npm module for Windows, macOS and Linux developers: + +``` +npm install -g @keymanapp/kmc +``` + +kmc does more than just compile keyboards. It builds packages, lexical models, +projects, keyboards, Windows installers, and more. It provides analysis tools +for keyboard data. + +kmc will be extended to generate new keyboard and lexical model projects, +support renaming or cloning of existing projects, importing keyboard data from +other formats, and running keyboard unit tests. + +kmc [replaces kmcomp](kmcomp-migration) from earlier versions of Keyman Developer. + +The following parameters are available: + +## `kmc` commands + +`kmc build [infile...]`, `kmc build file [infile...]` + +: Compile one or more Keyman files. Takes Keyman keyboard source files, and + compiles them into the binary formats used by the Keyman apps. Supports + building: + * Keyman projects (.kpj or folder) + * Keyman keyboards (.kmn) + * LDML keyboards (.xml) + * Keyboard packages - bundles of keyboard files, fonts, documentation for + distribution (.kps) + * Lexical models (.model.ts) + + The `file` subcommand is the default command for `kmc build`, so can be + omitted. + + File lists can be referenced with @filelist.txt. If no input file is supplied, + kmc will attempt to build a project file in the current folder. + +`kmc build ldml-test-data` + +: Converts LDML keyboard test .xml file to .json. + +`kmc build windows-package-installer` + +: Builds a .exe installer for a keyboard, together with the Keyman installer, + for Windows only. + +`kmc analyze osk-char-use [infile...]` + +: Analyze on screen keyboard files for character usage + +`kmc analyze osk-rewrite-from-char-use -m mapping-file [infile...]` + +: Rewrites On Screen Keyboard files from source mapping + +`kmc message [message...]` + +: Describes one or more compiler messages in greater detail + +## `kmc` global options + +`-h`, `--help` + +: Display help on kmc; note that `kmc --help` can be used for further detail on + subcommands, e.g. `kmc build --help` + +`-V`, `--version` + +: Prints the version number of kmc + +`--no-error-reporting`, `--error-reporting` + +: Enable or disable error reporting to keyman.com, overriding [user + settings](../../user-settings). Error reporting is for fatal errors in the + compiler, and not errors in compiled files. No user data is sent in error + reports, although some filenames and paths may be present in the diagnostic + data attached to the report. + +`-l `, `--log-level ` + +: Controls the level of logging to console for messages relating to the + compilation process. The options are: + * `silent`: suppresses all messages (except fatal internal errors) + * `error`: only emits compilation errors + * `warn`: only emits compilation errors and warnings + * `hint`: emits compilation errors, warnings, and hints + * `info` (default): emits compilation errors, warnings, hints, and + informational messages + * `debug`: emits all compilation messages, plus internal debug messages + + Logging of specific [messages](messages) can be controlled with `--message`, `-m`. + + Note that when warnings are treated as errors + (`--compiler-warnings-as-errors`, `-w`), they will still be logged as + warnings, so suppressing warnings while using this flag may be confusing. + +## `kmc build` options + +`--color`, `--no-color` + +: Controls colorization for log messages, using ANSI color controls. If both of + these settings are omitted, kmc will attempt to detect from console, and will + use colorization for interactive terminals, and no colorization when + redirection is being used. + +`-d`, `--debug` + +: Include debug information in output files. Debug information is used for + interactive debugging of .kmx files within the Keyman Developer IDE. This + flag also produces pretty printed .js files for web keyboards, making + interactive debugging of web keyboards simpler. + +`-w`, `--compiler-warnings-as-errors` vs `-W`, `--no-compiler-warnings-as-errors` + +: Controls whether or not warnings fail the build; overrides project-level + warnings-as-errors option. Most compiler warnings are an indication that + something is not right in the source code, even though the compiler can + produce a result. This strict compilation mode helps to ensure that problems + are caught early, and is recommended. + +`-m `, `--message ` + +: Adjusts the severity of info, hint or warning messages. Error and fatal error + messages can not be adjusted. Message severity can be adjusted to: + * `disable` (default): suppresses the message altogether + * `info`: converts the message to an informational severity + * `hint`: converts the message to a hint severity + * `warn`: converts the message to a warning severity + * `error`: raises the message to an error severity + + This may be used to suppress a warning message that would otherwise fail the + build, if used in conjunction with `-w`, `--compiler-warnings-as-errors` + + This option may be repeated to adjust multiple messages. The `-m` option must + be specified each time. + +`--no-compiler-version` + +: Excludes compiler version metadata from output. This is helpful for producing + files that will be identical regardless of the compiler version, for + regression testing. + +`--no-warn-deprecated-code` + +: Turns off warnings (CWARN_HeaderStatementIsDeprecated, + CWARN_LanguageHeadersDeprecatedInKeyman10) for deprecated code styles + +`--log-format ` + +: Output log format. The available options are: + * `formatted` (default): emits log messages in a human-readable format + * `tsv`: emits log messages in UTF-8 tab-separated format. This format will be + stable across versions of kmc. The format has the following fields: + * filename + * line number + * severity + * code + * message + +`-o `, `--out-file ` + +: Overrides the default path and filename for the output file(s). Note that + some compilers emit multiple files, in which case, the output filenames + will vary by file extension. + +## `kmc build file` additional options + +`--for-publishing` + +: Verifies that project meets @keymanapp repository requirements. This also + causes a .keyboard-info or .model-info file to be emitted when compiling the + project (which can also be controlled at a project level with the + `skipMetadataFiles` option). This option is only valid for compiling projects. + +### Examples + +```shell +kmc build project.kpj +``` + +Compile all components of a keyboard or model project named `project.kpj`. +kmc will respect the path settings within the project file. This is the +recommended way to build, as it will build keyboards, models and packages all in +one step. You can also call `kmc build ` to build the project in the +referenced folder, e.g. `kmc build .`. + +```shell +kmc build keyboard.kmn +``` + +Compile a keyboard file to a .kmx (desktop targets) and/or .js (web/touch +targets). If an output file is not specified, writes to the same folder as the +keyboard. + +```shell +kmc build package.kps +``` + +Compile a package file to a .kmp (all targets). All included keyboards must +already be compiled. + + +## `kmc build windows-package-installer` additional options + +`--msi ` + +: Full path of keymandesktop.msi to bundle into the installer. This file can be + downloaded from https://downloads.keyman.com/windows/stable (/version). + +`--exe ` + +: Location of setup.exe. This file can be downloaded from + https://downloads.keyman.com/windows/stable (/version). + +`--license ` + +: Location of license.txt for Keyman for Windows. + +`--title-image [titleImageFilename]` + +: Location of title image file. This should be a .png, .jpg, or .bmp file which + replaces the standard 'Keyman for Windows' image in the bootstrap installer. + +`--app-name [applicationName]` + +: Installer property: name of the application to be installed (default: "Keyman") + +`--start-disabled` + +: Installer property: do not enable keyboards after installation completes + +`--start-with-configuration` + +: Installer property: start Keyman Configuration after installation completes + +### Examples + +#### Windows, command prompt (all one line) + +```bat +kmc build windows-package-installer .\khmer_angkor.kps + --msi "C:\Program Files (x86)\Common Files\Keyman\Cached Installer Files\keymandesktop.msi" + --exe .\setup-redist.exe --license .\LICENSE.md --out-file .\khmer.exe +``` + +#### Bash (Linux, WSL, macOS, etc) + +```shell +kmc build windows-package-installer \ + ./khmer_angkor/source/khmer_angkor.kps \ + --msi ./redist/keymandesktop.msi \ + --exe ./redist/setup-redist.exe \ + --license ./redist/LICENSE.md \ + --out-file ./khmer.exe +``` + +Note: paths shown above may vary. + +## `kmc analyze osk-char-use` options + +`-b, --base` + +: First PUA codepoint to use, in hexadecimal (default F100) + +`--include-counts` + +: Include number of times each character is referenced (default: false) + +`--strip-dotted-circle` + +: Strip U+25CC (dotted circle base) from results (default: false) + +`-m, --mapping-file ` + +: Result file to write to (.json, .md, or .txt) + +For more information on the purpose of `analyze osk-char-use` and +`analyze rewrite-osk-from-char-use`, see +[`&displayMap`](/developer/language/reference/displaymap). + +## `kmc analyze osk-rewrite-from-char-use` options + +`-m, --mapping-file ` + +: JSON mapping file to read from. + +For more information on the purpose of `analyze osk-char-use` and +`analyze rewrite-osk-from-char-use`, see +[`&displayMap`](/developer/language/reference/displaymap). + +## `kmc message` options + +One or more message identifiers can be specified for text or json formats. + +Message identifiers are 5 hex digit codes, optonally preceded by `KM`, for +example `KM02001`. + +For Markdown format, all messages are always emitted, to `out-path`, and no +messages can be specified on the command line, with one file per message, and +index files also generated. The Markdown mode is used to generate the online +documentation on help.keyman.com. + +`-f, --format ` + +: Output format, one of: + * `text`: plain text output to console or file, of specified messages + * `json`: JSON formatted to console or file, of specified messages + * `markdown`: Markdown formatted text output, to a folder, of all messages + +`-o, --out-path ` + +: Output folder name for Markdown format (required for Markdown), or optional + output filename for text and json formats. + +`-a, --all-messages` + +: Emit descriptions for all messages (text, json formats) + diff --git a/developer/docs/help/reference/kmc/index.md b/developer/docs/help/reference/kmc/index.md new file mode 100644 index 00000000000..1630554982b --- /dev/null +++ b/developer/docs/help/reference/kmc/index.md @@ -0,0 +1,15 @@ +--- +title: Command line compiler kmc +--- + +kmc is the Keyman Developer command line compiler interface. + +# Using kmc + +* [Get started using kmc](cli/get-started) +* [Migrating from kmcomp to kmc](cli/kmcomp-migration) + +# kmc Reference + +* [kmc Command Line Reference](cli/reference) +* [kmc module API Reference](api) diff --git a/developer/docs/help/reference/messages/common-types.commontypesmessages.md b/developer/docs/help/reference/messages/common-types.commontypesmessages.md new file mode 100644 index 00000000000..38baeb6e522 --- /dev/null +++ b/developer/docs/help/reference/messages/common-types.commontypesmessages.md @@ -0,0 +1,13 @@ +--- +title: Compiler Messages Reference for @keymanapp/common-types +--- + + Code | Identifier | Message +------|------------|--------- +[KM01001](km01001) | `ERROR_SchemaValidationError` | Error validating LDML XML file: <param>: <param>: <param> <param> +[KM01002](km01002) | `ERROR_ImportInvalidBase` | Import element with base <param> is unsupported\. Only cldr is supported\. +[KM01003](km01003) | `ERROR_ImportInvalidPath` | Import element with invalid path <param>: expected the form '45/\*\.xml +[KM01004](km01004) | `ERROR_ImportReadFail` | Import could not read data with path <param>: expected the form '45/\*\.xml' +[KM01005](km01005) | `ERROR_ImportWrongRoot` | Invalid import file <param>: expected <param> as root element\. +[KM01006](km01006) | `ERROR_ImportMergeFail` | Problem importing <param>: not sure how to handle non\-array <param>\.<param> +[KM01007](km01007) | `ERROR_TestDataUnexpectedArray` | Problem reading test data: expected single <param> element, found multiple diff --git a/developer/docs/help/reference/messages/index.md b/developer/docs/help/reference/messages/index.md new file mode 100644 index 00000000000..907ca597f65 --- /dev/null +++ b/developer/docs/help/reference/messages/index.md @@ -0,0 +1,14 @@ +--- +title: Compiler Messages Reference +--- + +* [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) +* [common-types.CommonTypesMessages](common-types.commontypesmessages) +* [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) +* [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) +* [kmc-package.CompilerMessages](kmc-package.compilermessages) +* [kmc.InfrastructureMessages](kmc.infrastructuremessages) +* [kmc-analyze.AnalyzerMessages](kmc-analyze.analyzermessages) +* [kmc-kmn.KmwCompilerMessages](kmc-kmn.kmwcompilermessages) +* [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) +* [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) diff --git a/developer/docs/help/reference/messages/km00001.md b/developer/docs/help/reference/messages/km00001.md new file mode 100644 index 00000000000..0a904083131 --- /dev/null +++ b/developer/docs/help/reference/messages/km00001.md @@ -0,0 +1,11 @@ +--- +title: KM00001: HINT_NormalizationDisabled +--- + +| | | +|------------|---------- | +| Message | normalization=disabled is not recommended\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `HINT_NormalizationDisabled` | + + diff --git a/developer/docs/help/reference/messages/km00002.md b/developer/docs/help/reference/messages/km00002.md new file mode 100644 index 00000000000..8d40e1af756 --- /dev/null +++ b/developer/docs/help/reference/messages/km00002.md @@ -0,0 +1,11 @@ +--- +title: KM00002: ERROR_InvalidLocale +--- + +| | | +|------------|---------- | +| Message | Invalid BCP 47 locale form '<param>' | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidLocale` | + + diff --git a/developer/docs/help/reference/messages/km00003.md b/developer/docs/help/reference/messages/km00003.md new file mode 100644 index 00000000000..10d25857963 --- /dev/null +++ b/developer/docs/help/reference/messages/km00003.md @@ -0,0 +1,11 @@ +--- +title: KM00003: ERROR_HardwareLayerHasTooManyRows +--- + +| | | +|------------|---------- | +| Message | 'hardware' layer has too many rows | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_HardwareLayerHasTooManyRows` | + + diff --git a/developer/docs/help/reference/messages/km00004.md b/developer/docs/help/reference/messages/km00004.md new file mode 100644 index 00000000000..662a2b0fcd3 --- /dev/null +++ b/developer/docs/help/reference/messages/km00004.md @@ -0,0 +1,11 @@ +--- +title: KM00004: ERROR_RowOnHardwareLayerHasTooManyKeys +--- + +| | | +|------------|---------- | +| Message | Row \#<param> on 'hardware' <param> layer for modifier none has too many keys | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_RowOnHardwareLayerHasTooManyKeys` | + + diff --git a/developer/docs/help/reference/messages/km00005.md b/developer/docs/help/reference/messages/km00005.md new file mode 100644 index 00000000000..1f6a6a2573b --- /dev/null +++ b/developer/docs/help/reference/messages/km00005.md @@ -0,0 +1,11 @@ +--- +title: KM00005: ERROR_KeyNotFoundInKeyBag +--- + +| | | +|------------|---------- | +| Message | Key '<param>' in position \#<param> on row \#<param> of layer <param>, form '<param>' not found in key bag | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_KeyNotFoundInKeyBag` | + + diff --git a/developer/docs/help/reference/messages/km00006.md b/developer/docs/help/reference/messages/km00006.md new file mode 100644 index 00000000000..93fe0a33099 --- /dev/null +++ b/developer/docs/help/reference/messages/km00006.md @@ -0,0 +1,11 @@ +--- +title: KM00006: HINT_OneOrMoreRepeatedLocales +--- + +| | | +|------------|---------- | +| Message | After minimization, one or more locales is repeated and has been removed | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `HINT_OneOrMoreRepeatedLocales` | + + diff --git a/developer/docs/help/reference/messages/km00007.md b/developer/docs/help/reference/messages/km00007.md new file mode 100644 index 00000000000..8199e9ba278 --- /dev/null +++ b/developer/docs/help/reference/messages/km00007.md @@ -0,0 +1,11 @@ +--- +title: KM00007: ERROR_InvalidFile +--- + +| | | +|------------|---------- | +| Message | The source file has an invalid structure: <param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidFile` | + + diff --git a/developer/docs/help/reference/messages/km00008.md b/developer/docs/help/reference/messages/km00008.md new file mode 100644 index 00000000000..11fa5bba0ef --- /dev/null +++ b/developer/docs/help/reference/messages/km00008.md @@ -0,0 +1,11 @@ +--- +title: KM00008: HINT_LocaleIsNotMinimalAndClean +--- + +| | | +|------------|---------- | +| Message | Locale '<param>' is not minimal or correctly formatted and should be '<param>' | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `HINT_LocaleIsNotMinimalAndClean` | + + diff --git a/developer/docs/help/reference/messages/km00009.md b/developer/docs/help/reference/messages/km00009.md new file mode 100644 index 00000000000..144f9049916 --- /dev/null +++ b/developer/docs/help/reference/messages/km00009.md @@ -0,0 +1,11 @@ +--- +title: KM00009: ERROR_InvalidScanCode +--- + +| | | +|------------|---------- | +| Message | Form '<param>' has invalid/unknown scancodes '<param>' | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidScanCode` | + + diff --git a/developer/docs/help/reference/messages/km0000a.md b/developer/docs/help/reference/messages/km0000a.md new file mode 100644 index 00000000000..7396bd7e0f2 --- /dev/null +++ b/developer/docs/help/reference/messages/km0000a.md @@ -0,0 +1,11 @@ +--- +title: KM0000A: WARN_CustomForm +--- + +| | | +|------------|---------- | +| Message | Custom <form id="<param>"> element\. Key layout may not be as expected\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `WARN_CustomForm` | + + diff --git a/developer/docs/help/reference/messages/km0000b.md b/developer/docs/help/reference/messages/km0000b.md new file mode 100644 index 00000000000..0fd4457bec6 --- /dev/null +++ b/developer/docs/help/reference/messages/km0000b.md @@ -0,0 +1,11 @@ +--- +title: KM0000B: ERROR_GestureKeyNotFoundInKeyBag +--- + +| | | +|------------|---------- | +| Message | Key '<param>' not found in key bag, referenced from other '<param>' in <param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_GestureKeyNotFoundInKeyBag` | + + diff --git a/developer/docs/help/reference/messages/km0000d.md b/developer/docs/help/reference/messages/km0000d.md new file mode 100644 index 00000000000..7ab2b13d3cc --- /dev/null +++ b/developer/docs/help/reference/messages/km0000d.md @@ -0,0 +1,11 @@ +--- +title: KM0000D: ERROR_InvalidVersion +--- + +| | | +|------------|---------- | +| Message | Version number '<param>' must be a semantic version format string\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidVersion` | + + diff --git a/developer/docs/help/reference/messages/km0000e.md b/developer/docs/help/reference/messages/km0000e.md new file mode 100644 index 00000000000..e14df1843cc --- /dev/null +++ b/developer/docs/help/reference/messages/km0000e.md @@ -0,0 +1,11 @@ +--- +title: KM0000E: ERROR_MustBeAtLeastOneLayerElement +--- + +| | | +|------------|---------- | +| Message | The source file must contain at least one layer element\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_MustBeAtLeastOneLayerElement` | + + diff --git a/developer/docs/help/reference/messages/km00010.md b/developer/docs/help/reference/messages/km00010.md new file mode 100644 index 00000000000..9f0dfbab729 --- /dev/null +++ b/developer/docs/help/reference/messages/km00010.md @@ -0,0 +1,11 @@ +--- +title: KM00010: ERROR_DisplayIsRepeated +--- + +| | | +|------------|---------- | +| Message | display has more than one display entry\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_DisplayIsRepeated` | + + diff --git a/developer/docs/help/reference/messages/km00011.md b/developer/docs/help/reference/messages/km00011.md new file mode 100644 index 00000000000..6f26e3ecf87 --- /dev/null +++ b/developer/docs/help/reference/messages/km00011.md @@ -0,0 +1,11 @@ +--- +title: KM00011: ERROR_KeyMissingToGapOrSwitch +--- + +| | | +|------------|---------- | +| Message | key id='<param>' must have either output=, gap=, or layerId=\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_KeyMissingToGapOrSwitch` | + + diff --git a/developer/docs/help/reference/messages/km00012.md b/developer/docs/help/reference/messages/km00012.md new file mode 100644 index 00000000000..6f2789649d0 --- /dev/null +++ b/developer/docs/help/reference/messages/km00012.md @@ -0,0 +1,11 @@ +--- +title: KM00012: ERROR_ExcessHardware +--- + +| | | +|------------|---------- | +| Message | layers formId=<param>: Can only have one non\-'touch' element | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_ExcessHardware` | + + diff --git a/developer/docs/help/reference/messages/km00013.md b/developer/docs/help/reference/messages/km00013.md new file mode 100644 index 00000000000..4795d8683c7 --- /dev/null +++ b/developer/docs/help/reference/messages/km00013.md @@ -0,0 +1,11 @@ +--- +title: KM00013: ERROR_InvalidHardware +--- + +| | | +|------------|---------- | +| Message | layers has invalid value formId=<param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidHardware` | + + diff --git a/developer/docs/help/reference/messages/km00014.md b/developer/docs/help/reference/messages/km00014.md new file mode 100644 index 00000000000..64d65a96da0 --- /dev/null +++ b/developer/docs/help/reference/messages/km00014.md @@ -0,0 +1,11 @@ +--- +title: KM00014: ERROR_InvalidModifier +--- + +| | | +|------------|---------- | +| Message | layer has invalid modifiers='<param>' on layer id=<param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidModifier` | + + diff --git a/developer/docs/help/reference/messages/km00015.md b/developer/docs/help/reference/messages/km00015.md new file mode 100644 index 00000000000..1102e70a94b --- /dev/null +++ b/developer/docs/help/reference/messages/km00015.md @@ -0,0 +1,11 @@ +--- +title: KM00015: ERROR_MissingFlicks +--- + +| | | +|------------|---------- | +| Message | key id=<param> refers to missing flickId=<param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_MissingFlicks` | + + diff --git a/developer/docs/help/reference/messages/km00016.md b/developer/docs/help/reference/messages/km00016.md new file mode 100644 index 00000000000..b6c3a6afb14 --- /dev/null +++ b/developer/docs/help/reference/messages/km00016.md @@ -0,0 +1,11 @@ +--- +title: KM00016: ERROR_DuplicateVariable +--- + +| | | +|------------|---------- | +| Message | duplicate variables: id=<param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_DuplicateVariable` | + + diff --git a/developer/docs/help/reference/messages/km00018.md b/developer/docs/help/reference/messages/km00018.md new file mode 100644 index 00000000000..a323ee5c648 --- /dev/null +++ b/developer/docs/help/reference/messages/km00018.md @@ -0,0 +1,11 @@ +--- +title: KM00018: ERROR_InvalidTransformsType +--- + +| | | +|------------|---------- | +| Message | Invalid transforms types: '<param>' | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidTransformsType` | + + diff --git a/developer/docs/help/reference/messages/km00019.md b/developer/docs/help/reference/messages/km00019.md new file mode 100644 index 00000000000..21f25ec3c00 --- /dev/null +++ b/developer/docs/help/reference/messages/km00019.md @@ -0,0 +1,11 @@ +--- +title: KM00019: ERROR_DuplicateTransformsType +--- + +| | | +|------------|---------- | +| Message | Duplicate transforms types: '<param>' | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_DuplicateTransformsType` | + + diff --git a/developer/docs/help/reference/messages/km0001a.md b/developer/docs/help/reference/messages/km0001a.md new file mode 100644 index 00000000000..5d2eae21429 --- /dev/null +++ b/developer/docs/help/reference/messages/km0001a.md @@ -0,0 +1,11 @@ +--- +title: KM0001A: ERROR_MixedTransformGroup +--- + +| | | +|------------|---------- | +| Message | transformGroup cannot contain both reorder and transform elements | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_MixedTransformGroup` | + + diff --git a/developer/docs/help/reference/messages/km0001b.md b/developer/docs/help/reference/messages/km0001b.md new file mode 100644 index 00000000000..8ddb410a580 --- /dev/null +++ b/developer/docs/help/reference/messages/km0001b.md @@ -0,0 +1,11 @@ +--- +title: KM0001B: ERROR_EmptyTransformGroup +--- + +| | | +|------------|---------- | +| Message | transformGroup must have either reorder or transform elements | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_EmptyTransformGroup` | + + diff --git a/developer/docs/help/reference/messages/km0001c.md b/developer/docs/help/reference/messages/km0001c.md new file mode 100644 index 00000000000..3338ca0251a --- /dev/null +++ b/developer/docs/help/reference/messages/km0001c.md @@ -0,0 +1,11 @@ +--- +title: KM0001C: ERROR_MissingStringVariable +--- + +| | | +|------------|---------- | +| Message | Reference to undefined string variable: $\{<param>\} | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_MissingStringVariable` | + + diff --git a/developer/docs/help/reference/messages/km0001d.md b/developer/docs/help/reference/messages/km0001d.md new file mode 100644 index 00000000000..d24fa058f93 --- /dev/null +++ b/developer/docs/help/reference/messages/km0001d.md @@ -0,0 +1,11 @@ +--- +title: KM0001D: ERROR_MissingSetVariable +--- + +| | | +|------------|---------- | +| Message | Reference to undefined set variable: $\[<param>\] | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_MissingSetVariable` | + + diff --git a/developer/docs/help/reference/messages/km0001e.md b/developer/docs/help/reference/messages/km0001e.md new file mode 100644 index 00000000000..591f53d60ae --- /dev/null +++ b/developer/docs/help/reference/messages/km0001e.md @@ -0,0 +1,11 @@ +--- +title: KM0001E: ERROR_MissingUnicodeSetVariable +--- + +| | | +|------------|---------- | +| Message | Reference to undefined UnicodeSet variable: $\[<param>\] | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_MissingUnicodeSetVariable` | + + diff --git a/developer/docs/help/reference/messages/km0001f.md b/developer/docs/help/reference/messages/km0001f.md new file mode 100644 index 00000000000..03ba8a63ee4 --- /dev/null +++ b/developer/docs/help/reference/messages/km0001f.md @@ -0,0 +1,11 @@ +--- +title: KM0001F: ERROR_NeedSpacesBetweenSetVariables +--- + +| | | +|------------|---------- | +| Message | Need spaces between set variables: <param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_NeedSpacesBetweenSetVariables` | + + diff --git a/developer/docs/help/reference/messages/km00020.md b/developer/docs/help/reference/messages/km00020.md new file mode 100644 index 00000000000..fa31310c59f --- /dev/null +++ b/developer/docs/help/reference/messages/km00020.md @@ -0,0 +1,11 @@ +--- +title: KM00020: ERROR_CantReferenceSetFromUnicodeSet +--- + +| | | +|------------|---------- | +| Message | Illegal use of set variable from within UnicodeSet: $\[<param>\] | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_CantReferenceSetFromUnicodeSet` | + + diff --git a/developer/docs/help/reference/messages/km00021.md b/developer/docs/help/reference/messages/km00021.md new file mode 100644 index 00000000000..7a51803a081 --- /dev/null +++ b/developer/docs/help/reference/messages/km00021.md @@ -0,0 +1,11 @@ +--- +title: KM00021: ERROR_MissingMarkers +--- + +| | | +|------------|---------- | +| Message | Markers used for matching but not defined: <param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_MissingMarkers` | + + diff --git a/developer/docs/help/reference/messages/km00022.md b/developer/docs/help/reference/messages/km00022.md new file mode 100644 index 00000000000..df332561348 --- /dev/null +++ b/developer/docs/help/reference/messages/km00022.md @@ -0,0 +1,11 @@ +--- +title: KM00022: ERROR_DisplayNeedsToOrId +--- + +| | | +|------------|---------- | +| Message | display needs output= or keyId=, but not both | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_DisplayNeedsToOrId` | + + diff --git a/developer/docs/help/reference/messages/km00023.md b/developer/docs/help/reference/messages/km00023.md new file mode 100644 index 00000000000..358ea1c1ef4 --- /dev/null +++ b/developer/docs/help/reference/messages/km00023.md @@ -0,0 +1,11 @@ +--- +title: KM00023: HINT_PUACharacters +--- + +| | | +|------------|---------- | +| Message | File contains <param> PUA character\(s\), including Illegal \(U\+NAN\) | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `HINT_PUACharacters` | + + diff --git a/developer/docs/help/reference/messages/km00024.md b/developer/docs/help/reference/messages/km00024.md new file mode 100644 index 00000000000..262df5019ea --- /dev/null +++ b/developer/docs/help/reference/messages/km00024.md @@ -0,0 +1,11 @@ +--- +title: KM00024: WARN_UnassignedCharacters +--- + +| | | +|------------|---------- | +| Message | File contains <param> unassigned character\(s\), including Illegal \(U\+NAN\) | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `WARN_UnassignedCharacters` | + + diff --git a/developer/docs/help/reference/messages/km00025.md b/developer/docs/help/reference/messages/km00025.md new file mode 100644 index 00000000000..e3946bbc528 --- /dev/null +++ b/developer/docs/help/reference/messages/km00025.md @@ -0,0 +1,11 @@ +--- +title: KM00025: ERROR_IllegalCharacters +--- + +| | | +|------------|---------- | +| Message | File contains <param> illegal character\(s\), including Illegal \(U\+NAN\) | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_IllegalCharacters` | + + diff --git a/developer/docs/help/reference/messages/km00026.md b/developer/docs/help/reference/messages/km00026.md new file mode 100644 index 00000000000..ebeeed31772 --- /dev/null +++ b/developer/docs/help/reference/messages/km00026.md @@ -0,0 +1,11 @@ +--- +title: KM00026: HINT_CharClassImplicitDenorm +--- + +| | | +|------------|---------- | +| Message | File has character classes which span non\-NFD character\(s\), including Illegal \(U\+NAN\)\. These will not match any text\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `HINT_CharClassImplicitDenorm` | + + diff --git a/developer/docs/help/reference/messages/km00027.md b/developer/docs/help/reference/messages/km00027.md new file mode 100644 index 00000000000..990b9b01a3c --- /dev/null +++ b/developer/docs/help/reference/messages/km00027.md @@ -0,0 +1,11 @@ +--- +title: KM00027: WARN_CharClassExplicitDenorm +--- + +| | | +|------------|---------- | +| Message | File has character classes which include non\-NFD characters\(s\), including Illegal \(U\+NAN\)\. These will not match any text\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `WARN_CharClassExplicitDenorm` | + + diff --git a/developer/docs/help/reference/messages/km00028.md b/developer/docs/help/reference/messages/km00028.md new file mode 100644 index 00000000000..5f46870d57a --- /dev/null +++ b/developer/docs/help/reference/messages/km00028.md @@ -0,0 +1,11 @@ +--- +title: KM00028: ERROR_UnparseableReorderSet +--- + +| | | +|------------|---------- | +| Message | Illegal UnicodeSet "<param>" in reorder "<param> | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_UnparseableReorderSet` | + + diff --git a/developer/docs/help/reference/messages/km00030.md b/developer/docs/help/reference/messages/km00030.md new file mode 100644 index 00000000000..43eba550c7c --- /dev/null +++ b/developer/docs/help/reference/messages/km00030.md @@ -0,0 +1,11 @@ +--- +title: KM00030: ERROR_InvalidQuadEscape +--- + +| | | +|------------|---------- | +| Message | Invalid escape "\\u0000"\. Hint: Use "\\u\{<param>\}" | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_InvalidQuadEscape` | + + diff --git a/developer/docs/help/reference/messages/km00f00.md b/developer/docs/help/reference/messages/km00f00.md new file mode 100644 index 00000000000..6077048b531 --- /dev/null +++ b/developer/docs/help/reference/messages/km00f00.md @@ -0,0 +1,11 @@ +--- +title: KM00F00: ERROR_UnparseableTransformFrom +--- + +| | | +|------------|---------- | +| Message | Invalid transform from="<param>": "<param>" | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_UnparseableTransformFrom` | + + diff --git a/developer/docs/help/reference/messages/km00f01.md b/developer/docs/help/reference/messages/km00f01.md new file mode 100644 index 00000000000..f2af03199ce --- /dev/null +++ b/developer/docs/help/reference/messages/km00f01.md @@ -0,0 +1,11 @@ +--- +title: KM00F01: ERROR_IllegalTransformDollarsign +--- + +| | | +|------------|---------- | +| Message | Invalid transform from="<param>": Unescaped dollar\-sign \($\) is not valid transform syntax\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_IllegalTransformDollarsign` | + +**Hint**: Use `\$` to match a literal dollar-sign. diff --git a/developer/docs/help/reference/messages/km00f02.md b/developer/docs/help/reference/messages/km00f02.md new file mode 100644 index 00000000000..51cbc4b4521 --- /dev/null +++ b/developer/docs/help/reference/messages/km00f02.md @@ -0,0 +1,11 @@ +--- +title: KM00F02: ERROR_TransformFromMatchesNothing +--- + +| | | +|------------|---------- | +| Message | Invalid transfom from="<param>": Matches an empty string\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_TransformFromMatchesNothing` | + + diff --git a/developer/docs/help/reference/messages/km00f03.md b/developer/docs/help/reference/messages/km00f03.md new file mode 100644 index 00000000000..ac4f22bc7d7 --- /dev/null +++ b/developer/docs/help/reference/messages/km00f03.md @@ -0,0 +1,11 @@ +--- +title: KM00F03: ERROR_IllegalTransformPlus +--- + +| | | +|------------|---------- | +| Message | Invalid transform from="<param>": Unescaped plus \(\+\) is not valid transform syntax\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_IllegalTransformPlus` | + +**Hint**: Use `\+` to match a literal plus. diff --git a/developer/docs/help/reference/messages/km00f04.md b/developer/docs/help/reference/messages/km00f04.md new file mode 100644 index 00000000000..2132866bd87 --- /dev/null +++ b/developer/docs/help/reference/messages/km00f04.md @@ -0,0 +1,11 @@ +--- +title: KM00F04: ERROR_IllegalTransformAsterisk +--- + +| | | +|------------|---------- | +| Message | Invalid transform from="<param>": Unescaped asterisk \(\*\) is not valid transform syntax\. | +| Module | [kmc-ldml.CompilerMessages](kmc-ldml.compilermessages) | +| Identifier | `ERROR_IllegalTransformAsterisk` | + +**Hint**: Use `\*` to match a literal asterisk. diff --git a/developer/docs/help/reference/messages/km01001.md b/developer/docs/help/reference/messages/km01001.md new file mode 100644 index 00000000000..a4440ecb017 --- /dev/null +++ b/developer/docs/help/reference/messages/km01001.md @@ -0,0 +1,11 @@ +--- +title: KM01001: ERROR_SchemaValidationError +--- + +| | | +|------------|---------- | +| Message | Error validating LDML XML file: <param>: <param>: <param> <param> | +| Module | [common-types.CommonTypesMessages](common-types.commontypesmessages) | +| Identifier | `ERROR_SchemaValidationError` | + + diff --git a/developer/docs/help/reference/messages/km01002.md b/developer/docs/help/reference/messages/km01002.md new file mode 100644 index 00000000000..63338ff9775 --- /dev/null +++ b/developer/docs/help/reference/messages/km01002.md @@ -0,0 +1,11 @@ +--- +title: KM01002: ERROR_ImportInvalidBase +--- + +| | | +|------------|---------- | +| Message | Import element with base <param> is unsupported\. Only cldr is supported\. | +| Module | [common-types.CommonTypesMessages](common-types.commontypesmessages) | +| Identifier | `ERROR_ImportInvalidBase` | + + diff --git a/developer/docs/help/reference/messages/km01003.md b/developer/docs/help/reference/messages/km01003.md new file mode 100644 index 00000000000..a8ce37a80e0 --- /dev/null +++ b/developer/docs/help/reference/messages/km01003.md @@ -0,0 +1,11 @@ +--- +title: KM01003: ERROR_ImportInvalidPath +--- + +| | | +|------------|---------- | +| Message | Import element with invalid path <param>: expected the form '45/\*\.xml | +| Module | [common-types.CommonTypesMessages](common-types.commontypesmessages) | +| Identifier | `ERROR_ImportInvalidPath` | + + diff --git a/developer/docs/help/reference/messages/km01004.md b/developer/docs/help/reference/messages/km01004.md new file mode 100644 index 00000000000..279786f9b6d --- /dev/null +++ b/developer/docs/help/reference/messages/km01004.md @@ -0,0 +1,11 @@ +--- +title: KM01004: ERROR_ImportReadFail +--- + +| | | +|------------|---------- | +| Message | Import could not read data with path <param>: expected the form '45/\*\.xml' | +| Module | [common-types.CommonTypesMessages](common-types.commontypesmessages) | +| Identifier | `ERROR_ImportReadFail` | + + diff --git a/developer/docs/help/reference/messages/km01005.md b/developer/docs/help/reference/messages/km01005.md new file mode 100644 index 00000000000..2d032c4ed5c --- /dev/null +++ b/developer/docs/help/reference/messages/km01005.md @@ -0,0 +1,11 @@ +--- +title: KM01005: ERROR_ImportWrongRoot +--- + +| | | +|------------|---------- | +| Message | Invalid import file <param>: expected <param> as root element\. | +| Module | [common-types.CommonTypesMessages](common-types.commontypesmessages) | +| Identifier | `ERROR_ImportWrongRoot` | + + diff --git a/developer/docs/help/reference/messages/km01006.md b/developer/docs/help/reference/messages/km01006.md new file mode 100644 index 00000000000..1e04d8c403c --- /dev/null +++ b/developer/docs/help/reference/messages/km01006.md @@ -0,0 +1,11 @@ +--- +title: KM01006: ERROR_ImportMergeFail +--- + +| | | +|------------|---------- | +| Message | Problem importing <param>: not sure how to handle non\-array <param>\.<param> | +| Module | [common-types.CommonTypesMessages](common-types.commontypesmessages) | +| Identifier | `ERROR_ImportMergeFail` | + + diff --git a/developer/docs/help/reference/messages/km01007.md b/developer/docs/help/reference/messages/km01007.md new file mode 100644 index 00000000000..e9a0dc89f77 --- /dev/null +++ b/developer/docs/help/reference/messages/km01007.md @@ -0,0 +1,11 @@ +--- +title: KM01007: ERROR_TestDataUnexpectedArray +--- + +| | | +|------------|---------- | +| Message | Problem reading test data: expected single <param> element, found multiple | +| Module | [common-types.CommonTypesMessages](common-types.commontypesmessages) | +| Identifier | `ERROR_TestDataUnexpectedArray` | + + diff --git a/developer/docs/help/reference/messages/km02001.md b/developer/docs/help/reference/messages/km02001.md new file mode 100644 index 00000000000..4532a816790 --- /dev/null +++ b/developer/docs/help/reference/messages/km02001.md @@ -0,0 +1,11 @@ +--- +title: KM02001: INFO_EndOfFile +--- + +| | | +|------------|---------- | +| Message | \(no error \- reserved code\) | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `INFO_EndOfFile` | + + diff --git a/developer/docs/help/reference/messages/km02002.md b/developer/docs/help/reference/messages/km02002.md new file mode 100644 index 00000000000..3b346a77449 --- /dev/null +++ b/developer/docs/help/reference/messages/km02002.md @@ -0,0 +1,11 @@ +--- +title: KM02002: FATAL_BadCallParams +--- + +| | | +|------------|---------- | +| Message | CompileKeyboardFile was called with bad parameters | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_BadCallParams` | + + diff --git a/developer/docs/help/reference/messages/km02004.md b/developer/docs/help/reference/messages/km02004.md new file mode 100644 index 00000000000..c583d5ef786 --- /dev/null +++ b/developer/docs/help/reference/messages/km02004.md @@ -0,0 +1,11 @@ +--- +title: KM02004: FATAL_CannotAllocateMemory +--- + +| | | +|------------|---------- | +| Message | Out of memory | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_CannotAllocateMemory` | + + diff --git a/developer/docs/help/reference/messages/km02005.md b/developer/docs/help/reference/messages/km02005.md new file mode 100644 index 00000000000..4713ec22cc4 --- /dev/null +++ b/developer/docs/help/reference/messages/km02005.md @@ -0,0 +1,11 @@ +--- +title: KM02005: ERROR_InfileNotExist +--- + +| | | +|------------|---------- | +| Message | Cannot find the input file | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InfileNotExist` | + + diff --git a/developer/docs/help/reference/messages/km02007.md b/developer/docs/help/reference/messages/km02007.md new file mode 100644 index 00000000000..4690c3c53e7 --- /dev/null +++ b/developer/docs/help/reference/messages/km02007.md @@ -0,0 +1,11 @@ +--- +title: KM02007: FATAL_UnableToWriteFully +--- + +| | | +|------------|---------- | +| Message | Unable to write the file completely | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_UnableToWriteFully` | + + diff --git a/developer/docs/help/reference/messages/km02008.md b/developer/docs/help/reference/messages/km02008.md new file mode 100644 index 00000000000..31eddb1e375 --- /dev/null +++ b/developer/docs/help/reference/messages/km02008.md @@ -0,0 +1,11 @@ +--- +title: KM02008: ERROR_CannotReadInfile +--- + +| | | +|------------|---------- | +| Message | Cannot read the input file | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CannotReadInfile` | + + diff --git a/developer/docs/help/reference/messages/km02009.md b/developer/docs/help/reference/messages/km02009.md new file mode 100644 index 00000000000..d1e3ec2155b --- /dev/null +++ b/developer/docs/help/reference/messages/km02009.md @@ -0,0 +1,11 @@ +--- +title: KM02009: FATAL_SomewhereIGotItWrong +--- + +| | | +|------------|---------- | +| Message | Internal error: contact Keyman | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_SomewhereIGotItWrong` | + + diff --git a/developer/docs/help/reference/messages/km0200a.md b/developer/docs/help/reference/messages/km0200a.md new file mode 100644 index 00000000000..c75422a406a --- /dev/null +++ b/developer/docs/help/reference/messages/km0200a.md @@ -0,0 +1,11 @@ +--- +title: KM0200A: ERROR_InvalidToken +--- + +| | | +|------------|---------- | +| Message | Invalid token found | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidToken` | + + diff --git a/developer/docs/help/reference/messages/km0200b.md b/developer/docs/help/reference/messages/km0200b.md new file mode 100644 index 00000000000..41e821d0184 --- /dev/null +++ b/developer/docs/help/reference/messages/km0200b.md @@ -0,0 +1,11 @@ +--- +title: KM0200B: ERROR_InvalidBegin +--- + +| | | +|------------|---------- | +| Message | A "begin unicode" statement is required to compile a KeymanWeb keyboard | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidBegin` | + + diff --git a/developer/docs/help/reference/messages/km0200c.md b/developer/docs/help/reference/messages/km0200c.md new file mode 100644 index 00000000000..8567272ba11 --- /dev/null +++ b/developer/docs/help/reference/messages/km0200c.md @@ -0,0 +1,11 @@ +--- +title: KM0200C: ERROR_InvalidName +--- + +| | | +|------------|---------- | +| Message | Invalid 'name' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidName` | + + diff --git a/developer/docs/help/reference/messages/km0200d.md b/developer/docs/help/reference/messages/km0200d.md new file mode 100644 index 00000000000..41ac2e2b613 --- /dev/null +++ b/developer/docs/help/reference/messages/km0200d.md @@ -0,0 +1,11 @@ +--- +title: KM0200D: ERROR_InvalidVersion +--- + +| | | +|------------|---------- | +| Message | Invalid 'version' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidVersion` | + + diff --git a/developer/docs/help/reference/messages/km0200e.md b/developer/docs/help/reference/messages/km0200e.md new file mode 100644 index 00000000000..0853617cc4a --- /dev/null +++ b/developer/docs/help/reference/messages/km0200e.md @@ -0,0 +1,11 @@ +--- +title: KM0200E: ERROR_InvalidLanguageLine +--- + +| | | +|------------|---------- | +| Message | Invalid 'language' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidLanguageLine` | + + diff --git a/developer/docs/help/reference/messages/km0200f.md b/developer/docs/help/reference/messages/km0200f.md new file mode 100644 index 00000000000..f894cd6f49b --- /dev/null +++ b/developer/docs/help/reference/messages/km0200f.md @@ -0,0 +1,11 @@ +--- +title: KM0200F: ERROR_LayoutButNoLanguage +--- + +| | | +|------------|---------- | +| Message | Layout command found but no language command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_LayoutButNoLanguage` | + + diff --git a/developer/docs/help/reference/messages/km02010.md b/developer/docs/help/reference/messages/km02010.md new file mode 100644 index 00000000000..b5cb984cf47 --- /dev/null +++ b/developer/docs/help/reference/messages/km02010.md @@ -0,0 +1,11 @@ +--- +title: KM02010: ERROR_InvalidLayoutLine +--- + +| | | +|------------|---------- | +| Message | Invalid 'layout' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidLayoutLine` | + + diff --git a/developer/docs/help/reference/messages/km02011.md b/developer/docs/help/reference/messages/km02011.md new file mode 100644 index 00000000000..07658b237ae --- /dev/null +++ b/developer/docs/help/reference/messages/km02011.md @@ -0,0 +1,11 @@ +--- +title: KM02011: ERROR_NoVersionLine +--- + +| | | +|------------|---------- | +| Message | No version line found for file | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_NoVersionLine` | + + diff --git a/developer/docs/help/reference/messages/km02012.md b/developer/docs/help/reference/messages/km02012.md new file mode 100644 index 00000000000..fa208fab3ea --- /dev/null +++ b/developer/docs/help/reference/messages/km02012.md @@ -0,0 +1,11 @@ +--- +title: KM02012: ERROR_InvalidGroupLine +--- + +| | | +|------------|---------- | +| Message | Invalid 'group' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidGroupLine` | + + diff --git a/developer/docs/help/reference/messages/km02013.md b/developer/docs/help/reference/messages/km02013.md new file mode 100644 index 00000000000..924407d9e97 --- /dev/null +++ b/developer/docs/help/reference/messages/km02013.md @@ -0,0 +1,11 @@ +--- +title: KM02013: ERROR_InvalidStoreLine +--- + +| | | +|------------|---------- | +| Message | Invalid 'store' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidStoreLine` | + + diff --git a/developer/docs/help/reference/messages/km02014.md b/developer/docs/help/reference/messages/km02014.md new file mode 100644 index 00000000000..6d010dc536d --- /dev/null +++ b/developer/docs/help/reference/messages/km02014.md @@ -0,0 +1,11 @@ +--- +title: KM02014: ERROR_InvalidCodeInKeyPartOfRule +--- + +| | | +|------------|---------- | +| Message | Invalid command or code found in key part of rule | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidCodeInKeyPartOfRule` | + + diff --git a/developer/docs/help/reference/messages/km02015.md b/developer/docs/help/reference/messages/km02015.md new file mode 100644 index 00000000000..01006037b26 --- /dev/null +++ b/developer/docs/help/reference/messages/km02015.md @@ -0,0 +1,11 @@ +--- +title: KM02015: ERROR_InvalidDeadkey +--- + +| | | +|------------|---------- | +| Message | Invalid 'deadkey' or 'dk' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidDeadkey` | + + diff --git a/developer/docs/help/reference/messages/km02016.md b/developer/docs/help/reference/messages/km02016.md new file mode 100644 index 00000000000..603122cd62d --- /dev/null +++ b/developer/docs/help/reference/messages/km02016.md @@ -0,0 +1,11 @@ +--- +title: KM02016: ERROR_InvalidValue +--- + +| | | +|------------|---------- | +| Message | Invalid value in extended string | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidValue` | + + diff --git a/developer/docs/help/reference/messages/km02017.md b/developer/docs/help/reference/messages/km02017.md new file mode 100644 index 00000000000..74a0a5c5dfc --- /dev/null +++ b/developer/docs/help/reference/messages/km02017.md @@ -0,0 +1,11 @@ +--- +title: KM02017: ERROR_ZeroLengthString +--- + +| | | +|------------|---------- | +| Message | A string of zero characters was found | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ZeroLengthString` | + + diff --git a/developer/docs/help/reference/messages/km02018.md b/developer/docs/help/reference/messages/km02018.md new file mode 100644 index 00000000000..662e2a7b544 --- /dev/null +++ b/developer/docs/help/reference/messages/km02018.md @@ -0,0 +1,11 @@ +--- +title: KM02018: ERROR_TooManyIndexToKeyRefs +--- + +| | | +|------------|---------- | +| Message | Too many index commands refering to key string | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_TooManyIndexToKeyRefs` | + + diff --git a/developer/docs/help/reference/messages/km02019.md b/developer/docs/help/reference/messages/km02019.md new file mode 100644 index 00000000000..6ff35e690a6 --- /dev/null +++ b/developer/docs/help/reference/messages/km02019.md @@ -0,0 +1,11 @@ +--- +title: KM02019: ERROR_UnterminatedString +--- + +| | | +|------------|---------- | +| Message | Unterminated string in line | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_UnterminatedString` | + + diff --git a/developer/docs/help/reference/messages/km0201a.md b/developer/docs/help/reference/messages/km0201a.md new file mode 100644 index 00000000000..c5be97b8103 --- /dev/null +++ b/developer/docs/help/reference/messages/km0201a.md @@ -0,0 +1,11 @@ +--- +title: KM0201A: ERROR_StringInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | extend string illegal in virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_StringInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km0201b.md b/developer/docs/help/reference/messages/km0201b.md new file mode 100644 index 00000000000..142b6b5f9a0 --- /dev/null +++ b/developer/docs/help/reference/messages/km0201b.md @@ -0,0 +1,11 @@ +--- +title: KM0201B: ERROR_AnyInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | 'any' command is illegal in virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_AnyInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km0201c.md b/developer/docs/help/reference/messages/km0201c.md new file mode 100644 index 00000000000..353337f6789 --- /dev/null +++ b/developer/docs/help/reference/messages/km0201c.md @@ -0,0 +1,11 @@ +--- +title: KM0201C: ERROR_InvalidAny +--- + +| | | +|------------|---------- | +| Message | Invalid 'any' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidAny` | + + diff --git a/developer/docs/help/reference/messages/km0201d.md b/developer/docs/help/reference/messages/km0201d.md new file mode 100644 index 00000000000..e998ebfd8f8 --- /dev/null +++ b/developer/docs/help/reference/messages/km0201d.md @@ -0,0 +1,11 @@ +--- +title: KM0201D: ERROR_StoreDoesNotExist +--- + +| | | +|------------|---------- | +| Message | Store referenced does not exist | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_StoreDoesNotExist` | + + diff --git a/developer/docs/help/reference/messages/km0201e.md b/developer/docs/help/reference/messages/km0201e.md new file mode 100644 index 00000000000..f6af856370a --- /dev/null +++ b/developer/docs/help/reference/messages/km0201e.md @@ -0,0 +1,11 @@ +--- +title: KM0201E: ERROR_BeepInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | 'beep' command is illegal in virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_BeepInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km0201f.md b/developer/docs/help/reference/messages/km0201f.md new file mode 100644 index 00000000000..30c1123411b --- /dev/null +++ b/developer/docs/help/reference/messages/km0201f.md @@ -0,0 +1,11 @@ +--- +title: KM0201F: ERROR_IndexInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | 'index' command is illegal in virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_IndexInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km02020.md b/developer/docs/help/reference/messages/km02020.md new file mode 100644 index 00000000000..ab2c0c7177f --- /dev/null +++ b/developer/docs/help/reference/messages/km02020.md @@ -0,0 +1,11 @@ +--- +title: KM02020: ERROR_InvalidIndex +--- + +| | | +|------------|---------- | +| Message | Invalid 'index' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidIndex` | + + diff --git a/developer/docs/help/reference/messages/km02021.md b/developer/docs/help/reference/messages/km02021.md new file mode 100644 index 00000000000..4082b601640 --- /dev/null +++ b/developer/docs/help/reference/messages/km02021.md @@ -0,0 +1,11 @@ +--- +title: KM02021: ERROR_OutsInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | 'outs' command is illegal in virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_OutsInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km02022.md b/developer/docs/help/reference/messages/km02022.md new file mode 100644 index 00000000000..10887e79098 --- /dev/null +++ b/developer/docs/help/reference/messages/km02022.md @@ -0,0 +1,11 @@ +--- +title: KM02022: ERROR_InvalidOuts +--- + +| | | +|------------|---------- | +| Message | Invalid 'outs' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidOuts` | + + diff --git a/developer/docs/help/reference/messages/km02024.md b/developer/docs/help/reference/messages/km02024.md new file mode 100644 index 00000000000..bee175522c1 --- /dev/null +++ b/developer/docs/help/reference/messages/km02024.md @@ -0,0 +1,11 @@ +--- +title: KM02024: ERROR_ContextInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | 'context' command is illegal in virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ContextInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km02025.md b/developer/docs/help/reference/messages/km02025.md new file mode 100644 index 00000000000..74183960bcb --- /dev/null +++ b/developer/docs/help/reference/messages/km02025.md @@ -0,0 +1,11 @@ +--- +title: KM02025: ERROR_InvalidUse +--- + +| | | +|------------|---------- | +| Message | Invalid 'use' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidUse` | + + diff --git a/developer/docs/help/reference/messages/km02026.md b/developer/docs/help/reference/messages/km02026.md new file mode 100644 index 00000000000..3f23dc452bd --- /dev/null +++ b/developer/docs/help/reference/messages/km02026.md @@ -0,0 +1,11 @@ +--- +title: KM02026: ERROR_GroupDoesNotExist +--- + +| | | +|------------|---------- | +| Message | Group does not exist | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_GroupDoesNotExist` | + + diff --git a/developer/docs/help/reference/messages/km02027.md b/developer/docs/help/reference/messages/km02027.md new file mode 100644 index 00000000000..62339e8f9c2 --- /dev/null +++ b/developer/docs/help/reference/messages/km02027.md @@ -0,0 +1,11 @@ +--- +title: KM02027: ERROR_VirtualKeyNotAllowedHere +--- + +| | | +|------------|---------- | +| Message | Virtual key is not allowed here | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VirtualKeyNotAllowedHere` | + + diff --git a/developer/docs/help/reference/messages/km02028.md b/developer/docs/help/reference/messages/km02028.md new file mode 100644 index 00000000000..cf0861c63be --- /dev/null +++ b/developer/docs/help/reference/messages/km02028.md @@ -0,0 +1,11 @@ +--- +title: KM02028: ERROR_InvalidSwitch +--- + +| | | +|------------|---------- | +| Message | Invalid 'switch' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidSwitch` | + + diff --git a/developer/docs/help/reference/messages/km02029.md b/developer/docs/help/reference/messages/km02029.md new file mode 100644 index 00000000000..4033972752b --- /dev/null +++ b/developer/docs/help/reference/messages/km02029.md @@ -0,0 +1,11 @@ +--- +title: KM02029: ERROR_NoTokensFound +--- + +| | | +|------------|---------- | +| Message | No tokens found in line | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_NoTokensFound` | + + diff --git a/developer/docs/help/reference/messages/km0202a.md b/developer/docs/help/reference/messages/km0202a.md new file mode 100644 index 00000000000..163d7072039 --- /dev/null +++ b/developer/docs/help/reference/messages/km0202a.md @@ -0,0 +1,11 @@ +--- +title: KM0202A: ERROR_InvalidLineContinuation +--- + +| | | +|------------|---------- | +| Message | Invalid line continuation | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidLineContinuation` | + + diff --git a/developer/docs/help/reference/messages/km0202b.md b/developer/docs/help/reference/messages/km0202b.md new file mode 100644 index 00000000000..72457a2dc4f --- /dev/null +++ b/developer/docs/help/reference/messages/km0202b.md @@ -0,0 +1,11 @@ +--- +title: KM0202B: ERROR_LineTooLong +--- + +| | | +|------------|---------- | +| Message | Line too long | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_LineTooLong` | + + diff --git a/developer/docs/help/reference/messages/km0202c.md b/developer/docs/help/reference/messages/km0202c.md new file mode 100644 index 00000000000..9e5260a5eed --- /dev/null +++ b/developer/docs/help/reference/messages/km0202c.md @@ -0,0 +1,11 @@ +--- +title: KM0202C: ERROR_InvalidCopyright +--- + +| | | +|------------|---------- | +| Message | Invalid 'copyright' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidCopyright` | + + diff --git a/developer/docs/help/reference/messages/km0202d.md b/developer/docs/help/reference/messages/km0202d.md new file mode 100644 index 00000000000..523b8123df4 --- /dev/null +++ b/developer/docs/help/reference/messages/km0202d.md @@ -0,0 +1,11 @@ +--- +title: KM0202D: ERROR_CodeInvalidInThisSection +--- + +| | | +|------------|---------- | +| Message | This line is invalid in this section of the file | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CodeInvalidInThisSection` | + + diff --git a/developer/docs/help/reference/messages/km0202e.md b/developer/docs/help/reference/messages/km0202e.md new file mode 100644 index 00000000000..1d9acf621e0 --- /dev/null +++ b/developer/docs/help/reference/messages/km0202e.md @@ -0,0 +1,11 @@ +--- +title: KM0202E: ERROR_InvalidMessage +--- + +| | | +|------------|---------- | +| Message | Invalid 'message' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidMessage` | + + diff --git a/developer/docs/help/reference/messages/km0202f.md b/developer/docs/help/reference/messages/km0202f.md new file mode 100644 index 00000000000..606967be92f --- /dev/null +++ b/developer/docs/help/reference/messages/km0202f.md @@ -0,0 +1,11 @@ +--- +title: KM0202F: ERROR_InvalidLanguageName +--- + +| | | +|------------|---------- | +| Message | Invalid 'languagename' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidLanguageName` | + + diff --git a/developer/docs/help/reference/messages/km02030.md b/developer/docs/help/reference/messages/km02030.md new file mode 100644 index 00000000000..5c912beafae --- /dev/null +++ b/developer/docs/help/reference/messages/km02030.md @@ -0,0 +1,11 @@ +--- +title: KM02030: ERROR_InvalidBitmapLine +--- + +| | | +|------------|---------- | +| Message | Invalid 'bitmaps' command | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidBitmapLine` | + + diff --git a/developer/docs/help/reference/messages/km02031.md b/developer/docs/help/reference/messages/km02031.md new file mode 100644 index 00000000000..b73d1a59ea4 --- /dev/null +++ b/developer/docs/help/reference/messages/km02031.md @@ -0,0 +1,11 @@ +--- +title: KM02031: ERROR_CannotReadBitmapFile +--- + +| | | +|------------|---------- | +| Message | Cannot open the bitmap or icon file for reading | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CannotReadBitmapFile` | + + diff --git a/developer/docs/help/reference/messages/km02032.md b/developer/docs/help/reference/messages/km02032.md new file mode 100644 index 00000000000..a555afd4d6c --- /dev/null +++ b/developer/docs/help/reference/messages/km02032.md @@ -0,0 +1,11 @@ +--- +title: KM02032: ERROR_IndexDoesNotPointToAny +--- + +| | | +|------------|---------- | +| Message | An index\(\) in the output does not have a corresponding any\(\) statement | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_IndexDoesNotPointToAny` | + + diff --git a/developer/docs/help/reference/messages/km02033.md b/developer/docs/help/reference/messages/km02033.md new file mode 100644 index 00000000000..7980984fff2 --- /dev/null +++ b/developer/docs/help/reference/messages/km02033.md @@ -0,0 +1,11 @@ +--- +title: KM02033: ERROR_ReservedCharacter +--- + +| | | +|------------|---------- | +| Message | A reserved character was found | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ReservedCharacter` | + + diff --git a/developer/docs/help/reference/messages/km02034.md b/developer/docs/help/reference/messages/km02034.md new file mode 100644 index 00000000000..d5a1a6f8390 --- /dev/null +++ b/developer/docs/help/reference/messages/km02034.md @@ -0,0 +1,11 @@ +--- +title: KM02034: ERROR_InvalidCharacter +--- + +| | | +|------------|---------- | +| Message | A character was found that is outside the valid Unicode range \(U\+0000 \- U\+10FFFF\) | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidCharacter` | + + diff --git a/developer/docs/help/reference/messages/km02035.md b/developer/docs/help/reference/messages/km02035.md new file mode 100644 index 00000000000..e8141d6387e --- /dev/null +++ b/developer/docs/help/reference/messages/km02035.md @@ -0,0 +1,11 @@ +--- +title: KM02035: ERROR_InvalidCall +--- + +| | | +|------------|---------- | +| Message | The 'call' command is invalid | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidCall` | + + diff --git a/developer/docs/help/reference/messages/km02036.md b/developer/docs/help/reference/messages/km02036.md new file mode 100644 index 00000000000..ab056bf0a27 --- /dev/null +++ b/developer/docs/help/reference/messages/km02036.md @@ -0,0 +1,11 @@ +--- +title: KM02036: ERROR_CallInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | 'call' command is illegal in virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CallInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km02037.md b/developer/docs/help/reference/messages/km02037.md new file mode 100644 index 00000000000..9b15dc2d7f0 --- /dev/null +++ b/developer/docs/help/reference/messages/km02037.md @@ -0,0 +1,11 @@ +--- +title: KM02037: ERROR_CodeInvalidInKeyStore +--- + +| | | +|------------|---------- | +| Message | The command is invalid inside a store that is used in a key part of the rule | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CodeInvalidInKeyStore` | + + diff --git a/developer/docs/help/reference/messages/km02038.md b/developer/docs/help/reference/messages/km02038.md new file mode 100644 index 00000000000..2b4e35050b3 --- /dev/null +++ b/developer/docs/help/reference/messages/km02038.md @@ -0,0 +1,11 @@ +--- +title: KM02038: ERROR_CannotLoadIncludeFile +--- + +| | | +|------------|---------- | +| Message | Cannot load the included file: it is either invalid or does not exist | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CannotLoadIncludeFile` | + + diff --git a/developer/docs/help/reference/messages/km02039.md b/developer/docs/help/reference/messages/km02039.md new file mode 100644 index 00000000000..5b9a6cbe0db --- /dev/null +++ b/developer/docs/help/reference/messages/km02039.md @@ -0,0 +1,11 @@ +--- +title: KM02039: ERROR_60FeatureOnly_EthnologueCode +--- + +| | | +|------------|---------- | +| Message | EthnologueCode system store requires VERSION 6\.0 or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_60FeatureOnly_EthnologueCode` | + + diff --git a/developer/docs/help/reference/messages/km0203a.md b/developer/docs/help/reference/messages/km0203a.md new file mode 100644 index 00000000000..02e84c70f92 --- /dev/null +++ b/developer/docs/help/reference/messages/km0203a.md @@ -0,0 +1,11 @@ +--- +title: KM0203A: ERROR_60FeatureOnly_MnemonicLayout +--- + +| | | +|------------|---------- | +| Message | MnemonicLayout functionality requires VERSION 6\.0 or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_60FeatureOnly_MnemonicLayout` | + + diff --git a/developer/docs/help/reference/messages/km0203b.md b/developer/docs/help/reference/messages/km0203b.md new file mode 100644 index 00000000000..3dff8c79869 --- /dev/null +++ b/developer/docs/help/reference/messages/km0203b.md @@ -0,0 +1,11 @@ +--- +title: KM0203B: ERROR_60FeatureOnly_OldCharPosMatching +--- + +| | | +|------------|---------- | +| Message | OldCharPosMatching system store requires VERSION 6\.0 or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_60FeatureOnly_OldCharPosMatching` | + + diff --git a/developer/docs/help/reference/messages/km0203c.md b/developer/docs/help/reference/messages/km0203c.md new file mode 100644 index 00000000000..270b19f3f9f --- /dev/null +++ b/developer/docs/help/reference/messages/km0203c.md @@ -0,0 +1,11 @@ +--- +title: KM0203C: ERROR_60FeatureOnly_NamedCodes +--- + +| | | +|------------|---------- | +| Message | Named character constants requires VERSION 6\.0 or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_60FeatureOnly_NamedCodes` | + + diff --git a/developer/docs/help/reference/messages/km0203d.md b/developer/docs/help/reference/messages/km0203d.md new file mode 100644 index 00000000000..bc67492e361 --- /dev/null +++ b/developer/docs/help/reference/messages/km0203d.md @@ -0,0 +1,11 @@ +--- +title: KM0203D: ERROR_60FeatureOnly_Contextn +--- + +| | | +|------------|---------- | +| Message | Context\(n\) requires VERSION 6\.0 or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_60FeatureOnly_Contextn` | + + diff --git a/developer/docs/help/reference/messages/km0203e.md b/developer/docs/help/reference/messages/km0203e.md new file mode 100644 index 00000000000..4f4e91b205b --- /dev/null +++ b/developer/docs/help/reference/messages/km0203e.md @@ -0,0 +1,11 @@ +--- +title: KM0203E: ERROR_501FeatureOnly_Call +--- + +| | | +|------------|---------- | +| Message | Call\(\) requires VERSION 5\.01 or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_501FeatureOnly_Call` | + + diff --git a/developer/docs/help/reference/messages/km0203f.md b/developer/docs/help/reference/messages/km0203f.md new file mode 100644 index 00000000000..c9348072966 --- /dev/null +++ b/developer/docs/help/reference/messages/km0203f.md @@ -0,0 +1,11 @@ +--- +title: KM0203F: ERROR_InvalidNamedCode +--- + +| | | +|------------|---------- | +| Message | Invalid named code constant | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidNamedCode` | + + diff --git a/developer/docs/help/reference/messages/km02040.md b/developer/docs/help/reference/messages/km02040.md new file mode 100644 index 00000000000..6d6884f63af --- /dev/null +++ b/developer/docs/help/reference/messages/km02040.md @@ -0,0 +1,11 @@ +--- +title: KM02040: ERROR_InvalidSystemStore +--- + +| | | +|------------|---------- | +| Message | Invalid system store name found | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidSystemStore` | + + diff --git a/developer/docs/help/reference/messages/km02044.md b/developer/docs/help/reference/messages/km02044.md new file mode 100644 index 00000000000..9d64c33fb04 --- /dev/null +++ b/developer/docs/help/reference/messages/km02044.md @@ -0,0 +1,11 @@ +--- +title: KM02044: ERROR_60FeatureOnly_VirtualCharKey +--- + +| | | +|------------|---------- | +| Message | Virtual character keys require VERSION 6\.0 or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_60FeatureOnly_VirtualCharKey` | + + diff --git a/developer/docs/help/reference/messages/km02045.md b/developer/docs/help/reference/messages/km02045.md new file mode 100644 index 00000000000..ff5f5707a6a --- /dev/null +++ b/developer/docs/help/reference/messages/km02045.md @@ -0,0 +1,11 @@ +--- +title: KM02045: ERROR_VersionAlreadyIncluded +--- + +| | | +|------------|---------- | +| Message | Only one VERSION or store\(version\) line allowed in a source file\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VersionAlreadyIncluded` | + + diff --git a/developer/docs/help/reference/messages/km02046.md b/developer/docs/help/reference/messages/km02046.md new file mode 100644 index 00000000000..2e7458348ae --- /dev/null +++ b/developer/docs/help/reference/messages/km02046.md @@ -0,0 +1,11 @@ +--- +title: KM02046: ERROR_70FeatureOnly +--- + +| | | +|------------|---------- | +| Message | This feature requires store\(version\) '7\.0' or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_70FeatureOnly` | + + diff --git a/developer/docs/help/reference/messages/km02047.md b/developer/docs/help/reference/messages/km02047.md new file mode 100644 index 00000000000..4c7d6446ef8 --- /dev/null +++ b/developer/docs/help/reference/messages/km02047.md @@ -0,0 +1,11 @@ +--- +title: KM02047: ERROR_80FeatureOnly +--- + +| | | +|------------|---------- | +| Message | This feature requires store\(version\) '8\.0' or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_80FeatureOnly` | + + diff --git a/developer/docs/help/reference/messages/km02048.md b/developer/docs/help/reference/messages/km02048.md new file mode 100644 index 00000000000..e5f84c82e69 --- /dev/null +++ b/developer/docs/help/reference/messages/km02048.md @@ -0,0 +1,11 @@ +--- +title: KM02048: ERROR_InvalidInVirtualKeySection +--- + +| | | +|------------|---------- | +| Message | This statement is not valid in a virtual key section | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidInVirtualKeySection` | + + diff --git a/developer/docs/help/reference/messages/km02049.md b/developer/docs/help/reference/messages/km02049.md new file mode 100644 index 00000000000..ead8d86ad6d --- /dev/null +++ b/developer/docs/help/reference/messages/km02049.md @@ -0,0 +1,11 @@ +--- +title: KM02049: ERROR_InvalidIf +--- + +| | | +|------------|---------- | +| Message | The if\(\) statement is not valid | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidIf` | + + diff --git a/developer/docs/help/reference/messages/km0204a.md b/developer/docs/help/reference/messages/km0204a.md new file mode 100644 index 00000000000..8b5878c7aa2 --- /dev/null +++ b/developer/docs/help/reference/messages/km0204a.md @@ -0,0 +1,11 @@ +--- +title: KM0204A: ERROR_InvalidReset +--- + +| | | +|------------|---------- | +| Message | The reset\(\) statement is not valid | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidReset` | + + diff --git a/developer/docs/help/reference/messages/km0204b.md b/developer/docs/help/reference/messages/km0204b.md new file mode 100644 index 00000000000..aa837630090 --- /dev/null +++ b/developer/docs/help/reference/messages/km0204b.md @@ -0,0 +1,11 @@ +--- +title: KM0204B: ERROR_InvalidSet +--- + +| | | +|------------|---------- | +| Message | The set\(\) statement is not valid | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidSet` | + + diff --git a/developer/docs/help/reference/messages/km0204c.md b/developer/docs/help/reference/messages/km0204c.md new file mode 100644 index 00000000000..9cedcbd3250 --- /dev/null +++ b/developer/docs/help/reference/messages/km0204c.md @@ -0,0 +1,11 @@ +--- +title: KM0204C: ERROR_InvalidSave +--- + +| | | +|------------|---------- | +| Message | The save\(\) statement is not valid | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidSave` | + + diff --git a/developer/docs/help/reference/messages/km0204d.md b/developer/docs/help/reference/messages/km0204d.md new file mode 100644 index 00000000000..a71ea826f65 --- /dev/null +++ b/developer/docs/help/reference/messages/km0204d.md @@ -0,0 +1,11 @@ +--- +title: KM0204D: ERROR_InvalidEthnologueCode +--- + +| | | +|------------|---------- | +| Message | Invalid ethnologuecode format | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidEthnologueCode` | + + diff --git a/developer/docs/help/reference/messages/km0204e.md b/developer/docs/help/reference/messages/km0204e.md new file mode 100644 index 00000000000..22c4c97da4e --- /dev/null +++ b/developer/docs/help/reference/messages/km0204e.md @@ -0,0 +1,11 @@ +--- +title: KM0204E: FATAL_CannotCreateTempfile +--- + +| | | +|------------|---------- | +| Message | Cannot create temp file | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_CannotCreateTempfile` | + + diff --git a/developer/docs/help/reference/messages/km0204f.md b/developer/docs/help/reference/messages/km0204f.md new file mode 100644 index 00000000000..846eff8be96 --- /dev/null +++ b/developer/docs/help/reference/messages/km0204f.md @@ -0,0 +1,11 @@ +--- +title: KM0204F: ERROR_90FeatureOnly_IfSystemStores +--- + +| | | +|------------|---------- | +| Message | if\(store\) requires store\(version\) '9\.0' or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_90FeatureOnly_IfSystemStores` | + + diff --git a/developer/docs/help/reference/messages/km02050.md b/developer/docs/help/reference/messages/km02050.md new file mode 100644 index 00000000000..facdd2272a2 --- /dev/null +++ b/developer/docs/help/reference/messages/km02050.md @@ -0,0 +1,11 @@ +--- +title: KM02050: ERROR_IfSystemStore_NotFound +--- + +| | | +|------------|---------- | +| Message | System store in if\(\) not found | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_IfSystemStore_NotFound` | + + diff --git a/developer/docs/help/reference/messages/km02051.md b/developer/docs/help/reference/messages/km02051.md new file mode 100644 index 00000000000..3eda67010db --- /dev/null +++ b/developer/docs/help/reference/messages/km02051.md @@ -0,0 +1,11 @@ +--- +title: KM02051: ERROR_90FeatureOnly_SetSystemStores +--- + +| | | +|------------|---------- | +| Message | set\(store\) requires store\(version\) '9\.0' or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_90FeatureOnly_SetSystemStores` | + + diff --git a/developer/docs/help/reference/messages/km02052.md b/developer/docs/help/reference/messages/km02052.md new file mode 100644 index 00000000000..caaa5e7235e --- /dev/null +++ b/developer/docs/help/reference/messages/km02052.md @@ -0,0 +1,11 @@ +--- +title: KM02052: ERROR_SetSystemStore_NotFound +--- + +| | | +|------------|---------- | +| Message | System store in set\(\) not found | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_SetSystemStore_NotFound` | + + diff --git a/developer/docs/help/reference/messages/km02053.md b/developer/docs/help/reference/messages/km02053.md new file mode 100644 index 00000000000..1e2558d4c87 --- /dev/null +++ b/developer/docs/help/reference/messages/km02053.md @@ -0,0 +1,11 @@ +--- +title: KM02053: ERROR_90FeatureOnlyVirtualKeyDictionary +--- + +| | | +|------------|---------- | +| Message | Custom virtual key names require store\(version\) '9\.0' | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_90FeatureOnlyVirtualKeyDictionary` | + + diff --git a/developer/docs/help/reference/messages/km02054.md b/developer/docs/help/reference/messages/km02054.md new file mode 100644 index 00000000000..c14ba1f9490 --- /dev/null +++ b/developer/docs/help/reference/messages/km02054.md @@ -0,0 +1,11 @@ +--- +title: KM02054: ERROR_NotSupportedInKeymanWebContext +--- + +| | | +|------------|---------- | +| Message | Statement '<param>' is not currently supported in context for web and touch targets | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_NotSupportedInKeymanWebContext` | + + diff --git a/developer/docs/help/reference/messages/km02055.md b/developer/docs/help/reference/messages/km02055.md new file mode 100644 index 00000000000..081447004e3 --- /dev/null +++ b/developer/docs/help/reference/messages/km02055.md @@ -0,0 +1,11 @@ +--- +title: KM02055: ERROR_NotSupportedInKeymanWebOutput +--- + +| | | +|------------|---------- | +| Message | Statement '<param>' is not currently supported in output for web and touch targets | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_NotSupportedInKeymanWebOutput` | + + diff --git a/developer/docs/help/reference/messages/km02056.md b/developer/docs/help/reference/messages/km02056.md new file mode 100644 index 00000000000..4e7a9e6e03b --- /dev/null +++ b/developer/docs/help/reference/messages/km02056.md @@ -0,0 +1,11 @@ +--- +title: KM02056: ERROR_NotSupportedInKeymanWebStore +--- + +| | | +|------------|---------- | +| Message | '<param>' is not currently supported in store '<param>' when used by any or index for web and touch targets | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_NotSupportedInKeymanWebStore` | + + diff --git a/developer/docs/help/reference/messages/km02057.md b/developer/docs/help/reference/messages/km02057.md new file mode 100644 index 00000000000..b74ebea922a --- /dev/null +++ b/developer/docs/help/reference/messages/km02057.md @@ -0,0 +1,11 @@ +--- +title: KM02057: ERROR_VirtualCharacterKeysNotSupportedInKeymanWeb +--- + +| | | +|------------|---------- | +| Message | Virtual character keys not currently supported in KeymanWeb | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VirtualCharacterKeysNotSupportedInKeymanWeb` | + + diff --git a/developer/docs/help/reference/messages/km02058.md b/developer/docs/help/reference/messages/km02058.md new file mode 100644 index 00000000000..b6b63eae273 --- /dev/null +++ b/developer/docs/help/reference/messages/km02058.md @@ -0,0 +1,11 @@ +--- +title: KM02058: ERROR_VirtualKeysNotValidForMnemonicLayouts +--- + +| | | +|------------|---------- | +| Message | Virtual keys are not valid for mnemonic layouts | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VirtualKeysNotValidForMnemonicLayouts` | + + diff --git a/developer/docs/help/reference/messages/km02059.md b/developer/docs/help/reference/messages/km02059.md new file mode 100644 index 00000000000..a100e56abef --- /dev/null +++ b/developer/docs/help/reference/messages/km02059.md @@ -0,0 +1,11 @@ +--- +title: KM02059: ERROR_InvalidTouchLayoutFile +--- + +| | | +|------------|---------- | +| Message | Touch layout file <param> is not valid | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidTouchLayoutFile` | + + diff --git a/developer/docs/help/reference/messages/km0205a.md b/developer/docs/help/reference/messages/km0205a.md new file mode 100644 index 00000000000..625b46b4b9a --- /dev/null +++ b/developer/docs/help/reference/messages/km0205a.md @@ -0,0 +1,11 @@ +--- +title: KM0205A: ERROR_TouchLayoutInvalidIdentifier +--- + +| | | +|------------|---------- | +| Message | Key "<param>" on "<param>", layer "<param>" has an invalid identifier\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_TouchLayoutInvalidIdentifier` | + + diff --git a/developer/docs/help/reference/messages/km0205b.md b/developer/docs/help/reference/messages/km0205b.md new file mode 100644 index 00000000000..e09dc68039b --- /dev/null +++ b/developer/docs/help/reference/messages/km0205b.md @@ -0,0 +1,11 @@ +--- +title: KM0205B: ERROR_InvalidKeyCode +--- + +| | | +|------------|---------- | +| Message | Invalid key identifier "<param>" | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidKeyCode` | + + diff --git a/developer/docs/help/reference/messages/km0205c.md b/developer/docs/help/reference/messages/km0205c.md new file mode 100644 index 00000000000..563f7650e9d --- /dev/null +++ b/developer/docs/help/reference/messages/km0205c.md @@ -0,0 +1,11 @@ +--- +title: KM0205C: ERROR_90FeatureOnlyLayoutFile +--- + +| | | +|------------|---------- | +| Message | Touch layout file reference requires store\(version\) '9\.0'or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_90FeatureOnlyLayoutFile` | + + diff --git a/developer/docs/help/reference/messages/km0205d.md b/developer/docs/help/reference/messages/km0205d.md new file mode 100644 index 00000000000..67620cfbc98 --- /dev/null +++ b/developer/docs/help/reference/messages/km0205d.md @@ -0,0 +1,11 @@ +--- +title: KM0205D: ERROR_90FeatureOnlyKeyboardVersion +--- + +| | | +|------------|---------- | +| Message | KeyboardVersion system store requires store\(version\) '9\.0'or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_90FeatureOnlyKeyboardVersion` | + + diff --git a/developer/docs/help/reference/messages/km0205e.md b/developer/docs/help/reference/messages/km0205e.md new file mode 100644 index 00000000000..12316dac807 --- /dev/null +++ b/developer/docs/help/reference/messages/km0205e.md @@ -0,0 +1,11 @@ +--- +title: KM0205E: ERROR_KeyboardVersionFormatInvalid +--- + +| | | +|------------|---------- | +| Message | KeyboardVersion format is invalid, expecting dot\-separated integers | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_KeyboardVersionFormatInvalid` | + + diff --git a/developer/docs/help/reference/messages/km0205f.md b/developer/docs/help/reference/messages/km0205f.md new file mode 100644 index 00000000000..0c79b8ba4b7 --- /dev/null +++ b/developer/docs/help/reference/messages/km0205f.md @@ -0,0 +1,11 @@ +--- +title: KM0205F: ERROR_ContextExHasInvalidOffset +--- + +| | | +|------------|---------- | +| Message | context\(\) statement has offset out of range | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ContextExHasInvalidOffset` | + + diff --git a/developer/docs/help/reference/messages/km02060.md b/developer/docs/help/reference/messages/km02060.md new file mode 100644 index 00000000000..c505c6d3f7c --- /dev/null +++ b/developer/docs/help/reference/messages/km02060.md @@ -0,0 +1,11 @@ +--- +title: KM02060: ERROR_90FeatureOnlyEmbedCSS +--- + +| | | +|------------|---------- | +| Message | Embedding CSS requires store\(version\) '9\.0'or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_90FeatureOnlyEmbedCSS` | + + diff --git a/developer/docs/help/reference/messages/km02061.md b/developer/docs/help/reference/messages/km02061.md new file mode 100644 index 00000000000..61240ea35fc --- /dev/null +++ b/developer/docs/help/reference/messages/km02061.md @@ -0,0 +1,11 @@ +--- +title: KM02061: ERROR_90FeatureOnlyTargets +--- + +| | | +|------------|---------- | +| Message | TARGETS system store requires store\(version\) '9\.0'or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_90FeatureOnlyTargets` | + + diff --git a/developer/docs/help/reference/messages/km02062.md b/developer/docs/help/reference/messages/km02062.md new file mode 100644 index 00000000000..6b6bc4b2cae --- /dev/null +++ b/developer/docs/help/reference/messages/km02062.md @@ -0,0 +1,11 @@ +--- +title: KM02062: ERROR_ContextAndIndexInvalidInMatchNomatch +--- + +| | | +|------------|---------- | +| Message | context and index statements cannot be used in a match or nomatch statement | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ContextAndIndexInvalidInMatchNomatch` | + + diff --git a/developer/docs/help/reference/messages/km02063.md b/developer/docs/help/reference/messages/km02063.md new file mode 100644 index 00000000000..a947616a008 --- /dev/null +++ b/developer/docs/help/reference/messages/km02063.md @@ -0,0 +1,11 @@ +--- +title: KM02063: ERROR_140FeatureOnlyContextAndNotAnyWeb +--- + +| | | +|------------|---------- | +| Message | For web and touch platforms, context\(\) statement referring to notany\(\) requires store\(version\) '14\.0'or higher | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_140FeatureOnlyContextAndNotAnyWeb` | + + diff --git a/developer/docs/help/reference/messages/km02064.md b/developer/docs/help/reference/messages/km02064.md new file mode 100644 index 00000000000..84cf5a156af --- /dev/null +++ b/developer/docs/help/reference/messages/km02064.md @@ -0,0 +1,11 @@ +--- +title: KM02064: ERROR_ExpansionMustFollowCharacterOrVKey +--- + +| | | +|------------|---------- | +| Message | An expansion must follow a character or a virtual key | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ExpansionMustFollowCharacterOrVKey` | + + diff --git a/developer/docs/help/reference/messages/km02065.md b/developer/docs/help/reference/messages/km02065.md new file mode 100644 index 00000000000..c8074db3a97 --- /dev/null +++ b/developer/docs/help/reference/messages/km02065.md @@ -0,0 +1,11 @@ +--- +title: KM02065: ERROR_VKeyExpansionMustBeFollowedByVKey +--- + +| | | +|------------|---------- | +| Message | A virtual key expansion must be terminated by a virtual key | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VKeyExpansionMustBeFollowedByVKey` | + + diff --git a/developer/docs/help/reference/messages/km02066.md b/developer/docs/help/reference/messages/km02066.md new file mode 100644 index 00000000000..874c3a62f5d --- /dev/null +++ b/developer/docs/help/reference/messages/km02066.md @@ -0,0 +1,11 @@ +--- +title: KM02066: ERROR_CharacterExpansionMustBeFollowedByCharacter +--- + +| | | +|------------|---------- | +| Message | A character expansion must be terminated by a character key | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CharacterExpansionMustBeFollowedByCharacter` | + + diff --git a/developer/docs/help/reference/messages/km02067.md b/developer/docs/help/reference/messages/km02067.md new file mode 100644 index 00000000000..aaacb3ad32d --- /dev/null +++ b/developer/docs/help/reference/messages/km02067.md @@ -0,0 +1,11 @@ +--- +title: KM02067: ERROR_VKeyExpansionMustUseConsistentShift +--- + +| | | +|------------|---------- | +| Message | A virtual key expansion must use the same shift state for both terminators | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VKeyExpansionMustUseConsistentShift` | + + diff --git a/developer/docs/help/reference/messages/km02068.md b/developer/docs/help/reference/messages/km02068.md new file mode 100644 index 00000000000..88f83971b37 --- /dev/null +++ b/developer/docs/help/reference/messages/km02068.md @@ -0,0 +1,11 @@ +--- +title: KM02068: ERROR_ExpansionMustBePositive +--- + +| | | +|------------|---------- | +| Message | An expansion must have positive difference \(i\.e\. A\-Z, not Z\-A\) | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ExpansionMustBePositive` | + + diff --git a/developer/docs/help/reference/messages/km02069.md b/developer/docs/help/reference/messages/km02069.md new file mode 100644 index 00000000000..c7bdf32efd6 --- /dev/null +++ b/developer/docs/help/reference/messages/km02069.md @@ -0,0 +1,11 @@ +--- +title: KM02069: ERROR_CasedKeysMustContainOnlyVirtualKeys +--- + +| | | +|------------|---------- | +| Message | The &CasedKeys system store must contain only virtual keys or characters found on a US English keyboard | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CasedKeysMustContainOnlyVirtualKeys` | + + diff --git a/developer/docs/help/reference/messages/km0206a.md b/developer/docs/help/reference/messages/km0206a.md new file mode 100644 index 00000000000..7a973006f2e --- /dev/null +++ b/developer/docs/help/reference/messages/km0206a.md @@ -0,0 +1,11 @@ +--- +title: KM0206A: ERROR_CasedKeysMustNotIncludeShiftStates +--- + +| | | +|------------|---------- | +| Message | The &CasedKeys system store must not include shift states | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CasedKeysMustNotIncludeShiftStates` | + + diff --git a/developer/docs/help/reference/messages/km0206b.md b/developer/docs/help/reference/messages/km0206b.md new file mode 100644 index 00000000000..d774f7c263f --- /dev/null +++ b/developer/docs/help/reference/messages/km0206b.md @@ -0,0 +1,11 @@ +--- +title: KM0206B: ERROR_CasedKeysNotSupportedWithMnemonicLayout +--- + +| | | +|------------|---------- | +| Message | The &CasedKeys system store is not supported with mnemonic layouts | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CasedKeysNotSupportedWithMnemonicLayout` | + + diff --git a/developer/docs/help/reference/messages/km0206c.md b/developer/docs/help/reference/messages/km0206c.md new file mode 100644 index 00000000000..78bb1f3ab1b --- /dev/null +++ b/developer/docs/help/reference/messages/km0206c.md @@ -0,0 +1,11 @@ +--- +title: KM0206C: ERROR_CannotUseReadWriteGroupFromReadonlyGroup +--- + +| | | +|------------|---------- | +| Message | Group used from a readonly group must also be readonly | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CannotUseReadWriteGroupFromReadonlyGroup` | + + diff --git a/developer/docs/help/reference/messages/km0206d.md b/developer/docs/help/reference/messages/km0206d.md new file mode 100644 index 00000000000..e97fa1f70dd --- /dev/null +++ b/developer/docs/help/reference/messages/km0206d.md @@ -0,0 +1,11 @@ +--- +title: KM0206D: ERROR_StatementNotPermittedInReadonlyGroup +--- + +| | | +|------------|---------- | +| Message | Statement is not permitted in output of readonly group | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_StatementNotPermittedInReadonlyGroup` | + + diff --git a/developer/docs/help/reference/messages/km0206e.md b/developer/docs/help/reference/messages/km0206e.md new file mode 100644 index 00000000000..d72ec373316 --- /dev/null +++ b/developer/docs/help/reference/messages/km0206e.md @@ -0,0 +1,11 @@ +--- +title: KM0206E: ERROR_OutputInReadonlyGroup +--- + +| | | +|------------|---------- | +| Message | Output is not permitted in a readonly group | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_OutputInReadonlyGroup` | + + diff --git a/developer/docs/help/reference/messages/km0206f.md b/developer/docs/help/reference/messages/km0206f.md new file mode 100644 index 00000000000..304b460b550 --- /dev/null +++ b/developer/docs/help/reference/messages/km0206f.md @@ -0,0 +1,11 @@ +--- +title: KM0206F: ERROR_NewContextGroupMustBeReadonly +--- + +| | | +|------------|---------- | +| Message | Group used in begin newContext must be readonly | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_NewContextGroupMustBeReadonly` | + + diff --git a/developer/docs/help/reference/messages/km02070.md b/developer/docs/help/reference/messages/km02070.md new file mode 100644 index 00000000000..fcf6cc352f4 --- /dev/null +++ b/developer/docs/help/reference/messages/km02070.md @@ -0,0 +1,11 @@ +--- +title: KM02070: ERROR_PostKeystrokeGroupMustBeReadonly +--- + +| | | +|------------|---------- | +| Message | Group used in begin postKeystroke must be readonly | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_PostKeystrokeGroupMustBeReadonly` | + + diff --git a/developer/docs/help/reference/messages/km02071.md b/developer/docs/help/reference/messages/km02071.md new file mode 100644 index 00000000000..fcac6322233 --- /dev/null +++ b/developer/docs/help/reference/messages/km02071.md @@ -0,0 +1,11 @@ +--- +title: KM02071: ERROR_DuplicateGroup +--- + +| | | +|------------|---------- | +| Message | A group with this name has already been defined\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_DuplicateGroup` | + + diff --git a/developer/docs/help/reference/messages/km02072.md b/developer/docs/help/reference/messages/km02072.md new file mode 100644 index 00000000000..8cfa13e5c33 --- /dev/null +++ b/developer/docs/help/reference/messages/km02072.md @@ -0,0 +1,11 @@ +--- +title: KM02072: ERROR_DuplicateStore +--- + +| | | +|------------|---------- | +| Message | A store with this name has already been defined\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_DuplicateStore` | + + diff --git a/developer/docs/help/reference/messages/km02073.md b/developer/docs/help/reference/messages/km02073.md new file mode 100644 index 00000000000..0a0616d84b6 --- /dev/null +++ b/developer/docs/help/reference/messages/km02073.md @@ -0,0 +1,11 @@ +--- +title: KM02073: ERROR_RepeatedBegin +--- + +| | | +|------------|---------- | +| Message | Begin has already been set | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_RepeatedBegin` | + + diff --git a/developer/docs/help/reference/messages/km02074.md b/developer/docs/help/reference/messages/km02074.md new file mode 100644 index 00000000000..a53219edc44 --- /dev/null +++ b/developer/docs/help/reference/messages/km02074.md @@ -0,0 +1,11 @@ +--- +title: KM02074: ERROR_VirtualKeyInContext +--- + +| | | +|------------|---------- | +| Message | Virtual keys are not permitted in context | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VirtualKeyInContext` | + + diff --git a/developer/docs/help/reference/messages/km02075.md b/developer/docs/help/reference/messages/km02075.md new file mode 100644 index 00000000000..8fbf31fbb5d --- /dev/null +++ b/developer/docs/help/reference/messages/km02075.md @@ -0,0 +1,11 @@ +--- +title: KM02075: ERROR_OutsTooLong +--- + +| | | +|------------|---------- | +| Message | Store cannot be inserted with outs\(\) as it makes the extended string too long | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_OutsTooLong` | + + diff --git a/developer/docs/help/reference/messages/km02076.md b/developer/docs/help/reference/messages/km02076.md new file mode 100644 index 00000000000..73a1129f326 --- /dev/null +++ b/developer/docs/help/reference/messages/km02076.md @@ -0,0 +1,11 @@ +--- +title: KM02076: ERROR_ExtendedStringTooLong +--- + +| | | +|------------|---------- | +| Message | Extended string is too long | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_ExtendedStringTooLong` | + + diff --git a/developer/docs/help/reference/messages/km02077.md b/developer/docs/help/reference/messages/km02077.md new file mode 100644 index 00000000000..994bd6ba193 --- /dev/null +++ b/developer/docs/help/reference/messages/km02077.md @@ -0,0 +1,11 @@ +--- +title: KM02077: ERROR_VirtualKeyExpansionTooLong +--- + +| | | +|------------|---------- | +| Message | Virtual key expansion is too large | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_VirtualKeyExpansionTooLong` | + + diff --git a/developer/docs/help/reference/messages/km02078.md b/developer/docs/help/reference/messages/km02078.md new file mode 100644 index 00000000000..1ad85f0dd97 --- /dev/null +++ b/developer/docs/help/reference/messages/km02078.md @@ -0,0 +1,11 @@ +--- +title: KM02078: ERROR_CharacterRangeTooLong +--- + +| | | +|------------|---------- | +| Message | Character range is too large and cannot be expanded | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_CharacterRangeTooLong` | + + diff --git a/developer/docs/help/reference/messages/km02079.md b/developer/docs/help/reference/messages/km02079.md new file mode 100644 index 00000000000..ccbb6aa607e --- /dev/null +++ b/developer/docs/help/reference/messages/km02079.md @@ -0,0 +1,11 @@ +--- +title: KM02079: ERROR_NonBMPCharactersNotSupportedInKeySection +--- + +| | | +|------------|---------- | +| Message | Characters with codepoints over U\+FFFF are not supported in the key part of the rule | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_NonBMPCharactersNotSupportedInKeySection` | + + diff --git a/developer/docs/help/reference/messages/km02080.md b/developer/docs/help/reference/messages/km02080.md new file mode 100644 index 00000000000..189dc8a0572 --- /dev/null +++ b/developer/docs/help/reference/messages/km02080.md @@ -0,0 +1,11 @@ +--- +title: KM02080: WARN_TooManyWarnings +--- + +| | | +|------------|---------- | +| Message | Too many warnings or errors | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_TooManyWarnings` | + + diff --git a/developer/docs/help/reference/messages/km02081.md b/developer/docs/help/reference/messages/km02081.md new file mode 100644 index 00000000000..28b67aef4c7 --- /dev/null +++ b/developer/docs/help/reference/messages/km02081.md @@ -0,0 +1,11 @@ +--- +title: KM02081: WARN_OldVersion +--- + +| | | +|------------|---------- | +| Message | The keyboard file is an old version | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_OldVersion` | + + diff --git a/developer/docs/help/reference/messages/km02082.md b/developer/docs/help/reference/messages/km02082.md new file mode 100644 index 00000000000..5dd37cb366b --- /dev/null +++ b/developer/docs/help/reference/messages/km02082.md @@ -0,0 +1,11 @@ +--- +title: KM02082: WARN_BitmapNotUsed +--- + +| | | +|------------|---------- | +| Message | The 'bitmaps' statement is obsolete and only the first bitmap referred to will be used, you should use 'bitmap'\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_BitmapNotUsed` | + + diff --git a/developer/docs/help/reference/messages/km02083.md b/developer/docs/help/reference/messages/km02083.md new file mode 100644 index 00000000000..06c5019eee3 --- /dev/null +++ b/developer/docs/help/reference/messages/km02083.md @@ -0,0 +1,11 @@ +--- +title: KM02083: WARN_CustomLanguagesNotSupported +--- + +| | | +|------------|---------- | +| Message | Languages over 0x1FF, 0x1F are not supported correctly by Windows\. You should use no LANGUAGE line instead\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_CustomLanguagesNotSupported` | + + diff --git a/developer/docs/help/reference/messages/km02084.md b/developer/docs/help/reference/messages/km02084.md new file mode 100644 index 00000000000..1f82992d643 --- /dev/null +++ b/developer/docs/help/reference/messages/km02084.md @@ -0,0 +1,11 @@ +--- +title: KM02084: WARN_KeyBadLength +--- + +| | | +|------------|---------- | +| Message | There are too many characters in the keystroke part of the rule\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_KeyBadLength` | + + diff --git a/developer/docs/help/reference/messages/km02085.md b/developer/docs/help/reference/messages/km02085.md new file mode 100644 index 00000000000..23363e783e5 --- /dev/null +++ b/developer/docs/help/reference/messages/km02085.md @@ -0,0 +1,11 @@ +--- +title: KM02085: WARN_IndexStoreShort +--- + +| | | +|------------|---------- | +| Message | The store referenced in index\(\) is shorter than the store referenced in any\(\) | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_IndexStoreShort` | + + diff --git a/developer/docs/help/reference/messages/km02086.md b/developer/docs/help/reference/messages/km02086.md new file mode 100644 index 00000000000..db603b5087a --- /dev/null +++ b/developer/docs/help/reference/messages/km02086.md @@ -0,0 +1,11 @@ +--- +title: KM02086: WARN_UnicodeInANSIGroup +--- + +| | | +|------------|---------- | +| Message | A Unicode character was found in an ANSI group | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_UnicodeInANSIGroup` | + + diff --git a/developer/docs/help/reference/messages/km02087.md b/developer/docs/help/reference/messages/km02087.md new file mode 100644 index 00000000000..f4cf3fa7366 --- /dev/null +++ b/developer/docs/help/reference/messages/km02087.md @@ -0,0 +1,11 @@ +--- +title: KM02087: WARN_ANSIInUnicodeGroup +--- + +| | | +|------------|---------- | +| Message | An ANSI character was found in a Unicode group | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_ANSIInUnicodeGroup` | + + diff --git a/developer/docs/help/reference/messages/km02088.md b/developer/docs/help/reference/messages/km02088.md new file mode 100644 index 00000000000..ee038ef1334 --- /dev/null +++ b/developer/docs/help/reference/messages/km02088.md @@ -0,0 +1,11 @@ +--- +title: KM02088: WARN_UnicodeSurrogateUsed +--- + +| | | +|------------|---------- | +| Message | A Unicode surrogate character was found\. You should use Unicode scalar values to represent values > U\+FFFF | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_UnicodeSurrogateUsed` | + + diff --git a/developer/docs/help/reference/messages/km02089.md b/developer/docs/help/reference/messages/km02089.md new file mode 100644 index 00000000000..73632221bbe --- /dev/null +++ b/developer/docs/help/reference/messages/km02089.md @@ -0,0 +1,11 @@ +--- +title: KM02089: WARN_ReservedCharacter +--- + +| | | +|------------|---------- | +| Message | A Unicode character was found that should not be used | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_ReservedCharacter` | + + diff --git a/developer/docs/help/reference/messages/km0208a.md b/developer/docs/help/reference/messages/km0208a.md new file mode 100644 index 00000000000..3b567389fa0 --- /dev/null +++ b/developer/docs/help/reference/messages/km0208a.md @@ -0,0 +1,11 @@ +--- +title: KM0208A: INFO_Info +--- + +| | | +|------------|---------- | +| Message | Information | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `INFO_Info` | + + diff --git a/developer/docs/help/reference/messages/km0208b.md b/developer/docs/help/reference/messages/km0208b.md new file mode 100644 index 00000000000..568ae0aa39a --- /dev/null +++ b/developer/docs/help/reference/messages/km0208b.md @@ -0,0 +1,11 @@ +--- +title: KM0208B: WARN_VirtualKeyWithMnemonicLayout +--- + +| | | +|------------|---------- | +| Message | Virtual key used instead of virtual character key with a mnemonic layout | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_VirtualKeyWithMnemonicLayout` | + + diff --git a/developer/docs/help/reference/messages/km0208c.md b/developer/docs/help/reference/messages/km0208c.md new file mode 100644 index 00000000000..52c93a7a4cf --- /dev/null +++ b/developer/docs/help/reference/messages/km0208c.md @@ -0,0 +1,11 @@ +--- +title: KM0208C: WARN_VirtualCharKeyWithPositionalLayout +--- + +| | | +|------------|---------- | +| Message | Virtual character key used with a positional layout instead of mnemonic layout | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_VirtualCharKeyWithPositionalLayout` | + + diff --git a/developer/docs/help/reference/messages/km0208d.md b/developer/docs/help/reference/messages/km0208d.md new file mode 100644 index 00000000000..18cd9c5e62f --- /dev/null +++ b/developer/docs/help/reference/messages/km0208d.md @@ -0,0 +1,11 @@ +--- +title: KM0208D: WARN_StoreAlreadyUsedAsOptionOrCall +--- + +| | | +|------------|---------- | +| Message | Store already used as an option or in a call statement and should not be used as a normal store | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_StoreAlreadyUsedAsOptionOrCall` | + + diff --git a/developer/docs/help/reference/messages/km0208e.md b/developer/docs/help/reference/messages/km0208e.md new file mode 100644 index 00000000000..61f6d48d9b3 --- /dev/null +++ b/developer/docs/help/reference/messages/km0208e.md @@ -0,0 +1,11 @@ +--- +title: KM0208E: WARN_StoreAlreadyUsedAsStoreOrCall +--- + +| | | +|------------|---------- | +| Message | Store already used as a normal store or in a call statement and should not be used as an option | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_StoreAlreadyUsedAsStoreOrCall` | + + diff --git a/developer/docs/help/reference/messages/km0208f.md b/developer/docs/help/reference/messages/km0208f.md new file mode 100644 index 00000000000..ca2313c89c6 --- /dev/null +++ b/developer/docs/help/reference/messages/km0208f.md @@ -0,0 +1,11 @@ +--- +title: KM0208F: WARN_StoreAlreadyUsedAsStoreOrOption +--- + +| | | +|------------|---------- | +| Message | Store already used as a normal store or as an option and should not be used in a call statement | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_StoreAlreadyUsedAsStoreOrOption` | + + diff --git a/developer/docs/help/reference/messages/km02090.md b/developer/docs/help/reference/messages/km02090.md new file mode 100644 index 00000000000..654a26a3dcf --- /dev/null +++ b/developer/docs/help/reference/messages/km02090.md @@ -0,0 +1,11 @@ +--- +title: KM02090: WARN_PunctuationInEthnologueCode +--- + +| | | +|------------|---------- | +| Message | Punctuation should not be used to separate Ethnologue codes; instead use spaces | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_PunctuationInEthnologueCode` | + + diff --git a/developer/docs/help/reference/messages/km02091.md b/developer/docs/help/reference/messages/km02091.md new file mode 100644 index 00000000000..45c7f67bca8 --- /dev/null +++ b/developer/docs/help/reference/messages/km02091.md @@ -0,0 +1,11 @@ +--- +title: KM02091: WARN_TouchLayoutMissingLayer +--- + +| | | +|------------|---------- | +| Message | Key "<param>" on platform "<param>", layer "<param>", references a missing layer "<param>" | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_TouchLayoutMissingLayer` | + + diff --git a/developer/docs/help/reference/messages/km02092.md b/developer/docs/help/reference/messages/km02092.md new file mode 100644 index 00000000000..f81acf778a2 --- /dev/null +++ b/developer/docs/help/reference/messages/km02092.md @@ -0,0 +1,11 @@ +--- +title: KM02092: WARN_TouchLayoutCustomKeyNotDefined +--- + +| | | +|------------|---------- | +| Message | Key "<param>" on platform "<param>", layer "<param>", is a custom key but has no corresponding rule in the source\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_TouchLayoutCustomKeyNotDefined` | + + diff --git a/developer/docs/help/reference/messages/km02093.md b/developer/docs/help/reference/messages/km02093.md new file mode 100644 index 00000000000..344c56f654e --- /dev/null +++ b/developer/docs/help/reference/messages/km02093.md @@ -0,0 +1,11 @@ +--- +title: KM02093: WARN_TouchLayoutMissingRequiredKeys +--- + +| | | +|------------|---------- | +| Message | Layer "<param>" on platform "<param>" is missing the required key\(s\) '<param>'\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_TouchLayoutMissingRequiredKeys` | + + diff --git a/developer/docs/help/reference/messages/km02094.md b/developer/docs/help/reference/messages/km02094.md new file mode 100644 index 00000000000..c445037d8c4 --- /dev/null +++ b/developer/docs/help/reference/messages/km02094.md @@ -0,0 +1,11 @@ +--- +title: KM02094: WARN_HelpFileMissing +--- + +| | | +|------------|---------- | +| Message | File <param> could not be loaded: | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_HelpFileMissing` | + + diff --git a/developer/docs/help/reference/messages/km02095.md b/developer/docs/help/reference/messages/km02095.md new file mode 100644 index 00000000000..f6250d30e80 --- /dev/null +++ b/developer/docs/help/reference/messages/km02095.md @@ -0,0 +1,11 @@ +--- +title: KM02095: WARN_EmbedJsFileMissing +--- + +| | | +|------------|---------- | +| Message | File <param> could not be loaded: | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_EmbedJsFileMissing` | + + diff --git a/developer/docs/help/reference/messages/km02098.md b/developer/docs/help/reference/messages/km02098.md new file mode 100644 index 00000000000..8ccdbd27284 --- /dev/null +++ b/developer/docs/help/reference/messages/km02098.md @@ -0,0 +1,11 @@ +--- +title: KM02098: WARN_ExtendedShiftFlagsNotSupportedInKeymanWeb +--- + +| | | +|------------|---------- | +| Message | Extended shift flags <param> are not supported in KeymanWeb | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_ExtendedShiftFlagsNotSupportedInKeymanWeb` | + + diff --git a/developer/docs/help/reference/messages/km02099.md b/developer/docs/help/reference/messages/km02099.md new file mode 100644 index 00000000000..17a93b9f65e --- /dev/null +++ b/developer/docs/help/reference/messages/km02099.md @@ -0,0 +1,11 @@ +--- +title: KM02099: WARN_TouchLayoutUnidentifiedKey +--- + +| | | +|------------|---------- | +| Message | A key on layer "<param>" has no identifier\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_TouchLayoutUnidentifiedKey` | + + diff --git a/developer/docs/help/reference/messages/km0209a.md b/developer/docs/help/reference/messages/km0209a.md new file mode 100644 index 00000000000..e49c8800bb3 --- /dev/null +++ b/developer/docs/help/reference/messages/km0209a.md @@ -0,0 +1,11 @@ +--- +title: KM0209A: HINT_UnreachableKeyCode +--- + +| | | +|------------|---------- | +| Message | The rule will never be matched for key <param> because its key code is never fired\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `HINT_UnreachableKeyCode` | + + diff --git a/developer/docs/help/reference/messages/km0209c.md b/developer/docs/help/reference/messages/km0209c.md new file mode 100644 index 00000000000..0dd2d6ffb05 --- /dev/null +++ b/developer/docs/help/reference/messages/km0209c.md @@ -0,0 +1,11 @@ +--- +title: KM0209C: WARN_PlatformNotInTargets +--- + +| | | +|------------|---------- | +| Message | The specified platform is not a target platform | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_PlatformNotInTargets` | + + diff --git a/developer/docs/help/reference/messages/km0209d.md b/developer/docs/help/reference/messages/km0209d.md new file mode 100644 index 00000000000..0ff7f4377a2 --- /dev/null +++ b/developer/docs/help/reference/messages/km0209d.md @@ -0,0 +1,11 @@ +--- +title: KM0209D: WARN_HeaderStatementIsDeprecated +--- + +| | | +|------------|---------- | +| Message | Header statements are deprecated; use instead the equivalent system store | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_HeaderStatementIsDeprecated` | + + diff --git a/developer/docs/help/reference/messages/km0209e.md b/developer/docs/help/reference/messages/km0209e.md new file mode 100644 index 00000000000..b3d21524d3a --- /dev/null +++ b/developer/docs/help/reference/messages/km0209e.md @@ -0,0 +1,11 @@ +--- +title: KM0209E: WARN_UseNotLastStatementInRule +--- + +| | | +|------------|---------- | +| Message | A rule with use\(\) statements in the output should not have other content following the use\(\) statements | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_UseNotLastStatementInRule` | + + diff --git a/developer/docs/help/reference/messages/km0209f.md b/developer/docs/help/reference/messages/km0209f.md new file mode 100644 index 00000000000..b28554e71c6 --- /dev/null +++ b/developer/docs/help/reference/messages/km0209f.md @@ -0,0 +1,11 @@ +--- +title: KM0209F: WARN_TouchLayoutFontShouldBeSameForAllPlatforms +--- + +| | | +|------------|---------- | +| Message | The touch layout font should be the same for all platforms\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_TouchLayoutFontShouldBeSameForAllPlatforms` | + + diff --git a/developer/docs/help/reference/messages/km020a2.md b/developer/docs/help/reference/messages/km020a2.md new file mode 100644 index 00000000000..e4e0530b22f --- /dev/null +++ b/developer/docs/help/reference/messages/km020a2.md @@ -0,0 +1,11 @@ +--- +title: KM020A2: WARN_KVKFileIsInSourceFormat +--- + +| | | +|------------|---------- | +| Message | \.kvk file should be binary but is an XML file | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_KVKFileIsInSourceFormat` | + + diff --git a/developer/docs/help/reference/messages/km020a3.md b/developer/docs/help/reference/messages/km020a3.md new file mode 100644 index 00000000000..36e2820f4ae --- /dev/null +++ b/developer/docs/help/reference/messages/km020a3.md @@ -0,0 +1,11 @@ +--- +title: KM020A3: WARN_DontMixChiralAndNonChiralModifiers +--- + +| | | +|------------|---------- | +| Message | This keyboard contains Ctrl,Alt and LCtrl,LAlt,RCtrl,RAlt sets of modifiers\. Use only one or the other set for web target\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_DontMixChiralAndNonChiralModifiers` | + + diff --git a/developer/docs/help/reference/messages/km020a4.md b/developer/docs/help/reference/messages/km020a4.md new file mode 100644 index 00000000000..e9f0cddc180 --- /dev/null +++ b/developer/docs/help/reference/messages/km020a4.md @@ -0,0 +1,11 @@ +--- +title: KM020A4: WARN_MixingLeftAndRightModifiers +--- + +| | | +|------------|---------- | +| Message | Left and right modifiers should not both be used in the same rule | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_MixingLeftAndRightModifiers` | + + diff --git a/developer/docs/help/reference/messages/km020a5.md b/developer/docs/help/reference/messages/km020a5.md new file mode 100644 index 00000000000..3cafe009836 --- /dev/null +++ b/developer/docs/help/reference/messages/km020a5.md @@ -0,0 +1,11 @@ +--- +title: KM020A5: WARN_LanguageHeadersDeprecatedInKeyman10 +--- + +| | | +|------------|---------- | +| Message | This language header has been deprecated in Keyman 10\. Instead, add language metadata in the package file | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_LanguageHeadersDeprecatedInKeyman10` | + + diff --git a/developer/docs/help/reference/messages/km020a6.md b/developer/docs/help/reference/messages/km020a6.md new file mode 100644 index 00000000000..30962d42fe8 --- /dev/null +++ b/developer/docs/help/reference/messages/km020a6.md @@ -0,0 +1,11 @@ +--- +title: KM020A6: HINT_NonUnicodeFile +--- + +| | | +|------------|---------- | +| Message | Keyman Developer has detected that the file has ANSI encoding\. Consider converting this file to UTF\-8 | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `HINT_NonUnicodeFile` | + + diff --git a/developer/docs/help/reference/messages/km020a8.md b/developer/docs/help/reference/messages/km020a8.md new file mode 100644 index 00000000000..1a92a9c17fc --- /dev/null +++ b/developer/docs/help/reference/messages/km020a8.md @@ -0,0 +1,11 @@ +--- +title: KM020A8: WARN_HotkeyHasInvalidModifier +--- + +| | | +|------------|---------- | +| Message | Hotkey has modifiers that are not supported\. Use only SHIFT, CTRL and ALT | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_HotkeyHasInvalidModifier` | + + diff --git a/developer/docs/help/reference/messages/km020a9.md b/developer/docs/help/reference/messages/km020a9.md new file mode 100644 index 00000000000..906171ba8a4 --- /dev/null +++ b/developer/docs/help/reference/messages/km020a9.md @@ -0,0 +1,11 @@ +--- +title: KM020A9: WARN_TouchLayoutSpecialLabelOnNormalKey +--- + +| | | +|------------|---------- | +| Message | Key "<param>" on platform "<param>", layer "<param>" does not have the key type "Special" or "Special \(active\)" but has the label "<param>"\. This feature is only supported in Keyman 14 or later | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_TouchLayoutSpecialLabelOnNormalKey` | + + diff --git a/developer/docs/help/reference/messages/km020aa.md b/developer/docs/help/reference/messages/km020aa.md new file mode 100644 index 00000000000..19505b3984a --- /dev/null +++ b/developer/docs/help/reference/messages/km020aa.md @@ -0,0 +1,11 @@ +--- +title: KM020AA: WARN_OptionStoreNameInvalid +--- + +| | | +|------------|---------- | +| Message | The option store <param> should be named with characters in the range A\-Z, a\-z, 0\-9 and \_ only\. | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_OptionStoreNameInvalid` | + + diff --git a/developer/docs/help/reference/messages/km020ab.md b/developer/docs/help/reference/messages/km020ab.md new file mode 100644 index 00000000000..39a050f9995 --- /dev/null +++ b/developer/docs/help/reference/messages/km020ab.md @@ -0,0 +1,11 @@ +--- +title: KM020AB: WARN_NulNotFirstStatementInContext +--- + +| | | +|------------|---------- | +| Message | nul must be the first statement in the context | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_NulNotFirstStatementInContext` | + + diff --git a/developer/docs/help/reference/messages/km020ac.md b/developer/docs/help/reference/messages/km020ac.md new file mode 100644 index 00000000000..87698b91387 --- /dev/null +++ b/developer/docs/help/reference/messages/km020ac.md @@ -0,0 +1,11 @@ +--- +title: KM020AC: WARN_IfShouldBeAtStartOfContext +--- + +| | | +|------------|---------- | +| Message | if, platform and baselayout should be at start of context \(after nul, if present\) | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_IfShouldBeAtStartOfContext` | + + diff --git a/developer/docs/help/reference/messages/km020ad.md b/developer/docs/help/reference/messages/km020ad.md new file mode 100644 index 00000000000..0a5258da8f7 --- /dev/null +++ b/developer/docs/help/reference/messages/km020ad.md @@ -0,0 +1,11 @@ +--- +title: KM020AD: WARN_KeyShouldIncludeNCaps +--- + +| | | +|------------|---------- | +| Message | Other rules which reference this key include CAPS or NCAPS modifiers, so this rule must include NCAPS modifier to avoid inconsistent matches | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_KeyShouldIncludeNCaps` | + + diff --git a/developer/docs/help/reference/messages/km020ae.md b/developer/docs/help/reference/messages/km020ae.md new file mode 100644 index 00000000000..15157c274b2 --- /dev/null +++ b/developer/docs/help/reference/messages/km020ae.md @@ -0,0 +1,11 @@ +--- +title: KM020AE: HINT_UnreachableRule +--- + +| | | +|------------|---------- | +| Message | This rule will never be matched as another rule takes precedence | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `HINT_UnreachableRule` | + + diff --git a/developer/docs/help/reference/messages/km020af.md b/developer/docs/help/reference/messages/km020af.md new file mode 100644 index 00000000000..b28458ca7d2 --- /dev/null +++ b/developer/docs/help/reference/messages/km020af.md @@ -0,0 +1,11 @@ +--- +title: KM020AF: WARN_VirtualKeyInOutput +--- + +| | | +|------------|---------- | +| Message | Virtual keys are not supported in output | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_VirtualKeyInOutput` | + + diff --git a/developer/docs/help/reference/messages/km020c0.md b/developer/docs/help/reference/messages/km020c0.md new file mode 100644 index 00000000000..73e90bd3dd2 --- /dev/null +++ b/developer/docs/help/reference/messages/km020c0.md @@ -0,0 +1,11 @@ +--- +title: KM020C0: FATAL_BufferOverflow +--- + +| | | +|------------|---------- | +| Message | The compiler memory buffer overflowed | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_BufferOverflow` | + + diff --git a/developer/docs/help/reference/messages/km020c1.md b/developer/docs/help/reference/messages/km020c1.md new file mode 100644 index 00000000000..7e82a1531f6 --- /dev/null +++ b/developer/docs/help/reference/messages/km020c1.md @@ -0,0 +1,11 @@ +--- +title: KM020C1: FATAL_Break +--- + +| | | +|------------|---------- | +| Message | Compiler interrupted by user | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_Break` | + + diff --git a/developer/docs/help/reference/messages/km02900.md b/developer/docs/help/reference/messages/km02900.md new file mode 100644 index 00000000000..9b4cefdfa9a --- /dev/null +++ b/developer/docs/help/reference/messages/km02900.md @@ -0,0 +1,13 @@ +--- +title: KM02900: FATAL_UnexpectedException +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_UnexpectedException` | + +Raised when KmnCompiler or one of its components has an internal +error. If you experience this error, it should be reported to the Keyman +team for resolution via https://github.com/keymanapp/keyman/issues/new. diff --git a/developer/docs/help/reference/messages/km02901.md b/developer/docs/help/reference/messages/km02901.md new file mode 100644 index 00000000000..1e9098c24e8 --- /dev/null +++ b/developer/docs/help/reference/messages/km02901.md @@ -0,0 +1,13 @@ +--- +title: KM02901: FATAL_MissingWasmModule +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_MissingWasmModule` | + +Raised when the kmcmplib component could not be instantiated. This may indicate +a configuration or dependency issue. Make sure you are running a Javascript +engine that supports WASM, and that use of WASM is enabled. diff --git a/developer/docs/help/reference/messages/km02903.md b/developer/docs/help/reference/messages/km02903.md new file mode 100644 index 00000000000..df0c0087e01 --- /dev/null +++ b/developer/docs/help/reference/messages/km02903.md @@ -0,0 +1,13 @@ +--- +title: KM02903: FATAL_CallbacksNotSet +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_CallbacksNotSet` | + +Raised when KmnCompiler or one of its components experiences an internal +error. If you experience this error, it should be reported to the Keyman +team for resolution via https://github.com/keymanapp/keyman/issues/new. diff --git a/developer/docs/help/reference/messages/km02904.md b/developer/docs/help/reference/messages/km02904.md new file mode 100644 index 00000000000..9661ae59203 --- /dev/null +++ b/developer/docs/help/reference/messages/km02904.md @@ -0,0 +1,13 @@ +--- +title: KM02904: FATAL_UnicodeSetOutOfRange +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `FATAL_UnicodeSetOutOfRange` | + +Raised when caller to UnicodeSet functions provides an invalid buffer. If +you experience this error, it should be reported to the Keyman team for +resolution via https://github.com/keymanapp/keyman/issues/new. diff --git a/developer/docs/help/reference/messages/km02905.md b/developer/docs/help/reference/messages/km02905.md new file mode 100644 index 00000000000..5b6982f18bb --- /dev/null +++ b/developer/docs/help/reference/messages/km02905.md @@ -0,0 +1,16 @@ +--- +title: KM02905: ERROR_UnicodeSetHasStrings +--- + +| | | +|------------|---------- | +| Message | uset contains strings, not allowed | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_UnicodeSetHasStrings` | + +The provided uset uses multi-character strings, (`{}` notation, e.g. +`[żġħ{ie}{għ}]`. ). Although full UnicodeSets support strings, LDML +keyboards do not support multi-character strings in usets. To resolve this, +reformat the uset to avoid the use of multi-character strings. + +More on uset: https://www.unicode.org/reports/tr35/tr35-keyboards.html#element-uset diff --git a/developer/docs/help/reference/messages/km02906.md b/developer/docs/help/reference/messages/km02906.md new file mode 100644 index 00000000000..99dd1569569 --- /dev/null +++ b/developer/docs/help/reference/messages/km02906.md @@ -0,0 +1,16 @@ +--- +title: KM02906: ERROR_UnicodeSetHasProperties +--- + +| | | +|------------|---------- | +| Message | uset contains properties, not allowed | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_UnicodeSetHasProperties` | + +The provided uset uses property notation (`\p{…}` or `[:…:]`). LDML +keyboards do not support Unicode properties in usets, because that would +make implementations dependent on a particular version of Unicode. To +resolve this, reformat the uset to avoid the use of properties. + +More on uset: https://www.unicode.org/reports/tr35/tr35-keyboards.html#element-uset diff --git a/developer/docs/help/reference/messages/km02907.md b/developer/docs/help/reference/messages/km02907.md new file mode 100644 index 00000000000..deae301f509 --- /dev/null +++ b/developer/docs/help/reference/messages/km02907.md @@ -0,0 +1,14 @@ +--- +title: KM02907: ERROR_UnicodeSetSyntaxError +--- + +| | | +|------------|---------- | +| Message | uset had a Syntax Error while parsing | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_UnicodeSetSyntaxError` | + +The provided uset has a syntax error and could not be parsed. Verify the +format of the uset against the specification. + +More on uset: https://www.unicode.org/reports/tr35/tr35-keyboards.html#element-uset diff --git a/developer/docs/help/reference/messages/km02908.md b/developer/docs/help/reference/messages/km02908.md new file mode 100644 index 00000000000..d4c4ac5dc17 --- /dev/null +++ b/developer/docs/help/reference/messages/km02908.md @@ -0,0 +1,15 @@ +--- +title: KM02908: ERROR_InvalidKvksFile +--- + +| | | +|------------|---------- | +| Message | Error encountered parsing <param>: unknown error | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidKvksFile` | + +The .kvks file could not be parsed because it was not a valid XML file. +There may be additional information in the error message to help you +resolve the error. + +More on .kvks file format: https://help.keyman.com/developer/current-version/reference/file-types/kvks diff --git a/developer/docs/help/reference/messages/km02909.md b/developer/docs/help/reference/messages/km02909.md new file mode 100644 index 00000000000..96d690960d9 --- /dev/null +++ b/developer/docs/help/reference/messages/km02909.md @@ -0,0 +1,14 @@ +--- +title: KM02909: WARN_InvalidVkeyInKvksFile +--- + +| | | +|------------|---------- | +| Message | Invalid virtual key <param> found in <param> | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `WARN_InvalidVkeyInKvksFile` | + +The .kvks file contained a virtual key that was not supported by +Keyman. Remove this virtual key from the .kvks file. + +Supported virtual keys: https://help.keyman.com/developer/language/guide/virtual-keys#common-virtual-key-codes diff --git a/developer/docs/help/reference/messages/km0290a.md b/developer/docs/help/reference/messages/km0290a.md new file mode 100644 index 00000000000..fb5db9ed09e --- /dev/null +++ b/developer/docs/help/reference/messages/km0290a.md @@ -0,0 +1,15 @@ +--- +title: KM0290A: ERROR_InvalidDisplayMapFile +--- + +| | | +|------------|---------- | +| Message | Error encountered parsing display map <param>: unknown error | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidDisplayMapFile` | + +The displayMap file could not be parsed because it was not a valid JSON +file. There may be additional information in the error message to help you +resolve the error. + +More on displayMap: https://help.keyman.com/developer/language/reference/displaymap diff --git a/developer/docs/help/reference/messages/km0290b.md b/developer/docs/help/reference/messages/km0290b.md new file mode 100644 index 00000000000..4fdb0f7d921 --- /dev/null +++ b/developer/docs/help/reference/messages/km0290b.md @@ -0,0 +1,15 @@ +--- +title: KM0290B: ERROR_InvalidKvkFile +--- + +| | | +|------------|---------- | +| Message | Error encountered loading <param>: unknown error | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_InvalidKvkFile` | + +The .kvk file could not be loaded because it was not a valid format. There +may be additional information in the error message to help you resolve the +error. + +More on .kvk files: https://help.keyman.com/developer/current-version/reference/file-types/kvk diff --git a/developer/docs/help/reference/messages/km0290c.md b/developer/docs/help/reference/messages/km0290c.md new file mode 100644 index 00000000000..97d584ca979 --- /dev/null +++ b/developer/docs/help/reference/messages/km0290c.md @@ -0,0 +1,12 @@ +--- +title: KM0290C: ERROR_FileNotFound +--- + +| | | +|------------|---------- | +| Message | File <param> was not found | +| Module | [kmc-kmn.KmnCompilerMessages](kmc-kmn.kmncompilermessages) | +| Identifier | `ERROR_FileNotFound` | + +The file was not found on the disk. Verify that you have the correct path +to the file. diff --git a/developer/docs/help/reference/messages/km03001.md b/developer/docs/help/reference/messages/km03001.md new file mode 100644 index 00000000000..b988ceb558c --- /dev/null +++ b/developer/docs/help/reference/messages/km03001.md @@ -0,0 +1,11 @@ +--- +title: KM03001: FATAL_UnexpectedException +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `FATAL_UnexpectedException` | + + diff --git a/developer/docs/help/reference/messages/km03002.md b/developer/docs/help/reference/messages/km03002.md new file mode 100644 index 00000000000..0066c30bb1a --- /dev/null +++ b/developer/docs/help/reference/messages/km03002.md @@ -0,0 +1,11 @@ +--- +title: KM03002: HINT_MixedNormalizationForms +--- + +| | | +|------------|---------- | +| Message | “<param>” is not in Unicode NFC\. Automatically converting to NFC\. | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `HINT_MixedNormalizationForms` | + + diff --git a/developer/docs/help/reference/messages/km03003.md b/developer/docs/help/reference/messages/km03003.md new file mode 100644 index 00000000000..d737092f030 --- /dev/null +++ b/developer/docs/help/reference/messages/km03003.md @@ -0,0 +1,11 @@ +--- +title: KM03003: HINT_DuplicateWordInSameFile +--- + +| | | +|------------|---------- | +| Message | duplicate word “<param>” found in same file; summing counts | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `HINT_DuplicateWordInSameFile` | + + diff --git a/developer/docs/help/reference/messages/km03004.md b/developer/docs/help/reference/messages/km03004.md new file mode 100644 index 00000000000..5b468c561b5 --- /dev/null +++ b/developer/docs/help/reference/messages/km03004.md @@ -0,0 +1,11 @@ +--- +title: KM03004: ERROR_UnimplementedModelFormat +--- + +| | | +|------------|---------- | +| Message | Unimplemented model format: <param> | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `ERROR_UnimplementedModelFormat` | + + diff --git a/developer/docs/help/reference/messages/km03005.md b/developer/docs/help/reference/messages/km03005.md new file mode 100644 index 00000000000..fc972eb9e93 --- /dev/null +++ b/developer/docs/help/reference/messages/km03005.md @@ -0,0 +1,11 @@ +--- +title: KM03005: ERROR_UnknownModelFormat +--- + +| | | +|------------|---------- | +| Message | Unimplemented model format: <param> | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `ERROR_UnknownModelFormat` | + + diff --git a/developer/docs/help/reference/messages/km03006.md b/developer/docs/help/reference/messages/km03006.md new file mode 100644 index 00000000000..24d6bc43513 --- /dev/null +++ b/developer/docs/help/reference/messages/km03006.md @@ -0,0 +1,11 @@ +--- +title: KM03006: ERROR_NoDefaultExport +--- + +| | | +|------------|---------- | +| Message | Model source does have a default export\. Did you remember to write \`export default source;\`? | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `ERROR_NoDefaultExport` | + + diff --git a/developer/docs/help/reference/messages/km03007.md b/developer/docs/help/reference/messages/km03007.md new file mode 100644 index 00000000000..988d8f60658 --- /dev/null +++ b/developer/docs/help/reference/messages/km03007.md @@ -0,0 +1,11 @@ +--- +title: KM03007: ERROR_SearchTermToKeyMustBeExplicitlySpecified +--- + +| | | +|------------|---------- | +| Message | searchTermToKey must be explicitly specified | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `ERROR_SearchTermToKeyMustBeExplicitlySpecified` | + + diff --git a/developer/docs/help/reference/messages/km03008.md b/developer/docs/help/reference/messages/km03008.md new file mode 100644 index 00000000000..761fede21a3 --- /dev/null +++ b/developer/docs/help/reference/messages/km03008.md @@ -0,0 +1,11 @@ +--- +title: KM03008: ERROR_UTF16BEUnsupported +--- + +| | | +|------------|---------- | +| Message | UTF\-16BE is unsupported | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `ERROR_UTF16BEUnsupported` | + + diff --git a/developer/docs/help/reference/messages/km03009.md b/developer/docs/help/reference/messages/km03009.md new file mode 100644 index 00000000000..293f02e7920 --- /dev/null +++ b/developer/docs/help/reference/messages/km03009.md @@ -0,0 +1,11 @@ +--- +title: KM03009: ERROR_UnknownWordBreaker +--- + +| | | +|------------|---------- | +| Message | Unknown word breaker: <param> | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `ERROR_UnknownWordBreaker` | + + diff --git a/developer/docs/help/reference/messages/km0300a.md b/developer/docs/help/reference/messages/km0300a.md new file mode 100644 index 00000000000..db2e3070c0b --- /dev/null +++ b/developer/docs/help/reference/messages/km0300a.md @@ -0,0 +1,11 @@ +--- +title: KM0300A: ERROR_UnsupportedScriptOverride +--- + +| | | +|------------|---------- | +| Message | Unsupported script override: <param> | +| Module | [kmc-model.ModelCompilerMessages](kmc-model.modelcompilermessages) | +| Identifier | `ERROR_UnsupportedScriptOverride` | + + diff --git a/developer/docs/help/reference/messages/km04001.md b/developer/docs/help/reference/messages/km04001.md new file mode 100644 index 00000000000..c0d482c2c4e --- /dev/null +++ b/developer/docs/help/reference/messages/km04001.md @@ -0,0 +1,11 @@ +--- +title: KM04001: FATAL_UnexpectedException +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `FATAL_UnexpectedException` | + + diff --git a/developer/docs/help/reference/messages/km04002.md b/developer/docs/help/reference/messages/km04002.md new file mode 100644 index 00000000000..d659496d1ac --- /dev/null +++ b/developer/docs/help/reference/messages/km04002.md @@ -0,0 +1,11 @@ +--- +title: KM04002: WARN_AbsolutePath +--- + +| | | +|------------|---------- | +| Message | File <param> has an absolute path, which is not portable\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_AbsolutePath` | + + diff --git a/developer/docs/help/reference/messages/km04003.md b/developer/docs/help/reference/messages/km04003.md new file mode 100644 index 00000000000..209a2d37a31 --- /dev/null +++ b/developer/docs/help/reference/messages/km04003.md @@ -0,0 +1,11 @@ +--- +title: KM04003: ERROR_FileDoesNotExist +--- + +| | | +|------------|---------- | +| Message | File <param> does not exist\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_FileDoesNotExist` | + + diff --git a/developer/docs/help/reference/messages/km04004.md b/developer/docs/help/reference/messages/km04004.md new file mode 100644 index 00000000000..d5b104ddfce --- /dev/null +++ b/developer/docs/help/reference/messages/km04004.md @@ -0,0 +1,11 @@ +--- +title: KM04004: ERROR_FileCouldNotBeRead +--- + +| | | +|------------|---------- | +| Message | File <param> could not be read: unknown error\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_FileCouldNotBeRead` | + + diff --git a/developer/docs/help/reference/messages/km04005.md b/developer/docs/help/reference/messages/km04005.md new file mode 100644 index 00000000000..494c040d142 --- /dev/null +++ b/developer/docs/help/reference/messages/km04005.md @@ -0,0 +1,11 @@ +--- +title: KM04005: WARN_FileIsNotABinaryKvkFile +--- + +| | | +|------------|---------- | +| Message | File <param> does not appear to be a valid binary \.kvk file; this may be an old package that includes an xml\-format \.kvk file\. You must update the package to include the compiled \.kvk file in the package\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_FileIsNotABinaryKvkFile` | + + diff --git a/developer/docs/help/reference/messages/km04006.md b/developer/docs/help/reference/messages/km04006.md new file mode 100644 index 00000000000..696815d28fc --- /dev/null +++ b/developer/docs/help/reference/messages/km04006.md @@ -0,0 +1,11 @@ +--- +title: KM04006: ERROR_FollowKeyboardVersionNotAllowedForModelPackages +--- + +| | | +|------------|---------- | +| Message | FollowKeyboardVersion is not allowed in model packages | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_FollowKeyboardVersionNotAllowedForModelPackages` | + + diff --git a/developer/docs/help/reference/messages/km04007.md b/developer/docs/help/reference/messages/km04007.md new file mode 100644 index 00000000000..a9709d876c2 --- /dev/null +++ b/developer/docs/help/reference/messages/km04007.md @@ -0,0 +1,11 @@ +--- +title: KM04007: ERROR_FollowKeyboardVersionButNoKeyboards +--- + +| | | +|------------|---------- | +| Message | FollowKeyboardVersion is set, but the package contains no keyboards | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_FollowKeyboardVersionButNoKeyboards` | + + diff --git a/developer/docs/help/reference/messages/km04008.md b/developer/docs/help/reference/messages/km04008.md new file mode 100644 index 00000000000..301b6ea85f7 --- /dev/null +++ b/developer/docs/help/reference/messages/km04008.md @@ -0,0 +1,11 @@ +--- +title: KM04008: ERROR_KeyboardContentFileNotFound +--- + +| | | +|------------|---------- | +| Message | Keyboard <param> was listed in <Keyboards> but a corresponding \.kmx file was not found in <Files> | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_KeyboardContentFileNotFound` | + + diff --git a/developer/docs/help/reference/messages/km04009.md b/developer/docs/help/reference/messages/km04009.md new file mode 100644 index 00000000000..5e2ebee13e5 --- /dev/null +++ b/developer/docs/help/reference/messages/km04009.md @@ -0,0 +1,11 @@ +--- +title: KM04009: ERROR_KeyboardFileNotValid +--- + +| | | +|------------|---------- | +| Message | Keyboard file <param> is not a valid \.kmx file: unknown error | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_KeyboardFileNotValid` | + + diff --git a/developer/docs/help/reference/messages/km0400a.md b/developer/docs/help/reference/messages/km0400a.md new file mode 100644 index 00000000000..f32c195b5d9 --- /dev/null +++ b/developer/docs/help/reference/messages/km0400a.md @@ -0,0 +1,11 @@ +--- +title: KM0400A: INFO_KeyboardFileHasNoKeyboardVersion +--- + +| | | +|------------|---------- | +| Message | Keyboard file <param> has no &KeyboardVersion store, using default '0\.0' | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `INFO_KeyboardFileHasNoKeyboardVersion` | + + diff --git a/developer/docs/help/reference/messages/km0400b.md b/developer/docs/help/reference/messages/km0400b.md new file mode 100644 index 00000000000..04c3af283b4 --- /dev/null +++ b/developer/docs/help/reference/messages/km0400b.md @@ -0,0 +1,11 @@ +--- +title: KM0400B: ERROR_PackageCannotContainBothModelsAndKeyboards +--- + +| | | +|------------|---------- | +| Message | The package contains both lexical models and keyboards, which is not permitted\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_PackageCannotContainBothModelsAndKeyboards` | + + diff --git a/developer/docs/help/reference/messages/km0400c.md b/developer/docs/help/reference/messages/km0400c.md new file mode 100644 index 00000000000..e8534620b82 --- /dev/null +++ b/developer/docs/help/reference/messages/km0400c.md @@ -0,0 +1,11 @@ +--- +title: KM0400C: HINT_PackageShouldNotRepeatLanguages +--- + +| | | +|------------|---------- | +| Message | Two language tags in <param> <param>, '<param>' and '<param>', reduce to the same minimal tag '<param>'\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `HINT_PackageShouldNotRepeatLanguages` | + + diff --git a/developer/docs/help/reference/messages/km0400d.md b/developer/docs/help/reference/messages/km0400d.md new file mode 100644 index 00000000000..b472719e0a9 --- /dev/null +++ b/developer/docs/help/reference/messages/km0400d.md @@ -0,0 +1,11 @@ +--- +title: KM0400D: WARN_PackageNameDoesNotFollowLexicalModelConventions +--- + +| | | +|------------|---------- | +| Message | The package file <param> does not follow the recommended model filename conventions\. The name should be all lower case, include only alphanumeric characters and underscore \(\_\), not start with a digit, and should have the structure <author>\.<bcp47>\.<uniq>\.model\.kps\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_PackageNameDoesNotFollowLexicalModelConventions` | + + diff --git a/developer/docs/help/reference/messages/km0400e.md b/developer/docs/help/reference/messages/km0400e.md new file mode 100644 index 00000000000..6315015e312 --- /dev/null +++ b/developer/docs/help/reference/messages/km0400e.md @@ -0,0 +1,11 @@ +--- +title: KM0400E: WARN_PackageNameDoesNotFollowKeyboardConventions +--- + +| | | +|------------|---------- | +| Message | The package file <param> does not follow the recommended keyboard filename conventions\. The name should be all lower case, include only alphanumeric characters and underscore \(\_\), and not start with a digit\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_PackageNameDoesNotFollowKeyboardConventions` | + + diff --git a/developer/docs/help/reference/messages/km0400f.md b/developer/docs/help/reference/messages/km0400f.md new file mode 100644 index 00000000000..654373479b1 --- /dev/null +++ b/developer/docs/help/reference/messages/km0400f.md @@ -0,0 +1,11 @@ +--- +title: KM0400F: WARN_FileInPackageDoesNotFollowFilenameConventions +--- + +| | | +|------------|---------- | +| Message | The file <param> does not follow the recommended filename conventions\. The extension should be all lower case, and the filename should include only alphanumeric characters, \-, \_, \+ and \. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_FileInPackageDoesNotFollowFilenameConventions` | + + diff --git a/developer/docs/help/reference/messages/km04010.md b/developer/docs/help/reference/messages/km04010.md new file mode 100644 index 00000000000..dae0bc2ebc7 --- /dev/null +++ b/developer/docs/help/reference/messages/km04010.md @@ -0,0 +1,11 @@ +--- +title: KM04010: ERROR_PackageNameCannotBeBlank +--- + +| | | +|------------|---------- | +| Message | Package name cannot be an empty string\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_PackageNameCannotBeBlank` | + + diff --git a/developer/docs/help/reference/messages/km04011.md b/developer/docs/help/reference/messages/km04011.md new file mode 100644 index 00000000000..c1244105ce9 --- /dev/null +++ b/developer/docs/help/reference/messages/km04011.md @@ -0,0 +1,11 @@ +--- +title: KM04011: ERROR_KeyboardFileNotFound +--- + +| | | +|------------|---------- | +| Message | Keyboard file <param> was not found\. Has it been compiled? | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_KeyboardFileNotFound` | + + diff --git a/developer/docs/help/reference/messages/km04012.md b/developer/docs/help/reference/messages/km04012.md new file mode 100644 index 00000000000..42d3197b4aa --- /dev/null +++ b/developer/docs/help/reference/messages/km04012.md @@ -0,0 +1,11 @@ +--- +title: KM04012: WARN_KeyboardVersionsDoNotMatch +--- + +| | | +|------------|---------- | +| Message | Keyboard <param> version <param> does not match keyboard <param> version <param>\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_KeyboardVersionsDoNotMatch` | + + diff --git a/developer/docs/help/reference/messages/km04014.md b/developer/docs/help/reference/messages/km04014.md new file mode 100644 index 00000000000..df8a014a85b --- /dev/null +++ b/developer/docs/help/reference/messages/km04014.md @@ -0,0 +1,11 @@ +--- +title: KM04014: ERROR_LanguageTagIsNotValid +--- + +| | | +|------------|---------- | +| Message | Language tag '<param>' in <param> <param> is invalid\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_LanguageTagIsNotValid` | + + diff --git a/developer/docs/help/reference/messages/km04015.md b/developer/docs/help/reference/messages/km04015.md new file mode 100644 index 00000000000..38d6a73b3fb --- /dev/null +++ b/developer/docs/help/reference/messages/km04015.md @@ -0,0 +1,11 @@ +--- +title: KM04015: HINT_LanguageTagIsNotMinimal +--- + +| | | +|------------|---------- | +| Message | Language tag '<param>' in <param> <param> is not minimal, and should be '<param>'\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `HINT_LanguageTagIsNotMinimal` | + + diff --git a/developer/docs/help/reference/messages/km04016.md b/developer/docs/help/reference/messages/km04016.md new file mode 100644 index 00000000000..5b4a6004097 --- /dev/null +++ b/developer/docs/help/reference/messages/km04016.md @@ -0,0 +1,11 @@ +--- +title: KM04016: ERROR_ModelMustHaveAtLeastOneLanguage +--- + +| | | +|------------|---------- | +| Message | The lexical model <param> must have at least one language specified\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_ModelMustHaveAtLeastOneLanguage` | + + diff --git a/developer/docs/help/reference/messages/km04017.md b/developer/docs/help/reference/messages/km04017.md new file mode 100644 index 00000000000..8545103e8e0 --- /dev/null +++ b/developer/docs/help/reference/messages/km04017.md @@ -0,0 +1,11 @@ +--- +title: KM04017: WARN_RedistFileShouldNotBeInPackage +--- + +| | | +|------------|---------- | +| Message | The Keyman system file '<param>' should not be compiled into the package\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_RedistFileShouldNotBeInPackage` | + + diff --git a/developer/docs/help/reference/messages/km04018.md b/developer/docs/help/reference/messages/km04018.md new file mode 100644 index 00000000000..7b80134b406 --- /dev/null +++ b/developer/docs/help/reference/messages/km04018.md @@ -0,0 +1,11 @@ +--- +title: KM04018: WARN_DocFileDangerous +--- + +| | | +|------------|---------- | +| Message | Microsoft Word \.doc or \.docx files \('<param>'\) are not portable\. You should instead use HTML or PDF format\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_DocFileDangerous` | + + diff --git a/developer/docs/help/reference/messages/km04019.md b/developer/docs/help/reference/messages/km04019.md new file mode 100644 index 00000000000..ba36824e99b --- /dev/null +++ b/developer/docs/help/reference/messages/km04019.md @@ -0,0 +1,11 @@ +--- +title: KM04019: ERROR_PackageMustContainAModelOrAKeyboard +--- + +| | | +|------------|---------- | +| Message | Package must contain a lexical model or a keyboard\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_PackageMustContainAModelOrAKeyboard` | + + diff --git a/developer/docs/help/reference/messages/km0401a.md b/developer/docs/help/reference/messages/km0401a.md new file mode 100644 index 00000000000..c26768212a9 --- /dev/null +++ b/developer/docs/help/reference/messages/km0401a.md @@ -0,0 +1,11 @@ +--- +title: KM0401A: WARN_JsKeyboardFileIsMissing +--- + +| | | +|------------|---------- | +| Message | Keyboard <param> targets touch devices but corresponding <param>\.js file is not in the package\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_JsKeyboardFileIsMissing` | + + diff --git a/developer/docs/help/reference/messages/km0401b.md b/developer/docs/help/reference/messages/km0401b.md new file mode 100644 index 00000000000..2cb156f927c --- /dev/null +++ b/developer/docs/help/reference/messages/km0401b.md @@ -0,0 +1,11 @@ +--- +title: KM0401B: WARN_KeyboardShouldHaveAtLeastOneLanguage +--- + +| | | +|------------|---------- | +| Message | The keyboard <param> should have at least one language specified\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `WARN_KeyboardShouldHaveAtLeastOneLanguage` | + + diff --git a/developer/docs/help/reference/messages/km0401c.md b/developer/docs/help/reference/messages/km0401c.md new file mode 100644 index 00000000000..72c4c84404b --- /dev/null +++ b/developer/docs/help/reference/messages/km0401c.md @@ -0,0 +1,11 @@ +--- +title: KM0401C: HINT_JsKeyboardFileHasNoTouchTargets +--- + +| | | +|------------|---------- | +| Message | The keyboard <param> has been included for touch platforms, but does not include a touch layout\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `HINT_JsKeyboardFileHasNoTouchTargets` | + + diff --git a/developer/docs/help/reference/messages/km0401d.md b/developer/docs/help/reference/messages/km0401d.md new file mode 100644 index 00000000000..d6a773dbed8 --- /dev/null +++ b/developer/docs/help/reference/messages/km0401d.md @@ -0,0 +1,11 @@ +--- +title: KM0401D: HINT_PackageContainsSourceFile +--- + +| | | +|------------|---------- | +| Message | The source file <param> should not be included in the package; instead include the compiled result\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `HINT_PackageContainsSourceFile` | + + diff --git a/developer/docs/help/reference/messages/km0401e.md b/developer/docs/help/reference/messages/km0401e.md new file mode 100644 index 00000000000..c7221243e5a --- /dev/null +++ b/developer/docs/help/reference/messages/km0401e.md @@ -0,0 +1,11 @@ +--- +title: KM0401E: ERROR_InvalidPackageFile +--- + +| | | +|------------|---------- | +| Message | Package source file is invalid: unknown error | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_InvalidPackageFile` | + + diff --git a/developer/docs/help/reference/messages/km0401f.md b/developer/docs/help/reference/messages/km0401f.md new file mode 100644 index 00000000000..71ffb82d91a --- /dev/null +++ b/developer/docs/help/reference/messages/km0401f.md @@ -0,0 +1,11 @@ +--- +title: KM0401F: ERROR_FileRecordIsMissingName +--- + +| | | +|------------|---------- | +| Message | File record in the package with description 'undefined' is missing a filename\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_FileRecordIsMissingName` | + + diff --git a/developer/docs/help/reference/messages/km04020.md b/developer/docs/help/reference/messages/km04020.md new file mode 100644 index 00000000000..94de1c5805b --- /dev/null +++ b/developer/docs/help/reference/messages/km04020.md @@ -0,0 +1,11 @@ +--- +title: KM04020: ERROR_InvalidAuthorEmail +--- + +| | | +|------------|---------- | +| Message | Invalid author email: <param> | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_InvalidAuthorEmail` | + + diff --git a/developer/docs/help/reference/messages/km04021.md b/developer/docs/help/reference/messages/km04021.md new file mode 100644 index 00000000000..37b60e128e2 --- /dev/null +++ b/developer/docs/help/reference/messages/km04021.md @@ -0,0 +1,11 @@ +--- +title: KM04021: ERROR_PackageFileHasEmptyVersion +--- + +| | | +|------------|---------- | +| Message | Package version is not following keyboard version, but the package version field is blank\. | +| Module | [kmc-package.CompilerMessages](kmc-package.compilermessages) | +| Identifier | `ERROR_PackageFileHasEmptyVersion` | + + diff --git a/developer/docs/help/reference/messages/km05001.md b/developer/docs/help/reference/messages/km05001.md new file mode 100644 index 00000000000..8d6217d8266 --- /dev/null +++ b/developer/docs/help/reference/messages/km05001.md @@ -0,0 +1,11 @@ +--- +title: KM05001: FATAL_UnexpectedException +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `FATAL_UnexpectedException` | + + diff --git a/developer/docs/help/reference/messages/km05002.md b/developer/docs/help/reference/messages/km05002.md new file mode 100644 index 00000000000..72b5f230ffe --- /dev/null +++ b/developer/docs/help/reference/messages/km05002.md @@ -0,0 +1,11 @@ +--- +title: KM05002: INFO_BuildingFile +--- + +| | | +|------------|---------- | +| Message | Building <param> | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `INFO_BuildingFile` | + + diff --git a/developer/docs/help/reference/messages/km05003.md b/developer/docs/help/reference/messages/km05003.md new file mode 100644 index 00000000000..9c592343ee9 --- /dev/null +++ b/developer/docs/help/reference/messages/km05003.md @@ -0,0 +1,11 @@ +--- +title: KM05003: ERROR_FileDoesNotExist +--- + +| | | +|------------|---------- | +| Message | File <param> does not exist | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_FileDoesNotExist` | + + diff --git a/developer/docs/help/reference/messages/km05004.md b/developer/docs/help/reference/messages/km05004.md new file mode 100644 index 00000000000..613b1f7b9a0 --- /dev/null +++ b/developer/docs/help/reference/messages/km05004.md @@ -0,0 +1,11 @@ +--- +title: KM05004: ERROR_FileTypeNotRecognized +--- + +| | | +|------------|---------- | +| Message | Unrecognised input file <param>, expecting <param>, or project folder | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_FileTypeNotRecognized` | + + diff --git a/developer/docs/help/reference/messages/km05005.md b/developer/docs/help/reference/messages/km05005.md new file mode 100644 index 00000000000..b8fd53b3c8e --- /dev/null +++ b/developer/docs/help/reference/messages/km05005.md @@ -0,0 +1,11 @@ +--- +title: KM05005: ERROR_OutFileNotValidForProjects +--- + +| | | +|------------|---------- | +| Message | \-\-out\-file should not be specified for project builds | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_OutFileNotValidForProjects` | + + diff --git a/developer/docs/help/reference/messages/km05006.md b/developer/docs/help/reference/messages/km05006.md new file mode 100644 index 00000000000..65ba2240482 --- /dev/null +++ b/developer/docs/help/reference/messages/km05006.md @@ -0,0 +1,11 @@ +--- +title: KM05006: INFO_FileBuiltSuccessfully +--- + +| | | +|------------|---------- | +| Message | <param> built successfully\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `INFO_FileBuiltSuccessfully` | + + diff --git a/developer/docs/help/reference/messages/km05007.md b/developer/docs/help/reference/messages/km05007.md new file mode 100644 index 00000000000..64f57f6e328 --- /dev/null +++ b/developer/docs/help/reference/messages/km05007.md @@ -0,0 +1,11 @@ +--- +title: KM05007: INFO_FileNotBuiltSuccessfully +--- + +| | | +|------------|---------- | +| Message | <param> failed to build\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `INFO_FileNotBuiltSuccessfully` | + + diff --git a/developer/docs/help/reference/messages/km05008.md b/developer/docs/help/reference/messages/km05008.md new file mode 100644 index 00000000000..d0838674b32 --- /dev/null +++ b/developer/docs/help/reference/messages/km05008.md @@ -0,0 +1,11 @@ +--- +title: KM05008: ERROR_InvalidProjectFile +--- + +| | | +|------------|---------- | +| Message | Project file is not valid: <param> | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_InvalidProjectFile` | + + diff --git a/developer/docs/help/reference/messages/km05009.md b/developer/docs/help/reference/messages/km05009.md new file mode 100644 index 00000000000..1874676a98a --- /dev/null +++ b/developer/docs/help/reference/messages/km05009.md @@ -0,0 +1,11 @@ +--- +title: KM05009: HINT_FilenameHasDifferingCase +--- + +| | | +|------------|---------- | +| Message | File on disk '<param>' does not match case of '<param>' in source file; this is an error on platforms with case\-sensitive filesystems\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `HINT_FilenameHasDifferingCase` | + + diff --git a/developer/docs/help/reference/messages/km0500a.md b/developer/docs/help/reference/messages/km0500a.md new file mode 100644 index 00000000000..c9dfa42d6c5 --- /dev/null +++ b/developer/docs/help/reference/messages/km0500a.md @@ -0,0 +1,11 @@ +--- +title: KM0500A: ERROR_UnknownFileFormat +--- + +| | | +|------------|---------- | +| Message | Unknown file format <param>; only Markdown \(\.md\), JSON \(\.json\), and Text \(\.txt\) are supported\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_UnknownFileFormat` | + + diff --git a/developer/docs/help/reference/messages/km0500b.md b/developer/docs/help/reference/messages/km0500b.md new file mode 100644 index 00000000000..632bccaf1b5 --- /dev/null +++ b/developer/docs/help/reference/messages/km0500b.md @@ -0,0 +1,11 @@ +--- +title: KM0500B: INFO_ProjectBuiltSuccessfully +--- + +| | | +|------------|---------- | +| Message | Project <param> built successfully\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `INFO_ProjectBuiltSuccessfully` | + + diff --git a/developer/docs/help/reference/messages/km0500c.md b/developer/docs/help/reference/messages/km0500c.md new file mode 100644 index 00000000000..9ed37722733 --- /dev/null +++ b/developer/docs/help/reference/messages/km0500c.md @@ -0,0 +1,11 @@ +--- +title: KM0500C: INFO_ProjectNotBuiltSuccessfully +--- + +| | | +|------------|---------- | +| Message | Project <param> failed to build\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `INFO_ProjectNotBuiltSuccessfully` | + + diff --git a/developer/docs/help/reference/messages/km0500d.md b/developer/docs/help/reference/messages/km0500d.md new file mode 100644 index 00000000000..b3b7e0ae9e6 --- /dev/null +++ b/developer/docs/help/reference/messages/km0500d.md @@ -0,0 +1,11 @@ +--- +title: KM0500D: INFO_TooManyMessages +--- + +| | | +|------------|---------- | +| Message | More than <param> warnings or errors received; suppressing further messages\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `INFO_TooManyMessages` | + + diff --git a/developer/docs/help/reference/messages/km0500e.md b/developer/docs/help/reference/messages/km0500e.md new file mode 100644 index 00000000000..1e8eecfe5c0 --- /dev/null +++ b/developer/docs/help/reference/messages/km0500e.md @@ -0,0 +1,11 @@ +--- +title: KM0500E: ERROR_FileTypeNotFound +--- + +| | | +|------------|---------- | +| Message | A file of type <param> was not found in the project\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_FileTypeNotFound` | + + diff --git a/developer/docs/help/reference/messages/km0500f.md b/developer/docs/help/reference/messages/km0500f.md new file mode 100644 index 00000000000..b3ae8ebbef1 --- /dev/null +++ b/developer/docs/help/reference/messages/km0500f.md @@ -0,0 +1,11 @@ +--- +title: KM0500F: ERROR_NotAProjectFile +--- + +| | | +|------------|---------- | +| Message | File <param> must have a \.kpj extension to be treated as a project\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_NotAProjectFile` | + + diff --git a/developer/docs/help/reference/messages/km05010.md b/developer/docs/help/reference/messages/km05010.md new file mode 100644 index 00000000000..18c0968ac6a --- /dev/null +++ b/developer/docs/help/reference/messages/km05010.md @@ -0,0 +1,11 @@ +--- +title: KM05010: INFO_WarningsHaveFailedBuild +--- + +| | | +|------------|---------- | +| Message | The build failed because option "treat warnings as errors" is enabled and there are one or more warnings\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `INFO_WarningsHaveFailedBuild` | + + diff --git a/developer/docs/help/reference/messages/km05011.md b/developer/docs/help/reference/messages/km05011.md new file mode 100644 index 00000000000..f019f9e88f2 --- /dev/null +++ b/developer/docs/help/reference/messages/km05011.md @@ -0,0 +1,11 @@ +--- +title: KM05011: ERROR_CannotCreateFolder +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_CannotCreateFolder` | + + diff --git a/developer/docs/help/reference/messages/km05012.md b/developer/docs/help/reference/messages/km05012.md new file mode 100644 index 00000000000..19bcaf883a7 --- /dev/null +++ b/developer/docs/help/reference/messages/km05012.md @@ -0,0 +1,11 @@ +--- +title: KM05012: ERROR_InvalidProjectFolder +--- + +| | | +|------------|---------- | +| Message | The folder <param> does not appear to be a Keyman Developer project\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_InvalidProjectFolder` | + + diff --git a/developer/docs/help/reference/messages/km05013.md b/developer/docs/help/reference/messages/km05013.md new file mode 100644 index 00000000000..bb5d07cf987 --- /dev/null +++ b/developer/docs/help/reference/messages/km05013.md @@ -0,0 +1,11 @@ +--- +title: KM05013: ERROR_UnsupportedProjectVersion +--- + +| | | +|------------|---------- | +| Message | Project version <param> is not supported by this version of Keyman Developer\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_UnsupportedProjectVersion` | + + diff --git a/developer/docs/help/reference/messages/km05014.md b/developer/docs/help/reference/messages/km05014.md new file mode 100644 index 00000000000..3e812653143 --- /dev/null +++ b/developer/docs/help/reference/messages/km05014.md @@ -0,0 +1,11 @@ +--- +title: KM05014: HINT_ProjectIsVersion10 +--- + +| | | +|------------|---------- | +| Message | The project file is an older version and can be upgraded to version 17\.0 | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `HINT_ProjectIsVersion10` | + + diff --git a/developer/docs/help/reference/messages/km05015.md b/developer/docs/help/reference/messages/km05015.md new file mode 100644 index 00000000000..1807eba3d2c --- /dev/null +++ b/developer/docs/help/reference/messages/km05015.md @@ -0,0 +1,11 @@ +--- +title: KM05015: ERROR_OutFileCanOnlyBeSpecifiedWithSingleInfile +--- + +| | | +|------------|---------- | +| Message | Parameter \-\-out\-file can only be used with a single input file\. | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_OutFileCanOnlyBeSpecifiedWithSingleInfile` | + + diff --git a/developer/docs/help/reference/messages/km05016.md b/developer/docs/help/reference/messages/km05016.md new file mode 100644 index 00000000000..714d56acad1 --- /dev/null +++ b/developer/docs/help/reference/messages/km05016.md @@ -0,0 +1,11 @@ +--- +title: KM05016: ERROR_InvalidMessageFormat +--- + +| | | +|------------|---------- | +| Message | Invalid parameter: \-\-message <param> must match format '\[KM\]\#\#\#\#\#\[:Disable\|Info\|Hint\|Warn\|Error\]' | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_InvalidMessageFormat` | + + diff --git a/developer/docs/help/reference/messages/km05017.md b/developer/docs/help/reference/messages/km05017.md new file mode 100644 index 00000000000..660f4471536 --- /dev/null +++ b/developer/docs/help/reference/messages/km05017.md @@ -0,0 +1,11 @@ +--- +title: KM05017: ERROR_MessageNamespaceNotFound +--- + +| | | +|------------|---------- | +| Message | Invalid parameter: \-\-message <param> does not have a recognized namespace | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_MessageNamespaceNotFound` | + + diff --git a/developer/docs/help/reference/messages/km05018.md b/developer/docs/help/reference/messages/km05018.md new file mode 100644 index 00000000000..8c9056d6a51 --- /dev/null +++ b/developer/docs/help/reference/messages/km05018.md @@ -0,0 +1,11 @@ +--- +title: KM05018: ERROR_MessageCodeNotFound +--- + +| | | +|------------|---------- | +| Message | Invalid parameter: \-\-message undefined is not a recognized code | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_MessageCodeNotFound` | + + diff --git a/developer/docs/help/reference/messages/km05019.md b/developer/docs/help/reference/messages/km05019.md new file mode 100644 index 00000000000..352928390f1 --- /dev/null +++ b/developer/docs/help/reference/messages/km05019.md @@ -0,0 +1,11 @@ +--- +title: KM05019: ERROR_MessageCannotBeCoerced +--- + +| | | +|------------|---------- | +| Message | Invalid parameter: \-\-message <param> is not of type 'info', 'hint' or 'warn', and cannot be coerced | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_MessageCannotBeCoerced` | + + diff --git a/developer/docs/help/reference/messages/km0501a.md b/developer/docs/help/reference/messages/km0501a.md new file mode 100644 index 00000000000..0d1f3872233 --- /dev/null +++ b/developer/docs/help/reference/messages/km0501a.md @@ -0,0 +1,11 @@ +--- +title: KM0501A: ERROR_UnrecognizedMessageCode +--- + +| | | +|------------|---------- | +| Message | Invalid parameter: message identifier '<param>' must match format '\[KM\]\#\#\#\#\#' | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_UnrecognizedMessageCode` | + + diff --git a/developer/docs/help/reference/messages/km0501b.md b/developer/docs/help/reference/messages/km0501b.md new file mode 100644 index 00000000000..233e92f33c1 --- /dev/null +++ b/developer/docs/help/reference/messages/km0501b.md @@ -0,0 +1,11 @@ +--- +title: KM0501B: ERROR_MustSpecifyMessageCode +--- + +| | | +|------------|---------- | +| Message | Must specify at least one message code or \-a for all messages | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_MustSpecifyMessageCode` | + + diff --git a/developer/docs/help/reference/messages/km0501c.md b/developer/docs/help/reference/messages/km0501c.md new file mode 100644 index 00000000000..510799f520b --- /dev/null +++ b/developer/docs/help/reference/messages/km0501c.md @@ -0,0 +1,11 @@ +--- +title: KM0501C: ERROR_MessagesCannotBeFilteredForMarkdownFormat +--- + +| | | +|------------|---------- | +| Message | Messages cannot be filtered for markdown format | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_MessagesCannotBeFilteredForMarkdownFormat` | + + diff --git a/developer/docs/help/reference/messages/km0501d.md b/developer/docs/help/reference/messages/km0501d.md new file mode 100644 index 00000000000..c91d7897c21 --- /dev/null +++ b/developer/docs/help/reference/messages/km0501d.md @@ -0,0 +1,11 @@ +--- +title: KM0501D: ERROR_OutputPathMustBeSpecifiedForMarkdownFormat +--- + +| | | +|------------|---------- | +| Message | Output path must be specified with \-o for markdown output format | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_OutputPathMustBeSpecifiedForMarkdownFormat` | + + diff --git a/developer/docs/help/reference/messages/km0501e.md b/developer/docs/help/reference/messages/km0501e.md new file mode 100644 index 00000000000..a4934b3856b --- /dev/null +++ b/developer/docs/help/reference/messages/km0501e.md @@ -0,0 +1,11 @@ +--- +title: KM0501E: ERROR_OutputPathMustExistAndBeADirectory +--- + +| | | +|------------|---------- | +| Message | Output path <param> must exist and must be a folder | +| Module | [kmc.InfrastructureMessages](kmc.infrastructuremessages) | +| Identifier | `ERROR_OutputPathMustExistAndBeADirectory` | + + diff --git a/developer/docs/help/reference/messages/km06001.md b/developer/docs/help/reference/messages/km06001.md new file mode 100644 index 00000000000..31e5c8afcfb --- /dev/null +++ b/developer/docs/help/reference/messages/km06001.md @@ -0,0 +1,13 @@ +--- +title: KM06001: FATAL_UnexpectedException +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-analyze.AnalyzerMessages](kmc-analyze.analyzermessages) | +| Identifier | `FATAL_UnexpectedException` | + +Raised when an analysis components has an internal error. If you +experience this error, it should be reported to the Keyman team for +resolution via https://github.com/keymanapp/keyman/issues/new diff --git a/developer/docs/help/reference/messages/km06002.md b/developer/docs/help/reference/messages/km06002.md new file mode 100644 index 00000000000..b533ffd6675 --- /dev/null +++ b/developer/docs/help/reference/messages/km06002.md @@ -0,0 +1,11 @@ +--- +title: KM06002: INFO_ScanningFile +--- + +| | | +|------------|---------- | +| Message | Scanning <param> file <param> | +| Module | [kmc-analyze.AnalyzerMessages](kmc-analyze.analyzermessages) | +| Identifier | `INFO_ScanningFile` | + +Informative message reporting on the current file being scanned diff --git a/developer/docs/help/reference/messages/km07001.md b/developer/docs/help/reference/messages/km07001.md new file mode 100644 index 00000000000..05474815efc --- /dev/null +++ b/developer/docs/help/reference/messages/km07001.md @@ -0,0 +1,11 @@ +--- +title: KM07001: ERROR_NotAnyRequiresVersion14 +--- + +| | | +|------------|---------- | +| Message | Statement notany in context\(\) match requires version 14\.0\+ of KeymanWeb | +| Module | [kmc-kmn.KmwCompilerMessages](kmc-kmn.kmwcompilermessages) | +| Identifier | `ERROR_NotAnyRequiresVersion14` | + + diff --git a/developer/docs/help/reference/messages/km07002.md b/developer/docs/help/reference/messages/km07002.md new file mode 100644 index 00000000000..3725b73a769 --- /dev/null +++ b/developer/docs/help/reference/messages/km07002.md @@ -0,0 +1,11 @@ +--- +title: KM07002: ERROR_TouchLayoutIdentifierRequires15 +--- + +| | | +|------------|---------- | +| Message | Key "<param>" on "<param>", layer "<param>" has a multi\-part identifier which requires version 15\.0 or newer\. | +| Module | [kmc-kmn.KmwCompilerMessages](kmc-kmn.kmwcompilermessages) | +| Identifier | `ERROR_TouchLayoutIdentifierRequires15` | + + diff --git a/developer/docs/help/reference/messages/km07003.md b/developer/docs/help/reference/messages/km07003.md new file mode 100644 index 00000000000..f248343f087 --- /dev/null +++ b/developer/docs/help/reference/messages/km07003.md @@ -0,0 +1,11 @@ +--- +title: KM07003: ERROR_InvalidTouchLayoutFileFormat +--- + +| | | +|------------|---------- | +| Message | Invalid touch layout file: <param> | +| Module | [kmc-kmn.KmwCompilerMessages](kmc-kmn.kmwcompilermessages) | +| Identifier | `ERROR_InvalidTouchLayoutFileFormat` | + + diff --git a/developer/docs/help/reference/messages/km07004.md b/developer/docs/help/reference/messages/km07004.md new file mode 100644 index 00000000000..962ebd92f9b --- /dev/null +++ b/developer/docs/help/reference/messages/km07004.md @@ -0,0 +1,11 @@ +--- +title: KM07004: ERROR_TouchLayoutFileDoesNotExist +--- + +| | | +|------------|---------- | +| Message | Touch layout file <param> does not exist | +| Module | [kmc-kmn.KmwCompilerMessages](kmc-kmn.kmwcompilermessages) | +| Identifier | `ERROR_TouchLayoutFileDoesNotExist` | + + diff --git a/developer/docs/help/reference/messages/km07005.md b/developer/docs/help/reference/messages/km07005.md new file mode 100644 index 00000000000..852b8689757 --- /dev/null +++ b/developer/docs/help/reference/messages/km07005.md @@ -0,0 +1,11 @@ +--- +title: KM07005: HINT_TouchLayoutUsesUnsupportedGesturesDownlevel +--- + +| | | +|------------|---------- | +| Message | The touch layout uses a flick or multi\-tap gesture on key <param>, which is only available on version 17\.0\+ of Keyman | +| Module | [kmc-kmn.KmwCompilerMessages](kmc-kmn.kmwcompilermessages) | +| Identifier | `HINT_TouchLayoutUsesUnsupportedGesturesDownlevel` | + + diff --git a/developer/docs/help/reference/messages/km08001.md b/developer/docs/help/reference/messages/km08001.md new file mode 100644 index 00000000000..5387285f733 --- /dev/null +++ b/developer/docs/help/reference/messages/km08001.md @@ -0,0 +1,11 @@ +--- +title: KM08001: FATAL_UnexpectedException +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `FATAL_UnexpectedException` | + + diff --git a/developer/docs/help/reference/messages/km08002.md b/developer/docs/help/reference/messages/km08002.md new file mode 100644 index 00000000000..77a251119aa --- /dev/null +++ b/developer/docs/help/reference/messages/km08002.md @@ -0,0 +1,11 @@ +--- +title: KM08002: ERROR_FileDoesNotExist +--- + +| | | +|------------|---------- | +| Message | File <param> does not exist\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_FileDoesNotExist` | + + diff --git a/developer/docs/help/reference/messages/km08003.md b/developer/docs/help/reference/messages/km08003.md new file mode 100644 index 00000000000..ae9d7244d9f --- /dev/null +++ b/developer/docs/help/reference/messages/km08003.md @@ -0,0 +1,11 @@ +--- +title: KM08003: ERROR_FileIsNotValid +--- + +| | | +|------------|---------- | +| Message | File <param> could not be parsed: unknown error\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_FileIsNotValid` | + + diff --git a/developer/docs/help/reference/messages/km08004.md b/developer/docs/help/reference/messages/km08004.md new file mode 100644 index 00000000000..82ad0635445 --- /dev/null +++ b/developer/docs/help/reference/messages/km08004.md @@ -0,0 +1,11 @@ +--- +title: KM08004: WARN_MetadataFieldInconsistent +--- + +| | | +|------------|---------- | +| Message | Warning: field <param> value "<param>" does not match "<param>" found in source file metadata\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `WARN_MetadataFieldInconsistent` | + + diff --git a/developer/docs/help/reference/messages/km08005.md b/developer/docs/help/reference/messages/km08005.md new file mode 100644 index 00000000000..b71b3590c1a --- /dev/null +++ b/developer/docs/help/reference/messages/km08005.md @@ -0,0 +1,11 @@ +--- +title: KM08005: ERROR_InvalidAuthorEmail +--- + +| | | +|------------|---------- | +| Message | Invalid author email: <param> | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_InvalidAuthorEmail` | + + diff --git a/developer/docs/help/reference/messages/km08006.md b/developer/docs/help/reference/messages/km08006.md new file mode 100644 index 00000000000..15e4997a403 --- /dev/null +++ b/developer/docs/help/reference/messages/km08006.md @@ -0,0 +1,11 @@ +--- +title: KM08006: ERROR_LicenseFileIsMissing +--- + +| | | +|------------|---------- | +| Message | License file <param> does not exist\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_LicenseFileIsMissing` | + + diff --git a/developer/docs/help/reference/messages/km08007.md b/developer/docs/help/reference/messages/km08007.md new file mode 100644 index 00000000000..6b352d11109 --- /dev/null +++ b/developer/docs/help/reference/messages/km08007.md @@ -0,0 +1,11 @@ +--- +title: KM08007: ERROR_LicenseFileIsDamaged +--- + +| | | +|------------|---------- | +| Message | License file <param> could not be loaded or decoded\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_LicenseFileIsDamaged` | + + diff --git a/developer/docs/help/reference/messages/km08008.md b/developer/docs/help/reference/messages/km08008.md new file mode 100644 index 00000000000..f7b5cfa3cef --- /dev/null +++ b/developer/docs/help/reference/messages/km08008.md @@ -0,0 +1,11 @@ +--- +title: KM08008: ERROR_LicenseIsNotValid +--- + +| | | +|------------|---------- | +| Message | An error was encountered parsing license file <param>: <param>\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_LicenseIsNotValid` | + + diff --git a/developer/docs/help/reference/messages/km08009.md b/developer/docs/help/reference/messages/km08009.md new file mode 100644 index 00000000000..969ba14c7b7 --- /dev/null +++ b/developer/docs/help/reference/messages/km08009.md @@ -0,0 +1,11 @@ +--- +title: KM08009: ERROR_NoLicenseFound +--- + +| | | +|------------|---------- | +| Message | No license for the model was found\. MIT license is required for publication to Keyman lexical\-models repository\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_NoLicenseFound` | + + diff --git a/developer/docs/help/reference/messages/km0800a.md b/developer/docs/help/reference/messages/km0800a.md new file mode 100644 index 00000000000..2d6170b19af --- /dev/null +++ b/developer/docs/help/reference/messages/km0800a.md @@ -0,0 +1,11 @@ +--- +title: KM0800A: ERROR_DescriptionIsMissing +--- + +| | | +|------------|---------- | +| Message | The Info\.Description field in the package <param> is required, but is missing or empty\. | +| Module | [kmc-model-info.ModelInfoCompilerMessages](kmc-model-info.modelinfocompilermessages) | +| Identifier | `ERROR_DescriptionIsMissing` | + + diff --git a/developer/docs/help/reference/messages/km09001.md b/developer/docs/help/reference/messages/km09001.md new file mode 100644 index 00000000000..7012d6e5516 --- /dev/null +++ b/developer/docs/help/reference/messages/km09001.md @@ -0,0 +1,11 @@ +--- +title: KM09001: FATAL_UnexpectedException +--- + +| | | +|------------|---------- | +| Message | This is an internal error; the message will vary | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `FATAL_UnexpectedException` | + + diff --git a/developer/docs/help/reference/messages/km09002.md b/developer/docs/help/reference/messages/km09002.md new file mode 100644 index 00000000000..17882283d09 --- /dev/null +++ b/developer/docs/help/reference/messages/km09002.md @@ -0,0 +1,11 @@ +--- +title: KM09002: ERROR_FileDoesNotExist +--- + +| | | +|------------|---------- | +| Message | File <param> does not exist\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_FileDoesNotExist` | + + diff --git a/developer/docs/help/reference/messages/km09005.md b/developer/docs/help/reference/messages/km09005.md new file mode 100644 index 00000000000..d88e2440adb --- /dev/null +++ b/developer/docs/help/reference/messages/km09005.md @@ -0,0 +1,11 @@ +--- +title: KM09005: ERROR_InvalidAuthorEmail +--- + +| | | +|------------|---------- | +| Message | Invalid author email: <param> | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_InvalidAuthorEmail` | + + diff --git a/developer/docs/help/reference/messages/km09006.md b/developer/docs/help/reference/messages/km09006.md new file mode 100644 index 00000000000..f8579775216 --- /dev/null +++ b/developer/docs/help/reference/messages/km09006.md @@ -0,0 +1,11 @@ +--- +title: KM09006: ERROR_LicenseFileIsMissing +--- + +| | | +|------------|---------- | +| Message | License file <param> does not exist\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_LicenseFileIsMissing` | + + diff --git a/developer/docs/help/reference/messages/km09007.md b/developer/docs/help/reference/messages/km09007.md new file mode 100644 index 00000000000..bbab92c762e --- /dev/null +++ b/developer/docs/help/reference/messages/km09007.md @@ -0,0 +1,11 @@ +--- +title: KM09007: ERROR_LicenseFileIsDamaged +--- + +| | | +|------------|---------- | +| Message | License file <param> could not be loaded or decoded\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_LicenseFileIsDamaged` | + + diff --git a/developer/docs/help/reference/messages/km09008.md b/developer/docs/help/reference/messages/km09008.md new file mode 100644 index 00000000000..bc6adb01a61 --- /dev/null +++ b/developer/docs/help/reference/messages/km09008.md @@ -0,0 +1,11 @@ +--- +title: KM09008: ERROR_LicenseIsNotValid +--- + +| | | +|------------|---------- | +| Message | An error was encountered parsing license file <param>: <param>\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_LicenseIsNotValid` | + + diff --git a/developer/docs/help/reference/messages/km09009.md b/developer/docs/help/reference/messages/km09009.md new file mode 100644 index 00000000000..d8c08d3d6f1 --- /dev/null +++ b/developer/docs/help/reference/messages/km09009.md @@ -0,0 +1,11 @@ +--- +title: KM09009: ERROR_CannotBuildWithoutKmpFile +--- + +| | | +|------------|---------- | +| Message | Compiling the \.keyboard\_info file requires a \.kmp file for metadata\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_CannotBuildWithoutKmpFile` | + + diff --git a/developer/docs/help/reference/messages/km0900a.md b/developer/docs/help/reference/messages/km0900a.md new file mode 100644 index 00000000000..8623a4f8dbf --- /dev/null +++ b/developer/docs/help/reference/messages/km0900a.md @@ -0,0 +1,11 @@ +--- +title: KM0900A: ERROR_NoLicenseFound +--- + +| | | +|------------|---------- | +| Message | No license for the keyboard was found\. MIT license is required for publication to Keyman keyboards repository\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_NoLicenseFound` | + + diff --git a/developer/docs/help/reference/messages/km0900e.md b/developer/docs/help/reference/messages/km0900e.md new file mode 100644 index 00000000000..a2ba732bb78 --- /dev/null +++ b/developer/docs/help/reference/messages/km0900e.md @@ -0,0 +1,11 @@ +--- +title: KM0900E: ERROR_FontFileCannotBeRead +--- + +| | | +|------------|---------- | +| Message | Font <param> could not be parsed to extract a font family\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_FontFileCannotBeRead` | + + diff --git a/developer/docs/help/reference/messages/km0900f.md b/developer/docs/help/reference/messages/km0900f.md new file mode 100644 index 00000000000..e2d5511d425 --- /dev/null +++ b/developer/docs/help/reference/messages/km0900f.md @@ -0,0 +1,11 @@ +--- +title: KM0900F: ERROR_FontFileMetaDataIsInvalid +--- + +| | | +|------------|---------- | +| Message | Font <param> meta data invalid: <param>\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_FontFileMetaDataIsInvalid` | + + diff --git a/developer/docs/help/reference/messages/km09010.md b/developer/docs/help/reference/messages/km09010.md new file mode 100644 index 00000000000..4fc25c8c367 --- /dev/null +++ b/developer/docs/help/reference/messages/km09010.md @@ -0,0 +1,11 @@ +--- +title: KM09010: ERROR_DescriptionIsMissing +--- + +| | | +|------------|---------- | +| Message | The Info\.Description field in the package <param> is required, but is missing or empty\. | +| Module | [kmc-keyboard-info.KeyboardInfoCompilerMessages](kmc-keyboard-info.keyboardinfocompilermessages) | +| Identifier | `ERROR_DescriptionIsMissing` | + + diff --git a/developer/docs/help/reference/messages/kmc-analyze.analyzermessages.md b/developer/docs/help/reference/messages/kmc-analyze.analyzermessages.md new file mode 100644 index 00000000000..a874853ba00 --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-analyze.analyzermessages.md @@ -0,0 +1,8 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-analyze +--- + + Code | Identifier | Message +------|------------|--------- +[KM06001](km06001) | `FATAL_UnexpectedException` | This is an internal error; the message will vary +[KM06002](km06002) | `INFO_ScanningFile` | Scanning <param> file <param> diff --git a/developer/docs/help/reference/messages/kmc-keyboard-info.keyboardinfocompilermessages.md b/developer/docs/help/reference/messages/kmc-keyboard-info.keyboardinfocompilermessages.md new file mode 100644 index 00000000000..99c6bb97af9 --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-keyboard-info.keyboardinfocompilermessages.md @@ -0,0 +1,17 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-keyboard-info +--- + + Code | Identifier | Message +------|------------|--------- +[KM09001](km09001) | `FATAL_UnexpectedException` | This is an internal error; the message will vary +[KM09002](km09002) | `ERROR_FileDoesNotExist` | File <param> does not exist\. +[KM09005](km09005) | `ERROR_InvalidAuthorEmail` | Invalid author email: <param> +[KM09006](km09006) | `ERROR_LicenseFileIsMissing` | License file <param> does not exist\. +[KM09007](km09007) | `ERROR_LicenseFileIsDamaged` | License file <param> could not be loaded or decoded\. +[KM09008](km09008) | `ERROR_LicenseIsNotValid` | An error was encountered parsing license file <param>: <param>\. +[KM09009](km09009) | `ERROR_CannotBuildWithoutKmpFile` | Compiling the \.keyboard\_info file requires a \.kmp file for metadata\. +[KM0900A](km0900a) | `ERROR_NoLicenseFound` | No license for the keyboard was found\. MIT license is required for publication to Keyman keyboards repository\. +[KM0900E](km0900e) | `ERROR_FontFileCannotBeRead` | Font <param> could not be parsed to extract a font family\. +[KM0900F](km0900f) | `ERROR_FontFileMetaDataIsInvalid` | Font <param> meta data invalid: <param>\. +[KM09010](km09010) | `ERROR_DescriptionIsMissing` | The Info\.Description field in the package <param> is required, but is missing or empty\. diff --git a/developer/docs/help/reference/messages/kmc-kmn.kmncompilermessages.md b/developer/docs/help/reference/messages/kmc-kmn.kmncompilermessages.md new file mode 100644 index 00000000000..4d7d2eb542e --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-kmn.kmncompilermessages.md @@ -0,0 +1,177 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-kmn +--- + + Code | Identifier | Message +------|------------|--------- +[KM02001](km02001) | `INFO_EndOfFile` | \(no error \- reserved code\) +[KM02002](km02002) | `FATAL_BadCallParams` | CompileKeyboardFile was called with bad parameters +[KM02004](km02004) | `FATAL_CannotAllocateMemory` | Out of memory +[KM02005](km02005) | `ERROR_InfileNotExist` | Cannot find the input file +[KM02007](km02007) | `FATAL_UnableToWriteFully` | Unable to write the file completely +[KM02008](km02008) | `ERROR_CannotReadInfile` | Cannot read the input file +[KM02009](km02009) | `FATAL_SomewhereIGotItWrong` | Internal error: contact Keyman +[KM0200A](km0200a) | `ERROR_InvalidToken` | Invalid token found +[KM0200B](km0200b) | `ERROR_InvalidBegin` | A "begin unicode" statement is required to compile a KeymanWeb keyboard +[KM0200C](km0200c) | `ERROR_InvalidName` | Invalid 'name' command +[KM0200D](km0200d) | `ERROR_InvalidVersion` | Invalid 'version' command +[KM0200E](km0200e) | `ERROR_InvalidLanguageLine` | Invalid 'language' command +[KM0200F](km0200f) | `ERROR_LayoutButNoLanguage` | Layout command found but no language command +[KM02010](km02010) | `ERROR_InvalidLayoutLine` | Invalid 'layout' command +[KM02011](km02011) | `ERROR_NoVersionLine` | No version line found for file +[KM02012](km02012) | `ERROR_InvalidGroupLine` | Invalid 'group' command +[KM02013](km02013) | `ERROR_InvalidStoreLine` | Invalid 'store' command +[KM02014](km02014) | `ERROR_InvalidCodeInKeyPartOfRule` | Invalid command or code found in key part of rule +[KM02015](km02015) | `ERROR_InvalidDeadkey` | Invalid 'deadkey' or 'dk' command +[KM02016](km02016) | `ERROR_InvalidValue` | Invalid value in extended string +[KM02017](km02017) | `ERROR_ZeroLengthString` | A string of zero characters was found +[KM02018](km02018) | `ERROR_TooManyIndexToKeyRefs` | Too many index commands refering to key string +[KM02019](km02019) | `ERROR_UnterminatedString` | Unterminated string in line +[KM0201A](km0201a) | `ERROR_StringInVirtualKeySection` | extend string illegal in virtual key section +[KM0201B](km0201b) | `ERROR_AnyInVirtualKeySection` | 'any' command is illegal in virtual key section +[KM0201C](km0201c) | `ERROR_InvalidAny` | Invalid 'any' command +[KM0201D](km0201d) | `ERROR_StoreDoesNotExist` | Store referenced does not exist +[KM0201E](km0201e) | `ERROR_BeepInVirtualKeySection` | 'beep' command is illegal in virtual key section +[KM0201F](km0201f) | `ERROR_IndexInVirtualKeySection` | 'index' command is illegal in virtual key section +[KM02020](km02020) | `ERROR_InvalidIndex` | Invalid 'index' command +[KM02021](km02021) | `ERROR_OutsInVirtualKeySection` | 'outs' command is illegal in virtual key section +[KM02022](km02022) | `ERROR_InvalidOuts` | Invalid 'outs' command +[KM02024](km02024) | `ERROR_ContextInVirtualKeySection` | 'context' command is illegal in virtual key section +[KM02025](km02025) | `ERROR_InvalidUse` | Invalid 'use' command +[KM02026](km02026) | `ERROR_GroupDoesNotExist` | Group does not exist +[KM02027](km02027) | `ERROR_VirtualKeyNotAllowedHere` | Virtual key is not allowed here +[KM02028](km02028) | `ERROR_InvalidSwitch` | Invalid 'switch' command +[KM02029](km02029) | `ERROR_NoTokensFound` | No tokens found in line +[KM0202A](km0202a) | `ERROR_InvalidLineContinuation` | Invalid line continuation +[KM0202B](km0202b) | `ERROR_LineTooLong` | Line too long +[KM0202C](km0202c) | `ERROR_InvalidCopyright` | Invalid 'copyright' command +[KM0202D](km0202d) | `ERROR_CodeInvalidInThisSection` | This line is invalid in this section of the file +[KM0202E](km0202e) | `ERROR_InvalidMessage` | Invalid 'message' command +[KM0202F](km0202f) | `ERROR_InvalidLanguageName` | Invalid 'languagename' command +[KM02030](km02030) | `ERROR_InvalidBitmapLine` | Invalid 'bitmaps' command +[KM02031](km02031) | `ERROR_CannotReadBitmapFile` | Cannot open the bitmap or icon file for reading +[KM02032](km02032) | `ERROR_IndexDoesNotPointToAny` | An index\(\) in the output does not have a corresponding any\(\) statement +[KM02033](km02033) | `ERROR_ReservedCharacter` | A reserved character was found +[KM02034](km02034) | `ERROR_InvalidCharacter` | A character was found that is outside the valid Unicode range \(U\+0000 \- U\+10FFFF\) +[KM02035](km02035) | `ERROR_InvalidCall` | The 'call' command is invalid +[KM02036](km02036) | `ERROR_CallInVirtualKeySection` | 'call' command is illegal in virtual key section +[KM02037](km02037) | `ERROR_CodeInvalidInKeyStore` | The command is invalid inside a store that is used in a key part of the rule +[KM02038](km02038) | `ERROR_CannotLoadIncludeFile` | Cannot load the included file: it is either invalid or does not exist +[KM02039](km02039) | `ERROR_60FeatureOnly_EthnologueCode` | EthnologueCode system store requires VERSION 6\.0 or higher +[KM0203A](km0203a) | `ERROR_60FeatureOnly_MnemonicLayout` | MnemonicLayout functionality requires VERSION 6\.0 or higher +[KM0203B](km0203b) | `ERROR_60FeatureOnly_OldCharPosMatching` | OldCharPosMatching system store requires VERSION 6\.0 or higher +[KM0203C](km0203c) | `ERROR_60FeatureOnly_NamedCodes` | Named character constants requires VERSION 6\.0 or higher +[KM0203D](km0203d) | `ERROR_60FeatureOnly_Contextn` | Context\(n\) requires VERSION 6\.0 or higher +[KM0203E](km0203e) | `ERROR_501FeatureOnly_Call` | Call\(\) requires VERSION 5\.01 or higher +[KM0203F](km0203f) | `ERROR_InvalidNamedCode` | Invalid named code constant +[KM02040](km02040) | `ERROR_InvalidSystemStore` | Invalid system store name found +[KM02044](km02044) | `ERROR_60FeatureOnly_VirtualCharKey` | Virtual character keys require VERSION 6\.0 or higher +[KM02045](km02045) | `ERROR_VersionAlreadyIncluded` | Only one VERSION or store\(version\) line allowed in a source file\. +[KM02046](km02046) | `ERROR_70FeatureOnly` | This feature requires store\(version\) '7\.0' or higher +[KM02047](km02047) | `ERROR_80FeatureOnly` | This feature requires store\(version\) '8\.0' or higher +[KM02048](km02048) | `ERROR_InvalidInVirtualKeySection` | This statement is not valid in a virtual key section +[KM02049](km02049) | `ERROR_InvalidIf` | The if\(\) statement is not valid +[KM0204A](km0204a) | `ERROR_InvalidReset` | The reset\(\) statement is not valid +[KM0204B](km0204b) | `ERROR_InvalidSet` | The set\(\) statement is not valid +[KM0204C](km0204c) | `ERROR_InvalidSave` | The save\(\) statement is not valid +[KM0204D](km0204d) | `ERROR_InvalidEthnologueCode` | Invalid ethnologuecode format +[KM0204E](km0204e) | `FATAL_CannotCreateTempfile` | Cannot create temp file +[KM0204F](km0204f) | `ERROR_90FeatureOnly_IfSystemStores` | if\(store\) requires store\(version\) '9\.0' or higher +[KM02050](km02050) | `ERROR_IfSystemStore_NotFound` | System store in if\(\) not found +[KM02051](km02051) | `ERROR_90FeatureOnly_SetSystemStores` | set\(store\) requires store\(version\) '9\.0' or higher +[KM02052](km02052) | `ERROR_SetSystemStore_NotFound` | System store in set\(\) not found +[KM02053](km02053) | `ERROR_90FeatureOnlyVirtualKeyDictionary` | Custom virtual key names require store\(version\) '9\.0' +[KM02054](km02054) | `ERROR_NotSupportedInKeymanWebContext` | Statement '<param>' is not currently supported in context for web and touch targets +[KM02055](km02055) | `ERROR_NotSupportedInKeymanWebOutput` | Statement '<param>' is not currently supported in output for web and touch targets +[KM02056](km02056) | `ERROR_NotSupportedInKeymanWebStore` | '<param>' is not currently supported in store '<param>' when used by any or index for web and touch targets +[KM02057](km02057) | `ERROR_VirtualCharacterKeysNotSupportedInKeymanWeb` | Virtual character keys not currently supported in KeymanWeb +[KM02058](km02058) | `ERROR_VirtualKeysNotValidForMnemonicLayouts` | Virtual keys are not valid for mnemonic layouts +[KM02059](km02059) | `ERROR_InvalidTouchLayoutFile` | Touch layout file <param> is not valid +[KM0205A](km0205a) | `ERROR_TouchLayoutInvalidIdentifier` | Key "<param>" on "<param>", layer "<param>" has an invalid identifier\. +[KM0205B](km0205b) | `ERROR_InvalidKeyCode` | Invalid key identifier "<param>" +[KM0205C](km0205c) | `ERROR_90FeatureOnlyLayoutFile` | Touch layout file reference requires store\(version\) '9\.0'or higher +[KM0205D](km0205d) | `ERROR_90FeatureOnlyKeyboardVersion` | KeyboardVersion system store requires store\(version\) '9\.0'or higher +[KM0205E](km0205e) | `ERROR_KeyboardVersionFormatInvalid` | KeyboardVersion format is invalid, expecting dot\-separated integers +[KM0205F](km0205f) | `ERROR_ContextExHasInvalidOffset` | context\(\) statement has offset out of range +[KM02060](km02060) | `ERROR_90FeatureOnlyEmbedCSS` | Embedding CSS requires store\(version\) '9\.0'or higher +[KM02061](km02061) | `ERROR_90FeatureOnlyTargets` | TARGETS system store requires store\(version\) '9\.0'or higher +[KM02062](km02062) | `ERROR_ContextAndIndexInvalidInMatchNomatch` | context and index statements cannot be used in a match or nomatch statement +[KM02063](km02063) | `ERROR_140FeatureOnlyContextAndNotAnyWeb` | For web and touch platforms, context\(\) statement referring to notany\(\) requires store\(version\) '14\.0'or higher +[KM02064](km02064) | `ERROR_ExpansionMustFollowCharacterOrVKey` | An expansion must follow a character or a virtual key +[KM02065](km02065) | `ERROR_VKeyExpansionMustBeFollowedByVKey` | A virtual key expansion must be terminated by a virtual key +[KM02066](km02066) | `ERROR_CharacterExpansionMustBeFollowedByCharacter` | A character expansion must be terminated by a character key +[KM02067](km02067) | `ERROR_VKeyExpansionMustUseConsistentShift` | A virtual key expansion must use the same shift state for both terminators +[KM02068](km02068) | `ERROR_ExpansionMustBePositive` | An expansion must have positive difference \(i\.e\. A\-Z, not Z\-A\) +[KM02069](km02069) | `ERROR_CasedKeysMustContainOnlyVirtualKeys` | The &CasedKeys system store must contain only virtual keys or characters found on a US English keyboard +[KM0206A](km0206a) | `ERROR_CasedKeysMustNotIncludeShiftStates` | The &CasedKeys system store must not include shift states +[KM0206B](km0206b) | `ERROR_CasedKeysNotSupportedWithMnemonicLayout` | The &CasedKeys system store is not supported with mnemonic layouts +[KM0206C](km0206c) | `ERROR_CannotUseReadWriteGroupFromReadonlyGroup` | Group used from a readonly group must also be readonly +[KM0206D](km0206d) | `ERROR_StatementNotPermittedInReadonlyGroup` | Statement is not permitted in output of readonly group +[KM0206E](km0206e) | `ERROR_OutputInReadonlyGroup` | Output is not permitted in a readonly group +[KM0206F](km0206f) | `ERROR_NewContextGroupMustBeReadonly` | Group used in begin newContext must be readonly +[KM02070](km02070) | `ERROR_PostKeystrokeGroupMustBeReadonly` | Group used in begin postKeystroke must be readonly +[KM02071](km02071) | `ERROR_DuplicateGroup` | A group with this name has already been defined\. +[KM02072](km02072) | `ERROR_DuplicateStore` | A store with this name has already been defined\. +[KM02073](km02073) | `ERROR_RepeatedBegin` | Begin has already been set +[KM02074](km02074) | `ERROR_VirtualKeyInContext` | Virtual keys are not permitted in context +[KM02075](km02075) | `ERROR_OutsTooLong` | Store cannot be inserted with outs\(\) as it makes the extended string too long +[KM02076](km02076) | `ERROR_ExtendedStringTooLong` | Extended string is too long +[KM02077](km02077) | `ERROR_VirtualKeyExpansionTooLong` | Virtual key expansion is too large +[KM02078](km02078) | `ERROR_CharacterRangeTooLong` | Character range is too large and cannot be expanded +[KM02079](km02079) | `ERROR_NonBMPCharactersNotSupportedInKeySection` | Characters with codepoints over U\+FFFF are not supported in the key part of the rule +[KM02080](km02080) | `WARN_TooManyWarnings` | Too many warnings or errors +[KM02081](km02081) | `WARN_OldVersion` | The keyboard file is an old version +[KM02082](km02082) | `WARN_BitmapNotUsed` | The 'bitmaps' statement is obsolete and only the first bitmap referred to will be used, you should use 'bitmap'\. +[KM02083](km02083) | `WARN_CustomLanguagesNotSupported` | Languages over 0x1FF, 0x1F are not supported correctly by Windows\. You should use no LANGUAGE line instead\. +[KM02084](km02084) | `WARN_KeyBadLength` | There are too many characters in the keystroke part of the rule\. +[KM02085](km02085) | `WARN_IndexStoreShort` | The store referenced in index\(\) is shorter than the store referenced in any\(\) +[KM02086](km02086) | `WARN_UnicodeInANSIGroup` | A Unicode character was found in an ANSI group +[KM02087](km02087) | `WARN_ANSIInUnicodeGroup` | An ANSI character was found in a Unicode group +[KM02088](km02088) | `WARN_UnicodeSurrogateUsed` | A Unicode surrogate character was found\. You should use Unicode scalar values to represent values > U\+FFFF +[KM02089](km02089) | `WARN_ReservedCharacter` | A Unicode character was found that should not be used +[KM0208A](km0208a) | `INFO_Info` | Information +[KM0208B](km0208b) | `WARN_VirtualKeyWithMnemonicLayout` | Virtual key used instead of virtual character key with a mnemonic layout +[KM0208C](km0208c) | `WARN_VirtualCharKeyWithPositionalLayout` | Virtual character key used with a positional layout instead of mnemonic layout +[KM0208D](km0208d) | `WARN_StoreAlreadyUsedAsOptionOrCall` | Store already used as an option or in a call statement and should not be used as a normal store +[KM0208E](km0208e) | `WARN_StoreAlreadyUsedAsStoreOrCall` | Store already used as a normal store or in a call statement and should not be used as an option +[KM0208F](km0208f) | `WARN_StoreAlreadyUsedAsStoreOrOption` | Store already used as a normal store or as an option and should not be used in a call statement +[KM02090](km02090) | `WARN_PunctuationInEthnologueCode` | Punctuation should not be used to separate Ethnologue codes; instead use spaces +[KM02091](km02091) | `WARN_TouchLayoutMissingLayer` | Key "<param>" on platform "<param>", layer "<param>", references a missing layer "<param>" +[KM02092](km02092) | `WARN_TouchLayoutCustomKeyNotDefined` | Key "<param>" on platform "<param>", layer "<param>", is a custom key but has no corresponding rule in the source\. +[KM02093](km02093) | `WARN_TouchLayoutMissingRequiredKeys` | Layer "<param>" on platform "<param>" is missing the required key\(s\) '<param>'\. +[KM02094](km02094) | `WARN_HelpFileMissing` | File <param> could not be loaded: +[KM02095](km02095) | `WARN_EmbedJsFileMissing` | File <param> could not be loaded: +[KM02098](km02098) | `WARN_ExtendedShiftFlagsNotSupportedInKeymanWeb` | Extended shift flags <param> are not supported in KeymanWeb +[KM02099](km02099) | `WARN_TouchLayoutUnidentifiedKey` | A key on layer "<param>" has no identifier\. +[KM0209A](km0209a) | `HINT_UnreachableKeyCode` | The rule will never be matched for key <param> because its key code is never fired\. +[KM0209C](km0209c) | `WARN_PlatformNotInTargets` | The specified platform is not a target platform +[KM0209D](km0209d) | `WARN_HeaderStatementIsDeprecated` | Header statements are deprecated; use instead the equivalent system store +[KM0209E](km0209e) | `WARN_UseNotLastStatementInRule` | A rule with use\(\) statements in the output should not have other content following the use\(\) statements +[KM0209F](km0209f) | `WARN_TouchLayoutFontShouldBeSameForAllPlatforms` | The touch layout font should be the same for all platforms\. +[KM020A2](km020a2) | `WARN_KVKFileIsInSourceFormat` | \.kvk file should be binary but is an XML file +[KM020A3](km020a3) | `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\. +[KM020A4](km020a4) | `WARN_MixingLeftAndRightModifiers` | Left and right modifiers should not both be used in the same rule +[KM020A5](km020a5) | `WARN_LanguageHeadersDeprecatedInKeyman10` | This language header has been deprecated in Keyman 10\. Instead, add language metadata in the package file +[KM020A6](km020a6) | `HINT_NonUnicodeFile` | Keyman Developer has detected that the file has ANSI encoding\. Consider converting this file to UTF\-8 +[KM020A8](km020a8) | `WARN_HotkeyHasInvalidModifier` | Hotkey has modifiers that are not supported\. Use only SHIFT, CTRL and ALT +[KM020A9](km020a9) | `WARN_TouchLayoutSpecialLabelOnNormalKey` | Key "<param>" on platform "<param>", layer "<param>" does not have the key type "Special" or "Special \(active\)" but has the label "<param>"\. This feature is only supported in Keyman 14 or later +[KM020AA](km020aa) | `WARN_OptionStoreNameInvalid` | The option store <param> should be named with characters in the range A\-Z, a\-z, 0\-9 and \_ only\. +[KM020AB](km020ab) | `WARN_NulNotFirstStatementInContext` | nul must be the first statement in the context +[KM020AC](km020ac) | `WARN_IfShouldBeAtStartOfContext` | if, platform and baselayout should be at start of context \(after nul, if present\) +[KM020AD](km020ad) | `WARN_KeyShouldIncludeNCaps` | Other rules which reference this key include CAPS or NCAPS modifiers, so this rule must include NCAPS modifier to avoid inconsistent matches +[KM020AE](km020ae) | `HINT_UnreachableRule` | This rule will never be matched as another rule takes precedence +[KM020AF](km020af) | `WARN_VirtualKeyInOutput` | Virtual keys are not supported in output +[KM020C0](km020c0) | `FATAL_BufferOverflow` | The compiler memory buffer overflowed +[KM020C1](km020c1) | `FATAL_Break` | Compiler interrupted by user +[KM02900](km02900) | `FATAL_UnexpectedException` | This is an internal error; the message will vary +[KM02901](km02901) | `FATAL_MissingWasmModule` | This is an internal error; the message will vary +[KM02903](km02903) | `FATAL_CallbacksNotSet` | This is an internal error; the message will vary +[KM02904](km02904) | `FATAL_UnicodeSetOutOfRange` | This is an internal error; the message will vary +[KM02905](km02905) | `ERROR_UnicodeSetHasStrings` | uset contains strings, not allowed +[KM02906](km02906) | `ERROR_UnicodeSetHasProperties` | uset contains properties, not allowed +[KM02907](km02907) | `ERROR_UnicodeSetSyntaxError` | uset had a Syntax Error while parsing +[KM02908](km02908) | `ERROR_InvalidKvksFile` | Error encountered parsing <param>: unknown error +[KM02909](km02909) | `WARN_InvalidVkeyInKvksFile` | Invalid virtual key <param> found in <param> +[KM0290A](km0290a) | `ERROR_InvalidDisplayMapFile` | Error encountered parsing display map <param>: unknown error +[KM0290B](km0290b) | `ERROR_InvalidKvkFile` | Error encountered loading <param>: unknown error +[KM0290C](km0290c) | `ERROR_FileNotFound` | File <param> was not found diff --git a/developer/docs/help/reference/messages/kmc-kmn.kmwcompilermessages.md b/developer/docs/help/reference/messages/kmc-kmn.kmwcompilermessages.md new file mode 100644 index 00000000000..84c21e4a170 --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-kmn.kmwcompilermessages.md @@ -0,0 +1,11 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-kmn +--- + + Code | Identifier | Message +------|------------|--------- +[KM07001](km07001) | `ERROR_NotAnyRequiresVersion14` | Statement notany in context\(\) match requires version 14\.0\+ of KeymanWeb +[KM07002](km07002) | `ERROR_TouchLayoutIdentifierRequires15` | Key "<param>" on "<param>", layer "<param>" has a multi\-part identifier which requires version 15\.0 or newer\. +[KM07003](km07003) | `ERROR_InvalidTouchLayoutFileFormat` | Invalid touch layout file: <param> +[KM07004](km07004) | `ERROR_TouchLayoutFileDoesNotExist` | Touch layout file <param> does not exist +[KM07005](km07005) | `HINT_TouchLayoutUsesUnsupportedGesturesDownlevel` | The touch layout uses a flick or multi\-tap gesture on key <param>, which is only available on version 17\.0\+ of Keyman diff --git a/developer/docs/help/reference/messages/kmc-ldml.compilermessages.md b/developer/docs/help/reference/messages/kmc-ldml.compilermessages.md new file mode 100644 index 00000000000..46dbf4e2e9c --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-ldml.compilermessages.md @@ -0,0 +1,49 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-ldml +--- + + Code | Identifier | Message +------|------------|--------- +[KM00001](km00001) | `HINT_NormalizationDisabled` | normalization=disabled is not recommended\. +[KM00002](km00002) | `ERROR_InvalidLocale` | Invalid BCP 47 locale form '<param>' +[KM00003](km00003) | `ERROR_HardwareLayerHasTooManyRows` | 'hardware' layer has too many rows +[KM00004](km00004) | `ERROR_RowOnHardwareLayerHasTooManyKeys` | Row \#<param> on 'hardware' <param> layer for modifier none has too many keys +[KM00005](km00005) | `ERROR_KeyNotFoundInKeyBag` | Key '<param>' in position \#<param> on row \#<param> of layer <param>, form '<param>' not found in key bag +[KM00006](km00006) | `HINT_OneOrMoreRepeatedLocales` | After minimization, one or more locales is repeated and has been removed +[KM00007](km00007) | `ERROR_InvalidFile` | The source file has an invalid structure: <param> +[KM00008](km00008) | `HINT_LocaleIsNotMinimalAndClean` | Locale '<param>' is not minimal or correctly formatted and should be '<param>' +[KM00009](km00009) | `ERROR_InvalidScanCode` | Form '<param>' has invalid/unknown scancodes '<param>' +[KM0000A](km0000a) | `WARN_CustomForm` | Custom <form id="<param>"> element\. Key layout may not be as expected\. +[KM0000B](km0000b) | `ERROR_GestureKeyNotFoundInKeyBag` | Key '<param>' not found in key bag, referenced from other '<param>' in <param> +[KM0000D](km0000d) | `ERROR_InvalidVersion` | Version number '<param>' must be a semantic version format string\. +[KM0000E](km0000e) | `ERROR_MustBeAtLeastOneLayerElement` | The source file must contain at least one layer element\. +[KM00010](km00010) | `ERROR_DisplayIsRepeated` | display has more than one display entry\. +[KM00011](km00011) | `ERROR_KeyMissingToGapOrSwitch` | key id='<param>' must have either output=, gap=, or layerId=\. +[KM00012](km00012) | `ERROR_ExcessHardware` | layers formId=<param>: Can only have one non\-'touch' element +[KM00013](km00013) | `ERROR_InvalidHardware` | layers has invalid value formId=<param> +[KM00014](km00014) | `ERROR_InvalidModifier` | layer has invalid modifiers='<param>' on layer id=<param> +[KM00015](km00015) | `ERROR_MissingFlicks` | key id=<param> refers to missing flickId=<param> +[KM00016](km00016) | `ERROR_DuplicateVariable` | duplicate variables: id=<param> +[KM00018](km00018) | `ERROR_InvalidTransformsType` | Invalid transforms types: '<param>' +[KM00019](km00019) | `ERROR_DuplicateTransformsType` | Duplicate transforms types: '<param>' +[KM0001A](km0001a) | `ERROR_MixedTransformGroup` | transformGroup cannot contain both reorder and transform elements +[KM0001B](km0001b) | `ERROR_EmptyTransformGroup` | transformGroup must have either reorder or transform elements +[KM0001C](km0001c) | `ERROR_MissingStringVariable` | Reference to undefined string variable: $\{<param>\} +[KM0001D](km0001d) | `ERROR_MissingSetVariable` | Reference to undefined set variable: $\[<param>\] +[KM0001E](km0001e) | `ERROR_MissingUnicodeSetVariable` | Reference to undefined UnicodeSet variable: $\[<param>\] +[KM0001F](km0001f) | `ERROR_NeedSpacesBetweenSetVariables` | Need spaces between set variables: <param> +[KM00020](km00020) | `ERROR_CantReferenceSetFromUnicodeSet` | Illegal use of set variable from within UnicodeSet: $\[<param>\] +[KM00021](km00021) | `ERROR_MissingMarkers` | Markers used for matching but not defined: <param> +[KM00022](km00022) | `ERROR_DisplayNeedsToOrId` | display needs output= or keyId=, but not both +[KM00023](km00023) | `HINT_PUACharacters` | File contains <param> PUA character\(s\), including Illegal \(U\+NAN\) +[KM00024](km00024) | `WARN_UnassignedCharacters` | File contains <param> unassigned character\(s\), including Illegal \(U\+NAN\) +[KM00025](km00025) | `ERROR_IllegalCharacters` | File contains <param> illegal character\(s\), including Illegal \(U\+NAN\) +[KM00026](km00026) | `HINT_CharClassImplicitDenorm` | File has character classes which span non\-NFD character\(s\), including Illegal \(U\+NAN\)\. These will not match any text\. +[KM00027](km00027) | `WARN_CharClassExplicitDenorm` | File has character classes which include non\-NFD characters\(s\), including Illegal \(U\+NAN\)\. These will not match any text\. +[KM00028](km00028) | `ERROR_UnparseableReorderSet` | Illegal UnicodeSet "<param>" in reorder "<param> +[KM00030](km00030) | `ERROR_InvalidQuadEscape` | Invalid escape "\\u0000"\. Hint: Use "\\u\{<param>\}" +[KM00F00](km00f00) | `ERROR_UnparseableTransformFrom` | Invalid transform from="<param>": "<param>" +[KM00F01](km00f01) | `ERROR_IllegalTransformDollarsign` | Invalid transform from="<param>": Unescaped dollar\-sign \($\) is not valid transform syntax\. +[KM00F02](km00f02) | `ERROR_TransformFromMatchesNothing` | Invalid transfom from="<param>": Matches an empty string\. +[KM00F03](km00f03) | `ERROR_IllegalTransformPlus` | Invalid transform from="<param>": Unescaped plus \(\+\) is not valid transform syntax\. +[KM00F04](km00f04) | `ERROR_IllegalTransformAsterisk` | Invalid transform from="<param>": Unescaped asterisk \(\*\) is not valid transform syntax\. diff --git a/developer/docs/help/reference/messages/kmc-model-info.modelinfocompilermessages.md b/developer/docs/help/reference/messages/kmc-model-info.modelinfocompilermessages.md new file mode 100644 index 00000000000..61837405eb4 --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-model-info.modelinfocompilermessages.md @@ -0,0 +1,16 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-model-info +--- + + Code | Identifier | Message +------|------------|--------- +[KM08001](km08001) | `FATAL_UnexpectedException` | This is an internal error; the message will vary +[KM08002](km08002) | `ERROR_FileDoesNotExist` | File <param> does not exist\. +[KM08003](km08003) | `ERROR_FileIsNotValid` | File <param> could not be parsed: unknown error\. +[KM08004](km08004) | `WARN_MetadataFieldInconsistent` | Warning: field <param> value "<param>" does not match "<param>" found in source file metadata\. +[KM08005](km08005) | `ERROR_InvalidAuthorEmail` | Invalid author email: <param> +[KM08006](km08006) | `ERROR_LicenseFileIsMissing` | License file <param> does not exist\. +[KM08007](km08007) | `ERROR_LicenseFileIsDamaged` | License file <param> could not be loaded or decoded\. +[KM08008](km08008) | `ERROR_LicenseIsNotValid` | An error was encountered parsing license file <param>: <param>\. +[KM08009](km08009) | `ERROR_NoLicenseFound` | No license for the model was found\. MIT license is required for publication to Keyman lexical\-models repository\. +[KM0800A](km0800a) | `ERROR_DescriptionIsMissing` | The Info\.Description field in the package <param> is required, but is missing or empty\. diff --git a/developer/docs/help/reference/messages/kmc-model.modelcompilermessages.md b/developer/docs/help/reference/messages/kmc-model.modelcompilermessages.md new file mode 100644 index 00000000000..aaa55ec3bb7 --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-model.modelcompilermessages.md @@ -0,0 +1,16 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-model +--- + + Code | Identifier | Message +------|------------|--------- +[KM03001](km03001) | `FATAL_UnexpectedException` | This is an internal error; the message will vary +[KM03002](km03002) | `HINT_MixedNormalizationForms` | “<param>” is not in Unicode NFC\. Automatically converting to NFC\. +[KM03003](km03003) | `HINT_DuplicateWordInSameFile` | duplicate word “<param>” found in same file; summing counts +[KM03004](km03004) | `ERROR_UnimplementedModelFormat` | Unimplemented model format: <param> +[KM03005](km03005) | `ERROR_UnknownModelFormat` | Unimplemented model format: <param> +[KM03006](km03006) | `ERROR_NoDefaultExport` | Model source does have a default export\. Did you remember to write \`export default source;\`? +[KM03007](km03007) | `ERROR_SearchTermToKeyMustBeExplicitlySpecified` | searchTermToKey must be explicitly specified +[KM03008](km03008) | `ERROR_UTF16BEUnsupported` | UTF\-16BE is unsupported +[KM03009](km03009) | `ERROR_UnknownWordBreaker` | Unknown word breaker: <param> +[KM0300A](km0300a) | `ERROR_UnsupportedScriptOverride` | Unsupported script override: <param> diff --git a/developer/docs/help/reference/messages/kmc-package.compilermessages.md b/developer/docs/help/reference/messages/kmc-package.compilermessages.md new file mode 100644 index 00000000000..627fd5860ad --- /dev/null +++ b/developer/docs/help/reference/messages/kmc-package.compilermessages.md @@ -0,0 +1,38 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc-package +--- + + Code | Identifier | Message +------|------------|--------- +[KM04001](km04001) | `FATAL_UnexpectedException` | This is an internal error; the message will vary +[KM04002](km04002) | `WARN_AbsolutePath` | File <param> has an absolute path, which is not portable\. +[KM04003](km04003) | `ERROR_FileDoesNotExist` | File <param> does not exist\. +[KM04004](km04004) | `ERROR_FileCouldNotBeRead` | File <param> could not be read: unknown error\. +[KM04005](km04005) | `WARN_FileIsNotABinaryKvkFile` | File <param> does not appear to be a valid binary \.kvk file; this may be an old package that includes an xml\-format \.kvk file\. You must update the package to include the compiled \.kvk file in the package\. +[KM04006](km04006) | `ERROR_FollowKeyboardVersionNotAllowedForModelPackages` | FollowKeyboardVersion is not allowed in model packages +[KM04007](km04007) | `ERROR_FollowKeyboardVersionButNoKeyboards` | FollowKeyboardVersion is set, but the package contains no keyboards +[KM04008](km04008) | `ERROR_KeyboardContentFileNotFound` | Keyboard <param> was listed in <Keyboards> but a corresponding \.kmx file was not found in <Files> +[KM04009](km04009) | `ERROR_KeyboardFileNotValid` | Keyboard file <param> is not a valid \.kmx file: unknown error +[KM0400A](km0400a) | `INFO_KeyboardFileHasNoKeyboardVersion` | Keyboard file <param> has no &KeyboardVersion store, using default '0\.0' +[KM0400B](km0400b) | `ERROR_PackageCannotContainBothModelsAndKeyboards` | The package contains both lexical models and keyboards, which is not permitted\. +[KM0400C](km0400c) | `HINT_PackageShouldNotRepeatLanguages` | Two language tags in <param> <param>, '<param>' and '<param>', reduce to the same minimal tag '<param>'\. +[KM0400D](km0400d) | `WARN_PackageNameDoesNotFollowLexicalModelConventions` | The package file <param> does not follow the recommended model filename conventions\. The name should be all lower case, include only alphanumeric characters and underscore \(\_\), not start with a digit, and should have the structure <author>\.<bcp47>\.<uniq>\.model\.kps\. +[KM0400E](km0400e) | `WARN_PackageNameDoesNotFollowKeyboardConventions` | The package file <param> does not follow the recommended keyboard filename conventions\. The name should be all lower case, include only alphanumeric characters and underscore \(\_\), and not start with a digit\. +[KM0400F](km0400f) | `WARN_FileInPackageDoesNotFollowFilenameConventions` | The file <param> does not follow the recommended filename conventions\. The extension should be all lower case, and the filename should include only alphanumeric characters, \-, \_, \+ and \. +[KM04010](km04010) | `ERROR_PackageNameCannotBeBlank` | Package name cannot be an empty string\. +[KM04011](km04011) | `ERROR_KeyboardFileNotFound` | Keyboard file <param> was not found\. Has it been compiled? +[KM04012](km04012) | `WARN_KeyboardVersionsDoNotMatch` | Keyboard <param> version <param> does not match keyboard <param> version <param>\. +[KM04014](km04014) | `ERROR_LanguageTagIsNotValid` | Language tag '<param>' in <param> <param> is invalid\. +[KM04015](km04015) | `HINT_LanguageTagIsNotMinimal` | Language tag '<param>' in <param> <param> is not minimal, and should be '<param>'\. +[KM04016](km04016) | `ERROR_ModelMustHaveAtLeastOneLanguage` | The lexical model <param> must have at least one language specified\. +[KM04017](km04017) | `WARN_RedistFileShouldNotBeInPackage` | The Keyman system file '<param>' should not be compiled into the package\. +[KM04018](km04018) | `WARN_DocFileDangerous` | Microsoft Word \.doc or \.docx files \('<param>'\) are not portable\. You should instead use HTML or PDF format\. +[KM04019](km04019) | `ERROR_PackageMustContainAModelOrAKeyboard` | Package must contain a lexical model or a keyboard\. +[KM0401A](km0401a) | `WARN_JsKeyboardFileIsMissing` | Keyboard <param> targets touch devices but corresponding <param>\.js file is not in the package\. +[KM0401B](km0401b) | `WARN_KeyboardShouldHaveAtLeastOneLanguage` | The keyboard <param> should have at least one language specified\. +[KM0401C](km0401c) | `HINT_JsKeyboardFileHasNoTouchTargets` | The keyboard <param> has been included for touch platforms, but does not include a touch layout\. +[KM0401D](km0401d) | `HINT_PackageContainsSourceFile` | The source file <param> should not be included in the package; instead include the compiled result\. +[KM0401E](km0401e) | `ERROR_InvalidPackageFile` | Package source file is invalid: unknown error +[KM0401F](km0401f) | `ERROR_FileRecordIsMissingName` | File record in the package with description 'undefined' is missing a filename\. +[KM04020](km04020) | `ERROR_InvalidAuthorEmail` | Invalid author email: <param> +[KM04021](km04021) | `ERROR_PackageFileHasEmptyVersion` | Package version is not following keyboard version, but the package version field is blank\. diff --git a/developer/docs/help/reference/messages/kmc.infrastructuremessages.md b/developer/docs/help/reference/messages/kmc.infrastructuremessages.md new file mode 100644 index 00000000000..ce80ed88852 --- /dev/null +++ b/developer/docs/help/reference/messages/kmc.infrastructuremessages.md @@ -0,0 +1,36 @@ +--- +title: Compiler Messages Reference for @keymanapp/kmc +--- + + Code | Identifier | Message +------|------------|--------- +[KM05001](km05001) | `FATAL_UnexpectedException` | This is an internal error; the message will vary +[KM05002](km05002) | `INFO_BuildingFile` | Building <param> +[KM05003](km05003) | `ERROR_FileDoesNotExist` | File <param> does not exist +[KM05004](km05004) | `ERROR_FileTypeNotRecognized` | Unrecognised input file <param>, expecting <param>, or project folder +[KM05005](km05005) | `ERROR_OutFileNotValidForProjects` | \-\-out\-file should not be specified for project builds +[KM05006](km05006) | `INFO_FileBuiltSuccessfully` | <param> built successfully\. +[KM05007](km05007) | `INFO_FileNotBuiltSuccessfully` | <param> failed to build\. +[KM05008](km05008) | `ERROR_InvalidProjectFile` | Project file is not valid: <param> +[KM05009](km05009) | `HINT_FilenameHasDifferingCase` | File on disk '<param>' does not match case of '<param>' in source file; this is an error on platforms with case\-sensitive filesystems\. +[KM0500A](km0500a) | `ERROR_UnknownFileFormat` | Unknown file format <param>; only Markdown \(\.md\), JSON \(\.json\), and Text \(\.txt\) are supported\. +[KM0500B](km0500b) | `INFO_ProjectBuiltSuccessfully` | Project <param> built successfully\. +[KM0500C](km0500c) | `INFO_ProjectNotBuiltSuccessfully` | Project <param> failed to build\. +[KM0500D](km0500d) | `INFO_TooManyMessages` | More than <param> warnings or errors received; suppressing further messages\. +[KM0500E](km0500e) | `ERROR_FileTypeNotFound` | A file of type <param> was not found in the project\. +[KM0500F](km0500f) | `ERROR_NotAProjectFile` | File <param> must have a \.kpj extension to be treated as a project\. +[KM05010](km05010) | `INFO_WarningsHaveFailedBuild` | The build failed because option "treat warnings as errors" is enabled and there are one or more warnings\. +[KM05011](km05011) | `ERROR_CannotCreateFolder` | This is an internal error; the message will vary +[KM05012](km05012) | `ERROR_InvalidProjectFolder` | The folder <param> does not appear to be a Keyman Developer project\. +[KM05013](km05013) | `ERROR_UnsupportedProjectVersion` | Project version <param> is not supported by this version of Keyman Developer\. +[KM05014](km05014) | `HINT_ProjectIsVersion10` | The project file is an older version and can be upgraded to version 17\.0 +[KM05015](km05015) | `ERROR_OutFileCanOnlyBeSpecifiedWithSingleInfile` | Parameter \-\-out\-file can only be used with a single input file\. +[KM05016](km05016) | `ERROR_InvalidMessageFormat` | Invalid parameter: \-\-message <param> must match format '\[KM\]\#\#\#\#\#\[:Disable\|Info\|Hint\|Warn\|Error\]' +[KM05017](km05017) | `ERROR_MessageNamespaceNotFound` | Invalid parameter: \-\-message <param> does not have a recognized namespace +[KM05018](km05018) | `ERROR_MessageCodeNotFound` | Invalid parameter: \-\-message undefined is not a recognized code +[KM05019](km05019) | `ERROR_MessageCannotBeCoerced` | Invalid parameter: \-\-message <param> is not of type 'info', 'hint' or 'warn', and cannot be coerced +[KM0501A](km0501a) | `ERROR_UnrecognizedMessageCode` | Invalid parameter: message identifier '<param>' must match format '\[KM\]\#\#\#\#\#' +[KM0501B](km0501b) | `ERROR_MustSpecifyMessageCode` | Must specify at least one message code or \-a for all messages +[KM0501C](km0501c) | `ERROR_MessagesCannotBeFilteredForMarkdownFormat` | Messages cannot be filtered for markdown format +[KM0501D](km0501d) | `ERROR_OutputPathMustBeSpecifiedForMarkdownFormat` | Output path must be specified with \-o for markdown output format +[KM0501E](km0501e) | `ERROR_OutputPathMustExistAndBeADirectory` | Output path <param> must exist and must be a folder diff --git a/developer/docs/help/reference/tools/index.md b/developer/docs/help/reference/tools/index.md new file mode 100644 index 00000000000..2dd2d36ef82 --- /dev/null +++ b/developer/docs/help/reference/tools/index.md @@ -0,0 +1,7 @@ +--- +title: Keyman Developer Tools +--- + +* [Setup Bootstrapper](setup) +* [kmc command line compiler](../kmc) +* [kmconvert keyboard conversion tool](../../context/kmconvert) diff --git a/developer/docs/help/reference/tools/setup.md b/developer/docs/help/reference/tools/setup.md new file mode 100644 index 00000000000..d628634f064 --- /dev/null +++ b/developer/docs/help/reference/tools/setup.md @@ -0,0 +1,17 @@ +--- +title: Setup Bootstrapper +--- + +# Setup Bootstrapper + +The Keyman Desktop installation bootstrapper is a self-extracting executable file that contains a Windows Installer technology MSI file, and optionally keyboards. The bootstrapper is used whenever a package installer is created. + +The bootstrapper: + +1. Checks the system before starting the installation to ensure that all prerequisites are met, and optionally downloads and installs the prerequisites. +2. Optionally checks online for an updated version of Keyman Desktop before installing. +3. Starts the Keyman Desktop Windows Installer MSI package. +4. Installs any keyboards included. +5. Starts Keyman Desktop after the install completes. + +For command line parameters and more information see [Knowledge Base article KMKB0035](/kb/35) diff --git a/developer/docs/help/reference/user-settings.md b/developer/docs/help/reference/user-settings.md new file mode 100644 index 00000000000..8652c5c98bd --- /dev/null +++ b/developer/docs/help/reference/user-settings.md @@ -0,0 +1,28 @@ +--- +title: Keyman Developer User Settings +--- + +Keyman Developer has settings stored in several locations: + +`~/.keymandeveloper/options.json` (`%userprofile%\.keymandeveloper\options.json` on Windows) + +: User preferences are stored in this file. In version 16 and earlier, these + options were stored in the Registry under + `HKCU\Software\Keyman\Keyman Developer\IDE\Options`. Any options found in + the Registry will be migrated to the `options.json` file on first start + of the Keyman Developer IDE. + +`HKCU\Software\Keyman\Keyman Developer\IDE` + +: Stores settings specific to the IDE, including window locations and + visibility, recently used projects, font preferences. + +`%appdata%\Keyman\Keyman Developer` + +: Stores files related to the runtime environment of Keyman Developer, including + cache files. + +`%localappdata%\Keyman\Diag` + +: Stores files relating to diagnostics for Keyman Developer; this folder is also + used for Keyman for Windows diagnostics. diff --git a/developer/docs/help/whats-new.md b/developer/docs/help/whats-new.md new file mode 100644 index 00000000000..d1dce092c37 --- /dev/null +++ b/developer/docs/help/whats-new.md @@ -0,0 +1,43 @@ +--- +title: What's new in Keyman Developer 18.0 +--- + +Keyman Developer 17 has a number of significant changes: + +* `kmcomp` has been removed and replaced with `kmc`. Learn more in our [kmcomp migration guide](reference/kmc/cli/kmcomp-migration). + +* Windows installer packages should now be built with + `kmc build windows-package-installer` and can no longer be built within + the Keyman Developer IDE. More details on how to use this are in the + [`kmc` reference documentation](reference/kmc/cli/reference#toc-kmc-build-windows-package-installer-additional-options). + +* `.keyboard_info` files are now generated entirely from the package and + keyboard files. Extra fields are available in packages for license file, + welcome file, typing examples, related packages (including deprecated + packages), and additional font files. Keyboards in the Keyman Cloud + keyboard repository have already been updated; if you are an author of + one of these keyboards, you should pull the changes from the repository + before submitting future updates. + +* Keyboard project files (.kpj) now have a new format which does not list + individual files, but instead includes all files in the same folder and + subfolders relative to the project file. This prevents projects from + including unrelated files, and reduces the number of files that change + when keyboards are updated. + +* Keyman Developer will now open each project in a new window, allowing + the user to rapidly switch between multiple projects at the same time. + +* The Keyman Keyboard and Lexical Model Cloud repositories have new build + scripts which run `kmc`. These run much, much faster than previously! + +* The [`&displayMap`](/developer/language/reference/displaymap) store allows + keyboard developers to specify a font mapping to PUA for the On Screen + Keyboard and Touch Layout to resolve diacritic rendering issues. + +* Keyman Developer has been updated to support Unicode 15.1. + +* Additional non-printing characters have been added to the Touch Layout Editor. + +* Virtual keys in output of rules have never worked properly or been officially + supported; Keyman Developer will now warn if you attempt to use this pattern. diff --git a/developer/src/build.sh b/developer/src/build.sh index b45dea38f50..cde9b7fc233 100755 --- a/developer/src/build.sh +++ b/developer/src/build.sh @@ -149,9 +149,9 @@ function do_publish() { DRY_RUN=--dry-run fi + ./common/web/utils/build.sh publish $DRY_RUN $NPM_PUBLISH ../../common/web/keyman-version/build.sh publish $DRY_RUN $NPM_PUBLISH ../../common/web/types/build.sh publish $DRY_RUN $NPM_PUBLISH - ../../common/models/types/build.sh publish $DRY_RUN $NPM_PUBLISH ../../core/include/ldml/build.sh publish $DRY_RUN $NPM_PUBLISH # end TODO #-------------------------------------------------------- diff --git a/developer/src/common/web/utils/package.json b/developer/src/common/web/utils/package.json index 1ab9daddbf8..7f2d9cef279 100644 --- a/developer/src/common/web/utils/package.json +++ b/developer/src/common/web/utils/package.json @@ -9,19 +9,19 @@ "/build/" ], "dependencies": { - "@sentry/node": "^7.57.0", "@keymanapp/common-types": "*", + "@sentry/node": "^7.57.0", "eventemitter3": "^5.0.0", + "fast-xml-parser": "^4.5.0", "restructure": "^3.0.1", - "semver": "^7.5.4", "sax": ">=0.6.0", + "semver": "^7.5.4", "xmlbuilder": "~11.0.0" }, "devDependencies": { "@types/git-diff": "^2.0.3", "@types/node": "^20.4.1", "@types/semver": "^7.3.12", - "@types/xml2js": "^0.4.5", "c8": "^7.12.0", "git-diff": "^2.0.6", "mocha": "^8.4.0", diff --git a/developer/src/common/web/utils/src/common-events.ts b/developer/src/common/web/utils/src/common-messages.ts similarity index 91% rename from developer/src/common/web/utils/src/common-events.ts rename to developer/src/common/web/utils/src/common-messages.ts index eee8a6c84ca..5b3fd7d5070 100644 --- a/developer/src/common/web/utils/src/common-events.ts +++ b/developer/src/common/web/utils/src/common-messages.ts @@ -1,3 +1,6 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + */ import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageDef as def, CompilerMessageSpec as m } from './compiler-interfaces.js'; import { constants } from '@keymanapp/ldml-keyboard-constants'; @@ -43,4 +46,8 @@ export class CommonTypesMessages { static Error_TestDataUnexpectedArray = (o: {subtag: string}) => m(this.ERROR_TestDataUnexpectedArray, `Problem reading test data: expected single ${def(o.subtag)} element, found multiple`); + + static ERROR_InvalidXml = SevError | 0x0008; + static Error_InvalidXml = (o:{e: any}) => + m(this.ERROR_InvalidXml, `The XML file could not be read: ${(o.e ?? '').toString()}`); }; diff --git a/developer/src/common/web/utils/src/deps/xml2js/LICENSE b/developer/src/common/web/utils/src/deps/xml2js/LICENSE deleted file mode 100644 index e3b4222a66a..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright 2010, 2011, 2012, 2013. All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -IN THE SOFTWARE. diff --git a/developer/src/common/web/utils/src/deps/xml2js/README.md b/developer/src/common/web/utils/src/deps/xml2js/README.md deleted file mode 100644 index 67f2104a513..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/README.md +++ /dev/null @@ -1,507 +0,0 @@ -node-xml2js -=========== - -Ever had the urge to parse XML? And wanted to access the data in some sane, -easy way? Don't want to compile a C parser, for whatever reason? Then xml2js is -what you're looking for! - -Description -=========== - -Simple XML to JavaScript object converter. It supports bi-directional conversion. -Uses [sax-js](https://github.com/isaacs/sax-js/) and -[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js/). - -Note: If you're looking for a full DOM parser, you probably want -[JSDom](https://github.com/tmpvar/jsdom). - -Installation -============ - -Simplest way to install `xml2js` is to use [npm](http://npmjs.org), just `npm -install xml2js` which will download xml2js and all dependencies. - -xml2js is also available via [Bower](http://bower.io/), just `bower install -xml2js` which will download xml2js and all dependencies. - -Usage -===== - -No extensive tutorials required because you are a smart developer! The task of -parsing XML should be an easy one, so let's make it so! Here's some examples. - -Shoot-and-forget usage ----------------------- - -You want to parse XML as simple and easy as possible? It's dangerous to go -alone, take this: - -```javascript -var parseString = require('xml2js').parseString; -var xml = "Hello xml2js!" -parseString(xml, function (err, result) { - console.dir(result); -}); -``` - -Can't get easier than this, right? This works starting with `xml2js` 0.2.3. -With CoffeeScript it looks like this: - -```coffeescript -{parseString} = require 'xml2js' -xml = "Hello xml2js!" -parseString xml, (err, result) -> - console.dir result -``` - -If you need some special options, fear not, `xml2js` supports a number of -options (see below), you can specify these as second argument: - -```javascript -parseString(xml, {trim: true}, function (err, result) { -}); -``` - -Simple as pie usage -------------------- - -That's right, if you have been using xml-simple or a home-grown -wrapper, this was added in 0.1.11 just for you: - -```javascript -var fs = require('fs'), - xml2js = require('xml2js'); - -var parser = new xml2js.Parser(); -fs.readFile(__dirname + '/foo.xml', function(err, data) { - parser.parseString(data, function (err, result) { - console.dir(result); - console.log('Done'); - }); -}); -``` - -Look ma, no event listeners! - -You can also use `xml2js` from -[CoffeeScript](https://github.com/jashkenas/coffeescript), further reducing -the clutter: - -```coffeescript -fs = require 'fs', -xml2js = require 'xml2js' - -parser = new xml2js.Parser() -fs.readFile __dirname + '/foo.xml', (err, data) -> - parser.parseString data, (err, result) -> - console.dir result - console.log 'Done.' -``` - -But what happens if you forget the `new` keyword to create a new `Parser`? In -the middle of a nightly coding session, it might get lost, after all. Worry -not, we got you covered! Starting with 0.2.8 you can also leave it out, in -which case `xml2js` will helpfully add it for you, no bad surprises and -inexplicable bugs! - -Promise usage -------------- - -```javascript -var xml2js = require('xml2js'); -var xml = ''; - -// With parser -var parser = new xml2js.Parser(/* options */); -parser.parseStringPromise(xml).then(function (result) { - console.dir(result); - console.log('Done'); -}) -.catch(function (err) { - // Failed -}); - -// Without parser -xml2js.parseStringPromise(xml /*, options */).then(function (result) { - console.dir(result); - console.log('Done'); -}) -.catch(function (err) { - // Failed -}); -``` - -Parsing multiple files ----------------------- - -If you want to parse multiple files, you have multiple possibilities: - - * You can create one `xml2js.Parser` per file. That's the recommended one - and is promised to always *just work*. - * You can call `reset()` on your parser object. - * You can hope everything goes well anyway. This behaviour is not - guaranteed work always, if ever. Use option #1 if possible. Thanks! - -So you wanna some JSON? ------------------------ - -Just wrap the `result` object in a call to `JSON.stringify` like this -`JSON.stringify(result)`. You get a string containing the JSON representation -of the parsed object that you can feed to JSON-hungry consumers. - -Displaying results ------------------- - -You might wonder why, using `console.dir` or `console.log` the output at some -level is only `[Object]`. Don't worry, this is not because `xml2js` got lazy. -That's because Node uses `util.inspect` to convert the object into strings and -that function stops after `depth=2` which is a bit low for most XML. - -To display the whole deal, you can use `console.log(util.inspect(result, false, -null))`, which displays the whole result. - -So much for that, but what if you use -[eyes](https://github.com/cloudhead/eyes.js) for nice colored output and it -truncates the output with `…`? Don't fear, there's also a solution for that, -you just need to increase the `maxLength` limit by creating a custom inspector -`var inspect = require('eyes').inspector({maxLength: false})` and then you can -easily `inspect(result)`. - -XML builder usage ------------------ - -Since 0.4.0, objects can be also be used to build XML: - -```javascript -var xml2js = require('xml2js'); - -var obj = {name: "Super", Surname: "Man", age: 23}; - -var builder = new xml2js.Builder(); -var xml = builder.buildObject(obj); -``` -will result in: - -```xml - - - Super - Man - 23 - -``` - -At the moment, a one to one bi-directional conversion is guaranteed only for -default configuration, except for `attrkey`, `charkey` and `explicitArray` options -you can redefine to your taste. Writing CDATA is supported via setting the `cdata` -option to `true`. - -To specify attributes: -```javascript -var xml2js = require('xml2js'); - -var obj = {root: {$: {id: "my id"}, _: "my inner text"}}; - -var builder = new xml2js.Builder(); -var xml = builder.buildObject(obj); -``` -will result in: -```xml - -my inner text -``` - -### Adding xmlns attributes - -You can generate XML that declares XML namespace prefix / URI pairs with xmlns attributes. - -Example declaring a default namespace on the root element: - -```javascript -let obj = { - Foo: { - $: { - "xmlns": "http://foo.com" - } - } -}; -``` -Result of `buildObject(obj)`: -```xml - -``` -Example declaring non-default namespaces on non-root elements: -```javascript -let obj = { - 'foo:Foo': { - $: { - 'xmlns:foo': 'http://foo.com' - }, - 'bar:Bar': { - $: { - 'xmlns:bar': 'http://bar.com' - } - } - } -} -``` -Result of `buildObject(obj)`: -```xml - - - -``` - - -Processing attribute, tag names and values ------------------------------------------- - -Since 0.4.1 you can optionally provide the parser with attribute name and tag name processors as well as element value processors (Since 0.4.14, you can also optionally provide the parser with attribute value processors): - -```javascript - -function nameToUpperCase(name){ - return name.toUpperCase(); -} - -//transform all attribute and tag names and values to uppercase -parseString(xml, { - tagNameProcessors: [nameToUpperCase], - attrNameProcessors: [nameToUpperCase], - valueProcessors: [nameToUpperCase], - attrValueProcessors: [nameToUpperCase]}, - function (err, result) { - // processed data -}); -``` - -The `tagNameProcessors` and `attrNameProcessors` options -accept an `Array` of functions with the following signature: - -```javascript -function (name){ - //do something with `name` - return name -} -``` - -The `attrValueProcessors` and `valueProcessors` options -accept an `Array` of functions with the following signature: - -```javascript -function (value, name) { - //`name` will be the node name or attribute name - //do something with `value`, (optionally) dependent on the node/attr name - return value -} -``` - -Some processors are provided out-of-the-box and can be found in `lib/processors.js`: - -- `normalize`: transforms the name to lowercase. -(Automatically used when `options.normalize` is set to `true`) - -- `firstCharLowerCase`: transforms the first character to lower case. -E.g. 'MyTagName' becomes 'myTagName' - -- `stripPrefix`: strips the xml namespace prefix. E.g `` will become 'Bar'. -(N.B.: the `xmlns` prefix is NOT stripped.) - -- `parseNumbers`: parses integer-like strings as integers and float-like strings as floats -E.g. "0" becomes 0 and "15.56" becomes 15.56 - -- `parseBooleans`: parses boolean-like strings to booleans -E.g. "true" becomes true and "False" becomes false - -Options -======= - -Apart from the default settings, there are a number of options that can be -specified for the parser. Options are specified by ``new Parser({optionName: -value})``. Possible options are: - - * `attrkey` (default: `$`): Prefix that is used to access the attributes. - Version 0.1 default was `@`. - * `charkey` (default: `_`): Prefix that is used to access the character - content. Version 0.1 default was `#`. - * `explicitCharkey` (default: `false`) Determines whether or not to use - a `charkey` prefix for elements with no attributes. - * `trim` (default: `false`): Trim the whitespace at the beginning and end of - text nodes. - * `normalizeTags` (default: `false`): Normalize all tag names to lowercase. - * `normalize` (default: `false`): Trim whitespaces inside text nodes. - * `explicitRoot` (default: `true`): Set this if you want to get the root - node in the resulting object. - * `emptyTag` (default: `''`): what will the value of empty nodes be. In case - you want to use an empty object as a default value, it is better to provide a factory - function `() => ({})` instead. Without this function a plain object would - become a shared reference across all occurrences with unwanted behavior. - * `explicitArray` (default: `true`): Always put child nodes in an array if - true; otherwise an array is created only if there is more than one. - * `ignoreAttrs` (default: `false`): Ignore all XML attributes and only create - text nodes. - * `mergeAttrs` (default: `false`): Merge attributes and child elements as - properties of the parent, instead of keying attributes off a child - attribute object. This option is ignored if `ignoreAttrs` is `true`. - * `validator` (default `null`): You can specify a callable that validates - the resulting structure somehow, however you want. See unit tests - for an example. - * `xmlns` (default `false`): Give each element a field usually called '$ns' - (the first character is the same as attrkey) that contains its local name - and namespace URI. - * `explicitChildren` (default `false`): Put child elements to separate - property. Doesn't work with `mergeAttrs = true`. If element has no children - then "children" won't be created. Added in 0.2.5. - * `childkey` (default `$$`): Prefix that is used to access child elements if - `explicitChildren` is set to `true`. Added in 0.2.5. - * `preserveChildrenOrder` (default `false`): Modifies the behavior of - `explicitChildren` so that the value of the "children" property becomes an - ordered array. When this is `true`, every node will also get a `#name` field - whose value will correspond to the XML nodeName, so that you may iterate - the "children" array and still be able to determine node names. The named - (and potentially unordered) properties are also retained in this - configuration at the same level as the ordered "children" array. Added in - 0.4.9. - * `charsAsChildren` (default `false`): Determines whether chars should be - considered children if `explicitChildren` is on. Added in 0.2.5. - * `includeWhiteChars` (default `false`): Determines whether whitespace-only - text nodes should be included. Added in 0.4.17. - * `async` (default `false`): Should the callbacks be async? This *might* be - an incompatible change if your code depends on sync execution of callbacks. - Future versions of `xml2js` might change this default, so the recommendation - is to not depend on sync execution anyway. Added in 0.2.6. - * `strict` (default `true`): Set sax-js to strict or non-strict parsing mode. - Defaults to `true` which is *highly* recommended, since parsing HTML which - is not well-formed XML might yield just about anything. Added in 0.2.7. - * `attrNameProcessors` (default: `null`): Allows the addition of attribute - name processing functions. Accepts an `Array` of functions with following - signature: - ```javascript - function (name){ - //do something with `name` - return name - } - ``` - Added in 0.4.14 - * `attrValueProcessors` (default: `null`): Allows the addition of attribute - value processing functions. Accepts an `Array` of functions with following - signature: - ```javascript - function (value, name){ - //do something with `name` - return name - } - ``` - Added in 0.4.1 - * `tagNameProcessors` (default: `null`): Allows the addition of tag name - processing functions. Accepts an `Array` of functions with following - signature: - ```javascript - function (name){ - //do something with `name` - return name - } - ``` - Added in 0.4.1 - * `valueProcessors` (default: `null`): Allows the addition of element value - processing functions. Accepts an `Array` of functions with following - signature: - ```javascript - function (value, name){ - //do something with `name` - return name - } - ``` - Added in 0.4.6 - -Options for the `Builder` class -------------------------------- -These options are specified by ``new Builder({optionName: value})``. -Possible options are: - - * `attrkey` (default: `$`): Prefix that is used to access the attributes. - Version 0.1 default was `@`. - * `charkey` (default: `_`): Prefix that is used to access the character - content. Version 0.1 default was `#`. - * `rootName` (default `root` or the root key name): root element name to be used in case - `explicitRoot` is `false` or to override the root element name. - * `renderOpts` (default `{ 'pretty': true, 'indent': ' ', 'newline': '\n' }`): - Rendering options for xmlbuilder-js. - * pretty: prettify generated XML - * indent: whitespace for indentation (only when pretty) - * newline: newline char (only when pretty) - * `xmldec` (default `{ 'version': '1.0', 'encoding': 'UTF-8', 'standalone': true }`: - XML declaration attributes. - * `xmldec.version` A version number string, e.g. 1.0 - * `xmldec.encoding` Encoding declaration, e.g. UTF-8 - * `xmldec.standalone` standalone document declaration: true or false - * `doctype` (default `null`): optional DTD. Eg. `{'ext': 'hello.dtd'}` - * `headless` (default: `false`): omit the XML header. Added in 0.4.3. - * `allowSurrogateChars` (default: `false`): allows using characters from the Unicode - surrogate blocks. - * `cdata` (default: `false`): wrap text nodes in `` instead of - escaping when necessary. Does not add `` if it is not required. - Added in 0.4.5. - -`renderOpts`, `xmldec`,`doctype` and `headless` pass through to -[xmlbuilder-js](https://github.com/oozcitak/xmlbuilder-js). - -Updating to new version -======================= - -Version 0.2 changed the default parsing settings, but version 0.1.14 introduced -the default settings for version 0.2, so these settings can be tried before the -migration. - -```javascript -var xml2js = require('xml2js'); -var parser = new xml2js.Parser(xml2js.defaults["0.2"]); -``` - -To get the 0.1 defaults in version 0.2 you can just use -`xml2js.defaults["0.1"]` in the same place. This provides you with enough time -to migrate to the saner way of parsing in `xml2js` 0.2. We try to make the -migration as simple and gentle as possible, but some breakage cannot be -avoided. - -So, what exactly did change and why? In 0.2 we changed some defaults to parse -the XML in a more universal and sane way. So we disabled `normalize` and `trim` -so `xml2js` does not cut out any text content. You can reenable this at will of -course. A more important change is that we return the root tag in the resulting -JavaScript structure via the `explicitRoot` setting, so you need to access the -first element. This is useful for anybody who wants to know what the root node -is and preserves more information. The last major change was to enable -`explicitArray`, so everytime it is possible that one might embed more than one -sub-tag into a tag, xml2js >= 0.2 returns an array even if the array just -includes one element. This is useful when dealing with APIs that return -variable amounts of subtags. - -Running tests, development -========================== - -[![Build Status](https://travis-ci.org/Leonidas-from-XIV/node-xml2js.svg?branch=master)](https://travis-ci.org/Leonidas-from-XIV/node-xml2js) -[![Coverage Status](https://coveralls.io/repos/Leonidas-from-XIV/node-xml2js/badge.svg?branch=)](https://coveralls.io/r/Leonidas-from-XIV/node-xml2js?branch=master) -[![Dependency Status](https://david-dm.org/Leonidas-from-XIV/node-xml2js.svg)](https://david-dm.org/Leonidas-from-XIV/node-xml2js) - -The development requirements are handled by npm, you just need to install them. -We also have a number of unit tests, they can be run using `npm test` directly -from the project root. This runs zap to discover all the tests and execute -them. - -If you like to contribute, keep in mind that `xml2js` is written in -CoffeeScript, so don't develop on the JavaScript files that are checked into -the repository for convenience reasons. Also, please write some unit test to -check your behaviour and if it is some user-facing thing, add some -documentation to this README, so people will know it exists. Thanks in advance! - -Getting support -=============== - -Please, if you have a problem with the library, first make sure you read this -README. If you read this far, thanks, you're good. Then, please make sure your -problem really is with `xml2js`. It is? Okay, then I'll look at it. Send me a -mail and we can talk. Please don't open issues, as I don't think that is the -proper forum for support problems. Some problems might as well really be bugs -in `xml2js`, if so I'll let you know to open an issue instead :) - -But if you know you really found a bug, feel free to open an issue instead. diff --git a/developer/src/common/web/utils/src/deps/xml2js/bom.js b/developer/src/common/web/utils/src/deps/xml2js/bom.js deleted file mode 100644 index 0ad6e2a4a43..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/bom.js +++ /dev/null @@ -1,8 +0,0 @@ -"use strict"; -export function stripBOM(str) { - if (str[0] === '\uFEFF') { - return str.substring(1); - } else { - return str; - } -}; diff --git a/developer/src/common/web/utils/src/deps/xml2js/builder.js b/developer/src/common/web/utils/src/deps/xml2js/builder.js deleted file mode 100644 index 5dfca61c9f6..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/builder.js +++ /dev/null @@ -1,118 +0,0 @@ -var escapeCDATA, requiresCDATA, wrapCDATA, - hasProp = {}.hasOwnProperty; - -import * as builder from 'xmlbuilder'; -import { defaults } from './defaults.js'; - -requiresCDATA = function(entry) { - return typeof entry === "string" && (entry.indexOf('&') >= 0 || entry.indexOf('>') >= 0 || entry.indexOf('<') >= 0); -}; - -wrapCDATA = function(entry) { - return ""; -}; - -escapeCDATA = function(entry) { - return entry.replace(']]>', ']]]]>'); -}; - -export class Builder { - constructor(opts) { - var key, ref, value; - this.options = {}; - ref = defaults["0.2"]; - for (key in ref) { - if (!hasProp.call(ref, key)) continue; - value = ref[key]; - this.options[key] = value; - } - for (key in opts) { - if (!hasProp.call(opts, key)) continue; - value = opts[key]; - this.options[key] = value; - } - } - - buildObject(rootObj) { - var attrkey, charkey, render, rootElement, rootName; - attrkey = this.options.attrkey; - charkey = this.options.charkey; - if ((Object.keys(rootObj).length === 1) && (this.options.rootName === defaults['0.2'].rootName)) { - rootName = Object.keys(rootObj)[0]; - rootObj = rootObj[rootName]; - } else { - rootName = this.options.rootName; - } - render = (function(_this) { - return function(element, obj) { - var attr, child, entry, index, key, value; - if (typeof obj !== 'object') { - if (_this.options.cdata && requiresCDATA(obj)) { - element.raw(wrapCDATA(obj)); - } else { - element.txt(obj); - } - } else if (Array.isArray(obj)) { - for (index in obj) { - if (!hasProp.call(obj, index)) continue; - child = obj[index]; - for (key in child) { - entry = child[key]; - element = render(element.ele(key), entry).up(); - } - } - } else { - for (key in obj) { - if (!hasProp.call(obj, key)) continue; - child = obj[key]; - if (key === attrkey) { - if (typeof child === "object") { - for (attr in child) { - value = child[attr]; - element = element.att(attr, value); - } - } - } else if (key === charkey) { - if (_this.options.cdata && requiresCDATA(child)) { - element = element.raw(wrapCDATA(child)); - } else { - element = element.txt(child); - } - } else if (Array.isArray(child)) { - for (index in child) { - if (!hasProp.call(child, index)) continue; - entry = child[index]; - if (typeof entry === 'string') { - if (_this.options.cdata && requiresCDATA(entry)) { - element = element.ele(key).raw(wrapCDATA(entry)).up(); - } else { - element = element.ele(key, entry).up(); - } - } else { - element = render(element.ele(key), entry).up(); - } - } - } else if (typeof child === "object") { - element = render(element.ele(key), child).up(); - } else { - if (typeof child === 'string' && _this.options.cdata && requiresCDATA(child)) { - element = element.ele(key).raw(wrapCDATA(child)).up(); - } else { - if (child == null) { - child = ''; - } - element = element.ele(key, child.toString()).up(); - } - } - } - } - return element; - }; - })(this); - rootElement = builder.create(rootName, this.options.xmldec, this.options.doctype, { - headless: this.options.headless, - allowSurrogateChars: this.options.allowSurrogateChars - }); - return render(rootElement, rootObj).end(this.options.renderOpts); - }; -} diff --git a/developer/src/common/web/utils/src/deps/xml2js/defaults.js b/developer/src/common/web/utils/src/deps/xml2js/defaults.js deleted file mode 100644 index d1009281792..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/defaults.js +++ /dev/null @@ -1,69 +0,0 @@ -// Generated by CoffeeScript 1.12.7 -export const defaults = { - "0.1": { - explicitCharkey: false, - trim: true, - normalize: true, - normalizeTags: false, - attrkey: "@", - charkey: "#", - explicitArray: false, - ignoreAttrs: false, - mergeAttrs: false, - explicitRoot: false, - validator: null, - xmlns: false, - explicitChildren: false, - childkey: '@@', - charsAsChildren: false, - includeWhiteChars: false, - async: false, - strict: true, - attrNameProcessors: null, - attrValueProcessors: null, - tagNameProcessors: null, - valueProcessors: null, - emptyTag: '' - }, - "0.2": { - explicitCharkey: false, - trim: false, - normalize: false, - normalizeTags: false, - attrkey: "$", - charkey: "_", - explicitArray: true, - ignoreAttrs: false, - mergeAttrs: false, - explicitRoot: true, - validator: null, - xmlns: false, - explicitChildren: false, - preserveChildrenOrder: false, - childkey: '$$', - charsAsChildren: false, - includeWhiteChars: false, - async: false, - strict: true, - attrNameProcessors: null, - attrValueProcessors: null, - tagNameProcessors: null, - valueProcessors: null, - rootName: 'root', - xmldec: { - 'version': '1.0', - 'encoding': 'UTF-8', - 'standalone': true - }, - doctype: null, - renderOpts: { - 'pretty': true, - 'indent': ' ', - 'newline': '\n' - }, - headless: false, - chunkSize: 10000, - emptyTag: '', - cdata: false - } - }; diff --git a/developer/src/common/web/utils/src/deps/xml2js/parser.js b/developer/src/common/web/utils/src/deps/xml2js/parser.js deleted file mode 100644 index 1c7f148d906..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/parser.js +++ /dev/null @@ -1,381 +0,0 @@ - var isEmpty, processItem, - bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, - extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - hasProp = {}.hasOwnProperty; - -import sax from 'sax'; -import { EventEmitter } from 'eventemitter3'; -import * as bom from './bom.js'; -import * as processors from './processors.js'; -import { setImmediate } from 'timers'; -import { defaults } from './defaults.js'; - - isEmpty = function(thing) { - return typeof thing === "object" && (thing != null) && Object.keys(thing).length === 0; - }; - - processItem = function(processors, item, key) { - var i, len, process; - for (i = 0, len = processors.length; i < len; i++) { - process = processors[i]; - item = process(item, key); - } - return item; - }; - -/** @type Class */ -export class Parser extends EventEmitter { -// export const Parser = (function(superClass) { - // extend(Parser, superClass); - - constructor(opts) { - super(); - this.parseStringPromise = bind(this.parseStringPromise, this); - this.parseString = bind(this.parseString, this); - this.reset = bind(this.reset, this); - this.assignOrPush = bind(this.assignOrPush, this); - this.processAsync = bind(this.processAsync, this); - var key, ref, value; - if (!(this instanceof Parser)) { - return new Parser(opts); - } - this.options = {}; - ref = defaults["0.2"]; - for (key in ref) { - if (!hasProp.call(ref, key)) continue; - value = ref[key]; - this.options[key] = value; - } - for (key in opts) { - if (!hasProp.call(opts, key)) continue; - value = opts[key]; - this.options[key] = value; - } - if (this.options.xmlns) { - this.options.xmlnskey = this.options.attrkey + "ns"; - } - if (this.options.normalizeTags) { - if (!this.options.tagNameProcessors) { - this.options.tagNameProcessors = []; - } - this.options.tagNameProcessors.unshift(processors.normalize); - } - this.reset(); - } - - processAsync() { - var chunk, err; - try { - if (this.remaining.length <= this.options.chunkSize) { - chunk = this.remaining; - this.remaining = ''; - this.saxParser = this.saxParser.write(chunk); - return this.saxParser.close(); - } else { - chunk = this.remaining.substr(0, this.options.chunkSize); - this.remaining = this.remaining.substr(this.options.chunkSize, this.remaining.length); - this.saxParser = this.saxParser.write(chunk); - return setImmediate(this.processAsync); - } - } catch (error1) { - err = error1; - if (!this.saxParser.errThrown) { - this.saxParser.errThrown = true; - return this.emit(err); - } - } - }; - - assignOrPush(obj, key, newValue) { - if (!(key in obj)) { - if (!this.options.explicitArray) { - return obj[key] = newValue; - } else { - return obj[key] = [newValue]; - } - } else { - if (!(obj[key] instanceof Array)) { - obj[key] = [obj[key]]; - } - return obj[key].push(newValue); - } - }; - - reset() { - var attrkey, charkey, ontext, stack; - this.removeAllListeners(); - this.saxParser = sax.parser(this.options.strict, { - trim: false, - normalize: false, - xmlns: this.options.xmlns - }); - this.saxParser.errThrown = false; - this.saxParser.onerror = (function(_this) { - return function(error) { - _this.saxParser.resume(); - if (!_this.saxParser.errThrown) { - _this.saxParser.errThrown = true; - return _this.emit("error", error); - } - }; - })(this); - this.saxParser.onend = (function(_this) { - return function() { - if (!_this.saxParser.ended) { - _this.saxParser.ended = true; - return _this.emit("end", _this.resultObject); - } - }; - })(this); - this.saxParser.ended = false; - this.EXPLICIT_CHARKEY = this.options.explicitCharkey; - this.resultObject = null; - stack = []; - attrkey = this.options.attrkey; - charkey = this.options.charkey; - this.saxParser.onopentag = (function(_this) { - return function(node) { - var key, newValue, obj, processedKey, ref; - obj = Object.create(null); - obj[charkey] = ""; - if (!_this.options.ignoreAttrs) { - ref = node.attributes; - for (key in ref) { - if (!hasProp.call(ref, key)) continue; - if (!(attrkey in obj) && !_this.options.mergeAttrs) { - obj[attrkey] = Object.create(null); - } - newValue = _this.options.attrValueProcessors ? processItem(_this.options.attrValueProcessors, node.attributes[key], key) : node.attributes[key]; - processedKey = _this.options.attrNameProcessors ? processItem(_this.options.attrNameProcessors, key) : key; - if (_this.options.mergeAttrs) { - _this.assignOrPush(obj, processedKey, newValue); - } else { - obj[attrkey][processedKey] = newValue; - } - } - } - obj["#name"] = _this.options.tagNameProcessors ? processItem(_this.options.tagNameProcessors, node.name) : node.name; - if (_this.options.xmlns) { - obj[_this.options.xmlnskey] = { - uri: node.uri, - local: node.local - }; - } - return stack.push(obj); - }; - })(this); - this.saxParser.onclosetag = (function(_this) { - return function() { - var cdata, emptyStr, key, node, nodeName, obj, objClone, old, s, xpath; - obj = stack.pop(); - nodeName = obj["#name"]; - if (!_this.options.explicitChildren || !_this.options.preserveChildrenOrder) { - delete obj["#name"]; - } - if (obj.cdata === true) { - cdata = obj.cdata; - delete obj.cdata; - } - s = stack[stack.length - 1]; - if (obj[charkey].match(/^\s*$/) && !cdata && !_this.options.includeWhiteChars) { - emptyStr = obj[charkey]; - delete obj[charkey]; - } else { - if (_this.options.trim) { - obj[charkey] = obj[charkey].trim(); - } - if (_this.options.normalize) { - obj[charkey] = obj[charkey].replace(/\s{2,}/g, " ").trim(); - } - obj[charkey] = _this.options.valueProcessors ? processItem(_this.options.valueProcessors, obj[charkey], nodeName) : obj[charkey]; - if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) { - obj = obj[charkey]; - } - } - if (isEmpty(obj)) { - if (typeof _this.options.emptyTag === 'function') { - obj = _this.options.emptyTag(); - } else { - obj = _this.options.emptyTag !== '' ? _this.options.emptyTag : emptyStr; - } - } - if (_this.options.validator != null) { - xpath = "/" + ((function() { - var i, len, results; - results = []; - for (i = 0, len = stack.length; i < len; i++) { - node = stack[i]; - results.push(node["#name"]); - } - return results; - })()).concat(nodeName).join("/"); - (function() { - var err; - try { - return obj = _this.options.validator(xpath, s && s[nodeName], obj); - } catch (error1) { - err = error1; - return _this.emit("error", err); - } - })(); - } - if (_this.options.explicitChildren && !_this.options.mergeAttrs && typeof obj === 'object') { - if (!_this.options.preserveChildrenOrder) { - node = Object.create(null); - if (_this.options.attrkey in obj) { - node[_this.options.attrkey] = obj[_this.options.attrkey]; - delete obj[_this.options.attrkey]; - } - if (!_this.options.charsAsChildren && _this.options.charkey in obj) { - node[_this.options.charkey] = obj[_this.options.charkey]; - delete obj[_this.options.charkey]; - } - if (Object.getOwnPropertyNames(obj).length > 0) { - node[_this.options.childkey] = obj; - } - obj = node; - } else if (s) { - s[_this.options.childkey] = s[_this.options.childkey] || []; - objClone = Object.create(null); - for (key in obj) { - if (!hasProp.call(obj, key)) continue; - objClone[key] = obj[key]; - } - s[_this.options.childkey].push(objClone); - delete obj["#name"]; - if (Object.keys(obj).length === 1 && charkey in obj && !_this.EXPLICIT_CHARKEY) { - obj = obj[charkey]; - } - } - } - if (stack.length > 0) { - return _this.assignOrPush(s, nodeName, obj); - } else { - if (_this.options.explicitRoot) { - old = obj; - obj = Object.create(null); - obj[nodeName] = old; - } - _this.resultObject = obj; - _this.saxParser.ended = true; - return _this.emit("end", _this.resultObject); - } - }; - })(this); - ontext = (function(_this) { - return function(text) { - var charChild, s; - s = stack[stack.length - 1]; - if (s) { - s[charkey] += text; - if (_this.options.explicitChildren && _this.options.preserveChildrenOrder && _this.options.charsAsChildren && (_this.options.includeWhiteChars || text.replace(/\\n/g, '').trim() !== '')) { - s[_this.options.childkey] = s[_this.options.childkey] || []; - charChild = { - '#name': '__text__' - }; - charChild[charkey] = text; - if (_this.options.normalize) { - charChild[charkey] = charChild[charkey].replace(/\s{2,}/g, " ").trim(); - } - s[_this.options.childkey].push(charChild); - } - return s; - } - }; - })(this); - this.saxParser.ontext = ontext; - return this.saxParser.oncdata = (function(_this) { - return function(text) { - var s; - s = ontext(text); - if (s) { - return s.cdata = true; - } - }; - })(this); - }; - - parseString(str, cb) { - var err; - if ((cb != null) && typeof cb === "function") { - this.on("end", function(result) { - this.reset(); - return cb(null, result); - }); - this.on("error", function(err) { - this.reset(); - return cb(err); - }); - } - try { - str = str.toString(); - if (str.trim() === '') { - this.emit("end", null); - return true; - } - str = bom.stripBOM(str); - if (this.options.async) { - this.remaining = str; - setImmediate(this.processAsync); - return this.saxParser; - } - return this.saxParser.write(str).close(); - } catch (error1) { - err = error1; - if (!(this.saxParser.errThrown || this.saxParser.ended)) { - if(this.listenerCount('error') > 0) { - this.emit('error', err); - } else { - throw err; - } - return this.saxParser.errThrown = true; - } else if (this.saxParser.ended) { - throw err; - } - } - }; - - parseStringPromise(str) { - return new Promise((function(_this) { - return function(resolve, reject) { - return _this.parseString(str, function(err, value) { - if (err) { - return reject(err); - } else { - return resolve(value); - } - }); - }; - })(this)); - }; - - } - - export const parseString = function(str, a, b) { - var cb, options, parser; - if (b != null) { - if (typeof b === 'function') { - cb = b; - } - if (typeof a === 'object') { - options = a; - } - } else { - if (typeof a === 'function') { - cb = a; - } - options = {}; - } - parser = new Parser(options); - return parser.parseString(str, cb); - }; - - export const parseStringPromise = function(str, a) { - var options, parser; - if (typeof a === 'object') { - options = a; - } - parser = new Parser(options); - return parser.parseStringPromise(str); - }; - diff --git a/developer/src/common/web/utils/src/deps/xml2js/processors.js b/developer/src/common/web/utils/src/deps/xml2js/processors.js deleted file mode 100644 index 2a6849088c1..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/processors.js +++ /dev/null @@ -1,31 +0,0 @@ - "use strict"; - var prefixMatch; - - prefixMatch = new RegExp(/(?!xmlns)^.*:/); - - export const normalize = function(str) { - return str.toLowerCase(); - }; - - export const firstCharLowerCase = function(str) { - return str.charAt(0).toLowerCase() + str.slice(1); - }; - - export const stripPrefix = function(str) { - return str.replace(prefixMatch, ''); - }; - - export const parseNumbers = function(str) { - if (!isNaN(str)) { - str = str % 1 === 0 ? parseInt(str, 10) : parseFloat(str); - } - return str; - }; - - export const parseBooleans = function(str) { - if (/^(?:true|false)$/i.test(str)) { - str = str.toLowerCase() === 'true'; - } - return str; - }; - diff --git a/developer/src/common/web/utils/src/deps/xml2js/xml2js.js b/developer/src/common/web/utils/src/deps/xml2js/xml2js.js deleted file mode 100644 index 8ecbe3bcf2f..00000000000 --- a/developer/src/common/web/utils/src/deps/xml2js/xml2js.js +++ /dev/null @@ -1,27 +0,0 @@ -var - extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - hasProp = {}.hasOwnProperty; - - // import { defaults } from './defaults.js'; - import * as builder from './builder.js'; - import * as parser from './parser.js'; - import * as processors from './processors.js'; - - // export const defaults = defaults.defaults; - // export const processors = processors; - - /** @type Class */ - export class ValidationError extends Error { - constructor(message) { - super(message); - this.message = message; - } - }; - - export const Parser = parser.Parser; - - export const Builder = builder.Builder; - - export const parseString = parser.parseString; - - export const parseStringPromise = parser.parseStringPromise; diff --git a/developer/src/common/web/utils/src/index.ts b/developer/src/common/web/utils/src/index.ts index 0e462c7c056..21b59cc749f 100644 --- a/developer/src/common/web/utils/src/index.ts +++ b/developer/src/common/web/utils/src/index.ts @@ -42,6 +42,6 @@ export { defaultCompilerOptions, CompilerBaseOptions, CompilerCallbacks, Compile } from './compiler-interfaces.js'; -export { CommonTypesMessages } from './common-events.js'; +export { CommonTypesMessages } from './common-messages.js'; -export * as xml2js from './deps/xml2js/xml2js.js'; +export { KeymanXMLType, KeymanXMLWriter, KeymanXMLReader } from './xml-utils.js'; diff --git a/developer/src/common/web/utils/src/types/kpj/kpj-file-reader.ts b/developer/src/common/web/utils/src/types/kpj/kpj-file-reader.ts index d7768987531..f86879b0068 100644 --- a/developer/src/common/web/utils/src/types/kpj/kpj-file-reader.ts +++ b/developer/src/common/web/utils/src/types/kpj/kpj-file-reader.ts @@ -1,4 +1,4 @@ -import { xml2js } from '../../index.js'; +import { KeymanXMLReader } from '../../index.js'; import { KPJFile, KPJFileProject } from './kpj-file.js'; import { util } from '@keymanapp/common-types'; import { KeymanDeveloperProject, KeymanDeveloperProjectFile10, KeymanDeveloperProjectType } from './keyman-developer-project.js'; @@ -13,20 +13,9 @@ export class KPJFileReader { public read(file: Uint8Array): KPJFile { let data: KPJFile; - const parser = new xml2js.Parser({ - explicitArray: false, - mergeAttrs: false, - includeWhiteChars: false, - normalize: false, - emptyTag: '' - }); + data = new KeymanXMLReader('kpj') + .parse(file.toString()); - parser.parseString(file, (e: unknown, r: unknown) => { - if(e) { - throw e; - } - data = r as KPJFile; - }); data = this.boxArrays(data); if(data.KeymanDeveloperProject?.Files?.File?.length) { for(const file of data.KeymanDeveloperProject?.Files?.File) { @@ -126,4 +115,4 @@ export class KPJFileReader { util.boxXmlArray(source.KeymanDeveloperProject.Files, 'File'); return source; } -} \ No newline at end of file +} diff --git a/developer/src/common/web/utils/src/types/kvks/kvks-file-reader.ts b/developer/src/common/web/utils/src/types/kvks/kvks-file-reader.ts index 6b2ad8e0a98..9f2ca18f887 100644 --- a/developer/src/common/web/utils/src/types/kvks/kvks-file-reader.ts +++ b/developer/src/common/web/utils/src/types/kvks/kvks-file-reader.ts @@ -1,5 +1,5 @@ import { SchemaValidators as SV, KvkFile, util, Constants } from '@keymanapp/common-types'; -import { xml2js } from '../../index.js' +import { KeymanXMLReader } from '../../index.js' import KVKSourceFile from './kvks-file.js'; const SchemaValidators = SV.default; import boxXmlArray = util.boxXmlArray; @@ -20,31 +20,15 @@ export default class KVKSFileReader { public read(file: Uint8Array): KVKSourceFile { let source: KVKSourceFile; - const parser = new xml2js.Parser({ - explicitArray: false, - mergeAttrs: false, - includeWhiteChars: true, - normalize: false, - emptyTag: {} as any - // Why "as any"? xml2js is broken: - // https://github.com/Leonidas-from-XIV/node-xml2js/issues/648 means - // that an old version of `emptyTag` is used which doesn't support - // functions, but DefinitelyTyped is requiring use of function or a - // string. See also notes at - // https://github.com/DefinitelyTyped/DefinitelyTyped/pull/59259#issuecomment-1254405470 - // An alternative fix would be to pull xml2js directly from github - // rather than using the version tagged on npmjs.com. - }); - - parser.parseString(file, (e: unknown, r: unknown) => { - if(e) { - if(file.byteLength > 4 && file.subarray(0,3).every((v,i) => v == KVK_HEADER_IDENTIFIER_BYTES[i])) { - throw new Error('File appears to be a binary .kvk file', {cause: e}); - } - throw e; - }; - source = r as KVKSourceFile; - }); + try { + source = new KeymanXMLReader('kvks') + .parse(file.toString()) as KVKSourceFile; + } catch(e) { + if(file.byteLength > 4 && file.subarray(0,3).every((v,i) => v == KVK_HEADER_IDENTIFIER_BYTES[i])) { + throw new Error('File appears to be a binary .kvk file', {cause: e}); + } + throw e; + } if(source) { source = this.boxArrays(source); this.cleanupFlags(source); @@ -197,4 +181,4 @@ export default class KVKSFileReader { } return 0; } -} \ No newline at end of file +} diff --git a/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts b/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts index dd4962a8fad..70534ff4408 100644 --- a/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts +++ b/developer/src/common/web/utils/src/types/kvks/kvks-file-writer.ts @@ -1,6 +1,6 @@ import { VisualKeyboard as VK, Constants } from '@keymanapp/common-types'; import KVKSourceFile, { KVKSEncoding, KVKSFlags, KVKSKey, KVKSLayer } from './kvks-file.js'; -import { xml2js } from '../../index.js'; +import { KeymanXMLWriter } from '../../index.js'; import USVirtualKeyCodes = Constants.USVirtualKeyCodes; import VisualKeyboard = VK.VisualKeyboard; @@ -11,18 +11,6 @@ import VisualKeyboardShiftState = VK.VisualKeyboardShiftState; export default class KVKSFileWriter { public write(vk: VisualKeyboard): string { - - const builder = new xml2js.Builder({ - allowSurrogateChars: true, - attrkey: '$', - charkey: '_', - xmldec: { - version: '1.0', - encoding: 'UTF-8', - standalone: true - } - }) - const flags: KVKSFlags = {}; if(vk.header.flags & VisualKeyboardHeaderFlags.kvkhDisplayUnderlying) { flags.displayunderlying = ''; @@ -37,8 +25,6 @@ export default class KVKSFileWriter { flags.useunderlying = ''; } - - const kvks: KVKSourceFile = { visualkeyboard: { header: { @@ -105,7 +91,7 @@ export default class KVKSFileWriter { l.key.push(k); } - const result = builder.buildObject(kvks); + const result = new KeymanXMLWriter('kvks').write(kvks); return result; //Uint8Array.from(result); } @@ -124,4 +110,4 @@ export default class KVKSFileWriter { } return ''; } -} \ No newline at end of file +} diff --git a/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts index ddeaf719abd..17ade173931 100644 --- a/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts +++ b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts @@ -1,11 +1,15 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Reads a LDML XML keyboard file into JS object tree and resolves imports + */ import { SchemaValidators, util } from '@keymanapp/common-types'; -import { xml2js } from '../../index.js'; -import { CommonTypesMessages } from '../../common-events.js'; +import { CommonTypesMessages } from '../../common-messages.js'; import { CompilerCallbacks } from '../../compiler-interfaces.js'; import { LDMLKeyboardXMLSourceFile, LKImport, ImportStatus } from './ldml-keyboard-xml.js'; import { constants } from '@keymanapp/ldml-keyboard-constants'; import { LDMLKeyboardTestDataXMLSourceFile, LKTTest, LKTTests } from './ldml-keyboard-testdata-xml.js'; - +import { KeymanXMLReader } from '@keymanapp/developer-utils'; import boxXmlArray = util.boxXmlArray; interface NameAndProps { @@ -93,6 +97,14 @@ export class LDMLKeyboardXMLSourceFileReader { if(source?.keyboard3?.transforms) { for(const transforms of source.keyboard3.transforms) { boxXmlArray(transforms, 'transformGroup'); + // need to see if there's an empty ('') element. + // the schema allows an empty object, but the spec doesn't. + for (let i=0; i { - let a: LDMLKeyboardXMLSourceFile; - const parser = new xml2js.Parser({ - explicitArray: false, - mergeAttrs: true, - includeWhiteChars: false, - emptyTag: {} as any - // Why "as any"? xml2js is broken: - // https://github.com/Leonidas-from-XIV/node-xml2js/issues/648 means - // that an old version of `emptyTag` is used which doesn't support - // functions, but DefinitelyTyped is requiring use of function or a - // string. See also notes at - // https://github.com/DefinitelyTyped/DefinitelyTyped/pull/59259#issuecomment-1254405470 - // An alternative fix would be to pull xml2js directly from github - // rather than using the version tagged on npmjs.com. - }); - parser.parseString(file, (e: unknown, r: unknown) => { a = r as LDMLKeyboardXMLSourceFile }); // TODO-LDML: isn't 'e' the error? - return a; - })(); + const data = new TextDecoder().decode(file); + const source = new KeymanXMLReader('keyboard3') + .parse(data) as LDMLKeyboardXMLSourceFile; return source; } @@ -279,38 +281,28 @@ export class LDMLKeyboardXMLSourceFileReader { */ public load(file: Uint8Array): LDMLKeyboardXMLSourceFile | null { if (!file) { + throw new Error(`file parameter must not be null`); + } + + let source: LDMLKeyboardXMLSourceFile = null; + try { + source = this.loadUnboxed(file); + } catch(e) { + this.callbacks.reportMessage(CommonTypesMessages.Error_InvalidXml({e})); return null; } - const source = this.loadUnboxed(file); - if(this.boxArrays(source)) { + + if (this.boxArrays(source)) { return source; - } else { - return null; } + + // boxArrays ... resolveImports has already logged a message + return null; } loadTestDataUnboxed(file: Uint8Array): any { - const source = (() => { - let a: any; - const parser = new xml2js.Parser({ - // explicitArray: false, - preserveChildrenOrder:true, // needed for test data - explicitChildren: true, // needed for test data - // mergeAttrs: true, - // includeWhiteChars: false, - // emptyTag: {} as any - // Why "as any"? xml2js is broken: - // https://github.com/Leonidas-from-XIV/node-xml2js/issues/648 means - // that an old version of `emptyTag` is used which doesn't support - // functions, but DefinitelyTyped is requiring use of function or a - // string. See also notes at - // https://github.com/DefinitelyTyped/DefinitelyTyped/pull/59259#issuecomment-1254405470 - // An alternative fix would be to pull xml2js directly from github - // rather than using the version tagged on npmjs.com. - }); - parser.parseString(file, (e: unknown, r: unknown) => { a = r as any }); // TODO-LDML: isn't 'e' the error? - return a; // Why 'any'? Because we need to box up the $'s into proper properties. - })(); + const source = new KeymanXMLReader('keyboardTest3') + .parse(file.toString()) as any; return source; } diff --git a/developer/src/common/web/utils/src/xml-utils.ts b/developer/src/common/web/utils/src/xml-utils.ts new file mode 100644 index 00000000000..999da59fde3 --- /dev/null +++ b/developer/src/common/web/utils/src/xml-utils.ts @@ -0,0 +1,310 @@ +/* + * Keyman is copyright (C) SIL Global. MIT License. + * + * Created by srl on 2024-09-27 + * + * Abstraction for XML reading and writing + */ + +import { XMLParser, XMLBuilder } from 'fast-xml-parser'; + +export type KeymanXMLType = + 'keyboard3' // LDML + | 'keyboardTest3' // LDML + | 'kps' // + | 'kvks' // + | 'kpj' // + ; + +/** Bag of options, maximally one for each KeymanXMLType */ +type KeymanXMLOptionsBag = { + [key in KeymanXMLType]?: any +}; + +/** map of options for the XML parser */ +const PARSER_OPTIONS: KeymanXMLOptionsBag = { + 'keyboard3': { + ignoreAttributes: false, // We'd like attributes, please + attributeNamePrefix: '@__', // We'll use this to convert attributes to strings and subobjects to arrays, when empty. + trimValues: false, // preserve spaces, but: + htmlEntities: true, + tagValueProcessor: (tagName: string, tagValue: string /*, jPath, hasAttributes, isLeafNode*/) => { + // since trimValues: false, we need to zap any element values that would be trimmed. + // currently, the LDML spec doesn't have any element values, but this + // future-proofs us a little in that element values are allowed, just trimmed. + // if we do need elements in the future, we'd check the preserve-space attribute here. + return tagValue?.trim(); + }, + }, + 'keyboardTest3': { + ignorePiTags: true, + htmlEntities: true, + ignoreAttributes: false, // We'd like attributes, please + attributeNamePrefix: '', // avoid @_ + preserveOrder: true, // Gives us a 'special' format + }, + 'kps': { + ignorePiTags: true, + ignoreAttributes: false, + htmlEntities: true, + attributeNamePrefix: '$', // causes remapping into $: { … } objects + textNodeName: '_', + numberParseOptions: { + skipLike: /(?:)/, // parse numbers as strings + hex: null, + leadingZeros: null, + eNotation: null, + }, + }, + 'kpj': { + ignorePiTags: true, + textNodeName: '_', + htmlEntities: true, + ignoreAttributes: false, // We'd like attributes, please + attributeNamePrefix: '', // to avoid '@_' prefixes + numberParseOptions: { + skipLike: /(?:)/, // parse numbers as strings + hex: null, + leadingZeros: null, + eNotation: null, + }, + }, + 'kvks': { + ignorePiTags: true, + textNodeName: '_', + htmlEntities: true, + ignoreAttributes: false, // We'd like attributes, please + attributeNamePrefix: '$', // causes remapping into $: { … } objects + numberParseOptions: { + skipLike: /(?:)/, // parse numbers as strings + hex: null, + leadingZeros: null, + eNotation: null, + }, + trimValues: false, // preserve spaces, but: + tagValueProcessor: (tagName: string, tagValue: string, jPath: string, hasAttributes: string, isLeafNode: boolean) : string | undefined => { + if (!isLeafNode) { + return tagValue?.trim(); // trimmed value + } else { + return null; // no change to leaf nodes + } + }, + }, +}; + +const GENERATOR_OPTIONS: KeymanXMLOptionsBag = { + kvks: { + attributeNamePrefix: '$', + ignoreAttributes: false, + format: true, + textNodeName: '_', + suppressEmptyNode: true, + }, +}; + +/** wrapper for XML parsing support */ +export class KeymanXMLReader { + public constructor(public type: KeymanXMLType) { + } + + /** move `{ $abc: 4 }` into `{ $: { abc: 4 } }` */ + private static fixupDollarAttributes(data: any) : any { + if (typeof data === 'object') { + if (Array.isArray(data)) { + return data.map(v => KeymanXMLReader.fixupDollarAttributes(v)); + } + // object + const e : any = []; + const attrs : any = []; + Object.entries(data).forEach(([k, v]) => { + if (k[0] === '$') { + k = k.slice(1); + attrs.push([k, KeymanXMLReader.fixupDollarAttributes(v)]); + } else { + e.push([k, KeymanXMLReader.fixupDollarAttributes(v)]); + } + }); + if (attrs.length) { + e.push(['$', Object.fromEntries(attrs)]); + } + return Object.fromEntries(e); + } else { + return data; + } + } + + /** + * Requires attribute prefix @__ (double underscore) + * For attributes, just remove @__ and continue. + * For objects, replace any empty string "" with an empty object {} */ + private static fixupEmptyStringToEmptyObject(data: any) : any { + if (typeof data === 'object') { + // For arrays of objects, we map "" to {} + // "" means an empty object + if (Array.isArray(data)) { + return data.map(v => { + if (v === '') { + return {}; + } else { + return KeymanXMLReader.fixupEmptyStringToEmptyObject(v); + } + }); + } + // otherwise: remove @__ for attributes, remap objects + const e: any = []; + Object.entries(data).forEach(([k, v]) => { + if (k.startsWith('@__')) { + e.push([k.substring(3), KeymanXMLReader.fixupEmptyStringToEmptyObject(v)]); + } else { + if (v === '') { + e.push([k, {}]); + } else { + e.push([k, KeymanXMLReader.fixupEmptyStringToEmptyObject(v)]); + } + } + }); + return Object.fromEntries(e); + } else { + return data; + } + } + + /** + * Replace: + * ```json + * [ { "info": [], ":@": { "abc": "def" } }] + * ``` + * with: + * ```json + * [{"$": { "abc": "def" }, "#name": "info" }] + * ``` + * see https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/docs/v4/2.XMLparseOptions.md#preserveorder + * @param data input data + */ + private static fixupPreserveOrder(data: any): any { + + // we need to extract the root name specially + if (!Array.isArray(data)) { + throw Error(`Internal Error: XML parser preserveOrder did not yield an array.`); + } + if (data.length !== 1) { + // we ignore comments, so should only have one element + throw Error(`Internal Error: XML parser preserveOrder did not yield an array of size 1.`); + } + // the root element is special, we copy it into a property + const rootElement = KeymanXMLReader.fixupPreserveOrderObject(data[0]); + const rootElementName = rootElement['#name']; + const out: any = {}; + out[rootElementName] = rootElement; + return out; + } + + /** takes an 'object' with a property `:@` containing attrs, and one other property with the object name */ + private static fixupPreserveOrderObject(data: any): any { + const attrs = data[':@']; + const mainEntry : any = Object.entries(data).filter(([k,v]) => k !== ':@'); + const [elementName, subItems] = mainEntry[0]; + const out : any = {}; + if ( attrs ) { + out['$'] = attrs; + } + if (!elementName) { + throw Error(`could not find elementName in ${JSON.stringify(mainEntry[0])}`); + } + out['#name'] = elementName; + if (subItems && subItems.length) { + out['$$'] = subItems.map((subObject: any) => KeymanXMLReader.fixupPreserveOrderObject(subObject)); + // xml2js duplicated data here, including elements in their 'non-preserved-order' form. + // we don't read this data, but we're maintaining compatibility here with the read format. + // example: emit: […], keystroke:[…] + for (const o of out['$$']) { + const subElementName = o['#name']; + const nonPreservedElements = out[subElementName] = out[subElementName] ?? []; + const oWithoutName = {...o}; + delete oWithoutName['#name']; // #name is only there in the preserved-order form. + nonPreservedElements.push(oWithoutName); + } + } + return out; + } + + public parse(data: string): any { + const parser = this.parser(); + let result = parser.parse(data, true); + if (PARSER_OPTIONS[this.type].attributeNamePrefix === '$') { + result = KeymanXMLReader.fixupDollarAttributes(result); + } else if (PARSER_OPTIONS[this.type].attributeNamePrefix === '@__') { + result = KeymanXMLReader.fixupEmptyStringToEmptyObject(result); + } else if (PARSER_OPTIONS[this.type].preserveOrder) { + result = KeymanXMLReader.fixupPreserveOrder(result); + } + delete result['?xml']; + return result; + } + + public parser() { + let options = PARSER_OPTIONS[this.type]; + if (!options) { + /* c8 ignore next 1 */ + throw Error(`Internal error: unhandled XML type ${this.type}`); + } + options = Object.assign({}, options); // TODO: xml2js likes to mutate the options here. Shallow clone the object. + if (options.emptyTag) { + options.emptyTag = {}; // TODO: xml2js likes to mutate the options here. Reset it. + } + return new XMLParser(options); + } +} + +/** + * Fixed prologue for writing XML + */ +const PROLOGUE = { '?xml': { '$version': '1.0', '$encoding': 'utf-8' } }; + +/** wrapper for XML generation support */ +export class KeymanXMLWriter { + + private static fixDataForWrite(data: any) : any { + if(typeof data === 'object') { + if (Array.isArray(data)) { + // just fixup each item of the array + return data.map(d => KeymanXMLWriter.fixDataForWrite(d)); + } + // else object + const e : any = []; + Object.entries(data).forEach(([k,v]) => { + if (k === '$') { + /* convert $: { a: 1, b: 2 } to { $a: 1, $b: 2} */ + Object.entries(v).forEach(([k,v]) => { + e.push([`\$${k}`, KeymanXMLWriter.fixDataForWrite(v)]); + }); + } else { + e.push([k, KeymanXMLWriter.fixDataForWrite(v)]); + } + }); + // reconstitute with $ elements fixed + return Object.fromEntries(e); + } else { + return data; // string or something else + } + } + + write(data: any): string { + const builder = this.builder(); + data = KeymanXMLWriter.fixDataForWrite(data); + return builder.build({ ...PROLOGUE, ...data }); + } + + constructor(public type: KeymanXMLType) { + } + + public builder() { + const options = GENERATOR_OPTIONS[this.type]; + if (!options) { + /* c8 ignore next 1 */ + throw Error(`Internal error: unhandled XML type ${this.type}`); + } + return new XMLBuilder(Object.assign({}, options)); // Shallow clone in case the options are mutated. + } +} + diff --git a/developer/src/common/web/utils/test/fixtures/xml/disp_maximal.xml b/developer/src/common/web/utils/test/fixtures/xml/disp_maximal.xml new file mode 100644 index 00000000000..aeab3a71a5c --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/disp_maximal.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/disp_maximal.xml.json b/developer/src/common/web/utils/test/fixtures/xml/disp_maximal.xml.json new file mode 100644 index 00000000000..55ea878c833 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/disp_maximal.xml.json @@ -0,0 +1,35 @@ +{ + "keyboard3": { + "xmlns": "https://schemas.unicode.org/cldr/45/keyboard3", + "locale": "mt", + "conformsTo": "45", + "info": { + "name": "disp-maximal" + }, + "displays": { + "display": [ + { + "keyId": "g", + "display": "(g)" + }, + { + "output": "f", + "display": "(f)" + }, + { + "output": "${eee}", + "display": "(${eee})" + } + ], + "displayOptions": { + "baseCharacter": "x" + } + }, + "variables": { + "string": { + "id": "eee", + "value": "e" + } + } + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/fixtures/xml/error_invalid_package_file.kps b/developer/src/common/web/utils/test/fixtures/xml/error_invalid_package_file.kps new file mode 100644 index 00000000000..e18eaa26a06 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/error_invalid_package_file.kps @@ -0,0 +1,32 @@ + + + + 15.0.266.0 + 7.0 + + + SENĆOŦEN (Saanich Dialect) Keyboard + + © 2019 National Research Council Canada & this test + Eddie Antonio Santos + 1.0 + + + + basic.kmx + Keyboard Basic + 0 + .kmx + + + + + Basic + basic + 1.0 + + Khmer + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/k_020_fr-test.xml b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr-test.xml new file mode 100644 index 00000000000..22fce785389 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr-test.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/k_020_fr-test.xml.json b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr-test.xml.json new file mode 100644 index 00000000000..ab530dd0b4a --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr-test.xml.json @@ -0,0 +1,538 @@ +{ + "keyboardTest3": { + "$": { + "conformsTo": "techpreview" + }, + "#name": "keyboardTest3", + "$$": [ + { + "$": { + "keyboard": "k_020_fr.xml", + "author": "Team Keyboard", + "name": "fr-test-updated" + }, + "#name": "info" + }, + { + "$": { + "name": "simple-repertoire", + "chars": "[a b c d e \\u0022]", + "type": "simple" + }, + "#name": "repertoire" + }, + { + "$": { + "name": "chars-repertoire", + "chars": "[á é ó]", + "type": "gesture" + }, + "#name": "repertoire" + }, + { + "$": { + "name": "key-tests-updated" + }, + "#name": "tests", + "$$": [ + { + "$": { + "name": "key-test" + }, + "#name": "test", + "$$": [ + { + "$": { + "to": "abc\\u0022..." + }, + "#name": "startContext" + }, + { + "$": { + "key": "s" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...s" + }, + "#name": "check" + }, + { + "$": { + "key": "t" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...st" + }, + "#name": "check" + }, + { + "$": { + "key": "u" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...stu" + }, + "#name": "check" + }, + { + "$": { + "to": "v" + }, + "#name": "emit" + }, + { + "$": { + "result": "abc\\u0022...stuv" + }, + "#name": "check" + } + ], + "startContext": [ + { + "$": { + "to": "abc\\u0022..." + } + } + ], + "keystroke": [ + { + "$": { + "key": "s" + } + }, + { + "$": { + "key": "t" + } + }, + { + "$": { + "key": "u" + } + } + ], + "check": [ + { + "$": { + "result": "abc\\u0022...s" + } + }, + { + "$": { + "result": "abc\\u0022...st" + } + }, + { + "$": { + "result": "abc\\u0022...stu" + } + }, + { + "$": { + "result": "abc\\u0022...stuv" + } + } + ], + "emit": [ + { + "$": { + "to": "v" + } + } + ] + } + ], + "test": [ + { + "$": { + "name": "key-test" + }, + "$$": [ + { + "$": { + "to": "abc\\u0022..." + }, + "#name": "startContext" + }, + { + "$": { + "key": "s" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...s" + }, + "#name": "check" + }, + { + "$": { + "key": "t" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...st" + }, + "#name": "check" + }, + { + "$": { + "key": "u" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...stu" + }, + "#name": "check" + }, + { + "$": { + "to": "v" + }, + "#name": "emit" + }, + { + "$": { + "result": "abc\\u0022...stuv" + }, + "#name": "check" + } + ], + "startContext": [ + { + "$": { + "to": "abc\\u0022..." + } + } + ], + "keystroke": [ + { + "$": { + "key": "s" + } + }, + { + "$": { + "key": "t" + } + }, + { + "$": { + "key": "u" + } + } + ], + "check": [ + { + "$": { + "result": "abc\\u0022...s" + } + }, + { + "$": { + "result": "abc\\u0022...st" + } + }, + { + "$": { + "result": "abc\\u0022...stu" + } + }, + { + "$": { + "result": "abc\\u0022...stuv" + } + } + ], + "emit": [ + { + "$": { + "to": "v" + } + } + ] + } + ] + } + ], + "info": [ + { + "$": { + "keyboard": "k_020_fr.xml", + "author": "Team Keyboard", + "name": "fr-test-updated" + } + } + ], + "repertoire": [ + { + "$": { + "name": "simple-repertoire", + "chars": "[a b c d e \\u0022]", + "type": "simple" + } + }, + { + "$": { + "name": "chars-repertoire", + "chars": "[á é ó]", + "type": "gesture" + } + } + ], + "tests": [ + { + "$": { + "name": "key-tests-updated" + }, + "$$": [ + { + "$": { + "name": "key-test" + }, + "#name": "test", + "$$": [ + { + "$": { + "to": "abc\\u0022..." + }, + "#name": "startContext" + }, + { + "$": { + "key": "s" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...s" + }, + "#name": "check" + }, + { + "$": { + "key": "t" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...st" + }, + "#name": "check" + }, + { + "$": { + "key": "u" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...stu" + }, + "#name": "check" + }, + { + "$": { + "to": "v" + }, + "#name": "emit" + }, + { + "$": { + "result": "abc\\u0022...stuv" + }, + "#name": "check" + } + ], + "startContext": [ + { + "$": { + "to": "abc\\u0022..." + } + } + ], + "keystroke": [ + { + "$": { + "key": "s" + } + }, + { + "$": { + "key": "t" + } + }, + { + "$": { + "key": "u" + } + } + ], + "check": [ + { + "$": { + "result": "abc\\u0022...s" + } + }, + { + "$": { + "result": "abc\\u0022...st" + } + }, + { + "$": { + "result": "abc\\u0022...stu" + } + }, + { + "$": { + "result": "abc\\u0022...stuv" + } + } + ], + "emit": [ + { + "$": { + "to": "v" + } + } + ] + } + ], + "test": [ + { + "$": { + "name": "key-test" + }, + "$$": [ + { + "$": { + "to": "abc\\u0022..." + }, + "#name": "startContext" + }, + { + "$": { + "key": "s" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...s" + }, + "#name": "check" + }, + { + "$": { + "key": "t" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...st" + }, + "#name": "check" + }, + { + "$": { + "key": "u" + }, + "#name": "keystroke" + }, + { + "$": { + "result": "abc\\u0022...stu" + }, + "#name": "check" + }, + { + "$": { + "to": "v" + }, + "#name": "emit" + }, + { + "$": { + "result": "abc\\u0022...stuv" + }, + "#name": "check" + } + ], + "startContext": [ + { + "$": { + "to": "abc\\u0022..." + } + } + ], + "keystroke": [ + { + "$": { + "key": "s" + } + }, + { + "$": { + "key": "t" + } + }, + { + "$": { + "key": "u" + } + } + ], + "check": [ + { + "$": { + "result": "abc\\u0022...s" + } + }, + { + "$": { + "result": "abc\\u0022...st" + } + }, + { + "$": { + "result": "abc\\u0022...stu" + } + }, + { + "$": { + "result": "abc\\u0022...stuv" + } + } + ], + "emit": [ + { + "$": { + "to": "v" + } + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/fixtures/xml/k_020_fr.xml b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr.xml new file mode 100644 index 00000000000..671f1b8b9b6 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr.xml @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/k_020_fr.xml.json b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr.xml.json new file mode 100644 index 00000000000..1e23ec4bdbd --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/k_020_fr.xml.json @@ -0,0 +1,509 @@ +{ + "keyboard3": { + "xmlns": "https://schemas.unicode.org/cldr/45/keyboard3", + "locale": "fr-t-k0-azerty", + "conformsTo": "45", + "locales": { + "locale": { + "id": "br" + } + }, + "version": { + "number": "1.0.1" + }, + "info": { + "author": "Team Keyboard", + "layout": "AZERTY", + "indicator": "FR", + "name": "French Test Updated" + }, + "displays": { + "display": { + "output": "\\u{0300}", + "display": "\\u{02CB}" + }, + "displayOptions": { + "baseCharacter": "x" + } + }, + "keys": { + "import": [ + { + "base": "cldr", + "path": "45/keys-Zyyy-punctuation.xml" + }, + { + "base": "cldr", + "path": "45/keys-Zyyy-currency.xml" + } + ], + "key": [ + { + "id": "shift", + "layerId": "shift" + }, + { + "id": "numeric", + "layerId": "numeric" + }, + { + "id": "symbol", + "layerId": "symbol" + }, + { + "id": "base", + "layerId": "base" + }, + { + "id": "bksp", + "gap": "true" + }, + { + "id": "extra", + "gap": "true" + }, + { + "id": "enter", + "output": "\\u{000A}" + }, + { + "id": "u-grave", + "output": "ü" + }, + { + "id": "e-grave", + "output": "é" + }, + { + "id": "e-acute", + "output": "è" + }, + { + "id": "c-cedilla", + "output": "ç" + }, + { + "id": "a-grave", + "output": "à" + }, + { + "id": "a-acute", + "output": "á" + }, + { + "id": "a-caret", + "output": "â" + }, + { + "id": "a-umlaut", + "output": "ä" + }, + { + "id": "a-tilde", + "output": "ã" + }, + { + "id": "a-ring", + "output": "å" + }, + { + "id": "a-caron", + "output": "ā" + }, + { + "id": "A-grave", + "output": "À" + }, + { + "id": "A-acute", + "output": "Á" + }, + { + "id": "A-caret", + "output": "Â" + }, + { + "id": "A-umlaut", + "output": "Ä" + }, + { + "id": "A-tilde", + "output": "Ã" + }, + { + "id": "A-ring", + "output": "Å" + }, + { + "id": "A-caron", + "output": "Ā" + }, + { + "id": "bullet", + "output": "•" + }, + { + "id": "umlaut", + "output": "¨" + }, + { + "id": "sub-2", + "output": "₂" + }, + { + "id": "super-2", + "output": "²", + "longPressKeyIds": "sub-2" + }, + { + "id": "a", + "flickId": "a", + "output": "a", + "longPressKeyIds": "a-grave a-caret a-acute a-umlaut a-tilde a-ring a-caron", + "longPressDefaultKeyId": "a-caret" + }, + { + "id": "A", + "flickId": "b", + "output": "A", + "longPressKeyIds": "A-grave A-caret A-acute A-umlaut a-tilde A-ring A-caron", + "longPressDefaultKeyId": "A-caret" + } + ] + }, + "flicks": { + "flick": [ + { + "id": "b", + "flickSegment": [ + { + "directions": "nw", + "keyId": "A-grave" + }, + { + "directions": "nw se", + "keyId": "A-acute" + }, + { + "directions": "e", + "keyId": "A-caron" + }, + { + "directions": "s", + "keyId": "numeric" + } + ] + }, + { + "id": "a", + "flickSegment": [ + { + "directions": "nw", + "keyId": "a-grave" + }, + { + "directions": "nw se", + "keyId": "a-acute" + }, + { + "directions": "e", + "keyId": "a-caron" + } + ] + } + ] + }, + "layers": [ + { + "formId": "iso", + "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" + }, + { + "keys": "a z e r t y u i o p caret dollar" + }, + { + "keys": "q s d f g h j k l m u-grave asterisk" + }, + { + "keys": "open-angle w x c v b n comma semi-colon colon bang" + }, + { + "keys": "space" + } + ] + }, + { + "modifiers": "shift", + "row": [ + { + "keys": "1 2 3 4 5 6 7 8 9 0 degree plus" + }, + { + "keys": "A Z E R T Y U I O P umlaut pound" + }, + { + "keys": "Q S D F G H J K L M percent micro" + }, + { + "keys": "close-angle W X C V B N question period slash section" + }, + { + "keys": "space" + } + ] + } + ] + }, + { + "formId": "touch", + "minDeviceWidth": "150", + "layer": [ + { + "id": "base", + "row": [ + { + "keys": "a z e r t y u i o p" + }, + { + "keys": "q s d f g h j k l m" + }, + { + "keys": "shift gap w x c v b n gap" + }, + { + "keys": "numeric extra space enter" + } + ] + }, + { + "id": "shift", + "row": [ + { + "keys": "A Z E R T Y U I O P" + }, + { + "keys": "Q S D F G H J K L M" + }, + { + "keys": "base W X C V B N" + }, + { + "keys": "numeric extra space enter" + } + ] + }, + { + "id": "numeric", + "row": [ + { + "keys": "1 2 3 4 5 6 7 8 9 0" + }, + { + "keys": "hyphen slash colon semi-colon open-paren close-paren dollar amp at double-quote" + }, + { + "keys": "symbol period comma question bang double-quote" + }, + { + "keys": "base extra space enter" + } + ] + }, + { + "id": "symbol", + "row": [ + { + "keys": "open-square close-square open-curly close-curly hash percent caret asterisk plus equal" + }, + { + "keys": "underscore backslash pipe tilde open-angle close-angle euro pound yen bullet" + }, + { + "keys": "numeric period comma question bang double-quote" + }, + { + "keys": "base extra space enter" + } + ] + } + ] + } + ], + "transforms": { + "type": "simple", + "transformGroup": { + "transform": [ + { + "from": "` ", + "to": "`" + }, + { + "from": "`a", + "to": "à" + }, + { + "from": "`A", + "to": "À" + }, + { + "from": "`e", + "to": "è" + }, + { + "from": "`E", + "to": "È" + }, + { + "from": "`i", + "to": "ì" + }, + { + "from": "`I", + "to": "Ì" + }, + { + "from": "`o", + "to": "ò" + }, + { + "from": "`O", + "to": "Ò" + }, + { + "from": "`u", + "to": "ù" + }, + { + "from": "`U", + "to": "Ù" + }, + { + "from": "^ ", + "to": "^" + }, + { + "from": "^a", + "to": "â" + }, + { + "from": "^A", + "to": " " + }, + { + "from": "^e", + "to": "ê" + }, + { + "from": "^E", + "to": "Ê" + }, + { + "from": "^i", + "to": "î" + }, + { + "from": "^I", + "to": "Î" + }, + { + "from": "^o", + "to": "ô" + }, + { + "from": "^O", + "to": "Ô" + }, + { + "from": "^u", + "to": "û" + }, + { + "from": "^U", + "to": "Û" + }, + { + "from": "¨ ", + "to": "¨" + }, + { + "from": "¨a", + "to": "ä" + }, + { + "from": "¨A", + "to": "Ä" + }, + { + "from": "¨e", + "to": "ë" + }, + { + "from": "¨E", + "to": "Ë" + }, + { + "from": "¨i", + "to": "ï" + }, + { + "from": "¨I", + "to": "Ï" + }, + { + "from": "¨o", + "to": "ö" + }, + { + "from": "¨O", + "to": "Ö" + }, + { + "from": "¨u", + "to": "ü" + }, + { + "from": "¨U", + "to": "Ü" + }, + { + "from": "¨y", + "to": "ÿ" + }, + { + "from": "~ ", + "to": "~" + }, + { + "from": "~a", + "to": "ã" + }, + { + "from": "~A", + "to": "Ã" + }, + { + "from": "~n", + "to": "ñ" + }, + { + "from": "~N", + "to": "Ñ" + }, + { + "from": "~o", + "to": "õ" + }, + { + "from": "~O", + "to": "Õ" + } + ] + } + } + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kpj b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kpj new file mode 100644 index 00000000000..4b239df20ce --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kpj @@ -0,0 +1,187 @@ + + + + $PROJECTPATH\build + True + True + False + keyboard + + + + id_f347675c33d2e6b1c705c787fad4941a + khmer_angkor.kmn + source\khmer_angkor.kmn + 1.3 + .kmn +
+ Khmer Angkor + © 2015-2022 SIL International + More than just a Khmer Unicode keyboard. +
+ + + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + khmer_angkor.kps + source\khmer_angkor.kps + + .kps +
+ Khmer Angkor + © 2015-2022 SIL International +
+ + + id_8a1efc7c4ab7cfece8aedd847679ca27 + khmer_angkor.ico + source\khmer_angkor.ico + + .ico + id_f347675c33d2e6b1c705c787fad4941a + + + id_8dc195db32d1fd0514de0ad51fff5df0 + khmer_angkor.js + source\..\build\khmer_angkor.js + + .js + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_10596632fcbf4138d24bcccf53e6ae01 + khmer_angkor.kvk + source\..\build\khmer_angkor.kvk + + .kvk + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_0a851f95ce553ecd62cbee6c32ced68f + khmer_angkor.kmx + source\..\build\khmer_angkor.kmx + + .kmx + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_d8b6eb05f4b7e2945c10e04c1f49e4c8 + keyboard_layout.png + source\welcome\keyboard_layout.png + + .png + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_724e5b4c63f10bc0abf7077f7c3172fc + welcome.htm + source\welcome\welcome.htm + + .htm + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_35857cb2b54f123612735ec948400082 + FONTLOG.txt + source\..\..\..\shared\fonts\khmer\mondulkiri\FONTLOG.txt + + .txt + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_7e3afe5bb59b888b08b48cd5817d8de4 + Mondulkiri-B.ttf + source\..\..\..\shared\fonts\khmer\mondulkiri\Mondulkiri-B.ttf + + .ttf + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_b9734e80f86c69ea5ae4dfa9f0083d09 + Mondulkiri-BI.ttf + source\..\..\..\shared\fonts\khmer\mondulkiri\Mondulkiri-BI.ttf + + .ttf + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_25abe4d2b0abc03a5be5b666a8de776e + Mondulkiri-I.ttf + source\..\..\..\shared\fonts\khmer\mondulkiri\Mondulkiri-I.ttf + + .ttf + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_b766568498108eee46ed1601ff69c47d + Mondulkiri-R.ttf + source\..\..\..\shared\fonts\khmer\mondulkiri\Mondulkiri-R.ttf + + .ttf + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_84544d04133cab3dbfc86b91ad1a4e17 + OFL.txt + source\..\..\..\shared\fonts\khmer\mondulkiri\OFL.txt + + .txt + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_0c33fbefd1c20f487b1bea2343b3bb2c + OFL-FAQ.txt + source\..\..\..\shared\fonts\khmer\mondulkiri\OFL-FAQ.txt + + .txt + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_a59d89fca36a310147645fa2604e521b + KAK_Documentation_EN.pdf + source\welcome\KAK_Documentation_EN.pdf + + .pdf + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_5643c4cd3933b3ada0b4af6579305ec4 + KAK_Documentation_KH.pdf + source\welcome\KAK_Documentation_KH.pdf + + .pdf + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_8da344c4cea6f467013357fe099006f5 + readme.htm + source\readme.htm + + .htm + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_acb0dd94c60e345d999670e999cbd159 + image002.png + source\welcome\image002.png + + .png + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_4edf70bc019f05b5ad39a2ea727ad547 + khmer_busra_kbd.ttf + source\..\..\..\shared\fonts\khmer\busrakbd\khmer_busra_kbd.ttf + + .ttf + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + id_bc823844e4399751e1867016801f7327 + splash.gif + source\splash.gif + + .gif + id_8d4eb765f80c9f2b0f769cf4e4aaa456 + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kpj.json b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kpj.json new file mode 100644 index 00000000000..8f2310f821c --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kpj.json @@ -0,0 +1,190 @@ +{ + "KeymanDeveloperProject": { + "Options": { + "BuildPath": "$PROJECTPATH\\build", + "CompilerWarningsAsErrors": "True", + "WarnDeprecatedCode": "True", + "CheckFilenameConventions": "False", + "ProjectType": "keyboard" + }, + "Files": { + "File": [ + { + "ID": "id_f347675c33d2e6b1c705c787fad4941a", + "Filename": "khmer_angkor.kmn", + "Filepath": "source\\khmer_angkor.kmn", + "FileVersion": "1.3", + "FileType": ".kmn", + "Details": { + "Name": "Khmer Angkor", + "Copyright": "© 2015-2022 SIL International", + "Message": "More than just a Khmer Unicode keyboard." + } + }, + { + "ID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456", + "Filename": "khmer_angkor.kps", + "Filepath": "source\\khmer_angkor.kps", + "FileVersion": "", + "FileType": ".kps", + "Details": { + "Name": "Khmer Angkor", + "Copyright": "© 2015-2022 SIL International" + } + }, + { + "ID": "id_8a1efc7c4ab7cfece8aedd847679ca27", + "Filename": "khmer_angkor.ico", + "Filepath": "source\\khmer_angkor.ico", + "FileVersion": "", + "FileType": ".ico", + "ParentFileID": "id_f347675c33d2e6b1c705c787fad4941a" + }, + { + "ID": "id_8dc195db32d1fd0514de0ad51fff5df0", + "Filename": "khmer_angkor.js", + "Filepath": "source\\..\\build\\khmer_angkor.js", + "FileVersion": "", + "FileType": ".js", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_10596632fcbf4138d24bcccf53e6ae01", + "Filename": "khmer_angkor.kvk", + "Filepath": "source\\..\\build\\khmer_angkor.kvk", + "FileVersion": "", + "FileType": ".kvk", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_0a851f95ce553ecd62cbee6c32ced68f", + "Filename": "khmer_angkor.kmx", + "Filepath": "source\\..\\build\\khmer_angkor.kmx", + "FileVersion": "", + "FileType": ".kmx", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_d8b6eb05f4b7e2945c10e04c1f49e4c8", + "Filename": "keyboard_layout.png", + "Filepath": "source\\welcome\\keyboard_layout.png", + "FileVersion": "", + "FileType": ".png", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_724e5b4c63f10bc0abf7077f7c3172fc", + "Filename": "welcome.htm", + "Filepath": "source\\welcome\\welcome.htm", + "FileVersion": "", + "FileType": ".htm", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_35857cb2b54f123612735ec948400082", + "Filename": "FONTLOG.txt", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\mondulkiri\\FONTLOG.txt", + "FileVersion": "", + "FileType": ".txt", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_7e3afe5bb59b888b08b48cd5817d8de4", + "Filename": "Mondulkiri-B.ttf", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\mondulkiri\\Mondulkiri-B.ttf", + "FileVersion": "", + "FileType": ".ttf", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_b9734e80f86c69ea5ae4dfa9f0083d09", + "Filename": "Mondulkiri-BI.ttf", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\mondulkiri\\Mondulkiri-BI.ttf", + "FileVersion": "", + "FileType": ".ttf", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_25abe4d2b0abc03a5be5b666a8de776e", + "Filename": "Mondulkiri-I.ttf", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\mondulkiri\\Mondulkiri-I.ttf", + "FileVersion": "", + "FileType": ".ttf", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_b766568498108eee46ed1601ff69c47d", + "Filename": "Mondulkiri-R.ttf", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\mondulkiri\\Mondulkiri-R.ttf", + "FileVersion": "", + "FileType": ".ttf", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_84544d04133cab3dbfc86b91ad1a4e17", + "Filename": "OFL.txt", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\mondulkiri\\OFL.txt", + "FileVersion": "", + "FileType": ".txt", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_0c33fbefd1c20f487b1bea2343b3bb2c", + "Filename": "OFL-FAQ.txt", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\mondulkiri\\OFL-FAQ.txt", + "FileVersion": "", + "FileType": ".txt", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_a59d89fca36a310147645fa2604e521b", + "Filename": "KAK_Documentation_EN.pdf", + "Filepath": "source\\welcome\\KAK_Documentation_EN.pdf", + "FileVersion": "", + "FileType": ".pdf", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_5643c4cd3933b3ada0b4af6579305ec4", + "Filename": "KAK_Documentation_KH.pdf", + "Filepath": "source\\welcome\\KAK_Documentation_KH.pdf", + "FileVersion": "", + "FileType": ".pdf", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_8da344c4cea6f467013357fe099006f5", + "Filename": "readme.htm", + "Filepath": "source\\readme.htm", + "FileVersion": "", + "FileType": ".htm", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_acb0dd94c60e345d999670e999cbd159", + "Filename": "image002.png", + "Filepath": "source\\welcome\\image002.png", + "FileVersion": "", + "FileType": ".png", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_4edf70bc019f05b5ad39a2ea727ad547", + "Filename": "khmer_busra_kbd.ttf", + "Filepath": "source\\..\\..\\..\\shared\\fonts\\khmer\\busrakbd\\khmer_busra_kbd.ttf", + "FileVersion": "", + "FileType": ".ttf", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + }, + { + "ID": "id_bc823844e4399751e1867016801f7327", + "Filename": "splash.gif", + "Filepath": "source\\splash.gif", + "FileVersion": "", + "FileType": ".gif", + "ParentFileID": "id_8d4eb765f80c9f2b0f769cf4e4aaa456" + } + ] + } + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kvks b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kvks new file mode 100644 index 00000000000..e9c38a464dd --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kvks @@ -0,0 +1,206 @@ + + +
+ 10.0 + khmer_angkor + + + +
+ + + ឞ + ឝ + ៈ + ឳ + ឨ + ឩ + ឰ + ឫ + ឦ + ឱ + ឯ + + + ៜ + + ៖ + ៙ + ៚ + + ៘ + ‌ + ‍ + ] + [ + / + . + ‘ + + + & + ’ + * + @ + \ + } + { + - + ÷ + : + , + ≈ + ; + < + # + > + × + $ + € +   + + + ៸ + ៰ + ៱ + ៲ + ៳ + ៴ + ៵ + ៶ + ៷ + ៹ + ᧿ + ᧾ + ᧪ + ᧫ + ᧶ + ᧵ + ᧬ + ᧷ + ᧥ + ᧸ + ᧡ + ᧻ + ᧹ + ᧮ + ᧢ + ᧯ + ᧰ + ᧦ + ᧱ + ᧤ + ᧭ + ᧣ + ᧧ + ᧠ + ᧺ + ᧲ + ᧳ + ᧴ + ᧩ + ᧨ + ᧼ + ᧽ + + + ​ + + + ឥ + ។ + + ០ + ១ + ២ + ៣ + ៤ + ៥ + ៦ + ៧ + ៨ + ៩ + + ឲ + + ឮ + ឪ + « + + ប + ច + ដ + + ថ + ង + ហ + + + ក + ល + ម + ន + + ផ + ឆ + រ + ស + ត + + វ + + ខ + យ + ឋ + + + + ! + + " + ៛ + % + + ( + ) + + = + + ៕ + ? + ៗ + + ព + ជ + ឌ + + ធ + អ + ះ + + ញ + គ + ឡ + + ណ + + ភ + ឈ + ឬ + + ទ + + + + ឃ + + ឍ + + + + ឭ + ឧ + » + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kvks.json b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kvks.json new file mode 100644 index 00000000000..a20c8b67518 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor.kvks.json @@ -0,0 +1,1171 @@ +{ + "visualkeyboard": { + + "header": { + + "version": "10.0", + "kbdname": "khmer_angkor", + "flags": { + + "usealtgr": "" + } + }, + "encoding": { + + "$": { + "name": "unicode", + "fontname": "Khmer Busra Kbd", + "fontsize": "16" + }, + "layer": [ + { + + "$": { + "shift": "RA" + }, + "key": [ + { + "_": "ឞ", + "$": { + "vkey": "K_B" + } + }, + { + "_": "ឝ", + "$": { + "vkey": "K_K" + } + }, + { + "_": "ៈ", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "ឳ", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "ឨ", + "$": { + "vkey": "K_T" + } + }, + { + "_": "ឩ", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "ឰ", + "$": { + "vkey": "K_P" + } + }, + { + "_": "ឫ", + "$": { + "vkey": "K_R" + } + }, + { + "_": "ឦ", + "$": { + "vkey": "K_I" + } + }, + { + "_": "ឱ", + "$": { + "vkey": "K_O" + } + }, + { + "_": "ឯ", + "$": { + "vkey": "K_E" + } + }, + { + "_": "", + "$": { + "vkey": "K_3" + } + }, + { + "_": "", + "$": { + "vkey": "K_W" + } + }, + { + "_": "ៜ", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "", + "$": { + "vkey": "K_EQUAL" + } + }, + { + "_": "៖", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "៙", + "$": { + "vkey": "K_6" + } + }, + { + "_": "៚", + "$": { + "vkey": "K_7" + } + }, + { + "_": "", + "$": { + "vkey": "K_M" + } + }, + { + "_": "៘", + "$": { + "vkey": "K_L" + } + }, + { + "_": "‌", + "$": { + "vkey": "K_1" + } + }, + { + "_": "‍", + "$": { + "vkey": "K_BKQUOTE" + } + }, + { + "_": "]", + "$": { + "vkey": "K_U" + } + }, + { + "_": "[", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "/", + "$": { + "vkey": "K_SLASH" + } + }, + { + "_": ".", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "‘", + "$": { + "vkey": "K_H" + } + }, + { + "_": "+", + "$": { + "vkey": "K_A" + } + }, + { + "_": "&", + "$": { + "vkey": "K_V" + } + }, + { + "_": "’", + "$": { + "vkey": "K_J" + } + }, + { + "_": "*", + "$": { + "vkey": "K_8" + } + }, + { + "_": "@", + "$": { + "vkey": "K_2" + } + }, + { + "_": "\\", + "$": { + "vkey": "K_BKSLASH" + } + }, + { + "_": "}", + "$": { + "vkey": "K_0" + } + }, + { + "_": "{", + "$": { + "vkey": "K_9" + } + }, + { + "_": "-", + "$": { + "vkey": "K_S" + } + }, + { + "_": "÷", + "$": { + "vkey": "K_F" + } + }, + { + "_": ":", + "$": { + "vkey": "K_G" + } + }, + { + "_": ",", + "$": { + "vkey": "K_COMMA" + } + }, + { + "_": "≈", + "$": { + "vkey": "K_HYPHEN" + } + }, + { + "_": ";", + "$": { + "vkey": "K_N" + } + }, + { + "_": "<", + "$": { + "vkey": "K_Z" + } + }, + { + "_": "#", + "$": { + "vkey": "K_C" + } + }, + { + "_": ">", + "$": { + "vkey": "K_X" + } + }, + { + "_": "×", + "$": { + "vkey": "K_D" + } + }, + { + "_": "$", + "$": { + "vkey": "K_4" + } + }, + { + "_": "€", + "$": { + "vkey": "K_5" + } + }, + { + "_": " ", + "$": { + "vkey": "K_SPACE" + } + } + ] + }, + { + + "$": { + "shift": "SRA" + }, + "key": [ + { + "_": "៸", + "$": { + "vkey": "K_8" + } + }, + { + "_": "៰", + "$": { + "vkey": "K_0" + } + }, + { + "_": "៱", + "$": { + "vkey": "K_1" + } + }, + { + "_": "៲", + "$": { + "vkey": "K_2" + } + }, + { + "_": "៳", + "$": { + "vkey": "K_3" + } + }, + { + "_": "៴", + "$": { + "vkey": "K_4" + } + }, + { + "_": "៵", + "$": { + "vkey": "K_5" + } + }, + { + "_": "៶", + "$": { + "vkey": "K_6" + } + }, + { + "_": "៷", + "$": { + "vkey": "K_7" + } + }, + { + "_": "៹", + "$": { + "vkey": "K_9" + } + }, + { + "_": "᧿", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "᧾", + "$": { + "vkey": "K_COMMA" + } + }, + { + "_": "᧪", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "᧫", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "᧶", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "᧵", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "᧬", + "$": { + "vkey": "K_A" + } + }, + { + "_": "᧷", + "$": { + "vkey": "K_Z" + } + }, + { + "_": "᧥", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "᧸", + "$": { + "vkey": "K_X" + } + }, + { + "_": "᧡", + "$": { + "vkey": "K_W" + } + }, + { + "_": "᧻", + "$": { + "vkey": "K_B" + } + }, + { + "_": "᧹", + "$": { + "vkey": "K_C" + } + }, + { + "_": "᧮", + "$": { + "vkey": "K_D" + } + }, + { + "_": "᧢", + "$": { + "vkey": "K_E" + } + }, + { + "_": "᧯", + "$": { + "vkey": "K_F" + } + }, + { + "_": "᧰", + "$": { + "vkey": "K_G" + } + }, + { + "_": "᧦", + "$": { + "vkey": "K_U" + } + }, + { + "_": "᧱", + "$": { + "vkey": "K_H" + } + }, + { + "_": "᧤", + "$": { + "vkey": "K_T" + } + }, + { + "_": "᧭", + "$": { + "vkey": "K_S" + } + }, + { + "_": "᧣", + "$": { + "vkey": "K_R" + } + }, + { + "_": "᧧", + "$": { + "vkey": "K_I" + } + }, + { + "_": "᧠", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "᧺", + "$": { + "vkey": "K_V" + } + }, + { + "_": "᧲", + "$": { + "vkey": "K_J" + } + }, + { + "_": "᧳", + "$": { + "vkey": "K_K" + } + }, + { + "_": "᧴", + "$": { + "vkey": "K_L" + } + }, + { + "_": "᧩", + "$": { + "vkey": "K_P" + } + }, + { + "_": "᧨", + "$": { + "vkey": "K_O" + } + }, + { + "_": "᧼", + "$": { + "vkey": "K_N" + } + }, + { + "_": "᧽", + "$": { + "vkey": "K_M" + } + } + ] + }, + { + + "$": { + "shift": "" + }, + "key": [ + { + "_": "​", + "$": { + "vkey": "K_SPACE" + } + }, + { + "_": "", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "", + "$": { + "vkey": "K_COMMA" + } + }, + { + "_": "ឥ", + "$": { + "vkey": "K_HYPHEN" + } + }, + { + "_": "។", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "", + "$": { + "vkey": "K_SLASH" + } + }, + { + "_": "០", + "$": { + "vkey": "K_0" + } + }, + { + "_": "១", + "$": { + "vkey": "K_1" + } + }, + { + "_": "២", + "$": { + "vkey": "K_2" + } + }, + { + "_": "៣", + "$": { + "vkey": "K_3" + } + }, + { + "_": "៤", + "$": { + "vkey": "K_4" + } + }, + { + "_": "៥", + "$": { + "vkey": "K_5" + } + }, + { + "_": "៦", + "$": { + "vkey": "K_6" + } + }, + { + "_": "៧", + "$": { + "vkey": "K_7" + } + }, + { + "_": "៨", + "$": { + "vkey": "K_8" + } + }, + { + "_": "៩", + "$": { + "vkey": "K_9" + } + }, + { + "_": "", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "ឲ", + "$": { + "vkey": "K_EQUAL" + } + }, + { + "_": "", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "ឮ", + "$": { + "vkey": "K_BKSLASH" + } + }, + { + "_": "ឪ", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "«", + "$": { + "vkey": "K_BKQUOTE" + } + }, + { + "_": "", + "$": { + "vkey": "K_A" + } + }, + { + "_": "ប", + "$": { + "vkey": "K_B" + } + }, + { + "_": "ច", + "$": { + "vkey": "K_C" + } + }, + { + "_": "ដ", + "$": { + "vkey": "K_D" + } + }, + { + "_": "", + "$": { + "vkey": "K_E" + } + }, + { + "_": "ថ", + "$": { + "vkey": "K_F" + } + }, + { + "_": "ង", + "$": { + "vkey": "K_G" + } + }, + { + "_": "ហ", + "$": { + "vkey": "K_H" + } + }, + { + "_": "", + "$": { + "vkey": "K_I" + } + }, + { + "_": "", + "$": { + "vkey": "K_J" + } + }, + { + "_": "ក", + "$": { + "vkey": "K_K" + } + }, + { + "_": "ល", + "$": { + "vkey": "K_L" + } + }, + { + "_": "ម", + "$": { + "vkey": "K_M" + } + }, + { + "_": "ន", + "$": { + "vkey": "K_N" + } + }, + { + "_": "", + "$": { + "vkey": "K_O" + } + }, + { + "_": "ផ", + "$": { + "vkey": "K_P" + } + }, + { + "_": "ឆ", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "រ", + "$": { + "vkey": "K_R" + } + }, + { + "_": "ស", + "$": { + "vkey": "K_S" + } + }, + { + "_": "ត", + "$": { + "vkey": "K_T" + } + }, + { + "_": "", + "$": { + "vkey": "K_U" + } + }, + { + "_": "វ", + "$": { + "vkey": "K_V" + } + }, + { + "_": "", + "$": { + "vkey": "K_W" + } + }, + { + "_": "ខ", + "$": { + "vkey": "K_X" + } + }, + { + "_": "យ", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "ឋ", + "$": { + "vkey": "K_Z" + } + } + ] + }, + { + + "$": { + "shift": "S" + }, + "key": [ + { + "$": { + "vkey": "K_SPACE" + } + }, + { + "_": "!", + "$": { + "vkey": "K_1" + } + }, + { + "_": "", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "\"", + "$": { + "vkey": "K_3" + } + }, + { + "_": "៛", + "$": { + "vkey": "K_4" + } + }, + { + "_": "%", + "$": { + "vkey": "K_5" + } + }, + { + "_": "", + "$": { + "vkey": "K_7" + } + }, + { + "_": "(", + "$": { + "vkey": "K_9" + } + }, + { + "_": ")", + "$": { + "vkey": "K_0" + } + }, + { + "_": "", + "$": { + "vkey": "K_8" + } + }, + { + "_": "=", + "$": { + "vkey": "K_EQUAL" + } + }, + { + "_": "", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "៕", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "?", + "$": { + "vkey": "K_SLASH" + } + }, + { + "_": "ៗ", + "$": { + "vkey": "K_2" + } + }, + { + "_": "", + "$": { + "vkey": "K_A" + } + }, + { + "_": "ព", + "$": { + "vkey": "K_B" + } + }, + { + "_": "ជ", + "$": { + "vkey": "K_C" + } + }, + { + "_": "ឌ", + "$": { + "vkey": "K_D" + } + }, + { + "_": "", + "$": { + "vkey": "K_E" + } + }, + { + "_": "ធ", + "$": { + "vkey": "K_F" + } + }, + { + "_": "អ", + "$": { + "vkey": "K_G" + } + }, + { + "_": "ះ", + "$": { + "vkey": "K_H" + } + }, + { + "_": "", + "$": { + "vkey": "K_I" + } + }, + { + "_": "ញ", + "$": { + "vkey": "K_J" + } + }, + { + "_": "គ", + "$": { + "vkey": "K_K" + } + }, + { + "_": "ឡ", + "$": { + "vkey": "K_L" + } + }, + { + "_": "", + "$": { + "vkey": "K_M" + } + }, + { + "_": "ណ", + "$": { + "vkey": "K_N" + } + }, + { + "_": "", + "$": { + "vkey": "K_O" + } + }, + { + "_": "ភ", + "$": { + "vkey": "K_P" + } + }, + { + "_": "ឈ", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "ឬ", + "$": { + "vkey": "K_R" + } + }, + { + "_": "", + "$": { + "vkey": "K_S" + } + }, + { + "_": "ទ", + "$": { + "vkey": "K_T" + } + }, + { + "_": "", + "$": { + "vkey": "K_U" + } + }, + { + "_": "", + "$": { + "vkey": "K_V" + } + }, + { + "_": "", + "$": { + "vkey": "K_W" + } + }, + { + "_": "ឃ", + "$": { + "vkey": "K_X" + } + }, + { + "_": "", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "ឍ", + "$": { + "vkey": "K_Z" + } + }, + { + "_": "", + "$": { + "vkey": "K_6" + } + }, + { + "_": "", + "$": { + "vkey": "K_HYPHEN" + } + }, + { + "_": "", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "ឭ", + "$": { + "vkey": "K_BKSLASH" + } + }, + { + "_": "ឧ", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "»", + "$": { + "vkey": "K_BKQUOTE" + } + }, + { + "_": "", + "$": { + "vkey": "K_COMMA" + } + } + ] + } + ] + } + } +} diff --git a/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor2.kvks b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor2.kvks new file mode 100644 index 00000000000..945477d3fee --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor2.kvks @@ -0,0 +1,206 @@ + + +
+ 10.0 + khmer_angkor + + + +
+ + + ឞ + ឝ + ៈ + ឳ + ឨ + ឩ + ឰ + ឫ + ឦ + ឱ + ឯ + + + ៜ + + ៖ + ៙ + ៚ + + ៘ + ‌ + ‍ + ] + [ + / + . + ‘ + + + & + ’ + * + @ + \ + } + { + - + ÷ + : + , + ≈ + ; + < + # + > + × + $ + € +   + + + ៸ + ៰ + ៱ + ៲ + ៳ + ៴ + ៵ + ៶ + ៷ + ៹ + ᧿ + ᧾ + ᧪ + ᧫ + ᧶ + ᧵ + ᧬ + ᧷ + ᧥ + ᧸ + ᧡ + ᧻ + ᧹ + ᧮ + ᧢ + ᧯ + ᧰ + ᧦ + ᧱ + ᧤ + ᧭ + ᧣ + ᧧ + ᧠ + ᧺ + ᧲ + ᧳ + ᧴ + ᧩ + ᧨ + ᧼ + ᧽ + + + ​ + + + ឥ + ។ + + ០ + ១ + ២ + ៣ + ៤ + ៥ + ៦ + ៧ + ៨ + ៩ + + ឲ + + ឮ + ឪ + « + + ប + ច + ដ + + ថ + ង + ហ + + + ក + ល + ម + ន + + ផ + ឆ + រ + ស + ត + + វ + + ខ + យ + ឋ + + + + ! + + " + ៛ + % + + ( + ) + + = + + ៕ + ? + ៗ + + ព + ជ + ឌ + + ធ + អ + ះ + + ញ + គ + ឡ + + ណ + + ភ + ឈ + ឬ + + ទ + + + + ឃ + + ឍ + + + + ឭ + ឧ + » + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor2.kvks.json b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor2.kvks.json new file mode 100644 index 00000000000..beabd9e6737 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/khmer_angkor2.kvks.json @@ -0,0 +1,1172 @@ +{ + "visualkeyboard": { + + "header": { + + "version": "10.0", + "kbdname": "khmer_angkor", + "flags": { + + "usealtgr": "" + } + }, + "encoding": { + + "$": { + "name": "unicode", + "fontname": "Khmer Busra Kbd", + "fontsize": "16" + }, + "layer": [ + { + + "$": { + "shift": "RA" + }, + "key": [ + { + "_": "ឞ", + "$": { + "vkey": "K_B" + } + }, + { + "_": "ឝ", + "$": { + "vkey": "K_K" + } + }, + { + "_": "ៈ", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "ឳ", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "ឨ", + "$": { + "vkey": "K_T" + } + }, + { + "_": "ឩ", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "ឰ", + "$": { + "vkey": "K_P" + } + }, + { + "_": "ឫ", + "$": { + "vkey": "K_R" + } + }, + { + "_": "ឦ", + "$": { + "vkey": "K_I" + } + }, + { + "_": "ឱ", + "$": { + "vkey": "K_O" + } + }, + { + "_": "ឯ", + "$": { + "vkey": "K_E" + } + }, + { + "_": "", + "$": { + "vkey": "K_3" + } + }, + { + "_": "", + "$": { + "vkey": "K_W" + } + }, + { + "_": "ៜ", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "", + "$": { + "vkey": "K_EQUAL" + } + }, + { + "_": "៖", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "៙", + "$": { + "vkey": "K_6" + } + }, + { + "_": "៚", + "$": { + "vkey": "K_7" + } + }, + { + "_": "", + "$": { + "vkey": "K_M" + } + }, + { + "_": "៘", + "$": { + "vkey": "K_L" + } + }, + { + "_": "‌", + "$": { + "vkey": "K_1" + } + }, + { + "_": "‍", + "$": { + "vkey": "K_BKQUOTE" + } + }, + { + "_": "]", + "$": { + "vkey": "K_U" + } + }, + { + "_": "[", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "/", + "$": { + "vkey": "K_SLASH" + } + }, + { + "_": ".", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "‘", + "$": { + "vkey": "K_H" + } + }, + { + "_": "+", + "$": { + "vkey": "K_A" + } + }, + { + "_": "&", + "$": { + "vkey": "K_V" + } + }, + { + "_": "’", + "$": { + "vkey": "K_J" + } + }, + { + "_": "*", + "$": { + "vkey": "K_8" + } + }, + { + "_": "@", + "$": { + "vkey": "K_2" + } + }, + { + "_": "\\", + "$": { + "vkey": "K_BKSLASH" + } + }, + { + "_": "}", + "$": { + "vkey": "K_0" + } + }, + { + "_": "{", + "$": { + "vkey": "K_9" + } + }, + { + "_": "-", + "$": { + "vkey": "K_S" + } + }, + { + "_": "÷", + "$": { + "vkey": "K_F" + } + }, + { + "_": ":", + "$": { + "vkey": "K_G" + } + }, + { + "_": ",", + "$": { + "vkey": "K_COMMA" + } + }, + { + "_": "≈", + "$": { + "vkey": "K_HYPHEN" + } + }, + { + "_": ";", + "$": { + "vkey": "K_N" + } + }, + { + "_": "<", + "$": { + "vkey": "K_Z" + } + }, + { + "_": "#", + "$": { + "vkey": "K_C" + } + }, + { + "_": ">", + "$": { + "vkey": "K_X" + } + }, + { + "_": "×", + "$": { + "vkey": "K_D" + } + }, + { + "_": "$", + "$": { + "vkey": "K_4" + } + }, + { + "_": "€", + "$": { + "vkey": "K_5" + } + }, + { + "_": " ", + "$": { + "vkey": "K_SPACE" + } + } + ] + }, + { + + "$": { + "shift": "SRA" + }, + "key": [ + { + "_": "៸", + "$": { + "vkey": "K_8" + } + }, + { + "_": "៰", + "$": { + "vkey": "K_0" + } + }, + { + "_": "៱", + "$": { + "vkey": "K_1" + } + }, + { + "_": "៲", + "$": { + "vkey": "K_2" + } + }, + { + "_": "៳", + "$": { + "vkey": "K_3" + } + }, + { + "_": "៴", + "$": { + "vkey": "K_4" + } + }, + { + "_": "៵", + "$": { + "vkey": "K_5" + } + }, + { + "_": "៶", + "$": { + "vkey": "K_6" + } + }, + { + "_": "៷", + "$": { + "vkey": "K_7" + } + }, + { + "_": "៹", + "$": { + "vkey": "K_9" + } + }, + { + "_": "᧿", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "᧾", + "$": { + "vkey": "K_COMMA" + } + }, + { + "_": "᧪", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "᧫", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "᧶", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "᧵", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "᧬", + "$": { + "vkey": "K_A" + } + }, + { + "_": "᧷", + "$": { + "vkey": "K_Z" + } + }, + { + "_": "᧥", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "᧸", + "$": { + "vkey": "K_X" + } + }, + { + "_": "᧡", + "$": { + "vkey": "K_W" + } + }, + { + "_": "᧻", + "$": { + "vkey": "K_B" + } + }, + { + "_": "᧹", + "$": { + "vkey": "K_C" + } + }, + { + "_": "᧮", + "$": { + "vkey": "K_D" + } + }, + { + "_": "᧢", + "$": { + "vkey": "K_E" + } + }, + { + "_": "᧯", + "$": { + "vkey": "K_F" + } + }, + { + "_": "᧰", + "$": { + "vkey": "K_G" + } + }, + { + "_": "᧦", + "$": { + "vkey": "K_U" + } + }, + { + "_": "᧱", + "$": { + "vkey": "K_H" + } + }, + { + "_": "᧤", + "$": { + "vkey": "K_T" + } + }, + { + "_": "᧭", + "$": { + "vkey": "K_S" + } + }, + { + "_": "᧣", + "$": { + "vkey": "K_R" + } + }, + { + "_": "᧧", + "$": { + "vkey": "K_I" + } + }, + { + "_": "᧠", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "᧺", + "$": { + "vkey": "K_V" + } + }, + { + "_": "᧲", + "$": { + "vkey": "K_J" + } + }, + { + "_": "᧳", + "$": { + "vkey": "K_K" + } + }, + { + "_": "᧴", + "$": { + "vkey": "K_L" + } + }, + { + "_": "᧩", + "$": { + "vkey": "K_P" + } + }, + { + "_": "᧨", + "$": { + "vkey": "K_O" + } + }, + { + "_": "᧼", + "$": { + "vkey": "K_N" + } + }, + { + "_": "᧽", + "$": { + "vkey": "K_M" + } + } + ] + }, + { + + "$": { + "shift": "" + }, + "key": [ + { + "_": "​", + "$": { + "vkey": "K_SPACE" + } + }, + { + "_": "", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "", + "$": { + "vkey": "K_COMMA" + } + }, + { + "_": "ឥ", + "$": { + "vkey": "K_HYPHEN" + } + }, + { + "_": "។", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "", + "$": { + "vkey": "K_SLASH" + } + }, + { + "_": "០", + "$": { + "vkey": "K_0" + } + }, + { + "_": "១", + "$": { + "vkey": "K_1" + } + }, + { + "_": "២", + "$": { + "vkey": "K_2" + } + }, + { + "_": "៣", + "$": { + "vkey": "K_3" + } + }, + { + "_": "៤", + "$": { + "vkey": "K_4" + } + }, + { + "_": "៥", + "$": { + "vkey": "K_5" + } + }, + { + "_": "៦", + "$": { + "vkey": "K_6" + } + }, + { + "_": "៧", + "$": { + "vkey": "K_7" + } + }, + { + "_": "៨", + "$": { + "vkey": "K_8" + } + }, + { + "_": "៩", + "$": { + "vkey": "K_9" + } + }, + { + "_": "", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "ឲ", + "$": { + "vkey": "K_EQUAL" + } + }, + { + "_": "", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "ឮ", + "$": { + "vkey": "K_BKSLASH" + } + }, + { + "_": "ឪ", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "«", + "$": { + "vkey": "K_BKQUOTE" + } + }, + { + "_": "", + "$": { + "vkey": "K_A" + } + }, + { + "_": "ប", + "$": { + "vkey": "K_B" + } + }, + { + "_": "ច", + "$": { + "vkey": "K_C" + } + }, + { + "_": "ដ", + "$": { + "vkey": "K_D" + } + }, + { + "_": "", + "$": { + "vkey": "K_E" + } + }, + { + "_": "ថ", + "$": { + "vkey": "K_F" + } + }, + { + "_": "ង", + "$": { + "vkey": "K_G" + } + }, + { + "_": "ហ", + "$": { + "vkey": "K_H" + } + }, + { + "_": "", + "$": { + "vkey": "K_I" + } + }, + { + "_": "", + "$": { + "vkey": "K_J" + } + }, + { + "_": "ក", + "$": { + "vkey": "K_K" + } + }, + { + "_": "ល", + "$": { + "vkey": "K_L" + } + }, + { + "_": "ម", + "$": { + "vkey": "K_M" + } + }, + { + "_": "ន", + "$": { + "vkey": "K_N" + } + }, + { + "_": "", + "$": { + "vkey": "K_O" + } + }, + { + "_": "ផ", + "$": { + "vkey": "K_P" + } + }, + { + "_": "ឆ", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "រ", + "$": { + "vkey": "K_R" + } + }, + { + "_": "ស", + "$": { + "vkey": "K_S" + } + }, + { + "_": "ត", + "$": { + "vkey": "K_T" + } + }, + { + "_": "", + "$": { + "vkey": "K_U" + } + }, + { + "_": "វ", + "$": { + "vkey": "K_V" + } + }, + { + "_": "", + "$": { + "vkey": "K_W" + } + }, + { + "_": "ខ", + "$": { + "vkey": "K_X" + } + }, + { + "_": "យ", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "ឋ", + "$": { + "vkey": "K_Z" + } + } + ] + }, + { + + "$": { + "shift": "S" + }, + "key": [ + { + "_": "", + "$": { + "vkey": "K_SPACE" + } + }, + { + "_": "!", + "$": { + "vkey": "K_1" + } + }, + { + "_": "", + "$": { + "vkey": "K_QUOTE" + } + }, + { + "_": "\"", + "$": { + "vkey": "K_3" + } + }, + { + "_": "៛", + "$": { + "vkey": "K_4" + } + }, + { + "_": "%", + "$": { + "vkey": "K_5" + } + }, + { + "_": "", + "$": { + "vkey": "K_7" + } + }, + { + "_": "(", + "$": { + "vkey": "K_9" + } + }, + { + "_": ")", + "$": { + "vkey": "K_0" + } + }, + { + "_": "", + "$": { + "vkey": "K_8" + } + }, + { + "_": "=", + "$": { + "vkey": "K_EQUAL" + } + }, + { + "_": "", + "$": { + "vkey": "K_COLON" + } + }, + { + "_": "៕", + "$": { + "vkey": "K_PERIOD" + } + }, + { + "_": "?", + "$": { + "vkey": "K_SLASH" + } + }, + { + "_": "ៗ", + "$": { + "vkey": "K_2" + } + }, + { + "_": "", + "$": { + "vkey": "K_A" + } + }, + { + "_": "ព", + "$": { + "vkey": "K_B" + } + }, + { + "_": "ជ", + "$": { + "vkey": "K_C" + } + }, + { + "_": "ឌ", + "$": { + "vkey": "K_D" + } + }, + { + "_": "", + "$": { + "vkey": "K_E" + } + }, + { + "_": "ធ", + "$": { + "vkey": "K_F" + } + }, + { + "_": "អ", + "$": { + "vkey": "K_G" + } + }, + { + "_": "ះ", + "$": { + "vkey": "K_H" + } + }, + { + "_": "", + "$": { + "vkey": "K_I" + } + }, + { + "_": "ញ", + "$": { + "vkey": "K_J" + } + }, + { + "_": "គ", + "$": { + "vkey": "K_K" + } + }, + { + "_": "ឡ", + "$": { + "vkey": "K_L" + } + }, + { + "_": "", + "$": { + "vkey": "K_M" + } + }, + { + "_": "ណ", + "$": { + "vkey": "K_N" + } + }, + { + "_": "", + "$": { + "vkey": "K_O" + } + }, + { + "_": "ភ", + "$": { + "vkey": "K_P" + } + }, + { + "_": "ឈ", + "$": { + "vkey": "K_Q" + } + }, + { + "_": "ឬ", + "$": { + "vkey": "K_R" + } + }, + { + "_": "", + "$": { + "vkey": "K_S" + } + }, + { + "_": "ទ", + "$": { + "vkey": "K_T" + } + }, + { + "_": "", + "$": { + "vkey": "K_U" + } + }, + { + "_": "", + "$": { + "vkey": "K_V" + } + }, + { + "_": "", + "$": { + "vkey": "K_W" + } + }, + { + "_": "ឃ", + "$": { + "vkey": "K_X" + } + }, + { + "_": "", + "$": { + "vkey": "K_Y" + } + }, + { + "_": "ឍ", + "$": { + "vkey": "K_Z" + } + }, + { + "_": "", + "$": { + "vkey": "K_6" + } + }, + { + "_": "", + "$": { + "vkey": "K_HYPHEN" + } + }, + { + "_": "", + "$": { + "vkey": "K_LBRKT" + } + }, + { + "_": "ឭ", + "$": { + "vkey": "K_BKSLASH" + } + }, + { + "_": "ឧ", + "$": { + "vkey": "K_RBRKT" + } + }, + { + "_": "»", + "$": { + "vkey": "K_BKQUOTE" + } + }, + { + "_": "", + "$": { + "vkey": "K_COMMA" + } + } + ] + } + ] + } + } +} diff --git a/developer/src/common/web/utils/test/fixtures/xml/strs_invalid-illegal.xml b/developer/src/common/web/utils/test/fixtures/xml/strs_invalid-illegal.xml new file mode 100644 index 00000000000..3eddaffdeea --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/strs_invalid-illegal.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/strs_invalid-illegal.xml.json b/developer/src/common/web/utils/test/fixtures/xml/strs_invalid-illegal.xml.json new file mode 100644 index 00000000000..e26bf18696d --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/strs_invalid-illegal.xml.json @@ -0,0 +1,113 @@ +{ + "keyboard3": { + "xmlns": "https://schemas.unicode.org/cldr/45/keyboard3", + "locale": "mt", + "conformsTo": "45", + "version": { + "number": "1.0.0" + }, + "info": { + "author": "srl295", + "indicator": "🙀", + "layout": "qwerty", + "name": "TestKbd" + }, + "displays": { + "display": [ + { + "output": "a", + "display": "^" + }, + { + "keyId": "e", + "display": "^e" + } + ], + "displayOptions": { + "baseCharacter": "e" + } + }, + "keys": { + "key": [ + { + "id": "hmaqtugha", + "output": "h\\u{FDD0}", + "longPressKeyIds": "a e" + }, + { + "id": "that", + "output": "￿" + } + ] + }, + "layers": { + "formId": "us", + "minDeviceWidth": "123", + "layer": { + "id": "￾", + "row": { + "keys": "hmaqtugha that" + } + } + }, + "variables": { + "string": [ + { + "id": "a", + "value": "\\m{a}" + }, + { + "id": "vst", + "value": "abc pua:\\u{E010}" + } + ], + "set": { + "id": "vse", + "value": "a b \\u{04FFFE} \\u{5FFFF}" + }, + "uset": { + "id": "vus", + "value": "[abc]" + } + }, + "transforms": [ + { + "type": "simple", + "transformGroup": [ + { + "transform": [ + { + "from": "^a", + "to": "\\u{FDD0}" + }, + { + "from": "a", + "to": "\\m{a}\\u{E020}" + } + ] + }, + { + "transform": { + "from": "\\m{a}" + } + }, + { + "reorder": { + "before": "\\u{1A6B}", + "from": "\\u{1A60}[\\u{1A75}-\\u{1A79}]\\u{1A45}", + "order": "10 55 10" + } + } + ] + }, + { + "type": "backspace", + "transformGroup": { + "transform": { + "from": "^e" + } + } + } + ] + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/fixtures/xml/test_valid.kps b/developer/src/common/web/utils/test/fixtures/xml/test_valid.kps new file mode 100644 index 00000000000..8877759a281 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/test_valid.kps @@ -0,0 +1,46 @@ + + + + 10.0.1024.0 + 7.0 + + + + + + + + + + + + 1.0 + Test Valid + + + + test_valid.kmx + Keyboard Test Valid + 0 + .kmx + + + test_valid.js + Keyboard Test Valid + 0 + .js + + + + + Test Valid + test_valid + 1.0 + True + + English + + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/test_valid.kps.json b/developer/src/common/web/utils/test/fixtures/xml/test_valid.kps.json new file mode 100644 index 00000000000..276554d09c3 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/test_valid.kps.json @@ -0,0 +1,64 @@ +{ + "Package": { + "System": { + "KeymanDeveloperVersion": "10.0.1024.0", + "FileVersion": "7.0" + }, + "Options": { + "ExecuteProgram": "", + "MSIFileName": "", + "MSIOptions": "" + }, + "StartMenu": { + "Folder": "", + "Items": "" + }, + "Info": { + "Version": { + "_": "1.0", + "$": { + "URL": "" + } + }, + "Name": { + "_": "Test Valid", + "$": { + "URL": "" + } + } + }, + "Files": { + "File": [ + { + "Name": "test_valid.kmx", + "Description": "Keyboard Test Valid", + "CopyLocation": "0", + "FileType": ".kmx" + }, + { + "Name": "test_valid.js", + "Description": "Keyboard Test Valid", + "CopyLocation": "0", + "FileType": ".js" + } + ] + }, + "Keyboards": { + "Keyboard": { + "Name": "Test Valid", + "ID": "test_valid", + "Version": "1.0", + "RTL": "True", + "Languages": { + "Language": { + "_": "English", + "$": { + "ID": "en" + } + } + } + } + }, + "Strings": "" + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/fixtures/xml/tran_fail-empty.xml b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-empty.xml new file mode 100644 index 00000000000..6c28d3f00d7 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-empty.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/tran_fail-empty.xml.json b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-empty.xml.json new file mode 100644 index 00000000000..3308970fdd8 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-empty.xml.json @@ -0,0 +1,28 @@ +{ + "keyboard3": { + "xmlns": "https://schemas.unicode.org/cldr/45/keyboard3", + "locale": "mt", + "conformsTo": "45", + "info": { + "name": "tran-mixed" + }, + "transforms": { + "type": "simple", + "transformGroup": [ + { + "transform": { + "from": "xx", + "to": "x" + } + }, + { + "reorder": { + "from": "ខែ្ម", + "order": "1 3 4 2" + } + }, + {} + ] + } + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/fixtures/xml/tran_fail-matches-nothing-1.xml b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-matches-nothing-1.xml new file mode 100644 index 00000000000..5b5e2bba5bd --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-matches-nothing-1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/developer/src/common/web/utils/test/fixtures/xml/tran_fail-matches-nothing-1.xml.json b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-matches-nothing-1.xml.json new file mode 100644 index 00000000000..477499477d8 --- /dev/null +++ b/developer/src/common/web/utils/test/fixtures/xml/tran_fail-matches-nothing-1.xml.json @@ -0,0 +1,19 @@ +{ + "keyboard3": { + "conformsTo": "45", + "xmlns": "https://schemas.unicode.org/cldr/45/keyboard3", + "locale": "mt", + "info": { + "name": "fail-matches-nothing" + }, + "keys": {}, + "transforms": { + "type": "simple", + "transformGroup": { + "transform": { + "from": "" + } + } + } + } +} \ No newline at end of file diff --git a/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts b/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts index a79960c7ca2..17c35660245 100644 --- a/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts +++ b/developer/src/common/web/utils/test/kmx/test-ldml-keyboard-xml-reader.ts @@ -1,7 +1,7 @@ import { LKKey, ImportStatus } from '../../src/types/ldml-keyboard/ldml-keyboard-xml.js'; import 'mocha'; import {assert} from 'chai'; -import { CommonTypesMessages } from '../../src/common-events.js'; +import { CommonTypesMessages } from '../../src/common-messages.js'; import { testReaderCases } from '../helpers/reader-callback-test.js'; import { Constants } from '@keymanapp/common-types'; diff --git a/developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts b/developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts index 4b154af0606..1caf70cd20d 100644 --- a/developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts +++ b/developer/src/common/web/utils/test/kpj/test-kpj-file-reader.ts @@ -15,9 +15,7 @@ describe('kpj-file-reader', function () { const input = fs.readFileSync(path); const reader = new KPJFileReader(callbacks); const kpj = reader.read(input); - assert.doesNotThrow(() => { - reader.validate(kpj); - }); + reader.validate(kpj); assert.equal(kpj.KeymanDeveloperProject.Options.BuildPath, '$PROJECTPATH\\build'); assert.equal(kpj.KeymanDeveloperProject.Options.CheckFilenameConventions, 'False'); assert.equal(kpj.KeymanDeveloperProject.Options.CompilerWarningsAsErrors, 'True'); diff --git a/developer/src/common/web/utils/test/test-xml-utils.ts b/developer/src/common/web/utils/test/test-xml-utils.ts new file mode 100644 index 00000000000..1cc9724b278 --- /dev/null +++ b/developer/src/common/web/utils/test/test-xml-utils.ts @@ -0,0 +1,162 @@ +/* + * Keyman is copyright (C) SIL Global. MIT License. + * + * Created by srl on 2024-09-27 + * + * Test for abstraction for XML reading and writing + */ + +import { assert } from 'chai'; +import 'mocha'; +import { env } from 'node:process'; +import { readFileSync, writeFileSync } from 'node:fs'; + + +import { KeymanXMLType, KeymanXMLReader, KeymanXMLWriter } from '../src/xml-utils.js'; +import { makePathToFixture } from './helpers/index.js'; + +// if true, attempt to WRITE the fixtures +const { GEN_XML_FIXTURES } = env; + +class Case { + type: KeymanXMLType; + paths: string[]; +}; + +const read_cases: Case[] = [ + { + type: 'keyboard3', + paths: [ + // keyboards + 'disp_maximal.xml', + 'k_020_fr.xml', + 'strs_invalid-illegal.xml', + 'tran_fail-empty.xml', + 'tran_fail-matches-nothing-1.xml', + ], + }, { + type: 'keyboardTest3', + paths: [ + // keyboard test + 'k_020_fr-test.xml', + ], + }, { + type: 'kvks', + paths: [ + // kvks + 'khmer_angkor.kvks', + ], + }, { + type: 'kps', + paths: [ + // kps + 'test_valid.kps', + // 'error_invalid_package_file.kps', + ], + }, { + type: 'kpj', + paths: [ + // kpj + 'khmer_angkor.kpj', + ], + }, +]; + +const write_cases: Case[] = [ + { + type: 'kvks', + paths: [ + // kvks + 'khmer_angkor2.kvks', // similar to the 'read case' with the similar name, except for whitespace differences and the prologue + ], + }, +]; + +/** read data, or null */ +function readData(path: string): string | null { + try { + return readFileSync(path, 'utf-8'); + } catch (e) { + if (e?.code !== 'ENOENT') console.error(`reading ${path}`, e); + return null; + } +} + +function readJson(path: string): any | null { + const data = readData(path); + if (data === null) return null; + return JSON.parse(data); +} + +function writeJson(path: string, data: any) { + writeFileSync(path, JSON.stringify(data, null, ' ')); +} + +describe(`XML Reader Test ${GEN_XML_FIXTURES && '(update mode!)' || ''}`, () => { + for (const c of read_cases) { + const { type, paths } = c; + describe(`test reading ${type}`, () => { + for (const path of paths) { + const xmlPath = makePathToFixture('xml', `${path}`); + const jsonPath = makePathToFixture('xml', `${path}.json`); + it(`read: xml/${path}`, () => { + // get the string data + const xml = readData(xmlPath); + assert.ok(xml, `Could not read ${xmlPath}`); + + const reader = new KeymanXMLReader(type); + assert.ok(reader); + + // now, parse. subsitute endings for Win + const actual = reader.parse(xml.replace(/\r\n/g, '\n')); + assert.ok(actual, `Parser failed on ${xmlPath}`); + + // get the expected + const expect = readJson(jsonPath); + + if (GEN_XML_FIXTURES) { + console.log(`GEN_XML_FIXTURES: writing ${jsonPath} from actual`); + writeJson(jsonPath, actual); + } else { + assert.ok(expect, `Could not read ${jsonPath} - run with env GEN_XML_FIXTURES=1 to update.`); + assert.deepEqual(actual, expect, `Mismatch of ${xmlPath} vs ${jsonPath}`); + } + }); + } + }); + } +}); + + +describe(`XML Writer Test ${GEN_XML_FIXTURES && '(update mode!)' || ''}`, () => { + for (const c of write_cases) { + const { type, paths } = c; + describe(`test writing ${type}`, () => { + const writer = new KeymanXMLWriter(type); + assert.ok(writer); + for (const path of paths) { + const jsonPath = makePathToFixture('xml', `${path}.json`); + const xmlPath = makePathToFixture('xml', `${path}`); + it(`write: xml/${path}`, () => { + // get the object data + const data = readJson(jsonPath); + assert.ok(data, `Could not read input ${jsonPath}`); + + // now, write. + const actual = writer.write(data); + assert.ok(actual, `Writer failed on ${jsonPath}`); + + if (GEN_XML_FIXTURES) { + console.log(`GEN_XML_FIXTURES: writing ${xmlPath} from actual`); + writeFileSync(xmlPath, actual); + } else { + // get the expected data + const expect = readData(xmlPath).replace(/\r\n/g, '\n'); + assert.ok(expect, `Could not read expected output ${xmlPath} - run with env=GEN_XML_FIXTURES=1 to update`); + assert.deepEqual(actual.trim(), expect.trim(), `Mismatch of ${xmlPath} vs ${jsonPath}`); + } + }); + } + }); + } +}); diff --git a/developer/src/common/web/utils/tsconfig.json b/developer/src/common/web/utils/tsconfig.json index 3be972dbcb6..6f96f75ee70 100644 --- a/developer/src/common/web/utils/tsconfig.json +++ b/developer/src/common/web/utils/tsconfig.json @@ -8,6 +8,5 @@ }, "include": [ "src/**/*.ts", - "src/deps/xml2js/*.js", ], -} \ No newline at end of file +} diff --git a/developer/src/kmc-analyze/.eslintrc.cjs b/developer/src/kmc-analyze/.eslintrc.cjs index bd0835f0be3..148ad7579f8 100644 --- a/developer/src/kmc-analyze/.eslintrc.cjs +++ b/developer/src/kmc-analyze/.eslintrc.cjs @@ -5,7 +5,7 @@ module.exports = { overrides: [ { files:"src/**/*.ts", - extends: ["../../../common/web/eslint/eslintNoNodeImports.js"], + extends: ["../../../common/tools/eslint/eslintNoNodeImports.js"], } ], rules: { diff --git a/developer/src/kmc-analyze/src/analyzer-messages.ts b/developer/src/kmc-analyze/src/analyzer-messages.ts index 1e4204595ed..c895a2f3675 100644 --- a/developer/src/kmc-analyze/src/analyzer-messages.ts +++ b/developer/src/kmc-analyze/src/analyzer-messages.ts @@ -1,6 +1,3 @@ -/// -// above is required for now, seemingly https://github.com/microsoft/TypeScript/issues/42873 -// probably addressed in ts 5.5.2 import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException, KeymanUrls } from "@keymanapp/developer-utils"; const Namespace = CompilerErrorNamespace.Analyzer; diff --git a/developer/src/kmc-kmn/.eslintrc.cjs b/developer/src/kmc-kmn/.eslintrc.cjs index 156e7b5cf07..9fb322a1e46 100644 --- a/developer/src/kmc-kmn/.eslintrc.cjs +++ b/developer/src/kmc-kmn/.eslintrc.cjs @@ -5,7 +5,7 @@ module.exports = { overrides: [ { files:"src/**/*.ts", - extends: ["../../../common/web/eslint/eslintNoNodeImports.js"], + extends: ["../../../common/tools/eslint/eslintNoNodeImports.js"], } ], ignorePatterns: ["test/fixtures/*"], diff --git a/developer/src/kmc-ldml/.eslintrc.cjs b/developer/src/kmc-ldml/.eslintrc.cjs index 09038ae9291..41a487fe41d 100644 --- a/developer/src/kmc-ldml/.eslintrc.cjs +++ b/developer/src/kmc-ldml/.eslintrc.cjs @@ -6,7 +6,7 @@ module.exports = { overrides: [ { files:"src/**/*.ts", - extends: ["../../../common/web/eslint/eslintNoNodeImports.js"], + extends: ["../../../common/tools/eslint/eslintNoNodeImports.js"], } ], rules: { diff --git a/developer/src/kmc-ldml/package.json b/developer/src/kmc-ldml/package.json index 6f65eaf0e0a..11d7c07b880 100644 --- a/developer/src/kmc-ldml/package.json +++ b/developer/src/kmc-ldml/package.json @@ -25,8 +25,8 @@ "url": "https://github.com/keymanapp/keyman/issues" }, "dependencies": { - "@keymanapp/keyman-version": "*", "@keymanapp/developer-utils": "*", + "@keymanapp/keyman-version": "*", "@keymanapp/kmc-kmn": "*", "@keymanapp/ldml-keyboard-constants": "*", "semver": "^7.5.4" @@ -34,11 +34,13 @@ "devDependencies": { "@keymanapp/developer-test-helpers": "*", "@keymanapp/resources-gosh": "*", + "@types/common-tags": "^1.8.4", "@types/mocha": "^5.2.7", "@types/node": "^20.4.1", "@types/semver": "^7.3.12", "c8": "^7.12.0", "chalk": "^2.4.2", + "common-tags": "^1.8.2", "mocha": "^8.4.0", "typescript": "^5.4.5" }, diff --git a/developer/src/kmc-ldml/src/compiler/compiler.ts b/developer/src/kmc-ldml/src/compiler/compiler.ts index 950534e69c8..388a64de69b 100644 --- a/developer/src/kmc-ldml/src/compiler/compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/compiler.ts @@ -1,4 +1,9 @@ -import { KMXPlus, UnicodeSetParser, KvkFileWriter } from '@keymanapp/common-types'; +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Compiles a LDML XML keyboard file into a Keyman KMXPlus file + */ +import { KMXPlus, UnicodeSetParser, KvkFileWriter, KMX } from '@keymanapp/common-types'; import { CompilerCallbacks, KeymanCompiler, KeymanCompilerResult, KeymanCompilerArtifacts, defaultCompilerOptions, LDMLKeyboardXMLSourceFileReader, LDMLKeyboard, @@ -25,7 +30,6 @@ import { KmnCompiler } from '@keymanapp/kmc-kmn'; import { KMXPlusMetadataCompiler } from './metadata-compiler.js'; import { LdmlKeyboardVisualKeyboardCompiler } from './visual-keyboard-compiler.js'; import { LinterKeycaps } from './linter-keycaps.js'; -//KMW17.0: import { LdmlKeyboardKeymanWebCompiler } from './keymanweb-compiler.js'; export const SECTION_COMPILERS = [ // These are in dependency order. @@ -68,11 +72,6 @@ export interface LdmlKeyboardCompilerArtifacts extends KeymanCompilerArtifacts { * desktop projects alongside .kmx */ kvk?: KeymanCompilerArtifactOptional; - /** - * Javascript keyboard filedata and filename - installable into KeymanWeb, - * Keyman mobile products - */ - js?: KeymanCompilerArtifactOptional; }; export interface LdmlKeyboardCompilerResult extends KeymanCompilerResult { @@ -85,7 +84,7 @@ export interface LdmlKeyboardCompilerResult extends KeymanCompilerResult { /** * @public - * Compiles a LDML keyboard .xml file to a .kmx (KMXPlus), .kvk, and/or .js. The + * Compiles a LDML keyboard .xml file to a .kmx (KMXPlus), .kvk. The * compiler does not read or write from filesystem or network directly, but * relies on callbacks for all external IO. */ @@ -111,7 +110,7 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { } /** - * Compiles a LDML keyboard .xml file to .kmx, .kvk, and/or .js files. Returns + * Compiles a LDML keyboard .xml file to .kmx, .kvk files. Returns * an object containing binary artifacts on success. The files are passed in * by name, and the compiler will use callbacks as passed to the * {@link LdmlKeyboardCompiler.init} function to read any input files by disk. @@ -137,18 +136,34 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { return null; } + outputFilename = outputFilename ?? inputFilename.replace(/\.xml$/, '.kmx'); + // In order for the KMX file to be loaded by non-KMXPlus components, it is helpful // to duplicate some of the metadata KMXPlusMetadataCompiler.addKmxMetadata(kmx.kmxplus, kmx.keyboard, compilerOptions); // Use the builder to generate the binary output file - const builder = new KMXBuilder(kmx, compilerOptions.saveDebug); - const kmx_binary = builder.compile(); + const kmxBuilder = new KMXBuilder(kmx, compilerOptions.saveDebug); + const keyboardId = this.callbacks.path.basename(outputFilename, '.kmx'); + const vkCompiler = new LdmlKeyboardVisualKeyboardCompiler(this.callbacks); + const vkCompilerResult = vkCompiler.compile(kmx.kmxplus, keyboardId); + if(vkCompilerResult === null) { + return null; + } + const vkData = typeof vkCompilerResult == 'object' ? vkCompilerResult : null; - const vkcompiler = new LdmlKeyboardVisualKeyboardCompiler(this.callbacks); - const vk = vkcompiler.compile(source); - const writer = new KvkFileWriter(); - const kvk_binary = writer.write(vk); + if(vkData) { + kmx.keyboard.stores.push({ + dpName: '', + dpString: keyboardId + '.kvk', + dwSystemID: KMX.KMXFile.TSS_VISUALKEYBOARD + }); + } + + const kmxBinary = kmxBuilder.compile(); + + const kvkWriter = new KvkFileWriter(); + const kvkBinary = vkData ? kvkWriter.write(vkData) : null; // Note: we could have a step of generating source files here // KvksFileWriter()... @@ -161,13 +176,10 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { //KMW17.0: const encoder = new TextEncoder(); //KMW17.0: const kmw_binary = encoder.encode(kmw_string); - outputFilename = outputFilename ?? inputFilename.replace(/\.xml$/, '.kmx'); - return { artifacts: { - kmx: { data: kmx_binary, filename: outputFilename }, - kvk: { data: kvk_binary, filename: outputFilename.replace(/\.kmx$/, '.kvk') }, - //KMW17.0: js: { data: kmw_binary, filename: outputFilename.replace(/\.kmx$/, '.js') }, + kmx: { data: kmxBinary, filename: outputFilename }, + kvk: kvkBinary ? { data: kvkBinary, filename: outputFilename.replace(/\.kmx$/, '.kvk') } : null, } }; } @@ -178,7 +190,6 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { * * - .kmx file - binary keyboard used by Keyman on desktop platforms * - .kvk file - binary on screen keyboard used by Keyman on desktop platforms - * - .js file - Javascript keyboard for web and touch platforms * * @param artifacts - object containing artifact binary data to write out * @returns true on success @@ -192,10 +203,6 @@ export class LdmlKeyboardCompiler implements KeymanCompiler { this.callbacks.fs.writeFileSync(artifacts.kvk.filename, artifacts.kvk.data); } - if (artifacts.js) { - this.callbacks.fs.writeFileSync(artifacts.js.filename, artifacts.js.data); - } - return true; } diff --git a/developer/src/kmc-ldml/src/compiler/empty-compiler.ts b/developer/src/kmc-ldml/src/compiler/empty-compiler.ts index 92c364e4dc9..44b04182a3f 100644 --- a/developer/src/kmc-ldml/src/compiler/empty-compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/empty-compiler.ts @@ -6,7 +6,7 @@ import { VarsCompiler } from './vars.js'; import { LdmlCompilerMessages } from './ldml-compiler-messages.js'; /** - * Compiler for typrs that don't actually consume input XML + * Compiler for types that don't actually consume input XML */ export abstract class EmptyCompiler extends SectionCompiler { private _id: SectionIdent; diff --git a/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts b/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts deleted file mode 100644 index 86402b6d45e..00000000000 --- a/developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts +++ /dev/null @@ -1,114 +0,0 @@ -import { VisualKeyboard, KeymanFileTypes } from "@keymanapp/common-types"; -import { CompilerCallbacks, LDMLKeyboard, TouchLayoutFileWriter } from "@keymanapp/developer-utils"; -import { LdmlCompilerOptions } from "./ldml-compiler-options.js"; -import { TouchLayoutCompiler } from "./touch-layout-compiler.js"; -import { LdmlKeyboardVisualKeyboardCompiler } from "./visual-keyboard-compiler.js"; - -const MINIMUM_KMW_VERSION = '16.0'; - -export class LdmlKeyboardKeymanWebCompiler { - private readonly options: LdmlCompilerOptions; - private readonly nl: string; - private readonly tab: string; - constructor(private callbacks: CompilerCallbacks, options?: LdmlCompilerOptions) { - this.options = { ...options }; - this.nl = this.options.saveDebug ? "\n" : ''; - this.tab = this.options.saveDebug ? " " : ''; - } - - public compileVisualKeyboard(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile) { - const nl = this.nl, tab = this.tab; - const vkc = new LdmlKeyboardVisualKeyboardCompiler(this.callbacks); - const vk: VisualKeyboard.VisualKeyboard = vkc.compile(source); - - let result = - `{F: ' 1em ${JSON.stringify(vk.header.unicodeFont.name)}', `+ - `K102: ${vk.header.flags & VisualKeyboard.VisualKeyboardHeaderFlags.kvkh102 ? 1 : 0}};${nl}` + // TODO-LDML: escape ' and " in font name correctly - `${tab}this.KV.KLS={${nl}` + - `${tab}${tab}TODO_LDML: ${vk.keys.length}${nl}` + - // TODO-LDML: fill in KLS - `${tab}}`; - - return result; - } - - public compileTouchLayout(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile) { - const tlcompiler = new TouchLayoutCompiler(); - const layout = tlcompiler.compileToJavascript(source); - const writer = new TouchLayoutFileWriter({formatted: this.options.saveDebug}); - return writer.compile(layout); - } - - private cleanName(name: string): string { - let result = this.callbacks.path.basename(name, KeymanFileTypes.Source.LdmlKeyboard); - if(!result) { - throw new Error(`Invalid file name ${name}`); - } - - result = result.replaceAll(/[^a-z0-9]/g, '_'); - if(result.match(/^[0-9]/)) { - // Can't have a digit as initial - result = '_' + result; - } - return result; - } - - public compile(name: string, source: LDMLKeyboard.LDMLKeyboardXMLSourceFile): string { - const nl = this.nl, tab = this.tab; - - const sName = 'Keyboard_'+this.cleanName(name); - const displayUnderlying = true; // TODO-LDML - const modifierBitmask = 0; // TODO-LDML: define the modifiers used by this keyboard - const vkDictionary = ''; // TODO-LDML: vk dictionary for touch keys - const hasSupplementaryPlaneChars = false; // TODO-LDML - const isRTL = false; // TODO-LDML - - let result = - `if(typeof keyman === 'undefined') {${nl}` + - `${tab}console.error('Keyboard requires KeymanWeb ${MINIMUM_KMW_VERSION} or later');${nl}` + - `} else {${nl}` + - `${tab}KeymanWeb.KR(new ${sName}());${nl}` + - `}${nl}` + - `function ${sName}() {${nl}` + - // `${tab}${this.setupDebug()}${nl}` + ? we may use this for modifierBitmask in future - // `${tab}this._v=(typeof keyman!="undefined"&&typeof keyman.version=="string")?parseInt(keyman.version,10):9;${nl}` + ? we probably don't need this, it's for back-compat - `${tab}this.KI="${sName}";${nl}` + - `${tab}this.KN=${JSON.stringify(source.keyboard3.info.name)};${nl}` + - `${tab}this.KMINVER=${JSON.stringify(MINIMUM_KMW_VERSION)};${nl}` + - `${tab}this.KV=${this.compileVisualKeyboard(source)};${nl}` + - `${tab}this.KDU=${displayUnderlying ? '1' : '0'};${nl}` + - `${tab}this.KH="";${nl}` + // TODO-LDML: help text not supported - `${tab}this.KM=0;${nl}` + // TODO-LDML: mnemonic layout not supported for LDML keyboards - `${tab}this.KBVER=${JSON.stringify(source.keyboard3.version?.number || '0.0')};${nl}` + - `${tab}this.KMBM=${modifierBitmask};${nl}`; - - if(isRTL) { - result += `${tab}this.KRTL=1;${nl}`; - } - - if(hasSupplementaryPlaneChars) { - result += `${tab}this.KS=1;${nl}`; - } - - if(vkDictionary != '') { - result += `${tab}this.KVKD=${JSON.stringify(vkDictionary)};${nl}`; - } - - let layoutFile = this.compileTouchLayout(source); - if(layoutFile != '') { - result += `${tab}this.KVKL=${layoutFile};${nl}`; - } - // TODO-LDML: KCSS not supported - - // TODO-LDML: embed binary keyboard for loading into Core - - // A LDML keyboard has a no-op for its gs() (begin Unicode) function, - // because the functionality is embedded in Keyman Core - result += `${tab}this.gs=function(t,e){${nl}`+ - `${tab}${tab}return 0;${nl}`+ // TODO-LDML: we will start by embedding call into Keyman Core here - `${tab}};${nl}`; - - result += `}${nl}`; - return result; - } -} diff --git a/developer/src/kmc-ldml/src/compiler/layr.ts b/developer/src/kmc-ldml/src/compiler/layr.ts index 62f8b3360d0..6c945a18642 100644 --- a/developer/src/kmc-ldml/src/compiler/layr.ts +++ b/developer/src/kmc-ldml/src/compiler/layr.ts @@ -63,7 +63,7 @@ export class LayrCompiler extends SectionCompiler { for (const layer of layers.layer) { const rows = layer.row.map((row) => { const erow: LayrRow = { - keys: row.keys.split(' ').map((id) => sections.strs.allocString(id)), + keys: row.keys.trim().split(/[ \t]+/).map((id) => sections.strs.allocString(id)), }; return erow; }); diff --git a/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts b/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts index 1b6752bdee8..901f4b00227 100644 --- a/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts +++ b/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts @@ -187,7 +187,13 @@ export class LdmlCompilerMessages { static Error_UnparseableReorderSet = (o: { from: string, set: string }) => m(this.ERROR_UnparseableReorderSet, `Illegal UnicodeSet "${def(o.set)}" in reorder "${def(o.from)}`); - // Available: 0x029 + static ERROR_InvalidVariableIdentifer = SevError | 0x0029; + static Error_InvalidVariableIdentifer = (o: { id: string }) => m( + this.ERROR_InvalidVariableIdentifer, + `Invalid variable identifier "\\u${def(o.id)}". Identifiers must be between 1 and 32 characters, and can use A-Z, a-z, 0-9, and _.`, + ); + + // Available: 0x02A-0x2F static ERROR_InvalidQuadEscape = SevError | 0x0030; static Error_InvalidQuadEscape = (o: { cp: number }) => @@ -202,9 +208,12 @@ export class LdmlCompilerMessages { m(this.ERROR_UnparseableTransformFrom, `Invalid transform from="${def(o.from)}": "${def(o.message)}"`); static ERROR_IllegalTransformDollarsign = SevErrorTransform | 0x01; - static Error_IllegalTransformDollarsign = (o: { from: string }) => - m(this.ERROR_IllegalTransformDollarsign, `Invalid transform from="${def(o.from)}": Unescaped dollar-sign ($) is not valid transform syntax.`, - '**Hint**: Use `\\$` to match a literal dollar-sign.'); + static Error_IllegalTransformDollarsign = (o: { from: string }) => m( + this.ERROR_IllegalTransformDollarsign, + `Invalid transform from="${def(o.from)}": Unescaped dollar-sign ($) is not valid transform syntax.`, + `**Hint**: Use \`\\$\` to match a literal dollar-sign. If this precedes a variable name, `+ + `the variable name may not be valid (A-Z, a-z, 0-9, _, 32 character maximum).` + ); static ERROR_TransformFromMatchesNothing = SevErrorTransform | 0x02; static Error_TransformFromMatchesNothing = (o: { from: string }) => diff --git a/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts b/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts deleted file mode 100644 index a36ab9c0974..00000000000 --- a/developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { TouchLayout } from "@keymanapp/common-types"; -import { LDMLKeyboard } from "@keymanapp/developer-utils"; - -export class TouchLayoutCompiler { - public compileToJavascript(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile): TouchLayout.TouchLayoutFile { - let result: TouchLayout.TouchLayoutFile = {}; - - // start with desktop to mimic vk emit - result.desktop = { - defaultHint: "none", // TODO-LDML this should be optional - layer: [] - }; - - for(let layers of source.keyboard3.layers) { - for(let layer of layers.layer) { - const resultLayer = this.compileHardwareLayer(source, result, layer); - result.desktop.layer.push(resultLayer); - } - } - return result; - } - - private compileHardwareLayer( - source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, - file: TouchLayout.TouchLayoutFile, - layer: LDMLKeyboard.LKLayer - ) { - // TODO-LDML: consider consolidation with keys.ts? - - let fileLayer: TouchLayout.TouchLayoutLayer = { - id: this.translateLayerIdToTouchLayoutLayerId(layer.id, layer.modifiers), - row: [] - }; - - let y = -1; - - for(let row of layer.row) { - y++; - - let fileRow: TouchLayout.TouchLayoutRow = {id: y, key: []}; - fileLayer.row.push(fileRow); - - const keys = row.keys.split(' '); - for(let key of keys) { - const keydef = source.keyboard3.keys?.key?.find(x => x.id == key); - if(keydef) { - const fileKey: TouchLayout.TouchLayoutKey = { - id: this.translateKeyIdentifierToTouch(keydef.id) as TouchLayout.TouchLayoutKeyId, - text: keydef.output || '', - // TODO-LDML: additional properties - }; - fileRow.key.push(fileKey); - } else { - // TODO-LDML: consider logging missing keys - } - } - } - - return fileLayer; - } - - private translateLayerIdToTouchLayoutLayerId(id: string, modifier: string): string { - // Touch layout layers have a set of reserved names that correspond to - // hardware modifiers. We want to map these identifiers first before falling - // back to the layer ids - - // The set of recognized layer identifiers is: - // - // touch | LDML - // ---------------+------------- - // default | none - // shift | shift - // caps | caps - // rightalt | altR - // rightalt-shift | altR shift - // - const map = { - none: 'default', - shift: 'shift', - caps: 'caps', - altR: 'rightalt', - "altR shift": 'rightalt-shift' - }; - - // canonicalize modifier string, alphabetical - // TODO-LDML: need to support multiple here - if (modifier && modifier.indexOf(',') !== -1) { - throw Error(`Internal error: TODO-LDML: multiple modifiers ${modifier} not yet supported.`); - } - modifier = (modifier||'').split(/\b/).sort().join(' ').trim(); - - if(Object.hasOwn(map, modifier)) { - return (map as any)[modifier]; - } - - // TODO-LDML: Other layer names will be used unmodified, is this sufficient? - return id; - } - - private translateKeyIdentifierToTouch(id: string): string { - // Note: keys identifiers in kmx were traditionally case-insensitive, but we - // are going to use them as case-insensitive for LDML keyboards. The set of - // standard key identifiers a-z, A-Z, 0-9 will be used, where possible, and - // all other keys will be mapped to `T_key`. - - if(id.match(/^[0-9a-zA-Z]$/)) { - return 'K_'+id; - } - - // Not a standard key - return 'T_'+id; - } -} diff --git a/developer/src/kmc-ldml/src/compiler/vars.ts b/developer/src/kmc-ldml/src/compiler/vars.ts index fb9b2f75965..3fc39f0d011 100644 --- a/developer/src/kmc-ldml/src/compiler/vars.ts +++ b/developer/src/kmc-ldml/src/compiler/vars.ts @@ -40,6 +40,14 @@ export class VarsCompiler extends SectionCompiler { return valid; } + private validateIdentifier(id: string) { + if(!id.match(VariableParser.ID)) { // From DTD + this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidVariableIdentifer({id})); + return false; + } + return true; + } + private validateVars(st: Substitutions): boolean { let valid = true; const variables = this.keyboard3?.variables; @@ -67,13 +75,28 @@ export class VarsCompiler extends SectionCompiler { if (variables) { // Strings for (const { id, value } of variables.string) { + if(!this.validateIdentifier(id)) { + valid = false; + continue; + } addId(id); - allStrings.add(id); const stringrefs = VariableParser.allStringReferences(value); + for(const ref of stringrefs) { + if(!allStrings.has(ref)) { + valid = false; + this.callbacks.reportMessage(LdmlCompilerMessages.Error_MissingStringVariable({id: ref})); + allStrings.add(ref); // avoids multiple reports of same missing variable + } + } st.string.add(SubstitutionUse.variable, stringrefs); + allStrings.add(id); } // Sets for (const { id, value } of variables.set) { + if(!this.validateIdentifier(id)) { + valid = false; + continue; + } addId(id); allSets.add(id); // check for illegal references, here. @@ -96,6 +119,10 @@ export class VarsCompiler extends SectionCompiler { } // UnicodeSets for (const { id, value } of variables.uset) { + if(!this.validateIdentifier(id)) { + valid = false; + continue; + } addId(id); allUnicodeSets.add(id); const stringrefs = VariableParser.allStringReferences(value); diff --git a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts index 6d76bc403ea..7783d42405c 100644 --- a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts +++ b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts @@ -1,6 +1,12 @@ -import { VisualKeyboard } from "@keymanapp/common-types"; -import { LDMLKeyboard, CompilerCallbacks } from "@keymanapp/developer-utils"; -import { KeysCompiler } from "./keys.js"; +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Export LDML data (https://www.unicode.org/reports/tr35/tr35-keyboards.html) + * to .kvk format. This is an interim solution until Keyman Core supports + * interrogation of the KMX+ data for OSK. + */ +import { ModifierKeyConstants, KMXPlus, VisualKeyboard } from "@keymanapp/common-types"; +import { CompilerCallbacks } from "@keymanapp/developer-utils"; import { LdmlCompilerMessages } from "./ldml-compiler-messages.js"; // This is a partial polyfill for findLast, so not polluting Array.prototype @@ -20,84 +26,139 @@ function findLast(arr: any, callback: any) { return undefined; } + +const LDML_MODIFIER_TO_KVK_MODIFIER = new Map(); +LDML_MODIFIER_TO_KVK_MODIFIER.set(ModifierKeyConstants.LCTRLFLAG, VisualKeyboard.VisualKeyboardShiftState.KVKS_LCTRL); +LDML_MODIFIER_TO_KVK_MODIFIER.set(ModifierKeyConstants.RCTRLFLAG, VisualKeyboard.VisualKeyboardShiftState.KVKS_RCTRL); +LDML_MODIFIER_TO_KVK_MODIFIER.set(ModifierKeyConstants.LALTFLAG, VisualKeyboard.VisualKeyboardShiftState.KVKS_LALT); +LDML_MODIFIER_TO_KVK_MODIFIER.set(ModifierKeyConstants.RALTFLAG, VisualKeyboard.VisualKeyboardShiftState.KVKS_RALT); +LDML_MODIFIER_TO_KVK_MODIFIER.set(ModifierKeyConstants.K_SHIFTFLAG, VisualKeyboard.VisualKeyboardShiftState.KVKS_SHIFT); +LDML_MODIFIER_TO_KVK_MODIFIER.set(ModifierKeyConstants.K_CTRLFLAG, VisualKeyboard.VisualKeyboardShiftState.KVKS_CTRL); +LDML_MODIFIER_TO_KVK_MODIFIER.set(ModifierKeyConstants.K_ALTFLAG, VisualKeyboard.VisualKeyboardShiftState.KVKS_ALT); + export class LdmlKeyboardVisualKeyboardCompiler { public constructor(private callbacks: CompilerCallbacks) { } - public compile(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile): VisualKeyboard.VisualKeyboard { + /** + * Generate a visual keyboard + * @param source Compiled KMX+ data; note that this is modified to add + * &VISUALKEYBOARD system store on success + * @param keyboardId Basename of keyboard, without file extension + * @returns Visual keyboard data on success, null on failure, or + * false if no VK was generated for this keyboard + */ + public compile(source: KMXPlus.KMXPlusData, keyboardId: string): VisualKeyboard.VisualKeyboard | boolean | null { let result = new VisualKeyboard.VisualKeyboard(); /* TODO-LDML: consider VisualKeyboardHeaderFlags.kvkhUseUnderlying kvkhDisplayUnderlying kvkhAltGr kvkh102 */ result.header.flags = 0; result.header.version = 0x0600; - - /* TODO-LDML: consider associatedKeyboard: this _must_ be set to id (aka basename sans ext) of keyboard .kmx file */ - result.header.associatedKeyboard = ''; + result.header.associatedKeyboard = keyboardId; result.header.ansiFont = {...VisualKeyboard.DEFAULT_KVK_FONT}; result.header.unicodeFont = {...VisualKeyboard.DEFAULT_KVK_FONT}; - for(let layers of source.keyboard3.layers) { - const { formId } = layers; - for(let layer of layers.layer) { - this.compileHardwareLayer(source, result, layer, formId); + let hasVisualKeyboard = false; + + for(let layersList of source.layr.lists) { + const formId = layersList.hardware.value; + if(formId == 'touch') { + continue; } + + for(let layer of layersList.layers) { + const res = this.compileHardwareLayer(source, result, layer, formId); + if(res === false) { + // failed to compile the layer + return null; + } + if(res === null) { + // not a supported layer type, but not an error + continue; + } + hasVisualKeyboard = true; + } + } + + if(!hasVisualKeyboard) { + return false; } + return result; } private compileHardwareLayer( - source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, + source: KMXPlus.KMXPlusData, vk: VisualKeyboard.VisualKeyboard, - layer: LDMLKeyboard.LKLayer, + layer: KMXPlus.LayrEntry, hardware: string, ) { - const layerId = layer.id; - if (hardware === 'touch') { - hardware = 'us'; // TODO-LDML: US Only. Do something different here? - } - const keymap = KeysCompiler.getKeymapFromForms(source.keyboard3?.forms?.form, hardware); - if (!keymap) { - this.callbacks.reportMessage( - LdmlCompilerMessages.Error_InvalidHardware({ formId: hardware }) - ); - return; + const layerId = layer.id.value; + + hardware = 'us'; // TODO-LDML: US Only. We need to clean this up for other hardware forms + + const shift = this.translateLayerModifiersToVisualKeyboardShift(layer.mod); + if(shift === null) { + // Caps (num, scroll) is not a supported shift state in .kvk + return null; } - const shift = this.translateLayerIdToVisualKeyboardShift(layer.id); + let result = true; let y = -1; - for(let row of layer.row) { + for(let row of layer.rows) { y++; - - const keys = row.keys.split(' '); let x = -1; - for(let key of keys) { - const keyId = key; + for(let key of row.keys) { x++; - //@ts-ignore - let keydef = findLast(source.keyboard3.keys?.key, x => x.id == key); + const keydef: KMXPlus.KeysKeys = findLast(source.keys?.keys, (kd: KMXPlus.KeysKeys) => kd.id.value == key.value); + const kmap = source.keys.kmap.find(k => k.key == keydef.id.value && k.mod == layer.mod); + const text = this.getDisplayFromKey(keydef, source) ?? null; - if (!keydef) { + if (!keydef || !kmap || text === null) { this.callbacks.reportMessage( - LdmlCompilerMessages.Error_KeyNotFoundInKeyBag({ keyId, layer: layerId, row: y, col: x, form: hardware }) + LdmlCompilerMessages.Error_KeyNotFoundInKeyBag({ keyId: key.value, layer: layerId, row: y, col: x, form: hardware }) ); + result = false; } else { vk.keys.push({ flags: VisualKeyboard.VisualKeyboardKeyFlags.kvkkUnicode, - shift: shift, - text: keydef.output, // TODO-LDML: displays - vkey: keymap[y][x], + shift, + text, + vkey: kmap.vkey }); } } } + return result; } - private translateLayerIdToVisualKeyboardShift(id: string) { - if(id == 'base') { - return 0; + private getDisplayFromKey(keydef: KMXPlus.KeysKeys, source: KMXPlus.KMXPlusData) { + const display = source.disp?.disps?.find(d => d.id.value == keydef.id.value || d.to.value == keydef.to.value); + return display?.display.value ?? keydef.to.value; + } + + private translateLayerModifiersToVisualKeyboardShift(modifiers: number): VisualKeyboard.VisualKeyboardShiftState { + + if(modifiers == 0) { + return VisualKeyboard.VisualKeyboardShiftState.KVKS_NORMAL; } - // TODO-LDML: other modifiers - return 0; + + if(modifiers & + (ModifierKeyConstants.CAPITALFLAG | ModifierKeyConstants.NUMLOCKFLAG | ModifierKeyConstants.SCROLLFLAG) + ) { + // Caps/Num/Scroll are not supported in .kvk, in combination or alone + return null; + } + + let shift: VisualKeyboard.VisualKeyboardShiftState = 0; + + for(const mod of LDML_MODIFIER_TO_KVK_MODIFIER.keys()) { + if(modifiers & mod) { + shift |= LDML_MODIFIER_TO_KVK_MODIFIER.get(mod); + } + } + + return shift; } } diff --git a/developer/src/kmc-ldml/test/fixtures/basic-kvk.txt b/developer/src/kmc-ldml/test/fixtures/basic-kvk.txt index 68666feacf3..da8f5e6011a 100644 --- a/developer/src/kmc-ldml/test/fixtures/basic-kvk.txt +++ b/developer/src/kmc-ldml/test/fixtures/basic-kvk.txt @@ -1,4 +1,6 @@ # +# Keyman is copyright (C) SIL International. MIT License. +# # basic-kvk.txt describes the expected output of running kmc against basic.xml to generate # a .kvk file. It is used in the end-to-end test test-visual-keyboard-compiler-e2e.ts. # @@ -10,8 +12,8 @@ block(kvkheader) 00 06 00 00 # version 0x0600 00 # flags block(associated_keyboard) - 01 00 # string len in UTF-16 code units incl zterm - 00 00 # '\0' + 06 00 # string len in UTF-16 code units incl zterm + 62 00 61 00 73 00 69 00 63 00 00 00 # 'basic\0' block(ansi_font) 06 00 # string len in UTF-16 code units incl zterm diff --git a/developer/src/kmc-ldml/test/fixtures/basic-no-debug.js b/developer/src/kmc-ldml/test/fixtures/basic-no-debug.js deleted file mode 100644 index 84168414cf8..00000000000 --- a/developer/src/kmc-ldml/test/fixtures/basic-no-debug.js +++ /dev/null @@ -1 +0,0 @@ -if(typeof keyman === 'undefined') {console.error('Keyboard requires KeymanWeb 16.0 or later');} else {KeymanWeb.KR(new Keyboard_basic());}function Keyboard_basic() {this.KI="Keyboard_basic";this.KN="TestKbd";this.KMINVER="16.0";this.KV={F: ' 1em "Arial"', K102: 0};this.KV.KLS={TODO_LDML: 2};this.KDU=1;this.KH="";this.KM=0;this.KBVER="1.0.0";this.KMBM=0;this.KVKL={"desktop":{"defaultHint":"none","layer":[{"id":"base","row":[{"id":"0","key":[{"id":"T_hmaqtugha","text":"ħ"},{"id":"T_that","text":"ថា"}]}]}],"displayUnderlying":false}};this.gs=function(t,e){return 0;};} diff --git a/developer/src/kmc-ldml/test/fixtures/basic.js b/developer/src/kmc-ldml/test/fixtures/basic.js deleted file mode 100644 index c74798cfac5..00000000000 --- a/developer/src/kmc-ldml/test/fixtures/basic.js +++ /dev/null @@ -1,48 +0,0 @@ -if(typeof keyman === 'undefined') { - console.error('Keyboard requires KeymanWeb 16.0 or later'); -} else { - KeymanWeb.KR(new Keyboard_basic()); -} -function Keyboard_basic() { - this.KI="Keyboard_basic"; - this.KN="TestKbd"; - this.KMINVER="16.0"; - this.KV={F: ' 1em "Arial"', K102: 0}; - this.KV.KLS={ - TODO_LDML: 2 - }; - this.KDU=1; - this.KH=""; - this.KM=0; - this.KBVER="1.0.0"; - this.KMBM=0; - this.KVKL={ - "desktop": { - "defaultHint": "none", - "layer": [ - { - "id": "base", - "row": [ - { - "id": "0", - "key": [ - { - "id": "T_hmaqtugha", - "text": "ħ" - }, - { - "id": "T_that", - "text": "ថា" - } - ] - } - ] - } - ], - "displayUnderlying": false - } -}; - this.gs=function(t,e){ - return 0; - }; -} diff --git a/developer/src/kmc-ldml/test/fixtures/basic.txt b/developer/src/kmc-ldml/test/fixtures/basic.txt index b471228a52c..6302a5eb276 100644 --- a/developer/src/kmc-ldml/test/fixtures/basic.txt +++ b/developer/src/kmc-ldml/test/fixtures/basic.txt @@ -1,4 +1,6 @@ # +# Keyman is copyright (C) SIL International. MIT License. +# # basic.txt describes the expected output of running kmc against basic.xml. It is used in # the end-to-end test test-compiler-e2e.ts. # @@ -402,7 +404,7 @@ block(layr) # struct COMP_KMXPLUS_LAYR { 01 00 00 00 # count 7B 00 00 00 # KMX_DWORD minDeviceWidth; // 123 # layers 0 - index(strNull,strBase,2) # KMXPLUS_STR id; + 00 00 00 00 # KMXPLUS_STR id; 00 00 00 00 # KMX_DWORD mod 00 00 00 00 # KMX_DWORD row index 01 00 00 00 # KMX_DWORD count @@ -502,7 +504,6 @@ block(strs) # struct COMP_KMXPLUS_STRS { diff(strs,strSet) sizeof(strSet,2) diff(strs,strSet2) sizeof(strSet2,2) diff(strs,strTranTo) sizeof(strTranTo,2) - diff(strs,strBase) sizeof(strBase,2) diff(strs,strElemBkspFrom2) sizeof(strElemBkspFrom2,2) diff(strs,strGapReserved) sizeof(strGapReserved,2) diff(strs,strHmaqtugha) sizeof(strHmaqtugha,2) @@ -538,7 +539,6 @@ block(strs) # struct COMP_KMXPLUS_STRS { #str #0A block(strSet2) 61 00 62 00 63 00 block(x) 00 00 # 'abc' block(strTranTo) 61 00 02 03 block(x) 00 00 # 'â' (U+0061 U+0302) - block(strBase) 62 00 61 00 73 00 65 00 block(x) 00 00 # 'base' block(strElemBkspFrom2) 65 00 block(x) 00 00 # 'e' block(strGapReserved) 67 00 61 00 70 00 20 00 28 00 72 00 65 00 73 00 65 00 72 00 76 00 65 00 64 00 29 00 block(x) 00 00 # 'gap (reserved)' block(strHmaqtugha) 68 00 6d 00 61 00 71 00 74 00 75 00 67 00 68 00 61 00 block(x) 00 00 # 'hmaqtugha' diff --git a/developer/src/kmc-ldml/test/fixtures/basic.xml b/developer/src/kmc-ldml/test/fixtures/basic.xml index c8565271ed1..168ee0ef9a0 100644 --- a/developer/src/kmc-ldml/test/fixtures/basic.xml +++ b/developer/src/kmc-ldml/test/fixtures/basic.xml @@ -1,4 +1,5 @@ + + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/row-keys-whitespace.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/row-keys-whitespace.xml new file mode 100644 index 00000000000..f8d1a629d5c --- /dev/null +++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/row-keys-whitespace.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-7.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-7.xml new file mode 100644 index 00000000000..25e7c46a1d4 --- /dev/null +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-badref-7.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-invalid-identifiers.xml b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-invalid-identifiers.xml new file mode 100644 index 00000000000..880864fd4e6 --- /dev/null +++ b/developer/src/kmc-ldml/test/fixtures/sections/vars/fail-invalid-identifiers.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/developer/src/kmc-ldml/test/helpers/index.ts b/developer/src/kmc-ldml/test/helpers/index.ts index 0285088acc3..e1463e81169 100644 --- a/developer/src/kmc-ldml/test/helpers/index.ts +++ b/developer/src/kmc-ldml/test/helpers/index.ts @@ -1,17 +1,18 @@ -/** +/* + * Keyman is copyright (C) SIL International. MIT License. + * * Helpers and utilities for the Mocha tests. */ import 'mocha'; import * as path from 'path'; import { fileURLToPath } from 'url'; import { SectionCompiler, SectionCompilerNew } from '../../src/compiler/section-compiler.js'; -import { util, KMXPlus, UnicodeSetParser, VisualKeyboard } from '@keymanapp/common-types'; +import { util, KMXPlus, UnicodeSetParser } from '@keymanapp/common-types'; import { CompilerEvent, compilerEventFormat, CompilerCallbacks, LDMLKeyboardXMLSourceFileReader, LDMLKeyboardTestDataXMLSourceFile, LDMLKeyboard, } from "@keymanapp/developer-utils"; import { LdmlKeyboardCompiler } from '../../src/main.js'; // make sure main.js compiles import { assert } from 'chai'; import { KMXPlusMetadataCompiler } from '../../src/compiler/metadata-compiler.js'; import { LdmlCompilerOptions } from '../../src/compiler/ldml-compiler-options.js'; -import { LdmlKeyboardVisualKeyboardCompiler } from '../../src/compiler/visual-keyboard-compiler.js'; import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers'; import KMXPlusFile = KMXPlus.KMXPlusFile; @@ -21,7 +22,6 @@ import Section = KMXPlus.Section; import { ElemCompiler, ListCompiler, StrsCompiler } from '../../src/compiler/empty-compiler.js'; import { KmnCompiler } from '@keymanapp/kmc-kmn'; import { VarsCompiler } from '../../src/compiler/vars.js'; -// import Vars = KMXPlus.Vars; /** * Builds a path to the fixture with the given path components. @@ -48,7 +48,7 @@ beforeEach(function() { afterEach(function() { if (this.currentTest.state !== 'passed') { - compilerTestCallbacks.messages.forEach(message => console.log(message.message)); + compilerTestCallbacks.printMessages(); } }); @@ -161,28 +161,7 @@ export async function compileKeyboard(inputFilename: string, options: LdmlCompil return kmx; } -export async function compileVisualKeyboard(inputFilename: string, options: LdmlCompilerOptions): Promise { - const k = new LdmlKeyboardCompiler(); - assert.isTrue(await k.init(compilerTestCallbacks, options)); - const source = k.load(inputFilename); - checkMessages(); - assert.isNotNull(source, 'k.load should not have returned null'); - - const valid = await k.validate(source); - checkMessages(); - assert.isTrue(valid, 'k.validate should not have failed'); - - const vk = (new LdmlKeyboardVisualKeyboardCompiler(compilerTestCallbacks)).compile(source); - checkMessages(); - assert.isNotNull(vk, 'LdmlKeyboardVisualKeyboardCompiler.compile should not have returned null'); - - return vk; -} - export function checkMessages() { - if(compilerTestCallbacks.messages.length > 0) { - console.log(compilerTestCallbacks.messages); - } assert.isEmpty(compilerTestCallbacks.messages, compilerEventFormat(compilerTestCallbacks.messages)); } diff --git a/developer/src/kmc-ldml/test/test-keymanweb-compiler.ts b/developer/src/kmc-ldml/test/test-keymanweb-compiler.ts deleted file mode 100644 index 9a14b38c33d..00000000000 --- a/developer/src/kmc-ldml/test/test-keymanweb-compiler.ts +++ /dev/null @@ -1,50 +0,0 @@ -import 'mocha'; -import { assert } from 'chai'; -import { checkMessages, compilerTestCallbacks, compilerTestOptions, makePathToFixture } from './helpers/index.js'; -import { LdmlKeyboardKeymanWebCompiler } from '../src/compiler/keymanweb-compiler.js'; -import { LdmlKeyboardCompiler } from '../src/compiler/compiler.js'; -import * as fs from 'fs'; - -describe('LdmlKeyboardKeymanWebCompiler', function() { - - it('should build a .js file', async function() { - // Let's build basic.xml - // It should generate content identical to basic.js - const inputFilename = makePathToFixture('basic.xml'); - const outputFilename = makePathToFixture('basic.js'); - const outputFilenameNoDebug = makePathToFixture('basic-no-debug.js'); - - // Load input data; we'll use the LDML keyboard compiler loader to save us - // effort here - const k = new LdmlKeyboardCompiler(); - await k.init(compilerTestCallbacks, {...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false}); - const source = k.load(inputFilename); - checkMessages(); - assert.isNotNull(source, 'k.load should not have returned null'); - - // Sanity check ... this is also checked in other tests - const valid = await k.validate(source); - checkMessages(); - assert.isTrue(valid, 'k.validate should not have failed'); - - // Actual test: compile to javascript - const jsCompiler = new LdmlKeyboardKeymanWebCompiler(compilerTestCallbacks, {...compilerTestOptions, saveDebug: true}); - const output = jsCompiler.compile('basic.xml', source); - assert.isNotNull(output); - - // Does the emitted js match? - const outputFixture = fs.readFileSync(outputFilename, 'utf-8').replaceAll(/\r\n/g, '\n'); - assert.strictEqual(output, outputFixture); - - // Second test: compile to javascript without debug formatting - const jsCompilerNoDebug = new LdmlKeyboardKeymanWebCompiler(compilerTestCallbacks, {...compilerTestOptions, saveDebug: false}); - const outputNoDebug = jsCompilerNoDebug.compile('basic.xml', source); - assert.isNotNull(outputNoDebug); - - // Does the emitted js match? The nodebug has no newline at end, but allow one in the fixture - const outputFixtureNoDebug = fs.readFileSync(outputFilenameNoDebug, 'utf-8').replaceAll(/\r\n/g, '\n').trim(); - assert.strictEqual(outputNoDebug, outputFixtureNoDebug); - - // TODO(lowpri): consider using Typescript parser to generate AST for further validation - }); -}); diff --git a/developer/src/kmc-ldml/test/test-layr.ts b/developer/src/kmc-ldml/test/test-layr.ts index 3cf0701986a..8aeb6041712 100644 --- a/developer/src/kmc-ldml/test/test-layr.ts +++ b/developer/src/kmc-ldml/test/test-layr.ts @@ -135,5 +135,30 @@ describe('layr', function () { LdmlCompilerMessages.Error_InvalidModifier({ layer: '', modifiers: 'caps bogus'}), ] }, + { + subpath: 'sections/layr/row-keys-whitespace.xml', + callback(sect) { + const layr = sect; + assert.ok(layr); + assert.equal(compilerTestCallbacks.messages.length, 0); + + assert.equal(layr.lists?.length, 1); + const list0 = layr.lists[0]; + assert.ok(list0); + assert.equal(list0.layers.length, 1); + assert.equal(list0.hardware.value, 'us'); + const layer0 = list0.layers[0]; + assert.ok(layer0); + assert.equal(layer0.rows.length, 2); + assert.equal(layer0.id.value, 'base'); + assert.equal(layer0.mod, constants.keys_mod_none); + for(const row of layer0.rows) { + assert.ok(row); + assert.equal(row.keys.length, 2); + assert.equal(row.keys[0]?.value, 'grave'); + assert.equal(row.keys[1]?.value, 'mistake'); + } + }, + }, ]); }); diff --git a/developer/src/kmc-ldml/test/test-vars.ts b/developer/src/kmc-ldml/test/test-vars.ts index 42b5d7df809..8eef17af25c 100644 --- a/developer/src/kmc-ldml/test/test-vars.ts +++ b/developer/src/kmc-ldml/test/test-vars.ts @@ -121,6 +121,16 @@ describe('vars', function () { LdmlCompilerMessages.Error_DuplicateVariable({ids: 'upper, y'}) ], }, + { + subpath: 'sections/vars/fail-invalid-identifiers.xml', + errors: [ + LdmlCompilerMessages.Error_InvalidVariableIdentifer({id: 'invalid-string'}), + LdmlCompilerMessages.Error_InvalidVariableIdentifer({id: 'invalid-set'}), + LdmlCompilerMessages.Error_InvalidVariableIdentifer({id: 'invalid-uset'}), + LdmlCompilerMessages.Error_InvalidVariableIdentifer({id: 'a_marker_name_more_than_32_chars_long'}), + LdmlCompilerMessages.Error_InvalidVariableIdentifer({id: '😡'}), + ], + }, { subpath: 'sections/vars/fail-uset-props1.xml', errors: [ @@ -187,7 +197,14 @@ describe('vars', function () { LdmlCompilerMessages.Error_MissingStringVariable({id: 'missingStringInSet'}) ], }, - ], varsDependencies); + { + subpath: 'sections/vars/fail-badref-7.xml', + errors: [ + LdmlCompilerMessages.Error_MissingStringVariable({id: 'usedBeforeDefinition'}) + ], + strictErrors: true + }, +], varsDependencies); describe('should match some marker constants', () => { // neither of these live here, but, common/web/types does not import ldml-keyboard-constants otherwise. diff --git a/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts b/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts deleted file mode 100644 index df0aea03918..00000000000 --- a/developer/src/kmc-ldml/test/test-visual-keyboard-compiler-e2e.ts +++ /dev/null @@ -1,31 +0,0 @@ -import 'mocha'; -import {assert} from 'chai'; -import hextobin from '@keymanapp/hextobin'; -import { KvkFileWriter } from '@keymanapp/common-types'; -import {checkMessages, compilerTestOptions, compileVisualKeyboard, makePathToFixture} from './helpers/index.js'; - -describe('visual-keyboard-compiler', function() { - this.slow(500); // 0.5 sec -- json schema validation takes a while - - it('should build fixtures', async function() { - // Let's build basic.xml - // It should match basic.kvk (built from basic-kvk.txt) - - const inputFilename = makePathToFixture('basic.xml'); - const binaryFilename = makePathToFixture('basic-kvk.txt'); - - // Compile the visual keyboard - const vk = await compileVisualKeyboard(inputFilename, {...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false}); - assert.isNotNull(vk); - - // Use the builder to generate the binary output file - const writer = new KvkFileWriter(); - const code = writer.write(vk); - checkMessages(); - assert.isNotNull(code); - - // Compare output - let expected = await hextobin(binaryFilename, undefined, {silent:true}); - assert.deepEqual(code, expected); - }); -}); diff --git a/developer/src/kmc-ldml/test/test-visual-keyboard-compiler.ts b/developer/src/kmc-ldml/test/test-visual-keyboard-compiler.ts new file mode 100644 index 00000000000..25e3abb47bb --- /dev/null +++ b/developer/src/kmc-ldml/test/test-visual-keyboard-compiler.ts @@ -0,0 +1,236 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + */ +import 'mocha'; +import * as path from 'path'; +import {assert} from 'chai'; +import { stripIndent } from 'common-tags'; + +import { KMX, KvkFileWriter, VisualKeyboard } from '@keymanapp/common-types'; +import hextobin from '@keymanapp/hextobin'; + +import { checkMessages, compilerTestCallbacks, compilerTestOptions, makePathToFixture } from './helpers/index.js'; + +import { LdmlKeyboardVisualKeyboardCompiler } from '../src/compiler/visual-keyboard-compiler.js'; +import { LDMLKeyboardXMLSourceFileReader } from '@keymanapp/developer-utils'; +import { LdmlKeyboardCompiler } from '../src/main.js'; + +describe('visual-keyboard-compiler', function() { + this.slow(500); // 0.5 sec -- json schema validation takes a while + + it('should build fixtures', async function() { + // Let's build basic.xml + + // It should match basic.kvk (built from basic-kvk.txt) + const inputFilename = makePathToFixture('basic.xml'); + const binaryFilename = makePathToFixture('basic-kvk.txt'); + + // Compile the visual keyboard + const k = new LdmlKeyboardCompiler(); + assert.isTrue(await k.init(compilerTestCallbacks, {...compilerTestOptions, saveDebug: true, shouldAddCompilerVersion: false})); + const source = k.load(inputFilename); + checkMessages(); + assert.isNotNull(source, 'k.load should not have returned null'); + + const valid = await k.validate(source); + checkMessages(); + assert.isTrue(valid, 'k.validate should not have failed'); + + let kmx = await k.compile(source); + assert(kmx, 'k.compile should not have failed'); + + const keyboardId = path.basename(inputFilename, '.xml'); + + const vk = (new LdmlKeyboardVisualKeyboardCompiler(compilerTestCallbacks)).compile(kmx.kmxplus, keyboardId); + checkMessages(); + assert.isNotNull(vk, 'LdmlKeyboardVisualKeyboardCompiler.compile should not have returned null'); + assert.isNotNull(kmx.keyboard.stores.find(store => + store.dwSystemID == KMX.KMXFile.TSS_VISUALKEYBOARD && + store.dpString == keyboardId + '.kvk' + )); + assert(typeof vk == 'object'); + + // Use the builder to generate the binary output file + const writer = new KvkFileWriter(); + const code = writer.write(vk); + assert.isEmpty(compilerTestCallbacks.messages); + assert.isNotNull(code); + + // Compare output + let expected = await hextobin(binaryFilename, undefined, {silent:true}); + + assert.deepEqual(code, expected); + }); + + it('should support various modifiers', async function() { + const xml = stripIndent` + + + + + + + + + + + + + + + `; + + const vk = await loadVisualKeyboardFromXml(xml, 'test'); + + assert.equal(vk.keys.length, 5); + assert.equal(vk.keys[0].shift, VisualKeyboard.VisualKeyboardShiftState.KVKS_NORMAL); + assert.equal(vk.keys[1].shift, VisualKeyboard.VisualKeyboardShiftState.KVKS_SHIFT); + assert.equal(vk.keys[2].shift, VisualKeyboard.VisualKeyboardShiftState.KVKS_RALT); + assert.equal(vk.keys[3].shift, VisualKeyboard.VisualKeyboardShiftState.KVKS_RCTRL | VisualKeyboard.VisualKeyboardShiftState.KVKS_RALT); + assert.equal(vk.keys[4].shift, VisualKeyboard.VisualKeyboardShiftState.KVKS_SHIFT | VisualKeyboard.VisualKeyboardShiftState.KVKS_RALT); + }); + + it('should emit the correct associated keyboard id', async function() { + const xml = stripIndent` + + + + + + + + + + + `; + + const vk = await loadVisualKeyboardFromXml(xml, 'test'); + + assert.equal(vk.header.associatedKeyboard, 'test'); + }); + + it('should support ', async function() { + const xml = stripIndent` + + + + + + + + + + + + + + + + `; + + const vk = await loadVisualKeyboardFromXml(xml, 'test'); + + assert.equal(vk.keys.length, 2); + assert.equal(vk.keys[0].text, 'C'); + assert.equal(vk.keys[1].text, 'D'); + }); + + it('should correctly decode \\u{xxxx}', async function() { + const xml = stripIndent` + + + + + + + + + + + + + + + `; + + const vk = await loadVisualKeyboardFromXml(xml, 'test'); + + assert.equal(vk.keys.length, 2); + assert.equal(vk.keys[0].text, '\u{0e80}'); + assert.equal(vk.keys[1].text, '\u{0e81}'); + }); + + it('should read string variables in key.output', async function() { + const xml = stripIndent` + + + + + + + + + + + + + + + `; + + const vk = await loadVisualKeyboardFromXml(xml, 'test'); + + assert.equal(vk.keys.length, 1); + assert.equal(vk.keys[0].text, '2'); + }); + + it('should read string variables in display.display', async function() { + const xml = stripIndent` + + + + + + + + + + + + + + + + + + `; + + const vk = await loadVisualKeyboardFromXml(xml, 'test'); + + assert.equal(vk.keys.length, 1); + assert.equal(vk.keys[0].text, '2'); + }); +}); + +async function loadVisualKeyboardFromXml(xml: string, id: string) { + const data = new TextEncoder().encode(xml); + assert.isOk(data); + + const reader = new LDMLKeyboardXMLSourceFileReader(compilerTestOptions.readerOptions, compilerTestCallbacks); + const source = reader.load(data); + assert.isEmpty(compilerTestCallbacks.messages); + assert.isOk(source); + + const k = new LdmlKeyboardCompiler(); + assert.isTrue(await k.init(compilerTestCallbacks, compilerTestOptions)); + + const kmx = await k.compile(source); + assert(kmx, 'k.compile should not have failed'); + + const vk = (new LdmlKeyboardVisualKeyboardCompiler(compilerTestCallbacks)).compile(kmx.kmxplus, id); + assert(typeof vk == 'object'); + assert.isEmpty(compilerTestCallbacks.messages); + assert.isOk(vk); + + return vk; +} diff --git a/developer/src/kmc-model-info/.eslintrc.cjs b/developer/src/kmc-model-info/.eslintrc.cjs index d37a4610738..494ae6b00ab 100644 --- a/developer/src/kmc-model-info/.eslintrc.cjs +++ b/developer/src/kmc-model-info/.eslintrc.cjs @@ -8,7 +8,7 @@ module.exports = { overrides: [ { files: "src/**/*.ts", - extends: ["../../../common/web/eslint/eslintNoNodeImports.js"], + extends: ["../../../common/tools/eslint/eslintNoNodeImports.js"], } ], rules: { diff --git a/developer/src/kmc-model-info/build.sh b/developer/src/kmc-model-info/build.sh index 334bfbd07bd..b1ba95c34b8 100755 --- a/developer/src/kmc-model-info/build.sh +++ b/developer/src/kmc-model-info/build.sh @@ -9,7 +9,6 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" builder_describe "Build Keyman kmc Lexical Model model-info Compiler module" \ "@/common/web/types" \ - "@/common/models/types" \ "clean" \ "configure" \ "build" \ diff --git a/developer/src/kmc-model-info/package.json b/developer/src/kmc-model-info/package.json index 23297a07ba2..20be72d1899 100644 --- a/developer/src/kmc-model-info/package.json +++ b/developer/src/kmc-model-info/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@keymanapp/common-types": "*", - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@keymanapp/developer-utils": "*" }, "devDependencies": { diff --git a/developer/src/kmc-model-info/tsconfig.json b/developer/src/kmc-model-info/tsconfig.json index 24475de0198..e4d68f11bfd 100644 --- a/developer/src/kmc-model-info/tsconfig.json +++ b/developer/src/kmc-model-info/tsconfig.json @@ -10,7 +10,6 @@ ], "references": [ { "path": "../../../common/web/types" }, - { "path": "../../../common/models/types" }, { "path": "../common/web/utils" }, ] } diff --git a/developer/src/kmc-model/.eslintrc.cjs b/developer/src/kmc-model/.eslintrc.cjs index 3d339676e2e..efa3d1a96a4 100644 --- a/developer/src/kmc-model/.eslintrc.cjs +++ b/developer/src/kmc-model/.eslintrc.cjs @@ -9,7 +9,7 @@ module.exports = { overrides: [ { files: "src/**/*.ts", - extends: ["../../../common/web/eslint/eslintNoNodeImports.js"], + extends: ["../../../common/tools/eslint/eslintNoNodeImports.js"], }, ], rules: { diff --git a/developer/src/kmc-model/build.sh b/developer/src/kmc-model/build.sh index c549648b451..372a145312a 100755 --- a/developer/src/kmc-model/build.sh +++ b/developer/src/kmc-model/build.sh @@ -8,12 +8,10 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh" -# TODO: "@/common/models/types" \ - builder_describe "Keyman kmc Lexical Model Compiler module" \ "@/common/web/keyman-version" \ "@/developer/src/common/web/test-helpers" \ - "@/common/models/templates test" \ + "@/web/src/engine/predictive-text/templates/ test" \ "clean" \ "configure" \ "build" \ diff --git a/developer/src/kmc-model/package.json b/developer/src/kmc-model/package.json index da73aabe7b1..9f95de51f8d 100644 --- a/developer/src/kmc-model/package.json +++ b/developer/src/kmc-model/package.json @@ -32,7 +32,7 @@ "dependencies": { "@keymanapp/common-types": "*", "@keymanapp/keyman-version": "*", - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "typescript": "^5.4.5" }, "devDependencies": { diff --git a/developer/src/kmc-model/src/join-word-breaker-decorator.ts b/developer/src/kmc-model/src/join-word-breaker-decorator.ts index 6d0426938a9..dec58d583ab 100644 --- a/developer/src/kmc-model/src/join-word-breaker-decorator.ts +++ b/developer/src/kmc-model/src/join-word-breaker-decorator.ts @@ -1,4 +1,4 @@ -/// +import { Span, WordBreakingFunction } from '@keymanapp/common-types'; /** * Returns a word breaker that joins spans of an existing word breaker. diff --git a/developer/src/kmc-model/src/lexical-model.ts b/developer/src/kmc-model/src/lexical-model.ts index 32d5bf5775f..f0fd95c19e6 100644 --- a/developer/src/kmc-model/src/lexical-model.ts +++ b/developer/src/kmc-model/src/lexical-model.ts @@ -3,6 +3,8 @@ * the LMLayer's internal worker code, so we provide those definitions too. */ +import { CasingFunction, LexicalModelPunctuation, WordBreakingFunction } from '@keymanapp/common-types'; + export interface LexicalModelDeclaration { readonly format: 'trie-1.0'|'fst-foma-1.0'|'custom-1.0', //... metadata ... diff --git a/developer/src/kmc-model/src/model-defaults.ts b/developer/src/kmc-model/src/model-defaults.ts index 541cadcb497..4d6c40d3a11 100644 --- a/developer/src/kmc-model/src/model-defaults.ts +++ b/developer/src/kmc-model/src/model-defaults.ts @@ -1,3 +1,5 @@ +import { CasingForm, CasingFunction } from '@keymanapp/common-types'; + /** * Converts wordforms into an indexable form. It does this by * normalizing the letter case of characters INDIVIDUALLY (to disregard @@ -104,4 +106,4 @@ export function defaultApplyCasing(casing: CasingForm, text: string): string { return text.substring(0, headUnitLength).toUpperCase() // head - uppercased .concat(text.substring(headUnitLength)); // tail - lowercased } -} \ No newline at end of file +} diff --git a/developer/src/kmc-model/src/model-definitions.ts b/developer/src/kmc-model/src/model-definitions.ts index d05a8254ce5..ccef469c91e 100644 --- a/developer/src/kmc-model/src/model-definitions.ts +++ b/developer/src/kmc-model/src/model-definitions.ts @@ -5,6 +5,7 @@ import { defaultApplyCasing, import KEYMAN_VERSION from "@keymanapp/keyman-version"; import { LexicalModelSource, WordformToKeySpec } from "./lexical-model.js"; +import { CasingForm, CasingFunction } from '@keymanapp/common-types'; /** * Processes certain defined model behaviors in such a way that the needed closures @@ -219,4 +220,4 @@ export class ModelDefinitions { } // Because it references the class field, this line must come afterward. -const PSEUDOCLOSURE = ModelDefinitions.COMPILED_NAME; \ No newline at end of file +const PSEUDOCLOSURE = ModelDefinitions.COMPILED_NAME; diff --git a/developer/src/kmc-model/src/script-overrides-decorator.ts b/developer/src/kmc-model/src/script-overrides-decorator.ts index 544f1b03869..ebf08b819e2 100644 --- a/developer/src/kmc-model/src/script-overrides-decorator.ts +++ b/developer/src/kmc-model/src/script-overrides-decorator.ts @@ -1,3 +1,4 @@ +import { Span, WordBreakingFunction } from '@keymanapp/common-types'; import { OverrideScriptDefaults } from "./lexical-model.js"; import { ModelCompilerError, ModelCompilerMessages } from "./model-compiler-messages.js"; diff --git a/developer/src/kmc-model/test/helpers/index.ts b/developer/src/kmc-model/test/helpers/index.ts index e7d274f5712..d58e0834d11 100644 --- a/developer/src/kmc-model/test/helpers/index.ts +++ b/developer/src/kmc-model/test/helpers/index.ts @@ -1,5 +1,3 @@ -/// - /** * Helpers and utilities for the Mocha tests. */ diff --git a/developer/src/kmc-model/test/test-compile-model-with-pseudoclosure.ts b/developer/src/kmc-model/test/test-compile-model-with-pseudoclosure.ts index 08247e17c1d..049776ec201 100644 --- a/developer/src/kmc-model/test/test-compile-model-with-pseudoclosure.ts +++ b/developer/src/kmc-model/test/test-compile-model-with-pseudoclosure.ts @@ -4,6 +4,7 @@ import 'mocha'; import { makePathToFixture, compileModelSourceCode } from './helpers/index.js'; import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers'; +import { CasingForm, CasingFunction } from '@keymanapp/common-types'; describe('LexicalModelCompiler - pseudoclosure compilation + use', function () { const callbacks = new TestCompilerCallbacks(); diff --git a/developer/src/kmc-model/test/test-compile-trie.ts b/developer/src/kmc-model/test/test-compile-trie.ts index a9829568370..845022cef5c 100644 --- a/developer/src/kmc-model/test/test-compile-trie.ts +++ b/developer/src/kmc-model/test/test-compile-trie.ts @@ -8,6 +8,7 @@ import { createTrieDataStructure } from '../src/build-trie.js'; import { ModelCompilerError } from '../src/model-compiler-messages.js'; import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers'; import { TrieModel } from '@keymanapp/models-templates'; +import { Span } from '@keymanapp/common-types'; describe('LexicalModelCompiler', function () { const callbacks = new TestCompilerCallbacks(); diff --git a/developer/src/kmc-model/test/test-default-search-term-to-key.ts b/developer/src/kmc-model/test/test-default-search-term-to-key.ts index b777c7c79c3..0f8120e6bae 100644 --- a/developer/src/kmc-model/test/test-default-search-term-to-key.ts +++ b/developer/src/kmc-model/test/test-default-search-term-to-key.ts @@ -4,6 +4,7 @@ import {assert} from 'chai'; import { defaultSearchTermToKey, defaultCasedSearchTermToKey, defaultApplyCasing } from '../src/model-defaults.js'; +import { CasingForm, CasingFunction } from '@keymanapp/common-types'; describe('The default searchTermToKey() function', function () { diff --git a/developer/src/kmc-model/test/test-join-word-breaker.ts b/developer/src/kmc-model/test/test-join-word-breaker.ts index b08411cb561..ff220088f5c 100644 --- a/developer/src/kmc-model/test/test-join-word-breaker.ts +++ b/developer/src/kmc-model/test/test-join-word-breaker.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; import defaultWordBreaker from '@keymanapp/models-wordbreakers'; import {decorateWithJoin} from '../src/join-word-breaker-decorator.js'; +import { Span } from '@keymanapp/common-types'; describe('The join word breaker decorator', function () { it('should decorate an existing word breaker', function () { diff --git a/developer/src/kmc-model/test/test-model-definitions.ts b/developer/src/kmc-model/test/test-model-definitions.ts index 297bb1a995b..ee569a01b1a 100644 --- a/developer/src/kmc-model/test/test-model-definitions.ts +++ b/developer/src/kmc-model/test/test-model-definitions.ts @@ -2,6 +2,7 @@ import 'mocha'; import { assert } from 'chai'; import { ModelDefinitions } from '../src/model-definitions.js'; import { LexicalModelSource } from '../src/lexical-model.js'; +import { CasingForm, CasingFunction } from '@keymanapp/common-types'; describe('Model definition pseudoclosures', function () { describe('14.0 defaults', function() { @@ -195,4 +196,4 @@ describe('Model definition pseudoclosures', function () { }); } }); -}); \ No newline at end of file +}); diff --git a/developer/src/kmc-model/test/test-override-script-defaults.ts b/developer/src/kmc-model/test/test-override-script-defaults.ts index a0500320fd9..b8afb18900b 100644 --- a/developer/src/kmc-model/test/test-override-script-defaults.ts +++ b/developer/src/kmc-model/test/test-override-script-defaults.ts @@ -1,6 +1,7 @@ import { assert } from "chai"; import defaultWordBreaker from '@keymanapp/models-wordbreakers'; import {decorateWithScriptOverrides} from '../src/script-overrides-decorator.js'; +import { Span } from '@keymanapp/common-types'; const THIN_SPACE = "\u2009"; diff --git a/developer/src/kmc-model/tsconfig.json b/developer/src/kmc-model/tsconfig.json index 724ebd74d0b..2400856d265 100644 --- a/developer/src/kmc-model/tsconfig.json +++ b/developer/src/kmc-model/tsconfig.json @@ -12,7 +12,6 @@ ], "references": [ { "path": "../../../common/web/keyman-version" }, - { "path": "../../../common/models/types" }, { "path": "../../../common/web/types" }, ] } diff --git a/developer/src/kmc-package/.eslintrc.cjs b/developer/src/kmc-package/.eslintrc.cjs index 09038ae9291..41a487fe41d 100644 --- a/developer/src/kmc-package/.eslintrc.cjs +++ b/developer/src/kmc-package/.eslintrc.cjs @@ -6,7 +6,7 @@ module.exports = { overrides: [ { files:"src/**/*.ts", - extends: ["../../../common/web/eslint/eslintNoNodeImports.js"], + extends: ["../../../common/tools/eslint/eslintNoNodeImports.js"], } ], rules: { diff --git a/developer/src/kmc-package/src/compiler/kmp-compiler.ts b/developer/src/kmc-package/src/compiler/kmp-compiler.ts index 04688d0e5a2..1708d69704c 100644 --- a/developer/src/kmc-package/src/compiler/kmp-compiler.ts +++ b/developer/src/kmc-package/src/compiler/kmp-compiler.ts @@ -1,4 +1,4 @@ -import { xml2js } from '@keymanapp/developer-utils'; +import { KeymanXMLReader } from '@keymanapp/developer-utils'; import JSZip from 'jszip'; import KEYMAN_VERSION from "@keymanapp/keyman-version"; @@ -180,12 +180,10 @@ export class KmpCompiler implements KeymanCompiler { const kpsPackage = (() => { let a: KpsFile.KpsPackage; - let parser = new xml2js.Parser({ - explicitArray: false - }); try { - parser.parseString(data, (e: unknown, r: unknown) => { if(e) throw e; a = r as KpsFile.KpsPackage }); + a = new KeymanXMLReader('kps') + .parse(data.toString()) as KpsFile.KpsPackage; } catch(e) { this.callbacks.reportMessage(PackageCompilerMessages.Error_InvalidPackageFile({e})); } diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh index a3bf11774a9..a39808a546f 100755 --- a/developer/src/kmc/build.sh +++ b/developer/src/kmc/build.sh @@ -16,6 +16,7 @@ builder_describe "Build Keyman Keyboard Compiler kmc" \ "@/common/include" \ "@/common/web/keyman-version" \ "@/common/web/types" \ + "@/core/include/ldml" \ "@/developer/src/common/web/utils" \ "@/developer/src/kmc-analyze" \ "@/developer/src/kmc-keyboard-info" \ diff --git a/developer/src/kmc/package.json b/developer/src/kmc/package.json index d6486e16852..4d36bb1e98c 100644 --- a/developer/src/kmc/package.json +++ b/developer/src/kmc/package.json @@ -44,7 +44,7 @@ "@keymanapp/kmc-model": "*", "@keymanapp/kmc-model-info": "*", "@keymanapp/kmc-package": "*", - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@sentry/node": "^7.57.0", "chalk": "^2.4.2", "commander": "^10.0.0", diff --git a/developer/src/kmcmplib/include/kmcmplibapi.h b/developer/src/kmcmplib/include/kmcmplibapi.h index c41ba53eaa0..536d4fff0d4 100644 --- a/developer/src/kmcmplib/include/kmcmplibapi.h +++ b/developer/src/kmcmplib/include/kmcmplibapi.h @@ -1,5 +1,7 @@ #pragma once +#include + #include #include diff --git a/developer/src/kmcmplib/src/Compiler.cpp b/developer/src/kmcmplib/src/Compiler.cpp index 313cc859e59..57702ee1f0f 100644 --- a/developer/src/kmcmplib/src/Compiler.cpp +++ b/developer/src/kmcmplib/src/Compiler.cpp @@ -2213,10 +2213,9 @@ KMX_DWORD GetXStringImpl(PKMX_WCHAR tstr, PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX { KMX_WCHAR *context = NULL; - KMX_WCHAR sep_com[3] = u" ,"; - PKMX_WCHAR p_sep_com = sep_com; - r = u16tok(q, p_sep_com, &context); // I3481 + r = u16tok(q, ',', &context); if (!r) return KmnCompilerMessages::ERROR_InvalidIndex; + r = u16trim(r); for (i = 0; i < fk->cxStoreArray; i++) { @@ -2226,8 +2225,10 @@ KMX_DWORD GetXStringImpl(PKMX_WCHAR tstr, PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX kmcmp::CheckStoreUsage(fk, i, TRUE, FALSE, FALSE); - r = u16tok(NULL, p_sep_com, &context); // I3481 - if (!r || !*r || !isIntegerWstring(r) || atoiW(r) < 1) return KmnCompilerMessages::ERROR_InvalidIndex; + r = context; + if (!r || !*r ) return KmnCompilerMessages::ERROR_InvalidIndex; + r = u16trim(r); + if (!isIntegerWstring(r) || atoiW(r) < 1) return KmnCompilerMessages::ERROR_InvalidIndex; } tstr[mx++] = UC_SENTINEL; tstr[mx++] = CODE_INDEX; diff --git a/developer/src/kmcmplib/tests/gtest-compiler-test.cpp b/developer/src/kmcmplib/tests/gtest-compiler-test.cpp index aab01f8131c..39c47372d42 100644 --- a/developer/src/kmcmplib/tests/gtest-compiler-test.cpp +++ b/developer/src/kmcmplib/tests/gtest-compiler-test.cpp @@ -26,7 +26,9 @@ KMX_DWORD ProcessKeyLineImpl(PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX_BOOL IsUnico namespace kmcmp { extern int nErrors; + extern int currentLine; extern int ErrChr; + extern std::string messageFilename; extern int BeginLine[4]; extern int CompileTarget; } @@ -49,7 +51,9 @@ class CompilerTest : public testing::Test { kmcmp::msgproc = msgproc_collect; msgproc_errors.clear(); kmcmp::nErrors = 0; + kmcmp::currentLine = 0; kmcmp::ErrChr = 0; + kmcmp::messageFilename = ""; kmcmp::BeginLine[BEGIN_ANSI] = -1; kmcmp::BeginLine[BEGIN_UNICODE] = -1; kmcmp::BeginLine[BEGIN_NEWCONTEXT] = -1; @@ -126,42 +130,48 @@ TEST_F(CompilerTest, wstrtostr_test) { EXPECT_EQ(0, strcmp("", wstrtostr((PKMX_WCHAR)u""))); }; -// TEST_F(CompilerTest, ReportCompilerMessage_test) { -// msgproc = msgproc_true_stub; -// kmcmp::ErrChr = 0; - -// // SevFatal -// EXPECT_EQ(0, kmcmp::nErrors); -// EXPECT_EQ(SevFatal, KmnCompilerMessages::FATAL_CannotCreateTempfile & SevFatal); -// EXPECT_TRUE(ReportCompilerMessage(KmnCompilerMessages::FATAL_CannotCreateTempfile)); -// EXPECT_EQ(1, kmcmp::nErrors); - -// // SevError -// EXPECT_EQ(SevError, KmnCompilerMessages::ERROR_InvalidLayoutLine & SevError); -// EXPECT_FALSE(ReportCompilerMessage(KmnCompilerMessages::ERROR_InvalidLayoutLine)); -// EXPECT_EQ(2, kmcmp::nErrors); - -// // Unknown -// const KMX_DWORD UNKNOWN_ERROR = 0x00004FFF; // top of range ERROR -// EXPECT_EQ(SevError, UNKNOWN_ERROR & SevError); -// EXPECT_FALSE(ReportCompilerMessage(UNKNOWN_ERROR)); -// sprintf(expected, "Unknown error %x", UNKNOWN_ERROR); -// EXPECT_EQ(3, kmcmp::nErrors); - -// // ErrChr -// const int ERROR_CHAR_INDEX = 42; -// kmcmp::ErrChr = ERROR_CHAR_INDEX ; -// EXPECT_EQ(SevError, KmnCompilerMessages::ERROR_InvalidLayoutLine & SevError); -// EXPECT_FALSE(ReportCompilerMessage(KmnCompilerMessages::ERROR_InvalidLayoutLine)); -// kmcmp::ErrChr = 0; -// EXPECT_EQ(4, kmcmp::nErrors); - -// // msgproc returns FALSE -// msgproc = msgproc_false_stub; -// EXPECT_EQ(SevError, KmnCompilerMessages::ERROR_InvalidLayoutLine & SevError); -// EXPECT_TRUE(ReportCompilerMessage(KmnCompilerMessages::ERROR_InvalidLayoutLine)); -// EXPECT_EQ(6, kmcmp::nErrors); -// }; +TEST_F(CompilerTest, ReportCompilerMessage_test) { + kmcmp::msgproc = msgproc_collect; + kmcmp::currentLine = 42; + std::vector params{"parameter"}; + kmcmp::messageFilename = "filename"; + kmcmp::ErrChr = 0; + + // SevFatal + EXPECT_EQ(0, kmcmp::nErrors); + EXPECT_EQ(SevFatal, KmnCompilerMessages::FATAL_CannotCreateTempfile & SevFatal); + ReportCompilerMessage(KmnCompilerMessages::FATAL_CannotCreateTempfile, params); + EXPECT_EQ(1, kmcmp::nErrors); + EXPECT_EQ(KmnCompilerMessages::FATAL_CannotCreateTempfile, msgproc_errors[0].errorCode); + EXPECT_EQ(kmcmp::currentLine+1, msgproc_errors[0].lineNumber); + EXPECT_EQ(kmcmp::ErrChr, msgproc_errors[0].columnNumber); + EXPECT_TRUE(msgproc_errors[0].filename == kmcmp::messageFilename); + EXPECT_TRUE(msgproc_errors[0].parameters == params); + + // SevError + EXPECT_EQ(SevError, KmnCompilerMessages::ERROR_InvalidLayoutLine & SevError); + ReportCompilerMessage(KmnCompilerMessages::ERROR_InvalidLayoutLine); + EXPECT_EQ(2, kmcmp::nErrors); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidLayoutLine, msgproc_errors[1].errorCode); + + // SevWarn + EXPECT_EQ(SevWarn, KmnCompilerMessages::WARN_ReservedCharacter & SevWarn); + ReportCompilerMessage(KmnCompilerMessages::WARN_ReservedCharacter); + EXPECT_EQ(2, kmcmp::nErrors); + EXPECT_EQ(KmnCompilerMessages::WARN_ReservedCharacter, msgproc_errors[2].errorCode); + + // SevHint + EXPECT_EQ(SevHint, KmnCompilerMessages::HINT_NonUnicodeFile & SevHint); + ReportCompilerMessage(KmnCompilerMessages::HINT_NonUnicodeFile); + EXPECT_EQ(2, kmcmp::nErrors); + EXPECT_EQ(KmnCompilerMessages::HINT_NonUnicodeFile, msgproc_errors[3].errorCode); + + // SevInfo + EXPECT_EQ(SevInfo, KmnCompilerMessages::INFO_MinimumCoreEngineVersion & SevInfo); + ReportCompilerMessage(KmnCompilerMessages::INFO_MinimumCoreEngineVersion); + EXPECT_EQ(2, kmcmp::nErrors); + EXPECT_EQ(KmnCompilerMessages::INFO_MinimumCoreEngineVersion, msgproc_errors[4].errorCode); +}; TEST_F(CompilerTest, ProcessBeginLine_test) { KMX_WCHAR str[LINESIZE]; @@ -795,7 +805,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_a_test) { u16cpy(str, u"any()"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidAny, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // KmnCompilerMessages::ERROR_InvalidAny, space in delimiters (see I11814, I11937, #11910, #11894, #11938) + // KmnCompilerMessages::ERROR_InvalidAny, space in delimiters (see #11814, #11937, #11910, #11894, #11938) u16cpy(str, u"any( )"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidAny, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); @@ -827,15 +837,13 @@ TEST_F(CompilerTest, GetXStringImpl_type_a_test) { u16cpy(str, u"any( b)"); file_store[1].dpString = (PKMX_WCHAR)u"abc"; // non-empty EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_any_space_before_valid[] = { UC_SENTINEL, CODE_ANY, 2, 0 }; - EXPECT_EQ(0, u16cmp(tstr_any_space_before_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_any_valid, tstr)); - // space after store, valid (see I11937, #11938) + // space after store, valid (see #11937, #11938) u16cpy(str, u"any(b )"); file_store[1].dpString = (PKMX_WCHAR)u"abc"; // non-empty EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_any_space_after_valid[] = { UC_SENTINEL, CODE_ANY, 2, 0 }; - EXPECT_EQ(0, u16cmp(tstr_any_space_after_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_any_valid, tstr)); } // tests strings starting with 'b' @@ -877,7 +885,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_b_test) { u16cpy(str, u"baselayout()"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // baselayout, space in delimiters (see I11814, I11937, #11910, #11894, #11938) + // baselayout, space in delimiters (see #11814, #11937, #11910, #11894, #11938) fileKeyboard.version = VERSION_90; u16cpy(str, u"baselayout( )"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); @@ -902,17 +910,15 @@ TEST_F(CompilerTest, GetXStringImpl_type_b_test) { fileKeyboard.dpStoreArray = nullptr; u16cpy(str, u"baselayout( beep)"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_baselayout_space_before_valid[] = { UC_SENTINEL, CODE_IFSYSTEMSTORE, TSS_BASELAYOUT+1, 2, 1, 0 }; - EXPECT_EQ(0, u16cmp(tstr_baselayout_space_before_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_baselayout_valid, tstr)); - // baselayout, space after argument, valid (see I11937, #11938) + // baselayout, space after argument, valid (see #11937, #11938) fileKeyboard.version = VERSION_90; fileKeyboard.cxStoreArray = 0; fileKeyboard.dpStoreArray = nullptr; u16cpy(str, u"baselayout(beep )"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_baselayout_space_after_valid[] = { UC_SENTINEL, CODE_IFSYSTEMSTORE, TSS_BASELAYOUT+1, 2, 1, 0 }; - EXPECT_EQ(0, u16cmp(tstr_baselayout_space_after_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_baselayout_valid, tstr)); } // tests strings starting with 'i' @@ -953,7 +959,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_i_test) { u16cpy(str, u"if()"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidIf, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // if, space in delimiters (see I11814, I11937, #11910, #11894, #11938) + // if, space in delimiters (see #11814, #11937, #11910, #11894, #11938) fileKeyboard.version = VERSION_80; fileKeyboard.dwFlags = 0u; u16cpy(str, u"if( )"); @@ -1012,8 +1018,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_i_test) { option[1].fIsOption = TRUE; u16cpy(str, u"if(b =beep)"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_if_option_space_before_assign_valid[] = { UC_SENTINEL, CODE_IFOPT, 2, 2, 4, 0 }; - EXPECT_EQ(0, u16cmp(tstr_if_option_space_before_assign_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_if_option_valid, tstr)); // if, option, equal, space before rhs, valid fileKeyboard.version = VERSION_80; @@ -1022,18 +1027,16 @@ TEST_F(CompilerTest, GetXStringImpl_type_i_test) { option[1].fIsOption = TRUE; u16cpy(str, u"if(b= beep)"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_if_option_space_before_rhs_valid[] = { UC_SENTINEL, CODE_IFOPT, 2, 2, 4, 0 }; - EXPECT_EQ(0, u16cmp(tstr_if_option_space_before_rhs_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_if_option_valid, tstr)); - // if, option, equal, space after rhs, valid (see I11937, #11938) + // if, option, equal, space after rhs, valid (see #11937, #11938) fileKeyboard.version = VERSION_80; fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = option; option[1].fIsOption = TRUE; u16cpy(str, u"if(b=beep )"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_if_option_space_after_rhs_valid[] = { UC_SENTINEL, CODE_IFOPT, 2, 2, 4, 0 }; - EXPECT_EQ(0, u16cmp(tstr_if_option_space_after_rhs_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_if_option_valid, tstr)); delete[] option; PFILE_STORE file_store = new FILE_STORE[100]; @@ -1054,7 +1057,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_i_test) { u16cpy(str, u"index()"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidIndex, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // index, space in delimiters (see I11814, I11937, #11910, #11894, #11938) + // index, space in delimiters (see #11814, #11937, #11910, #11894, #11938) u16cpy(str, u"index( )"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidIndex, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); @@ -1091,34 +1094,50 @@ TEST_F(CompilerTest, GetXStringImpl_type_i_test) { fileKeyboard.dpStoreArray = file_store; u16cpy(str, u"index(b,4)"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_index_comma_valid[] = { UC_SENTINEL, CODE_INDEX, 2, 4, 0 }; - EXPECT_EQ(0, u16cmp(tstr_index_comma_valid, tstr)); + const KMX_WCHAR tstr_index_valid[] = { UC_SENTINEL, CODE_INDEX, 2, 4, 0 }; + EXPECT_EQ(0, u16cmp(tstr_index_valid, tstr)); // index, space before store, comma, valid fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; u16cpy(str, u"index( b,4)"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_index_initial_space_and_comma_valid[] = { UC_SENTINEL, CODE_INDEX, 2, 4, 0 }; - EXPECT_EQ(0, u16cmp(tstr_index_initial_space_and_comma_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_index_valid, tstr)); + + // index, space after store, comma, valid + fileKeyboard.cxStoreArray = 3u; + fileKeyboard.dpStoreArray = file_store; + u16cpy(str, u"index(b ,4)"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + EXPECT_EQ(0, u16cmp(tstr_index_valid, tstr)); // index, comma and space, valid fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; u16cpy(str, u"index(b, 4)"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_index_comma_and_space_valid[] = { UC_SENTINEL, CODE_INDEX, 2, 4, 0 }; - EXPECT_EQ(0, u16cmp(tstr_index_comma_and_space_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_index_valid, tstr)); - // index, space, valid ... should not be valid (see issue #11833) - u16cpy(str, u"index(b 4)"); + // index, comma, space after offset, valid fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; + u16cpy(str, u"index(b,4 )"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_index_space_valid[] = { UC_SENTINEL, CODE_INDEX, 2, 4, 0 }; - EXPECT_EQ(0, u16cmp(tstr_index_space_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_index_valid, tstr)); + + // index, space, KmnCompilerMessages::ERROR_StoreDoesNotExist (see issue #11833) + u16cpy(str, u"index(b 4)"); // store name appears to be 'b 4' + fileKeyboard.cxStoreArray = 3u; + fileKeyboard.dpStoreArray = file_store; + EXPECT_EQ(KmnCompilerMessages::ERROR_StoreDoesNotExist, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // index, two commas and extra parameter, KmnCompilerMessages::ERROR_InvalidIndex + u16cpy(str, u"index(b,4,5)"); + fileKeyboard.cxStoreArray = 3u; + fileKeyboard.dpStoreArray = file_store; + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidIndex, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // index, two-digit parameter, valid + // index, two-digit offset, valid u16cpy(str, u"index(b,42)"); fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; @@ -1126,25 +1145,25 @@ TEST_F(CompilerTest, GetXStringImpl_type_i_test) { const KMX_WCHAR tstr_index_two_digit_valid[] = { UC_SENTINEL, CODE_INDEX, 2, 42, 0 }; EXPECT_EQ(0, u16cmp(tstr_index_two_digit_valid, tstr)); - // index, comma, non-digit parameter, KmnCompilerMessages::ERROR_InvalidIndex + // index, comma, non-digit offset, KmnCompilerMessages::ERROR_InvalidIndex u16cpy(str, u"index(b,g)"); fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidIndex, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // index, comma, no parameter, KmnCompilerMessages::ERROR_InvalidIndex + // index, comma, no offset, KmnCompilerMessages::ERROR_InvalidIndex u16cpy(str, u"index(b,)"); fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidIndex, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // index, space and comma, no parameter, KmnCompilerMessages::ERROR_InvalidIndex + // index, space and comma, no offset, KmnCompilerMessages::ERROR_InvalidIndex u16cpy(str, u"index(b ,)"); fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidIndex, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // index, comma, no parameter but space, KmnCompilerMessages::ERROR_InvalidIndex + // index, comma, no offset but space, KmnCompilerMessages::ERROR_InvalidIndex u16cpy(str, u"index(b, )"); fileKeyboard.cxStoreArray = 3u; fileKeyboard.dpStoreArray = file_store; @@ -1180,7 +1199,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_o_test) { u16cpy(str, u"outs()"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidOuts, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // outs, space in delimiters (see I11814, I11937, #11910, #11894, #11938) + // outs, space in delimiters (see #11814, #11937, #11910, #11894, #11938) u16cpy(str, u"outs( )"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidOuts, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); @@ -1214,15 +1233,13 @@ TEST_F(CompilerTest, GetXStringImpl_type_o_test) { file_store[1].dpString = (PKMX_WCHAR)u"abc"; u16cpy(str, u"outs( b)"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_outs_space_before_valid[] = { 'a', 'b', 'c', 0 }; - EXPECT_EQ(0, u16cmp(tstr_outs_space_before_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_outs_valid, tstr)); - // outs, space after store, valid (see I11937, #11938) + // outs, space after store, valid (see #11937, #11938) file_store[1].dpString = (PKMX_WCHAR)u"abc"; u16cpy(str, u"outs(b )"); EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - const KMX_WCHAR tstr_outs_space_after_valid[] = { 'a', 'b', 'c', 0 }; - EXPECT_EQ(0, u16cmp(tstr_outs_space_after_valid, tstr)); + EXPECT_EQ(0, u16cmp(tstr_outs_valid, tstr)); } // tests strings starting with 'c' @@ -1241,6 +1258,95 @@ TEST_F(CompilerTest, GetXStringImpl_type_c_test) { u16cpy(file_store[1].szName, u"b"); u16cpy(file_store[2].szName, u"c"); + // are comments stripped before this point? + // if so, why the test on whitespace after 'c'? + + // KmnCompilerMessages::ERROR_InvalidToken + fileKeyboard.version = VERSION_60; + u16cpy(str, u"cde"); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // context, KmnCompilerMessages::ERROR_ContextInVirtualKeySection *** TODO *** + + // context, no offset, valid + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_context_no_offset_valid[] = { UC_SENTINEL, CODE_CONTEXT, 0 }; + EXPECT_EQ(0, u16cmp(tstr_context_no_offset_valid, tstr)); + + // context, KmnCompilerMessages::ERROR_InvalidToken, no close delimiter => NULL + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context("); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // context, empty delimiters => empty string, valid + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context()"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_context_empty_offset_valid[] = { UC_SENTINEL, CODE_CONTEXT, 0 }; + EXPECT_EQ(0, u16cmp(tstr_context_empty_offset_valid, tstr)); + + // context, space in delimiters (see #11814, #11937, #11910, #11894, #11938) + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context( )"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // context, offset, valid + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context(1)"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_context_offset_valid[] = { UC_SENTINEL, CODE_CONTEXTEX, 1, 0 }; + EXPECT_EQ(0, u16cmp(tstr_context_offset_valid, tstr)); + + // context, CERR_InvalidToke, offset < 1 + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context(0)"); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // context, large offset < 0xF000, valid + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context(61439)"); //0xF000 - 1 + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_context_large_offset_valid[] = { UC_SENTINEL, CODE_CONTEXTEX, 61439, 0 }; + EXPECT_EQ(0, u16cmp(tstr_context_large_offset_valid, tstr)); + + // context, KmnCompilerMessages::ERROR_InvalidToken, too large offset == 0xF000 + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context(61440)"); //0xF000 + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // context, KmnCompilerMessages::ERROR_60FeatureOnly_Contextn + fileKeyboard.version = VERSION_50; + u16cpy(str, u"context(1)"); + EXPECT_EQ(KmnCompilerMessages::ERROR_60FeatureOnly_Contextn, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // context, valid + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context(1)"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_context_valid[] = { UC_SENTINEL, CODE_CONTEXTEX, 1, 0 }; + EXPECT_EQ(0, u16cmp(tstr_context_valid, tstr)); + + // context, space before offset, valid + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context( 1)"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + EXPECT_EQ(0, u16cmp(tstr_context_valid, tstr)); + + // context, space after offset, valid (see #11937, #11938) + fileKeyboard.version = VERSION_60; + u16cpy(str, u"context(1 )"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + EXPECT_EQ(0, u16cmp(tstr_context_valid, tstr)); + + // clearcontext, valid + fileKeyboard.version = VERSION_60; + u16cpy(str, u"clearcontext"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_clearcontext_valid[] = { UC_SENTINEL, CODE_CLEARCONTEXT, 0 }; + EXPECT_EQ(0, u16cmp(tstr_clearcontext_valid, tstr)); + // call, KmnCompilerMessages::ERROR_501FeatureOnly_Call fileKeyboard.version = VERSION_50; u16cpy(str, u"call"); @@ -1258,7 +1364,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_c_test) { u16cpy(str, u"call()"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidCall, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); - // call, space in delimiters (see I11814, I11937, #11910, #11894, #11938) + // call, space in delimiters (see #11814, #11937, #11910, #11894, #11938) fileKeyboard.version = VERSION_501; u16cpy(str, u"call( )"); EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidCall, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); @@ -1303,7 +1409,7 @@ TEST_F(CompilerTest, GetXStringImpl_type_c_test) { EXPECT_EQ(0, u16cmp(tstr_call_valid, tstr)); EXPECT_EQ(TSS_CALLDEFINITION, file_store[1].dwSystemID); - // call, space after store, valid (see I11937, #11938) + // call, space after store, valid (see #11937, #11938) fileKeyboard.version = VERSION_501; file_store[1].dpString = (PKMX_WCHAR)u"a.dll:A"; file_store[1].dwSystemID = TSS_NONE; @@ -1313,6 +1419,147 @@ TEST_F(CompilerTest, GetXStringImpl_type_c_test) { EXPECT_EQ(TSS_CALLDEFINITION, file_store[1].dwSystemID); } +// tests strings starting with 'n' +TEST_F(CompilerTest, GetXStringImpl_type_n_test) { + KMX_WCHAR tstr[128]; + fileKeyboard.version = VERSION_70; + KMX_WCHAR str[LINESIZE]; + KMX_WCHAR output[GLOBAL_BUFSIZE]; + PKMX_WCHAR newp = nullptr; + PFILE_STORE file_store = new FILE_STORE[100]; + fileKeyboard.cxStoreArray = 3u; + fileKeyboard.dpStoreArray = file_store; + u16cpy(file_store[0].szName, u"a"); + u16cpy(file_store[1].szName, u"b"); + u16cpy(file_store[2].szName, u"c"); + + // KmnCompilerMessages::ERROR_InvalidToken + fileKeyboard.version = VERSION_70; + u16cpy(str, u"nmo"); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, KmnCompilerMessages::ERROR_60FeatureOnly_Contextn + fileKeyboard.version = VERSION_60; + u16cpy(str, u"notany"); + EXPECT_EQ(KmnCompilerMessages::ERROR_70FeatureOnly, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, KmnCompilerMessages::ERROR_AnyInVirtualKeySection *** TODO *** + + // notany, no close delimiter => NULL + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany("); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidAny, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, empty delimiters => empty string + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany()"); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidAny, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, space in delimiters (see #11814, #11937, #11910, #11894, #11938) + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany( )"); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidAny, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, KmnCompilerMessages::ERROR_StoreDoesNotExist + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany(d)"); + EXPECT_EQ(KmnCompilerMessages::ERROR_StoreDoesNotExist, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, KmnCompilerMessages::ERROR_StoreDoesNotExist, space before store + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany( d)"); + EXPECT_EQ(KmnCompilerMessages::ERROR_StoreDoesNotExist, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, KmnCompilerMessages::ERROR_StoreDoesNotExist, space after store + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany(d )"); + EXPECT_EQ(KmnCompilerMessages::ERROR_StoreDoesNotExist, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // notany, valid + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany(b)"); + file_store[1].dpString = (PKMX_WCHAR)u"abc"; // non-empty + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_notany_valid[] = { UC_SENTINEL, CODE_NOTANY, 2, 0 }; + EXPECT_EQ(0, u16cmp(tstr_notany_valid, tstr)); + + // notany, valid, empy store + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany(b)"); + file_store[1].dpString = (PKMX_WCHAR)u""; // empty + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + EXPECT_EQ(0, u16cmp(tstr_notany_valid, tstr)); + + // notany, space before store, valid + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany( b)"); + file_store[1].dpString = (PKMX_WCHAR)u"abc"; // non-empty + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + EXPECT_EQ(0, u16cmp(tstr_notany_valid, tstr)); + + // notany, space after store, valid (see #11937, #11938) + fileKeyboard.version = VERSION_70; + u16cpy(str, u"notany(b )"); + file_store[1].dpString = (PKMX_WCHAR)u"abc"; // non-empty + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + EXPECT_EQ(0, u16cmp(tstr_notany_valid, tstr)); + + // null + fileKeyboard.version = VERSION_70; + u16cpy(str, u"nul"); + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + const KMX_WCHAR tstr_null_valid[] = { UC_SENTINEL, CODE_NUL, 0 }; + EXPECT_EQ(0, u16cmp(tstr_null_valid, tstr)); +} + +// tests strings starting with 'u' +TEST_F(CompilerTest, GetXStringImpl_type_u_test) { + KMX_WCHAR tstr[128]; + fileKeyboard.version = VERSION_70; + KMX_WCHAR str[LINESIZE]; + KMX_WCHAR output[GLOBAL_BUFSIZE]; + PKMX_WCHAR newp = nullptr; + + // KmnCompilerMessages::ERROR_InvalidToken + u16cpy(str, u"uvw"); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + + // unicode, n1 and n2, valid + u16cpy(str, u"u+10330"); // Gothic A + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, TRUE)); + const KMX_WCHAR tstr_unicode_valid[] = { 0xD800, 0xDF30, 0 }; // see UTF32ToUTF16 + EXPECT_EQ(0, u16cmp(tstr_unicode_valid, tstr)); + EXPECT_EQ(0, msgproc_errors.size()); + + // unicode, ERROR_InvalidValue + u16cpy(str, u"u+10330z"); // Gothic A, unexpected character 'z' + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidValue, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, TRUE)); + + // unicode, space after, valid + u16cpy(str, u"u+10330 "); // Gothic A + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, TRUE)); + EXPECT_EQ(0, u16cmp(tstr_unicode_valid, tstr)); + EXPECT_EQ(0, msgproc_errors.size()); + + // unicode, KmnCompilerMessages::ERROR_InvalidCharacter + u16cpy(str, u"u+110000"); + EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidCharacter, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, TRUE)); + + // unicode, n1 only, valid + u16cpy(str, u"u+0061"); // a + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, TRUE)); + const KMX_WCHAR tstr_unicode_n1_only_valid[] = { 0x0061, 0 }; // see UTF32ToUTF16 + EXPECT_EQ(0, u16cmp(tstr_unicode_n1_only_valid, tstr)); + EXPECT_EQ(0, msgproc_errors.size()); + + // unicode, n1 and n2, valid, KmnCompilerMessages::WARN_UnicodeInANSIGroup + u16cpy(str, u"u+10330"); // Gothic A + EXPECT_EQ(STATUS_Success, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE)); + EXPECT_EQ(0, u16cmp(tstr_unicode_valid, tstr)); + EXPECT_EQ(1, msgproc_errors.size()); + EXPECT_EQ(KmnCompilerMessages::WARN_UnicodeInANSIGroup, msgproc_errors[0].errorCode); +} + // KMX_DWORD process_baselayout(PFILE_KEYBOARD fk, PKMX_WCHAR q, PKMX_WCHAR tstr, int *mx) // KMX_DWORD process_platform(PFILE_KEYBOARD fk, PKMX_WCHAR q, PKMX_WCHAR tstr, int *mx) // KMX_DWORD process_if_synonym(KMX_DWORD dwSystemID, PFILE_KEYBOARD fk, PKMX_WCHAR q, PKMX_WCHAR tstr, int *mx) diff --git a/developer/src/kmcmplib/tests/gtest-km_u16-test.cpp b/developer/src/kmcmplib/tests/gtest-km_u16-test.cpp index b67957bd317..75d74607cd4 100644 --- a/developer/src/kmcmplib/tests/gtest-km_u16-test.cpp +++ b/developer/src/kmcmplib/tests/gtest-km_u16-test.cpp @@ -166,3 +166,91 @@ TEST(km_u16_Test, u16tok_str_compare_to_strtok) { EXPECT_TRUE(!strcmp("ghi", strtok(nullptr, reverse_delim))); EXPECT_EQ(nullptr, strtok(nullptr, reverse_delim)); } + +TEST(km_u16_Test, u16ltrim) { + KMX_WCHAR str[LINESIZE]; + PKMX_WCHAR q; + + EXPECT_TRUE(!u16ltrim(nullptr)); + + std::map m{ + // input output + {u"", u"" }, + {u" ", u"" }, + {u" ", u"" }, + {u"abc", u"abc" }, + {u" abc", u"abc" }, + {u" abc", u"abc" }, + {u"abc ", u"abc " }, + {u"\tabc", u"abc" }, + {u"abc def", u"abc def"}, + {u" abc def", u"abc def"}, + }; + + for (auto i = m.begin(); i != m.end(); i++) { + u16cpy(str, i->first); + q = u16ltrim(str); + EXPECT_TRUE(!u16cmp(i->second, q)); + EXPECT_EQ(str, q); + } +} + +TEST(km_u16_Test, u16rtrim) { + KMX_WCHAR str[LINESIZE]; + PKMX_WCHAR q; + + EXPECT_TRUE(!u16rtrim(nullptr)); + + std::map m{ + // input output + {u"", u"" }, + {u" ", u"" }, + {u" ", u"" }, + {u"abc", u"abc" }, + {u"abc ", u"abc" }, + {u"abc ", u"abc" }, + {u" abc", u" abc" }, + {u"abc\t", u"abc" }, + {u"abc def", u"abc def"}, + {u"abc def ", u"abc def"}, + }; + + for (auto i = m.begin(); i != m.end(); i++) { + u16cpy(str, i->first); + q = u16rtrim(str); + EXPECT_TRUE(!u16cmp(i->second, q)); + EXPECT_EQ(str, q); + } +} + +TEST(km_u16_Test, u16trim) { + KMX_WCHAR str[LINESIZE]; + PKMX_WCHAR q; + + EXPECT_TRUE(!u16trim(nullptr)); + + std::map m{ + // input output + {u"", u"" }, + {u" ", u"" }, + {u" ", u"" }, + {u"abc", u"abc" }, + {u"abc ", u"abc" }, + {u"abc ", u"abc" }, + {u" abc", u"abc" }, + {u" abc", u"abc" }, + {u" abc ", u"abc" }, + {u" abc ", u"abc" }, + {u"abc\t", u"abc" }, + {u"\tabc", u"abc" }, + {u"abc def", u"abc def" }, + {u" abc def ", u"abc def"}, + }; + + for (auto i = m.begin(); i != m.end(); i++) { + u16cpy(str, i->first); + q = u16trim(str); + EXPECT_TRUE(!u16cmp(i->second, q)); + EXPECT_EQ(str, q); + } +} diff --git a/developer/src/packages.inc.sh b/developer/src/packages.inc.sh index 28f2513f974..0726209973a 100644 --- a/developer/src/packages.inc.sh +++ b/developer/src/packages.inc.sh @@ -6,7 +6,6 @@ readonly PACKAGES=( common/web/keyman-version common/web/types - common/models/types core/include/ldml developer/src/common/web/utils developer/src/kmc-analyze diff --git a/developer/src/server/package.json b/developer/src/server/package.json index f3be3425f2a..8619adceecc 100644 --- a/developer/src/server/package.json +++ b/developer/src/server/package.json @@ -12,7 +12,7 @@ "@keymanapp/developer-utils": "*", "@sentry/node": "^7.57.0", "chalk": "^4.1.2", - "express": "^4.19.2", + "express": "^4.20.0", "multer": "^1.4.5-lts.1", "ngrok": "^5.0.0-beta.2", "open": "^8.4.0", diff --git a/developer/src/tike/child/UfrmKeymanWizard.pas b/developer/src/tike/child/UfrmKeymanWizard.pas index baa906e8369..59e0f8a3411 100644 --- a/developer/src/tike/child/UfrmKeymanWizard.pas +++ b/developer/src/tike/child/UfrmKeymanWizard.pas @@ -3263,6 +3263,14 @@ procedure TfrmKeymanWizard.cmdImportFromOnScreenClick(Sender: TObject); // I39 Exit; end; + if MessageDlg( + 'Importing the Desktop On Screen Keyboard will overwrite all changes in all '+ + 'layers in the touch layout. Continue and overwrite touch layout?', mtWarning, + mbOkCancel, 0) = mrCancel then + begin + Exit; + end; + if Self.Modified then // I4059 begin if not FKeymanDeveloperOptions.OSKAutoSaveBeforeImporting then diff --git a/developer/src/tike/xml/help/contexthelp.xml b/developer/src/tike/xml/help/contexthelp.xml index 2298b5676e7..66140f0ae97 100644 --- a/developer/src/tike/xml/help/contexthelp.xml +++ b/developer/src/tike/xml/help/contexthelp.xml @@ -920,7 +920,151 @@ - +
+ +

The Options dialog display several tabs such as General, Editor, Debugger, Character Map and Server. + You can configure the environment of Keyman Developer here.

+ + + +

Instead of opening a keyboard file in the Details tab, open directly into the Layout tab, Source pane.

+ + + +

You can open any Keyman source file shown in the project in an external text editor by right-clicking + on the file and selecting "Open in External Editor". The files available for editing externally + are .kmn, .kps, and .kvks. This field configures which editor you wish to use to edit the files. + Note: if you need to pass command line parameters to the editor, you will need to wrap the command + in a batch file and reference the batch file here.

+ + + +

You can open any Keyman source file shown in the project in an external text editor by right-clicking + on the file and selecting "Open in External Editor". The files available for editing externally + are .kmn, .kps, and .kvks. This field configures which editor you wish to use to edit the files. + Note: if you need to pass command line parameters to the editor, you will need to wrap the command + in a batch file and reference the batch file here.

+ + + +

You can check the location of your default project folder, where projects like keyboards or + lexical models will be saved automatically. If needed, you can change the folder location + to a more convenient spot.

+ + + +

Reset all tabs to their original locations.

+ + + +

Configure your SMTP server settings for email functionality within Keyman Developer, + such as emailing debug URLs for the touch layout debugger.

+ + + +

Configure the HTTP proxy settings for online functionality within Keyman Developer, + such as uploading files to Tavultesoft.

+ + + +

Click Cancel to close the dialog without saving changes.

+ + + +

Click OK to save changes and close the dialog.

+ + + +

Sets whether to use the Tab character or spaces for indents.

+ + + +

The indent size, measured in number of spaces.

+ + + +

If checked, the quoted font size will be the same as the default font size.

+ + + +

Sets the font for ordinary text in the editor.

+ + + +

Sets the font for displaying comments text and strings in Keyman source files in + single or double quotes.

+ + + +

Sets the display theme and syntax highlighting options for the editor. A custom + theme can be defined in a JSON file.

+ + + +

Enables the Keyman 5-style Test window instead of the debugger.

+ + + +

Breakpoints will fire when a rule has finished being processed also.

+ + + +

Activates single-step mode after a breakpoint fires.

+ + + +

Displays numeric indices of characters in stores

+ + + +

When the debugger starts, rebuild a keyboard without prompting if the keyboard + has no debug symbols included.

+ + + +

If you are debugging a keyboard, make a change to the keyboard, and recompile it, + then the debugger needs to be reset in order to get access to the new keyboard. + Keyman Developer will normally prompt you to do this, but if you set + this option, then it will reset the debugger automatically instead.

+ + + +

The character beneath the cursor in the edit window will be highlighted in the + Character Map. This will intelligently parse the character data under the cursor so that + a character code (e.g. U+1234) will be highlighted correctly.

+ + + +

Rebuilds the Unicode character database from source unicodedata.txt and blocks.txt. + These files can be downloaded from the Unicode website at http://www.unicode.org/ucd/. + This lets you update the character map with a newer version of Unicode. + Keyman Developer 17.0 was released with Unicode version 15.1 data.

+ + + +

Rebuilds the Unicode character database from source unicodedata.txt and blocks.txt. + These files can be downloaded from the Unicode website at http://www.unicode.org/ucd/. + This lets you update the character map with a newer version of Unicode. + Keyman Developer 17.0 was released with Unicode version 15.1 data.

+ + + +

You can customize the Keyman Developer server for testing the usability of your keyboard. + Features of the Keyman Developer server include: +

    +
  • Seamless integration with the IDE (Start, Stop, Live reload, Recompile...)
    • +
  • Port configuration
    • +
  • Allow testing cross devices
    • +
  • Support for ngrok to allow simple sharing of debug sessions across the Internet
    • +
+

+ + + +

Below Configure Server, untick the box, and it will quit displaying any local URLs for keyboard testing.

+ +
+

The name of the developer of the keyboard. This is either your full name or diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS index 75530e6bde1..dcf54ce78cc 100644 --- a/docs/CODEOWNERS +++ b/docs/CODEOWNERS @@ -8,7 +8,6 @@ /common/ @mcdurdin @rc-swag /core/ @mcdurdin @rc-swag /common/lexical-model-types/ @jahorton @mcdurdin -/common/models/ @jahorton @mcdurdin /common/schemas/ @mcdurdin @jahorton /common/test/ @mcdurdin @ermshiperete /common/web/ @jahorton @mcdurdin diff --git a/docs/file-formats/kmx-plus-file-format.md b/docs/file-formats/kmx-plus-file-format.md index 3b7003f09a8..680f3675b92 100644 --- a/docs/file-formats/kmx-plus-file-format.md +++ b/docs/file-formats/kmx-plus-file-format.md @@ -35,7 +35,9 @@ Draft spec PR: - Other than the `sect` table itself, the rest of the sections follow in binary order in the file. In other words, the binary ordering of the section identifiers determines the order of the file layout. -- All sections other than the `sect` table are optional +- All sections other than the `sect` table are optional for the file + format to be valid, however, a valid keyboard will need most or + all of the sections present to be usable. ### C7043.2.1 `sect`—Section Table of contents @@ -173,8 +175,8 @@ Then for each string: | ∆ | Bits | Name | Description | |---|------|---------------|-----------------------------------------------| -|16+| 32 | offset | off: Offset to string | -|20+| 32 | length | int: Length of string in UTF-16LE code units | +|12+| 32 | offset | off: Offset to string | +|16+| 32 | length | int: Length of string in UTF-16LE code units | After the string offset table comes the actual UTF-16LE data. There is a null (\u0000) after each string, which is _not_ included in the string length. @@ -362,14 +364,14 @@ For each element: | ∆ | Bits | Name | Description | |---|------|---------|------------------------------------------| -|32+| 32 | to | str: to string | -|36+| 32 | id | str: id string | -|40+| 32 | display | str: output display string | +|16+| 32 | to | str: to string | +|20+| 32 | id | str: id string | +|24+| 32 | display | str: output display string | Either `to` or `id` must be set, not both. Entries with an `to` field are sorted in a binary codepoint sort on the `to` field, -followed by entries with an `id` field set sorted in a binary codepoint sort on the `id` field. - +followed by entries with an `id` field set sorted in a binary codepoint sort +on the `id` field. ### C7043.2.15 `key2`—Extended keybag @@ -402,7 +404,8 @@ For each key: |28+| 32 | multiTap | list: index into `list` section with multiTap key id list or 0 | |32+| 32 | flicks | int: index into `key2.flicks` subtable | -- `id`: The original string id from XML. This may be 0 to save space (i.e. omit the string id). +- `id`: The original string id from XML. This may be 0 to save space (i.e. + omit the string id). - `flags`: Flags is a 32-bit bitfield defined as below: | Bit position | Meaning | Description | @@ -412,7 +415,8 @@ For each key: - `to`: If `extend` is 0, `to` is a UTF-32LE codepoint. If `extend` is 1, `to` is a 32 bit index into the `strs` table. The string may be zero-length. -- `longPress`, `longPressDefault`, and `multiTap` refer to key ids or lists of key ids in this same `key2.keys` subtable. +- `longPress`, `longPressDefault`, and `multiTap` refer to key ids or lists + of key ids in this same `key2.keys` subtable. #### `key2.flicks` flick list subtable @@ -421,24 +425,28 @@ For each flicks in the flick list: | ∆ | Bits | Name | Description | |---|------|---------------- |----------------------------------------------------------| | 0+| 32 | count | int: number of flick elements in this flick | -|12+| 32 | flick | int: index into `flick` subtable for first flick element | -|16+| 32 | id | str: flick id | +| 4+| 32 | flick | int: index into `flick` subtable for first flick element | +| 8+| 32 | id | str: flick id | -- `id`: The original string id from XML. This may be 0 to save space (i.e. omit the string id). +- `id`: The original string id from XML. This may be 0 to save space (i.e. omit + the string id). Elements are ordered by the string id. -If this section is present, it must have a 'flicks' in the list at position zero with count=0, index=0 and id=0 meaning 'no flicks'. +If this section is present, it must have a 'flicks' in the list at position zero +with count=0, index=0 and id=0 meaning 'no flicks'. + #### `key2.flick` flick element subtable For each flick element: | ∆ | Bits | Name | Description | |---|------|---------------- |----------------------------------------------------------| -| 0+| 32 | directions | list: index into `list` section with direction list | -| 8+| 32 | keyId | str: id of key | +| 0+| 32 | directions | list: index into `list` section with direction sequence | +| 4+| 32 | keyId | str: id of key | -If this section is present, it must have a 'flick element' at position zero with directions=0, flags=0, and to=0 meaning 'no flick'. +If this section is present, it must have a 'flick element' at position zero with +directions=0, flags=0, and to=0 meaning 'no flick'. There is not a 'null' flick element at the end of each list. diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md index 4b308450690..2b7a65b300a 100644 --- a/docs/minimum-versions.md +++ b/docs/minimum-versions.md @@ -10,23 +10,23 @@ Target Operating System and Platform Versions ### Keyman for Windows -Helpfile: [os.md](../../windows/src/desktop/help/common/os.md) +Helpfile: [os.md](../../windows/docs/help/common/os.md) ### Keyman for macOS -Helpfile: [requirements.md](../../mac/help/about/requirements.md) +Helpfile: [requirements.md](../../mac/docs/help/about/requirements.md) ### Keyman for Linux -Helpfile: [common/index.md](../../linux/help/common/index.md#q-what-linux-distros-will-keyman-work-with) +Helpfile: [common/index.md](../../linux/docs/help/common/index.md#q-what-linux-distros-will-keyman-work-with) ### Keyman iPhone and iPad -Helpfile: [system-requirements.md](../../ios/help/about/system-requirements.md) +Helpfile: [system-requirements.md](../../ios/docs/help/about/system-requirements.md) ### Keyman for Android -Helpfile: [system-requirements.md](../../android/help/about/system-requirements.md) +Helpfile: [system-requirements.md](../../android/docs/help/about/system-requirements.md) ---- @@ -68,6 +68,6 @@ https://help.keyman.com/developer/engine/android/latest-version/ | KEYMAN_VERSION_JAVA | 11 | | KEYMAN_VERSION_LANGTAGS | 2024-05-22 | | KEYMAN_VERSION_LANGTAGS_SUBTAG_REGISTRY | 2024-05-16 | -| KEYMAN_VERSION_UNICODE | 15.1.0 | +| KEYMAN_VERSION_UNICODE | 16.0.0 | > ### This file is auto-generated by publish-minimum-versions.sh. Do not modify diff --git a/docs/minimum-versions.md.in b/docs/minimum-versions.md.in index 42d04b59870..35fa2adde30 100644 --- a/docs/minimum-versions.md.in +++ b/docs/minimum-versions.md.in @@ -10,23 +10,23 @@ Target Operating System and Platform Versions ### Keyman for Windows -Helpfile: [os.md](../../windows/src/desktop/help/common/os.md) +Helpfile: [os.md](../../windows/docs/help/common/os.md) ### Keyman for macOS -Helpfile: [requirements.md](../../mac/help/about/requirements.md) +Helpfile: [requirements.md](../../mac/docs/help/about/requirements.md) ### Keyman for Linux -Helpfile: [common/index.md](../../linux/help/common/index.md#q-what-linux-distros-will-keyman-work-with) +Helpfile: [common/index.md](../../linux/docs/help/common/index.md#q-what-linux-distros-will-keyman-work-with) ### Keyman iPhone and iPad -Helpfile: [system-requirements.md](../../ios/help/about/system-requirements.md) +Helpfile: [system-requirements.md](../../ios/docs/help/about/system-requirements.md) ### Keyman for Android -Helpfile: [system-requirements.md](../../android/help/about/system-requirements.md) +Helpfile: [system-requirements.md](../../android/docs/help/about/system-requirements.md) ---- diff --git a/docs/npm-packages.md b/docs/npm-packages.md index 36e5d9a6de7..494bec00448 100644 --- a/docs/npm-packages.md +++ b/docs/npm-packages.md @@ -19,13 +19,13 @@ Packages are **never** published from a developer's machine. * `@keymanapp/kmc-model` -- located at `developer/src/kmc-model` * `@keymanapp/kmc-model-info` -- located at `developer/src/kmc-model-info` * `@keymanapp/kmc-package` -- located at `developer/src/kmc-package` -* `@keymanapp/models-types` -- located at `common/models/types` ### Deprecated npm packages * `@keymanapp/developer-lexical-model-compiler` -- replaced by `@keymanapp/kmc` * `@keymanapp/lexical-model-compiler` -- replaced by `@keymanapp/kmc` -* `@keymanapp/lexical-model-types` -- replaced by `@keymanapp/models-types` +* `@keymanapp/lexical-model-types` -- replaced by `@keymanapp/common-types` +* `@keymanapp/models-types` -- replaced by `@keymanapp/common-types` * `@keymanapp/lmlayer-cli` -- replaced by `@keymanapp/kmc` * `@keymanapp/models-wordbreakers` -- published accidentally diff --git a/docs/websites/README.md b/docs/websites/README.md index 5fc84ffa596..be329ad054b 100644 --- a/docs/websites/README.md +++ b/docs/websites/README.md @@ -53,17 +53,19 @@ This maps the local directory to the the Docker image. For sites that use Composer dependencies, this step also creates a link in the Docker image from /var/www/vendor/ to /var/www/html/vendor. The link file also appears locally. +Some sites have assets in `/cdn/dev/` used to generate CDN in `/dev/deploy/`. To avoid confusion during development, you can skip generating CDN with `./build.sh start --debug`. + ##### Port lookup table After this, you can access the website at the following ports: -| Website | URL | with website-local-proxy running | -|----------------|-----------------------|-----------------------------------| -| keyman.com | http://localhost:8053 | http://keyman.com.localhost | -| s.keyman.com | http://localhost:8054 | http://s.keyman.com.localhost | -| help.keyman | http://localhost:8055 | http://help.keyman.com.localhost | -| keymanweb.com | http://localhost:8057 | http://keymanweb.com.localhost | -| | | http://web.keyman.com.localhost | -| api.keyman.com | http://localhost:8058 | http://api.keyman.com.localhost | +| Website | URL | with website-local-proxy running | Docker Container Name | +|----------------|-----------------------|-----------------------------------|------------------------| +| keyman.com | http://localhost:8053 | http://keyman.com.localhost | keyman-website | +| s.keyman.com | http://localhost:8054 | http://s.keyman.com.localhost | s-keyman-website | +| help.keyman | http://localhost:8055 | http://help.keyman.com.localhost | help-keyman-website | +| keymanweb.com | http://localhost:8057 | http://keymanweb.com.localhost | web-keyman-website | +| | | http://web.keyman.com.localhost | | +| api.keyman.com | http://localhost:8058 | http://api.keyman.com.localhost | api-keyman-com-website | #### Remove the Docker container and image 1. Run `./build.sh clean`. @@ -76,6 +78,16 @@ You might need to install the broken-link-checker first Checks for broken links 1. Run `./build.sh test` +#### Troubleshooting Errors + +You can access PHP errors with + +```bash +docker logs -f {Docker Container Name} +``` + +Refer to **Port lookup table** above for Docker container names + --------- ## Kubernetes Deployment diff --git a/ios/help/about/history.md b/ios/docs/help/about/history.md similarity index 100% rename from ios/help/about/history.md rename to ios/docs/help/about/history.md diff --git a/ios/help/about/index.md b/ios/docs/help/about/index.md similarity index 100% rename from ios/help/about/index.md rename to ios/docs/help/about/index.md diff --git a/ios/help/about/system-requirements.md b/ios/docs/help/about/system-requirements.md similarity index 100% rename from ios/help/about/system-requirements.md rename to ios/docs/help/about/system-requirements.md diff --git a/ios/help/about/welcome.md b/ios/docs/help/about/welcome.md similarity index 100% rename from ios/help/about/welcome.md rename to ios/docs/help/about/welcome.md diff --git a/ios/help/about/whatsnew.md b/ios/docs/help/about/whatsnew.md similarity index 100% rename from ios/help/about/whatsnew.md rename to ios/docs/help/about/whatsnew.md diff --git a/ios/help/basic/config/index.md b/ios/docs/help/basic/config/index.md similarity index 100% rename from ios/help/basic/config/index.md rename to ios/docs/help/basic/config/index.md diff --git a/ios/help/basic/config/spacebar-caption.md b/ios/docs/help/basic/config/spacebar-caption.md similarity index 100% rename from ios/help/basic/config/spacebar-caption.md rename to ios/docs/help/basic/config/spacebar-caption.md diff --git a/ios/help/basic/index.md b/ios/docs/help/basic/index.md similarity index 100% rename from ios/help/basic/index.md rename to ios/docs/help/basic/index.md diff --git a/ios/help/basic/installing-custom-keyboards-dictionaries.md b/ios/docs/help/basic/installing-custom-keyboards-dictionaries.md similarity index 100% rename from ios/help/basic/installing-custom-keyboards-dictionaries.md rename to ios/docs/help/basic/installing-custom-keyboards-dictionaries.md diff --git a/ios/help/basic/keyboard-usage.md b/ios/docs/help/basic/keyboard-usage.md similarity index 100% rename from ios/help/basic/keyboard-usage.md rename to ios/docs/help/basic/keyboard-usage.md diff --git a/ios/help/basic/language-settings.md b/ios/docs/help/basic/language-settings.md similarity index 100% rename from ios/help/basic/language-settings.md rename to ios/docs/help/basic/language-settings.md diff --git a/ios/help/basic/sharing-keyboards.md b/ios/docs/help/basic/sharing-keyboards.md similarity index 100% rename from ios/help/basic/sharing-keyboards.md rename to ios/docs/help/basic/sharing-keyboards.md diff --git a/ios/help/basic/switching-between-keyboards.md b/ios/docs/help/basic/switching-between-keyboards.md similarity index 100% rename from ios/help/basic/switching-between-keyboards.md rename to ios/docs/help/basic/switching-between-keyboards.md diff --git a/ios/help/basic/uninstalling-keyboards.md b/ios/docs/help/basic/uninstalling-keyboards.md similarity index 100% rename from ios/help/basic/uninstalling-keyboards.md rename to ios/docs/help/basic/uninstalling-keyboards.md diff --git a/ios/help/basic/using-keyman-browser.md b/ios/docs/help/basic/using-keyman-browser.md similarity index 100% rename from ios/help/basic/using-keyman-browser.md rename to ios/docs/help/basic/using-keyman-browser.md diff --git a/ios/help/basic/using-the-banner.md b/ios/docs/help/basic/using-the-banner.md similarity index 100% rename from ios/help/basic/using-the-banner.md rename to ios/docs/help/basic/using-the-banner.md diff --git a/ios/help/context/index.md b/ios/docs/help/context/index.md similarity index 100% rename from ios/help/context/index.md rename to ios/docs/help/context/index.md diff --git a/ios/help/index.md b/ios/docs/help/index.md similarity index 100% rename from ios/help/index.md rename to ios/docs/help/index.md diff --git a/ios/help/ios_images/add-keyboard-file-i.png b/ios/docs/help/ios_images/add-keyboard-file-i.png similarity index 100% rename from ios/help/ios_images/add-keyboard-file-i.png rename to ios/docs/help/ios_images/add-keyboard-file-i.png diff --git a/ios/help/ios_images/add-keyboard-i.png b/ios/docs/help/ios_images/add-keyboard-i.png similarity index 100% rename from ios/help/ios_images/add-keyboard-i.png rename to ios/docs/help/ios_images/add-keyboard-i.png diff --git a/ios/help/ios_images/add-keyboard-i2.png b/ios/docs/help/ios_images/add-keyboard-i2.png similarity index 100% rename from ios/help/ios_images/add-keyboard-i2.png rename to ios/docs/help/ios_images/add-keyboard-i2.png diff --git a/ios/help/ios_images/add-keyboard-i3.png b/ios/docs/help/ios_images/add-keyboard-i3.png similarity index 100% rename from ios/help/ios_images/add-keyboard-i3.png rename to ios/docs/help/ios_images/add-keyboard-i3.png diff --git a/ios/help/ios_images/backspace.png b/ios/docs/help/ios_images/backspace.png similarity index 100% rename from ios/help/ios_images/backspace.png rename to ios/docs/help/ios_images/backspace.png diff --git a/ios/help/ios_images/browser-icon.png b/ios/docs/help/ios_images/browser-icon.png similarity index 100% rename from ios/help/ios_images/browser-icon.png rename to ios/docs/help/ios_images/browser-icon.png diff --git a/ios/help/ios_images/confirm-dl.png b/ios/docs/help/ios_images/confirm-dl.png similarity index 100% rename from ios/help/ios_images/confirm-dl.png rename to ios/docs/help/ios_images/confirm-dl.png diff --git a/ios/help/ios_images/delete-keyboard-i.png b/ios/docs/help/ios_images/delete-keyboard-i.png similarity index 100% rename from ios/help/ios_images/delete-keyboard-i.png rename to ios/docs/help/ios_images/delete-keyboard-i.png diff --git a/ios/help/ios_images/delete-keyboard-i2.png b/ios/docs/help/ios_images/delete-keyboard-i2.png similarity index 100% rename from ios/help/ios_images/delete-keyboard-i2.png rename to ios/docs/help/ios_images/delete-keyboard-i2.png diff --git a/ios/help/ios_images/delete.png b/ios/docs/help/ios_images/delete.png similarity index 100% rename from ios/help/ios_images/delete.png rename to ios/docs/help/ios_images/delete.png diff --git a/ios/help/ios_images/dictionary-list.png b/ios/docs/help/ios_images/dictionary-list.png similarity index 100% rename from ios/help/ios_images/dictionary-list.png rename to ios/docs/help/ios_images/dictionary-list.png diff --git a/ios/help/ios_images/dictionary-select.png b/ios/docs/help/ios_images/dictionary-select.png similarity index 100% rename from ios/help/ios_images/dictionary-select.png rename to ios/docs/help/ios_images/dictionary-select.png diff --git a/ios/help/ios_images/dist-install1-i.png b/ios/docs/help/ios_images/dist-install1-i.png similarity index 100% rename from ios/help/ios_images/dist-install1-i.png rename to ios/docs/help/ios_images/dist-install1-i.png diff --git a/ios/docs/help/ios_images/dist-kmp-open-i.png b/ios/docs/help/ios_images/dist-kmp-open-i.png new file mode 100644 index 00000000000..a6220a38562 Binary files /dev/null and b/ios/docs/help/ios_images/dist-kmp-open-i.png differ diff --git a/ios/docs/help/ios_images/dist-kmp-success-i.png b/ios/docs/help/ios_images/dist-kmp-success-i.png new file mode 100644 index 00000000000..af1108946b9 Binary files /dev/null and b/ios/docs/help/ios_images/dist-kmp-success-i.png differ diff --git a/ios/docs/help/ios_images/dist-url-screen-i.png b/ios/docs/help/ios_images/dist-url-screen-i.png new file mode 100644 index 00000000000..1c002964675 Binary files /dev/null and b/ios/docs/help/ios_images/dist-url-screen-i.png differ diff --git a/ios/docs/help/ios_images/dist-welcome-i.png b/ios/docs/help/ios_images/dist-welcome-i.png new file mode 100644 index 00000000000..cfa0cc725fc Binary files /dev/null and b/ios/docs/help/ios_images/dist-welcome-i.png differ diff --git a/ios/help/ios_images/dl-success.png b/ios/docs/help/ios_images/dl-success.png similarity index 100% rename from ios/help/ios_images/dl-success.png rename to ios/docs/help/ios_images/dl-success.png diff --git a/ios/help/ios_images/down-flick-i.gif b/ios/docs/help/ios_images/down-flick-i.gif similarity index 100% rename from ios/help/ios_images/down-flick-i.gif rename to ios/docs/help/ios_images/down-flick-i.gif diff --git a/ios/help/ios_images/file-share-1i.png b/ios/docs/help/ios_images/file-share-1i.png similarity index 100% rename from ios/help/ios_images/file-share-1i.png rename to ios/docs/help/ios_images/file-share-1i.png diff --git a/ios/help/ios_images/file-share-2i.png b/ios/docs/help/ios_images/file-share-2i.png similarity index 100% rename from ios/help/ios_images/file-share-2i.png rename to ios/docs/help/ios_images/file-share-2i.png diff --git a/ios/help/ios_images/find-new.png b/ios/docs/help/ios_images/find-new.png similarity index 100% rename from ios/help/ios_images/find-new.png rename to ios/docs/help/ios_images/find-new.png diff --git a/ios/help/ios_images/font-dl1.png b/ios/docs/help/ios_images/font-dl1.png similarity index 100% rename from ios/help/ios_images/font-dl1.png rename to ios/docs/help/ios_images/font-dl1.png diff --git a/ios/help/ios_images/font-dl2.png b/ios/docs/help/ios_images/font-dl2.png similarity index 100% rename from ios/help/ios_images/font-dl2.png rename to ios/docs/help/ios_images/font-dl2.png diff --git a/ios/help/ios_images/font-dl3.png b/ios/docs/help/ios_images/font-dl3.png similarity index 100% rename from ios/help/ios_images/font-dl3.png rename to ios/docs/help/ios_images/font-dl3.png diff --git a/ios/help/ios_images/font-dl4.png b/ios/docs/help/ios_images/font-dl4.png similarity index 100% rename from ios/help/ios_images/font-dl4.png rename to ios/docs/help/ios_images/font-dl4.png diff --git a/ios/help/ios_images/font-dl5.png b/ios/docs/help/ios_images/font-dl5.png similarity index 100% rename from ios/help/ios_images/font-dl5.png rename to ios/docs/help/ios_images/font-dl5.png diff --git a/ios/help/ios_images/font-size.png b/ios/docs/help/ios_images/font-size.png similarity index 100% rename from ios/help/ios_images/font-size.png rename to ios/docs/help/ios_images/font-size.png diff --git a/ios/help/ios_images/get-started.png b/ios/docs/help/ios_images/get-started.png similarity index 100% rename from ios/help/ios_images/get-started.png rename to ios/docs/help/ios_images/get-started.png diff --git a/ios/help/ios_images/globe.png b/ios/docs/help/ios_images/globe.png similarity index 100% rename from ios/help/ios_images/globe.png rename to ios/docs/help/ios_images/globe.png diff --git a/ios/help/ios_images/hide-keyboard.png b/ios/docs/help/ios_images/hide-keyboard.png similarity index 100% rename from ios/help/ios_images/hide-keyboard.png rename to ios/docs/help/ios_images/hide-keyboard.png diff --git a/ios/help/ios_images/in-app-picker-i.png b/ios/docs/help/ios_images/in-app-picker-i.png similarity index 100% rename from ios/help/ios_images/in-app-picker-i.png rename to ios/docs/help/ios_images/in-app-picker-i.png diff --git a/ios/help/ios_images/info.png b/ios/docs/help/ios_images/info.png similarity index 100% rename from ios/help/ios_images/info.png rename to ios/docs/help/ios_images/info.png diff --git a/ios/help/ios_images/key-submenu.png b/ios/docs/help/ios_images/key-submenu.png similarity index 100% rename from ios/help/ios_images/key-submenu.png rename to ios/docs/help/ios_images/key-submenu.png diff --git a/ios/help/ios_images/keyboard-search-1.png b/ios/docs/help/ios_images/keyboard-search-1.png similarity index 100% rename from ios/help/ios_images/keyboard-search-1.png rename to ios/docs/help/ios_images/keyboard-search-1.png diff --git a/ios/help/ios_images/keyboard-search-2.png b/ios/docs/help/ios_images/keyboard-search-2.png similarity index 100% rename from ios/help/ios_images/keyboard-search-2.png rename to ios/docs/help/ios_images/keyboard-search-2.png diff --git a/ios/help/ios_images/keyboard-search-3.png b/ios/docs/help/ios_images/keyboard-search-3.png similarity index 100% rename from ios/help/ios_images/keyboard-search-3.png rename to ios/docs/help/ios_images/keyboard-search-3.png diff --git a/ios/help/ios_images/keyboard-search-4.png b/ios/docs/help/ios_images/keyboard-search-4.png similarity index 100% rename from ios/help/ios_images/keyboard-search-4.png rename to ios/docs/help/ios_images/keyboard-search-4.png diff --git a/ios/help/ios_images/keyboard-search-5.png b/ios/docs/help/ios_images/keyboard-search-5.png similarity index 100% rename from ios/help/ios_images/keyboard-search-5.png rename to ios/docs/help/ios_images/keyboard-search-5.png diff --git a/ios/help/ios_images/keyman-settings.png b/ios/docs/help/ios_images/keyman-settings.png similarity index 100% rename from ios/help/ios_images/keyman-settings.png rename to ios/docs/help/ios_images/keyman-settings.png diff --git a/ios/help/ios_images/keyman-settings2.png b/ios/docs/help/ios_images/keyman-settings2.png similarity index 100% rename from ios/help/ios_images/keyman-settings2.png rename to ios/docs/help/ios_images/keyman-settings2.png diff --git a/ios/help/ios_images/keyman-settings3.png b/ios/docs/help/ios_images/keyman-settings3.png similarity index 100% rename from ios/help/ios_images/keyman-settings3.png rename to ios/docs/help/ios_images/keyman-settings3.png diff --git a/ios/help/ios_images/keyman-settings4.png b/ios/docs/help/ios_images/keyman-settings4.png similarity index 100% rename from ios/help/ios_images/keyman-settings4.png rename to ios/docs/help/ios_images/keyman-settings4.png diff --git a/ios/help/ios_images/keyman-settings5.png b/ios/docs/help/ios_images/keyman-settings5.png similarity index 100% rename from ios/help/ios_images/keyman-settings5.png rename to ios/docs/help/ios_images/keyman-settings5.png diff --git a/ios/help/ios_images/keyman-settings6.png b/ios/docs/help/ios_images/keyman-settings6.png similarity index 100% rename from ios/help/ios_images/keyman-settings6.png rename to ios/docs/help/ios_images/keyman-settings6.png diff --git a/ios/help/ios_images/language-settings.png b/ios/docs/help/ios_images/language-settings.png similarity index 100% rename from ios/help/ios_images/language-settings.png rename to ios/docs/help/ios_images/language-settings.png diff --git a/ios/help/ios_images/menu-icon.png b/ios/docs/help/ios_images/menu-icon.png similarity index 100% rename from ios/help/ios_images/menu-icon.png rename to ios/docs/help/ios_images/menu-icon.png diff --git a/ios/help/ios_images/package-install-1.png b/ios/docs/help/ios_images/package-install-1.png similarity index 100% rename from ios/help/ios_images/package-install-1.png rename to ios/docs/help/ios_images/package-install-1.png diff --git a/ios/help/ios_images/package-install-2.png b/ios/docs/help/ios_images/package-install-2.png similarity index 100% rename from ios/help/ios_images/package-install-2.png rename to ios/docs/help/ios_images/package-install-2.png diff --git a/ios/help/ios_images/package-install-3.png b/ios/docs/help/ios_images/package-install-3.png similarity index 100% rename from ios/help/ios_images/package-install-3.png rename to ios/docs/help/ios_images/package-install-3.png diff --git a/ios/help/ios_images/package-install-4.png b/ios/docs/help/ios_images/package-install-4.png similarity index 100% rename from ios/help/ios_images/package-install-4.png rename to ios/docs/help/ios_images/package-install-4.png diff --git a/ios/help/ios_images/package-install-5.png b/ios/docs/help/ios_images/package-install-5.png similarity index 100% rename from ios/help/ios_images/package-install-5.png rename to ios/docs/help/ios_images/package-install-5.png diff --git a/ios/help/ios_images/qr-code-share-1i.png b/ios/docs/help/ios_images/qr-code-share-1i.png similarity index 100% rename from ios/help/ios_images/qr-code-share-1i.png rename to ios/docs/help/ios_images/qr-code-share-1i.png diff --git a/ios/help/ios_images/qr-code-share-2i.png b/ios/docs/help/ios_images/qr-code-share-2i.png similarity index 100% rename from ios/help/ios_images/qr-code-share-2i.png rename to ios/docs/help/ios_images/qr-code-share-2i.png diff --git a/ios/help/ios_images/qr-code-share-3i.png b/ios/docs/help/ios_images/qr-code-share-3i.png similarity index 100% rename from ios/help/ios_images/qr-code-share-3i.png rename to ios/docs/help/ios_images/qr-code-share-3i.png diff --git a/ios/help/ios_images/qr-code-share-4i.png b/ios/docs/help/ios_images/qr-code-share-4i.png similarity index 100% rename from ios/help/ios_images/qr-code-share-4i.png rename to ios/docs/help/ios_images/qr-code-share-4i.png diff --git a/ios/help/ios_images/return.png b/ios/docs/help/ios_images/return.png similarity index 100% rename from ios/help/ios_images/return.png rename to ios/docs/help/ios_images/return.png diff --git a/ios/help/ios_images/settings-screen.png b/ios/docs/help/ios_images/settings-screen.png similarity index 100% rename from ios/help/ios_images/settings-screen.png rename to ios/docs/help/ios_images/settings-screen.png diff --git a/ios/help/ios_images/settings-suggestions-i.png b/ios/docs/help/ios_images/settings-suggestions-i.png similarity index 100% rename from ios/help/ios_images/settings-suggestions-i.png rename to ios/docs/help/ios_images/settings-suggestions-i.png diff --git a/ios/help/ios_images/share.png b/ios/docs/help/ios_images/share.png similarity index 100% rename from ios/help/ios_images/share.png rename to ios/docs/help/ios_images/share.png diff --git a/ios/help/ios_images/shift.png b/ios/docs/help/ios_images/shift.png similarity index 100% rename from ios/help/ios_images/shift.png rename to ios/docs/help/ios_images/shift.png diff --git a/ios/help/ios_images/spacebar-caption.png b/ios/docs/help/ios_images/spacebar-caption.png similarity index 100% rename from ios/help/ios_images/spacebar-caption.png rename to ios/docs/help/ios_images/spacebar-caption.png diff --git a/ios/help/ios_images/system-keyboard-cal.png b/ios/docs/help/ios_images/system-keyboard-cal.png similarity index 100% rename from ios/help/ios_images/system-keyboard-cal.png rename to ios/docs/help/ios_images/system-keyboard-cal.png diff --git a/ios/help/ios_images/system-picker-i.png b/ios/docs/help/ios_images/system-picker-i.png similarity index 100% rename from ios/help/ios_images/system-picker-i.png rename to ios/docs/help/ios_images/system-picker-i.png diff --git a/ios/help/ios_images/system-wide-setting.png b/ios/docs/help/ios_images/system-wide-setting.png similarity index 100% rename from ios/help/ios_images/system-wide-setting.png rename to ios/docs/help/ios_images/system-wide-setting.png diff --git a/ios/help/ios_images/themed-banner.png b/ios/docs/help/ios_images/themed-banner.png similarity index 100% rename from ios/help/ios_images/themed-banner.png rename to ios/docs/help/ios_images/themed-banner.png diff --git a/ios/help/ios_images/touch-hold.png b/ios/docs/help/ios_images/touch-hold.png similarity index 100% rename from ios/help/ios_images/touch-hold.png rename to ios/docs/help/ios_images/touch-hold.png diff --git a/ios/help/ios_images/uninstall-delete-i.png b/ios/docs/help/ios_images/uninstall-delete-i.png similarity index 100% rename from ios/help/ios_images/uninstall-delete-i.png rename to ios/docs/help/ios_images/uninstall-delete-i.png diff --git a/ios/help/ios_images/uninstall-list-i.png b/ios/docs/help/ios_images/uninstall-list-i.png similarity index 100% rename from ios/help/ios_images/uninstall-list-i.png rename to ios/docs/help/ios_images/uninstall-list-i.png diff --git a/ios/help/ios_images/video.png b/ios/docs/help/ios_images/video.png similarity index 100% rename from ios/help/ios_images/video.png rename to ios/docs/help/ios_images/video.png diff --git a/ios/help/start/index.md b/ios/docs/help/start/index.md similarity index 100% rename from ios/help/start/index.md rename to ios/docs/help/start/index.md diff --git a/ios/help/start/installing-packages.md b/ios/docs/help/start/installing-packages.md similarity index 100% rename from ios/help/start/installing-packages.md rename to ios/docs/help/start/installing-packages.md diff --git a/ios/help/start/installing-system-keyboard.md b/ios/docs/help/start/installing-system-keyboard.md similarity index 100% rename from ios/help/start/installing-system-keyboard.md rename to ios/docs/help/start/installing-system-keyboard.md diff --git a/ios/help/start/searching-for-keyboards.md b/ios/docs/help/start/searching-for-keyboards.md similarity index 100% rename from ios/help/start/searching-for-keyboards.md rename to ios/docs/help/start/searching-for-keyboards.md diff --git a/ios/help/troubleshooting/index.md b/ios/docs/help/troubleshooting/index.md similarity index 100% rename from ios/help/troubleshooting/index.md rename to ios/docs/help/troubleshooting/index.md diff --git a/ios/help/troubleshooting/installing-fonts.md b/ios/docs/help/troubleshooting/installing-fonts.md similarity index 100% rename from ios/help/troubleshooting/installing-fonts.md rename to ios/docs/help/troubleshooting/installing-fonts.md diff --git a/ios/help/troubleshooting/integrating.md b/ios/docs/help/troubleshooting/integrating.md similarity index 100% rename from ios/help/troubleshooting/integrating.md rename to ios/docs/help/troubleshooting/integrating.md diff --git a/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings index 86f138adffe..0653ed3aeb0 100644 --- a/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings +++ b/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings @@ -125,7 +125,7 @@ "kmp-error-missing-resource" = "Tento balíček neobsahuje požadovanou klávesnici ani slovník."; /* Error installing a Keyman package with a version of Keyman that does not support it */ -"kmp-error-unsupported-keyman-version" = "This package requires a newer version of Keyman."; +"kmp-error-unsupported-keyman-version" = "Tento balíček vyžaduje novější verzi Keyman."; /* Error opening a Keyman package - cannot parse contents */ "kmp-error-no-metadata" = "Tento balíček nebyl správně sestaven - obsah není znám."; diff --git a/ios/engine/KMEI/KeymanEngine/it.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/it.lproj/Localizable.strings index 262a99756db..bd12409118a 100644 --- a/ios/engine/KMEI/KeymanEngine/it.lproj/Localizable.strings +++ b/ios/engine/KMEI/KeymanEngine/it.lproj/Localizable.strings @@ -125,7 +125,7 @@ "kmp-error-missing-resource" = "Questo pacchetto non contiene la tastiera o il dizionario richiesto."; /* Error installing a Keyman package with a version of Keyman that does not support it */ -"kmp-error-unsupported-keyman-version" = "This package requires a newer version of Keyman."; +"kmp-error-unsupported-keyman-version" = "Questo pacchetto richiede una nuova versione di Keyman."; /* Error opening a Keyman package - cannot parse contents */ "kmp-error-no-metadata" = "Questo pacchetto non è stato costruito correttamente - contenuti sconosciuti."; diff --git a/ios/engine/build.sh b/ios/engine/build.sh index 600b93154b2..f6687f0a00e 100755 --- a/ios/engine/build.sh +++ b/ios/engine/build.sh @@ -15,7 +15,7 @@ verify_on_mac builder_describe "Builds Keyman Engine for use on iOS devices - iPhone and iPad." \ "@/web/src/app/webview build" \ - "@/common/web/sentry-manager build" \ + "@/web/src/engine/sentry-manager build" \ "clean" \ "configure" \ "build" \ @@ -109,7 +109,7 @@ function update_bundle ( ) { cp "$KMW_PRODUCT/keymanweb-webview.js" "$BUNDLE_PATH/keymanweb-webview.js" cp "$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js" "$BUNDLE_PATH/sentry.min.js" - cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "$BUNDLE_PATH/keyman-sentry.js" + cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" "$BUNDLE_PATH/keyman-sentry.js" } # First things first - update our dependencies. @@ -140,4 +140,4 @@ function build_engine() { builder_run_action clean do_clean builder_run_action configure do_configure -builder_run_action build build_engine \ No newline at end of file +builder_run_action build build_engine diff --git a/ios/exportAppStore.plist b/ios/exportAppStore.plist index 48ef58f532d..bb7315750ed 100644 --- a/ios/exportAppStore.plist +++ b/ios/exportAppStore.plist @@ -7,9 +7,9 @@ teamID 3YE4W86L3G signingCertificate - BB842A0081298BBA6D034C85451750B08FC9EE8A + 683E4A3CDF5277C13004E84D63E31D2F720AB063 installerSigningCertificate - BB842A0081298BBA6D034C85451750B08FC9EE8A + 683E4A3CDF5277C13004E84D63E31D2F720AB063 provisioningProfiles Tavultesoft.Keyman diff --git a/linux/debian/control b/linux/debian/control index f7299997318..fbe7066f5c2 100644 --- a/linux/debian/control +++ b/linux/debian/control @@ -26,6 +26,7 @@ Build-Depends: pkgconf, python3-all (>= 3.5), python3-dbus, + python3-fonttools, python3-gi, python3-lxml, python3-magic, @@ -90,6 +91,7 @@ Depends: gir1.2-webkit2-4.1 | gir1.2-webkit2-4.0, keyman-engine, python3-bs4, + python3-fonttools, python3-gi, python3-packaging, python3-sentry-sdk (>= 1.1), diff --git a/linux/debian/libkeymancore2.symbols b/linux/debian/libkeymancore2.symbols index 5a9db70ef0b..c784cdf16c2 100644 --- a/linux/debian/libkeymancore2.symbols +++ b/linux/debian/libkeymancore2.symbols @@ -2,7 +2,7 @@ libkeymancore.so.2 libkeymancore2 #MINVER# * Build-Depends-Package: libkeymancore-dev (c++|optional)"typeinfo name for std::codecvt_utf8_utf16@Base" 17.0.244 - (c++|optional)std::piecewise_construct@Base 18.0.101 + (c++|optional)std::piecewise_construct@Base 18.0.223 km_core_context_clear@Base 17.0.195 km_core_context_get@Base 17.0.195 km_core_context_item_list_size@Base 17.0.195 diff --git a/linux/help/about/history.md b/linux/docs/help/about/history.md similarity index 100% rename from linux/help/about/history.md rename to linux/docs/help/about/history.md diff --git a/linux/help/about/index.md b/linux/docs/help/about/index.md similarity index 100% rename from linux/help/about/index.md rename to linux/docs/help/about/index.md diff --git a/linux/help/about/welcome.md b/linux/docs/help/about/welcome.md similarity index 100% rename from linux/help/about/welcome.md rename to linux/docs/help/about/welcome.md diff --git a/linux/help/about/whatsnew.md b/linux/docs/help/about/whatsnew.md similarity index 100% rename from linux/help/about/whatsnew.md rename to linux/docs/help/about/whatsnew.md diff --git a/linux/help/common/index.md b/linux/docs/help/common/index.md similarity index 100% rename from linux/help/common/index.md rename to linux/docs/help/common/index.md diff --git a/linux/help/index.md b/linux/docs/help/index.md similarity index 100% rename from linux/help/index.md rename to linux/docs/help/index.md diff --git a/linux/help/linux_images/add-input-source-khmer-angkor.png b/linux/docs/help/linux_images/add-input-source-khmer-angkor.png similarity index 100% rename from linux/help/linux_images/add-input-source-khmer-angkor.png rename to linux/docs/help/linux_images/add-input-source-khmer-angkor.png diff --git a/linux/help/linux_images/add-input-source-khmer.png b/linux/docs/help/linux_images/add-input-source-khmer.png similarity index 100% rename from linux/help/linux_images/add-input-source-khmer.png rename to linux/docs/help/linux_images/add-input-source-khmer.png diff --git a/linux/help/linux_images/add-input-source.png b/linux/docs/help/linux_images/add-input-source.png similarity index 100% rename from linux/help/linux_images/add-input-source.png rename to linux/docs/help/linux_images/add-input-source.png diff --git a/linux/help/linux_images/download-khmer-angkor.png b/linux/docs/help/linux_images/download-khmer-angkor.png similarity index 100% rename from linux/help/linux_images/download-khmer-angkor.png rename to linux/docs/help/linux_images/download-khmer-angkor.png diff --git a/linux/help/linux_images/km-config-khmer-angkor.png b/linux/docs/help/linux_images/km-config-khmer-angkor.png similarity index 100% rename from linux/help/linux_images/km-config-khmer-angkor.png rename to linux/docs/help/linux_images/km-config-khmer-angkor.png diff --git a/linux/help/linux_images/km-config.png b/linux/docs/help/linux_images/km-config.png similarity index 100% rename from linux/help/linux_images/km-config.png rename to linux/docs/help/linux_images/km-config.png diff --git a/linux/help/linux_images/mobile viewport.png b/linux/docs/help/linux_images/mobile viewport.png similarity index 100% rename from linux/help/linux_images/mobile viewport.png rename to linux/docs/help/linux_images/mobile viewport.png diff --git a/linux/help/linux_images/onboard.png b/linux/docs/help/linux_images/onboard.png similarity index 100% rename from linux/help/linux_images/onboard.png rename to linux/docs/help/linux_images/onboard.png diff --git a/linux/help/linux_images/package-khmer-angkor-welcome.png b/linux/docs/help/linux_images/package-khmer-angkor-welcome.png similarity index 100% rename from linux/help/linux_images/package-khmer-angkor-welcome.png rename to linux/docs/help/linux_images/package-khmer-angkor-welcome.png diff --git a/linux/help/linux_images/region-and-language.png b/linux/docs/help/linux_images/region-and-language.png similarity index 100% rename from linux/help/linux_images/region-and-language.png rename to linux/docs/help/linux_images/region-and-language.png diff --git a/linux/help/linux_images/region-language-khmer-angkor.png b/linux/docs/help/linux_images/region-language-khmer-angkor.png similarity index 100% rename from linux/help/linux_images/region-language-khmer-angkor.png rename to linux/docs/help/linux_images/region-language-khmer-angkor.png diff --git a/linux/help/linux_images/search-khmer-angkor.png b/linux/docs/help/linux_images/search-khmer-angkor.png similarity index 100% rename from linux/help/linux_images/search-khmer-angkor.png rename to linux/docs/help/linux_images/search-khmer-angkor.png diff --git a/linux/help/linux_images/video.png b/linux/docs/help/linux_images/video.png similarity index 100% rename from linux/help/linux_images/video.png rename to linux/docs/help/linux_images/video.png diff --git a/linux/help/reference/index.md b/linux/docs/help/reference/index.md similarity index 100% rename from linux/help/reference/index.md rename to linux/docs/help/reference/index.md diff --git a/linux/help/start/index.md b/linux/docs/help/start/index.md similarity index 100% rename from linux/help/start/index.md rename to linux/docs/help/start/index.md diff --git a/linux/help/start/installing-keyboard.md b/linux/docs/help/start/installing-keyboard.md similarity index 100% rename from linux/help/start/installing-keyboard.md rename to linux/docs/help/start/installing-keyboard.md diff --git a/linux/keyman-config/build-help.sh b/linux/keyman-config/build-help.sh index e05b8d284e4..3bc959cc6c4 100755 --- a/linux/keyman-config/build-help.sh +++ b/linux/keyman-config/build-help.sh @@ -72,11 +72,11 @@ fi if [ -n "$generate_help" ]; then echo "Generating markdown help pages..." - mkdir -p ../help/reference - buildtools/help2md ./km-package-get -o ../help/reference/km-package-get.md -n "Download a Keyman keyboard package" -I maninc/km-package-get.inc - buildtools/help2md ./km-package-install -o ../help/reference/km-package-install.md -n "Install a Keyman keyboard package" -I maninc/km-package-install.inc - buildtools/help2md ./km-config -o ../help/reference/km-config.md -n "Launches Keyman Configuration for installing and showing information about Keyman keyboards" -I maninc/km-config.inc - buildtools/help2md ./km-kvk2ldml -o ../help/reference/km-kvk2ldml.md -n "Convert a Keyman on-screen keyboard file to LDML" -I maninc/km-kvk2ldml.inc - buildtools/help2md ./km-package-list-installed -o ../help/reference/km-package-list-installed.md -n "List installed Keyman keyboard packages" -I maninc/km-package-list-installed.inc - buildtools/help2md ./km-package-uninstall -o ../help/reference/km-package-uninstall.md -n "Uninstall a Keyman keyboard package" -I maninc/km-package-uninstall.inc + mkdir -p ../docs/help/reference + buildtools/help2md ./km-package-get -o ../docs/help/reference/km-package-get.md -n "Download a Keyman keyboard package" -I maninc/km-package-get.inc + buildtools/help2md ./km-package-install -o ../docs/help/reference/km-package-install.md -n "Install a Keyman keyboard package" -I maninc/km-package-install.inc + buildtools/help2md ./km-config -o ../docs/help/reference/km-config.md -n "Launches Keyman Configuration for installing and showing information about Keyman keyboards" -I maninc/km-config.inc + buildtools/help2md ./km-kvk2ldml -o ../docs/help/reference/km-kvk2ldml.md -n "Convert a Keyman on-screen keyboard file to LDML" -I maninc/km-kvk2ldml.inc + buildtools/help2md ./km-package-list-installed -o ../docs/help/reference/km-package-list-installed.md -n "List installed Keyman keyboard packages" -I maninc/km-package-list-installed.inc + buildtools/help2md ./km-package-uninstall -o ../docs/help/reference/km-package-uninstall.md -n "Uninstall a Keyman keyboard package" -I maninc/km-package-uninstall.inc fi diff --git a/linux/keyman-config/build.sh b/linux/keyman-config/build.sh index 3346a7defaa..9296f80d059 100755 --- a/linux/keyman-config/build.sh +++ b/linux/keyman-config/build.sh @@ -28,7 +28,7 @@ builder_describe_outputs \ clean_action() { rm -rf dist make_deb build ./*.egg-info keyman_config/version.py find . \( -name __pycache__ -o -name keyman-config.mo \) -exec rm -rf {} + - rm -rf ../help/reference/km-*.md + rm -rf ../docs/help/reference/km-*.md # Don't delete this file during a package build because they are # part of the source package. We can't generate it during a package diff --git a/linux/keyman-config/keyman_config/__init__.py b/linux/keyman-config/keyman_config/__init__.py index 2bb3cdbaa25..26fbeddf7dd 100644 --- a/linux/keyman-config/keyman_config/__init__.py +++ b/linux/keyman-config/keyman_config/__init__.py @@ -1,5 +1,6 @@ import atexit import gettext +import importlib import logging import os import pathlib @@ -53,6 +54,14 @@ def initialize_sentry(): SentryErrorHandling().initialize_sentry() +def are_requirements_missing(): + try: + ttLib = importlib.import_module('fontTools.ttLib') + except ImportError: + return True + return False + + class FileCleanup(): """ Allow to register files that will be deleted when the process exits diff --git a/linux/keyman-config/keyman_config/install_kmp.py b/linux/keyman-config/keyman_config/install_kmp.py index d82c8e06e57..fed67952ca5 100755 --- a/linux/keyman-config/keyman_config/install_kmp.py +++ b/linux/keyman-config/keyman_config/install_kmp.py @@ -177,8 +177,8 @@ def _install_files(self, keyboards, files): # Special handling to convert kvk into LDML logging.info("Converting %s to LDML and installing both as as keyman file", f['name']) - ldml = convert_kvk_to_ldml(fpath) name, ext = os.path.splitext(f['name']) + ldml = convert_kvk_to_ldml(name, fpath) ldmlfile = os.path.join(self.packageDir, f"{name}.ldml") output_ldml(ldmlfile, ldml) elif ftype == KMFileTypes.KM_ICON: diff --git a/linux/keyman-config/keyman_config/kvk2ldml.py b/linux/keyman-config/keyman_config/kvk2ldml.py index 3b3aee281bb..ddef89241a3 100755 --- a/linux/keyman-config/keyman_config/kvk2ldml.py +++ b/linux/keyman-config/keyman_config/kvk2ldml.py @@ -1,11 +1,15 @@ #!/usr/bin/python3 import logging +import os import struct import sys +from fontTools import ttLib from lxml import etree +from keyman_config.kmpmetadata import parsemetadata + # .kvk file format # KVK files are variable length files with variable sized structures. @@ -311,7 +315,18 @@ def _get_modifer(key): return modifier -def convert_ldml(kvkData): +def _fontFacename(fontFilename): + """Get the facename from fontFilename's TTF tables""" + # From https://github.com/mcfletch/ttfquery/blob/master/ttfquery/describe.py + FONT_SPECIFIER_NAME_ID = 4 + font = ttLib.TTFont(fontFilename) + for record in font['name'].names: + if record.nameID == FONT_SPECIFIER_NAME_ID: + return record.toUnicode() + return None + + +def convert_ldml(keyboardName, kvkData, kmpJsonFilename): keymaps = {} for key in kvkData.Keys: @@ -349,7 +364,19 @@ def convert_ldml(kvkData): else: keymaps["shift"] = (uskey,) + info, system, options, keyboards, files = parsemetadata(kmpJsonFilename) + ldml = etree.Element("keyboard", locale="zzz-keyman") + for keyboard in keyboards: + if keyboard['id'] != keyboardName: + continue + if 'oskFont' in keyboard: + fontFile = os.path.join(os.path.dirname(kmpJsonFilename), keyboard['oskFont']) + font = _fontFacename(fontFile) + if font: + ldml.set('keymanFacename', font) + break + etree.SubElement(ldml, "version", platform="11") names = etree.SubElement(ldml, "names") names.append(etree.Element("name", value="ZZZ")) @@ -402,6 +429,7 @@ def parse_kvk_file(kvkfile): return kvkData -def convert_kvk_to_ldml(kvkfile): +def convert_kvk_to_ldml(name, kvkfile): kvkData = parse_kvk_file(kvkfile) - return convert_ldml(kvkData) + kmpJsonFilename = os.path.join(os.path.dirname(kvkfile), 'kmp.json') + return convert_ldml(name, kvkData, kmpJsonFilename) diff --git a/linux/keyman-config/km-config b/linux/keyman-config/km-config index f40ebeebb4b..641fb964706 100755 --- a/linux/keyman-config/km-config +++ b/linux/keyman-config/km-config @@ -9,7 +9,10 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk -from keyman_config import __versionwithtag__, __pkgversion__, add_standard_arguments, initialize_logging, initialize_sentry, verify_dbus_running +from keyman_config import ( + _, __versionwithtag__, __pkgversion__, add_standard_arguments, + are_requirements_missing, initialize_logging, initialize_sentry, + verify_dbus_running) from keyman_config.handle_install import download_and_install_package from keyman_config.ibus_util import verify_ibus_daemon from keyman_config.view_installed import ViewInstalledWindow @@ -42,6 +45,18 @@ if __name__ == '__main__': initialize_sentry() verify_dbus_running() + if are_requirements_missing(): + if args.install or args.url: + logging.error('Missing requirements. Please install python3-fonttools.') + else: + dialog = Gtk.MessageDialog( + None, 0, Gtk.MessageType.ERROR, + Gtk.ButtonsType.OK, _("Missing requirements. Please install python3-fonttools.")) + dialog.run() + dialog.destroy() + sys.exit(1) + + logging.info('Keyman version %s %s', __versionwithtag__, __pkgversion__) verify_ibus_daemon(False) diff --git a/linux/keyman-config/km-kvk2ldml b/linux/keyman-config/km-kvk2ldml index d669dfa72cd..2ddddc5becc 100755 --- a/linux/keyman-config/km-kvk2ldml +++ b/linux/keyman-config/km-kvk2ldml @@ -5,7 +5,9 @@ import logging import os import sys -from keyman_config import add_standard_arguments, initialize_logging, initialize_sentry, verify_dbus_running +from keyman_config import ( + are_requirements_missing, add_standard_arguments, initialize_logging, + initialize_sentry, verify_dbus_running) from keyman_config.kvk2ldml import parse_kvk_file, print_kvk, convert_ldml, output_ldml @@ -25,6 +27,10 @@ def main(): initialize_sentry() verify_dbus_running() + if are_requirements_missing(): + logging.error('km-kvk2ldml: Missing requirements. Please install python3-fonttools.') + sys.exit(1) + name, ext = os.path.splitext(args.kvkfile) # Check if input file extension is kvk if ext != ".kvk": @@ -56,7 +62,8 @@ def main(): try: with open(outputfile, 'wb') as ldmlfile: - ldml = convert_ldml(kvkData) + kmpJsonFilename = os.path.join(os.path.dirname(args.kvkfile), 'kmp.json') + ldml = convert_ldml(name, kvkData, kmpJsonFilename) output_ldml(ldmlfile, ldml) except PermissionError: logging.error(f'km-kvk2ldml: error, permission denied writing file `{outputfile}`') diff --git a/linux/keyman-config/tests/test_kvk2ldml.py b/linux/keyman-config/tests/test_kvk2ldml.py new file mode 100644 index 00000000000..9f4c072874f --- /dev/null +++ b/linux/keyman-config/tests/test_kvk2ldml.py @@ -0,0 +1,57 @@ +import os +import shutil +import sys +import tempfile +import unittest + +from keyman_config.kvk2ldml import KVKData, NFont, convert_ldml + +class Kvk2LdmlTests(unittest.TestCase): + def _createKmpJson(self, packagedir): + kmpJsonFilename = os.path.join(packagedir, 'kmp.json') + with open(kmpJsonFilename, 'w') as file: + file.write('''{ + "system": { + "keymanDeveloperVersion": "18.0", + "fileVersion": "7.0" + }, + "files": [ { + "name": "khmer_angkor.kmx", + "description": "Keyboard Khmer Angkor" + }, { + "name": "kmp.json", + "description": "Package information (JSON)" + } ], + "keyboards": [ { + "name": "Khmer Angkor", + "id": "khmer_angkor", + "version": "1.5", + "oskFont": "keymanweb-osk.ttf", + "languages": [ { + "name": "Central Khmer (Khmer, Cambodia)", + "id": "km" + } ]} + ]}''') + return kmpJsonFilename + + def test_convert_ldml__adds_keymanFacename(self): + # Setup + keyboardName = 'khmer_angkor' + kvkData = KVKData() + kvkData.AssociatedKeyboard = keyboardName + kvkData.UnicodeFont = NFont() + kvkData.UnicodeFont.name='DontUseThis!' + + workdir = tempfile.TemporaryDirectory() + kmpJsonFilename = self._createKmpJson(workdir.name) + shutil.copy2(os.path.join(sys.path[0], '../../../common/resources/fonts/keymanweb-osk.ttf'), + workdir.name) + + # Execute + ldml = convert_ldml(keyboardName, kvkData, kmpJsonFilename) + + # Verify + self.assertEqual(ldml.get('locale'), "zzz-keyman") + self.assertEqual(ldml.get('keymanFacename'), 'SymChar') + + workdir.cleanup() diff --git a/linux/scripts/dist.sh b/linux/scripts/dist.sh index 6ef0be7d8bb..1c730f8f4b9 100755 --- a/linux/scripts/dist.sh +++ b/linux/scripts/dist.sh @@ -57,7 +57,7 @@ dpkg-source --tar-ignore=*~ \ --tar-ignore=linux/keyman-config/keyman_config/version.py \ --tar-ignore=linux/keyman-config/buildtools/build-langtags.py \ --tar-ignore=__pycache__ \ - --tar-ignore=linux/help \ + --tar-ignore=linux/docs/help \ --tar-ignore=mac \ --tar-ignore=node_modules \ --tar-ignore=oem \ diff --git a/mac/Keyman4Mac/Keyman4Mac/AppDelegate.m b/mac/Keyman4Mac/Keyman4Mac/AppDelegate.m index 44f7cfda587..f6bf6c81fed 100644 --- a/mac/Keyman4Mac/Keyman4Mac/AppDelegate.m +++ b/mac/Keyman4Mac/Keyman4Mac/AppDelegate.m @@ -9,8 +9,6 @@ #import "AppDelegate.h" #import -static BOOL debugMode = YES; - BOOL isKeyMapEnabled; const unsigned short keyMapSize = 0x80; @@ -47,8 +45,6 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { NSArray *kvkFiles = [self KVKFiles]; for (NSString *path in kvkFiles){ KVKFile *kvkFile = [[KVKFile alloc] initWithFilePath:path]; - if (debugMode) - NSLog(@"%@", kvkFile); }*/ } @@ -116,7 +112,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef NSLog(@"AppDelegate eventTapFunction key down event: %@", event); // Key down event NSEvent *mEvent = [NSEvent eventWithCGEvent:event]; - KMEngine *kme = [[KMEngine alloc] initWithKMX:kmx context:contextBuffer verboseLogging:debugMode]; + KMEngine *kme = [[KMEngine alloc] initWithKMX:kmx context:contextBuffer]; CoreKeyOutput *coreKeyOutput = [kme processEvent:mEvent]; if (coreKeyOutput) { if (coreKeyOutput.hasTextToInsert) { @@ -227,18 +223,6 @@ - (void)comboBoxSelectionDidChange:(NSNotification *)notification { NSLog(@"%d: %@", index, kmStore); index++; } - - for (NSObject *gp in kmx.group) { - if (debugMode) { - NSLog(@"Group %@", gp); - //NSLog(@"match = %@", gp.match); - //NSLog(@"nomatch = %@", gp.noMatch); - /* - for (KMCompKey *kmKey in gp.keys) { - NSLog(@"\nKey: %@", kmKey); - }*/ - } - } } } @@ -259,9 +243,6 @@ - (void)setKMXList { if (!infoDict) continue; - //if (debugMode) - // NSLog(@"%@", infoDict); - //NSString *str = [NSString stringWithFormat:@"%@ (%@)", [infoDict objectForKey:kKMKeyboardNameKey], [infoDict objectForKey:kKMKeyboardVersionKey]]; NSString *str = [infoDict objectForKey:kKMKeyboardNameKey]; [kmxDesc addObject:str]; } diff --git a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj index 66dac595c8c..51cf7185509 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj +++ b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj @@ -7,12 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 29015ABD2C58D86F00CCBB94 /* KMDataRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = 29015ABC2C58D86F00CCBB94 /* KMDataRepository.m */; }; 290BC680274B9DB1005CD1C3 /* KMPackageInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 290BC67F274B9DB1005CD1C3 /* KMPackageInfo.m */; }; 290BC75E274F3FD7005CD1C3 /* KMKeyboardInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 290BC75D274F3FD7005CD1C3 /* KMKeyboardInfo.m */; }; 2915DC512BFE35DB0051FC52 /* KMLogs.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B4A0D32BF7675A00682049 /* KMLogs.m */; }; 293EA3E627140D8100545EED /* KMAboutWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 293EA3E827140D8100545EED /* KMAboutWindowController.xib */; }; 293EA3EB27140DEC00545EED /* preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 293EA3ED27140DEC00545EED /* preferences.xib */; }; 293EA3F427181FDA00545EED /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 293EA3F627181FDA00545EED /* Localizable.strings */; }; + 296105232C8E91C7007BF6B7 /* KMInputMethodLifecycle.m in Sources */ = {isa = PBXBuildFile; fileRef = 296105222C8E91C7007BF6B7 /* KMInputMethodLifecycle.m */; }; 296FE2FC275DD21600F46898 /* KMPackageReader.m in Sources */ = {isa = PBXBuildFile; fileRef = 296FE2FB275DD21600F46898 /* KMPackageReader.m */; }; 297A501728DF4D360074EB1B /* PrivacyWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 297A501228DF4D360074EB1B /* PrivacyWindowController.m */; }; 297A501828DF4D360074EB1B /* PrivacyWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 297A501328DF4D360074EB1B /* PrivacyWindowController.xib */; }; @@ -30,6 +32,9 @@ 29B42A602728343B00EDD5D3 /* KMKeyboardHelpWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29B42A622728343B00EDD5D3 /* KMKeyboardHelpWindowController.xib */; }; 29B4A0D52BF7675A00682049 /* KMLogs.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B4A0D32BF7675A00682049 /* KMLogs.m */; }; 29B6FB732BC39DD60074BF7F /* TextApiComplianceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B6FB722BC39DD60074BF7F /* TextApiComplianceTests.m */; }; + 29BE9D872CA3C21900B67DE7 /* KMModifierMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BE9D862CA3C21900B67DE7 /* KMModifierMapping.m */; }; + 29C1CDE22C5B2F8B003C23BB /* KMSettingsRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = D861B03E2C5747F70003675E /* KMSettingsRepository.m */; }; + 29C1CDE32C5B2F8B003C23BB /* KMDataRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = 29015ABC2C58D86F00CCBB94 /* KMDataRepository.m */; }; 37A245C12565DFA6000BBF92 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 37A245C02565DFA6000BBF92 /* Assets.xcassets */; }; 37AE5C9D239A7B770086CC7C /* qrcode.min.js in Resources */ = {isa = PBXBuildFile; fileRef = 37AE5C9C239A7B770086CC7C /* qrcode.min.js */; }; 37C2B0CB25FF2C350092E16A /* Help in Resources */ = {isa = PBXBuildFile; fileRef = 37C2B0CA25FF2C340092E16A /* Help */; }; @@ -72,6 +77,7 @@ 98FE10631B4DEE5600525F54 /* KMInfoWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 98FE10611B4DEE5600525F54 /* KMInfoWindowController.m */; }; 9A3D6C5D221531B0008785A3 /* KMOSVersion.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A3D6C5C221531B0008785A3 /* KMOSVersion.m */; }; B90818AF7ED302187DE0E026 /* Pods_Keyman.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B644E63217FFE54B91C71C94 /* Pods_Keyman.framework */; }; + D861B03F2C5747F70003675E /* KMSettingsRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = D861B03E2C5747F70003675E /* KMSettingsRepository.m */; }; E211769D20E182DD00F8065D /* NoContextTestClient.m in Sources */ = {isa = PBXBuildFile; fileRef = E211769C20E182DD00F8065D /* NoContextTestClient.m */; }; E21176A020E18C5200F8065D /* AppleCompliantTestClient.m in Sources */ = {isa = PBXBuildFile; fileRef = E211769F20E18C5200F8065D /* AppleCompliantTestClient.m */; }; E211CCF620B600A500505C36 /* KeymanEngine4Mac.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = E211CCF520B600A500505C36 /* KeymanEngine4Mac.framework.dSYM */; }; @@ -135,6 +141,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 29015ABB2C58D86F00CCBB94 /* KMDataRepository.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMDataRepository.h; sourceTree = ""; }; + 29015ABC2C58D86F00CCBB94 /* KMDataRepository.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMDataRepository.m; sourceTree = ""; }; 2901BA8A292332B3009903EC /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/KMAboutWindowController.strings"; sourceTree = ""; }; 2901BA8B292332B3009903EC /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/preferences.strings"; sourceTree = ""; }; 2901BA8C292332B3009903EC /* ff-NG */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ff-NG"; path = "ff-NG.lproj/KMInfoWindowController.strings"; sourceTree = ""; }; @@ -152,6 +160,8 @@ 293EA3EF27140DFA00545EED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/preferences.strings; sourceTree = ""; }; 293EA3F02714158600545EED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = ""; }; 293EA3F527181FDA00545EED /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; + 296105212C8E91C7007BF6B7 /* KMInputMethodLifecycle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMInputMethodLifecycle.h; sourceTree = ""; }; + 296105222C8E91C7007BF6B7 /* KMInputMethodLifecycle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMInputMethodLifecycle.m; sourceTree = ""; }; 296FE2FA275DD21600F46898 /* KMPackageReader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMPackageReader.h; sourceTree = ""; }; 296FE2FB275DD21600F46898 /* KMPackageReader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMPackageReader.m; sourceTree = ""; }; 29781101297FB262007C886D /* kn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = kn; path = kn.lproj/KMAboutWindowController.strings; sourceTree = ""; }; @@ -239,6 +249,8 @@ 29B70A26283CB66B0086B580 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/KMKeyboardHelpWindowController.strings"; sourceTree = ""; }; 29B70A27283CB66C0086B580 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/MainMenu.strings"; sourceTree = ""; }; 29B70A28283CB6900086B580 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = ""; }; + 29BE9D852CA3C21900B67DE7 /* KMModifierMapping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMModifierMapping.h; sourceTree = ""; }; + 29BE9D862CA3C21900B67DE7 /* KMModifierMapping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KMModifierMapping.m; sourceTree = ""; }; 29BFA761282936D4009FCCC3 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/KMAboutWindowController.strings; sourceTree = ""; }; 29BFA762282936D5009FCCC3 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/preferences.strings; sourceTree = ""; }; 29BFA763282936D5009FCCC3 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/KMInfoWindowController.strings; sourceTree = ""; }; @@ -356,6 +368,8 @@ CEFFECDB2A417FEC00D58C36 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/KMKeyboardHelpWindowController.strings; sourceTree = ""; }; CEFFECDC2A417FEC00D58C36 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainMenu.strings; sourceTree = ""; }; CEFFECDD2A4180FD00D58C36 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = ""; }; + D861B03D2C5747F70003675E /* KMSettingsRepository.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMSettingsRepository.h; sourceTree = ""; }; + D861B03E2C5747F70003675E /* KMSettingsRepository.m */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = KMSettingsRepository.m; sourceTree = ""; tabWidth = 2; }; E211769B20E1826800F8065D /* NoContextTestClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NoContextTestClient.h; sourceTree = ""; }; E211769C20E182DD00F8065D /* NoContextTestClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NoContextTestClient.m; sourceTree = ""; }; E211769E20E18C0B00F8065D /* AppleCompliantTestClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleCompliantTestClient.h; sourceTree = ""; }; @@ -554,6 +568,10 @@ 29B4A0D32BF7675A00682049 /* KMLogs.m */, 299ABD6F29ECE75B00AA5948 /* KeySender.m */, 299ABD7029ECE75B00AA5948 /* KeySender.h */, + D861B03D2C5747F70003675E /* KMSettingsRepository.h */, + D861B03E2C5747F70003675E /* KMSettingsRepository.m */, + 29015ABB2C58D86F00CCBB94 /* KMDataRepository.h */, + 29015ABC2C58D86F00CCBB94 /* KMDataRepository.m */, 297A501128DF4D360074EB1B /* Privacy */, 98FE105B1B4DE86300525F54 /* Categories */, 98D6DA791A799EE700B09822 /* Frameworks */, @@ -567,6 +585,10 @@ 98D6DA7D1A799FF400B09822 /* KMInputController.m */, 98A778C21A8C53BF00CF809D /* KMInputMethodAppDelegate.h */, 98A778C31A8C53BF00CF809D /* KMInputMethodAppDelegate.m */, + 29BE9D852CA3C21900B67DE7 /* KMModifierMapping.h */, + 29BE9D862CA3C21900B67DE7 /* KMModifierMapping.m */, + 296105212C8E91C7007BF6B7 /* KMInputMethodLifecycle.h */, + 296105222C8E91C7007BF6B7 /* KMInputMethodLifecycle.m */, E21799031FC5B74D00F2D66A /* KMInputMethodEventHandler.h */, E21799041FC5B7BC00F2D66A /* KMInputMethodEventHandler.m */, 298D09F62A1F4533006B9DFE /* TextApiCompliance.h */, @@ -981,8 +1003,11 @@ 29B4A0D52BF7675A00682049 /* KMLogs.m in Sources */, 98BF924F1BF02DC20002126A /* KMBarView.m in Sources */, E240F599202DED740000067D /* KMPackage.m in Sources */, + 296105232C8E91C7007BF6B7 /* KMInputMethodLifecycle.m in Sources */, + D861B03F2C5747F70003675E /* KMSettingsRepository.m in Sources */, 984B8F441AF1C3D900E096A8 /* OSKWindowController.m in Sources */, 9836B3711AE5F11D00780482 /* mztools.c in Sources */, + 29015ABD2C58D86F00CCBB94 /* KMDataRepository.m in Sources */, 9836B3701AE5F11D00780482 /* ioapi.c in Sources */, E21799051FC5B7BC00F2D66A /* KMInputMethodEventHandler.m in Sources */, 98E6729F1B532F5E00DBDE2F /* KMDownloadKBWindowController.m in Sources */, @@ -1003,6 +1028,7 @@ 290BC75E274F3FD7005CD1C3 /* KMKeyboardInfo.m in Sources */, 297A501728DF4D360074EB1B /* PrivacyWindowController.m in Sources */, 98BF92521BF03D4D0002126A /* KMAboutBGView.m in Sources */, + 29BE9D872CA3C21900B67DE7 /* KMModifierMapping.m in Sources */, 98BF92571BF0431F0002126A /* KMAboutWindow.m in Sources */, 98BCD1F61B4E5998004E1AFD /* NSString+SuppMethods.m in Sources */, ); @@ -1012,6 +1038,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 29C1CDE22C5B2F8B003C23BB /* KMSettingsRepository.m in Sources */, + 29C1CDE32C5B2F8B003C23BB /* KMDataRepository.m in Sources */, 2915DC512BFE35DB0051FC52 /* KMLogs.m in Sources */, 2992F4202A28482800E08929 /* PrivacyWindowController.m in Sources */, 2992F41F2A2847C900E08929 /* TextApiCompliance.m in Sources */, diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/Base.lproj/preferences.xib b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/Base.lproj/preferences.xib index c327ce4ad27..e6cc0173aac 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/Base.lproj/preferences.xib +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/Base.lproj/preferences.xib @@ -1,21 +1,18 @@ - + - - + + - - - @@ -79,7 +76,7 @@ - + - - - @@ -254,7 +217,7 @@ - + @@ -305,9 +268,9 @@ - + - + YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m index 3e2ffe24100..202be65ef5e 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/KMConfigurationWindowController.m @@ -8,14 +8,12 @@ #import "KMConfigurationWindowController.h" #import "KMDownloadKBWindowController.h" +#import "KMDataRepository.h" #import "KMLogs.h" @interface KMConfigurationWindowController () @property (nonatomic, weak) IBOutlet NSTableView *tableView; @property (nonatomic, weak) IBOutlet WebView *webView; -@property (nonatomic, weak) IBOutlet NSButton *alwaysShowOSKCheckBox; -@property (nonatomic, weak) IBOutlet NSButton *useVerboseLoggingCheckBox; -@property (nonatomic, weak) IBOutlet NSTextField *verboseLoggingInfo; @property (nonatomic, weak) IBOutlet NSButton *supportBack; @property (nonatomic, weak) IBOutlet NSButton *supportForward; @property (nonatomic, weak) IBOutlet NSButton *supportHome; @@ -68,9 +66,6 @@ - (void)windowDidLoad { NSURL *homeUrl = [[NSBundle mainBundle] URLForResource:@"index" withExtension:@"html" subdirectory:@"Help"]; [self.webView.mainFrame loadRequest:[NSURLRequest requestWithURL:homeUrl]]; - - [self.alwaysShowOSKCheckBox setState:(self.AppDelegate.alwaysShowOSK ? NSOnState : NSOffState)]; - [self.useVerboseLoggingCheckBox setState:(self.AppDelegate.useVerboseLogging ? NSOnState : NSOffState)]; } - (void)webView:(WebView *)sender decidePolicyForNewWindowAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request newFrameName:(NSString *)frameName decisionListener:(id)listener { @@ -134,8 +129,10 @@ - (NSArray *)tableContents { NSArray *pArray = (NSArray *)obj; NSString *packageFolder = [self packageFolderFromPath:[pArray objectAtIndex:0]]; NSString *packageName = [self.AppDelegate packageNameFromPackageInfo:packageFolder]; + os_log_debug([KMLogs uiLog], "tableContents, packageFolder: %{public}@, packageName: %{public}@", packageFolder, packageName); [_tableContents addObject:[NSDictionary dictionaryWithObjectsAndKeys:packageName, @"HeaderTitle", nil]]; for (NSString *path in pArray) { + os_log_debug([KMLogs uiLog], "tableContents, path = '%{public}@'", path); NSDictionary *info = [KMXFile keyboardInfoFromKmxFile:path]; if (!info) { info = [[NSDictionary alloc] initWithObjectsAndKeys: @@ -150,6 +147,7 @@ - (NSArray *)tableContents { } else { NSString *path = (NSString *)obj; + os_log_debug([KMLogs uiLog], "tableContents, path = '%{public}@'", path); NSDictionary *info = [KMXFile keyboardInfoFromKmxFile:path]; if (!info) { info = [[NSDictionary alloc] initWithObjectsAndKeys: @@ -241,22 +239,27 @@ - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn BOOL isHeader = (headerTitle != nil); BOOL isOthers = NO; NSString *kmxFilePath = [self kmxFilePathAtIndex:row]; - if (kmxFilePath != nil) + if (kmxFilePath != nil) { isOthers = [[self packageFolderFromPath:kmxFilePath] isEqualToString:@"Others"]; - else if (isHeader && [headerTitle isEqualToString:@"Others"]) + } + else if (isHeader && [headerTitle isEqualToString:@"Others"]) { isOthers = YES; - + } if ([identifier isEqualToString:@"Column1"]) { KMConfigColumn1CellView *cellView = [tableView makeViewWithIdentifier:identifier owner:self]; - if (isHeader) + if (isHeader) { [cellView setHidden:YES]; + } else { [cellView setHidden:NO]; cellView.imageView.objectValue = [info objectForKey:kKMKeyboardIconKey]; [cellView.checkBox setTag:row]; [cellView.checkBox setAction:@selector(checkBoxAction:)]; - [cellView.checkBox setState:([self.activeKeyboards containsObject:[self kmxFilePathAtIndex:row]])?NSOnState:NSOffState]; + NSString *kmxFilePath = [self kmxFilePathAtIndex:row]; + NSString *partialPath = [KMDataRepository.shared trimToPartialPath:kmxFilePath]; + os_log_debug([KMLogs uiLog], "tableView:viewForTableColumn, kmxFilePath = %{public}@ for row %li, partialPath = %{public}@", kmxFilePath, (long)row, partialPath); + [cellView.checkBox setState:([self.activeKeyboards containsObject:partialPath])?NSOnState:NSOffState]; } return cellView; @@ -357,14 +360,16 @@ - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id)info r - (void)checkBoxAction:(id)sender { NSButton *checkBox = (NSButton *)sender; NSString *kmxFilePath = [self kmxFilePathAtIndex:checkBox.tag]; + NSString *partialPath = [KMDataRepository.shared trimToPartialPath:kmxFilePath]; + os_log_debug([KMLogs uiLog], "checkBoxAction, kmxFilePath = %{public}@ for checkBox.tag %li, partialPath = %{public}@", kmxFilePath, checkBox.tag, partialPath); if (checkBox.state == NSOnState) { os_log_debug([KMLogs uiLog], "Adding active keyboard: %{public}@", kmxFilePath); - [self.activeKeyboards addObject:kmxFilePath]; + [self.activeKeyboards addObject:partialPath]; [self saveActiveKeyboards]; } else if (checkBox.state == NSOffState) { os_log_debug([KMLogs uiLog], "Disabling active keyboard: %{public}@", kmxFilePath); - [self.activeKeyboards removeObject:kmxFilePath]; + [self.activeKeyboards removeObject:partialPath]; [self saveActiveKeyboards]; } } @@ -398,8 +403,8 @@ - (void)helpAction:(id)sender { } - (void)removeAction:(id)sender { - NSButton *removeButton = (NSButton *)sender; - NSDictionary *info = [self.tableContents objectAtIndex:removeButton.tag]; + NSButton *deleteButton = (NSButton *)sender; + NSDictionary *info = [self.tableContents objectAtIndex:deleteButton.tag]; NSString *deleteKeyboardMessage = NSLocalizedString(@"message-confirm-delete-keyboard", nil); if ([info objectForKey:@"HeaderTitle"] != nil) @@ -407,10 +412,13 @@ - (void)removeAction:(id)sender { else [self.deleteAlertView setMessageText:[NSString localizedStringWithFormat:deleteKeyboardMessage, [info objectForKey:kKMKeyboardNameKey]]]; - [self.deleteAlertView beginSheetModalForWindow:self.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:(__bridge void *)([NSNumber numberWithInteger:removeButton.tag])]; + [self.deleteAlertView beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { + if (returnCode == NSAlertFirstButtonReturn) { + os_log_debug([KMLogs uiLog], "confirm delete keyboard alert dismissed"); + [self deleteFileAtIndex:[NSNumber numberWithInteger:deleteButton.tag]]; + } + self.deleteAlertView = nil; + }]; } - (IBAction)downloadAction:(id)sender { @@ -425,38 +433,31 @@ - (IBAction)downloadAction:(id)sender { [self.AppDelegate.downloadKBWindow.window makeKeyAndOrderFront:nil]; } -- (IBAction)alwaysShowOSKCheckBoxAction:(id)sender { - NSButton *checkBox = (NSButton *)sender; - [self.AppDelegate setAlwaysShowOSK:(checkBox.state == NSOnState)]; -} - -- (IBAction)useVerboseLoggingCheckBoxAction:(id)sender { - NSButton *checkBox = (NSButton *)sender; - BOOL verboseLoggingOn = checkBox.state == NSOnState; - [self.AppDelegate setUseVerboseLogging:verboseLoggingOn]; - [self.verboseLoggingInfo setHidden:!verboseLoggingOn]; -} - - (void)handleRequestToInstallPackage:(KMPackage *) package { + os_log_debug([KMLogs dataLog], "handleRequestToInstallPackage"); NSString *keyboardInfoString = NSLocalizedString(@"info-install-keyboard-filename", nil); [self.confirmKmpInstallAlertView setInformativeText:[NSString localizedStringWithFormat:keyboardInfoString, package.getOrigKmpFilename]]; os_log_debug([KMLogs uiLog], "Asking user to confirm installation of %{public}@, KMP - temp file name: %{public}@", package.getOrigKmpFilename, package.getTempKmpFilename); - [self.confirmKmpInstallAlertView beginSheetModalForWindow:self.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:(__bridge void *)(package)]; + [self.confirmKmpInstallAlertView beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { + os_log_debug([KMLogs uiLog], "confirm keyboard installation alert dismissed"); + if (returnCode == NSAlertFirstButtonReturn) { + [self installPackageFile: package.getTempKmpFilename]; + } + [package releaseTempKMPFile]; + self.confirmKmpInstallAlertView = nil; + }]; } - (void)installPackageFile:(NSString *)kmpFile { // kmpFile could be a temp file (in fact, it always is!), so don't display the name. - - os_log_debug([KMLogs dataLog], "KMP - Ready to unzip/install Package File: %{public}@", kmpFile); + os_log_debug([KMLogs dataLog], "kmpFile - ready to unzip/install Package File: %{public}@", kmpFile); BOOL didUnzip = [self.AppDelegate unzipFile:kmpFile]; if (!didUnzip) { + os_log_debug([KMLogs dataLog], "kmpFile, unzipFile failed"); NSAlert *failure = [[NSAlert alloc] init]; [failure addButtonWithTitle:NSLocalizedString(@"button-keyboard-file-unreadable", @"Alert button")]; @@ -465,13 +466,12 @@ - (void)installPackageFile:(NSString *)kmpFile { [failure setIcon:[[NSBundle mainBundle] imageForResource:@"logo.png"]]; [failure setAlertStyle:NSAlertStyleWarning]; - [failure beginSheetModalForWindow:self.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + [failure beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) { + os_log_debug([KMLogs uiLog], "kmpFile, keyboard file unreadable alert dismissed with returnCode: %ld", (long)returnCode); + }]; } else { - os_log_debug([KMLogs dataLog], "Completed installation of KMP file."); + os_log_debug([KMLogs dataLog], "kmpFile, completed installation of KMP file"); } } @@ -547,28 +547,6 @@ - (NSAlert *)confirmKmpInstallAlertView { return _confirmKmpInstallAlertView; } -- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - os_log_debug([KMLogs uiLog], "User responded to NSAlert"); - if (alert == _deleteAlertView) { - if (returnCode == NSAlertFirstButtonReturn) { // Delete - [self deleteFileAtIndex:(__bridge NSNumber *)contextInfo]; - } - - _deleteAlertView = nil; - } - else if (alert == _confirmKmpInstallAlertView) { - KMPackage *package = (__bridge KMPackage *)contextInfo; - os_log_debug([KMLogs uiLog], "KMP - Temp file: %{public}@", package.getTempKmpFilename); - if (returnCode == NSAlertFirstButtonReturn) { // Install - [self installPackageFile: package.getTempKmpFilename]; - } - - [package releaseTempKMPFile]; - _confirmKmpInstallAlertView = nil; - } - // else, just a message - nothing to do. -} - - (void)deleteFileAtIndex:(NSNumber *) n { NSInteger index = [n integerValue]; NSString *path2Remove = nil; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/cs.lproj/preferences.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/cs.lproj/preferences.strings index 305368c9ca1..9477b4c6378 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/cs.lproj/preferences.strings +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/cs.lproj/preferences.strings @@ -17,7 +17,7 @@ "JOK-JV-n8w.title" = "Zpět"; /* Keyboards button text */ -"MPN-9N-wWc.label" = "Keyboards"; +"MPN-9N-wWc.label" = "Klávesnice"; /* text to explain verbose Console logging option */ "MrI-GM-7d6.title" = "Když je zapnuta možnost detailního logování, Keyman zaznamená akce, které mohou pomoci Keymanovi diagnostikovat problém. Program konzole může být použit k zobrazení protokolu zpráv od Keymana. V konzoli filtr zobrazuje všechny zprávy z procesu \"Klíčové\". Tento log může být exportován a v případě potřeby odeslán na podporu klíče."; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/it.lproj/preferences.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/it.lproj/preferences.strings index e83bbe7c452..23333e41df1 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/it.lproj/preferences.strings +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/it.lproj/preferences.strings @@ -17,7 +17,7 @@ "JOK-JV-n8w.title" = "Indietro"; /* Keyboards button text */ -"MPN-9N-wWc.label" = "Keyboards"; +"MPN-9N-wWc.label" = "Tastiere"; /* text to explain verbose Console logging option */ "MrI-GM-7d6.title" = "Quando l'opzione di registrazione dettagliata è attiva, Keyman registrerà le azioni che potrebbero aiutare Keyman Supporto diagnosticare un problema. Il programma Console può essere utilizzato per vedere un registro dei messaggi da Keyman. In Console, filtrare per mostrare tutti i messaggi dal processo \"Keyman\". Questo registro può essere esportato e inviato al supporto di Keyman, se necessario."; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMDataRepository.h b/mac/Keyman4MacIM/Keyman4MacIM/KMDataRepository.h new file mode 100644 index 00000000000..35d3f427e6f --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMDataRepository.h @@ -0,0 +1,28 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-07-30. + * + */ + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface KMDataRepository : NSObject +// keymanDataDirectory: '~/Library/Application Support/keyman.inputmethod.Keyman' +@property (readonly) NSURL *keymanDataDirectory; + +// keymanKeyboardsDirectory: '~/Library/Application Support/keyman.inputmethod.Keyman/Keyman-Keyboards' +@property (readonly) NSURL *keymanKeyboardsDirectory; + ++ (KMDataRepository *)shared; +- (void)createDataDirectoryIfNecessary; +- (void)createKeyboardsDirectoryIfNecessary; +- (BOOL)migrateData; +- (NSString*)buildFullPath:(NSString *)fromPartialPath; +- (NSString*)trimToPartialPath:(NSString *)fromFullPath; +- (NSString *)buildPartialPathFrom:(NSString *)keyboardSubdirectory keyboardFile:(NSString *)kmxFilename; +@end + +NS_ASSUME_NONNULL_END diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMDataRepository.m b/mac/Keyman4MacIM/Keyman4MacIM/KMDataRepository.m new file mode 100644 index 00000000000..4722a86fec9 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMDataRepository.m @@ -0,0 +1,230 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-07-30. + * + * Singleton object which serves as an abstraction for the reading and writing of Keyman data. + * The 'data' currently consists of keyman keyboards installed by the user. All data is saved locally on disk using NSFileManager. + * This is in contrast with the lighter weight Settings which is stored using UserDefaults and handled by KMSettingsRepository. + */ + +#import "KMDataRepository.h" +#import "KMLogs.h" + +@interface KMDataRepository () +@property (readonly) NSURL *applicationSupportSubDirectory; +@property (readonly) NSURL *documentsSubDirectory; +@property (readonly) NSURL *obsoleteKeymanKeyboardsDirectory; +@end + +@implementation KMDataRepository +/** + * Two directory trees are represented by the following properties, one in active use + * and one that is obsolete. + * The actively used directories, begin with the parent + * applicationSupportSubDirectory: '~/Library/Application Support' + * keymanDataDirectory: '~/Library/Application Support/keyman.inputmethod.Keyman' + * keymanKeyboardsDirectory: '~/Library/Application Support/keyman.inputmethod.Keyman/Keyman-Keyboards' + * The obsolete directories, begin with the parent + * documentsSubDirectory: '~/Documents' + * obsoleteKeymanKeyboardsDirectory: '~/Documents/Keyman-Keyboards' + */ +@synthesize applicationSupportSubDirectory = _applicationSupportSubDirectory; +@synthesize keymanDataDirectory = _keymanDataDirectory; +@synthesize keymanKeyboardsDirectory = _keymanKeyboardsDirectory; +@synthesize documentsSubDirectory = _documentsSubDirectory; +@synthesize obsoleteKeymanKeyboardsDirectory = _obsoleteKeymanKeyboardsDirectory; + +NSString *const kKeyboardsDirectoryName = @"Keyman-Keyboards"; +/** + * The name of the subdirectory within '~/Library/Application Support'. + * We follow the convention of using the bundle identifier rather than our subsystem id. + * (Also, using the subsystem id, "com.keyman.app", is a poor choice because the API + * createDirectoryAtPath sees the .app extension and creates an application file.) + */ +NSString *const kKeymanSubdirectoryName = @"keyman.inputmethod.Keyman"; + ++ (KMDataRepository *)shared { + static KMDataRepository *shared = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + shared = [[KMDataRepository alloc] init]; + }); + return shared; +} + +- (NSURL *)documentsSubDirectory { + if (_documentsSubDirectory == nil) { + NSError *directoryError = nil; + + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSURL *documentsUrl = [fileManager URLForDirectory:NSDocumentDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:&directoryError]; + + if (directoryError) { + os_log_error([KMLogs dataLog], "error getting Documents subdirectory: '%{public}@'", directoryError.localizedDescription); + } else { + os_log_info([KMLogs dataLog], "Documents subdirectory: '%{public}@'", documentsUrl); + _documentsSubDirectory = documentsUrl; + } + } + return _documentsSubDirectory; +} + +- (NSURL *)applicationSupportSubDirectory { + if (_applicationSupportSubDirectory == nil) { + NSError *directoryError = nil; + + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSURL *applicationSupportUrl = [fileManager URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:&directoryError]; + + if (directoryError) { + os_log_error([KMLogs dataLog], "error getting Application Support subdirectory: '%{public}@'", directoryError.localizedDescription); + } else { + os_log_info([KMLogs dataLog], "Application Support subdirectory: '%{public}@'", applicationSupportUrl.path); + _applicationSupportSubDirectory = applicationSupportUrl; + } + } + return _applicationSupportSubDirectory; +} + +- (NSURL *)keymanDataDirectory { + if (_keymanDataDirectory == nil) { + NSURL *keymanDataUrl = [self.applicationSupportSubDirectory URLByAppendingPathComponent:kKeymanSubdirectoryName isDirectory: TRUE]; + _keymanDataDirectory = keymanDataUrl; + } + return _keymanDataDirectory; +} + +- (NSURL *)keymanKeyboardsDirectory { + if (_keymanKeyboardsDirectory == nil) { + NSURL *keyboardsUrl = [self.keymanDataDirectory URLByAppendingPathComponent:kKeyboardsDirectoryName isDirectory: TRUE]; + _keymanKeyboardsDirectory = keyboardsUrl; + } + return _keymanKeyboardsDirectory; +} + +/** + * Creates Keyman data directory if it do not exist yet. This is the main data subdirectory: keyman.inputmethod.Keyman + */ +- (void)createDataDirectoryIfNecessary { + NSFileManager *fileManager = [NSFileManager defaultManager]; + BOOL isDir; + BOOL exists = [fileManager fileExistsAtPath:self.keymanDataDirectory.path isDirectory:&isDir]; + + if (!exists) { + NSError *createError = nil; + os_log_info([KMLogs dataLog], "createDataDirectoryIfNecessary, about to attempt createDirectoryAtPath for: '%{public}@'", self.keymanDataDirectory.path); + [fileManager createDirectoryAtPath:self.keymanDataDirectory.path withIntermediateDirectories:YES attributes:nil error:nil]; + if (createError) { + os_log_error([KMLogs dataLog], "error creating Keyman data directory: '%{public}@'", createError.localizedDescription); + } else { + os_log_info([KMLogs dataLog], "created Keyman data directory: '%{public}@'", self.keymanDataDirectory.path); + } + } else { + os_log_info([KMLogs dataLog], "Keyman data directory already exists: '%{public}@'", self.keymanDataDirectory.path); + } +} + +/** + * Creates Keyman keyboard directory if it does not exist yet. This is the 'Keyman-Keyboards' directory. + * It should not be created until after migrating because its existence would block migrating data from the old location. + */ +- (void)createKeyboardsDirectoryIfNecessary { + NSFileManager *fileManager = [NSFileManager defaultManager]; + BOOL isDir; + BOOL exists = [fileManager fileExistsAtPath:self.keymanKeyboardsDirectory.path isDirectory:&isDir]; + + if (!exists) { + NSError *createError = nil; + os_log_info([KMLogs dataLog], "createKeyboardsDirectoryIfNecessary, about to attempt createDirectoryAtPath for: '%{public}@'", self.keymanKeyboardsDirectory.path); + [fileManager createDirectoryAtPath:self.keymanKeyboardsDirectory.path withIntermediateDirectories:YES attributes:nil error:nil]; + if (createError) { + os_log_error([KMLogs dataLog], "error creating Keyman-Keyboards directory: '%{public}@'", createError.localizedDescription); + } else { + os_log_info([KMLogs dataLog], "created Keyman-Keyboards subdirectory: '%{public}@'", self.keymanKeyboardsDirectory.path); + } + } else { + os_log_info([KMLogs dataLog], "Keyman-Keyboards already exists: '%{public}@'", self.keymanKeyboardsDirectory.path); + } +} + +- (NSURL *)obsoleteKeymanKeyboardsDirectory { + if (_obsoleteKeymanKeyboardsDirectory == nil) { + NSURL *keymanUrl = [self.documentsSubDirectory URLByAppendingPathComponent:kKeyboardsDirectoryName isDirectory: TRUE]; + _obsoleteKeymanKeyboardsDirectory = keymanUrl; + } + return _obsoleteKeymanKeyboardsDirectory; +} + +/** + * Only called from migrateData. + * Causes user to be prompted for permission to access ~/Documents, but they should already have it. + * otherwise we would not be attempting to migrate. + */ +- (BOOL)keyboardsExistInObsoleteDirectory { + NSFileManager *fileManager = [NSFileManager defaultManager]; + BOOL isDir; + BOOL exists = ([fileManager fileExistsAtPath:self.obsoleteKeymanKeyboardsDirectory.path isDirectory:&isDir]); + return exists; +} + +/** + * Migrate the keyboards data from the old location in '~/Documents' to the new location '~/Application Support/keyman.inputmethod.Keyman/' + * This should only be called if the Keyman settings written to the UserDefaults indicates that we have data in the old location. + * If this is the case, then we expect the user to have already granted permission for Keyman to access the ~/Documents directory. + * If that permission has been removed for some reason, then calling this code will cause the user to be asked for permission again. + */ +- (BOOL)migrateData { + BOOL didMoveData = NO; + NSFileManager *fileManager = [NSFileManager defaultManager]; + BOOL dataExistsInOldLocation = [self keyboardsExistInObsoleteDirectory]; + os_log_debug([KMLogs dataLog], "obsolete keyman keyboards directory exists: %@", dataExistsInOldLocation?@"YES":@"NO"); + + // only move data if there is something to move + if (dataExistsInOldLocation) { + NSError *moveError = nil; + didMoveData = [fileManager moveItemAtURL:self.obsoleteKeymanKeyboardsDirectory + toURL:self.keymanKeyboardsDirectory + error:&moveError]; + if (moveError) { + os_log_error([KMLogs dataLog], "data migration failed: '%{public}@'", moveError.localizedDescription); + } else { + os_log_info([KMLogs dataLog], "data migrated successfully to: '%{public}@'", self.keymanKeyboardsDirectory.path); + } + } + + return didMoveData; +} + +- (NSString*)buildFullPath:(NSString *)fromPartialPath { + NSString *fullPath = [self.keymanKeyboardsDirectory.path stringByAppendingString:fromPartialPath]; + os_log_debug([KMLogs dataLog], "buildFullPath: '%{public}@' fromPartialPath '%{public}@'", + fullPath, fromPartialPath); + return fullPath; +} + +- (NSString *)trimToPartialPath:(NSString *)fromFullPath { + NSString *partialPath = fromFullPath; + if(fromFullPath != nil) { + NSRange range = [fromFullPath rangeOfString:kKeyboardsDirectoryName]; + if (range.length > 0) { + partialPath = [fromFullPath substringFromIndex:range.location + range.length]; + os_log_debug([KMLogs dataLog], "trimToPartialPath: fromFullPath: '%{public}@' to partialPath: '%{public}@'", fromFullPath, partialPath); + } + } + return partialPath; +} + +- (NSString *)buildPartialPathFrom:(NSString *)keyboardSubdirectory keyboardFile:(NSString *)kmxFilename { + NSMutableArray *pathComponents = [[NSMutableArray alloc] initWithCapacity:0]; + [pathComponents addObject:@"/"]; + [pathComponents addObject:keyboardSubdirectory]; + [pathComponents addObject:kmxFilename]; + NSString *keyboardPartialPath = [NSString pathWithComponents:pathComponents]; + os_log_debug([KMLogs keyboardLog], "buildPartialPathFrom, keyboardSubdirectory: %{public}@, kmxFileName: %{public}@, keyboardPartialPath : %{public}@", + keyboardSubdirectory, kmxFilename, keyboardPartialPath); + return keyboardPartialPath; +} + + +@end diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m index 6be446ddd28..32a8377b64d 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/KMInfoWindowController.m @@ -85,8 +85,6 @@ - (BOOL)tabView:(NSTabView *)tabView shouldSelectTabViewItem:(NSTabViewItem *)ta // TODO: refactor: any reason for this to be HTML? hard to read stringWithFormat applied to template with 16 arguments - (NSString *)detailsHtml { - NSString *errorString = NSLocalizedString(@"message-keyboard-file-unreadable", nil); - @try { NSString *htmlFormat = @"" diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/cs.lproj/KMInfoWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/cs.lproj/KMInfoWindowController.strings index f3fe6a722b1..4c9f26c0f84 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/cs.lproj/KMInfoWindowController.strings +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/cs.lproj/KMInfoWindowController.strings @@ -1,5 +1,5 @@ /* Package Information window title */ -"F0z-JX-Cv5.title" = "Package Information"; +"F0z-JX-Cv5.title" = "Informace o balíčku"; /* button text to show Details */ "Fvy-XJ-s38.label" = "Detaily"; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/it.lproj/KMInfoWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/it.lproj/KMInfoWindowController.strings index 5d3902de438..3d2755066ca 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/it.lproj/KMInfoWindowController.strings +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/it.lproj/KMInfoWindowController.strings @@ -1,5 +1,5 @@ /* Package Information window title */ -"F0z-JX-Cv5.title" = "Package Information"; +"F0z-JX-Cv5.title" = "Informazioni pacchetto"; /* button text to show Details */ "Fvy-XJ-s38.label" = "Dettagli"; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputController.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputController.m index f832abf27fd..e97be3e389c 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputController.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputController.m @@ -1,39 +1,46 @@ -// -// KMInputController.m -// Keyman4MacIM -// -// Created by Serkan Kurt on 29/01/2015. -// Copyright (c) 2017 SIL International. All rights reserved. -// +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Serkan Kurt on 2015-01-29. + * + */ #import "KMInputController.h" #import "KMInputMethodEventHandler.h" #import "KMOSVersion.h" #include /* For kVK_ constants. */ +#import "KMSettingsRepository.h" #import "KMLogs.h" +#import "InputMethodKit/InputMethodKit.h" +#import "KMInputMethodLifecycle.h" + @implementation KMInputController KMInputMethodEventHandler* _eventHandler; -NSMutableArray *servers; -- (KMInputMethodAppDelegate *)AppDelegate { +- (KMInputMethodAppDelegate *)appDelegate { return (KMInputMethodAppDelegate *)[NSApp delegate]; } - (id)initWithServer:(IMKServer *)server delegate:(id)delegate client:(id)inputClient { - os_log_debug([KMLogs lifecycleLog], "Initializing Keyman Input Method for server with bundleID: %{public}@", server.bundle.bundleIdentifier); - + os_log_debug([KMLogs lifecycleLog], "initWithServer, active app: '%{public}@'", [KMInputMethodLifecycle getClientApplicationId]); + self = [super initWithServer:server delegate:delegate client:inputClient]; if (self) { - servers = [[NSMutableArray alloc] initWithCapacity:2]; - self.AppDelegate.inputController = self; - if (self.AppDelegate.kvk != nil && self.AppDelegate.alwaysShowOSK) { - [self.AppDelegate showOSK]; - } + self.appDelegate.inputController = self; } + /** + * Register to receive the Deactivated and ChangedClient notification generated from KMInputMethodLifecycle so + * that the eventHandler can be changed. There is no need to receive the Activated notification because + * the InputController does it all it needs to when it receives the ChangedClient. + */ + + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(inputMethodDeactivated:) name:kInputMethodDeactivatedNotification object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(inputMethodChangedClient:) name:kInputMethodClientChangeNotification object:nil]; + return self; } @@ -59,102 +66,44 @@ - (void)handleBackspace:(NSEvent *)event { } } -- (void)activateServer:(id)sender { - @synchronized(servers) { - [sender overrideKeyboardWithKeyboardNamed:@"com.apple.keylayout.US"]; - - [self.AppDelegate wakeUpWith:sender]; - [servers addObject:sender]; - - if (_eventHandler != nil) { - [_eventHandler deactivate]; - } - - NSRunningApplication *currApp = [[NSWorkspace sharedWorkspace] frontmostApplication]; - NSString *clientAppId = [currApp bundleIdentifier]; - os_log_debug([KMLogs lifecycleLog], "activateServer, new active app: '%{public}@'", clientAppId); - - _eventHandler = [[KMInputMethodEventHandler alloc] initWithClient:clientAppId client:sender]; - +/** + * The Keyman input method is deactivating because the user chose a different input method: notification from KMInputMethodLifecycle + */ +- (void)inputMethodDeactivated:(NSNotification *)notification { + os_log_debug([KMLogs lifecycleLog], "***KMInputController inputMethodDeactivated, deactivating eventHandler"); + if (_eventHandler != nil) { + [_eventHandler deactivate]; } } -- (void)deactivateServer:(id)sender { - if ([self.AppDelegate debugMode]) { - os_log_debug([KMLogs lifecycleLog], "deactivateServer, sender %{public}@", sender); - } - @synchronized(servers) { - for (int i = 0; i < servers.count; i++) { - if (servers[i] == sender) { - [servers removeObjectAtIndex:i]; - break; - } - } - if (servers.count == 0) { - os_log_debug([KMLogs lifecycleLog], "No known active server for Keyman IM. Starting countdown to sleep..."); - [self performSelector:@selector(timerAction:) withObject:sender afterDelay:0.7]; - } +/** + * The user has switched to a different text input client: notification from KMInputMethodLifecycle + */ +- (void)inputMethodChangedClient:(NSNotification *)notification { + os_log_debug([KMLogs lifecycleLog], "***KMInputController inputMethodChangedClient, deactivating old eventHandler and activating new one"); + if (_eventHandler != nil) { + [_eventHandler deactivate]; } -} + _eventHandler = [[KMInputMethodEventHandler alloc] initWithClient:[KMInputMethodLifecycle getClientApplicationId] client:self.client]; -- (void)timerAction:(id)lastServer { - @synchronized(servers) { - if (servers.count == 0) { - if (_eventHandler != nil) { - [_eventHandler deactivate]; - _eventHandler = nil; - } - [self.AppDelegate sleepFollowingDeactivationOfServer:lastServer]; - } - } } +- (void)activateServer:(id)sender { + [sender overrideKeyboardWithKeyboardNamed:@"com.apple.keylayout.US"]; + [KMInputMethodLifecycle.shared activateClient:sender]; +} -/* - - (NSDictionary *)modes:(id)sender { - if ([self.AppDelegate debugMode]) - os_log_debug([KMLogs lifecycleLog], "*** Modes ***"); - if (_kmModes == nil) { - NSDictionary *amhMode = [[NSDictionary alloc] initWithObjectsAndKeys:@"keyman.png", kTSInputModeAlternateMenuIconFileKey, - [NSNumber numberWithBool:YES], kTSInputModeDefaultStateKey, - [NSNumber numberWithBool:YES], kTSInputModeIsVisibleKey, - @"A", kTSInputModeKeyEquivalentKey, - [NSNumber numberWithInteger:4608], kTSInputModeKeyEquivalentModifiersKey, - [NSNumber numberWithBool:YES], kTSInputModeDefaultStateKey, - @"keyman.png", kTSInputModeMenuIconFileKey, - @"keyman.png", kTSInputModePaletteIconFileKey, - [NSNumber numberWithBool:YES], kTSInputModePrimaryInScriptKey, - @"smUnicodeScript", kTSInputModeScriptKey, - @"amh", @"TISIntendedLanguage", nil]; - - NSDictionary *hinMode = [[NSDictionary alloc] initWithObjectsAndKeys:@"keyman.png", kTSInputModeAlternateMenuIconFileKey, - [NSNumber numberWithBool:YES], kTSInputModeDefaultStateKey, - [NSNumber numberWithBool:YES], kTSInputModeIsVisibleKey, - @"H", kTSInputModeKeyEquivalentKey, - [NSNumber numberWithInteger:4608], kTSInputModeKeyEquivalentModifiersKey, - [NSNumber numberWithBool:YES], kTSInputModeDefaultStateKey, - @"keyman.png", kTSInputModeMenuIconFileKey, - @"keyman.png", kTSInputModePaletteIconFileKey, - [NSNumber numberWithBool:YES], kTSInputModePrimaryInScriptKey, - @"smUnicodeScript", kTSInputModeScriptKey, - @"hin", @"TISIntendedLanguage", nil]; - - NSDictionary *modeList = [[NSDictionary alloc] initWithObjectsAndKeys:amhMode, @"com.apple.inputmethod.amh", hinMode, @"com.apple.inputmethod.hin", nil]; - NSArray *modeOrder = [[NSArray alloc] initWithObjects:@"com.apple.inputmethod.amh", @"com.apple.inputmethod.hin", nil]; - _kmModes = [[NSDictionary alloc] initWithObjectsAndKeys:modeList, kTSInputModeListKey, - modeOrder, kTSVisibleInputModeOrderedArrayKey, nil]; - } - - return _kmModes; - } - */ +- (void)deactivateServer:(id)sender { + [KMInputMethodLifecycle.shared deactivateClient:sender]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} - (NSMenu *)menu { - return self.AppDelegate.menu; + return self.appDelegate.menu; } - (KMXFile *)kmx { - return self.AppDelegate.kmx; + return self.appDelegate.kmx; } - (void)menuAction:(id)sender { @@ -165,13 +114,15 @@ - (void)menuAction:(id)sender { [self showConfigurationWindow:sender]; } else if (itag == OSK_MENUITEM_TAG) { - [self.AppDelegate showOSK]; + [KMSettingsRepository.shared writeShowOskOnActivate:YES]; + os_log_debug([KMLogs oskLog], "menuAction OSK_MENUITEM_TAG, updating settings writeShowOsk to YES"); + [self.appDelegate showOSK]; } else if (itag == ABOUT_MENUITEM_TAG) { - [self.AppDelegate showAboutWindow]; + [self.appDelegate showAboutWindow]; } else if (itag >= KEYMAN_FIRST_KEYBOARD_MENUITEM_TAG) { - [self.AppDelegate selectKeyboardFromMenu:itag]; + [self.appDelegate selectKeyboardFromMenu:itag]; } } @@ -183,7 +134,7 @@ - (void)showConfigurationWindow:(id)sender { if ([KMOSVersion Version_10_13_1] <= systemVersion && systemVersion <= [KMOSVersion Version_10_13_3]) // between 10.13.1 and 10.13.3 inclusive { os_log_info([KMLogs uiLog], "Input Menu: calling workaround instead of showPreferences (sys ver %x)", systemVersion); - [self.AppDelegate showConfigurationWindow]; // call our workaround + [self.appDelegate showConfigurationWindow]; // call our workaround } else { diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.h b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.h index 4bf463c177f..fe06fa603a8 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.h +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.h @@ -12,6 +12,7 @@ #import #import #import +#import "KMModifierMapping.h" #import "KMPackageReader.h" #import "KMInputController.h" #import "KMAboutWindowController.h" @@ -23,8 +24,6 @@ typedef void(^PostEventCallback)(CGEventRef eventToPost); -extern NSString *const kKMSelectedKeyboardKey; -extern NSString *const kKMActiveKeyboardsKey; extern NSString *const kKeymanKeyboardDownloadCompletedNotification; typedef struct { @@ -63,23 +62,25 @@ static const int KEYMAN_FIRST_KEYBOARD_MENUITEM_INDEX = 0; } @property (nonatomic, strong) KMEngine *kme; -@property (nonatomic, strong) KMXFile *kmx; +// TODO: refactor and encapsulate below properties with current keyboard +@property (nonatomic, strong, readonly) KMXFile *kmx; +@property (nonatomic, strong, readonly) KMModifierMapping *modifierMapping; @property (nonatomic, strong) KVKFile *kvk; +@property (nonatomic, strong) NSString *keyboardName; +@property (nonatomic, strong) NSString *selectedKeyboard; +@property (nonatomic, strong) NSImage *keyboardIcon; +// TODO: refactor above properties @property (nonatomic, strong) NSString *keyboardsPath; @property (nonatomic, strong) NSString *fontsPath; @property (nonatomic, strong) NSMutableArray *kmxFileList; -@property (nonatomic, strong) NSString *selectedKeyboard; @property (nonatomic, strong) NSMutableArray *activeKeyboards; @property (assign) int numberOfKeyboardMenuItems; @property (nonatomic, strong) NSMutableString *contextBuffer; -@property (nonatomic, assign) NSEventModifierFlags currentModifierFlags; +@property (nonatomic, assign) NSEventModifierFlags currentModifiers; @property (nonatomic, assign) CFMachPortRef lowLevelEventTap; @property (nonatomic, assign) CFRunLoopSourceRef runLoopEventSrc; -@property (nonatomic, assign) BOOL sleeping; @property (nonatomic, assign) BOOL contextChangedByLowLevelEvent; @property (nonatomic, strong) OSKWindowController *oskWindow; -@property (nonatomic, strong) NSString *keyboardName; -@property (nonatomic, strong) NSImage *keyboardIcon; @property (nonatomic, strong) NSAlert *downloadInfoView; @property (nonatomic, strong) NSProgressIndicator *progressIndicator; @property (nonatomic, weak) KMInputController *inputController; @@ -92,22 +93,18 @@ static const int KEYMAN_FIRST_KEYBOARD_MENUITEM_INDEX = 0; @property (nonatomic, strong) NSString *downloadFilename; @property (nonatomic, strong) NSMutableData *receivedData; @property (nonatomic, assign) NSUInteger expectedBytes; -@property (nonatomic, assign) BOOL alwaysShowOSK; -@property (nonatomic, assign) BOOL useVerboseLogging; -@property (nonatomic, assign) BOOL useNullChar; -@property (nonatomic, assign) BOOL debugMode; - (NSMenu *)menu; - (void)saveActiveKeyboards; -- (void)readPersistedOptions; -- (void)writePersistedOptions:(NSString *)storeKey withValue:(NSString* )value; +- (void)applyPersistedOptions; - (void)showAboutWindow; - (void)showOSK; - (void)showConfigurationWindow; - (void)selectKeyboardFromMenu:(NSInteger)tag; -- (void)sleepFollowingDeactivationOfServer:(id)lastServer; -- (void)wakeUpWith:(id)newServer; - (void)handleKeyEvent:(NSEvent *)event; +- (void)loadKeyboardFromKmxFile:(KMXFile *)kmx; +- (void)resetKmx; +- (NSEventModifierFlags) determineModifiers; - (BOOL)unzipFile:(NSString *)filePath; - (NSWindowController *)downloadKBWindow_; - (NSWindowController *)aboutWindow_; @@ -126,7 +123,6 @@ static const int KEYMAN_FIRST_KEYBOARD_MENUITEM_INDEX = 0; - (NSString *)oskWindowTitle; - (void)postKeyboardEventWithSource: (CGEventSourceRef)source code:(CGKeyCode) virtualKey postCallback:(PostEventCallback)postEvent; - (KeymanVersionInfo)versionInfo; -- (NSString *)keymanDataPath; - (void)registerConfigurationWindow:(NSWindowController *)window; @end diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m index 9189e39d58e..ef13f15b789 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m @@ -6,41 +6,19 @@ // Copyright (c) 2017 SIL International. All rights reserved. // -// *** TO INVESTIGATE *** -// Keyman4MacIM[6245]: IMK Stall detected, *please Report* your user scenario in - (activateServerWithReply:) block performed very slowly (0.00 secs) -// Keyman4MacIM[6245]: IMK Stall detected, *please Report* your user scenario in - (deactivateServerWithReply:) block performed very slowly (0.00 secs) -// Keyman4MacIM[6245]: IMK Stall detected, *please Report* your user scenario in - (menusDictionaryWithClientAsync:reply:) block performed very slowly (0.00 secs) -// Keyman4MacIM[6245]: IMK Stall detected, *please Report* your user scenario in - (modesWithClientAsync:reply:) block performed very slowly (0.00 secs) -// Keyman4MacIM[6245]: IMK Stall detected, *please Report* your user scenario in - (commitCompositionWithReply:) block performed very slowly (0.00 secs) -// Keyman4MacIM[6245]: IMK Stall detected, *please Report* your user scenario in - (hidePalettes) block performed very slowly (0.00 secs) -// Keyman4MacIM[6245]: IMK Stall detected, *please Report* your user scenario in - (sessionFinished) block performed very slowly (0.00 secs) - #import "KMInputMethodAppDelegate.h" +#import "KMInputMethodLifecycle.h" +#import "KMSettingsRepository.h" +#import "KMDataRepository.h" #import "KMConfigurationWindowController.h" #import "KMDownloadKBWindowController.h" #import "ZipArchive.h" #import "KMPackageReader.h" #import "KMPackageInfo.h" -#import "KMKeyboardInfo.h" #import "PrivacyConsent.h" #import "KMLogs.h" @import Sentry; -/** NSUserDefaults keys */ -NSString *const kKMSelectedKeyboardKey = @"KMSelectedKeyboardKey"; -NSString *const kKMActiveKeyboardsKey = @"KMActiveKeyboardsKey"; -/** - The following constant "KMSavedStoresKey" is left here for documentation - though we have abandoned stores written to UserDefaults with this key because - they used a less-reliable numeric key prior to integration with Keyman Core. - It is replaced by the renamed "KMPersistedOptionsKey" which directly - represents what it is saving. - */ -NSString *const kKMDeprecatedPersistedOptionsKey = @"KMSavedStoresKey"; -NSString *const kKMPersistedOptionsKey = @"KMPersistedOptionsKey"; -NSString *const kKMAlwaysShowOSKKey = @"KMAlwaysShowOSKKey"; -NSString *const kKMUseVerboseLogging = @"KMUseVerboseLogging"; - NSString *const kKeymanKeyboardDownloadCompletedNotification = @"kKeymanKeyboardDownloadCompletedNotification"; @implementation NSString (VersionNumbers) @@ -73,6 +51,7 @@ @interface KMInputMethodAppDelegate () @implementation KMInputMethodAppDelegate @synthesize kme = _kme; @synthesize kmx = _kmx; +@synthesize modifierMapping = _modifierMapping; @synthesize kvk = _kvk; @synthesize keyboardName = _keyboardName; @synthesize keyboardsPath = _keyboardsPath; @@ -80,23 +59,12 @@ @implementation KMInputMethodAppDelegate @synthesize selectedKeyboard = _selectedKeyboard; @synthesize activeKeyboards = _activeKeyboards; @synthesize contextBuffer = _contextBuffer; -@synthesize alwaysShowOSK = _alwaysShowOSK; id _lastServerWithOSKShowing = nil; -NSString* _keymanDataPath = nil; - (id)init { self = [super init]; - if (self) { -#ifdef DEBUG - // If debugging, we'll turn it on by default, regardless of setting. If developer - // really wants it off, they can either change this line of code temporarily or - // go to the config screen and turn it off explicitly. - _debugMode = YES; -#else - _debugMode = self.useVerboseLogging; -#endif - + if (self) { // first notify user and request access to Accessibility/PostEvent permissions // pass block as completion handler to complete init with initCompletion [PrivacyConsent.shared requestPrivacyAccess:^void (void){ @@ -139,6 +107,45 @@ - (void)initCompletion { if (self.runLoopEventSrc && runLoop) { CFRunLoopAddSource(runLoop, self.runLoopEventSrc, kCFRunLoopDefaultMode); } + + // register to receive notifications generated from KMInputMethodLifecycle + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(inputMethodActivated:) name:kInputMethodActivatedNotification object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(inputMethodDeactivated:) name:kInputMethodDeactivatedNotification object:nil]; + + // start Input Method lifecycle + [KMInputMethodLifecycle.shared startLifecycle]; +} + +/** + * When the input method is deactivated, hide the OSK and disable the low-level event tap + */ +- (void)inputMethodDeactivated:(NSNotification *)notification { + if ([self.oskWindow.window isVisible]) { + os_log_debug([KMLogs oskLog], "***KMInputMethodAppDelegate inputMethodDeactivated, hiding OSK"); + [self.oskWindow.window setIsVisible:NO]; + } else { + os_log_debug([KMLogs oskLog], "***KMInputMethodAppDelegate inputMethodDeactivated, OSK already hidden"); + } + + if (self.lowLevelEventTap) { + os_log_debug([KMLogs lifecycleLog], "***inputMethodDeactivated, disabling event tap"); + CGEventTapEnable(self.lowLevelEventTap, NO); + } +} + +/** + * When the input method is activated, show the OSK and enable the low-level event tap + */ +- (void)inputMethodActivated:(NSNotification *)notification { + if (self.lowLevelEventTap && !CGEventTapIsEnabled(self.lowLevelEventTap)) { + os_log_debug([KMLogs lifecycleLog], "***KMInputMethodAppDelegate inputMethodActivated, re-enabling event tap..."); + CGEventTapEnable(self.lowLevelEventTap, YES); + } + + if (_kvk != nil && ([KMInputMethodLifecycle.shared shouldShowOskOnActivate])) { + os_log_debug([KMLogs oskLog], "***KMInputMethodAppDelegate inputMethodActivated, showing OSK"); + [self showOSK]; + } } - (KeymanVersionInfo)versionInfo { @@ -168,9 +175,11 @@ -(void)applicationDidFinishLaunching:(NSNotification *)aNotification { [[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"NSApplicationCrashOnExceptions": @YES }]; [KMLogs reportLogStatus]; - [self startSentry]; + [self setDefaultKeymanMenuItems]; + [self updateKeyboardMenuItems]; [self setPostLaunchKeymanSentryTags]; + // [SentrySDK captureMessage:@"Starting Keyman [test message]"]; } - (void)startSentry { @@ -183,7 +192,6 @@ - (void)startSentry { options.environment = keymanVersionInfo.sentryEnvironment; //options.debug = YES; }]; - } - (void)setPostLaunchKeymanSentryTags { @@ -244,43 +252,12 @@ + (KMInputMethodAppDelegate *)AppDelegate { return (KMInputMethodAppDelegate *)[NSApp delegate]; } --(void) sleepFollowingDeactivationOfServer:(id)lastServer { - os_log_debug([KMLogs lifecycleLog], "Keyman no longer active IM."); - self.sleeping = YES; - if ([self.oskWindow.window isVisible]) { - os_log_debug([KMLogs oskLog], "sleepFollowingDeactivationOfServer, Hiding OSK."); - // Storing this ensures that if the deactivation is temporary, resulting from dropping down a menu, - // the OSK will re-display when that client application re-activates. - _lastServerWithOSKShowing = lastServer; - [self.oskWindow.window setIsVisible:NO]; - } - if (self.lowLevelEventTap) { - os_log_debug([KMLogs lifecycleLog], "sleepFollowingDeactivationOfServer, disabling event tap..."); - CGEventTapEnable(self.lowLevelEventTap, NO); - } -} - --(void) wakeUpWith:(id)newServer { - self.sleeping = NO; - if (self.lowLevelEventTap && !CGEventTapIsEnabled(self.lowLevelEventTap)) { - os_log_debug([KMLogs lifecycleLog], "wakeUpWith, Keyman is now the active IM. Re-enabling event tap..."); - CGEventTapEnable(self.lowLevelEventTap, YES); - } - // See note in sleepFollowingDeactivationOfServer. - if (_kvk != nil && (_alwaysShowOSK || _lastServerWithOSKShowing == newServer)) { - [self showOSK]; - } - - _lastServerWithOSKShowing = nil; -} - CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon) { KMInputMethodAppDelegate *appDelegate = [KMInputMethodAppDelegate AppDelegate]; if (appDelegate != nil) { if (type == kCGEventTapDisabledByTimeout || type == kCGEventTapDisabledByUserInput) { - // kCGEventTapDisabledByUserInput most likely means we're "sleeping", in which case we want it to stay - // disabled until we get the wake-up call. - if (!appDelegate.sleeping) { + // kCGEventTapDisabledByUserInput most likely means we're "sleeping", in which case we want it to stay disabled until we get the wake-up call. + if ([KMInputMethodLifecycle.shared shouldEnableEventTap]) { // REVIEW: We might need to consider putting in some kind of counter/flag to ensure that the very next // event is not another disable so we don't end up in an endless cycle. os_log([KMLogs eventsLog], "Event tap disabled by %{public}@! Attempting to restart...", (type == kCGEventTapDisabledByTimeout ? @"timeout" : @"user")); @@ -306,9 +283,9 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef switch (type) { case kCGEventFlagsChanged: - os_log_debug([KMLogs eventsLog], "eventTapFunction: system event kCGEventFlagsChanged to: %x", (int) sysEvent.modifierFlags); - appDelegate.currentModifierFlags = sysEvent.modifierFlags; - if (appDelegate.currentModifierFlags & NSEventModifierFlagCommand) { + os_log_debug([KMLogs eventsLog], "eventTapFunction: system event kCGEventFlagsChanged to: 0x%X", (int) sysEvent.modifierFlags); + appDelegate.currentModifiers = sysEvent.modifierFlags; + if (appDelegate.currentModifiers & NSEventModifierFlagCommand) { appDelegate.contextChangedByLowLevelEvent = YES; } break; @@ -398,7 +375,7 @@ - (NSMenu *)menu { - (KMEngine *)kme { if (_kme == nil) { - _kme = [[KMEngine alloc] initWithKMX:nil context:self.contextBuffer verboseLogging:self.debugMode]; + _kme = [[KMEngine alloc] initWithKMX:nil context:self.contextBuffer]; } return _kme; @@ -407,22 +384,29 @@ - (KMEngine *)kme { - (KMPackageReader *)packageReader { if (_packageReader == nil) { _packageReader = [[KMPackageReader alloc] init]; - [_packageReader setDebugMode:self.debugMode]; } return _packageReader; } -- (void)setKmx:(KMXFile *)kmx { +- (void)resetKmx { + _kmx = nil; + _modifierMapping = nil; +} + +- (void)loadKeyboardFromKmxFile:(KMXFile *)kmx { _kmx = kmx; - [self.kme setKmx:_kmx]; + CoreKeyboardInfo *keyboardInfo = [self.kme loadKeyboardFromKmxFile:kmx]; + + os_log_info([KMLogs keyboardLog], "setKmx loaded keyboard, keyboard info: %{public}@", keyboardInfo); - NSString *keyboardFileName = [kmx.filePath lastPathComponent]; - os_log_info([KMLogs keyboardLog], "setKmx to %{public}@", keyboardFileName); + _modifierMapping = [[KMModifierMapping alloc] init:keyboardInfo]; + + os_log_info([KMLogs keyboardLog], "modifierMapping bothOptionKeysGenerateRightAlt: %d", self.modifierMapping.bothOptionKeysGenerateRightAlt); // assign custom keyboard tag in Sentry to default keyboard [SentrySDK configureScope:^(SentryScope * _Nonnull scope) { - [scope setTagValue:keyboardFileName forKey:@"keyboard"]; + [scope setTagValue:keyboardInfo.keyboardId forKey:@"keyboard"]; }]; } @@ -438,55 +422,17 @@ - (void)setKeyboardName:(NSString *)keyboardName { [_oskWindow.window setTitle:self.oskWindowTitle]; } -- (void)readPersistedOptions { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - NSDictionary *allPersistedOptions = [userData dictionaryForKey:kKMPersistedOptionsKey]; - if (!allPersistedOptions) { - return; - } - NSDictionary *persistedOptionsForSelectedKeyboard = [allPersistedOptions objectForKey:_selectedKeyboard]; - if (!persistedOptionsForSelectedKeyboard) { - os_log_info([KMLogs configLog], "no persisted options found in UserDefaults for keyboard %{public}@ ", _selectedKeyboard); - return; - } +- (void)applyPersistedOptions { + NSDictionary *selectedPersistedOptions = [[KMSettingsRepository shared] readOptionsForSelectedKeyboard]; // TODO: pass array instead of making repeated calls - for (NSString *key in persistedOptionsForSelectedKeyboard) { - NSString *value = [persistedOptionsForSelectedKeyboard objectForKey:key]; + for (NSString *key in selectedPersistedOptions) { + NSString *value = [selectedPersistedOptions objectForKey:key]; os_log_info([KMLogs configLog], "persisted options found in UserDefaults for keyboard %{public}@, key: %{public}@, value: %{public}@", _selectedKeyboard, key, value); [self.kme setCoreOptions:key withValue:value]; } } -- (void)writePersistedOptions:(NSString *)storeKey withValue:(NSString* )value { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - NSDictionary *allPersistedOptions = [userData dictionaryForKey:kKMPersistedOptionsKey]; - NSDictionary *persistedOptionsForSelectedKeyboard; - - if (allPersistedOptions) { - persistedOptionsForSelectedKeyboard = [allPersistedOptions objectForKey:_selectedKeyboard]; - } - - if (persistedOptionsForSelectedKeyboard) { - NSMutableDictionary *newSavedStores = [persistedOptionsForSelectedKeyboard mutableCopy]; - [newSavedStores setObject:value forKey:storeKey]; - persistedOptionsForSelectedKeyboard = newSavedStores; - } else { - persistedOptionsForSelectedKeyboard = [[NSDictionary alloc] initWithObjectsAndKeys:value, storeKey, nil]; - } - - if (allPersistedOptions) { - NSMutableDictionary *newAllSavedStores = [allPersistedOptions mutableCopy]; - [newAllSavedStores setObject:persistedOptionsForSelectedKeyboard forKey:_selectedKeyboard]; - allPersistedOptions = newAllSavedStores; - } else { - allPersistedOptions = [[NSDictionary alloc] initWithObjectsAndKeys:persistedOptionsForSelectedKeyboard, _selectedKeyboard, nil]; - } - - [userData setObject:allPersistedOptions forKey:kKMPersistedOptionsKey]; - [userData synchronize]; -} - - (NSString *)oskWindowTitle { if (_keyboardName == nil || !_keyboardName.length) return [NSString stringWithFormat:@"Keyman"]; @@ -494,62 +440,14 @@ - (NSString *)oskWindowTitle { return [NSString stringWithFormat:@"%@ - Keyman", _keyboardName]; } -- (void)setAlwaysShowOSK:(BOOL)alwaysShowOSK { - _alwaysShowOSK = alwaysShowOSK; - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - [userData setBool:alwaysShowOSK forKey:kKMAlwaysShowOSKKey]; - [userData synchronize]; -} - -- (void)setUseVerboseLogging:(BOOL)useVerboseLogging { - os_log_debug([KMLogs configLog], "Turning verbose logging %{public}@", useVerboseLogging ? @"on." : @"off."); - _debugMode = useVerboseLogging; - if (_kme != nil) - [_kme setUseVerboseLogging:useVerboseLogging]; - if (_packageReader != nil) { - [_packageReader setDebugMode:useVerboseLogging]; - } - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - [userData setBool:useVerboseLogging forKey:kKMUseVerboseLogging]; - [userData synchronize]; -} - -- (BOOL)alwaysShowOSK { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - _alwaysShowOSK = [userData boolForKey:kKMAlwaysShowOSKKey]; - return _alwaysShowOSK; -} - -- (BOOL)useVerboseLogging { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - return [userData boolForKey:kKMUseVerboseLogging]; -} - #pragma mark - Keyman Data /** - * Locate and create the Keyman data path; currently in ~/Documents/Keyman-Keyboards - */ -- (NSString *)keymanDataPath { - if(_keymanDataPath == nil) { - NSString *documentDirPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0]; - _keymanDataPath = [documentDirPath stringByAppendingPathComponent:@"Keyman-Keyboards"]; - - NSFileManager *fm = [NSFileManager defaultManager]; - if (![fm fileExistsAtPath:_keymanDataPath]) { - [fm createDirectoryAtPath:_keymanDataPath withIntermediateDirectories:YES attributes:nil error:nil]; - } - } - return _keymanDataPath; -} - -/** - * Returns the root folder where keyboards are stored; currently the same - * as the keymanDataPath, but may diverge in future versions (possibly a sub-folder) + * Returns the root folder where keyboards are stored */ - (NSString *)keyboardsPath { if (_keyboardsPath == nil) { - _keyboardsPath = [self keymanDataPath]; + _keyboardsPath = [KMDataRepository shared].keymanKeyboardsDirectory.path; } return _keyboardsPath; @@ -557,10 +455,12 @@ - (NSString *)keyboardsPath { - (NSArray *)kmxFileList { if (_kmxFileList == nil) { - NSArray *kmxFiles = [self KMXFiles]; + os_log_debug([KMLogs dataLog], "creating kmxFileList"); + NSArray *kmxFiles = [self getKmxFilesInKeyboardsDirectory]; _kmxFileList = [[NSMutableArray alloc] initWithCapacity:0]; NSMutableArray *others = nil; for (NSString *filePath in kmxFiles) { + os_log_debug([KMLogs dataLog], "kmxFileList, filePath: %{public}@", filePath); NSString *packageFolder = [self packageFolderFromPath:filePath]; NSInteger index = [self indexForPackageFolder:packageFolder]; if ([packageFolder isEqualToString:@"Others"]) { @@ -664,7 +564,7 @@ - (KMPackageInfo *)loadPackageInfo:(NSString *)path { - (NSString *)packageNameFromPackageInfo:(NSString *)packageFolder { NSString *packageName = nil; - NSString *path = [[self keymanDataPath] stringByAppendingPathComponent:packageFolder]; + NSString *path = [[self keyboardsPath] stringByAppendingPathComponent:packageFolder]; KMPackageInfo *packageInfo = [self.packageReader loadPackageInfo:path]; if (packageInfo) { @@ -675,8 +575,9 @@ - (NSString *)packageNameFromPackageInfo:(NSString *)packageFolder { } - (NSArray *)keyboardNamesFromFolder:(NSString *)packageFolder { + os_log_debug([KMLogs dataLog], "keyboardNamesFromFolder, folder = %{public}@", packageFolder); NSMutableArray *kbNames = [[NSMutableArray alloc] initWithCapacity:0];; - for (NSString *kmxFile in [self KMXFilesAtPath:packageFolder]) { + for (NSString *kmxFile in [self getKmxFilesAtPath:packageFolder]) { NSDictionary * infoDict = [KMXFile keyboardInfoFromKmxFile:kmxFile]; if (infoDict != nil) { NSString *name = [infoDict objectForKey:kKMKeyboardNameKey]; @@ -691,52 +592,56 @@ - (NSArray *)keyboardNamesFromFolder:(NSString *)packageFolder { - (NSString *)selectedKeyboard { if (_selectedKeyboard == nil) { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - _selectedKeyboard = [userData objectForKey:kKMSelectedKeyboardKey]; + _selectedKeyboard = [[KMSettingsRepository shared] readSelectedKeyboard]; } - + os_log_debug([KMLogs dataLog], "selectedKeyboard = %{public}@", _selectedKeyboard); + return _selectedKeyboard; } - (void)setSelectedKeyboard:(NSString *)selectedKeyboard { + [[KMSettingsRepository shared] writeSelectedKeyboard:selectedKeyboard]; _selectedKeyboard = selectedKeyboard; - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - [userData setObject:_selectedKeyboard forKey:kKMSelectedKeyboardKey]; - [userData synchronize]; } - (NSMutableArray *)activeKeyboards { if (!_activeKeyboards) { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - _activeKeyboards = [[userData arrayForKey:kKMActiveKeyboardsKey] mutableCopy]; - if (!_activeKeyboards) - _activeKeyboards = [[NSMutableArray alloc] initWithCapacity:0]; + os_log_debug([KMLogs dataLog], "initializing activeKeyboards"); + _activeKeyboards = [[KMSettingsRepository.shared readActiveKeyboards] mutableCopy]; } - + return _activeKeyboards; } - (void)saveActiveKeyboards { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - [userData setObject:_activeKeyboards forKey:kKMActiveKeyboardsKey]; - [userData synchronize]; + os_log_debug([KMLogs dataLog], "saveActiveKeyboards"); + [KMSettingsRepository.shared writeActiveKeyboards:_activeKeyboards]; [self resetActiveKeyboards]; [self updateKeyboardMenuItems]; } - (void)clearActiveKeyboards { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - [userData setObject:nil forKey:kKMActiveKeyboardsKey]; - [userData synchronize]; + [KMSettingsRepository.shared clearActiveKeyboards]; [self updateKeyboardMenuItems]; } +- (void)addActiveKeyboard:(NSString *) partialPath { + if (![self.activeKeyboards containsObject:partialPath]) { + os_log_debug([KMLogs keyboardLog], "addActiveKeyboard, adding '%{public}@' to list of active keyboards: ", partialPath); + [self.activeKeyboards addObject:partialPath]; + } +} + - (void)resetActiveKeyboards { // Remove entries with missing files NSMutableArray *pathsToRemove = [[NSMutableArray alloc] initWithCapacity:0]; for (NSString *path in self.activeKeyboards) { - if (![[NSFileManager defaultManager] fileExistsAtPath:path]) + NSString *fullPath = [KMDataRepository.shared buildFullPath:path]; + os_log_debug([KMLogs dataLog], "resetActiveKeyboards, checking fullPath: '%{public}@' for path: '%{public}@'", fullPath, path); + if (![[NSFileManager defaultManager] fileExistsAtPath:fullPath]) { + os_log_debug([KMLogs dataLog], "resetActiveKeyboards, need to remove non-existent path: %{public}@", fullPath); [pathsToRemove addObject:path]; + } } BOOL found = FALSE; @@ -759,9 +664,7 @@ - (void)resetActiveKeyboards { } if (found) { - NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; - [userData setObject:_activeKeyboards forKey:kKMActiveKeyboardsKey]; - [userData synchronize]; + [KMSettingsRepository.shared writeActiveKeyboards:_activeKeyboards]; } } @@ -781,8 +684,23 @@ - (void)setContextBuffer:(NSMutableString *)contextBuffer { } - (void)awakeFromNib { - [self setDefaultKeymanMenuItems]; - [self updateKeyboardMenuItems]; + [self prepareStorage]; +} + +/** + * Prepare the app environment for all the things that need to be persisted: + * namely, the keyboard data on disk and the settings in UserDefaults + */ +- (void)prepareStorage { + [KMDataRepository.shared createDataDirectoryIfNecessary]; + + if ([KMSettingsRepository.shared dataMigrationNeeded]) { + [KMDataRepository.shared migrateData]; + [KMSettingsRepository.shared convertSettingsForMigration]; + } + + [KMDataRepository.shared createKeyboardsDirectoryIfNecessary]; + [KMSettingsRepository.shared setDataModelVersionIfNecessary]; } - (void)setDefaultKeymanMenuItems { @@ -809,6 +727,7 @@ - (void)updateKeyboardMenuItems { } - (int)calculateNumberOfKeyboardMenuItems { + os_log_debug([KMLogs uiLog], "calculateNumberOfKeyboardMenuItems, entered"); if (self.activeKeyboards.count == 0) { // if there are no active keyboards, then we will insert one placeholder menu item 'No Active Keyboards' return 1; @@ -830,18 +749,19 @@ - (void)removeDynamicKeyboardMenuItems { } - (void)addDynamicKeyboardMenuItems { + os_log_debug([KMLogs startupLog], "addDynamicKeyboardMenuItems, entered"); BOOL didSetSelectedKeyboard = NO; NSInteger itag = KEYMAN_FIRST_KEYBOARD_MENUITEM_TAG; NSString *keyboardMenuName = @""; int menuItemIndex = KEYMAN_FIRST_KEYBOARD_MENUITEM_INDEX; - if (self.debugMode) { - os_log_info([KMLogs configLog], "*** populateKeyboardMenuItems, number of active keyboards=%lu", self.activeKeyboards.count); - } + os_log_debug([KMLogs configLog], "*** populateKeyboardMenuItems, number of active keyboards=%lu", self.activeKeyboards.count); // loop through the active keyboards list and add them to the menu for (NSString *path in self.activeKeyboards) { - NSDictionary *infoDict = [KMXFile keyboardInfoFromKmxFile:path]; + NSString *fullPath = [KMDataRepository.shared buildFullPath:path]; + os_log_debug([KMLogs dataLog], "addDynamicKeyboardMenuItems, path = '%{public}@', full path = '%{public}@'", path, fullPath); + NSDictionary *infoDict = [KMXFile keyboardInfoFromKmxFile:fullPath]; if (!infoDict) { continue; } @@ -871,10 +791,12 @@ - (void)addDynamicKeyboardMenuItems { - (void) setSelectedKeyboard:(NSString*)keyboardName inMenuItem:(NSMenuItem*) menuItem { KVKFile *kvk = nil; + NSString *fullPath = [KMDataRepository.shared buildFullPath:keyboardName]; + os_log_debug([KMLogs dataLog], "setSelectedKeyboard, keyboardName = '%{public}@', full path = '%{public}@'", keyboardName, fullPath); [menuItem setState:NSOnState]; - KMXFile *kmx = [[KMXFile alloc] initWithFilePath:keyboardName]; - [self setKmx:kmx]; - NSDictionary *kmxInfo = [KMXFile keyboardInfoFromKmxFile:keyboardName]; + KMXFile *kmx = [[KMXFile alloc] initWithFilePath:fullPath]; + [self loadKeyboardFromKmxFile:kmx]; + NSDictionary *kmxInfo = [KMXFile keyboardInfoFromKmxFile:fullPath]; NSString *kvkFilename = [kmxInfo objectForKey:kKMVisualKeyboardKey]; if (kvkFilename != nil) { NSString *kvkFilePath = [self kvkFilePathFromFilename:kvkFilename]; @@ -885,7 +807,7 @@ - (void) setSelectedKeyboard:(NSString*)keyboardName inMenuItem:(NSMenuItem*) me [self setKvk:kvk]; [self setKeyboardName:[kmxInfo objectForKey:kKMKeyboardNameKey]]; [self setKeyboardIcon:[kmxInfo objectForKey:kKMKeyboardIconKey]]; - [self readPersistedOptions]; + [self applyPersistedOptions]; } // defaults to the whatever keyboard happens to be first in the list @@ -901,7 +823,7 @@ - (void) addKeyboardPlaceholderMenuItem { NSString* placeholder = NSLocalizedString(@"no-keyboard-configured-menu-placeholder", nil); NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:placeholder action:NULL keyEquivalent:@""]; [self.menu insertItem:item atIndex:KEYMAN_FIRST_KEYBOARD_MENUITEM_INDEX]; - [self setKmx:nil]; + [self resetKmx]; [self setKvk:nil]; [self setKeyboardName:nil]; [self setKeyboardIcon:nil]; @@ -926,10 +848,13 @@ - (void)selectKeyboardFromMenu:(NSInteger)tag { } NSString *path = [self.activeKeyboards objectAtIndex:tag-KEYMAN_FIRST_KEYBOARD_MENUITEM_TAG]; - KMXFile *kmx = [[KMXFile alloc] initWithFilePath:path]; - [self setKmx:kmx]; + NSString *fullPath = [KMDataRepository.shared buildFullPath:path]; + os_log_debug([KMLogs dataLog], "setSelectedKeyboard, keyboardName = '%{public}@', full path = '%{public}@'", path, fullPath); + + KMXFile *kmx = [[KMXFile alloc] initWithFilePath:fullPath]; + [self loadKeyboardFromKmxFile:kmx]; KVKFile *kvk = nil; - NSDictionary *kmxInfo = [KMXFile keyboardInfoFromKmxFile:path]; + NSDictionary *kmxInfo = [KMXFile keyboardInfoFromKmxFile:fullPath]; NSString *kvkFilename = [kmxInfo objectForKey:kKMVisualKeyboardKey]; if (kvkFilename != nil) { NSString *kvkFilePath = [self kvkFilePathFromFilename:kvkFilename]; @@ -943,45 +868,46 @@ - (void)selectKeyboardFromMenu:(NSInteger)tag { [self setKeyboardIcon:[kmxInfo objectForKey:kKMKeyboardIconKey]]; [self setContextBuffer:nil]; [self setSelectedKeyboard:path]; - [self readPersistedOptions]; - if (kvk != nil && self.alwaysShowOSK) - [self showOSK]; + [self applyPersistedOptions]; } -- (NSArray *)KMXFiles { - return [self KMXFilesAtPath:self.keyboardsPath]; +- (NSArray *)getKmxFilesInKeyboardsDirectory { + return [self getKmxFilesAtPath:self.keyboardsPath]; } -- (NSArray *)KMXFilesAtPath:(NSString *)path { +- (NSArray *)getKmxFilesAtPath:(NSString *)path { + os_log_debug([KMLogs dataLog], "getKmxFilesAtPath, path: '%{public}@'", path); NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:path]; NSMutableArray *kmxFiles = [[NSMutableArray alloc] initWithCapacity:0]; NSString *filePath; while (filePath = (NSString *)[dirEnum nextObject]) { NSString *extension = [[filePath pathExtension] lowercaseString]; - if ([extension isEqualToString:@"kmx"]) + if ([extension isEqualToString:@"kmx"]) { [kmxFiles addObject:[path stringByAppendingPathComponent:filePath]]; + os_log_debug([KMLogs dataLog], "file = %{public}@", filePath); + } } return kmxFiles; } -- (NSArray *)KVKFiles { +- (NSArray *)getKvkFilesArray { NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:self.keyboardsPath]; - NSMutableArray *kvkFiles = [[NSMutableArray alloc] initWithCapacity:0]; + NSMutableArray *kvkFilesArray = [[NSMutableArray alloc] initWithCapacity:0]; NSString *filePath; while (filePath = (NSString *)[dirEnum nextObject]) { NSString *extension = [[filePath pathExtension] lowercaseString]; if ([extension isEqualToString:@"kvk"]) - [kvkFiles addObject:[self.keyboardsPath stringByAppendingPathComponent:filePath]]; + [kvkFilesArray addObject:[self.keyboardsPath stringByAppendingPathComponent:filePath]]; } - return kvkFiles; + return kvkFilesArray; } - (NSString *)kvkFilePathFromFilename:(NSString *)kvkFilename { NSString *kvkFilePath = nil; - NSArray *kvkFiles = [self KVKFiles]; - for (NSString *filePath in kvkFiles) { + NSArray *kvkFilesArray = [self getKvkFilesArray]; + for (NSString *filePath in kvkFilesArray) { if ([[filePath lastPathComponent] isEqualToString:kvkFilename]) { kvkFilePath = filePath; break; @@ -1037,6 +963,7 @@ - (NSWindowController *)configWindow { return _configWindow; } +// TODO: rewrite confusing pattern, multiple methods differing only by underscore - (NSWindowController *)aboutWindow_ { return _aboutWindow; } @@ -1119,14 +1046,19 @@ - (void)windowWillClose:(NSNotification *)notification { * TODO: this should really be refactored */ -- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - NSButton *button = (NSButton *)[alert.buttons objectAtIndex:0]; - if (button.tag == -1) { +- (void)downloadComplete:(NSModalResponse) returnCode { + os_log_debug([KMLogs uiLog], "downloadComplete, NSModalResponse returnCode: %ld", (long)returnCode); + if (returnCode == NSModalResponseCancel) { + os_log_debug([KMLogs uiLog], "downloadComplete, returnCode == NSModalResponseCancel"); [_connection cancel]; } - else if (button.tag == 1) { + else if (returnCode == NSModalResponseOK) { + os_log_debug([KMLogs uiLog], "downloadComplete, returnCode == NSModalResponseOK"); + [_downloadKBWindow close]; + if (self.configWindow.window != nil) { + os_log_debug([KMLogs uiLog], "downloadComplete, self.configWindow.window != nil"); [self.configWindow.window makeKeyAndOrderFront:nil]; if (![[self.configWindow.window childWindows] containsObject:self.infoWindow.window]) { [self.configWindow.window addChildWindow:self.infoWindow.window ordered:NSWindowAbove]; @@ -1135,6 +1067,7 @@ - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInf [self.infoWindow.window makeKeyAndOrderFront:nil]; } else { + os_log_debug([KMLogs uiLog], "downloadComplete, self.configWindow.window == nil"); [self.infoWindow.window centerInParent]; [self.infoWindow.window makeKeyAndOrderFront:nil]; [self.infoWindow.window setLevel:NSFloatingWindowLevel]; @@ -1152,6 +1085,7 @@ - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInf } - (NSAlert *)downloadInfoView { + os_log_debug([KMLogs uiLog], "downloadInfoView"); if (_downloadInfoView == nil) { _downloadInfoView = [[NSAlert alloc] init]; [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-downloading", nil)]; @@ -1165,6 +1099,7 @@ - (NSAlert *)downloadInfoView { } - (NSProgressIndicator *)progressIndicator { + os_log_debug([KMLogs uiLog], "progressIndicator"); if (_progressIndicator == nil) { _progressIndicator = [[NSProgressIndicator alloc] initWithFrame:NSMakeRect(0, 0, 300, 20)]; [_progressIndicator setIndeterminate:NO]; @@ -1184,38 +1119,51 @@ - (void)downloadKeyboardFromKeyboardId:(NSString *)keyboardId { [self downloadKeyboardFromURL:url]; } + - (void)downloadKeyboardFromURL:(NSURL *)url { NSURL* downloadUrl = url; - + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, url.path: %{public}@", url.path); + if (downloadUrl && _downloadFilename) { if (_infoWindow.window != nil) [_infoWindow close]; [self.downloadInfoView setInformativeText:self.downloadFilename]; + if (self.configWindow.window != nil) { + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, self.configWindow.window != nil"); [self.configWindow.window makeKeyAndOrderFront:nil]; if (![[self.configWindow.window childWindows] containsObject:self.downloadKBWindow.window]) { [self.configWindow.window addChildWindow:self.downloadKBWindow.window ordered:NSWindowAbove]; } [self.downloadKBWindow.window centerInParent]; [self.downloadKBWindow.window makeKeyAndOrderFront:nil]; - [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + + /* + Open sheet off of config window, not the download window. + This is because, if the download is successful, + the download window will be closed by the sheet. + */ + [self.downloadInfoView beginSheetModalForWindow:self.configWindow.window completionHandler:^(NSModalResponse returnCode) { + [self downloadComplete:returnCode]; + }]; } else { + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, self.configWindow.window == nil"); [self.downloadKBWindow.window centerInParent]; [self.downloadKBWindow.window makeKeyAndOrderFront:nil]; [self.downloadKBWindow.window setLevel:NSFloatingWindowLevel]; - [self.downloadInfoView beginSheetModalForWindow:self.downloadKBWindow.window - modalDelegate:self - didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + /* + Open sheet off of config window, same as above. + */ + [self.downloadInfoView beginSheetModalForWindow:self.configWindow.window completionHandler:^(NSModalResponse returnCode) { + [self downloadComplete:returnCode]; + }]; } if (_connection == nil) { - [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-downloading", nil)]; + os_log_debug([KMLogs uiLog], "downloadKeyboardFromURL, _connection == nil, set button title cancel downloading, tag = -1"); + [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-downloading", nil)]; NSButton *button = (NSButton *)[_downloadInfoView.buttons objectAtIndex:0]; [button setTitle:NSLocalizedString(@"button-cancel-downloading", nil)]; [button setTag:-1]; @@ -1224,7 +1172,6 @@ - (void)downloadKeyboardFromURL:(NSURL *)url { _receivedData = [[NSMutableData alloc] initWithLength:0]; _connection = [[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:YES]; } - } } @@ -1257,6 +1204,7 @@ - (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheRespo } - (void)connectionDidFinishLoading:(NSURLConnection *)connection { + os_log_debug([KMLogs uiLog], "connectionDidFinishLoading"); NSString *filePath = [self.keyboardsPath stringByAppendingPathComponent:self.downloadFilename]; [self.receivedData writeToFile:filePath atomically:YES]; [self unzipFile:filePath]; @@ -1264,6 +1212,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection { [_downloadInfoView setMessageText:NSLocalizedString(@"message-keyboard-download-complete", nil)]; NSButton *button = (NSButton *)[_downloadInfoView.buttons objectAtIndex:0]; + os_log_debug([KMLogs uiLog], "connectionDidFinishLoading, set button title download complete, tag = 1"); [button setTitle:NSLocalizedString(@"button-download-complete", nil)]; [button setTag:1]; [[NSNotificationCenter defaultCenter] postNotificationName:kKeymanKeyboardDownloadCompletedNotification @@ -1281,6 +1230,11 @@ - (void)handleKeyEvent:(NSEvent *)event { [_oskWindow.oskView handleKeyEvent:event]; } +- (NSEventModifierFlags) determineModifiers { + NSEventModifierFlags originalModifiers = self.currentModifiers; + return [self.modifierMapping adjustModifiers:originalModifiers]; +} + extern const CGKeyCode kProcessPendingBuffer; // This could more easily and logically be done in the input method, but this @@ -1330,7 +1284,9 @@ - (BOOL)unzipFile:(NSString *)filePath { NSError *error = nil; NSString *fileName = filePath.lastPathComponent; NSString *folderName = [fileName stringByDeletingPathExtension]; - + + os_log_debug([KMLogs keyboardLog], "unzipFile, folderName: %{public}@, fileName: %{public}@", folderName, fileName); + // First we unzip into a temp folder, and check kmp.json for the fileVersion // before we continue installation. We don't want to overwrite existing // package if it is there if the files are not compatible with the installed @@ -1341,9 +1297,9 @@ - (BOOL)unzipFile:(NSString *)filePath { ZipArchive *za = [[ZipArchive alloc] init]; if ([za UnzipOpenFile:filePath]) { - os_log_debug([KMLogs keyboardLog], "Unzipping %{public}@ to %{public}@", filePath, tempDestFolder); + os_log_debug([KMLogs keyboardLog], "unzipFile, Unzipping %{public}@ to %{public}@", filePath, tempDestFolder); if ([[NSFileManager defaultManager] fileExistsAtPath:tempDestFolder]) { - os_log_debug([KMLogs keyboardLog], "The temp destination folder already exists. Overwriting..."); + os_log_debug([KMLogs keyboardLog], "unzipFile, The temp destination folder already exists. Overwriting..."); } didUnzip = [za UnzipFileTo:tempDestFolder overWrite:YES]; @@ -1351,11 +1307,11 @@ - (BOOL)unzipFile:(NSString *)filePath { } if (!didUnzip) { - os_log_error([KMLogs keyboardLog], "Failed to unzip file: %{public}@", filePath); + os_log_error([KMLogs keyboardLog], "unzipFile, Failed to unzip file: %{public}@", filePath); return NO; } - os_log_debug([KMLogs keyboardLog], "Unzipped file: %{public}@", filePath); + os_log_debug([KMLogs keyboardLog], "unzipFile, Unzipped file: %{public}@", filePath); BOOL didInstall = [self verifyPackageVersionInTempFolder:tempDestFolder filePath:filePath]; @@ -1363,10 +1319,10 @@ - (BOOL)unzipFile:(NSString *)filePath { // Remove existing package if it exists if (didInstall && [[NSFileManager defaultManager] fileExistsAtPath:destFolder]) { - os_log_debug([KMLogs keyboardLog], "The destination folder already exists. Overwriting..."); + os_log_debug([KMLogs keyboardLog], "unzipFile, The destination folder already exists. Overwriting..."); [[NSFileManager defaultManager] removeItemAtPath:destFolder error:&error]; if (error != nil) { - os_log_error([KMLogs keyboardLog], "Unable to remove destination folder %{public}@", destFolder); + os_log_error([KMLogs keyboardLog], "unzipFile, Unable to remove destination folder %{public}@", destFolder); didInstall = NO; } } @@ -1379,7 +1335,7 @@ - (BOOL)unzipFile:(NSString *)filePath { if(didInstall) { [[NSFileManager defaultManager] moveItemAtPath:tempDestFolder toPath:destFolder error:&error]; if (error != nil) { - os_log_error([KMLogs keyboardLog], "Unable to move temp folder %{public}@ to dest folder %{public}@", tempDestFolder, destFolder); + os_log_error([KMLogs keyboardLog], "unzipFile, Unable to move temp folder %{public}@ to dest folder %{public}@", tempDestFolder, destFolder); didInstall = NO; } } @@ -1387,7 +1343,7 @@ - (BOOL)unzipFile:(NSString *)filePath { if(!didInstall) { [[NSFileManager defaultManager] removeItemAtPath:tempDestFolder error:&error]; if (error != nil) { - os_log_error([KMLogs keyboardLog], "Unable to remove temp folder %{public}@", tempDestFolder); + os_log_error([KMLogs keyboardLog], "unzipFile, Unable to remove temp folder %{public}@", tempDestFolder); } return NO; @@ -1396,11 +1352,12 @@ - (BOOL)unzipFile:(NSString *)filePath { // Package has installed, now scan for keyboards and fonts // TODO: we need to be reading the kmp.json data to determine keyboards to install NSString * keyboardFolderPath = [self.keyboardsPath stringByAppendingPathComponent:folderName]; + os_log_debug([KMLogs keyboardLog], "unzipFile, folderName: %{public}@, keyboardFolderPath: %{public}@", folderName, keyboardFolderPath); [self installFontsAtPath:keyboardFolderPath]; - for (NSString *kmxFile in [self KMXFilesAtPath:keyboardFolderPath]) { - os_log_debug([KMLogs keyboardLog], "Adding keyboard to list of active keyboards: %{public}@", kmxFile); - if (![self.activeKeyboards containsObject:kmxFile]) - [self.activeKeyboards addObject:kmxFile]; + + for (NSString *kmxFile in [self getKmxFilesAtPath:keyboardFolderPath]) { + NSString *partialPath = [KMDataRepository.shared buildPartialPathFrom:folderName keyboardFile:[kmxFile lastPathComponent]]; + [self addActiveKeyboard:partialPath]; } [self saveActiveKeyboards]; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m index ab1b515e430..1c6462f02ab 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m @@ -10,6 +10,7 @@ #import /* For kVK_ constants. */ #import "KeySender.h" #import "TextApiCompliance.h" +#import "KMSettingsRepository.h" #import "KMLogs.h" @import Sentry; @@ -44,11 +45,14 @@ - (instancetype)initWithClient:(NSString *)clientAppId client:(id) sender { _lowLevelBackspaceCount = 0; _queuedText = nil; - // In Xcode, if Keyman is the active IM and is in "debugMode" and "English plus Spanish" is - // the current keyboard and you type "Sentry force now", it will force a simulated crash to + BOOL forceSentryCrash = [KMSettingsRepository.shared readForceSentryError]; + + // In Xcode, if Keyman is the active IM and the settings include the + // forceSentryCrash flag and "English plus Spanish" is the current keyboard + // and you type "Sentry force now", it will force a simulated crash to // test reporting to sentry.keyman.com - if ([self.appDelegate debugMode] && [clientAppId isEqual: @"com.apple.dt.Xcode"]) { - os_log_debug([KMLogs testLog], "Sentry - Preparing to detect Easter egg."); + if (forceSentryCrash && [clientAppId isEqual: @"com.apple.dt.Xcode"]) { + os_log_debug([KMLogs testLog], "initWithClient, preparing to force Sentry crash."); _easterEggForSentry = [[NSMutableString alloc] init]; } else @@ -65,9 +69,7 @@ - (void)deactivate { if (_generatedBackspaceCount > 0 || (_queuedText != nil && _queuedText.length > 0) || _keyCodeOfOriginalEvent != 0 || _sourceFromOriginalEvent != nil) { - if ([self.appDelegate debugMode]) { - os_log_error([KMLogs lifecycleLog], "ERROR: new app activated before previous app finished processing pending events! _generatedBackspaceCount: %lu, _queuedText: '%{public}@' _keyCodeOfOriginalEvent: %hu", _generatedBackspaceCount, _queuedText == nil ? @"(NIL)" : (NSString*)[self queuedText], _keyCodeOfOriginalEvent); - } + os_log_error([KMLogs lifecycleLog], "ERROR: new app activated before previous app finished processing pending events! _generatedBackspaceCount: %lu, _queuedText: '%{public}@' _keyCodeOfOriginalEvent: %hu", _generatedBackspaceCount, _queuedText == nil ? @"(NIL)" : (NSString*)[self queuedText], _keyCodeOfOriginalEvent); _keyCodeOfOriginalEvent = 0; _generatedBackspaceCount = 0; _queuedText = nil; @@ -120,17 +122,19 @@ - (BOOL) handleEventWithKeymanEngine:(NSEvent *)event in:(id) sender { - (CoreKeyOutput*) processEventWithKeymanEngine:(NSEvent *)event in:(id) sender { CoreKeyOutput* coreKeyOutput = nil; if (self.appDelegate.lowLevelEventTap != nil) { - NSEvent *eventWithOriginalModifierFlags = [NSEvent keyEventWithType:event.type location:event.locationInWindow modifierFlags:self.appDelegate.currentModifierFlags timestamp:event.timestamp windowNumber:event.windowNumber context:[NSGraphicsContext currentContext] characters:event.characters charactersIgnoringModifiers:event.charactersIgnoringModifiers isARepeat:event.isARepeat keyCode:event.keyCode]; + NSEventModifierFlags newModifiers = [self.appDelegate determineModifiers]; + NSEvent *eventWithOriginalModifierFlags = [NSEvent keyEventWithType:event.type location:event.locationInWindow modifierFlags:newModifiers timestamp:event.timestamp windowNumber:event.windowNumber context:[NSGraphicsContext currentContext] characters:event.characters charactersIgnoringModifiers:event.charactersIgnoringModifiers isARepeat:event.isARepeat keyCode:event.keyCode]; coreKeyOutput = [self.kme processEvent:eventWithOriginalModifierFlags]; - os_log_debug([KMLogs eventsLog], "processEventWithKeymanEngine, using AppDelegate.currentModifierFlags: %lu / 0x%lX, instead of event.modifiers = %lu / 0x%lX", self.appDelegate.currentModifierFlags, self.appDelegate.currentModifierFlags, event.modifierFlags, event.modifierFlags); + os_log_debug([KMLogs eventsLog], "processEventWithKeymanEngine, using newModifierFlag 0x%lX, instead of event.modifiers 0x%lX", newModifiers, event.modifierFlags); } else { - // Depending on the client app and the keyboard, using the passed-in event as it is should work okay. - // Keyboards that depend on chirality support will not work. And command-key actions that change the - // context might go undetected in some apps, resulting in errant behavior for subsequent typing. + /** + * Without the low level event tap, there will be no way to distinguish left and right option keys. + * Also command-key actions that should invalidate the context may go undetected. + * Have yet to determine which scenarios prevent an event tap from be created + */ coreKeyOutput = [self.kme processEvent:event]; } - //os_log_debug([KMLogs eventsLog], "processEventWithKeymanEngine, coreKeyOutput = %{public}@", coreKeyOutput); return coreKeyOutput; } @@ -416,11 +420,11 @@ -(void) persistOptions:(NSDictionary*)options{ for(NSString *key in options) { NSString *value = [options objectForKey:key]; if(key && value) { - os_log_debug([KMLogs keyLog], "applyNonTextualOutput calling writePersistedOptions, key: %{public}@, value: %{public}@", key, value); - [self.appDelegate writePersistedOptions:key withValue:value]; + os_log_debug([KMLogs keyLog], "persistOptions, key: %{public}@, value: %{public}@", key, value); + [[KMSettingsRepository shared] writeOptionForSelectedKeyboard:key withValue:value]; } else { - os_log_debug([KMLogs keyLog], "applyNonTextualOutput, invalid values in optionsToPersist, not writing to UserDefaults, key: %{public}@, value: %{public}@", key, value); + os_log_debug([KMLogs keyLog], "invalid values in persistOptions, not writing to UserDefaults, key: %{public}@, value: %{public}@", key, value); } } } diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodLifecycle.h b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodLifecycle.h new file mode 100644 index 00000000000..62a3aac35d1 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodLifecycle.h @@ -0,0 +1,27 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-09. + * + */ + +#import + +NS_ASSUME_NONNULL_BEGIN + +extern NSString *const kInputMethodActivatedNotification; +extern NSString *const kInputMethodDeactivatedNotification; +extern NSString *const kInputMethodClientChangeNotification; + +@interface KMInputMethodLifecycle : NSObject ++ (KMInputMethodLifecycle *)shared; ++ (NSString*)getClientApplicationId; +- (void)startLifecycle; +- (void)activateClient:(id)client; +- (void)deactivateClient:(id)client; +- (BOOL)shouldEnableEventTap; +- (BOOL)shouldShowOskOnActivate; + +@end + +NS_ASSUME_NONNULL_END diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodLifecycle.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodLifecycle.m new file mode 100644 index 00000000000..9b877a530e7 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodLifecycle.m @@ -0,0 +1,253 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-09. + * + * This class is responsible for determining the state of the Keyman input method. + * It is called from the KMInputController (a subclass of IMKInputController), and + * shares changes in the state of the input method by synchronously posting + * notifications to NSNotificationCenter. + */ + +/** + * This class is needed because many activateServer and deactivateServer messages sent from macOS + * to KMInputController, but they are not particularly reliable. Keyman receives some messages when it + * is not active and should not become active. It also receives messages when it is active, but there is no + * need to change state. For example, when a menu is clicked with Keyman active, macOS will send a + * deactivateServer message followed by an activateServer message when the menu is released. + * The messages may also arrive in an unexpected order. + * + * Instead of relying on the information conveyed in these messages, this class interprets them as a notification + * that the input method state may have changed. For the actual state of the input method, it gets the current + * input source using the Carbon APIs TISCopyCurrentKeyboardInputSource and TISGetInputSourceProperty. + * If the result is equal to "keyman.inputmethod.Keyman", then Keyman is the active input method. If, for + * example, the U.S. keyboard were selected, then the result would be "com.apple.keylayout.US". + * + * The state of the text input client is discovered using the NSRunningApplication frontmostApplication API. + * Knowing the current input method and the current text input client enables us to determine whether the + * state has actually changed and how to adjust to the new state. + * + * It is important for state to be known so that the On-screen keyboard can be appropriately shown or hidden + * and the low-level event tap can be stopped or started. + */ + +#import "KMInputMethodLifecycle.h" +#import "KMLogs.h" +#import +#import "KMSettingsRepository.h" +#import + +NSString *const kInputMethodActivatedNotification = @"kInputMethodActivatedNotification"; +NSString *const kInputMethodDeactivatedNotification = @"kInputMethodDeactivatedNotification"; +NSString *const kInputMethodClientChangeNotification = @"kInputMethodClientChangeNotification"; +NSString *const keymanInputMethodName = @"keyman.inputmethod.Keyman"; +const double transitionDelay = 0.25; + +typedef enum { + Started, + Active, + Inactive +} LifecycleState; + +typedef enum { + None, + Activate, + Deactivate, + ChangeClients, +} TransitionType; + + +@interface KMInputMethodLifecycle() + +@property LifecycleState lifecycleState; +@property NSString *inputSourceId; +@property NSString *clientApplicationId; +@end + +@implementation KMInputMethodLifecycle + ++ (KMInputMethodLifecycle *)shared { + static KMInputMethodLifecycle *shared = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + shared = [[KMInputMethodLifecycle alloc] init]; + }); + + return shared; +} + +- (instancetype)init { + self = [super init]; + if (self) { + _lifecycleState = Started; + _inputSourceId = @""; + _clientApplicationId = @""; + } + return self; +} + +/** + * called from Application Delgate during init + */ +- (void)startLifecycle { + _lifecycleState = Started; +} + +/** + * Use Carbon APIs to get the current input source or input method. Even though many Carbon APIs were deprecated and removed + * from the OS years ago, these and other low-level APIs are still supported (but apparently completely undocumented). + */ ++ (NSString*)getCurrentInputSourceId { + TISInputSourceRef inputSource = TISCopyCurrentKeyboardInputSource(); + NSString *inputSourceId = (__bridge NSString *)(TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceID)); + return inputSourceId; +} + +/** + * Get the bundle ID of the currently active text input client.. + */ ++ (NSString*)getClientApplicationId { + NSRunningApplication *currentApp = [[NSWorkspace sharedWorkspace] frontmostApplication]; + NSString *clientAppId = [currentApp bundleIdentifier]; + return clientAppId; +} + +/** + * Based on the current lifecycleState and the input method state from the OS, determine how the state must transition. + */ +- (TransitionType)determineTransition:(NSString*)newInputSourceId withAppId:(NSString*)newClientAppId { + TransitionType transition = None; + BOOL inputSourceIsKeyman = [newInputSourceId isEqualTo:keymanInputMethodName]; + BOOL clientHasChanged = [self.clientApplicationId isNotEqualTo:newClientAppId]; + os_log_debug([KMLogs lifecycleLog], "determineTransition, current InputSourceId: %{public}@, new InputSourceId: %{public}@, current ClientAppId: %{public}@, new ClientAppId: %{public}@, inputSourceIsKeyman: %d, clientHasChanged: %d", self.inputSourceId, newInputSourceId, self.clientApplicationId, newClientAppId, inputSourceIsKeyman, clientHasChanged); + + switch (self.lifecycleState) { + case Started: + transition = Activate; + break; + case Active: + if (inputSourceIsKeyman) { + if (clientHasChanged) { + transition = ChangeClients; + } + } else { + transition = Deactivate; + } + break; + case Inactive: + if (inputSourceIsKeyman) { + transition = Activate; + } + break; + } + return transition; +} + +/** + * Update the input method state, consisting of the input source ID and the client application ID. + */ +- (void)saveNewInputMethodState:(NSString*)newInputSourceId withAppId:(NSString*)newClientAppId { + self.inputSourceId = newInputSourceId; + self.clientApplicationId = newClientAppId; +} + +/** + * Called when IMKInputController receives an activateServer or a deactivateServer message + */ +- (void)performTransition:(id)client { + NSString *currentInputSource = [KMInputMethodLifecycle getCurrentInputSourceId]; + NSString *currentClientAppId = [KMInputMethodLifecycle getClientApplicationId]; + + TransitionType transition = [self determineTransition:currentInputSource withAppId:currentClientAppId]; + [self saveNewInputMethodState:currentInputSource withAppId:currentClientAppId]; + + switch(transition) { + case None: + os_log_info([KMLogs lifecycleLog], "performTransition: None, new InputSourceId: %{public}@, new application ID: %{public}@", currentInputSource, currentClientAppId); + break; + case Activate: + os_log_info([KMLogs lifecycleLog], "performTransition: Activate, new InputSourceId: %{public}@, new application ID: %{public}@", currentInputSource, currentClientAppId); + /** + * Perform two actions when activating the input method. + * Change the client first which prepares the event handler. + * Then do the activate which starts the event loop and opens the OSK. + */ + [self changeClient]; + [self activateInputMethod]; + break; + case Deactivate: + os_log_info([KMLogs lifecycleLog], "performTransition: Deactivate, new InputSourceId: %{public}@, new application ID: %{public}@", currentInputSource, currentClientAppId); + [self deactivateInputMethod]; + break; + case ChangeClients: + os_log_info([KMLogs lifecycleLog], "performTransition: ChangeClients, new InputSourceId: %{public}@, new application ID: %{public}@", currentInputSource, currentClientAppId); + [self changeClient]; + break; + } +} + +/** + * Called when IMKInputController receives an activateServer message + */ +- (void)activateClient:(id)client { + os_log_debug([KMLogs lifecycleLog], "KMInputMethodLifecycle activateClient"); + + [self performSelector:@selector(performTransitionAfterDelay:) withObject:client afterDelay:transitionDelay]; +} + +/** + * Called when IMKInputController receives an deactivateServer message + */ +- (void)deactivateClient:(id)client { + os_log_debug([KMLogs lifecycleLog], "KMInputMethodLifecycle deactivateClient"); + + [self performSelector:@selector(performTransitionAfterDelay:) withObject:client afterDelay:transitionDelay]; +} + +- (void)performTransitionAfterDelay:(id)client { + os_log_debug([KMLogs lifecycleLog], "performTransitionAfterDelay: calling performTransition"); + [self performTransition:client]; +} + +/** + * Change lifecycleState to Active and send notification. + */ +- (void)activateInputMethod { + os_log_debug([KMLogs lifecycleLog], "activateInputMethod"); + _lifecycleState = Active; + [[NSNotificationCenter defaultCenter] postNotificationName:kInputMethodActivatedNotification object:self]; +} + +/** + * Change lifecycleState to Inactive and send notification. + */ +- (void)deactivateInputMethod { + os_log_debug([KMLogs lifecycleLog], "deactivateInputMethod"); + _lifecycleState = Inactive; + [[NSNotificationCenter defaultCenter] postNotificationName:kInputMethodDeactivatedNotification object:self]; +} + +/** + * Does not change lifecycleState, just fires notification so that InputController knows to change the event handler + */ +- (void)changeClient { + os_log_debug([KMLogs lifecycleLog], "changeClient"); + [[NSNotificationCenter defaultCenter] postNotificationName:kInputMethodClientChangeNotification object:self]; +} + +/** + * Returns true if Started or Active + */ +- (BOOL)shouldEnableEventTap { + return ((self.lifecycleState == Started) || (self.lifecycleState == Active)); +} + +/** + * Returns true if lifecycleState is Active and the Settings require us to show the OSK + */ +- (BOOL)shouldShowOskOnActivate { + return [KMSettingsRepository.shared readShowOskOnActivate] + && (self.lifecycleState == Active); +} + +@end diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMModifierMapping.h b/mac/Keyman4MacIM/Keyman4MacIM/KMModifierMapping.h new file mode 100644 index 00000000000..71efb50db6e --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMModifierMapping.h @@ -0,0 +1,20 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-25. + * + */ + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface KMModifierMapping : NSObject +-(instancetype)init:(CoreKeyboardInfo*)keyboardInfo; +-(BOOL)optionKeysUnused; +-(BOOL)bothOptionKeysGenerateRightAlt; +-(NSEventModifierFlags)adjustModifiers:(NSEventModifierFlags)originalModifiers; +@end + +NS_ASSUME_NONNULL_END diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMModifierMapping.m b/mac/Keyman4MacIM/Keyman4MacIM/KMModifierMapping.m new file mode 100644 index 00000000000..14eba0f770e --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMModifierMapping.m @@ -0,0 +1,72 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-25. + * + * Contains the logic that determines whether the right and left + * options keys both cause the same character to be generated or + * whether each option key results in a unique key combination. + */ + +#import "KMModifierMapping.h" +#import +#import "KMLogs.h" + +@interface KMModifierMapping () +@property (nonatomic, strong) CoreKeyboardInfo *keyboardInfo; +@end + +@implementation KMModifierMapping + +const NSEventModifierFlags LEFT_OPTION_MASK = 0x80120; +const NSEventModifierFlags RIGHT_OPTION_MASK = 0x80140; + ++(BOOL)containsLeftOptionFlag:(NSEventModifierFlags)modifiers { + return (modifiers & LEFT_OPTION_MASK) == LEFT_OPTION_MASK; +} + +-(instancetype)init:(CoreKeyboardInfo*)keyboardInfo { + self = [super init]; + if (self) { + _keyboardInfo = keyboardInfo; + } + return self; +} + +-(BOOL)optionKeysUnused { + return !(self.keyboardInfo.containsRightAlt || + self.keyboardInfo.containsLeftAlt || + self.keyboardInfo.containsAlt); +} + +-(BOOL)bothOptionKeysGenerateRightAlt { + return (self.keyboardInfo.containsRightAlt || self.keyboardInfo.containsAlt) && !self.keyboardInfo.containsLeftAlt; +} + +/** + * If necessary, change the modifiers so that it appears that the right option key was pressed instead of the + * left option key. This will trigger keyboard rules that are defined for right option because both option keys + * usually have the same meaning on the Mac. + */ +- (NSEventModifierFlags) adjustModifiers:(NSEventModifierFlags)originalModifiers { + + NSEventModifierFlags newModifiers = originalModifiers; + + if (self.bothOptionKeysGenerateRightAlt) { + // if original includes left option key, then replace it with the right option key + if ([KMModifierMapping containsLeftOptionFlag:originalModifiers]) { + + // clear all left option bits + newModifiers = originalModifiers & ~LEFT_OPTION_MASK; + + // set all right option bits + newModifiers = newModifiers | RIGHT_OPTION_MASK; + os_log_debug([KMLogs eventsLog], "adjustModifiers, changing from originalModifiers: 0x%lX to newModifiers: 0x%lX", originalModifiers, newModifiers); + } + } else { + os_log_debug([KMLogs eventsLog], "adjustModifiers, retaining originalModifiers: 0x%lX", (unsigned long)originalModifiers); + } + return newModifiers; +} + +@end diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.h b/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.h index 2c138d8215a..008f0c025e6 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.h +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.h @@ -19,8 +19,6 @@ NS_ASSUME_NONNULL_BEGIN @interface KMPackageReader : NSObject -@property (assign, nonatomic) BOOL debugMode; - - (instancetype)init; - (KMPackageInfo *)loadPackageInfo:(NSString *)path; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m b/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m index 7406488a8a0..12c0b3c5645 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMPackageReader.m @@ -44,9 +44,6 @@ @implementation KMPackageReader - (instancetype)init { self = [super init]; - if (self) { - _debugMode = NO; - } return self; } @@ -69,15 +66,6 @@ - (KMPackageInfo *)loadPackageInfo:(NSString *)path { return packageInfo; } -- (NSString *)packageNameFromPackageInfo:(NSString *)path { - NSString *packageName = nil; - - KMPackageInfo *packageInfo = [self loadPackageInfo:path]; - packageName = packageInfo.packageName; - - return packageName; -} - /** * read JSON file and load it into KMPackageInfo object * returns nil if the file does not exist or it cannot be parsed as JSON @@ -251,14 +239,12 @@ - (KMPackageInfo *) loadPackageInfoFromInfFile:(NSString *)path { NSString *s = [line substringFromIndex:kName.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.packageName = v1; } else if ([[line lowercaseString] hasPrefix:[kVersion lowercaseString]]) { NSString *s = [line substringFromIndex:kVersion.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.packageVersion = v1; } else if ([[line lowercaseString] hasPrefix:[kAuthor lowercaseString]]) { @@ -273,14 +259,12 @@ - (KMPackageInfo *) loadPackageInfoFromInfFile:(NSString *)path { NSString *s = [line substringFromIndex:kCopyright.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.copyright = v1; } else if ([[line lowercaseString] hasPrefix:[kWebSite lowercaseString]]) { NSString *s = [line substringFromIndex:kWebSite.length+1]; NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *v1 = [[vs objectAtIndex:0] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *v2 = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; builder.website = v1; } @@ -294,20 +278,17 @@ - (KMPackageInfo *) loadPackageInfoFromInfFile:(NSString *)path { NSString *s = [line substringFromIndex:x+2]; if ([[s lowercaseString] hasPrefix:[kFile lowercaseString]]) { NSArray *vs = [s componentsSeparatedByString:@"\","]; - NSString *v1 = [[[vs objectAtIndex:0] substringFromIndex:kFile.length+1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; NSString *fileName = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; [files addObject:fileName]; } else if ([[s lowercaseString] hasPrefix:[kFont lowercaseString]]) { NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *fontName = [[[vs objectAtIndex:0] substringFromIndex:kFont.length+1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *fontFileName = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; [fontArray addObject:fontName]; } else if ([[s lowercaseString] hasPrefix:[kKeyboard lowercaseString]]) { NSArray *vs = [s componentsSeparatedByString:@"\","]; NSString *keyboardName = [[[vs objectAtIndex:0] substringFromIndex:kKeyboard.length+1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; - NSString *keyboardFileName = [[vs objectAtIndex:1] stringByReplacingOccurrencesOfString:@"\"" withString:@""]; KMKeyboardInfoBuilder *builder = [[KMKeyboardInfoBuilder alloc] init]; builder.name = keyboardName; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h new file mode 100644 index 00000000000..846b9e11c67 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.h @@ -0,0 +1,32 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * KMSettingsRepository.h + * Keyman + * + * Created by Shawn Schantz on 2024-07-29. + * + */ + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface KMSettingsRepository : NSObject ++ (KMSettingsRepository *)shared; +- (BOOL)dataMigrationNeeded; +- (void)convertSettingsForMigration; +- (void)setDataModelVersionIfNecessary; +- (NSString *)readSelectedKeyboard; +- (void)writeSelectedKeyboard:(NSString *)selectedKeyboard; +- (NSArray *)readActiveKeyboards; +- (void)writeActiveKeyboards: (NSArray *) keyboards; +- (void)clearActiveKeyboards; +- (NSDictionary *)readOptionsForSelectedKeyboard; +- (void)writeOptionForSelectedKeyboard:(NSString *)key withValue:(NSString*)value; +- (BOOL)readShowOskOnActivate; +- (void)writeShowOskOnActivate:(BOOL)show; +- (BOOL)readForceSentryError; +@end + +NS_ASSUME_NONNULL_END diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m new file mode 100644 index 00000000000..120c26e2c41 --- /dev/null +++ b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m @@ -0,0 +1,334 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-07-29. + * + * Singleton object for reading and writing Keyman application settings. + * Serves as an abstraction to StandardUserDefaults which is currently used to store application settings. + */ + +#import "KMSettingsRepository.h" +#import "KMLogs.h" +#import "KMDataRepository.h" + +NSString *const kActiveKeyboardsKey = @"KMActiveKeyboardsKey"; +NSString *const kSelectedKeyboardKey = @"KMSelectedKeyboardKey"; +NSString *const kPersistedOptionsKey = @"KMPersistedOptionsKey"; +NSString *const kShowOskOnActivate = @"KMShowOskOnActivate"; +NSString *const kForceSentryError = @"KMForceSentryError"; + +/** + * The following constant "KMSavedStoresKey" is left here for documentation + * though we have abandoned stores written to UserDefaults with this key because + * they used a less-reliable numeric key prior to integration with Keyman Core. + * It is replaced by the renamed "KMPersistedOptionsKey" which directly + * represents what it is saving. + */ +NSString *const kKMDeprecatedPersistedOptionsKey = @"KMSavedStoresKey"; +/** + * The following constant "KMAlwaysShowOSKKey" is left here for documentation + * but the related UI has been removed according to issue #12342 + */ +NSString *const kAlwaysShowOSKKey = @"KMAlwaysShowOSKKey"; +/** + * The following constant "KMUseVerboseLogging" is left here for documentation + * but it is obsolete and removed issue #11525 + */ +NSString *const kUseVerboseLogging = @"KMUseVerboseLogging"; + +NSString *const kObsoletePathComponent = @"/Documents/Keyman-Keyboards"; +NSString *const kNewPathComponent = @"/Library/Application Support/keyman.inputmethod.Keyman/"; + +/** + * Store the version number of the data model in the UserDefaults with this key. + * The first version, 1, is defined to indicate that we are storing the data/keyboards in the Library + * directory instead of in the Documents directory. + */ +NSString *const kDataModelVersion = @"KMDataModelVersion"; +NSInteger const kVersionStoreDataInLibraryDirectory = 1; +NSInteger const kCurrentDataModelVersionNumber = kVersionStoreDataInLibraryDirectory; + +@implementation KMSettingsRepository + ++ (KMSettingsRepository *)shared +{ + static KMSettingsRepository *shared = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + shared = [[KMSettingsRepository alloc] init]; + }); + return shared; +} + +- (void)setDataModelVersionIfNecessary { + if (![self dataModelWithKeyboardsInLibrary]) { + [[NSUserDefaults standardUserDefaults] setInteger:kVersionStoreDataInLibraryDirectory forKey:kDataModelVersion]; + } +} + +/** + * If the selectedKeyboard has not been set, then the settings have not been saved in the UserDefaults. + * If this method is called after applicationDidFinishLaunching, then it will always return true. + * If called from awakeFromNib, then it will return false when running for the first time. + */ +- (BOOL)settingsExist +{ + return ([[NSUserDefaults standardUserDefaults] objectForKey:kSelectedKeyboardKey] != nil); +} + +- (void)writeOptionForSelectedKeyboard:(NSString *)key withValue:(NSString*)value { + NSDictionary *optionsMap = [self readOptionsForSelectedKeyboard]; + NSDictionary *newOptionsMap = nil; + + // if we can read an existing options map, then add the specified key-value pair + if (optionsMap != nil) { + NSMutableDictionary *mutableOptionsMap = [optionsMap mutableCopy]; + [mutableOptionsMap setObject:value forKey:key]; + newOptionsMap = mutableOptionsMap; + } else { + // if no options map exists, create a new one add the specified key-value pair + newOptionsMap = [[NSDictionary alloc] initWithObjectsAndKeys:value, key, nil]; + } + + // write the options map for the selected keyboard to the dictionary of options + NSString *selectedKeyboard = [self readSelectedKeyboard]; + os_log_info([KMLogs dataLog], "writeOptionForSelectedKeyboard, adding options map: %{public}@, to keyboard %{public}@", newOptionsMap, selectedKeyboard); + [self writeKeyboardOptionsMap: selectedKeyboard withOptions:newOptionsMap]; +} + +- (void)writeKeyboardOptionsMap:(NSString *)keyboardName withOptions:(NSDictionary*) optionsMap { + NSMutableDictionary *newFullOptionsMap = nil; + os_log_debug([KMLogs dataLog], "writeKeyboardOptionsMap, adding options map: %{public}@, to keyboard %{public}@", optionsMap, keyboardName); + + NSDictionary *fullOptionsMap = [self readFullOptionsMap]; + // if we can read the existing full options map, then add for the specified keyboard + if (fullOptionsMap != nil) { + newFullOptionsMap = [fullOptionsMap mutableCopy]; + [newFullOptionsMap setObject:optionsMap forKey:keyboardName]; + } else { + // otherwise, create the full options map and add for the specified keyboard + newFullOptionsMap = [[NSMutableDictionary alloc] initWithObjectsAndKeys:optionsMap, keyboardName, nil]; + } + + [self writeFullOptionsMap:newFullOptionsMap]; +} + +/** + * For the first numbered version of the data model, the app stores the keyboards under the ~/Library directory + * For versions before version 1, the keyboards were stored under the ~/Documents directory. + */ +- (BOOL)dataModelWithKeyboardsInLibrary { + // [NSUserDefaults integerForKey] returns zero if the key does not exist + NSInteger dataModelVersion = [[NSUserDefaults standardUserDefaults] integerForKey:kDataModelVersion]; + + return dataModelVersion >= kVersionStoreDataInLibraryDirectory; +} + +/** + * Determines whether the keyboard data needs to be moved from the old location to the new location + * This is true if + * 1) the UserDefaults exist (indicating that this is not a new installation of Keyman) and + * 2) the value for kVersionStoreDataInLibraryDirectory is < 1, + */ +- (BOOL)dataMigrationNeeded { + BOOL keymanSettingsExist = [self settingsExist]; + os_log([KMLogs dataLog], "keyman settings exist: %{public}@", keymanSettingsExist ? @"YES" : @"NO" ); + + BOOL keyboardsStoredInLibrary = [self dataModelWithKeyboardsInLibrary]; + os_log([KMLogs dataLog], "settings indicate that keyboards are stored in ~/Library: %{public}@", keyboardsStoredInLibrary ? @"YES" : @"NO" ); + + BOOL migrationNeeded = keymanSettingsExist && !keyboardsStoredInLibrary; + os_log([KMLogs dataLog], "dataMigrationNeeded: %{public}@", migrationNeeded ? @"YES" : @"NO" ); + + return migrationNeeded; +} + +- (NSString *)readSelectedKeyboard { + return [[NSUserDefaults standardUserDefaults] objectForKey:kSelectedKeyboardKey]; +} + +- (void)writeSelectedKeyboard:(NSString *)selectedKeyboard { + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + [userData setObject:selectedKeyboard forKey:kSelectedKeyboardKey]; +} + +- (NSMutableArray *)activeKeyboards { + NSMutableArray * activeKeyboards = [[[NSUserDefaults standardUserDefaults] arrayForKey:kActiveKeyboardsKey] mutableCopy]; + + if (!activeKeyboards) { + activeKeyboards = [[NSMutableArray alloc] initWithCapacity:0]; + } + return activeKeyboards; +} + +- (NSArray *)readActiveKeyboards { + os_log_debug([KMLogs dataLog], "KMSettingsRepository readActiveKeyboards"); + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + NSArray *keyboardsArray = [userData arrayForKey:kActiveKeyboardsKey]; + + // if the kActiveKeyboardsKey does not exist, then create an empty array + if (!keyboardsArray) { + os_log_debug([KMLogs dataLog], "KMActiveKeyboardsKey key not found in NSUserDefualts"); + keyboardsArray = [[NSArray alloc] init]; + } + return keyboardsArray; +} + +- (void)writeActiveKeyboards: (NSArray *) keyboards { + os_log_debug([KMLogs dataLog], "KMSettingsRepository writeActiveKeyboards"); + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + [userData setObject:keyboards forKey:kActiveKeyboardsKey]; +} + +- (void)clearActiveKeyboards { + os_log_debug([KMLogs dataLog], "KMSettingsRepository clearActiveKeyboards"); + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + [userData setObject:nil forKey:kActiveKeyboardsKey]; +} + + +/** + * returns dictionary of persisted options for the single selected keyboard + */ +- (NSDictionary *)readOptionsForSelectedKeyboard { + NSDictionary *optionsMap = [self readFullOptionsMap]; + NSString *selectedKeyboard = [self readSelectedKeyboard]; + NSDictionary *selectedOptionsMap = [optionsMap objectForKey: selectedKeyboard]; + if (selectedOptionsMap == nil) { + os_log_info([KMLogs dataLog], "no persisted options found in UserDefaults for keyboard %{public}@ ", selectedKeyboard); + } else { + for (NSString *key in selectedOptionsMap) { + NSString *value = [selectedOptionsMap objectForKey:key]; + os_log_info([KMLogs dataLog], "option for keyboard %{public}@ key: %{public}@, value %{public}@", selectedKeyboard, key, value); + } + } + return selectedOptionsMap; +} + +/** + * returns dictionary of all persisted options for all keyboards + * (options are stored in UserDefaults as a map of maps) + */ +- (NSDictionary *)readFullOptionsMap { + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + return [userData dictionaryForKey:kPersistedOptionsKey]; +} + +- (void)writeFullOptionsMap:(NSDictionary *) fullOptionsMap { + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + [userData setObject:fullOptionsMap forKey:kPersistedOptionsKey]; +} + +- (void)removeAllOptions { + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + return [userData removeObjectForKey:kPersistedOptionsKey]; +} + +- (void)convertSettingsForMigration { + os_log_debug([KMLogs dataLog], "converting settings in UserDefaults for migration"); + [self convertSelectedKeyboardPathForMigration]; + [self convertActiveKeyboardArrayForMigration]; + [self convertOptionsPathsForMigration]; +} + +- (void)convertSelectedKeyboardPathForMigration { + NSString *selectedKeyboardPath = [self readSelectedKeyboard]; + if (selectedKeyboardPath != nil) { + NSString *newPathString = [self trimObsoleteKeyboardPath:selectedKeyboardPath]; + + if ([selectedKeyboardPath isNotEqualTo:newPathString]) { + [self writeSelectedKeyboard:newPathString]; + os_log_debug([KMLogs dataLog], "converted selected keyboard setting from '%{public}@' to '%{public}@'", selectedKeyboardPath, newPathString); + } + } +} + +/** + * To convert the keyboard path for the new location, just trim the parent directory from the path + * No need to repeatedly store the parent directory with the path of each keyboard + * If the old directory is not found in the string, then return the string unchanged + */ +- (NSString *)trimObsoleteKeyboardPath:(NSString *)oldPath { + NSString *newPath = oldPath; + if(oldPath != nil) { + NSRange range = [oldPath rangeOfString:kObsoletePathComponent]; + if (range.length > 0) { + newPath = [oldPath substringFromIndex:range.location + range.length]; + os_log_debug([KMLogs dataLog], "trimmed keyboard path from '%{public}@' to '%{public}@'", oldPath, newPath); + } + } + return newPath; +} + +- (void)convertActiveKeyboardArrayForMigration { + NSMutableArray *keyboards = [self activeKeyboards]; + NSMutableArray *convertedActiveKeyboards = [[NSMutableArray alloc] initWithCapacity:0]; + BOOL didConvert = NO; + + for (NSString *oldPath in keyboards) { + NSString *newPath = [self trimObsoleteKeyboardPath:oldPath]; + if ([oldPath isNotEqualTo:newPath]) { + [convertedActiveKeyboards addObject:newPath]; + os_log_debug([KMLogs dataLog], "converted active keyboard from old path '%{public}@' to '%{public}@'", oldPath, newPath); + // if we have adjusted at least one path, set flag + didConvert = YES; + } else { + // if, somehow, the path does not need converting then retain it in new array + [convertedActiveKeyboards addObject:oldPath]; + } + } + + // only write array to UserDefaults if we actually converted something + if (didConvert) { + [self writeActiveKeyboards:convertedActiveKeyboards]; + } +} + +- (void)convertOptionsPathsForMigration { + NSDictionary * optionsMap = [self readFullOptionsMap]; + NSMutableDictionary *mutableOptionsMap = nil; + BOOL optionsChanged = NO; + + if (optionsMap != nil) { + os_log_info([KMLogs configLog], "optionsMap != nil"); + mutableOptionsMap = [[NSMutableDictionary alloc] initWithCapacity:0]; + for(id key in optionsMap) { + os_log_info([KMLogs configLog], "persisted options found in UserDefaults with key = %{public}@", key); + } + for (NSString *key in optionsMap) { + NSString *newPathString = [self trimObsoleteKeyboardPath:key]; + NSDictionary *optionsValue = [optionsMap objectForKey:key]; + + if ([key isNotEqualTo:newPathString]) { + optionsChanged = YES; + + // insert options into new map with newly converted path as key + [mutableOptionsMap setObject:optionsValue forKey:newPathString]; + os_log_debug([KMLogs dataLog], "converted option key from '%{public}@' to '%{public}@'", key, newPathString); + } else { + // retain options that did not need converting + [mutableOptionsMap setObject:optionsValue forKey:key]; + } + } + if (optionsChanged) { + [self writeFullOptionsMap:mutableOptionsMap]; + } + } +} + +- (BOOL)readShowOskOnActivate { + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + return [userData boolForKey:kShowOskOnActivate]; +} + +- (void)writeShowOskOnActivate:(BOOL)show { + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + [userData setBool:show forKey:kShowOskOnActivate]; +} + +- (BOOL)readForceSentryError { + NSUserDefaults *userData = [NSUserDefaults standardUserDefaults]; + return [userData boolForKey:kForceSentryError]; +} + +@end diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m b/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m index 417475c777d..dc73edc11bd 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/KeySender.m @@ -1,9 +1,6 @@ /** * Keyman is copyright (C) SIL International. MIT License. * - * KeySender.m - * Keyman - * * Created by Shawn Schantz on 2023-04-17. * * Sends keydown events for the provided keycode to the frontmost application. @@ -56,15 +53,13 @@ - (void)postKeyboardEventWithSource: (CGEventSourceRef)source code:(CGKeyCode) v } /** - sendKeymanKeyCodeForEvent sends the kKeymanEventKeyCode to the - frontmost application to indicate that all the backspaces have been processed - and we can insert the queuedText to the client + * sendKeymanKeyCodeForEvent sends the kKeymanEventKeyCode to the + * frontmost application to indicate that all the backspaces have been processed + * and we can insert the queuedText to the client */ - (void)sendKeymanKeyCodeForEvent:(NSEvent *)event { os_log_debug([KMLogs keyLog], "KeySender sendKeymanKeyCodeForEvent"); - - ProcessSerialNumber psn; // Returns the frontmost app, which is the app that receives key events. NSRunningApplication *app = NSWorkspace.sharedWorkspace.frontmostApplication; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.h b/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.h index 4b98f633b85..fd3a953a858 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.h +++ b/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.h @@ -9,7 +9,7 @@ #import #import -@interface OSKWindowController : NSWindowController +@interface OSKWindowController : NSWindowController @property (nonatomic, weak) IBOutlet OSKView *oskView; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.m index 30d30004c45..33d7eda4062 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.m @@ -8,6 +8,8 @@ #import "OSKWindowController.h" #import "KMInputMethodAppDelegate.h" +#import "KMInputMethodLifecycle.h" +#import "KMSettingsRepository.h" #import "KMLogs.h" @interface OSKWindowController () @@ -25,7 +27,6 @@ - (KMInputMethodAppDelegate *)AppDelegate { } - (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; [self stopTimer]; } @@ -55,7 +56,6 @@ - (void)awakeFromNib { - (void)windowDidLoad { os_log_debug([KMLogs oskLog], "OSKWindowController windowDidLoad"); [super windowDidLoad]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:self.window]; [self.oskView setKvk:[self.AppDelegate kvk]]; [self startTimerWithTimeInterval:0.1]; // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file. @@ -66,6 +66,11 @@ - (void)windowDidResize:(NSNotification *)notification { [self.oskView resizeOSKLayout]; } +- (void)windowWillClose:(NSNotification *)notification { + [KMSettingsRepository.shared writeShowOskOnActivate:NO]; + os_log_debug([KMLogs oskLog], "OSKWindowController windowWillClose, updating settings writeShowOsk to NO"); +} + - (void)helpAction:(id)sender { NSString *kvkPath = [self AppDelegate].kvk.filePath; if (!kvkPath) diff --git a/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.xib b/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.xib index 753a59365a9..b753e438028 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.xib +++ b/mac/Keyman4MacIM/Keyman4MacIM/OnScreenKeyboard/OSKWindowController.xib @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m b/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m index 057f401cbe4..89e63388523 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m +++ b/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyConsent.m @@ -1,4 +1,4 @@ -/** +/* * Keyman is copyright (C) SIL International. MIT License. * * PrivacyConsent.m @@ -7,8 +7,8 @@ * Created by Shawn Schantz on 2022-09-22. * * Used to determine if the user has provided consent to the services it needs - * and, if not, to request that consent. For versions of macOS prior to 10.15, - * Keyman requires Accessibility access. For 10.15 and later, Keyman requires + * and, if not, to request that consent. For versions of macOS prior to 11.0, + * Keyman requires Accessibility access. For 11.0 and later, Keyman requires * PostEvent access. Both are presented to the user as a need for Accessibility * when prompted by the system and are listed under Accessibility in the Privacy * tab in System Preferences, Security & Privacy. Both Accessibility and @@ -16,7 +16,11 @@ * that access is not explicitly needed as long as one of the others is provided * first. * - * Access this functionality through the shared instance. Call + * Note that Apple's documentation states that the PostEvent access APIs are + * available with macOS 10.15 (Catalina) but testing showed that it was only + * available with macOS 11.0 (Big Sur). This is documented with issue #12295. + * + * To access this functionality, used the shared instance. Call * requestPrivacyAccess which will check whether access has been granted. If * not, then a dialog will be presented to the user to inform them that * Accessibility is required. Dismissing this dialog will trigger the API call @@ -24,7 +28,7 @@ * only happen once. If the user was prompted earlier and did not grant access, * they can still go to System Preferences and enable it there. So it is useful * to prompt with a dialog from Keyman at startup. Without Accessibility, the - * shift layer and the OSK do not work -- so Keyman is basically useless. + * shift layer and the OSK do not work. */ #import "PrivacyConsent.h" @@ -43,7 +47,7 @@ + (PrivacyConsent *)shared } /** - * For macOS earlier than 10.15: check for Accessibility access. + * For macOS earlier than 11.0: check for Accessibility access. */ - (BOOL)checkAccessibility { @@ -66,7 +70,7 @@ - (void)requestPrivacyAccess:(void (^)(void))withCompletionHandler BOOL hasAccessibility = NO; // check if we already have accessibility - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { hasAccessibility = [self checkPostEventAccess]; } else { hasAccessibility = [self checkAccessibility]; @@ -85,7 +89,7 @@ - (void)requestPrivacyAccess:(void (^)(void))withCompletionHandler } /** - * For macOS earlier than 10.15: request Accessibility access. + * For macOS earlier than 11.0: request Accessibility access. */ - (void)requestAccessibility { @@ -113,18 +117,18 @@ - (NSWindowController *)privacyDialog { */ - (void)configureDialogForOsVersion { - if (@available(macOS 10.15, *)) { - [self configureDialogForCatalinaAndLater]; + if (@available(macOS 11.0, *)) { + [self configureDialogForBigSurAndLater]; } else { - [self configureDialogForPreCatalina]; + [self configureDialogForPreBigSur]; } } /** - * Initialize privacy dialog for macOS versions prior to Catalina (10.15). + * Initialize privacy dialog for macOS versions prior to Big Sur (11.0). * In this case, request Accessibility access, not PostEvent. */ -- (void)configureDialogForPreCatalina { +- (void)configureDialogForPreBigSur { void (^consentPrompt)(void) = ^(void) { [self requestAccessibility]; @@ -136,10 +140,10 @@ - (void)configureDialogForPreCatalina { } /** - * Initialize privacy dialog for macOS versions of Catalina (10.15) or later. + * Initialize privacy dialog for macOS versions of Big Sur (11.0) or later. * In this case, request PostEvent access, not Accessibility. */ -- (void)configureDialogForCatalinaAndLater { +- (void)configureDialogForBigSurAndLater { void (^consentPrompt)(void) = ^(void) { [self requestPostEventAccess]; @@ -160,7 +164,7 @@ - (void)showPrivacyDialog { /** * Check whether the user has allowed ListenEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. * * If user has granted Accessibility or PostEvent access, then * ListenEvent access is also granted. @@ -170,18 +174,18 @@ - (BOOL)checkListenEventAccess BOOL hasAccess = NO; // below checks for ListenEvent access - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { hasAccess = CGPreflightListenEventAccess(); os_log([KMLogs privacyLog], "CGPreflightListenEventAccess() returned %@", hasAccess ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGPreflightListenEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGPreflightListenEventAccess not available before macOS version 11.0"); } return hasAccess; } /** * Check whether the user has allowed PostEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. * * If user has granted Accessibility, then PostEvent access is also granted. */ @@ -190,46 +194,46 @@ - (BOOL)checkPostEventAccess BOOL hasAccess = NO; // below checks for PostEvent access - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { hasAccess = CGPreflightPostEventAccess(); os_log([KMLogs privacyLog], "CGPreflightPostEventAccess() returned %@", hasAccess ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGPreflightPostEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGPreflightPostEventAccess not available before macOS version 11.0"); } return hasAccess; } /** * Request ListenEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. */ - (BOOL)requestListenEventAccess { BOOL granted = NO; - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { granted = CGRequestListenEventAccess(); os_log([KMLogs privacyLog], "CGRequestListenEventAccess() returned %@", granted ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGRequestListenEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGRequestListenEventAccess not available before macOS version 11.0"); } return granted; } /** * Request PostEvent access. - * Only available with macOS Catalina (10.15) or later. + * Only available with macOS Big Sur (11.0) or later. */ - (BOOL)requestPostEventAccess { BOOL granted = NO; - if (@available(macOS 10.15, *)) { + if (@available(macOS 11.0, *)) { granted = CGRequestPostEventAccess(); os_log([KMLogs privacyLog], "CGRequestPostEventAccess() returned %@", granted ? @"YES" : @"NO"); } else { - os_log([KMLogs privacyLog], "CGRequestPostEventAccess not available before macOS version 10.15"); + os_log([KMLogs privacyLog], "CGRequestPostEventAccess not available before macOS version 11.0"); } return granted; } diff --git a/mac/Keyman4MacIM/Keyman4MacIM/cs.lproj/Localizable.strings b/mac/Keyman4MacIM/Keyman4MacIM/cs.lproj/Localizable.strings index f192a323683..31b54577b28 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/cs.lproj/Localizable.strings +++ b/mac/Keyman4MacIM/Keyman4MacIM/cs.lproj/Localizable.strings @@ -26,10 +26,10 @@ "message-keyboard-file-unreadable" = "Nelze číst soubor Keymana '%@'."; /* Message displayed in Configuration window when keyboard cannot be loaded */ -"message-error-loading-keyboard" = "(error loading keyboard)"; +"message-error-loading-keyboard" = "(chyba při načítání klávesnice)"; /* Message displayed in Configuration window when keyboard metadata cannot be loaded */ -"message-error-unknown-metadata" = "unknown"; +"message-error-unknown-metadata" = "neznámé"; /* Button text to acknowledge that .kmp file could not be read */ "button-keyboard-file-unreadable" = "OK"; @@ -50,22 +50,25 @@ "button-download-complete" = "Hotovo"; /* keyboards label in the Package Information window */ -"keyboards-label" = "Keyboards:"; +"keyboards-label" = "Klávesnice:"; /* fonts label in the Package Information window */ -"fonts-label" = "Fonts:"; +"fonts-label" = "Písma:"; /* package version label in the Package Information window */ -"package-version-label" = "Package Version:"; +"package-version-label" = "Verze balíčku:"; /* author label in the Package Information window */ -"author-label" = "Author:"; +"author-label" = "Autor:"; /* website label in the Package Information window */ -"website-label" = "Website:"; +"website-label" = "Webová stránka:"; /* copyright label in the Package Information window */ -"copyright-label" = "Copyright:"; +"copyright-label" = "Autorská práva:"; /* message displayed to alert user to need grant accessibility permission */ -"privacy-alert-text" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Preferences, Security & Privacy.\nRestart your system."; +"privacy-alert-text" = "Ke správné funkci vyžaduje Keyman zpřístupnění:\n\nPovolte přístup v Předvolbách systému, Zabezpečení a soukromí.\nRestartujte systém."; + +/* Text of menu item in Input Menu when no Keyboards are configured -- include parentheses */ +"no-keyboard-configured-menu-placeholder" = "(Žádná klávesnice nenastavena)"; diff --git a/mac/Keyman4MacIM/Keyman4MacIM/it.lproj/Localizable.strings b/mac/Keyman4MacIM/Keyman4MacIM/it.lproj/Localizable.strings index adb2ea787e8..f1264dd4030 100644 --- a/mac/Keyman4MacIM/Keyman4MacIM/it.lproj/Localizable.strings +++ b/mac/Keyman4MacIM/Keyman4MacIM/it.lproj/Localizable.strings @@ -26,10 +26,10 @@ "message-keyboard-file-unreadable" = "Impossibile leggere il file Keyman «%@»."; /* Message displayed in Configuration window when keyboard cannot be loaded */ -"message-error-loading-keyboard" = "(error loading keyboard)"; +"message-error-loading-keyboard" = "(errore caricamento tastiera)"; /* Message displayed in Configuration window when keyboard metadata cannot be loaded */ -"message-error-unknown-metadata" = "unknown"; +"message-error-unknown-metadata" = "sconosciuto"; /* Button text to acknowledge that .kmp file could not be read */ "button-keyboard-file-unreadable" = "OK"; @@ -50,22 +50,25 @@ "button-download-complete" = "Fatto"; /* keyboards label in the Package Information window */ -"keyboards-label" = "Keyboards:"; +"keyboards-label" = "Tastiere:"; /* fonts label in the Package Information window */ -"fonts-label" = "Fonts:"; +"fonts-label" = "Caratteri:"; /* package version label in the Package Information window */ -"package-version-label" = "Package Version:"; +"package-version-label" = "Versione pacchetto:"; /* author label in the Package Information window */ -"author-label" = "Author:"; +"author-label" = "Autore:"; /* website label in the Package Information window */ -"website-label" = "Website:"; +"website-label" = "Sito web:"; /* copyright label in the Package Information window */ "copyright-label" = "Copyright:"; /* message displayed to alert user to need grant accessibility permission */ -"privacy-alert-text" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Preferences, Security & Privacy.\nRestart your system."; +"privacy-alert-text" = "Per funzionare correttamente, Keyman richiede funzionalità di accessibilità:\n\nConsenti l'accesso nelle preferenze di sistema, Sicurezza e Privacy.\nRiavvia il sistema."; + +/* Text of menu item in Input Menu when no Keyboards are configured -- include parentheses */ +"no-keyboard-configured-menu-placeholder" = "(Nessuna tastiera configurata)"; diff --git a/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m b/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m index 7372a2a5486..45e5e9855ae 100644 --- a/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m +++ b/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m @@ -13,6 +13,9 @@ #import "KMInputMethodEventHandler.h" #import "AppleCompliantTestClient.h" #import "TextApiCompliance.h" +#import "KMSettingsRepository.h" +#import "KMDataRepository.h" +#import KMInputMethodEventHandler *testEventHandler = nil; id testClient = nil; diff --git a/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.h b/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.h index fafd6f19057..437f19c01d1 100644 --- a/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.h +++ b/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.h @@ -21,8 +21,6 @@ typedef void(^PostEventCallback)(CGEventRef eventToPost); @property (nonatomic, strong) NSMutableString *contextBuffer; @property (nonatomic, assign) CFMachPortRef lowLevelEventTap; // Always nil for tests @property (nonatomic, assign) BOOL contextChangingEventDetected; -@property (nonatomic, assign) BOOL useNullChar; -@property (nonatomic, assign) BOOL debugMode; @property (nonatomic, assign) CGKeyCode virtualKeyPosted; // Helper method diff --git a/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.m b/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.m index 4b247056af2..c2078c95ea0 100644 --- a/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.m +++ b/mac/Keyman4MacIM/KeymanTests/TestAppDelegate.m @@ -16,7 +16,7 @@ @implementation TestAppDelegate - (KMEngine *)kme { if (_kme == nil) { - _kme = [[KMEngine alloc] initWithKMX:nil context:self.contextBuffer verboseLogging:self.debugMode]; + _kme = [[KMEngine alloc] initWithKMX:nil context:self.contextBuffer]; } return _kme; @@ -24,7 +24,7 @@ - (KMEngine *)kme { - (void)setKmx:(KMXFile *)kmx { _kmx = kmx; - [self.kme setKmx:_kmx]; + [self.kme loadKeyboardFromKmxFile:_kmx]; } - (NSMutableString *)contextBuffer { @@ -42,10 +42,6 @@ - (void)setContextBuffer:(NSMutableString *)contextBuffer { [self.kme setCoreContextIfNeeded:self.contextBuffer]; } -- (BOOL)debugMode { - return YES; -} - -(NSEvent *)keyStrokeEventForCharacter:(NSString *)character keyCode:(unsigned short) keyCode { return [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSZeroPoint modifierFlags:0 timestamp:NSTimeIntervalSince1970 windowNumber:0 context:nil characters:character charactersIgnoringModifiers:character isARepeat:NO keyCode:keyCode]; } diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac.xcodeproj/project.pbxproj b/mac/KeymanEngine4Mac/KeymanEngine4Mac.xcodeproj/project.pbxproj index 658891c0c6f..f87288a9538 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac.xcodeproj/project.pbxproj +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac.xcodeproj/project.pbxproj @@ -25,6 +25,10 @@ 29A658C82AF394560038DCFE /* armenian_mnemonic.kmx in Resources */ = {isa = PBXBuildFile; fileRef = 29A658C72AF394560038DCFE /* armenian_mnemonic.kmx */; }; 29B4A0D82BFAE8A400682049 /* KMELogs.h in Headers */ = {isa = PBXBuildFile; fileRef = 29B4A0D62BFAE8A400682049 /* KMELogs.h */; }; 29B4A0D92BFAE8A400682049 /* KMELogs.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B4A0D72BFAE8A400682049 /* KMELogs.m */; }; + 29BE6F042C9D700B00635B1A /* CoreKey.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BE6F032C9D700B00635B1A /* CoreKey.m */; }; + 29CBB2C62CA137A50097556B /* CoreKey.h in Headers */ = {isa = PBXBuildFile; fileRef = 29BE6F022C9D700B00635B1A /* CoreKey.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 29E50EB02CA121BA00B59959 /* CoreKeyboardInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 29E50EAF2CA121BA00B59959 /* CoreKeyboardInfo.m */; }; + 29E50EB12CA121BA00B59959 /* CoreKeyboardInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 29E50EAE2CA121BA00B59959 /* CoreKeyboardInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 378568D122FCCF0A00B481B5 /* sil_ipa.kmx in Resources */ = {isa = PBXBuildFile; fileRef = 378568D022FCCF0A00B481B5 /* sil_ipa.kmx */; }; 378568D322FCD93300B481B5 /* indexoffset1892.kmx in Resources */ = {isa = PBXBuildFile; fileRef = 378568D222FCD93300B481B5 /* indexoffset1892.kmx */; }; 980053351B37C9B50088DDDD /* NFont.h in Headers */ = {isa = PBXBuildFile; fileRef = 980053311B37C9B50088DDDD /* NFont.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -101,6 +105,10 @@ 29A658C72AF394560038DCFE /* armenian_mnemonic.kmx */ = {isa = PBXFileReference; lastKnownFileType = file; path = armenian_mnemonic.kmx; sourceTree = ""; }; 29B4A0D62BFAE8A400682049 /* KMELogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMELogs.h; sourceTree = ""; }; 29B4A0D72BFAE8A400682049 /* KMELogs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMELogs.m; sourceTree = ""; }; + 29BE6F022C9D700B00635B1A /* CoreKey.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreKey.h; sourceTree = ""; }; + 29BE6F032C9D700B00635B1A /* CoreKey.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CoreKey.m; sourceTree = ""; }; + 29E50EAE2CA121BA00B59959 /* CoreKeyboardInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreKeyboardInfo.h; sourceTree = ""; }; + 29E50EAF2CA121BA00B59959 /* CoreKeyboardInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CoreKeyboardInfo.m; sourceTree = ""; }; 378568D022FCCF0A00B481B5 /* sil_ipa.kmx */ = {isa = PBXFileReference; lastKnownFileType = file; path = sil_ipa.kmx; sourceTree = ""; }; 378568D222FCD93300B481B5 /* indexoffset1892.kmx */ = {isa = PBXFileReference; lastKnownFileType = file; path = indexoffset1892.kmx; sourceTree = ""; }; 980053311B37C9B50088DDDD /* NFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFont.h; sourceTree = ""; }; @@ -178,6 +186,10 @@ children = ( 2993C32B29B1D92E00FB5E95 /* CoreHelper.h */, 2993C32529B1D92E00FB5E95 /* CoreHelper.m */, + 29E50EAE2CA121BA00B59959 /* CoreKeyboardInfo.h */, + 29E50EAF2CA121BA00B59959 /* CoreKeyboardInfo.m */, + 29BE6F022C9D700B00635B1A /* CoreKey.h */, + 29BE6F032C9D700B00635B1A /* CoreKey.m */, 2993C32829B1D92E00FB5E95 /* CoreWrapper.h */, 2993C32429B1D92E00FB5E95 /* CoreWrapper.m */, 2993C32A29B1D92E00FB5E95 /* CoreAction.h */, @@ -345,7 +357,9 @@ 980053351B37C9B50088DDDD /* NFont.h in Headers */, 9818807B1BC1EE9700A1FBA5 /* TimerTarget.h in Headers */, E28C71E520EBBA2D002D959D /* KMkeyViewProtocol.h in Headers */, + 29CBB2C62CA137A50097556B /* CoreKey.h in Headers */, 984C2B191A79CB020023F89D /* WindowsVKCodes.h in Headers */, + 29E50EB12CA121BA00B59959 /* CoreKeyboardInfo.h in Headers */, 984C2B0C1A79CA4F0023F89D /* KMCompGroup.h in Headers */, 984C2B101A79CA4F0023F89D /* KMCompStore.h in Headers */, 984C2B0E1A79CA4F0023F89D /* KMCompKey.h in Headers */, @@ -517,6 +531,7 @@ 29A1971F2AF091E600512A37 /* CoreKeyOutput.m in Sources */, 981880741BC1EA5800A1FBA5 /* KeyView.m in Sources */, 981880761BC1EA5800A1FBA5 /* OSKKey.m in Sources */, + 29BE6F042C9D700B00635B1A /* CoreKey.m in Sources */, 2993C32F29B1D92E00FB5E95 /* CoreHelper.m in Sources */, 984C2B0D1A79CA4F0023F89D /* KMCompGroup.m in Sources */, 984C2B111A79CA4F0023F89D /* KMCompStore.m in Sources */, @@ -524,6 +539,7 @@ 984C2B151A79CA4F0023F89D /* KMXFile.m in Sources */, 980053361B37C9B50088DDDD /* NFont.m in Sources */, 984C2B071A79CA4F0023F89D /* NSString+XString.m in Sources */, + 29E50EB02CA121BA00B59959 /* CoreKeyboardInfo.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.h b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.h index 0345ea6f31e..ba3e5031f3d 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.h +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.h @@ -16,13 +16,10 @@ extern UInt32 VirtualKeyMap[0x80]; @interface CoreHelper : NSObject -@property (assign, nonatomic) BOOL debugMode; - -(unichar const *) createUnicharStringFromNSString:(NSString *)string; -(NSString *) createNSStringFromUnicharString:(unichar const *)string; -(unsigned long long) unicharStringLength:(unichar const *)string; --(instancetype)initWithDebugMode:(BOOL)debugMode; -(unsigned short) macVirtualKeyToWindowsVirtualKey:(unsigned short) keyCode; -(UTF32Char)macToKeymanModifier:(NSEventModifierFlags)modifiers; -(NSString*)utf32ValueToString:(UTF32Char)scalarValue; diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m index 46ddbdeeb14..c7858e7b0d9 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m @@ -69,10 +69,9 @@ -(unsigned long) scalarValueStringLength:(UTF32Char const *)string { return length; } --(instancetype)initWithDebugMode:(BOOL)debugMode { +-(instancetype)init { self = [super init]; if (self) { - _debugMode = debugMode; [self initVirtualKeyMapping]; } return self; diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKey.h b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKey.h new file mode 100644 index 00000000000..7e11c222054 --- /dev/null +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKey.h @@ -0,0 +1,20 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-20. + */ + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface CoreKey : NSObject +@property (nonatomic, readonly) NSUInteger keyCode; +@property (nonatomic, readonly) NSUInteger keyModifiers; +-(instancetype)init:(NSUInteger)code modifiers:(NSUInteger)modifiers; +-(BOOL)hasLeftAlt; +-(BOOL)hasRightAlt; +-(BOOL)hasAlt; +@end + +NS_ASSUME_NONNULL_END diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKey.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKey.m new file mode 100644 index 00000000000..c2b0d8017a9 --- /dev/null +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKey.m @@ -0,0 +1,45 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-20. + * + * A value object to represent a keycode and modifier pair. + * This corresponds to the km_core_keyboard_key struct returned by Core. + */ + +#import "CoreKey.h" +#import "keyman_core_api_vkeys.h" +#import "KMELogs.h" + +@implementation CoreKey +-(instancetype)init:(NSUInteger)code modifiers:(NSUInteger)modifiers { + self = [super init]; + if (self) { + _keyCode = code; + _keyModifiers = modifiers; + } + return self; +} + +-(BOOL)hasLeftAlt { + int result = (self.keyModifiers & KM_CORE_MODIFIER_LALT); + //os_log_info([KMELogs coreLog], "hasLeftAlt, keyModifiers: 0x%lX KM_CORE_MODIFIER_LALT: 0x%X (keyModifiers & KM_CORE_MODIFIER_LALT): 0x%X", (unsigned long)self.keyModifiers, KM_CORE_MODIFIER_LALT, result); + return (result == KM_CORE_MODIFIER_LALT); +} + +-(BOOL)hasRightAlt { + return ((self.keyModifiers & KM_CORE_MODIFIER_RALT) == KM_CORE_MODIFIER_RALT); +} + +-(BOOL)hasAlt { + return ((self.keyModifiers & KM_CORE_MODIFIER_ALT) == KM_CORE_MODIFIER_ALT); +} + +- (NSString *)description { + NSString *format = @"<%@: %p, keyCode: %d keyModifiers: 0x%X hasLeftAlt: %d hasRightAlt: %d hasAlt: %d>"; + NSString *str = [NSString stringWithFormat:format, + self.className, self, self.keyCode, self.keyModifiers, self.hasLeftAlt, self.hasRightAlt, self.hasAlt]; + return str; +} + +@end diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKeyboardInfo.h b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKeyboardInfo.h new file mode 100644 index 00000000000..59d81f69cf5 --- /dev/null +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKeyboardInfo.h @@ -0,0 +1,21 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-23. + * + */ + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface CoreKeyboardInfo : NSObject +@property (nonatomic, readonly) NSArray *keyArray; +@property (nonatomic, readonly) NSString *keyboardId; +@property (readonly) BOOL containsAlt; +@property (readonly) BOOL containsLeftAlt; +@property (readonly) BOOL containsRightAlt; +-(instancetype)init:(NSString*)id keyArray:(NSArray*) keys; +@end + +NS_ASSUME_NONNULL_END diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKeyboardInfo.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKeyboardInfo.m new file mode 100644 index 00000000000..6deb33d2d58 --- /dev/null +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreKeyboardInfo.m @@ -0,0 +1,49 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Created by Shawn Schantz on 2024-09-23. + * + * A class to contain the information about the Keyman Keyboard + * provided by calling km_core_keyboard_get_key_list. + */ + +#import "CoreKeyboardInfo.h" +#import "CoreKey.h" + +@implementation CoreKeyboardInfo +-(instancetype)init:(NSString*)id keyArray:(NSArray*) keys { + self = [super init]; + if (self) { + _keyboardId = id; + _keyArray = keys; + _containsAlt = false; + _containsLeftAlt = false; + _containsRightAlt = false; + [self checkModifiers]; + } + return self; +} + +/** + * loop through the entire key list and track whether any keys have the specified modifiers + */ +-(void)checkModifiers { + for (CoreKey *key in _keyArray) { + if (key.hasRightAlt) { + _containsRightAlt = true; + } else if (key.hasLeftAlt) { + _containsLeftAlt = true; + } else if (key.hasAlt) { + _containsAlt = true; + } + } +} + +- (NSString *)description { + NSString *format = @"<%@: %p, keyboardId: %@ key count: %d containsAlt: %d containsLeftAlt: %d containsRightAlt: %d>"; + NSString *str = [NSString stringWithFormat:format, + self.className, self, self.keyboardId, self.keyArray.count, self.containsAlt, self.containsLeftAlt, self.containsRightAlt]; + return str; +} + +@end diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.h b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.h index 1109b1130fd..39e17b11ab1 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.h +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.h @@ -1,9 +1,6 @@ -/** +/* * Keyman is copyright (C) SIL International. MIT License. * - * CoreWrapper.h - * Keyman - * * Created by Shawn Schantz on 2022-12-12. */ @@ -12,6 +9,8 @@ #import "CoreHelper.h" #import "CoreAction.h" #import "CoreKeyOutput.h" +#import "CoreKeyboardInfo.h" +#import "CoreKey.h" NS_ASSUME_NONNULL_BEGIN @@ -23,6 +22,7 @@ NS_ASSUME_NONNULL_BEGIN -(instancetype)initWithHelper:(CoreHelper*)helper kmxFilePath:(nullable NSString*)path; -(BOOL)setOptionsForCore: (NSString *) key value:(NSString *) value; -(void)changeKeyboardWithKmxFilePath:(NSString*)path; +-(CoreKeyboardInfo*) getKeyboardInfoForKmxFile:(NSString*)kmxFile; -(CoreKeyOutput*)processEvent:(nonnull NSEvent *)event; -(CoreKeyOutput*)processMacVirtualKey:(unsigned short)macKeyCode withModifiers:(NSEventModifierFlags)modifierState diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.m index 44c82e5b7b8..c1cd9b81f85 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreWrapper.m @@ -1,9 +1,6 @@ -/** +/* * Keyman is copyright (C) SIL International. MIT License. * - * CoreWrapper.m - * Keyman - * * Created by Shawn Schantz on 2022-12-12. * * A class to wrap an instance of a Keyman Core keyboard (a km_core_keyboard @@ -67,6 +64,40 @@ -(void)changeKeyboardWithKmxFilePath:(NSString*) path { } } +-(CoreKeyboardInfo*) getKeyboardInfoForKmxFile:(NSString*)kmxFile { + NSArray *keyArray = [self getKeyArray]; + CoreKeyboardInfo* info = [[CoreKeyboardInfo alloc] init:kmxFile keyArray: keyArray]; + return info; +} + +/** + * Get the list of Keys supported by the keyboard + */ +-(NSArray*)getKeyArray { + NSMutableArray *keyArray = [[NSMutableArray alloc] initWithCapacity:0]; + km_core_keyboard_key *keyList; + + km_core_status result = km_core_keyboard_get_key_list(self.coreKeyboard, &keyList); + + for(km_core_keyboard_key* keyPtr = keyList; (keyPtr->key) != 0; keyPtr++) { + uint16_t key = keyPtr->key; + uint32_t modifier_flag = keyPtr->modifier_flag; + + if(key != 0) { + CoreKey* coreKey = [[CoreKey alloc] init: key modifiers: modifier_flag]; + [keyArray addObject:coreKey]; + + //os_log_debug([KMELogs coreLog], "key %d modifiers 0x%X coreKey %{public}@", key, modifier_flag, coreKey); + } + } + + km_core_keyboard_key_list_dispose(keyList); + + os_log_debug([KMELogs coreLog], "getKeyList returning %lu keys", (unsigned long)keyArray.count); + + return keyArray; +} + -(void) dealloc{ if (self.coreState) { km_core_state_dispose(self.coreState); @@ -74,7 +105,7 @@ -(void) dealloc{ if (self.coreKeyboard) { km_core_keyboard_dispose(self.coreKeyboard); } - os_log_debug([KMELogs coreLog], "dealloc called."); + os_log_debug([KMELogs coreLog], "CoreWrapper dealloc called"); } -(void)loadKeyboardUsingCore:(NSString*) path { diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.h b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.h index c79b02ba32b..d1581f55e0b 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.h +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.h @@ -12,22 +12,22 @@ #import #import "KMXFile.h" #import "CoreKeyOutput.h" +#import "CoreKeyboardInfo.h" //#define USE_ALERT_SHOW_HELP_TO_FORCE_EASTER_EGG_CRASH_FROM_ENGINE @interface KMEngine : NSObject @property (weak, nonatomic) KMXFile *kmx; -@property (assign, nonatomic) BOOL debugMode; -- (id)initWithKMX:(KMXFile *)kmx context:(NSString *)ctxBuf verboseLogging:(BOOL)enableDebugLogging; +- (id)initWithKMX:(KMXFile *)kmx context:(NSString *)ctxBuf; +- (CoreKeyboardInfo*)loadKeyboardFromKmxFile:(KMXFile*) kmxFile; - (NSString *)getCoreContextDebug; - (void)clearCoreContext; - (void)setCoreContextIfNeeded:(NSString *)context; - (void)setCoreOptions:(NSString *)key withValue:(NSString *)value; - (CoreKeyOutput *)processEvent:(NSEvent *)event; -- (void)setUseVerboseLogging:(BOOL)useVerboseLogging; @end diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m index dd2b3247ede..080c7023c3e 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m @@ -25,16 +25,11 @@ @interface KMEngine () @implementation KMEngine -NSMutableString* _easterEggForSentry = nil; -const NSString* kEasterEggText = @"Sentrycrash#KME"; -const NSString* kEasterEggKmxName = @"EnglishSpanish.kmx"; - -- (id)initWithKMX:(KMXFile *)kmx context:(NSString *)contextString verboseLogging:(BOOL)enableDebugLogging { +- (id)initWithKMX:(KMXFile *)kmx context:(NSString *)contextString { self = [super init]; if (self) { - self.debugMode = enableDebugLogging; _kmx = kmx; - _coreHelper = [[CoreHelper alloc] initWithDebugMode:enableDebugLogging]; + _coreHelper = [[CoreHelper alloc] init]; if (kmx) { [self loadCoreWrapperFromKmxFile:self.kmx.filePath]; @@ -63,29 +58,15 @@ -(void)setKmx:(KMXFile*) kmxFile { } } -- (void)setUseVerboseLogging:(BOOL)useVerboseLogging { - self.debugMode = useVerboseLogging; - - if (self.coreHelper) { - self.coreHelper.debugMode = useVerboseLogging; - } - - if (useVerboseLogging) { - os_log_debug([KMELogs testLog], "KMEngine - Turning verbose logging on"); - // In Keyman Engine if "debugMode" is turned on (explicitly) with "English plus Spanish" as the current keyboard and you type "Sentrycrash#KME", - // it will force a simulated crash to test reporting to sentry.keyman.com. - NSString * kmxName = [[_kmx filePath] lastPathComponent]; - os_log_debug([KMELogs testLog], "Sentry - KME: _kmx name = %{public}@", kmxName); - if ([kEasterEggKmxName isEqualToString:kmxName]) { - os_log_debug([KMELogs testLog], "Sentry - KME: Preparing to detect Easter egg."); - _easterEggForSentry = [[NSMutableString alloc] init]; - } - else - _easterEggForSentry = nil; - } - else { - os_log_debug([KMELogs testLog], "KMEngine - Turning verbose logging off"); - } +-(CoreKeyboardInfo*)loadKeyboardFromKmxFile:(KMXFile*) kmxFile { + [self setKmx:kmxFile]; + + // os_log_debug([KMELogs coreLog], "loadKeyboardFromKmxFile, keyList: %{public}@", keyList); + + CoreKeyboardInfo *info = [_coreWrapper getKeyboardInfoForKmxFile:kmxFile.filePath]; + os_log_debug([KMELogs coreLog], "loadKeyboardFromKmxFile, keyboardInfo: %{public}@", info); + + return info; } - (NSString *)getCoreContextDebug { @@ -115,43 +96,6 @@ - (CoreKeyOutput *)processEvent:(NSEvent *)event { return [self.coreWrapper processEvent:event]; } -- (void) processPossibleEasterEggCharacterFrom:(NSString *)characters { - NSUInteger len = [_easterEggForSentry length]; - os_log_debug([KMELogs keyLog], "Sentry - KME: Processing character(s): %{public}@", characters); - if ([characters length] == 1 && [characters characterAtIndex:0] == [kEasterEggText characterAtIndex:len]) { - NSString *characterToAdd = [kEasterEggText substringWithRange:NSMakeRange(len, 1)]; - os_log_debug([KMELogs keyLog], "Sentry - KME: Adding character to Easter Egg code string: %{public}@", characterToAdd); - [_easterEggForSentry appendString:characterToAdd]; - if ([kEasterEggText isEqualToString:_easterEggForSentry]) { - os_log_debug([KMELogs keyLog], "Sentry - KME: Forcing crash now!"); - // Both of the following approaches do throw an exception that causes control to exit this method, - // but at least in my debug builds locally, neither one seems to get picked up by Sentry in a - // way that results in a new report on sentry.keyman.com - -#ifndef USE_ALERT_SHOW_HELP_TO_FORCE_EASTER_EGG_CRASH_FROM_ENGINE - //#1 - @throw ([NSException exceptionWithName:@"SentryForce" reason:@"Easter egg hit" userInfo:nil]); - - //#2 - // NSDecimalNumber *i = [NSDecimalNumber decimalNumberWithDecimal:[@(1) decimalValue]]; - // NSDecimalNumber *o = [NSDecimalNumber decimalNumberWithDecimal:[@(0) decimalValue]]; - // // Divide by 0 to throw an exception - // NSDecimalNumber *x = [i decimalNumberByDividingBy:o]; - -#else - //#3 The following DOES work, but it's really lame because the crash actually gets forced in the IM - // via this bogus call to a protocol method implemented in the IM's App Delegate just for the - // purpose of enabling the engine to force a crash. - [(NSObject *)[NSApp delegate] alertShowHelp:[NSAlert alertWithMessageText:@"Forcing an error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"Forcing an Easter egg error from KME!"]]; -#endif - } - } - else if (len > 0) { - os_log_debug([KMELogs keyLog], "Sentry - KME: Clearing Easter Egg code string."); - [_easterEggForSentry setString:@""]; - } -} - - (NSString *)getCharsFromKeyCode:(UInt16)keyCode { TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardLayoutInputSource(); CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData); diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/NKey.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/NKey.m index f9ed1977b2e..90f842fd5f3 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/NKey.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/NKey.m @@ -20,8 +20,8 @@ - (id)init { } - (NSString *)description { - NSString *format = @"<%@:%p F:%d S:%d VK:%d TXT:%@ BMP:%@>"; - NSString *str = [NSString stringWithFormat:format, self.className, self, self.flags, self.shift, self.vkey, self.text, self.bitmap]; + NSString *format = @"<%@:%p flags:%d shift:%d virtualkey:%d text:%@ utf8:%@ bmp:%@>"; + NSString *str = [NSString stringWithFormat:format, self.className, self, self.flags, self.shift, self.vkey, self.text, [self.text dataUsingEncoding:NSUTF8StringEncoding], self.bitmap]; return str; } diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m index c1dfa75a87a..b2d6429e786 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/KeyView.m @@ -41,7 +41,10 @@ @implementation KeyView - (id)initWithFrame:(NSRect)frame { self = [super initWithFrame:frame]; if (self) { - os_log_debug([KMELogs oskLog], "KeyView initWithFrame: %{public}@, bounds: %{public}@, default clipsToBounds %{public}@", NSStringFromRect(frame), NSStringFromRect(self.bounds), self.clipsToBounds?@"YES":@"NO"); + /* + // usually too much logging, uncomment for debugging + os_log_debug([KMELogs oskLog], "KeyView initWithFrame: %{public}@, bounds: %{public}@, default clipsToBounds %{public}@", NSStringFromRect(frame), NSStringFromRect(self.bounds), self.clipsToBounds?@"YES":@"NO"); + */ self.clipsToBounds = true; CGSize size = frame.size; CGFloat x = size.width*0.05; @@ -69,8 +72,17 @@ - (id)initWithFrame:(NSRect)frame { return self; } +- (NSString *)description { + NSString *format = @""; + NSString *str = [NSString stringWithFormat:format, _keyCode, _hasKeyCaption, _isModifierKey, _isSpecialKey, _isCharacterKey, _label.stringValue, _caption.stringValue]; + return str; +} + - (void)drawRect:(NSRect)rect { + /* + // usually too much logging, uncomment for debugging os_log_debug([KMELogs uiLog], "KeyView drawRect: %{public}@, bounds: %{public}@, keyCode: 0x%lx, caption: %{public}@, label: %{public}@", NSStringFromRect(rect), NSStringFromRect(self.bounds), self.keyCode, self.caption.stringValue, self.label.stringValue); + */ [[self getOpaqueColorWithRed:241 green:242 blue:242] setFill]; NSRectFillUsingOperation(rect, NSCompositingOperationSourceOver); diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m index d81097d3e2f..b1144a17fa9 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKKey.m @@ -14,7 +14,10 @@ @implementation OSKKey - (id)initWithKeyCode:(NSUInteger)keyCode caption:(NSString *)caption scale:(CGFloat)scale { self = [super init]; if (self) { - os_log_debug([KMELogs oskLog], "OSKKey initWithKeyCode: 0x%lx, caption: %{public}@, scale: %f", keyCode, caption, scale); + /* + // usually too much logging, uncomment for debugging + os_log_debug([KMELogs oskLog], "OSKKey initWithKeyCode: 0x%lx, caption: %{public}@, scale: %f", keyCode, caption, scale); + */ _keyCode = keyCode; if (caption == nil) diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m index f5154fa76da..8a2edd5c757 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m @@ -43,7 +43,7 @@ - (id)initWithFrame:(NSRect)frame { } - (void)drawRect:(NSRect)rect { - os_log_debug([KMELogs uiLog], "OSKView drawRect: %{public}@", NSStringFromRect(rect)); + os_log_debug([KMELogs oskLog], "OSKView drawRect: %{public}@", NSStringFromRect(rect)); CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] CGContext]; CGContextSetLineJoin(context, kCGLineJoinRound); @@ -411,7 +411,7 @@ - (void)resizeOSKLayout { - (void)keyAction:(id)sender { KeyView *keyView = (KeyView *)sender; NSUInteger keyCode = [keyView.key keyCode]; - os_log_debug([KMELogs oskLog], "OSKView keyAction keyCode: 0x%lx", keyCode); + os_log_debug([KMELogs oskLog], "OSKView keyAction keyView: %{public}@", keyView); if (keyCode < 0x100) { NSRunningApplication *app = NSWorkspace.sharedWorkspace.frontmostApplication; pid_t processId = app.processIdentifier; @@ -467,6 +467,7 @@ - (void)setKeyPressedOff:(KeyView *)keyView { } - (void)setKeyLabels:(BOOL)shift alt:(BOOL)alt ctrl:(BOOL)ctrl { + os_log_debug([KMELogs keyLog], "OSKView setKeyLabels, shift: %d, alt: %d, ctrl: %d", shift, alt, ctrl); [self resetKeyLabels]; NSMutableArray *mKeys = [[self keyTags] mutableCopy]; NSArray *nkeys = [self.kvk keys]; @@ -487,6 +488,7 @@ - (void)setKeyLabels:(BOOL)shift alt:(BOOL)alt ctrl:(BOOL)ctrl { for (NKey *nkey in nkeys) { if (nkey.shift == flags) { keyCode = [self MacKeyCode:nkey.vkey]; + os_log_debug([KMELogs keyLog], "keyCode: %d, %x for key: %{public}@", keyCode, keyCode, nkey); if (keyCode < USHRT_MAX) { NSView *view = [self viewWithTag:keyCode|0x1000]; if (view == nil || ![view isKindOfClass:[KeyView class]]) @@ -496,6 +498,9 @@ - (void)setKeyLabels:(BOOL)shift alt:(BOOL)alt ctrl:(BOOL)ctrl { [keyView setLabelFont:ansiFont]; if (nkey.flags & KVKK_UNICODE) { [keyView setLabelText:nkey.text]; + NSString* label = nkey.text; + NSData* data = [label dataUsingEncoding:NSUTF8StringEncoding]; + os_log_debug([KMELogs keyLog], "setLabelText to %{public}@, utf8data %{public}@", label, data); [keyView setLabelFont:unicodeFont]; [mKeys removeObject:[NSNumber numberWithInteger:(keyCode|0x1000)]]; } diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KeymanEngine4Mac.h b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KeymanEngine4Mac.h index eef0225413b..6addfc4b477 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KeymanEngine4Mac.h +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KeymanEngine4Mac.h @@ -29,6 +29,8 @@ FOUNDATION_EXPORT const unsigned char KeymanEngine4MacVersionString[]; #import #import #import +#import +#import #import "KMkeyViewProtocol.h" #import "OSKView.h" #import "TimerTarget.h" diff --git a/mac/KeymanEngine4Mac/KeymanEngine4MacTests/CoreTestStaticHelperMethods.m b/mac/KeymanEngine4Mac/KeymanEngine4MacTests/CoreTestStaticHelperMethods.m index 0f0aaf8a830..9954f4e01da 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4MacTests/CoreTestStaticHelperMethods.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4MacTests/CoreTestStaticHelperMethods.m @@ -16,7 +16,7 @@ @implementation CoreTestStaticHelperMethods + (CoreHelper *)helper { static CoreHelper *coreHelper = nil; if (coreHelper == nil) { - coreHelper = [[CoreHelper alloc] initWithDebugMode:YES]; + coreHelper = [[CoreHelper alloc] init]; } return coreHelper; } diff --git a/mac/KeymanEngine4Mac/KeymanEngine4MacTests/KMEngineTests.m b/mac/KeymanEngine4Mac/KeymanEngine4MacTests/KMEngineTests.m index 290f30f302b..2ebe487f8cb 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4MacTests/KMEngineTests.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4MacTests/KMEngineTests.m @@ -32,7 +32,7 @@ - (void)tearDown { } - (void)testinitWithKMX_NilKmx_ProcessEventReturnsNil { - KMEngine *engine = [[KMEngine alloc] initWithKMX:nil context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:nil context:@""]; NSEvent *event = [[NSEvent alloc] init]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output == nil, @"Expected processEvent to return nil for nil kmx"); @@ -40,7 +40,7 @@ - (void)testinitWithKMX_NilKmx_ProcessEventReturnsNil { - (void)testinitWithKMX_ValidKmxEmptyContext_InitializedWithEmptyContext { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; XCTAssert(engine != nil, @"Expected non-nil engine"); // Note: relying on km_core_state_context_debug output format is just barely // acceptable for a unit test @@ -49,7 +49,7 @@ - (void)testinitWithKMX_ValidKmxEmptyContext_InitializedWithEmptyContext { - (void)testinitWithKMX_ValidKmxNonEmptyContext_InitializedWithContext { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"abc" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"abc"]; XCTAssert(engine != nil, @"Expected non-nil engine"); // Note: relying on km_core_state_context_debug output format is just barely // acceptable for a unit test @@ -58,7 +58,7 @@ - (void)testinitWithKMX_ValidKmxNonEmptyContext_InitializedWithContext { - (void)testsetCoreContextIfNeeded_NonEmptyContext_InitialContextUpdated { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"a" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"a"]; [engine setCoreContextIfNeeded:@"xyz"]; // Note: relying on km_core_state_context_debug output format is just barely // acceptable for a unit test @@ -69,7 +69,7 @@ - (void)testsetCoreContextIfNeeded_NonEmptyContext_InitialContextUpdated { /* - (void)testsetCoreContextIfNeeded_EmptyContext_InitialContextUpdated { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; [engine setCoreContextIfNeeded:@"xyz"]; // Note: relying on km_core_state_context_debug output format is just barely // acceptable for a unit test @@ -79,7 +79,7 @@ - (void)testsetCoreContextIfNeeded_EmptyContext_InitialContextUpdated { - (void)testprocessEvent_eventForCommandKey_ReturnsNilOutput { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:NSEventModifierFlagCommand timestamp:0 windowNumber:0 context:nil characters:@"a" charactersIgnoringModifiers:@"a" isARepeat:NO keyCode:kVK_ANSI_A]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output == nil, @"expected nil output from core"); @@ -87,7 +87,7 @@ - (void)testprocessEvent_eventForCommandKey_ReturnsNilOutput { - (void)testprocessEvent_eventWithoutKeycode_ReturnsNilOutput { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent mouseEventWithType:NSEventTypeMouseMoved location:NSMakePoint(29, 21) modifierFlags:NSEventModifierFlagShift timestamp:0 windowNumber:0 context:nil eventNumber:23 clickCount:0 pressure:0]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output == nil, @"nil CoreKeyOutput"); @@ -96,7 +96,7 @@ - (void)testprocessEvent_eventWithoutKeycode_ReturnsNilOutput { // TODO: shouldn't this return emitKeystroke = YES? - (void)testprocessEvent_eventForUnmappedKey_ReturnsNoActions { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"z" charactersIgnoringModifiers:@"z" isARepeat:NO keyCode:kVK_ANSI_Z]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output == nil, @"Expected nil array of actions"); @@ -104,7 +104,7 @@ - (void)testprocessEvent_eventForUnmappedKey_ReturnsNoActions { - (void)testprocessEvent_eventForLowercaseA_ReturnsCharacterActionWithExpectedCharacterBasedOnKmx { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"a" charactersIgnoringModifiers:@"a" isARepeat:NO keyCode:kVK_ANSI_A]; CoreKeyOutput *output = [engine processEvent:event]; os_log_debug([KMELogs testLog], "output = %{public}@", output); @@ -116,7 +116,7 @@ - (void)testprocessEvent_eventForLowercaseA_ReturnsCharacterActionWithExpectedCh /* -(void)testprocessEvent_eventForCtrlShiftNumeralWithCipherMusicKmx_ReturnsQstrActionForCorrectUnicodeSurrogatePair { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForCipherMusicTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile contextBuffer:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile contextBuffer:@""]; for (int i = 1; i <= 6; i++) { unsigned short ansiCode = kVK_ANSI_1 + i - 1; @@ -152,7 +152,7 @@ -(void)testprocessEvent_eventForCtrlShiftNumeralWithCipherMusicKmx_ReturnsQstrAc - (void)testprocessEvent_eventsForOpenCurlyBraceWithCipherMusicKmx_ReturnsCharacterForStartSlide { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForCipherMusicTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; UTF32Char expectedUtf32Char = 0x1D177; NSString * expectedStartSlideSurrogatePair = [[NSString alloc] initWithBytes:&expectedUtf32Char length:4 encoding:NSUTF32LittleEndianStringEncoding]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:NSEventModifierFlagShift timestamp:0 windowNumber:0 context:nil characters:@"{" charactersIgnoringModifiers:@"[" isARepeat:NO keyCode:kVK_ANSI_LeftBracket]; @@ -165,7 +165,7 @@ - (void)testprocessEvent_eventsForOpenCurlyBraceWithCipherMusicKmx_ReturnsCharac // TODO: fails with core, investigate - (void)testprocessEvent_eventForUnshiftedNumeralWithCipherMusicKmx_ReturnsCharacterActionToInsertNumeral { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForCipherMusicTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile contextBuffer:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile contextBuffer:@""]; for (int i = 1; i <= 9; i++) { unsigned short ansiCode = kVK_ANSI_1 + i - 1; @@ -185,7 +185,7 @@ - (void)testprocessEvent_eventForUnshiftedNumeralWithCipherMusicKmx_ReturnsChara // TODO: fails with core, returns CharacterAction - (void)testprocessEvent_eventForShiftNumeralsWithoutRulesInCipherMusicKmx_ReturnsNoAction { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForCipherMusicTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; for (int i = 0; i <= 9; i++) { if (i == 6) @@ -228,7 +228,7 @@ - (void)testprocessEvent_eventForShiftNumeralsWithoutRulesInCipherMusicKmx_Retur // TODO: fails with core, returns CharacterAction - (void)testprocessEvent_eventForPeriodWithCipherMusicKmx_ReturnsNoAction { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForCipherMusicTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"." charactersIgnoringModifiers:@"." isARepeat:NO keyCode:kVK_ANSI_Period]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(!output.hasTextToInsert, @"expected no text to insert"); @@ -236,7 +236,7 @@ - (void)testprocessEvent_eventForPeriodWithCipherMusicKmx_ReturnsNoAction { - (void)testprocessEvent_eventForCtrl8WithCipherMusicKmx_ReturnsEmit { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForCipherMusicTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:NSEventModifierFlagControl timestamp:0 windowNumber:0 context:nil characters:@"8" charactersIgnoringModifiers:@"8" isARepeat:NO keyCode:kVK_ANSI_8]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output.emitKeystroke, @"emitKeystroke == YES"); @@ -279,7 +279,7 @@ - (void)testprocessEvent_eventForAWithModifiers_ReturnsCharacterActionWithExpect [KMEngineTests fillInNamesAndModifiersForAllChiralCombinations]; KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; for (i = 0; i < nCombinations; i++) { [engine clearCoreContext]; @@ -346,7 +346,7 @@ - (void)testprocessEvent_eventForSWithModifiers_ReturnsCharacterActionWithExpect [KMEngineTests fillInNamesAndModifiersForAllChiralCombinations]; KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileTestMacEngine]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; for (i = 0; i < nCombinations; i++) { [engine clearCoreContext]; @@ -419,7 +419,7 @@ - (void)testprocessEvent_eventForSWithModifiers_ReturnsCharacterActionWithExpect - (NSString *)checkPlatform_getOutputForKeystroke: (NSString*) character modifierFlags: (NSEventModifierFlags) flag keyCode:(unsigned short)code { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForPlatformTest]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSString *lcChar = [character lowercaseString]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:flag timestamp:0 windowNumber:0 context:nil characters:character charactersIgnoringModifiers:lcChar isARepeat:NO keyCode:code]; CoreKeyOutput *output = [engine processEvent:event]; @@ -516,7 +516,7 @@ - (void)testContextMatch_InvertedPlatformLogic_NotTouch { - (void)testEngine_ipaKeyboardAction_DoesNotCrash_Issue1892 { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForIndexOffsetTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"z" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"z"]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"a" charactersIgnoringModifiers:@"a" isARepeat:NO keyCode:kVK_ANSI_A]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output.hasCodePointsToDelete, @"output hasCodePointsToDelete == YES"); @@ -525,7 +525,7 @@ - (void)testEngine_ipaKeyboardAction_DoesNotCrash_Issue1892 { - (void)testCoreProcessEvent_eventForFWithElNuerKmx_ReturnsCorrectCharacter { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForElNuerTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"f" charactersIgnoringModifiers:@"f" isARepeat:NO keyCode:kVK_ANSI_F]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert([output.textToInsert isEqualToString:@"ɣ"], @"Expected output to be 'ɣ'."); @@ -535,7 +535,7 @@ - (void)testCoreProcessEvent_eventForFWithElNuerKmx_ReturnsCorrectCharacter { - (void)testArmenianMnemonic_triggerPersistOptions_ReturnsOptions { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForArmenianMnemonicTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"√" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"√"]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"w" charactersIgnoringModifiers:@"w" isARepeat:NO keyCode:kVK_ANSI_W]; CoreKeyOutput *output = [engine processEvent:event]; NSString *key = @"option_ligature_ew"; @@ -546,7 +546,7 @@ - (void)testArmenianMnemonic_triggerPersistOptions_ReturnsOptions { - (void)testCoreProcessEvent_backspaceElNuerEmptyContext_PassesThrough { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForElNuerTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@""]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"\b" charactersIgnoringModifiers:@"\b" isARepeat:NO keyCode:kVK_Delete]; CoreKeyOutput *output = [engine processEvent:event]; os_log_debug([KMELogs testLog], "output = %{public}@", output); @@ -557,7 +557,7 @@ - (void)testCoreProcessEvent_backspaceElNuerEmptyContext_PassesThrough { - (void)testCoreProcessEvent_backspaceElNuerWithContext_EmptiesContextReturnsDelete { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForElNuerTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"ɣ" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"ɣ"]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"\b" charactersIgnoringModifiers:@"\b" isARepeat:NO keyCode:kVK_Delete]; CoreKeyOutput *output = [engine processEvent:event]; os_log_debug([KMELogs testLog], "output = %{public}@", output); @@ -571,7 +571,7 @@ - (void)testCoreProcessEvent_backspaceElNuerWithContext_EmptiesContextReturnsDel - (void)testCoreProcessEvent_eventReturnWithElNuerKmx_EmitWithContextEmpty { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForElNuerTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"ɣ" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"ɣ"]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"\n" charactersIgnoringModifiers:@"\n" isARepeat:NO keyCode:kVK_Return]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output.emitKeystroke, @"Expected emitKeystroke==YES"); @@ -583,7 +583,7 @@ - (void)testCoreProcessEvent_eventReturnWithElNuerKmx_EmitWithContextEmpty { - (void)testCoreProcessEvent_eventTabWithElNuerKmx_EmitWithContextEmpty { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForElNuerTests]; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"ɣ" verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:@"ɣ"]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"\t" charactersIgnoringModifiers:@"\t" isARepeat:NO keyCode:kVK_Tab]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output.emitKeystroke, @"Expected emitKeystroke==YES"); @@ -596,7 +596,7 @@ - (void)testCoreProcessEvent_eventTabWithElNuerKmx_EmitWithContextEmpty { - (void)testCoreProcessEvent_eventSingleQuoteWithElNuerKmx_ReturnsDiacritic { KMXFile *kmxFile = [KeymanEngineTestsStaticHelperMethods getKmxFileForElNuerTests]; NSString *context = @"ɛ"; - KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:context verboseLogging:YES]; + KMEngine *engine = [[KMEngine alloc] initWithKMX:kmxFile context:context]; NSEvent *event = [NSEvent keyEventWithType:NSEventTypeKeyDown location:NSMakePoint(0, 0) modifierFlags:0 timestamp:0 windowNumber:0 context:nil characters:@"'" charactersIgnoringModifiers:@"'" isARepeat:NO keyCode:kVK_ANSI_Quote]; CoreKeyOutput *output = [engine processEvent:event]; XCTAssert(output.hasTextToInsert, @"returns text to insert"); diff --git a/mac/help/about/history.md b/mac/docs/help/about/history.md similarity index 100% rename from mac/help/about/history.md rename to mac/docs/help/about/history.md diff --git a/mac/help/about/index.md b/mac/docs/help/about/index.md similarity index 100% rename from mac/help/about/index.md rename to mac/docs/help/about/index.md diff --git a/mac/help/about/requirements.md b/mac/docs/help/about/requirements.md similarity index 100% rename from mac/help/about/requirements.md rename to mac/docs/help/about/requirements.md diff --git a/mac/help/about/welcome.md b/mac/docs/help/about/welcome.md similarity index 100% rename from mac/help/about/welcome.md rename to mac/docs/help/about/welcome.md diff --git a/mac/help/about/whatsnew.md b/mac/docs/help/about/whatsnew.md similarity index 100% rename from mac/help/about/whatsnew.md rename to mac/docs/help/about/whatsnew.md diff --git a/mac/help/basic/config/index.md b/mac/docs/help/basic/config/index.md similarity index 100% rename from mac/help/basic/config/index.md rename to mac/docs/help/basic/config/index.md diff --git a/mac/help/basic/config/keyboards.md b/mac/docs/help/basic/config/keyboards.md similarity index 100% rename from mac/help/basic/config/keyboards.md rename to mac/docs/help/basic/config/keyboards.md diff --git a/mac/help/basic/config/options.md b/mac/docs/help/basic/config/options.md similarity index 100% rename from mac/help/basic/config/options.md rename to mac/docs/help/basic/config/options.md diff --git a/mac/help/basic/config/support.md b/mac/docs/help/basic/config/support.md similarity index 100% rename from mac/help/basic/config/support.md rename to mac/docs/help/basic/config/support.md diff --git a/mac/help/basic/index.md b/mac/docs/help/basic/index.md similarity index 100% rename from mac/help/basic/index.md rename to mac/docs/help/basic/index.md diff --git a/mac/help/common/adware.md b/mac/docs/help/common/adware.md similarity index 100% rename from mac/help/common/adware.md rename to mac/docs/help/common/adware.md diff --git a/mac/help/common/bug.md b/mac/docs/help/common/bug.md similarity index 100% rename from mac/help/common/bug.md rename to mac/docs/help/common/bug.md diff --git a/mac/help/common/free.md b/mac/docs/help/common/free.md similarity index 100% rename from mac/help/common/free.md rename to mac/docs/help/common/free.md diff --git a/mac/help/common/index.md b/mac/docs/help/common/index.md similarity index 100% rename from mac/help/common/index.md rename to mac/docs/help/common/index.md diff --git a/mac/help/common/keyboards.md b/mac/docs/help/common/keyboards.md similarity index 100% rename from mac/help/common/keyboards.md rename to mac/docs/help/common/keyboards.md diff --git a/mac/help/common/os.md b/mac/docs/help/common/os.md similarity index 100% rename from mac/help/common/os.md rename to mac/docs/help/common/os.md diff --git a/mac/help/common/osk.md b/mac/docs/help/common/osk.md similarity index 100% rename from mac/help/common/osk.md rename to mac/docs/help/common/osk.md diff --git a/mac/help/common/requirements.md b/mac/docs/help/common/requirements.md similarity index 100% rename from mac/help/common/requirements.md rename to mac/docs/help/common/requirements.md diff --git a/mac/help/common/support.md b/mac/docs/help/common/support.md similarity index 100% rename from mac/help/common/support.md rename to mac/docs/help/common/support.md diff --git a/mac/help/index.md b/mac/docs/help/index.md similarity index 100% rename from mac/help/index.md rename to mac/docs/help/index.md diff --git a/mac/help/mac_images/add.png b/mac/docs/help/mac_images/add.png similarity index 100% rename from mac/help/mac_images/add.png rename to mac/docs/help/mac_images/add.png diff --git a/mac/help/mac_images/add_keyman.png b/mac/docs/help/mac_images/add_keyman.png similarity index 100% rename from mac/help/mac_images/add_keyman.png rename to mac/docs/help/mac_images/add_keyman.png diff --git a/mac/help/mac_images/apple_menu.png b/mac/docs/help/mac_images/apple_menu.png similarity index 100% rename from mac/help/mac_images/apple_menu.png rename to mac/docs/help/mac_images/apple_menu.png diff --git a/mac/help/mac_images/go_to_folder.png b/mac/docs/help/mac_images/go_to_folder.png similarity index 100% rename from mac/help/mac_images/go_to_folder.png rename to mac/docs/help/mac_images/go_to_folder.png diff --git a/mac/help/mac_images/help_button.png b/mac/docs/help/mac_images/help_button.png similarity index 100% rename from mac/help/mac_images/help_button.png rename to mac/docs/help/mac_images/help_button.png diff --git a/mac/help/mac_images/icon-fonts.png b/mac/docs/help/mac_images/icon-fonts.png similarity index 100% rename from mac/help/mac_images/icon-fonts.png rename to mac/docs/help/mac_images/icon-fonts.png diff --git a/mac/help/mac_images/icon-help.png b/mac/docs/help/mac_images/icon-help.png similarity index 100% rename from mac/help/mac_images/icon-help.png rename to mac/docs/help/mac_images/icon-help.png diff --git a/mac/help/mac_images/icon-intro.png b/mac/docs/help/mac_images/icon-intro.png similarity index 100% rename from mac/help/mac_images/icon-intro.png rename to mac/docs/help/mac_images/icon-intro.png diff --git a/mac/help/mac_images/icon-keyman.png b/mac/docs/help/mac_images/icon-keyman.png similarity index 100% rename from mac/help/mac_images/icon-keyman.png rename to mac/docs/help/mac_images/icon-keyman.png diff --git a/mac/help/mac_images/icon-osk.png b/mac/docs/help/mac_images/icon-osk.png similarity index 100% rename from mac/help/mac_images/icon-osk.png rename to mac/docs/help/mac_images/icon-osk.png diff --git a/mac/help/mac_images/icon-unicode.png b/mac/docs/help/mac_images/icon-unicode.png similarity index 100% rename from mac/help/mac_images/icon-unicode.png rename to mac/docs/help/mac_images/icon-unicode.png diff --git a/mac/help/mac_images/information_button.png b/mac/docs/help/mac_images/information_button.png similarity index 100% rename from mac/help/mac_images/information_button.png rename to mac/docs/help/mac_images/information_button.png diff --git a/mac/help/mac_images/input_menu.png b/mac/docs/help/mac_images/input_menu.png similarity index 100% rename from mac/help/mac_images/input_menu.png rename to mac/docs/help/mac_images/input_menu.png diff --git a/mac/help/mac_images/keyboards_menu.png b/mac/docs/help/mac_images/keyboards_menu.png similarity index 100% rename from mac/help/mac_images/keyboards_menu.png rename to mac/docs/help/mac_images/keyboards_menu.png diff --git a/mac/help/mac_images/keyman_config.png b/mac/docs/help/mac_images/keyman_config.png similarity index 100% rename from mac/help/mac_images/keyman_config.png rename to mac/docs/help/mac_images/keyman_config.png diff --git a/mac/help/mac_images/keyman_install.png b/mac/docs/help/mac_images/keyman_install.png similarity index 100% rename from mac/help/mac_images/keyman_install.png rename to mac/docs/help/mac_images/keyman_install.png diff --git a/mac/help/mac_images/keyman_menu_config.png b/mac/docs/help/mac_images/keyman_menu_config.png similarity index 100% rename from mac/help/mac_images/keyman_menu_config.png rename to mac/docs/help/mac_images/keyman_menu_config.png diff --git a/mac/help/mac_images/menu_bar.png b/mac/docs/help/mac_images/menu_bar.png similarity index 100% rename from mac/help/mac_images/menu_bar.png rename to mac/docs/help/mac_images/menu_bar.png diff --git a/mac/help/mac_images/menu_bar_keyman.png b/mac/docs/help/mac_images/menu_bar_keyman.png similarity index 100% rename from mac/help/mac_images/menu_bar_keyman.png rename to mac/docs/help/mac_images/menu_bar_keyman.png diff --git a/mac/help/mac_images/osk_amharic.png b/mac/docs/help/mac_images/osk_amharic.png similarity index 100% rename from mac/help/mac_images/osk_amharic.png rename to mac/docs/help/mac_images/osk_amharic.png diff --git a/mac/help/mac_images/privacy_accessibility.png b/mac/docs/help/mac_images/privacy_accessibility.png similarity index 100% rename from mac/help/mac_images/privacy_accessibility.png rename to mac/docs/help/mac_images/privacy_accessibility.png diff --git a/mac/help/mac_images/privacy_files_and_folders.png b/mac/docs/help/mac_images/privacy_files_and_folders.png similarity index 100% rename from mac/help/mac_images/privacy_files_and_folders.png rename to mac/docs/help/mac_images/privacy_files_and_folders.png diff --git a/mac/help/mac_images/privacy_input_monitoring.png b/mac/docs/help/mac_images/privacy_input_monitoring.png similarity index 100% rename from mac/help/mac_images/privacy_input_monitoring.png rename to mac/docs/help/mac_images/privacy_input_monitoring.png diff --git a/mac/help/mac_images/privacy_input_monitoring_locked.png b/mac/docs/help/mac_images/privacy_input_monitoring_locked.png similarity index 100% rename from mac/help/mac_images/privacy_input_monitoring_locked.png rename to mac/docs/help/mac_images/privacy_input_monitoring_locked.png diff --git a/mac/help/mac_images/remove.png b/mac/docs/help/mac_images/remove.png similarity index 100% rename from mac/help/mac_images/remove.png rename to mac/docs/help/mac_images/remove.png diff --git a/mac/help/mac_images/remove_button.png b/mac/docs/help/mac_images/remove_button.png similarity index 100% rename from mac/help/mac_images/remove_button.png rename to mac/docs/help/mac_images/remove_button.png diff --git a/mac/help/mac_images/remove_keyman.png b/mac/docs/help/mac_images/remove_keyman.png similarity index 100% rename from mac/help/mac_images/remove_keyman.png rename to mac/docs/help/mac_images/remove_keyman.png diff --git a/mac/help/mac_images/system_preferences.png b/mac/docs/help/mac_images/system_preferences.png similarity index 100% rename from mac/help/mac_images/system_preferences.png rename to mac/docs/help/mac_images/system_preferences.png diff --git a/mac/help/mac_images/video.png b/mac/docs/help/mac_images/video.png similarity index 100% rename from mac/help/mac_images/video.png rename to mac/docs/help/mac_images/video.png diff --git a/mac/help/start/index.md b/mac/docs/help/start/index.md similarity index 100% rename from mac/help/start/index.md rename to mac/docs/help/start/index.md diff --git a/mac/help/start/install-keyboard.md b/mac/docs/help/start/install-keyboard.md similarity index 100% rename from mac/help/start/install-keyboard.md rename to mac/docs/help/start/install-keyboard.md diff --git a/mac/help/start/install-keyman.md b/mac/docs/help/start/install-keyman.md similarity index 100% rename from mac/help/start/install-keyman.md rename to mac/docs/help/start/install-keyman.md diff --git a/mac/help/start/tutorial.md b/mac/docs/help/start/tutorial.md similarity index 100% rename from mac/help/start/tutorial.md rename to mac/docs/help/start/tutorial.md diff --git a/mac/help/troubleshooting/configure-security.md b/mac/docs/help/troubleshooting/configure-security.md similarity index 100% rename from mac/help/troubleshooting/configure-security.md rename to mac/docs/help/troubleshooting/configure-security.md diff --git a/mac/help/troubleshooting/index.md b/mac/docs/help/troubleshooting/index.md similarity index 100% rename from mac/help/troubleshooting/index.md rename to mac/docs/help/troubleshooting/index.md diff --git a/mac/help/troubleshooting/uninstall-keyman.md b/mac/docs/help/troubleshooting/uninstall-keyman.md similarity index 100% rename from mac/help/troubleshooting/uninstall-keyman.md rename to mac/docs/help/troubleshooting/uninstall-keyman.md diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle index 0837c381ad0..fa5dc5a1273 100644 --- a/oem/firstvoices/android/app/build.gradle +++ b/oem/firstvoices/android/app/build.gradle @@ -73,12 +73,17 @@ java { } // how to configure the sentry android gradle plugin -sentry { - // Disables or enables the automatic configuration of Native symbols - uploadNativeSymbols = true - - // Does or doesn't include the source code of native code for Sentry - includeNativeSources = true +task publishSentry { + doLast { + println 'Publishing FirstVoices symbols to Sentry' + sentry { + // Disables or enables the automatic configuration of Native symbols + uploadNativeSymbols = true + + // Does or doesn't include the source code of native code for Sentry + includeNativeSources = true + } + } } String env_keys_json_file = System.getenv("oem_firstvoices_keys_json_file") diff --git a/oem/firstvoices/android/app/src/main/assets/setup/main.html b/oem/firstvoices/android/app/src/main/assets/setup/main.html index 331251981d9..d9cc9893da8 100644 --- a/oem/firstvoices/android/app/src/main/assets/setup/main.html +++ b/oem/firstvoices/android/app/src/main/assets/setup/main.html @@ -98,7 +98,7 @@

To use FirstVoices Keyboards

diff --git a/oem/firstvoices/android/build.sh b/oem/firstvoices/android/build.sh index e27be069747..260f8823687 100755 --- a/oem/firstvoices/android/build.sh +++ b/oem/firstvoices/android/build.sh @@ -25,6 +25,7 @@ builder_describe "Builds FirstVoices for Android app." \ "configure" \ "build" \ "test Runs lint and tests." \ + "publish Publishes symbols to Sentry and the APK to the Play Store." \ "--ci Don't start the Gradle daemon. For CI" # parse before describe_outputs to check debug flags @@ -85,3 +86,6 @@ if builder_start_action test; then builder_finish_action success test fi + +builder_run_action publish ./gradlew $DAEMON_FLAG publishSentry publishReleaseApk + diff --git a/oem/firstvoices/keyboards.csv b/oem/firstvoices/keyboards.csv index 22812ec14de..ed13eb5aaa0 100644 --- a/oem/firstvoices/keyboards.csv +++ b/oem/firstvoices/keyboards.csv @@ -7,45 +7,45 @@ fv,fv_uummarmiutun,Uummarmiutun,Arctic,fv_uummarmiutun_kmw-9.0.js,9.1.1,ikt-Latn fv,fv_eastern_canadian_inuktitut,ᐃᓄᒃᑎᑐᑦ (Eastern Canadian Inuktitut),Arctic,fv_eastern_canadian_inuktitut_kmw-9.0.js,9.2.1,ike-Cans,Eastern Canadian Inuktitut (Unified Canadian Aboriginal Syllabics) fv,fv_migmaq,Mi'gmawi'simg / Mi'kmawi'simk,Atlantic,fv_migmaq_kmw-9.0.js,9.1.2,mic-Latn,Mi'kmaq (Latin) fv,fv_skicinuwatuwewakon,Skicinuwatuwewakon,Atlantic,fv_skicinuwatuwewakon_kmw-9.0.js,9.1.1,pqm-Latn,Malecite-Passamaquoddy (Latin) -fv,fv_uwikala,'Uwik̓ala,BC Coast,fv_uwikala_kmw-9.0.js,9.4,hei,Heiltsuk +fv,fv_uwikala,’Wuìk̓ala,BC Coast,fv_uwikala_kmw-9.0.js,9.4,hei,Heiltsuk fv,fv_dexwlesucid,Dəxʷləšucid,BC Coast,fv_dexwlesucid_kmw-9.0.js,9.2.1,lut-Latn,Lushootseed (Latin) fv,fv_diitiidatx,Diidiitidq,BC Coast,fv_diitiidatx_kmw-9.0.js,9.2.1,nuk-Latn,Nuu-chah-nulth (Latin) fv,fv_gitsenimx,Gitsenimx̱,BC Coast,fv_gitsenimx_kmw-9.0.js,10.1.2,git,Gitxsan (Latin) -fv,fv_hailzaqvla,Haiɫzaqvla,BC Coast,fv_hailzaqvla_kmw-9.0.js,9.5.2,hei,Heiltsuk (Latin) -fv,fv_haisla,Haisla,BC Coast,fv_haisla.js,2.1.2,has-Latn,Haisla (Latin) -fv,fv_halqemeylem,Halq'eméylem,BC Coast,fv_halqemeylem_kmw-9.0.js,9.2,hur-Latn,Halkomelem (Latin) -fv,fv_henqeminem,Hǝn̓q̓ǝmin̓ǝm,BC Coast,fv_henqeminem_kmw-9.0.js,10.1,hur-Latn,Halkomelem (Latin) -fv,fv_klahoose,Homalco-Klahoose-Sliammon,BC Coast,fv_klahoose_kmw-9.0.js,10.1,coo,Comox -fv,fv_hulquminum,Hul’q’umi’num’,BC Coast,fv_hulquminum_kmw-9.0.js,9.1,hur-Latn,Halkomelem (Latin) +fv,fv_hailzaqvla,Haíɫzaqvḷa,BC Coast,fv_hailzaqvla_kmw-9.0.js,10.0,hei,Heiltsuk (Latin) +fv,fv_haisla,Haisla,BC Coast,fv_haisla.js,2.1.3,has-Latn,Haisla (Latin) +fv,fv_halqemeylem,Halq'eméylem,BC Coast,fv_halqemeylem_kmw-9.0.js,9.2.1,hur-Latn,Halkomelem (Latin) +fv,fv_henqeminem,hǝn̓q̓ǝmin̓ǝm̓,BC Coast,fv_henqeminem_kmw-9.0.js,10.2.1,hur-Latn,Halkomelem (Latin) +fv,fv_klahoose,Éy7á7juuthem,BC Coast,fv_klahoose_kmw-9.0.js,10.2,coo,Comox +fv,fv_hulquminum,Hul’q’umi’num’,BC Coast,fv_hulquminum_kmw-9.0.js,9.2,hur,Halkomelem fv,fv_hulquminum_combine,Hul̓q̓umin̓um̓,BC Coast,fv_hulquminum_combine_kmw-9.0.js,2.0.1,hur-Latn,Halkomelem (Latin) fv,fv_kwakwala_liqwala,Kʷak̓ʷala,BC Coast,fv_kwakwala_liqwala_kmw-9.0.js,9.3,kwk-Latn,Kwakiutl (Latin) fv,fv_kwakwala,Kwak̕wala,BC Coast,fv_kwakwala_kmw-9.0.js,9.2,kwk-Latn,Kwakiutl (Latin) -fv,fv_lekwungen,Lək̓ʷəŋən,BC Coast,fv_lekwungen-9.0.js,1.0,str,Lekwungen -fv,fv_nexwslayemucen,Nəxʷsƛ̓ay̓əmúcən,BC Coast,fv_nexwslayemucen_kmw-9.0.js,10.0,clm-Latn,Clallam (Latin) -fv,fv_nisgaa,Nisg̱a'a,BC Coast,fv_nisgaa_kmw-9.0.js,9.2,ncg-Latn,Nisga'a (Latin) +fv,fv_lekwungen,Lekwungen (Lək̓ʷəŋən),BC Coast,fv_lekwungen_kmw-9.0.js,1.0.1,str,Straits Salish +fv,fv_nexwslayemucen,Nəxʷsƛ̓ay̓əmúcən,BC Coast,fv_nexwslayemucen_kmw-9.0.js,11.0,clm,Clallam +fv,fv_nisgaa,Nisg̱a'a,BC Coast,fv_nisgaa_kmw-9.0.js,9.2.1,ncg-Latn,Nisga'a (Latin) fv,fv_nuucaanul,Nuučaan̓uł,BC Coast,fv_nuucaanul_kmw-9.0.js,9.2,nuk-Latn,Nuu-chah-nulth (Latin) fv,fv_nuxalk,Nuxalk,BC Coast,fv_nuxalk_kmw-9.0.js,10.0.1,blc-Latn,Bella Coola (Latin) -fv,fv_sencoten,SENĆOŦEN,BC Coast,fv_sencoten_kmw-9.0.js,9.2.2,str,Straits Salish +fv,fv_sencoten,SENĆOŦEN,BC Coast,fv_sencoten_kmw-9.0.js,9.2.3,str,Straits Salish fv,fv_sguuxs,Sgüüx̱s,BC Coast,fv_sguuxs.js,1.1,tsi,Tsimshian -fv,fv_shashishalhem,Shashishalhem,BC Coast,fv_shashishalhem_kmw-9.0.js,9.2,sec-Latn,Sechelt (Latin) -fv,fv_skwxwumesh_snichim,Sḵwx̱wúmesh sníchim,BC Coast,fv_skwxwumesh_snichim_kmw-9.0.js,10.0,squ-Latn,Squamish (Latin) -fv,fv_smalgyax,Sm'algya̱x,BC Coast,fv_smalgyax_kmw-9.0.js,9.2,tsi-Latn,Tsimshian (Latin) -fv,fv_xaislakala,X̄a'ʼislak̓ala,BC Coast,fv_xaislakala_kmw-9.0.js,10.0,has-Latn,Haisla (Latin) +fv,fv_shashishalhem,Shashishalhem,BC Coast,fv_shashishalhem_kmw-9.0.js,9.2.1,sec-Latn,Sechelt (Latin) +fv,fv_skwxwumesh_snichim,Sḵwx̱wú7mesh sníchim,BC Coast,fv_skwxwumesh_snichim_kmw-9.0.js,10.0,squ-Latn,Squamish (Latin) +fv,fv_smalgyax,Sm'algya̱x,BC Coast,fv_smalgyax_kmw-9.0.js,9.3,tsi-Latn,Tsimshian (Latin) +fv,fv_xaislakala,X̄aʼislak̓ala,BC Coast,fv_xaislakala_kmw-9.0.js,10.0,has-Latn,Haisla (Latin) fv,fv_hlgaagilda_xaayda_kil,X̱aayda-X̱aad Kil,BC Coast,fv_hlgaagilda_xaayda_kil_kmw-9.0.js,9.4,hax,Southern Haida fv,fv_dakelh,Dakelh,BC Interior,fv_dakelh_kmw-9.0.js,9.2.1,caf-Latn,Southern Carrier (Latin) fv,fv_ktunaxa,Ktunaxa,BC Interior,fv_ktunaxa_kmw-9.0.js,10.0,kut-Latn,Kutenai (Latin) fv,fv_kwadacha_tsekene,Kwadacha Tsek’ene,BC Interior,fv_kwadacha_tsekene_kmw-9.0.js,1.1,sek-Latn,Sekani -fv,fv_natwits,Nedut’en-Witsuwit'en,BC Interior,fv_natwits_kmw-9.0.js,9.1.3,caf-Latn,Southern Carrier (Latin) +fv,fv_natwits,Nedut’en-Witsuwit'en,BC Interior,fv_natwits_kmw-9.0.js,9.2,caf-Latn,Southern Carrier (Latin) fv,fv_nlekepmxcin,Nłeʔkepmxcin,BC Interior,fv_nlekepmxcin_kmw-9.0.js,9.5.1,thp-Latn,Thompson (Latin) -fv,fv_nlha7kapmxtsin,Nlha7kapmxtsin,BC Interior,fv_nlha7kapmxtsin_kmw-9.0.js,10.1.1,thp-Latn,Thompson (Latin) +fv,fv_nlha7kapmxtsin,Nlha7kapmxtsin,BC Interior,fv_nlha7kapmxtsin_kmw-9.0.js,10.1.2,thp,Thompson fv,fv_nlakapamuxcheen,Nlakapamuxcheen,BC Interior,fv_nlakapamuxcheen_kmw-9.0.js,1.1,thp,Thompson -fv,fv_nsilxcen,Nsilxcən,BC Interior,fv_nsilxcen_kmw-9.0.js,10.0,oka,Okanagan -fv,fv_secwepemctsin,Secwepemctsín,BC Interior,fv_secwepemctsin_kmw-9.0.js,9.2,shs-Latn,Shuswap (Latin) -fv,fv_stlatlimxec,Sƛ̓aƛ̓imxəc,BC Interior,fv_stlatlimxec_kmw-9.0.js,9.3,lil-Latn,Lillooet (Latin) +fv,fv_nsilxcen,Nsyilxcən,BC Interior,fv_nsilxcen_kmw-9.0.js,10.0.1,oka,Okanagan +fv,fv_secwepemctsin,Secwepemctsín,BC Interior,fv_secwepemctsin_kmw-9.0.js,9.3,shs,Shuswap +fv,fv_stlatlimxec,Sƛ̓aƛ̓imxəc,BC Interior,fv_stlatlimxec_kmw-9.0.js,9.4,lil-Latn,Lillooet (Latin) fv,fv_statimcets,St̓át̓imcets,BC Interior,fv_statimcets_kmw-9.0.js,9.2,lil-Latn,Lillooet (Latin) -fv,fv_taltan,Tāłtān,BC Interior,fv_taltan_kmw-9.0.js,9.2,tht-Latn,Tahltan (Latin) +fv,fv_taltan,Tāłtān,BC Interior,fv_taltan_kmw-9.0.js,9.2,tht-Latn,Tahltan (Latin) fv,fv_tsekehne,Tsek'ehne,BC Interior,fv_tsekehne_kmw-9.0.js,9.2,sek-Latn,Sekani (Latin) -fv,fv_tsilhqotin,Tŝilhqot'in,BC Interior,fv_tsilhqotin_kmw-9.0.js,9.2,clc-Latn,Chilcotin (Latin) +fv,fv_tsilhqotin,Tŝilhqot’in,BC Interior,fv_tsilhqotin_kmw-9.0.js,9.3,clc-Latn,Chilcotin (Latin) fv,fv_southern_carrier,ᑐᑊᘁᗕᑋᗸ (Southern Carrier),BC Interior,fv_southern_carrier_kmw-9.0.js,10.1,caf-Cans,Southern Carrier (Unified Canadian Aboriginal Syllabics) fv,fv_anicinapemi8in,Anicinapemi8in/Anishinàbemiwin,Eastern Subarctic,fv_anicinapemi8in_kmw-9.0.js,9.1.1,alq-Latn,Algonquin (Latin) fv,fv_atikamekw,Atikamekw,Eastern Subarctic,fv_atikamekw_kmw-9.0.js,9.1.1,atj-Latn,Atikamekw (Latin) @@ -53,16 +53,16 @@ fv,fv_ilnu_innu_aimun,Ilnu-Innu Aimun,Eastern Subarctic,fv_ilnu_innu_aimun_kmw-9 fv,fv_swampy_cree,ᐃᓂᓂᒧᐎᐣ (Swampy Cree),Eastern Subarctic,fv_swampy_cree_kmw-9.0.js,9.2.1,csw-Cans,Swampy Cree (Unified Canadian Aboriginal Syllabics) fv,fv_moose_cree,ᐃᓕᓖᒧᐎᓐ (Moose Cree),Eastern Subarctic,fv_moose_cree_kmw-9.0.js,9.2.1,crm-Cans,Moose Cree (Unified Canadian Aboriginal Syllabics) fv,fv_northern_east_cree,ᐄᔨᔫ-ᐄᓅ ᐊᔨᒨᓐ (Northern East Cree),Eastern Subarctic,fv_northern_east_cree_kmw-9.0.js,9.2.1,crl-Cans,Northern East Cree (Unified Canadian Aboriginal Syllabics) -fv,fv_severn_ojibwa,ᐊᓂᔑᓂᓂᒧᐎᐣ (Severn Ojibwa),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,10.1,ojs-Cans,Severn Ojibwa (Unified Canadian Aboriginal Syllabics) -fv,fv_severn_ojibwa_rdot,ᐊᓂᔑᓂᓂᒧᐏᐣ (Severn Ojibwa right w-dot),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,1.1,ojs,Oji-Cree +fv,fv_severn_ojibwa,ᐊᓂᔑᓂᓂᒧᐎᐣ (Severn Ojibwa),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,10.1.1,ojs-Cans,Severn Ojibwa (Unified Canadian Aboriginal Syllabics) +fv,fv_severn_ojibwa_rdot,ᐊᓂᔑᓂᓂᒧᐏᐣ (Severn Ojibwa right w-dot),Eastern Subarctic,fv_severn_ojibwa_kmw-9.0.js,1.1.1,ojs,Oji-Cree fv,fv_ojibwa,ᐊᓂᔑᓇᐯᒧᐎᓐ (a-finals),Eastern Subarctic,fv_ojibwa_kmw-9.0.js,10.1,ojb-Cans,Northwestern Ojibwa (Unified Canadian Aboriginal Syllabics) -fv,fv_ojibwa_rdot,ᐁᓂᔑᓇᐯᒧᐏᓐ (a-finals right w-dot),Eastern Subarctic,fv_ojibwa_rdot_kmw-9.0.js,1.0.2,oj,Ojibwa -fv,fv_ojibwa_ifinal,ᐊᓂᔑᓇᐯᒧᐎᣙ (i-finals),Eastern Subarctic,fv_ojibwa_ifinal_kmw-9.0.js,1.0.1,oj,Ojibwa -fv,fv_ojibwa_ifinal_rdot,ᐊᓂᔑᓇᐯᒧᐏᣙ (i-finals right w-dot),Eastern Subarctic,fv_ojibwa_ifinal_rdot_kmw-9.0.js,1.0.1,oj,Ojibwa +fv,fv_ojibwa_rdot,ᐁᓂᔑᓇᐯᒧᐏᓐ (a-finals right w-dot),Eastern Subarctic,fv_ojibwa_rdot_kmw-9.0.js,1.0.3,oj,Ojibwa +fv,fv_ojibwa_ifinal,ᐊᓂᔑᓇᐯᒧᐎᣙ (i-finals),Eastern Subarctic,fv_ojibwa_ifinal_kmw-9.0.js,1.0.2,oj,Ojibwa +fv,fv_ojibwa_ifinal_rdot,ᐊᓂᔑᓇᐯᒧᐏᣙ (i-finals right w-dot),Eastern Subarctic,fv_ojibwa_ifinal_rdot_kmw-9.0.js,1.0.2,oj,Ojibwa fv,fv_naskapi,ᓇᔅᑲᐱ (Naskapi),Eastern Subarctic,fv_naskapi_kmw-9.0.js,9.3.1,nsk-Cans,Naskapi (Unified Canadian Aboriginal Syllabics) sil,sil_euro_latin,English,European,european2-1.6.js,3.0.2,en,English basic,basic_kbdcan,Français,European,canadian_french-1.0.js,1.1.1,fr-CA,French (Canada) -fv,fv_anishinaabemowin,Anishinaabemowin,Great Lakes - St. Lawrence,fv_anishinaabemowin_kmw-9.0.js,10.1,oj,Ojibwa +fv,fv_anishinaabemowin,Anishinaabemowin,Great Lakes - St. Lawrence,fv_anishinaabemowin_kmw-9.0.js,10.2,oj,Ojibwa fv,fv_bodewadminwen,Bodéwadminwen-Nishnabémwen,Great Lakes - St. Lawrence,fv_bodewadminwen_kmw-9.0.js,9.1.1,pot-Latn,Potawatomi (Latin) fv,fv_goyogohono,Goyogo̱hó:nǫ',Great Lakes - St. Lawrence,fv_goyogohono_kmw-9.0.js,9.2.1,cay-Latn,Cayuga (Latin) fv,fv_kanienkeha_e,Kanien'kéha-Kanyen'kéha,Great Lakes - St. Lawrence,fv_kanienkeha_e_kmw-9.0.js,9.1.3,moh-Latn,Mohawk (Latin) @@ -85,11 +85,11 @@ fv,fv_nakoda,Nakoda,Prairies,fv_nakoda_kmw-9.0.js,9.1.1,asb-Latn,Assiniboine (La fv,fv_tsuutina,Tsúùt'ínà,Prairies,fv_tsuutina_kmw-9.0.js,9.1.1,srs-Latn,Sarsi (Latin) fv,fv_plains_cree,ᓀᐦᐃᔭᐍᐏᐣ (Plains Cree),Prairies,fv_plains_cree_kmw-9.0.js,11.1,crk-Cans,ᓀᐦᐃᔭᐍᐏᐣ (Cree syllabics) fv,fv_dine_bizaad,Diné Bizaad,South West,fv_dine_bizaad_kmw-9.0.js,9.1.1,nv-Latn,Navajo (Latin) -fv,fv_dane_zaa_zaage,Dane-Z̲aa Z̲áágéʔ,Western Subarctic,fv_dane_zaa_zaage_kmw-9.0.js,9.4,bea,Beaver -fv,fv_dene_dzage,Dene Dzage,Western Subarctic,fv_dene_dzage_kmw-9.0.js,11.0.1,kkz-Latn,Kaska (Latin) -fv,fv_dene_zhatie,Dene Zhatié,Western Subarctic,fv_dene_zhatie_kmw-9.0.js,10.2.1,den,Dene Zhatıé -fv,fv_denesuline_epsilon,Dënesųłıné,Western Subarctic,fv_denesuline_epsilon_kmw-9.0.js,10.0.1,chp,Chipewyan -fv,fv_denesuline,Dɛnɛsųłiné,Western Subarctic,fv_denesuline_kmw-9.0.js,10.0.1,chp,Chipewyan (Latin) +fv,fv_dane_zaa_zaage,Dane-Z̲aa Z̲áágéʔ,Western Subarctic,fv_dane_zaa_zaage_kmw-9.0.js,9.4.1,bea,Beaver +fv,fv_dene_dzage,Danezāgéʼ,Western Subarctic,fv_dene_dzage_kmw-9.0.js,11.0.1,kkz-Latn,Kaska (Latin) +fv,fv_dene_zhatie,Dene Zhatıé,Western Subarctic,fv_dene_zhatie_kmw-9.0.js,10.2.1,den,Dene Zhatıé +fv,fv_denesuline_epsilon,Dɛnɛsųłįnɛ,Western Subarctic,fv_denesuline_epsilon_kmw-9.0.js,10.0.2,chp,Chipewyan +fv,fv_denesuline,Dënesųłıné,Western Subarctic,fv_denesuline_kmw-9.0.js,10.0.1,chp,Chipewyan (Latin) fv,fv_gwichin,Gwich'in,Western Subarctic,fv_gwichin_kmw-9.0.js,9.2.1,gwi-Latn,Gwichʼin (Latin) fv,fv_han,Hän,Western Subarctic,fv_han_kmw-9.0.js,9.2,haa-Latn,Han (Latin) fv,fv_kashogotine_yati,K'áshogot'ı̨nę́ Yatı̨́,Western Subarctic,fv_kashogotine_yati_kmw-9.0.js,10.1,scs,North Slavey @@ -100,7 +100,7 @@ fv,fv_northern_tutchone,Northern Tutchone,Western Subarctic,fv_northern_tutchone fv,fv_sahugotine_yati,Sahtúgot'ı̨nę́ Yatı̨́,Western Subarctic,fv_sahugotine_yati_kmw-9.0.js,9.1.1,scs-Latn,North Slavey (Latin) fv,fv_shihgotine_yati,Shıhgot'ı̨nę́ Yatı̨́,Western Subarctic,fv_shihgotine_yati_kmw-9.0.js,9.1.1,scs-Latn,North Slavey (Latin) fv,fv_southern_tutchone,Southern Tutchone,Western Subarctic,fv_southern_tutchone_kmw-9.0.js,9.3,tce-Latn,Southern Tutchone (Latin) -fv,fv_tagizi_dene,Tāgizi Dene,Western Subarctic,fv_tagizi_dene_kmw-9.0.js,9.3,tgx-Latn,Tagish (Latin) +fv,fv_tagizi_dene,Tāgizi Dene,Western Subarctic,fv_tagizi_dene_kmw-9.0.js,9.4,tgx-Latn,Tagish (Latin) fv,fv_tlicho_yatii,Tłı̨chǫ Yatıı̀,Western Subarctic,fv_tlicho_yatii_kmw-9.0.js,9.1.1,dgr-Latn,Dogrib (Latin) fv,fv_dene_mb,ᑌᓀ ᔭᕠᐁ (Dene MB),Western Subarctic,fv_dene_mb_kmw-9.0.js,9.2.1,chp-Cans,Chipewyan (Unified Canadian Aboriginal Syllabics) fv,fv_dene_nt,ᑌᓀ ᔭᕱᐁ (Dene NT),Western Subarctic,fv_dene_nt_kmw-9.0.js,9.2.1,chp-Cans,Chipewyan (Unified Canadian Aboriginal Syllabics) diff --git a/oem/firstvoices/windows/src/xml/config.css b/oem/firstvoices/windows/src/xml/config.css index 28f09464765..763c7229a1c 100644 --- a/oem/firstvoices/windows/src/xml/config.css +++ b/oem/firstvoices/windows/src/xml/config.css @@ -762,10 +762,10 @@ th color: #444; position: absolute; bottom: 32px; - left: 80px; - height: 50px; - padding-top: 25px; - padding-left: 56px; + left: 73px; + height: 64px; + padding-top: 32px; + padding-left: 110px; box-sizing: border-box; } @@ -1021,4 +1021,4 @@ th width:100%; height:100%; border:none; -} \ No newline at end of file +} diff --git a/oem/firstvoices/windows/src/xml/keyman_support.xsl b/oem/firstvoices/windows/src/xml/keyman_support.xsl index dfd8c8445bd..81f72fdb66f 100644 --- a/oem/firstvoices/windows/src/xml/keyman_support.xsl +++ b/oem/firstvoices/windows/src/xml/keyman_support.xsl @@ -32,11 +32,19 @@
- + + + + +
- + + + + +
diff --git a/oem/firstvoices/windows/src/xml/sil-logo-blue.png b/oem/firstvoices/windows/src/xml/sil-logo-blue.png index e0d7ab6b373..b65c2a4e086 100644 Binary files a/oem/firstvoices/windows/src/xml/sil-logo-blue.png and b/oem/firstvoices/windows/src/xml/sil-logo-blue.png differ diff --git a/oem/firstvoices/windows/src/xml/strings.xml b/oem/firstvoices/windows/src/xml/strings.xml index d0708d2b4c9..fbd099c8c74 100644 --- a/oem/firstvoices/windows/src/xml/strings.xml +++ b/oem/firstvoices/windows/src/xml/strings.xml @@ -512,6 +512,16 @@ Copyright © SIL International. All Rights Reserved. + + + + Created by %1$s + + + + + Copyright © %1$s. All Rights Reserved. + diff --git a/package-lock.json b/package-lock.json index c317ee79d48..a04d7539e01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,6 @@ "developer/src/kmc-package", "developer/src/kmc", "developer/src/server", - "common/models/*", "common/test/resources", "common/tools/*", "common/web/*", @@ -70,45 +69,6 @@ "node": "20.16.0" } }, - "common/models/templates": { - "name": "@keymanapp/models-templates", - "license": "MIT", - "dependencies": { - "@keymanapp/keyman-version": "*", - "@keymanapp/models-types": "*", - "@keymanapp/models-wordbreakers": "*", - "@keymanapp/resources-gosh": "*" - }, - "devDependencies": { - "@keymanapp/models-types": "*", - "@keymanapp/web-utils": "*", - "@types/mocha": "^7.0.2", - "c8": "^7.12.0", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - } - }, - "common/models/types": { - "name": "@keymanapp/models-types", - "license": "MIT", - "devDependencies": { - "typescript": "^5.4.5" - } - }, - "common/models/wordbreakers": { - "name": "@keymanapp/models-wordbreakers", - "license": "MIT", - "devDependencies": { - "@keymanapp/models-types": "*", - "@keymanapp/resources-gosh": "*", - "@types/mocha": "^7.0.2", - "c8": "^7.12.0", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - } - }, "common/test/resources": { "name": "@keymanapp/common-test-resources", "license": "MIT", @@ -119,6 +79,7 @@ }, "common/tools/hextobin": { "name": "@keymanapp/hextobin", + "hasInstallScript": true, "license": "MIT", "dependencies": { "commander": "^5.1.0" @@ -167,17 +128,6 @@ "typescript": "^5.4.5" } }, - "common/web/sentry-manager": { - "name": "@keymanapp/web-sentry-manager", - "license": "MIT", - "dependencies": { - "@keymanapp/keyman-version": "*", - "@sentry/browser": "^5.27.4" - }, - "devDependencies": { - "typescript": "^5.4.5" - } - }, "common/web/types": { "name": "@keymanapp/common-types", "license": "MIT", @@ -356,18 +306,6 @@ "node": ">=4" } }, - "common/web/utils": { - "name": "@keymanapp/web-utils", - "license": "MIT", - "devDependencies": { - "@keymanapp/keyman-version": "*", - "@keymanapp/resources-gosh": "*", - "c8": "^7.12.0", - "mocha": "^10.0.0", - "mocha-teamcity-reporter": "^4.0.0", - "typescript": "^5.4.5" - } - }, "core/include/ldml": { "name": "@keymanapp/ldml-keyboard-constants", "license": "MIT" @@ -390,6 +328,7 @@ "@keymanapp/common-types": "*", "@sentry/node": "^7.57.0", "eventemitter3": "^5.0.0", + "fast-xml-parser": "^4.5.0", "restructure": "^3.0.1", "sax": ">=0.6.0", "semver": "^7.5.4", @@ -399,7 +338,6 @@ "@types/git-diff": "^2.0.3", "@types/node": "^20.4.1", "@types/semver": "^7.3.12", - "@types/xml2js": "^0.4.5", "c8": "^7.12.0", "git-diff": "^2.0.6", "mocha": "^8.4.0", @@ -521,7 +459,6 @@ "@keymanapp/kmc-model": "*", "@keymanapp/kmc-model-info": "*", "@keymanapp/kmc-package": "*", - "@keymanapp/models-types": "*", "@sentry/node": "^7.57.0", "chalk": "^2.4.2", "commander": "^10.0.0", @@ -1146,11 +1083,13 @@ "devDependencies": { "@keymanapp/developer-test-helpers": "*", "@keymanapp/resources-gosh": "*", + "@types/common-tags": "^1.8.4", "@types/mocha": "^5.2.7", "@types/node": "^20.4.1", "@types/semver": "^7.3.12", "c8": "^7.12.0", "chalk": "^2.4.2", + "common-tags": "^1.8.2", "mocha": "^8.4.0", "typescript": "^5.4.5" } @@ -1330,7 +1269,6 @@ "dependencies": { "@keymanapp/common-types": "*", "@keymanapp/keyman-version": "*", - "@keymanapp/models-types": "*", "typescript": "^5.4.5" }, "devDependencies": { @@ -1349,8 +1287,7 @@ "license": "MIT", "dependencies": { "@keymanapp/common-types": "*", - "@keymanapp/developer-utils": "*", - "@keymanapp/models-types": "*" + "@keymanapp/developer-utils": "*" }, "devDependencies": { "@types/mocha": "^5.2.7", @@ -1924,7 +1861,7 @@ "@keymanapp/developer-utils": "*", "@sentry/node": "^7.57.0", "chalk": "^4.1.2", - "express": "^4.19.2", + "express": "^4.20.0", "multer": "^1.4.5-lts.1", "ngrok": "^5.0.0-beta.2", "open": "^8.4.0", @@ -2894,15 +2831,11 @@ "link": true }, "node_modules/@keymanapp/models-templates": { - "resolved": "common/models/templates", - "link": true - }, - "node_modules/@keymanapp/models-types": { - "resolved": "common/models/types", + "resolved": "web/src/engine/predictive-text/templates", "link": true }, "node_modules/@keymanapp/models-wordbreakers": { - "resolved": "common/models/wordbreakers", + "resolved": "web/src/engine/predictive-text/wordbreakers", "link": true }, "node_modules/@keymanapp/recorder-core": { @@ -2918,11 +2851,11 @@ "link": true }, "node_modules/@keymanapp/web-sentry-manager": { - "resolved": "common/web/sentry-manager", + "resolved": "web/src/engine/sentry-manager", "link": true }, "node_modules/@keymanapp/web-utils": { - "resolved": "common/web/utils", + "resolved": "web/src/engine/common/web-utils", "link": true }, "node_modules/@mdn/browser-compat-data": { @@ -3707,9 +3640,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.4.tgz", - "integrity": "sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", + "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==", "cpu": [ "arm" ], @@ -3720,9 +3653,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.4.tgz", - "integrity": "sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz", + "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==", "cpu": [ "arm64" ], @@ -3733,9 +3666,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.4.tgz", - "integrity": "sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz", + "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==", "cpu": [ "arm64" ], @@ -3746,9 +3679,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.4.tgz", - "integrity": "sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz", + "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==", "cpu": [ "x64" ], @@ -3759,9 +3692,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.4.tgz", - "integrity": "sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz", + "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==", "cpu": [ "arm" ], @@ -3772,9 +3705,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.4.tgz", - "integrity": "sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz", + "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==", "cpu": [ "arm" ], @@ -3785,9 +3718,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.4.tgz", - "integrity": "sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz", + "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==", "cpu": [ "arm64" ], @@ -3798,9 +3731,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.4.tgz", - "integrity": "sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz", + "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==", "cpu": [ "arm64" ], @@ -3811,9 +3744,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.4.tgz", - "integrity": "sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz", + "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==", "cpu": [ "ppc64" ], @@ -3824,9 +3757,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.4.tgz", - "integrity": "sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz", + "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==", "cpu": [ "riscv64" ], @@ -3837,9 +3770,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.4.tgz", - "integrity": "sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz", + "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==", "cpu": [ "s390x" ], @@ -3850,9 +3783,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.4.tgz", - "integrity": "sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz", + "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==", "cpu": [ "x64" ], @@ -3863,9 +3796,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.4.tgz", - "integrity": "sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz", + "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==", "cpu": [ "x64" ], @@ -3876,9 +3809,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.4.tgz", - "integrity": "sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz", + "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==", "cpu": [ "arm64" ], @@ -3889,9 +3822,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.4.tgz", - "integrity": "sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz", + "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==", "cpu": [ "ia32" ], @@ -3902,9 +3835,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.4.tgz", - "integrity": "sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz", + "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==", "cpu": [ "x64" ], @@ -4055,6 +3988,7 @@ }, "node_modules/@sentry/browser": { "version": "5.30.0", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sentry/core": "5.30.0", @@ -4069,7 +4003,8 @@ "node_modules/@sentry/browser/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true }, "node_modules/@sentry/cli": { "version": "2.31.0", @@ -4217,6 +4152,7 @@ }, "node_modules/@sentry/core": { "version": "5.30.0", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sentry/hub": "5.30.0", @@ -4232,10 +4168,12 @@ "node_modules/@sentry/core/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true }, "node_modules/@sentry/hub": { "version": "5.30.0", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sentry/types": "5.30.0", @@ -4249,10 +4187,12 @@ "node_modules/@sentry/hub/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true }, "node_modules/@sentry/minimal": { "version": "5.30.0", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sentry/hub": "5.30.0", @@ -4266,7 +4206,8 @@ "node_modules/@sentry/minimal/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true }, "node_modules/@sentry/node": { "version": "7.108.0", @@ -4315,6 +4256,7 @@ }, "node_modules/@sentry/types": { "version": "5.30.0", + "dev": true, "license": "BSD-3-Clause", "engines": { "node": ">=6" @@ -4322,6 +4264,7 @@ }, "node_modules/@sentry/utils": { "version": "5.30.0", + "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sentry/types": "5.30.0", @@ -4334,7 +4277,8 @@ "node_modules/@sentry/utils/node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true }, "node_modules/@sindresorhus/is": { "version": "4.6.0", @@ -4459,6 +4403,13 @@ "integrity": "sha512-uv0aG6R0Y8WHZLTamZwtfsDLVRnOa+n+n5rEvFWL5Na5gZ8V2Teab/duDPFzIIIhs9qizDpcavCusCLJZu62Kw==", "dev": true }, + "node_modules/@types/common-tags": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.4.tgz", + "integrity": "sha512-S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/connect": { "version": "3.4.35", "dev": true, @@ -4718,14 +4669,6 @@ "@types/node": "*" } }, - "node_modules/@types/xml2js": { - "version": "0.4.9", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@types/yargs": { "version": "17.0.26", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.26.tgz", @@ -6093,9 +6036,9 @@ } }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -6105,7 +6048,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -6117,7 +6060,8 @@ }, "node_modules/body-parser/node_modules/debug": { "version": "2.6.9", - "license": "MIT", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dependencies": { "ms": "2.0.0" } @@ -6132,17 +6076,21 @@ }, "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/body-parser/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "node_modules/body-parser/node_modules/qs": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "ee-first": "1.1.1" + "side-channel": "^1.0.6" }, "engines": { - "node": ">= 0.8" + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/brace-expansion": { @@ -6410,12 +6358,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6822,6 +6776,16 @@ "node": ">=14" } }, + "node_modules/common-tags": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/compress-brotli": { "version": "1.3.6", "license": "MIT", @@ -7109,6 +7073,22 @@ "node": ">=10" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "license": "MIT", @@ -7361,6 +7341,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-module-lexer": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz", @@ -8550,37 +8549,37 @@ "dev": true }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.20.0.tgz", + "integrity": "sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", "finalhandler": "1.2.0", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", "qs": "6.11.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.0", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -8614,6 +8613,14 @@ "node": ">= 0.8" } }, + "node_modules/express/node_modules/encodeurl": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/express/node_modules/finalhandler": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", @@ -8631,21 +8638,18 @@ "node": ">= 0.8" } }, - "node_modules/express/node_modules/ms": { - "version": "2.0.0", - "license": "MIT" - }, - "node_modules/express/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dependencies": { - "ee-first": "1.1.1" - }, + "node_modules/express/node_modules/finalhandler/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "engines": { "node": ">= 0.8" } }, + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "license": "MIT" + }, "node_modules/express/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -8729,6 +8733,28 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "node_modules/fast-xml-parser": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz", + "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + }, + { + "type": "paypal", + "url": "https://paypal.me/naturalintelligence" + } + ], + "license": "MIT", + "dependencies": { + "strnum": "^1.0.5" + }, + "bin": { + "fxparser": "src/cli/cli.js" + } + }, "node_modules/fastq": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", @@ -8990,13 +9016,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9253,7 +9284,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -9305,6 +9335,7 @@ }, "node_modules/has": { "version": "1.0.3", + "dev": true, "license": "MIT", "dependencies": { "function-bind": "^1.1.1" @@ -9330,12 +9361,11 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", - "dev": true, + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.1.1" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9345,7 +9375,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -9383,7 +9412,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -10874,8 +10902,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "license": "MIT" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge2": { "version": "1.4.1", @@ -10906,6 +10938,17 @@ "node": ">=8.6" } }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/mime-db": { "version": "1.52.0", "license": "MIT", @@ -11699,9 +11742,12 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -11755,9 +11801,9 @@ "license": "MIT" }, "node_modules/on-finished": { - "version": "2.3.0", - "dev": true, - "license": "MIT", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dependencies": { "ee-first": "1.1.1" }, @@ -12072,8 +12118,9 @@ "dev": true }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "license": "MIT" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/path-type": { "version": "4.0.0", @@ -12464,7 +12511,8 @@ }, "node_modules/range-parser": { "version": "1.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "engines": { "node": ">= 0.6" } @@ -12710,9 +12758,9 @@ } }, "node_modules/rollup": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.16.4.tgz", - "integrity": "sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==", + "version": "4.22.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", + "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", "dev": true, "dependencies": { "@types/estree": "1.0.5" @@ -12725,22 +12773,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.16.4", - "@rollup/rollup-android-arm64": "4.16.4", - "@rollup/rollup-darwin-arm64": "4.16.4", - "@rollup/rollup-darwin-x64": "4.16.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.16.4", - "@rollup/rollup-linux-arm-musleabihf": "4.16.4", - "@rollup/rollup-linux-arm64-gnu": "4.16.4", - "@rollup/rollup-linux-arm64-musl": "4.16.4", - "@rollup/rollup-linux-powerpc64le-gnu": "4.16.4", - "@rollup/rollup-linux-riscv64-gnu": "4.16.4", - "@rollup/rollup-linux-s390x-gnu": "4.16.4", - "@rollup/rollup-linux-x64-gnu": "4.16.4", - "@rollup/rollup-linux-x64-musl": "4.16.4", - "@rollup/rollup-win32-arm64-msvc": "4.16.4", - "@rollup/rollup-win32-ia32-msvc": "4.16.4", - "@rollup/rollup-win32-x64-msvc": "4.16.4", + "@rollup/rollup-android-arm-eabi": "4.22.4", + "@rollup/rollup-android-arm64": "4.22.4", + "@rollup/rollup-darwin-arm64": "4.22.4", + "@rollup/rollup-darwin-x64": "4.22.4", + "@rollup/rollup-linux-arm-gnueabihf": "4.22.4", + "@rollup/rollup-linux-arm-musleabihf": "4.22.4", + "@rollup/rollup-linux-arm64-gnu": "4.22.4", + "@rollup/rollup-linux-arm64-musl": "4.22.4", + "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4", + "@rollup/rollup-linux-riscv64-gnu": "4.22.4", + "@rollup/rollup-linux-s390x-gnu": "4.22.4", + "@rollup/rollup-linux-x64-gnu": "4.22.4", + "@rollup/rollup-linux-x64-musl": "4.22.4", + "@rollup/rollup-win32-arm64-msvc": "4.22.4", + "@rollup/rollup-win32-ia32-msvc": "4.22.4", + "@rollup/rollup-win32-x64-msvc": "4.22.4", "fsevents": "~2.3.2" } }, @@ -12840,9 +12888,9 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -12883,33 +12931,11 @@ "node": ">= 0.8" } }, - "node_modules/send/node_modules/mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, - "node_modules/send/node_modules/on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dependencies": { - "ee-first": "1.1.1" - }, - "engines": { - "node": ">= 0.8" - } - }, "node_modules/send/node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -12927,9 +12953,9 @@ } }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.0.tgz", + "integrity": "sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==", "dependencies": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", @@ -12940,6 +12966,79 @@ "node": ">= 0.8.0" } }, + "node_modules/serve-static/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/serve-static/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/serve-static/node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/serve-static/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/serve-static/node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-static/node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/set-immediate-shim": { "version": "1.0.1", "license": "MIT", @@ -12995,13 +13094,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13466,6 +13569,12 @@ "resolved": "resources/tools/strip-emoji", "link": true }, + "node_modules/strnum": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz", + "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==", + "license": "MIT" + }, "node_modules/supports-color": { "version": "7.2.0", "license": "MIT", @@ -15220,9 +15329,9 @@ "name": "keyman", "license": "MIT", "dependencies": { + "@keymanapp/common-types": "*", "@keymanapp/keyman-version": "*", "@keymanapp/lexical-model-layer": "*", - "@keymanapp/models-types": "*", "@keymanapp/recorder-core": "*", "@keymanapp/web-utils": "*", "core-js": "^3.34.0", @@ -15241,6 +15350,18 @@ "tsx": "^4.19.0" } }, + "web/src/engine/common/web-utils": { + "name": "@keymanapp/web-utils", + "license": "MIT", + "devDependencies": { + "@keymanapp/keyman-version": "*", + "@keymanapp/resources-gosh": "*", + "c8": "^7.12.0", + "mocha": "^10.0.0", + "mocha-teamcity-reporter": "^4.0.0", + "typescript": "^5.4.5" + } + }, "web/src/engine/osk/gesture-processor": { "name": "@keymanapp/gesture-recognizer", "dependencies": { @@ -15255,6 +15376,25 @@ "typescript": "^5.4.5" } }, + "web/src/engine/predictive-text/templates": { + "name": "@keymanapp/models-templates", + "license": "MIT", + "dependencies": { + "@keymanapp/common-types": "*", + "@keymanapp/keyman-version": "*", + "@keymanapp/models-wordbreakers": "*", + "@keymanapp/resources-gosh": "*" + }, + "devDependencies": { + "@keymanapp/common-types": "*", + "@keymanapp/web-utils": "*", + "@types/mocha": "^7.0.2", + "c8": "^7.12.0", + "mocha": "^10.0.0", + "mocha-teamcity-reporter": "^4.0.0", + "typescript": "^5.4.5" + } + }, "web/src/engine/predictive-text/types": { "name": "@keymanapp/lm-message-types", "license": "MIT", @@ -15262,6 +15402,19 @@ "typescript": "^5.4.5" } }, + "web/src/engine/predictive-text/wordbreakers": { + "name": "@keymanapp/models-wordbreakers", + "license": "MIT", + "devDependencies": { + "@keymanapp/common-types": "*", + "@keymanapp/resources-gosh": "*", + "@types/mocha": "^7.0.2", + "c8": "^7.12.0", + "mocha": "^10.0.0", + "mocha-teamcity-reporter": "^4.0.0", + "typescript": "^5.4.5" + } + }, "web/src/engine/predictive-text/worker-main": { "name": "@keymanapp/lexical-model-layer", "license": "MIT", @@ -15274,7 +15427,7 @@ "string.prototype.codepointat": "^0.2.1" }, "devDependencies": { - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@keymanapp/resources-gosh": "*", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", @@ -15295,7 +15448,7 @@ }, "devDependencies": { "@keymanapp/common-test-resources": "*", - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@keymanapp/resources-gosh": "*", "c8": "^7.12.0", "combine-source-map": "^0.8.0", @@ -15304,12 +15457,24 @@ "typescript": "^5.4.5" } }, + "web/src/engine/sentry-manager": { + "name": "@keymanapp/web-sentry-manager", + "dev": true, + "license": "MIT", + "dependencies": { + "@keymanapp/keyman-version": "*", + "@sentry/browser": "^5.27.4" + }, + "devDependencies": { + "typescript": "^5.4.5" + } + }, "web/src/tools/testing/recorder-core": { "name": "@keymanapp/recorder-core", "license": "MIT", "dependencies": { + "@keymanapp/common-types": "*", "@keymanapp/keyman-version": "*", - "@keymanapp/models-types": "*", "@keymanapp/web-utils": "*" }, "devDependencies": { diff --git a/package.json b/package.json index 72508afc034..2c06c1652c8 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "developer/src/kmc-package", "developer/src/kmc", "developer/src/server", - "common/models/*", "common/test/resources", "common/tools/*", "common/web/*", diff --git a/resources/build/build-help.inc.sh b/resources/build/build-help.inc.sh index f5770fe885e..364f3f1bcd0 100644 --- a/resources/build/build-help.inc.sh +++ b/resources/build/build-help.inc.sh @@ -36,7 +36,7 @@ function _build_help_build() { local CSS="$KEYMAN_ROOT/resources/build/offline-help-style-spec.txt" local PLATFORM="$1" - cd "$KEYMAN_ROOT/$PLATFORM/help" + cd "$KEYMAN_ROOT/$PLATFORM/docs/help" local MD=`find . -name "*.md"` local DESTHTM="$KEYMAN_ROOT/$PLATFORM/$2" @@ -53,9 +53,9 @@ function _build_help_build() { # # Copy Images # - cd "$KEYMAN_ROOT/$PLATFORM/help/" + cd "$KEYMAN_ROOT/$PLATFORM/docs/help/" mkdir -p "$DESTHTM/${PLATFORM}_images" - cp $KEYMAN_ROOT/$PLATFORM/help/${PLATFORM}_images/* "$DESTHTM/${PLATFORM}_images/" + cp $KEYMAN_ROOT/$PLATFORM/docs/help/${PLATFORM}_images/* "$DESTHTM/${PLATFORM}_images/" } # @@ -74,7 +74,7 @@ function _build_help_build() { # # ### Description # -# Expects to find .md source under $KEYMAN_ROOT/$platform/help/, and +# Expects to find .md source under $KEYMAN_ROOT/$platform/docs/help/, and # will write the output .html to $KEYMAN_ROOT/$platform/$output_path. # function build_help_html() { diff --git a/resources/build/builder.md b/resources/build/builder.md index 0e3ef901f7f..dd52318810d 100644 --- a/resources/build/builder.md +++ b/resources/build/builder.md @@ -327,6 +327,8 @@ The following parameters are pre-defined and should not be overridden: * `--no-color`: forces off ANSI color output for the script * `--verbose`, `-v`: verbose mode, sets the [`$builder_verbose`] variable * `--debug`, `-d`: debug build; see [`builder_is_debug_build`] for more detail +* `--offline`: allow to build while offline. This might fail if not all + dependencies are cached. -------------------------------------------------------------------------------- diff --git a/resources/build/help-keyman-com.sh b/resources/build/help-keyman-com.sh index 6160816443d..b8391256383 100755 --- a/resources/build/help-keyman-com.sh +++ b/resources/build/help-keyman-com.sh @@ -74,19 +74,19 @@ function upload { function upload_keyman_help { case $platform in android) - upload android/help products/android/$VERSION_RELEASE + upload android/docs/help products/android/$VERSION_RELEASE ;; ios) - upload ios/help products/iphone-and-ipad/$VERSION_RELEASE + upload ios/docs/help products/iphone-and-ipad/$VERSION_RELEASE ;; linux) pushd "$KEYMAN_ROOT/linux/keyman-config" > /dev/null ./build.sh build popd > /dev/null - upload linux/help products/linux/$VERSION_RELEASE + upload linux/docs/help products/linux/$VERSION_RELEASE ;; mac) - upload mac/help products/mac/$VERSION_RELEASE + upload mac/docs/help products/mac/$VERSION_RELEASE ;; windows) # Note: `/windows/src/desktop/help/build.sh web` must be run first @@ -94,6 +94,7 @@ function upload_keyman_help { ;; developer) # Note: `/developer/build.sh api` must be run first - covers both uploads + upload developer/docs/help developer/$VERSION_RELEASE upload developer/build/docs developer/$VERSION_RELEASE/reference/api upload developer/src/kmc/build/messages developer/$VERSION_RELEASE/reference/messages ;; diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh index 4dcf5e64f1e..a816395ab20 100644 --- a/resources/build/minimum-versions.inc.sh +++ b/resources/build/minimum-versions.inc.sh @@ -18,7 +18,7 @@ KEYMAN_MIN_TARGET_VERSION_UBUNTU=20.04 # Ubuntu 20.04 Focal KEYMAN_MIN_TARGET_VERSION_CHROME=95.0 # Final version that runs on Android 5.0 # Dependency versions -KEYMAN_MIN_VERSION_NODE_MAJOR=20 # node version source of truth is /package.json:/engines/node +KEYMAN_MIN_VERSION_NODE_MAJOR=20 # node version source of truth is /package.json:/engines/node; use KEYMAN_USE_NVM to automatically update KEYMAN_MIN_VERSION_NPM=10.5.1 # 10.5.0 has bug, discussed in #10350 KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.64 # Use KEYMAN_USE_EMSDK to automatically update to this version KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019 @@ -39,4 +39,4 @@ KEYMAN_VERSION_CLDR=45 # LDML Keyboards version KEYMAN_VERSION_ISO639_3=2024-05-22 # Date of last import KEYMAN_VERSION_LANGTAGS=2024-05-22 # Date of last import KEYMAN_VERSION_LANGTAGS_SUBTAG_REGISTRY=2024-05-16 # Date of last import -KEYMAN_VERSION_UNICODE=15.1.0 # UCD + related data +KEYMAN_VERSION_UNICODE=16.0.0 # UCD + related data diff --git a/resources/builder.inc.sh b/resources/builder.inc.sh index b233614029d..c4cf586f42b 100755 --- a/resources/builder.inc.sh +++ b/resources/builder.inc.sh @@ -40,6 +40,12 @@ function _builder_init() { else builder_use_color false fi + + # Set shared Meson package cache (works with Meson >= 1.3) + if [[ -z ${MESON_PACKAGE_CACHE_DIR:-} ]]; then + export MESON_PACKAGE_CACHE_DIR="${XDG_CACHE_HOME:-${HOME}/.cache}/keyman/builder" + mkdir -p "${MESON_PACKAGE_CACHE_DIR}" + fi } function _builder_findRepoRoot() { @@ -416,6 +422,7 @@ _builder_execute_child() { ${child_options[@]} \ $builder_verbose \ $builder_debug \ + $_builder_offline \ && ( if $_builder_debug_internal; then builder_echo success "## $action$target completed successfully" @@ -1267,6 +1274,7 @@ _builder_parse_expanded_parameters() { _builder_chosen_options=() _builder_current_action= _builder_is_child=1 + _builder_offline= local n=0 @@ -1399,6 +1407,9 @@ _builder_parse_expanded_parameters() { # internal reporting function, ignores all other parameters _builder_report_dependencies ;; + --offline) + _builder_offline=--offline + ;; *) # script does not recognize anything of action or target form at this point. if [[ $key =~ ^: ]]; then @@ -1565,6 +1576,7 @@ builder_display_usage() { _builder_pad $width " --debug, -d" "Debug build" _builder_pad $width " --color" "Force colorized output" _builder_pad $width " --no-color" "Never use colorized output" + _builder_pad $width " --offline" "Try to build while being offline" if builder_has_dependencies; then _builder_pad $width " --deps" "Build dependencies if required (default)" _builder_pad $width " --no-deps" "Skip build of dependencies" @@ -1731,6 +1743,7 @@ _builder_do_build_deps() { "$REPO_ROOT/$dep/build.sh" "configure$dep_target" "build$dep_target" \ $builder_verbose \ $builder_debug \ + $_builder_offline \ $_builder_build_deps \ --builder-dep-parent "$THIS_SCRIPT_IDENTIFIER" && ( if $_builder_debug_internal; then @@ -1761,6 +1774,18 @@ builder_is_child_build() { return $_builder_is_child } +# +# return `1` for a regular build, `0` to try to build while being offline. +# The offline build might fail if not all dependencies are cached. +# +builder_try_offline() { + if [[ "${_builder_offline}" == "--offline" ]]; then + return 0 + else + return 1 + fi +} + # # returns `0` if we should attempt to do quick builds in a dependency build, for # example skipping `tsc -b` where a parent may also do it; corresponds to the diff --git a/resources/git-hooks/commit-msg b/resources/git-hooks/commit-msg index 427ad96b58c..fcb4f26a040 100755 --- a/resources/git-hooks/commit-msg +++ b/resources/git-hooks/commit-msg @@ -51,7 +51,7 @@ fi GIT_ORIGIN="$(git remote get-url origin)" -if [[ ! "$GIT_ORIGIN" =~ github\.com/keymanapp ]]; then +if [[ ! "$GIT_ORIGIN" =~ github\.com(/|:)keymanapp ]]; then # Not a Keyman repository. We have no opinion. # echo "DEBUG: Not a Keyman repository. We don't care" exit 0 @@ -107,14 +107,18 @@ function print_error() { echo -e "----------------------------------------------------------${t_end}" echo -e "Valid types: ${t_grn}${types[@]}${t_end}" echo -e "Valid scopes: ${t_grn}${scopes[@]}${t_end}" - echo -e "Max length (first line): ${t_grn}$max_length${t_end}" + echo -e "" echo -e "Min length (first line): ${t_grn}$min_length${t_end}" + echo -e "Max length (first line): ${t_grn}$max_length${t_end}" + echo -e "" echo -e "If possible, append git trailers:" echo -e " * ${t_grn}Fixes: #1234${t_end}" echo -e " * ${t_grn}Fixes: KEYMAN-MODULE-XYZ${t_end}" echo -e " * ${t_grn}Cherry-pick-of: #2468${t_end}" echo -e " * ${t_grn}Co-authored-by: Firstname Lastname ${t_end}" + echo -e "" echo -e "${t_cyn}Example:${t_end} fix(windows): Re-attach the widget plug which had fallen out" + echo -e "" echo -e "${t_cyn}Reference${t_end}: https://github.com/keymanapp/keyman/wiki/Pull-Request-and-Commit-workflow-notes" echo -e "" echo -e "Tips: " @@ -136,4 +140,4 @@ if [[ ! $msg =~ $regexp ]]; then print_error fi exit 1 -fi \ No newline at end of file +fi diff --git a/resources/git-hooks/pre-commit b/resources/git-hooks/pre-commit index db7ba3cf30c..df165feaec6 100755 --- a/resources/git-hooks/pre-commit +++ b/resources/git-hooks/pre-commit @@ -6,7 +6,7 @@ GIT_ORIGIN="$(git remote get-url origin)" -if [[ ! "$GIT_ORIGIN" =~ github\.com/keymanapp ]]; then +if [[ ! "$GIT_ORIGIN" =~ github\.com(/|:)keymanapp ]]; then # Not a Keyman repository. We have no opinion. echo "DEBUG: Not a Keyman repository. We don't care" exit 0 diff --git a/resources/locate_emscripten.inc.sh b/resources/locate_emscripten.inc.sh index 3d470f75772..1d185f55525 100644 --- a/resources/locate_emscripten.inc.sh +++ b/resources/locate_emscripten.inc.sh @@ -41,7 +41,7 @@ locate_emscripten() { } # Ensure that we use correct version of emsdk on build agents. -# For developers, define KEYMAN_USE_SDK to do this on your +# For developers, define KEYMAN_USE_EMSDK to do this on your # build machine. verify_emscripten_version() { if [[ "$VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_EMSDK+x}" ]]; then diff --git a/resources/shellHelperFunctions.sh b/resources/shellHelperFunctions.sh index 7ded208d448..a3f419382e9 100755 --- a/resources/shellHelperFunctions.sh +++ b/resources/shellHelperFunctions.sh @@ -267,7 +267,12 @@ verify_npm_setup() { pushd "$KEYMAN_ROOT" > /dev/null - try_multiple_times npm ci + offline_param= + if builder_try_offline; then + builder_echo "Trying offline build" + offline_param=--prefer-offline + fi + try_multiple_times npm ${offline_param} ci popd > /dev/null } diff --git a/resources/standards-data/unicode-character-database/Blocks.txt b/resources/standards-data/unicode-character-database/Blocks.txt index 8fa3eaad04a..1517dde0cec 100644 --- a/resources/standards-data/unicode-character-database/Blocks.txt +++ b/resources/standards-data/unicode-character-database/Blocks.txt @@ -1,7 +1,8 @@ -# Blocks-15.1.0.txt -# Date: 2023-07-28, 15:47:20 GMT -# © 2023 Unicode®, Inc. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# Blocks-16.0.0.txt +# Date: 2024-02-02 +# © 2024 Unicode®, Inc. +# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -217,6 +218,7 @@ FFF0..FFFF; Specials 10500..1052F; Elbasan 10530..1056F; Caucasian Albanian 10570..105BF; Vithkuqi +105C0..105FF; Todhri 10600..1077F; Linear A 10780..107BF; Latin Extended-F 10800..1083F; Cypriot Syllabary @@ -239,6 +241,7 @@ FFF0..FFFF; Specials 10C00..10C4F; Old Turkic 10C80..10CFF; Old Hungarian 10D00..10D3F; Hanifi Rohingya +10D40..10D8F; Garay 10E60..10E7F; Rumi Numeral Symbols 10E80..10EBF; Yezidi 10EC0..10EFF; Arabic Extended-C @@ -258,12 +261,14 @@ FFF0..FFFF; Specials 11280..112AF; Multani 112B0..112FF; Khudawadi 11300..1137F; Grantha +11380..113FF; Tulu-Tigalari 11400..1147F; Newa 11480..114DF; Tirhuta 11580..115FF; Siddham 11600..1165F; Modi 11660..1167F; Mongolian Supplement 11680..116CF; Takri +116D0..116FF; Myanmar Extended-C 11700..1174F; Ahom 11800..1184F; Dogra 118A0..118FF; Warang Citi @@ -274,6 +279,7 @@ FFF0..FFFF; Specials 11AB0..11ABF; Unified Canadian Aboriginal Syllabics Extended-A 11AC0..11AFF; Pau Cin Hau 11B00..11B5F; Devanagari Extended-A +11BC0..11BFF; Sunuwar 11C00..11C6F; Bhaiksuki 11C70..11CBF; Marchen 11D00..11D5F; Masaram Gondi @@ -288,12 +294,15 @@ FFF0..FFFF; Specials 12F90..12FFF; Cypro-Minoan 13000..1342F; Egyptian Hieroglyphs 13430..1345F; Egyptian Hieroglyph Format Controls +13460..143FF; Egyptian Hieroglyphs Extended-A 14400..1467F; Anatolian Hieroglyphs +16100..1613F; Gurung Khema 16800..16A3F; Bamum Supplement 16A40..16A6F; Mro 16A70..16ACF; Tangsa 16AD0..16AFF; Bassa Vah 16B00..16B8F; Pahawh Hmong +16D40..16D7F; Kirat Rai 16E40..16E9F; Medefaidrin 16F00..16F9F; Miao 16FE0..16FFF; Ideographic Symbols and Punctuation @@ -308,6 +317,7 @@ FFF0..FFFF; Specials 1B170..1B2FF; Nushu 1BC00..1BC9F; Duployan 1BCA0..1BCAF; Shorthand Format Controls +1CC00..1CEBF; Symbols for Legacy Computing Supplement 1CF00..1CFCF; Znamenny Musical Notation 1D000..1D0FF; Byzantine Musical Symbols 1D100..1D1FF; Musical Symbols @@ -325,6 +335,7 @@ FFF0..FFFF; Specials 1E290..1E2BF; Toto 1E2C0..1E2FF; Wancho 1E4D0..1E4FF; Nag Mundari +1E5D0..1E5FF; Ol Onal 1E7E0..1E7FF; Ethiopic Extended-B 1E800..1E8DF; Mende Kikakui 1E900..1E95F; Adlam diff --git a/resources/standards-data/unicode-character-database/UnicodeData.txt b/resources/standards-data/unicode-character-database/UnicodeData.txt index bdcc41850d7..64258a37395 100644 --- a/resources/standards-data/unicode-character-database/UnicodeData.txt +++ b/resources/standards-data/unicode-character-database/UnicodeData.txt @@ -409,7 +409,7 @@ 0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199; 0199;LATIN SMALL LETTER K WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER K HOOK;;0198;;0198 019A;LATIN SMALL LETTER L WITH BAR;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED L;;023D;;023D -019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;;; +019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;A7DC;;A7DC 019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F; 019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272; 019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220 @@ -610,7 +610,7 @@ 0261;LATIN SMALL LETTER SCRIPT G;Ll;0;L;;;;;N;;;A7AC;;A7AC 0262;LATIN LETTER SMALL CAPITAL G;Ll;0;L;;;;;N;;;;; 0263;LATIN SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0194;;0194 -0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;;; +0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;A7CB;;A7CB 0265;LATIN SMALL LETTER TURNED H;Ll;0;L;;;;;N;;;A78D;;A78D 0266;LATIN SMALL LETTER H WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER H HOOK;;A7AA;;A7AA 0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;; @@ -2123,6 +2123,7 @@ 088E;ARABIC VERTICAL TAIL;Lo;0;AL;;;;;N;;;;; 0890;ARABIC POUND MARK ABOVE;Cf;0;AN;;;;;N;;;;; 0891;ARABIC PIASTRE MARK ABOVE;Cf;0;AN;;;;;N;;;;; +0897;ARABIC PEPET;Mn;230;NSM;;;;;N;;;;; 0898;ARABIC SMALL HIGH WORD AL-JUZ;Mn;230;NSM;;;;;N;;;;; 0899;ARABIC SMALL LOW WORD ISHMAAM;Mn;220;NSM;;;;;N;;;;; 089A;ARABIC SMALL LOW WORD IMAALA;Mn;220;NSM;;;;;N;;;;; @@ -6213,6 +6214,8 @@ 1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;; 1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;; 1B4C;BALINESE LETTER ARCHAIC JNYA;Lo;0;L;;;;;N;;;;; +1B4E;BALINESE INVERTED CARIK SIKI;Po;0;L;;;;;N;;;;; +1B4F;BALINESE INVERTED CARIK PAREREN;Po;0;L;;;;;N;;;;; 1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; 1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; 1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; @@ -6260,6 +6263,7 @@ 1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;; 1B7D;BALINESE PANTI LANTANG;Po;0;L;;;;;N;;;;; 1B7E;BALINESE PAMADA LANTANG;Po;0;L;;;;;N;;;;; +1B7F;BALINESE PANTI BAWAK;Po;0;L;;;;;N;;;;; 1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;; 1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;; 1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;; @@ -6511,6 +6515,8 @@ 1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A 1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462 1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A +1C89;CYRILLIC CAPITAL LETTER TJE;Lu;0;L;;;;;N;;;;1C8A; +1C8A;CYRILLIC SMALL LETTER TJE;Ll;0;L;;;;;N;;;1C89;;1C89 1C90;GEORGIAN MTAVRULI CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;10D0; 1C91;GEORGIAN MTAVRULI CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;10D1; 1C92;GEORGIAN MTAVRULI CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;10D2; @@ -7933,7 +7939,7 @@ 226A;MUCH LESS-THAN;Sm;0;ON;;;;;Y;MUCH LESS THAN;;;; 226B;MUCH GREATER-THAN;Sm;0;ON;;;;;Y;MUCH GREATER THAN;;;; 226C;BETWEEN;Sm;0;ON;;;;;N;;;;; -226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;N;;;;; +226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;Y;;;;; 226E;NOT LESS-THAN;Sm;0;ON;003C 0338;;;;Y;NOT LESS THAN;;;; 226F;NOT GREATER-THAN;Sm;0;ON;003E 0338;;;;Y;NOT GREATER THAN;;;; 2270;NEITHER LESS-THAN NOR EQUAL TO;Sm;0;ON;2264 0338;;;;Y;NEITHER LESS THAN NOR EQUAL TO;;;; @@ -8375,6 +8381,9 @@ 2424;SYMBOL FOR NEWLINE;So;0;ON;;;;;N;GRAPHIC FOR NEWLINE;;;; 2425;SYMBOL FOR DELETE FORM TWO;So;0;ON;;;;;N;;;;; 2426;SYMBOL FOR SUBSTITUTE FORM TWO;So;0;ON;;;;;N;;;;; +2427;SYMBOL FOR DELETE SQUARE CHECKER BOARD FORM;So;0;ON;;;;;N;;;;; +2428;SYMBOL FOR DELETE RECTANGULAR CHECKER BOARD FORM;So;0;ON;;;;;N;;;;; +2429;SYMBOL FOR DELETE MEDIUM SHADE FORM;So;0;ON;;;;;N;;;;; 2440;OCR HOOK;So;0;ON;;;;;N;;;;; 2441;OCR CHAIR;So;0;ON;;;;;N;;;;; 2442;OCR FORK;So;0;ON;;;;;N;;;;; @@ -11709,6 +11718,8 @@ 31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;; 31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;; 31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;; +31E4;CJK STROKE HXG;So;0;ON;;;;;N;;;;; +31E5;CJK STROKE SZP;So;0;ON;;;;;N;;;;; 31EF;IDEOGRAPHIC DESCRIPTION CHARACTER SUBTRACTION;So;0;ON;;;;;N;;;;; 31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;; 31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;; @@ -14260,6 +14271,9 @@ A7C7;LATIN CAPITAL LETTER D WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7C8; A7C8;LATIN SMALL LETTER D WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C7;;A7C7 A7C9;LATIN CAPITAL LETTER S WITH SHORT STROKE OVERLAY;Lu;0;L;;;;;N;;;;A7CA; A7CA;LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY;Ll;0;L;;;;;N;;;A7C9;;A7C9 +A7CB;LATIN CAPITAL LETTER RAMS HORN;Lu;0;L;;;;;N;;;;0264; +A7CC;LATIN CAPITAL LETTER S WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A7CD; +A7CD;LATIN SMALL LETTER S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A7CC;;A7CC A7D0;LATIN CAPITAL LETTER CLOSED INSULAR G;Lu;0;L;;;;;N;;;;A7D1; A7D1;LATIN SMALL LETTER CLOSED INSULAR G;Ll;0;L;;;;;N;;;A7D0;;A7D0 A7D3;LATIN SMALL LETTER DOUBLE THORN;Ll;0;L;;;;;N;;;;; @@ -14268,6 +14282,9 @@ A7D6;LATIN CAPITAL LETTER MIDDLE SCOTS S;Lu;0;L;;;;;N;;;;A7D7; A7D7;LATIN SMALL LETTER MIDDLE SCOTS S;Ll;0;L;;;;;N;;;A7D6;;A7D6 A7D8;LATIN CAPITAL LETTER SIGMOID S;Lu;0;L;;;;;N;;;;A7D9; A7D9;LATIN SMALL LETTER SIGMOID S;Ll;0;L;;;;;N;;;A7D8;;A7D8 +A7DA;LATIN CAPITAL LETTER LAMBDA;Lu;0;L;;;;;N;;;;A7DB; +A7DB;LATIN SMALL LETTER LAMBDA;Ll;0;L;;;;;N;;;A7DA;;A7DA +A7DC;LATIN CAPITAL LETTER LAMBDA WITH STROKE;Lu;0;L;;;;;N;;;;019B; A7F2;MODIFIER LETTER CAPITAL C;Lm;0;L; 0043;;;;N;;;;; A7F3;MODIFIER LETTER CAPITAL F;Lm;0;L; 0046;;;;N;;;;; A7F4;MODIFIER LETTER CAPITAL Q;Lm;0;L; 0051;;;;N;;;;; @@ -18001,6 +18018,58 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 105B9;VITHKUQI SMALL LETTER XE;Ll;0;L;;;;;N;;;10592;;10592 105BB;VITHKUQI SMALL LETTER Y;Ll;0;L;;;;;N;;;10594;;10594 105BC;VITHKUQI SMALL LETTER ZE;Ll;0;L;;;;;N;;;10595;;10595 +105C0;TODHRI LETTER A;Lo;0;L;;;;;N;;;;; +105C1;TODHRI LETTER AS;Lo;0;L;;;;;N;;;;; +105C2;TODHRI LETTER BA;Lo;0;L;;;;;N;;;;; +105C3;TODHRI LETTER MBA;Lo;0;L;;;;;N;;;;; +105C4;TODHRI LETTER CA;Lo;0;L;;;;;N;;;;; +105C5;TODHRI LETTER CHA;Lo;0;L;;;;;N;;;;; +105C6;TODHRI LETTER DA;Lo;0;L;;;;;N;;;;; +105C7;TODHRI LETTER NDA;Lo;0;L;;;;;N;;;;; +105C8;TODHRI LETTER DHA;Lo;0;L;;;;;N;;;;; +105C9;TODHRI LETTER EI;Lo;0;L;105D2 0307;;;;N;;;;; +105CA;TODHRI LETTER E;Lo;0;L;;;;;N;;;;; +105CB;TODHRI LETTER FA;Lo;0;L;;;;;N;;;;; +105CC;TODHRI LETTER GA;Lo;0;L;;;;;N;;;;; +105CD;TODHRI LETTER NGA;Lo;0;L;;;;;N;;;;; +105CE;TODHRI LETTER GJA;Lo;0;L;;;;;N;;;;; +105CF;TODHRI LETTER NGJA;Lo;0;L;;;;;N;;;;; +105D0;TODHRI LETTER HA;Lo;0;L;;;;;N;;;;; +105D1;TODHRI LETTER HJA;Lo;0;L;;;;;N;;;;; +105D2;TODHRI LETTER I;Lo;0;L;;;;;N;;;;; +105D3;TODHRI LETTER JA;Lo;0;L;;;;;N;;;;; +105D4;TODHRI LETTER KA;Lo;0;L;;;;;N;;;;; +105D5;TODHRI LETTER LA;Lo;0;L;;;;;N;;;;; +105D6;TODHRI LETTER LLA;Lo;0;L;;;;;N;;;;; +105D7;TODHRI LETTER MA;Lo;0;L;;;;;N;;;;; +105D8;TODHRI LETTER NA;Lo;0;L;;;;;N;;;;; +105D9;TODHRI LETTER NJAN;Lo;0;L;;;;;N;;;;; +105DA;TODHRI LETTER O;Lo;0;L;;;;;N;;;;; +105DB;TODHRI LETTER PA;Lo;0;L;;;;;N;;;;; +105DC;TODHRI LETTER QA;Lo;0;L;;;;;N;;;;; +105DD;TODHRI LETTER RA;Lo;0;L;;;;;N;;;;; +105DE;TODHRI LETTER RRA;Lo;0;L;;;;;N;;;;; +105DF;TODHRI LETTER SA;Lo;0;L;;;;;N;;;;; +105E0;TODHRI LETTER SHA;Lo;0;L;;;;;N;;;;; +105E1;TODHRI LETTER SHTA;Lo;0;L;;;;;N;;;;; +105E2;TODHRI LETTER TA;Lo;0;L;;;;;N;;;;; +105E3;TODHRI LETTER THA;Lo;0;L;;;;;N;;;;; +105E4;TODHRI LETTER U;Lo;0;L;105DA 0307;;;;N;;;;; +105E5;TODHRI LETTER VA;Lo;0;L;;;;;N;;;;; +105E6;TODHRI LETTER XA;Lo;0;L;;;;;N;;;;; +105E7;TODHRI LETTER NXA;Lo;0;L;;;;;N;;;;; +105E8;TODHRI LETTER XHA;Lo;0;L;;;;;N;;;;; +105E9;TODHRI LETTER NXHA;Lo;0;L;;;;;N;;;;; +105EA;TODHRI LETTER Y;Lo;0;L;;;;;N;;;;; +105EB;TODHRI LETTER JY;Lo;0;L;;;;;N;;;;; +105EC;TODHRI LETTER ZA;Lo;0;L;;;;;N;;;;; +105ED;TODHRI LETTER ZHA;Lo;0;L;;;;;N;;;;; +105EE;TODHRI LETTER GHA;Lo;0;L;;;;;N;;;;; +105EF;TODHRI LETTER STA;Lo;0;L;;;;;N;;;;; +105F0;TODHRI LETTER SKAN;Lo;0;L;;;;;N;;;;; +105F1;TODHRI LETTER KHA;Lo;0;L;;;;;N;;;;; +105F2;TODHRI LETTER PSA;Lo;0;L;;;;;N;;;;; +105F3;TODHRI LETTER OO;Lo;0;L;;;;;N;;;;; 10600;LINEAR A SIGN AB001;Lo;0;L;;;;;N;;;;; 10601;LINEAR A SIGN AB002;Lo;0;L;;;;;N;;;;; 10602;LINEAR A SIGN AB003;Lo;0;L;;;;;N;;;;; @@ -19322,6 +19391,75 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10D37;HANIFI ROHINGYA DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;; 10D38;HANIFI ROHINGYA DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;; 10D39;HANIFI ROHINGYA DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;; +10D40;GARAY DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;; +10D41;GARAY DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;; +10D42;GARAY DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;; +10D43;GARAY DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;; +10D44;GARAY DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;; +10D45;GARAY DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;; +10D46;GARAY DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;; +10D47;GARAY DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;; +10D48;GARAY DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;; +10D49;GARAY DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;; +10D4A;GARAY VOWEL SIGN A;Lo;0;R;;;;;N;;;;; +10D4B;GARAY VOWEL SIGN I;Lo;0;R;;;;;N;;;;; +10D4C;GARAY VOWEL SIGN O;Lo;0;R;;;;;N;;;;; +10D4D;GARAY VOWEL SIGN EE;Lo;0;R;;;;;N;;;;; +10D4E;GARAY VOWEL LENGTH MARK;Lm;0;R;;;;;N;;;;; +10D4F;GARAY SUKUN;Lo;0;R;;;;;N;;;;; +10D50;GARAY CAPITAL LETTER A;Lu;0;R;;;;;N;;;;10D70; +10D51;GARAY CAPITAL LETTER CA;Lu;0;R;;;;;N;;;;10D71; +10D52;GARAY CAPITAL LETTER MA;Lu;0;R;;;;;N;;;;10D72; +10D53;GARAY CAPITAL LETTER KA;Lu;0;R;;;;;N;;;;10D73; +10D54;GARAY CAPITAL LETTER BA;Lu;0;R;;;;;N;;;;10D74; +10D55;GARAY CAPITAL LETTER JA;Lu;0;R;;;;;N;;;;10D75; +10D56;GARAY CAPITAL LETTER SA;Lu;0;R;;;;;N;;;;10D76; +10D57;GARAY CAPITAL LETTER WA;Lu;0;R;;;;;N;;;;10D77; +10D58;GARAY CAPITAL LETTER LA;Lu;0;R;;;;;N;;;;10D78; +10D59;GARAY CAPITAL LETTER GA;Lu;0;R;;;;;N;;;;10D79; +10D5A;GARAY CAPITAL LETTER DA;Lu;0;R;;;;;N;;;;10D7A; +10D5B;GARAY CAPITAL LETTER XA;Lu;0;R;;;;;N;;;;10D7B; +10D5C;GARAY CAPITAL LETTER YA;Lu;0;R;;;;;N;;;;10D7C; +10D5D;GARAY CAPITAL LETTER TA;Lu;0;R;;;;;N;;;;10D7D; +10D5E;GARAY CAPITAL LETTER RA;Lu;0;R;;;;;N;;;;10D7E; +10D5F;GARAY CAPITAL LETTER NYA;Lu;0;R;;;;;N;;;;10D7F; +10D60;GARAY CAPITAL LETTER FA;Lu;0;R;;;;;N;;;;10D80; +10D61;GARAY CAPITAL LETTER NA;Lu;0;R;;;;;N;;;;10D81; +10D62;GARAY CAPITAL LETTER PA;Lu;0;R;;;;;N;;;;10D82; +10D63;GARAY CAPITAL LETTER HA;Lu;0;R;;;;;N;;;;10D83; +10D64;GARAY CAPITAL LETTER OLD KA;Lu;0;R;;;;;N;;;;10D84; +10D65;GARAY CAPITAL LETTER OLD NA;Lu;0;R;;;;;N;;;;10D85; +10D69;GARAY VOWEL SIGN E;Mn;230;NSM;;;;;N;;;;; +10D6A;GARAY CONSONANT GEMINATION MARK;Mn;230;NSM;;;;;N;;;;; +10D6B;GARAY COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10D6C;GARAY COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;; +10D6D;GARAY CONSONANT NASALIZATION MARK;Mn;230;NSM;;;;;N;;;;; +10D6E;GARAY HYPHEN;Pd;0;ON;;;;;N;;;;; +10D6F;GARAY REDUPLICATION MARK;Lm;0;R;;;;;N;;;;; +10D70;GARAY SMALL LETTER A;Ll;0;R;;;;;N;;;10D50;;10D50 +10D71;GARAY SMALL LETTER CA;Ll;0;R;;;;;N;;;10D51;;10D51 +10D72;GARAY SMALL LETTER MA;Ll;0;R;;;;;N;;;10D52;;10D52 +10D73;GARAY SMALL LETTER KA;Ll;0;R;;;;;N;;;10D53;;10D53 +10D74;GARAY SMALL LETTER BA;Ll;0;R;;;;;N;;;10D54;;10D54 +10D75;GARAY SMALL LETTER JA;Ll;0;R;;;;;N;;;10D55;;10D55 +10D76;GARAY SMALL LETTER SA;Ll;0;R;;;;;N;;;10D56;;10D56 +10D77;GARAY SMALL LETTER WA;Ll;0;R;;;;;N;;;10D57;;10D57 +10D78;GARAY SMALL LETTER LA;Ll;0;R;;;;;N;;;10D58;;10D58 +10D79;GARAY SMALL LETTER GA;Ll;0;R;;;;;N;;;10D59;;10D59 +10D7A;GARAY SMALL LETTER DA;Ll;0;R;;;;;N;;;10D5A;;10D5A +10D7B;GARAY SMALL LETTER XA;Ll;0;R;;;;;N;;;10D5B;;10D5B +10D7C;GARAY SMALL LETTER YA;Ll;0;R;;;;;N;;;10D5C;;10D5C +10D7D;GARAY SMALL LETTER TA;Ll;0;R;;;;;N;;;10D5D;;10D5D +10D7E;GARAY SMALL LETTER RA;Ll;0;R;;;;;N;;;10D5E;;10D5E +10D7F;GARAY SMALL LETTER NYA;Ll;0;R;;;;;N;;;10D5F;;10D5F +10D80;GARAY SMALL LETTER FA;Ll;0;R;;;;;N;;;10D60;;10D60 +10D81;GARAY SMALL LETTER NA;Ll;0;R;;;;;N;;;10D61;;10D61 +10D82;GARAY SMALL LETTER PA;Ll;0;R;;;;;N;;;10D62;;10D62 +10D83;GARAY SMALL LETTER HA;Ll;0;R;;;;;N;;;10D63;;10D63 +10D84;GARAY SMALL LETTER OLD KA;Ll;0;R;;;;;N;;;10D64;;10D64 +10D85;GARAY SMALL LETTER OLD NA;Ll;0;R;;;;;N;;;10D65;;10D65 +10D8E;GARAY PLUS SIGN;Sm;0;R;;;;;N;;;;; +10D8F;GARAY MINUS SIGN;Sm;0;R;;;;;N;;;;; 10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;; 10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;; 10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;; @@ -19400,6 +19538,10 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 10EAD;YEZIDI HYPHENATION MARK;Pd;0;R;;;;;N;;;;; 10EB0;YEZIDI LETTER LAM WITH DOT ABOVE;Lo;0;R;;;;;N;;;;; 10EB1;YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE;Lo;0;R;;;;;N;;;;; +10EC2;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EC3;ARABIC LETTER TAH WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EC4;ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW;Lo;0;AL;;;;;N;;;;; +10EFC;ARABIC COMBINING ALEF OVERLAY;Mn;0;NSM;;;;;N;;;;; 10EFD;ARABIC SMALL LOW WORD SAKTA;Mn;220;NSM;;;;;N;;;;; 10EFE;ARABIC SMALL LOW WORD QASR;Mn;220;NSM;;;;;N;;;;; 10EFF;ARABIC SMALL LOW WORD MADDA;Mn;220;NSM;;;;;N;;;;; @@ -20264,6 +20406,86 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11372;COMBINING GRANTHA LETTER NA;Mn;230;NSM;;;;;N;;;;; 11373;COMBINING GRANTHA LETTER VI;Mn;230;NSM;;;;;N;;;;; 11374;COMBINING GRANTHA LETTER PA;Mn;230;NSM;;;;;N;;;;; +11380;TULU-TIGALARI LETTER A;Lo;0;L;;;;;N;;;;; +11381;TULU-TIGALARI LETTER AA;Lo;0;L;;;;;N;;;;; +11382;TULU-TIGALARI LETTER I;Lo;0;L;;;;;N;;;;; +11383;TULU-TIGALARI LETTER II;Lo;0;L;11382 113C9;;;;N;;;;; +11384;TULU-TIGALARI LETTER U;Lo;0;L;;;;;N;;;;; +11385;TULU-TIGALARI LETTER UU;Lo;0;L;11384 113BB;;;;N;;;;; +11386;TULU-TIGALARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;; +11387;TULU-TIGALARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;; +11388;TULU-TIGALARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;; +11389;TULU-TIGALARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;; +1138B;TULU-TIGALARI LETTER EE;Lo;0;L;;;;;N;;;;; +1138E;TULU-TIGALARI LETTER AI;Lo;0;L;1138B 113C2;;;;N;;;;; +11390;TULU-TIGALARI LETTER OO;Lo;0;L;;;;;N;;;;; +11391;TULU-TIGALARI LETTER AU;Lo;0;L;11390 113C9;;;;N;;;;; +11392;TULU-TIGALARI LETTER KA;Lo;0;L;;;;;N;;;;; +11393;TULU-TIGALARI LETTER KHA;Lo;0;L;;;;;N;;;;; +11394;TULU-TIGALARI LETTER GA;Lo;0;L;;;;;N;;;;; +11395;TULU-TIGALARI LETTER GHA;Lo;0;L;;;;;N;;;;; +11396;TULU-TIGALARI LETTER NGA;Lo;0;L;;;;;N;;;;; +11397;TULU-TIGALARI LETTER CA;Lo;0;L;;;;;N;;;;; +11398;TULU-TIGALARI LETTER CHA;Lo;0;L;;;;;N;;;;; +11399;TULU-TIGALARI LETTER JA;Lo;0;L;;;;;N;;;;; +1139A;TULU-TIGALARI LETTER JHA;Lo;0;L;;;;;N;;;;; +1139B;TULU-TIGALARI LETTER NYA;Lo;0;L;;;;;N;;;;; +1139C;TULU-TIGALARI LETTER TTA;Lo;0;L;;;;;N;;;;; +1139D;TULU-TIGALARI LETTER TTHA;Lo;0;L;;;;;N;;;;; +1139E;TULU-TIGALARI LETTER DDA;Lo;0;L;;;;;N;;;;; +1139F;TULU-TIGALARI LETTER DDHA;Lo;0;L;;;;;N;;;;; +113A0;TULU-TIGALARI LETTER NNA;Lo;0;L;;;;;N;;;;; +113A1;TULU-TIGALARI LETTER TA;Lo;0;L;;;;;N;;;;; +113A2;TULU-TIGALARI LETTER THA;Lo;0;L;;;;;N;;;;; +113A3;TULU-TIGALARI LETTER DA;Lo;0;L;;;;;N;;;;; +113A4;TULU-TIGALARI LETTER DHA;Lo;0;L;;;;;N;;;;; +113A5;TULU-TIGALARI LETTER NA;Lo;0;L;;;;;N;;;;; +113A6;TULU-TIGALARI LETTER PA;Lo;0;L;;;;;N;;;;; +113A7;TULU-TIGALARI LETTER PHA;Lo;0;L;;;;;N;;;;; +113A8;TULU-TIGALARI LETTER BA;Lo;0;L;;;;;N;;;;; +113A9;TULU-TIGALARI LETTER BHA;Lo;0;L;;;;;N;;;;; +113AA;TULU-TIGALARI LETTER MA;Lo;0;L;;;;;N;;;;; +113AB;TULU-TIGALARI LETTER YA;Lo;0;L;;;;;N;;;;; +113AC;TULU-TIGALARI LETTER RA;Lo;0;L;;;;;N;;;;; +113AD;TULU-TIGALARI LETTER LA;Lo;0;L;;;;;N;;;;; +113AE;TULU-TIGALARI LETTER VA;Lo;0;L;;;;;N;;;;; +113AF;TULU-TIGALARI LETTER SHA;Lo;0;L;;;;;N;;;;; +113B0;TULU-TIGALARI LETTER SSA;Lo;0;L;;;;;N;;;;; +113B1;TULU-TIGALARI LETTER SA;Lo;0;L;;;;;N;;;;; +113B2;TULU-TIGALARI LETTER HA;Lo;0;L;;;;;N;;;;; +113B3;TULU-TIGALARI LETTER LLA;Lo;0;L;;;;;N;;;;; +113B4;TULU-TIGALARI LETTER RRA;Lo;0;L;;;;;N;;;;; +113B5;TULU-TIGALARI LETTER LLLA;Lo;0;L;;;;;N;;;;; +113B7;TULU-TIGALARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;; +113B8;TULU-TIGALARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; +113B9;TULU-TIGALARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;; +113BA;TULU-TIGALARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;; +113BB;TULU-TIGALARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;; +113BC;TULU-TIGALARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;; +113BD;TULU-TIGALARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;; +113BE;TULU-TIGALARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;; +113BF;TULU-TIGALARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;; +113C0;TULU-TIGALARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;; +113C2;TULU-TIGALARI VOWEL SIGN EE;Mc;0;L;;;;;N;;;;; +113C5;TULU-TIGALARI VOWEL SIGN AI;Mc;0;L;113C2 113C2;;;;N;;;;; +113C7;TULU-TIGALARI VOWEL SIGN OO;Mc;0;L;113C2 113B8;;;;N;;;;; +113C8;TULU-TIGALARI VOWEL SIGN AU;Mc;0;L;113C2 113C9;;;;N;;;;; +113C9;TULU-TIGALARI AU LENGTH MARK;Mc;0;L;;;;;N;;;;; +113CA;TULU-TIGALARI SIGN CANDRA ANUNASIKA;Mc;0;L;;;;;N;;;;; +113CC;TULU-TIGALARI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;; +113CD;TULU-TIGALARI SIGN VISARGA;Mc;0;L;;;;;N;;;;; +113CE;TULU-TIGALARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;; +113CF;TULU-TIGALARI SIGN LOOPED VIRAMA;Mc;9;L;;;;;N;;;;; +113D0;TULU-TIGALARI CONJOINER;Mn;9;NSM;;;;;N;;;;; +113D1;TULU-TIGALARI REPHA;Lo;0;L;;;;;N;;;;; +113D2;TULU-TIGALARI GEMINATION MARK;Mn;0;NSM;;;;;N;;;;; +113D3;TULU-TIGALARI SIGN PLUTA;Lo;0;L;;;;;N;;;;; +113D4;TULU-TIGALARI DANDA;Po;0;L;;;;;N;;;;; +113D5;TULU-TIGALARI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +113D7;TULU-TIGALARI SIGN OM PUSHPIKA;Po;0;L;;;;;N;;;;; +113D8;TULU-TIGALARI SIGN SHRII PUSHPIKA;Po;0;L;;;;;N;;;;; +113E1;TULU-TIGALARI VEDIC TONE SVARITA;Mn;0;NSM;;;;;N;;;;; +113E2;TULU-TIGALARI VEDIC TONE ANUDATTA;Mn;0;NSM;;;;;N;;;;; 11400;NEWA LETTER A;Lo;0;L;;;;;N;;;;; 11401;NEWA LETTER AA;Lo;0;L;;;;;N;;;;; 11402;NEWA LETTER I;Lo;0;L;;;;;N;;;;; @@ -20695,6 +20917,26 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 116C7;TAKRI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 116C8;TAKRI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 116C9;TAKRI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +116D0;MYANMAR PAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +116D1;MYANMAR PAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +116D2;MYANMAR PAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +116D3;MYANMAR PAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +116D4;MYANMAR PAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +116D5;MYANMAR PAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +116D6;MYANMAR PAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +116D7;MYANMAR PAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +116D8;MYANMAR PAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +116D9;MYANMAR PAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +116DA;MYANMAR EASTERN PWO KAREN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +116DB;MYANMAR EASTERN PWO KAREN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +116DC;MYANMAR EASTERN PWO KAREN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +116DD;MYANMAR EASTERN PWO KAREN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +116DE;MYANMAR EASTERN PWO KAREN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +116DF;MYANMAR EASTERN PWO KAREN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +116E0;MYANMAR EASTERN PWO KAREN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +116E1;MYANMAR EASTERN PWO KAREN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +116E2;MYANMAR EASTERN PWO KAREN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +116E3;MYANMAR EASTERN PWO KAREN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 11700;AHOM LETTER KA;Lo;0;L;;;;;N;;;;; 11701;AHOM LETTER KHA;Lo;0;L;;;;;N;;;;; 11702;AHOM LETTER NGA;Lo;0;L;;;;;N;;;;; @@ -20723,7 +20965,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11719;AHOM LETTER JHA;Lo;0;L;;;;;N;;;;; 1171A;AHOM LETTER ALTERNATE BA;Lo;0;L;;;;;N;;;;; 1171D;AHOM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;; -1171E;AHOM CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;; +1171E;AHOM CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;; 1171F;AHOM CONSONANT SIGN MEDIAL LIGATING RA;Mn;0;NSM;;;;;N;;;;; 11720;AHOM VOWEL SIGN A;Mc;0;L;;;;;N;;;;; 11721;AHOM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;; @@ -21279,6 +21521,50 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11B07;DEVANAGARI SIGN WESTERN NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; 11B08;DEVANAGARI SIGN REVERSED NINE-LIKE BHALE;Po;0;L;;;;;N;;;;; 11B09;DEVANAGARI SIGN MINDU;Po;0;L;;;;;N;;;;; +11BC0;SUNUWAR LETTER DEVI;Lo;0;L;;;;;N;;;;; +11BC1;SUNUWAR LETTER TASLA;Lo;0;L;;;;;N;;;;; +11BC2;SUNUWAR LETTER EKO;Lo;0;L;;;;;N;;;;; +11BC3;SUNUWAR LETTER IMAR;Lo;0;L;;;;;N;;;;; +11BC4;SUNUWAR LETTER REU;Lo;0;L;;;;;N;;;;; +11BC5;SUNUWAR LETTER UTTHI;Lo;0;L;;;;;N;;;;; +11BC6;SUNUWAR LETTER KIK;Lo;0;L;;;;;N;;;;; +11BC7;SUNUWAR LETTER MA;Lo;0;L;;;;;N;;;;; +11BC8;SUNUWAR LETTER APPHO;Lo;0;L;;;;;N;;;;; +11BC9;SUNUWAR LETTER PIP;Lo;0;L;;;;;N;;;;; +11BCA;SUNUWAR LETTER GIL;Lo;0;L;;;;;N;;;;; +11BCB;SUNUWAR LETTER HAMSO;Lo;0;L;;;;;N;;;;; +11BCC;SUNUWAR LETTER CARMI;Lo;0;L;;;;;N;;;;; +11BCD;SUNUWAR LETTER NAH;Lo;0;L;;;;;N;;;;; +11BCE;SUNUWAR LETTER BUR;Lo;0;L;;;;;N;;;;; +11BCF;SUNUWAR LETTER JYAH;Lo;0;L;;;;;N;;;;; +11BD0;SUNUWAR LETTER LOACHA;Lo;0;L;;;;;N;;;;; +11BD1;SUNUWAR LETTER OTTHI;Lo;0;L;;;;;N;;;;; +11BD2;SUNUWAR LETTER SHYELE;Lo;0;L;;;;;N;;;;; +11BD3;SUNUWAR LETTER VARCA;Lo;0;L;;;;;N;;;;; +11BD4;SUNUWAR LETTER YAT;Lo;0;L;;;;;N;;;;; +11BD5;SUNUWAR LETTER AVA;Lo;0;L;;;;;N;;;;; +11BD6;SUNUWAR LETTER AAL;Lo;0;L;;;;;N;;;;; +11BD7;SUNUWAR LETTER DONGA;Lo;0;L;;;;;N;;;;; +11BD8;SUNUWAR LETTER THARI;Lo;0;L;;;;;N;;;;; +11BD9;SUNUWAR LETTER PHAR;Lo;0;L;;;;;N;;;;; +11BDA;SUNUWAR LETTER NGAR;Lo;0;L;;;;;N;;;;; +11BDB;SUNUWAR LETTER KHA;Lo;0;L;;;;;N;;;;; +11BDC;SUNUWAR LETTER SHYER;Lo;0;L;;;;;N;;;;; +11BDD;SUNUWAR LETTER CHELAP;Lo;0;L;;;;;N;;;;; +11BDE;SUNUWAR LETTER TENTU;Lo;0;L;;;;;N;;;;; +11BDF;SUNUWAR LETTER THELE;Lo;0;L;;;;;N;;;;; +11BE0;SUNUWAR LETTER KLOKO;Lo;0;L;;;;;N;;;;; +11BE1;SUNUWAR SIGN PVO;Po;0;L;;;;;N;;;;; +11BF0;SUNUWAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +11BF1;SUNUWAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +11BF2;SUNUWAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +11BF3;SUNUWAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +11BF4;SUNUWAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +11BF5;SUNUWAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +11BF6;SUNUWAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +11BF7;SUNUWAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +11BF8;SUNUWAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +11BF9;SUNUWAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 11C00;BHAIKSUKI LETTER A;Lo;0;L;;;;;N;;;;; 11C01;BHAIKSUKI LETTER AA;Lo;0;L;;;;;N;;;;; 11C02;BHAIKSUKI LETTER I;Lo;0;L;;;;;N;;;;; @@ -21693,6 +21979,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 11F57;KAWI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 11F58;KAWI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 11F59;KAWI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +11F5A;KAWI SIGN NUKTA;Mn;0;NSM;;;;;N;;;;; 11FB0;LISU LETTER YHA;Lo;0;L;;;;;N;;;;; 11FC0;TAMIL FRACTION ONE THREE-HUNDRED-AND-TWENTIETH;No;0;L;;;;1/320;N;;;;; 11FC1;TAMIL FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;; @@ -24188,6 +24475,4001 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 13453;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP AND END;Mn;0;NSM;;;;;N;;;;; 13454;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT BOTTOM AND END;Mn;0;NSM;;;;;N;;;;; 13455;EGYPTIAN HIEROGLYPH MODIFIER DAMAGED;Mn;0;NSM;;;;;N;;;;; +13460;EGYPTIAN HIEROGLYPH-13460;Lo;0;L;;;;;N;;;;; +13461;EGYPTIAN HIEROGLYPH-13461;Lo;0;L;;;;;N;;;;; +13462;EGYPTIAN HIEROGLYPH-13462;Lo;0;L;;;;;N;;;;; +13463;EGYPTIAN HIEROGLYPH-13463;Lo;0;L;;;;;N;;;;; +13464;EGYPTIAN HIEROGLYPH-13464;Lo;0;L;;;;;N;;;;; +13465;EGYPTIAN HIEROGLYPH-13465;Lo;0;L;;;;;N;;;;; +13466;EGYPTIAN HIEROGLYPH-13466;Lo;0;L;;;;;N;;;;; +13467;EGYPTIAN HIEROGLYPH-13467;Lo;0;L;;;;;N;;;;; +13468;EGYPTIAN HIEROGLYPH-13468;Lo;0;L;;;;;N;;;;; +13469;EGYPTIAN HIEROGLYPH-13469;Lo;0;L;;;;;N;;;;; +1346A;EGYPTIAN HIEROGLYPH-1346A;Lo;0;L;;;;;N;;;;; +1346B;EGYPTIAN HIEROGLYPH-1346B;Lo;0;L;;;;;N;;;;; +1346C;EGYPTIAN HIEROGLYPH-1346C;Lo;0;L;;;;;N;;;;; +1346D;EGYPTIAN HIEROGLYPH-1346D;Lo;0;L;;;;;N;;;;; +1346E;EGYPTIAN HIEROGLYPH-1346E;Lo;0;L;;;;;N;;;;; +1346F;EGYPTIAN HIEROGLYPH-1346F;Lo;0;L;;;;;N;;;;; +13470;EGYPTIAN HIEROGLYPH-13470;Lo;0;L;;;;;N;;;;; +13471;EGYPTIAN HIEROGLYPH-13471;Lo;0;L;;;;;N;;;;; +13472;EGYPTIAN HIEROGLYPH-13472;Lo;0;L;;;;;N;;;;; +13473;EGYPTIAN HIEROGLYPH-13473;Lo;0;L;;;;;N;;;;; +13474;EGYPTIAN HIEROGLYPH-13474;Lo;0;L;;;;;N;;;;; +13475;EGYPTIAN HIEROGLYPH-13475;Lo;0;L;;;;;N;;;;; +13476;EGYPTIAN HIEROGLYPH-13476;Lo;0;L;;;;;N;;;;; +13477;EGYPTIAN HIEROGLYPH-13477;Lo;0;L;;;;;N;;;;; +13478;EGYPTIAN HIEROGLYPH-13478;Lo;0;L;;;;;N;;;;; +13479;EGYPTIAN HIEROGLYPH-13479;Lo;0;L;;;;;N;;;;; +1347A;EGYPTIAN HIEROGLYPH-1347A;Lo;0;L;;;;;N;;;;; +1347B;EGYPTIAN HIEROGLYPH-1347B;Lo;0;L;;;;;N;;;;; +1347C;EGYPTIAN HIEROGLYPH-1347C;Lo;0;L;;;;;N;;;;; +1347D;EGYPTIAN HIEROGLYPH-1347D;Lo;0;L;;;;;N;;;;; +1347E;EGYPTIAN HIEROGLYPH-1347E;Lo;0;L;;;;;N;;;;; +1347F;EGYPTIAN HIEROGLYPH-1347F;Lo;0;L;;;;;N;;;;; +13480;EGYPTIAN HIEROGLYPH-13480;Lo;0;L;;;;;N;;;;; +13481;EGYPTIAN HIEROGLYPH-13481;Lo;0;L;;;;;N;;;;; +13482;EGYPTIAN HIEROGLYPH-13482;Lo;0;L;;;;;N;;;;; +13483;EGYPTIAN HIEROGLYPH-13483;Lo;0;L;;;;;N;;;;; +13484;EGYPTIAN HIEROGLYPH-13484;Lo;0;L;;;;;N;;;;; +13485;EGYPTIAN HIEROGLYPH-13485;Lo;0;L;;;;;N;;;;; +13486;EGYPTIAN HIEROGLYPH-13486;Lo;0;L;;;;;N;;;;; +13487;EGYPTIAN HIEROGLYPH-13487;Lo;0;L;;;;;N;;;;; +13488;EGYPTIAN HIEROGLYPH-13488;Lo;0;L;;;;;N;;;;; +13489;EGYPTIAN HIEROGLYPH-13489;Lo;0;L;;;;;N;;;;; +1348A;EGYPTIAN HIEROGLYPH-1348A;Lo;0;L;;;;;N;;;;; +1348B;EGYPTIAN HIEROGLYPH-1348B;Lo;0;L;;;;;N;;;;; +1348C;EGYPTIAN HIEROGLYPH-1348C;Lo;0;L;;;;;N;;;;; +1348D;EGYPTIAN HIEROGLYPH-1348D;Lo;0;L;;;;;N;;;;; +1348E;EGYPTIAN HIEROGLYPH-1348E;Lo;0;L;;;;;N;;;;; +1348F;EGYPTIAN HIEROGLYPH-1348F;Lo;0;L;;;;;N;;;;; +13490;EGYPTIAN HIEROGLYPH-13490;Lo;0;L;;;;;N;;;;; +13491;EGYPTIAN HIEROGLYPH-13491;Lo;0;L;;;;;N;;;;; +13492;EGYPTIAN HIEROGLYPH-13492;Lo;0;L;;;;;N;;;;; +13493;EGYPTIAN HIEROGLYPH-13493;Lo;0;L;;;;;N;;;;; +13494;EGYPTIAN HIEROGLYPH-13494;Lo;0;L;;;;;N;;;;; +13495;EGYPTIAN HIEROGLYPH-13495;Lo;0;L;;;;;N;;;;; +13496;EGYPTIAN HIEROGLYPH-13496;Lo;0;L;;;;;N;;;;; +13497;EGYPTIAN HIEROGLYPH-13497;Lo;0;L;;;;;N;;;;; +13498;EGYPTIAN HIEROGLYPH-13498;Lo;0;L;;;;;N;;;;; +13499;EGYPTIAN HIEROGLYPH-13499;Lo;0;L;;;;;N;;;;; +1349A;EGYPTIAN HIEROGLYPH-1349A;Lo;0;L;;;;;N;;;;; +1349B;EGYPTIAN HIEROGLYPH-1349B;Lo;0;L;;;;;N;;;;; +1349C;EGYPTIAN HIEROGLYPH-1349C;Lo;0;L;;;;;N;;;;; +1349D;EGYPTIAN HIEROGLYPH-1349D;Lo;0;L;;;;;N;;;;; +1349E;EGYPTIAN HIEROGLYPH-1349E;Lo;0;L;;;;;N;;;;; +1349F;EGYPTIAN HIEROGLYPH-1349F;Lo;0;L;;;;;N;;;;; +134A0;EGYPTIAN HIEROGLYPH-134A0;Lo;0;L;;;;;N;;;;; +134A1;EGYPTIAN HIEROGLYPH-134A1;Lo;0;L;;;;;N;;;;; +134A2;EGYPTIAN HIEROGLYPH-134A2;Lo;0;L;;;;;N;;;;; +134A3;EGYPTIAN HIEROGLYPH-134A3;Lo;0;L;;;;;N;;;;; +134A4;EGYPTIAN HIEROGLYPH-134A4;Lo;0;L;;;;;N;;;;; +134A5;EGYPTIAN HIEROGLYPH-134A5;Lo;0;L;;;;;N;;;;; +134A6;EGYPTIAN HIEROGLYPH-134A6;Lo;0;L;;;;;N;;;;; +134A7;EGYPTIAN HIEROGLYPH-134A7;Lo;0;L;;;;;N;;;;; +134A8;EGYPTIAN HIEROGLYPH-134A8;Lo;0;L;;;;;N;;;;; +134A9;EGYPTIAN HIEROGLYPH-134A9;Lo;0;L;;;;;N;;;;; +134AA;EGYPTIAN HIEROGLYPH-134AA;Lo;0;L;;;;;N;;;;; +134AB;EGYPTIAN HIEROGLYPH-134AB;Lo;0;L;;;;;N;;;;; +134AC;EGYPTIAN HIEROGLYPH-134AC;Lo;0;L;;;;;N;;;;; +134AD;EGYPTIAN HIEROGLYPH-134AD;Lo;0;L;;;;;N;;;;; +134AE;EGYPTIAN HIEROGLYPH-134AE;Lo;0;L;;;;;N;;;;; +134AF;EGYPTIAN HIEROGLYPH-134AF;Lo;0;L;;;;;N;;;;; +134B0;EGYPTIAN HIEROGLYPH-134B0;Lo;0;L;;;;;N;;;;; +134B1;EGYPTIAN HIEROGLYPH-134B1;Lo;0;L;;;;;N;;;;; +134B2;EGYPTIAN HIEROGLYPH-134B2;Lo;0;L;;;;;N;;;;; +134B3;EGYPTIAN HIEROGLYPH-134B3;Lo;0;L;;;;;N;;;;; +134B4;EGYPTIAN HIEROGLYPH-134B4;Lo;0;L;;;;;N;;;;; +134B5;EGYPTIAN HIEROGLYPH-134B5;Lo;0;L;;;;;N;;;;; +134B6;EGYPTIAN HIEROGLYPH-134B6;Lo;0;L;;;;;N;;;;; +134B7;EGYPTIAN HIEROGLYPH-134B7;Lo;0;L;;;;;N;;;;; +134B8;EGYPTIAN HIEROGLYPH-134B8;Lo;0;L;;;;;N;;;;; +134B9;EGYPTIAN HIEROGLYPH-134B9;Lo;0;L;;;;;N;;;;; +134BA;EGYPTIAN HIEROGLYPH-134BA;Lo;0;L;;;;;N;;;;; +134BB;EGYPTIAN HIEROGLYPH-134BB;Lo;0;L;;;;;N;;;;; +134BC;EGYPTIAN HIEROGLYPH-134BC;Lo;0;L;;;;;N;;;;; +134BD;EGYPTIAN HIEROGLYPH-134BD;Lo;0;L;;;;;N;;;;; +134BE;EGYPTIAN HIEROGLYPH-134BE;Lo;0;L;;;;;N;;;;; +134BF;EGYPTIAN HIEROGLYPH-134BF;Lo;0;L;;;;;N;;;;; +134C0;EGYPTIAN HIEROGLYPH-134C0;Lo;0;L;;;;;N;;;;; +134C1;EGYPTIAN HIEROGLYPH-134C1;Lo;0;L;;;;;N;;;;; +134C2;EGYPTIAN HIEROGLYPH-134C2;Lo;0;L;;;;;N;;;;; +134C3;EGYPTIAN HIEROGLYPH-134C3;Lo;0;L;;;;;N;;;;; +134C4;EGYPTIAN HIEROGLYPH-134C4;Lo;0;L;;;;;N;;;;; +134C5;EGYPTIAN HIEROGLYPH-134C5;Lo;0;L;;;;;N;;;;; +134C6;EGYPTIAN HIEROGLYPH-134C6;Lo;0;L;;;;;N;;;;; +134C7;EGYPTIAN HIEROGLYPH-134C7;Lo;0;L;;;;;N;;;;; +134C8;EGYPTIAN HIEROGLYPH-134C8;Lo;0;L;;;;;N;;;;; +134C9;EGYPTIAN HIEROGLYPH-134C9;Lo;0;L;;;;;N;;;;; +134CA;EGYPTIAN HIEROGLYPH-134CA;Lo;0;L;;;;;N;;;;; +134CB;EGYPTIAN HIEROGLYPH-134CB;Lo;0;L;;;;;N;;;;; +134CC;EGYPTIAN HIEROGLYPH-134CC;Lo;0;L;;;;;N;;;;; +134CD;EGYPTIAN HIEROGLYPH-134CD;Lo;0;L;;;;;N;;;;; +134CE;EGYPTIAN HIEROGLYPH-134CE;Lo;0;L;;;;;N;;;;; +134CF;EGYPTIAN HIEROGLYPH-134CF;Lo;0;L;;;;;N;;;;; +134D0;EGYPTIAN HIEROGLYPH-134D0;Lo;0;L;;;;;N;;;;; +134D1;EGYPTIAN HIEROGLYPH-134D1;Lo;0;L;;;;;N;;;;; +134D2;EGYPTIAN HIEROGLYPH-134D2;Lo;0;L;;;;;N;;;;; +134D3;EGYPTIAN HIEROGLYPH-134D3;Lo;0;L;;;;;N;;;;; +134D4;EGYPTIAN HIEROGLYPH-134D4;Lo;0;L;;;;;N;;;;; +134D5;EGYPTIAN HIEROGLYPH-134D5;Lo;0;L;;;;;N;;;;; +134D6;EGYPTIAN HIEROGLYPH-134D6;Lo;0;L;;;;;N;;;;; +134D7;EGYPTIAN HIEROGLYPH-134D7;Lo;0;L;;;;;N;;;;; +134D8;EGYPTIAN HIEROGLYPH-134D8;Lo;0;L;;;;;N;;;;; +134D9;EGYPTIAN HIEROGLYPH-134D9;Lo;0;L;;;;;N;;;;; +134DA;EGYPTIAN HIEROGLYPH-134DA;Lo;0;L;;;;;N;;;;; +134DB;EGYPTIAN HIEROGLYPH-134DB;Lo;0;L;;;;;N;;;;; +134DC;EGYPTIAN HIEROGLYPH-134DC;Lo;0;L;;;;;N;;;;; +134DD;EGYPTIAN HIEROGLYPH-134DD;Lo;0;L;;;;;N;;;;; +134DE;EGYPTIAN HIEROGLYPH-134DE;Lo;0;L;;;;;N;;;;; +134DF;EGYPTIAN HIEROGLYPH-134DF;Lo;0;L;;;;;N;;;;; +134E0;EGYPTIAN HIEROGLYPH-134E0;Lo;0;L;;;;;N;;;;; +134E1;EGYPTIAN HIEROGLYPH-134E1;Lo;0;L;;;;;N;;;;; +134E2;EGYPTIAN HIEROGLYPH-134E2;Lo;0;L;;;;;N;;;;; +134E3;EGYPTIAN HIEROGLYPH-134E3;Lo;0;L;;;;;N;;;;; +134E4;EGYPTIAN HIEROGLYPH-134E4;Lo;0;L;;;;;N;;;;; +134E5;EGYPTIAN HIEROGLYPH-134E5;Lo;0;L;;;;;N;;;;; +134E6;EGYPTIAN HIEROGLYPH-134E6;Lo;0;L;;;;;N;;;;; +134E7;EGYPTIAN HIEROGLYPH-134E7;Lo;0;L;;;;;N;;;;; +134E8;EGYPTIAN HIEROGLYPH-134E8;Lo;0;L;;;;;N;;;;; +134E9;EGYPTIAN HIEROGLYPH-134E9;Lo;0;L;;;;;N;;;;; +134EA;EGYPTIAN HIEROGLYPH-134EA;Lo;0;L;;;;;N;;;;; +134EB;EGYPTIAN HIEROGLYPH-134EB;Lo;0;L;;;;;N;;;;; +134EC;EGYPTIAN HIEROGLYPH-134EC;Lo;0;L;;;;;N;;;;; +134ED;EGYPTIAN HIEROGLYPH-134ED;Lo;0;L;;;;;N;;;;; +134EE;EGYPTIAN HIEROGLYPH-134EE;Lo;0;L;;;;;N;;;;; +134EF;EGYPTIAN HIEROGLYPH-134EF;Lo;0;L;;;;;N;;;;; +134F0;EGYPTIAN HIEROGLYPH-134F0;Lo;0;L;;;;;N;;;;; +134F1;EGYPTIAN HIEROGLYPH-134F1;Lo;0;L;;;;;N;;;;; +134F2;EGYPTIAN HIEROGLYPH-134F2;Lo;0;L;;;;;N;;;;; +134F3;EGYPTIAN HIEROGLYPH-134F3;Lo;0;L;;;;;N;;;;; +134F4;EGYPTIAN HIEROGLYPH-134F4;Lo;0;L;;;;;N;;;;; +134F5;EGYPTIAN HIEROGLYPH-134F5;Lo;0;L;;;;;N;;;;; +134F6;EGYPTIAN HIEROGLYPH-134F6;Lo;0;L;;;;;N;;;;; +134F7;EGYPTIAN HIEROGLYPH-134F7;Lo;0;L;;;;;N;;;;; +134F8;EGYPTIAN HIEROGLYPH-134F8;Lo;0;L;;;;;N;;;;; +134F9;EGYPTIAN HIEROGLYPH-134F9;Lo;0;L;;;;;N;;;;; +134FA;EGYPTIAN HIEROGLYPH-134FA;Lo;0;L;;;;;N;;;;; +134FB;EGYPTIAN HIEROGLYPH-134FB;Lo;0;L;;;;;N;;;;; +134FC;EGYPTIAN HIEROGLYPH-134FC;Lo;0;L;;;;;N;;;;; +134FD;EGYPTIAN HIEROGLYPH-134FD;Lo;0;L;;;;;N;;;;; +134FE;EGYPTIAN HIEROGLYPH-134FE;Lo;0;L;;;;;N;;;;; +134FF;EGYPTIAN HIEROGLYPH-134FF;Lo;0;L;;;;;N;;;;; +13500;EGYPTIAN HIEROGLYPH-13500;Lo;0;L;;;;;N;;;;; +13501;EGYPTIAN HIEROGLYPH-13501;Lo;0;L;;;;;N;;;;; +13502;EGYPTIAN HIEROGLYPH-13502;Lo;0;L;;;;;N;;;;; +13503;EGYPTIAN HIEROGLYPH-13503;Lo;0;L;;;;;N;;;;; +13504;EGYPTIAN HIEROGLYPH-13504;Lo;0;L;;;;;N;;;;; +13505;EGYPTIAN HIEROGLYPH-13505;Lo;0;L;;;;;N;;;;; +13506;EGYPTIAN HIEROGLYPH-13506;Lo;0;L;;;;;N;;;;; +13507;EGYPTIAN HIEROGLYPH-13507;Lo;0;L;;;;;N;;;;; +13508;EGYPTIAN HIEROGLYPH-13508;Lo;0;L;;;;;N;;;;; +13509;EGYPTIAN HIEROGLYPH-13509;Lo;0;L;;;;;N;;;;; +1350A;EGYPTIAN HIEROGLYPH-1350A;Lo;0;L;;;;;N;;;;; +1350B;EGYPTIAN HIEROGLYPH-1350B;Lo;0;L;;;;;N;;;;; +1350C;EGYPTIAN HIEROGLYPH-1350C;Lo;0;L;;;;;N;;;;; +1350D;EGYPTIAN HIEROGLYPH-1350D;Lo;0;L;;;;;N;;;;; +1350E;EGYPTIAN HIEROGLYPH-1350E;Lo;0;L;;;;;N;;;;; +1350F;EGYPTIAN HIEROGLYPH-1350F;Lo;0;L;;;;;N;;;;; +13510;EGYPTIAN HIEROGLYPH-13510;Lo;0;L;;;;;N;;;;; +13511;EGYPTIAN HIEROGLYPH-13511;Lo;0;L;;;;;N;;;;; +13512;EGYPTIAN HIEROGLYPH-13512;Lo;0;L;;;;;N;;;;; +13513;EGYPTIAN HIEROGLYPH-13513;Lo;0;L;;;;;N;;;;; +13514;EGYPTIAN HIEROGLYPH-13514;Lo;0;L;;;;;N;;;;; +13515;EGYPTIAN HIEROGLYPH-13515;Lo;0;L;;;;;N;;;;; +13516;EGYPTIAN HIEROGLYPH-13516;Lo;0;L;;;;;N;;;;; +13517;EGYPTIAN HIEROGLYPH-13517;Lo;0;L;;;;;N;;;;; +13518;EGYPTIAN HIEROGLYPH-13518;Lo;0;L;;;;;N;;;;; +13519;EGYPTIAN HIEROGLYPH-13519;Lo;0;L;;;;;N;;;;; +1351A;EGYPTIAN HIEROGLYPH-1351A;Lo;0;L;;;;;N;;;;; +1351B;EGYPTIAN HIEROGLYPH-1351B;Lo;0;L;;;;;N;;;;; +1351C;EGYPTIAN HIEROGLYPH-1351C;Lo;0;L;;;;;N;;;;; +1351D;EGYPTIAN HIEROGLYPH-1351D;Lo;0;L;;;;;N;;;;; +1351E;EGYPTIAN HIEROGLYPH-1351E;Lo;0;L;;;;;N;;;;; +1351F;EGYPTIAN HIEROGLYPH-1351F;Lo;0;L;;;;;N;;;;; +13520;EGYPTIAN HIEROGLYPH-13520;Lo;0;L;;;;;N;;;;; +13521;EGYPTIAN HIEROGLYPH-13521;Lo;0;L;;;;;N;;;;; +13522;EGYPTIAN HIEROGLYPH-13522;Lo;0;L;;;;;N;;;;; +13523;EGYPTIAN HIEROGLYPH-13523;Lo;0;L;;;;;N;;;;; +13524;EGYPTIAN HIEROGLYPH-13524;Lo;0;L;;;;;N;;;;; +13525;EGYPTIAN HIEROGLYPH-13525;Lo;0;L;;;;;N;;;;; +13526;EGYPTIAN HIEROGLYPH-13526;Lo;0;L;;;;;N;;;;; +13527;EGYPTIAN HIEROGLYPH-13527;Lo;0;L;;;;;N;;;;; +13528;EGYPTIAN HIEROGLYPH-13528;Lo;0;L;;;;;N;;;;; +13529;EGYPTIAN HIEROGLYPH-13529;Lo;0;L;;;;;N;;;;; +1352A;EGYPTIAN HIEROGLYPH-1352A;Lo;0;L;;;;;N;;;;; +1352B;EGYPTIAN HIEROGLYPH-1352B;Lo;0;L;;;;;N;;;;; +1352C;EGYPTIAN HIEROGLYPH-1352C;Lo;0;L;;;;;N;;;;; +1352D;EGYPTIAN HIEROGLYPH-1352D;Lo;0;L;;;;;N;;;;; +1352E;EGYPTIAN HIEROGLYPH-1352E;Lo;0;L;;;;;N;;;;; +1352F;EGYPTIAN HIEROGLYPH-1352F;Lo;0;L;;;;;N;;;;; +13530;EGYPTIAN HIEROGLYPH-13530;Lo;0;L;;;;;N;;;;; +13531;EGYPTIAN HIEROGLYPH-13531;Lo;0;L;;;;;N;;;;; +13532;EGYPTIAN HIEROGLYPH-13532;Lo;0;L;;;;;N;;;;; +13533;EGYPTIAN HIEROGLYPH-13533;Lo;0;L;;;;;N;;;;; +13534;EGYPTIAN HIEROGLYPH-13534;Lo;0;L;;;;;N;;;;; +13535;EGYPTIAN HIEROGLYPH-13535;Lo;0;L;;;;;N;;;;; +13536;EGYPTIAN HIEROGLYPH-13536;Lo;0;L;;;;;N;;;;; +13537;EGYPTIAN HIEROGLYPH-13537;Lo;0;L;;;;;N;;;;; +13538;EGYPTIAN HIEROGLYPH-13538;Lo;0;L;;;;;N;;;;; +13539;EGYPTIAN HIEROGLYPH-13539;Lo;0;L;;;;;N;;;;; +1353A;EGYPTIAN HIEROGLYPH-1353A;Lo;0;L;;;;;N;;;;; +1353B;EGYPTIAN HIEROGLYPH-1353B;Lo;0;L;;;;;N;;;;; +1353C;EGYPTIAN HIEROGLYPH-1353C;Lo;0;L;;;;;N;;;;; +1353D;EGYPTIAN HIEROGLYPH-1353D;Lo;0;L;;;;;N;;;;; +1353E;EGYPTIAN HIEROGLYPH-1353E;Lo;0;L;;;;;N;;;;; +1353F;EGYPTIAN HIEROGLYPH-1353F;Lo;0;L;;;;;N;;;;; +13540;EGYPTIAN HIEROGLYPH-13540;Lo;0;L;;;;;N;;;;; +13541;EGYPTIAN HIEROGLYPH-13541;Lo;0;L;;;;;N;;;;; +13542;EGYPTIAN HIEROGLYPH-13542;Lo;0;L;;;;;N;;;;; +13543;EGYPTIAN HIEROGLYPH-13543;Lo;0;L;;;;;N;;;;; +13544;EGYPTIAN HIEROGLYPH-13544;Lo;0;L;;;;;N;;;;; +13545;EGYPTIAN HIEROGLYPH-13545;Lo;0;L;;;;;N;;;;; +13546;EGYPTIAN HIEROGLYPH-13546;Lo;0;L;;;;;N;;;;; +13547;EGYPTIAN HIEROGLYPH-13547;Lo;0;L;;;;;N;;;;; +13548;EGYPTIAN HIEROGLYPH-13548;Lo;0;L;;;;;N;;;;; +13549;EGYPTIAN HIEROGLYPH-13549;Lo;0;L;;;;;N;;;;; +1354A;EGYPTIAN HIEROGLYPH-1354A;Lo;0;L;;;;;N;;;;; +1354B;EGYPTIAN HIEROGLYPH-1354B;Lo;0;L;;;;;N;;;;; +1354C;EGYPTIAN HIEROGLYPH-1354C;Lo;0;L;;;;;N;;;;; +1354D;EGYPTIAN HIEROGLYPH-1354D;Lo;0;L;;;;;N;;;;; +1354E;EGYPTIAN HIEROGLYPH-1354E;Lo;0;L;;;;;N;;;;; +1354F;EGYPTIAN HIEROGLYPH-1354F;Lo;0;L;;;;;N;;;;; +13550;EGYPTIAN HIEROGLYPH-13550;Lo;0;L;;;;;N;;;;; +13551;EGYPTIAN HIEROGLYPH-13551;Lo;0;L;;;;;N;;;;; +13552;EGYPTIAN HIEROGLYPH-13552;Lo;0;L;;;;;N;;;;; +13553;EGYPTIAN HIEROGLYPH-13553;Lo;0;L;;;;;N;;;;; +13554;EGYPTIAN HIEROGLYPH-13554;Lo;0;L;;;;;N;;;;; +13555;EGYPTIAN HIEROGLYPH-13555;Lo;0;L;;;;;N;;;;; +13556;EGYPTIAN HIEROGLYPH-13556;Lo;0;L;;;;;N;;;;; +13557;EGYPTIAN HIEROGLYPH-13557;Lo;0;L;;;;;N;;;;; +13558;EGYPTIAN HIEROGLYPH-13558;Lo;0;L;;;;;N;;;;; +13559;EGYPTIAN HIEROGLYPH-13559;Lo;0;L;;;;;N;;;;; +1355A;EGYPTIAN HIEROGLYPH-1355A;Lo;0;L;;;;;N;;;;; +1355B;EGYPTIAN HIEROGLYPH-1355B;Lo;0;L;;;;;N;;;;; +1355C;EGYPTIAN HIEROGLYPH-1355C;Lo;0;L;;;;;N;;;;; +1355D;EGYPTIAN HIEROGLYPH-1355D;Lo;0;L;;;;;N;;;;; +1355E;EGYPTIAN HIEROGLYPH-1355E;Lo;0;L;;;;;N;;;;; +1355F;EGYPTIAN HIEROGLYPH-1355F;Lo;0;L;;;;;N;;;;; +13560;EGYPTIAN HIEROGLYPH-13560;Lo;0;L;;;;;N;;;;; +13561;EGYPTIAN HIEROGLYPH-13561;Lo;0;L;;;;;N;;;;; +13562;EGYPTIAN HIEROGLYPH-13562;Lo;0;L;;;;;N;;;;; +13563;EGYPTIAN HIEROGLYPH-13563;Lo;0;L;;;;;N;;;;; +13564;EGYPTIAN HIEROGLYPH-13564;Lo;0;L;;;;;N;;;;; +13565;EGYPTIAN HIEROGLYPH-13565;Lo;0;L;;;;;N;;;;; +13566;EGYPTIAN HIEROGLYPH-13566;Lo;0;L;;;;;N;;;;; +13567;EGYPTIAN HIEROGLYPH-13567;Lo;0;L;;;;;N;;;;; +13568;EGYPTIAN HIEROGLYPH-13568;Lo;0;L;;;;;N;;;;; +13569;EGYPTIAN HIEROGLYPH-13569;Lo;0;L;;;;;N;;;;; +1356A;EGYPTIAN HIEROGLYPH-1356A;Lo;0;L;;;;;N;;;;; +1356B;EGYPTIAN HIEROGLYPH-1356B;Lo;0;L;;;;;N;;;;; +1356C;EGYPTIAN HIEROGLYPH-1356C;Lo;0;L;;;;;N;;;;; +1356D;EGYPTIAN HIEROGLYPH-1356D;Lo;0;L;;;;;N;;;;; +1356E;EGYPTIAN HIEROGLYPH-1356E;Lo;0;L;;;;;N;;;;; +1356F;EGYPTIAN HIEROGLYPH-1356F;Lo;0;L;;;;;N;;;;; +13570;EGYPTIAN HIEROGLYPH-13570;Lo;0;L;;;;;N;;;;; +13571;EGYPTIAN HIEROGLYPH-13571;Lo;0;L;;;;;N;;;;; +13572;EGYPTIAN HIEROGLYPH-13572;Lo;0;L;;;;;N;;;;; +13573;EGYPTIAN HIEROGLYPH-13573;Lo;0;L;;;;;N;;;;; +13574;EGYPTIAN HIEROGLYPH-13574;Lo;0;L;;;;;N;;;;; +13575;EGYPTIAN HIEROGLYPH-13575;Lo;0;L;;;;;N;;;;; +13576;EGYPTIAN HIEROGLYPH-13576;Lo;0;L;;;;;N;;;;; +13577;EGYPTIAN HIEROGLYPH-13577;Lo;0;L;;;;;N;;;;; +13578;EGYPTIAN HIEROGLYPH-13578;Lo;0;L;;;;;N;;;;; +13579;EGYPTIAN HIEROGLYPH-13579;Lo;0;L;;;;;N;;;;; +1357A;EGYPTIAN HIEROGLYPH-1357A;Lo;0;L;;;;;N;;;;; +1357B;EGYPTIAN HIEROGLYPH-1357B;Lo;0;L;;;;;N;;;;; +1357C;EGYPTIAN HIEROGLYPH-1357C;Lo;0;L;;;;;N;;;;; +1357D;EGYPTIAN HIEROGLYPH-1357D;Lo;0;L;;;;;N;;;;; +1357E;EGYPTIAN HIEROGLYPH-1357E;Lo;0;L;;;;;N;;;;; +1357F;EGYPTIAN HIEROGLYPH-1357F;Lo;0;L;;;;;N;;;;; +13580;EGYPTIAN HIEROGLYPH-13580;Lo;0;L;;;;;N;;;;; +13581;EGYPTIAN HIEROGLYPH-13581;Lo;0;L;;;;;N;;;;; +13582;EGYPTIAN HIEROGLYPH-13582;Lo;0;L;;;;;N;;;;; +13583;EGYPTIAN HIEROGLYPH-13583;Lo;0;L;;;;;N;;;;; +13584;EGYPTIAN HIEROGLYPH-13584;Lo;0;L;;;;;N;;;;; +13585;EGYPTIAN HIEROGLYPH-13585;Lo;0;L;;;;;N;;;;; +13586;EGYPTIAN HIEROGLYPH-13586;Lo;0;L;;;;;N;;;;; +13587;EGYPTIAN HIEROGLYPH-13587;Lo;0;L;;;;;N;;;;; +13588;EGYPTIAN HIEROGLYPH-13588;Lo;0;L;;;;;N;;;;; +13589;EGYPTIAN HIEROGLYPH-13589;Lo;0;L;;;;;N;;;;; +1358A;EGYPTIAN HIEROGLYPH-1358A;Lo;0;L;;;;;N;;;;; +1358B;EGYPTIAN HIEROGLYPH-1358B;Lo;0;L;;;;;N;;;;; +1358C;EGYPTIAN HIEROGLYPH-1358C;Lo;0;L;;;;;N;;;;; +1358D;EGYPTIAN HIEROGLYPH-1358D;Lo;0;L;;;;;N;;;;; +1358E;EGYPTIAN HIEROGLYPH-1358E;Lo;0;L;;;;;N;;;;; +1358F;EGYPTIAN HIEROGLYPH-1358F;Lo;0;L;;;;;N;;;;; +13590;EGYPTIAN HIEROGLYPH-13590;Lo;0;L;;;;;N;;;;; +13591;EGYPTIAN HIEROGLYPH-13591;Lo;0;L;;;;;N;;;;; +13592;EGYPTIAN HIEROGLYPH-13592;Lo;0;L;;;;;N;;;;; +13593;EGYPTIAN HIEROGLYPH-13593;Lo;0;L;;;;;N;;;;; +13594;EGYPTIAN HIEROGLYPH-13594;Lo;0;L;;;;;N;;;;; +13595;EGYPTIAN HIEROGLYPH-13595;Lo;0;L;;;;;N;;;;; +13596;EGYPTIAN HIEROGLYPH-13596;Lo;0;L;;;;;N;;;;; +13597;EGYPTIAN HIEROGLYPH-13597;Lo;0;L;;;;;N;;;;; +13598;EGYPTIAN HIEROGLYPH-13598;Lo;0;L;;;;;N;;;;; +13599;EGYPTIAN HIEROGLYPH-13599;Lo;0;L;;;;;N;;;;; +1359A;EGYPTIAN HIEROGLYPH-1359A;Lo;0;L;;;;;N;;;;; +1359B;EGYPTIAN HIEROGLYPH-1359B;Lo;0;L;;;;;N;;;;; +1359C;EGYPTIAN HIEROGLYPH-1359C;Lo;0;L;;;;;N;;;;; +1359D;EGYPTIAN HIEROGLYPH-1359D;Lo;0;L;;;;;N;;;;; +1359E;EGYPTIAN HIEROGLYPH-1359E;Lo;0;L;;;;;N;;;;; +1359F;EGYPTIAN HIEROGLYPH-1359F;Lo;0;L;;;;;N;;;;; +135A0;EGYPTIAN HIEROGLYPH-135A0;Lo;0;L;;;;;N;;;;; +135A1;EGYPTIAN HIEROGLYPH-135A1;Lo;0;L;;;;;N;;;;; +135A2;EGYPTIAN HIEROGLYPH-135A2;Lo;0;L;;;;;N;;;;; +135A3;EGYPTIAN HIEROGLYPH-135A3;Lo;0;L;;;;;N;;;;; +135A4;EGYPTIAN HIEROGLYPH-135A4;Lo;0;L;;;;;N;;;;; +135A5;EGYPTIAN HIEROGLYPH-135A5;Lo;0;L;;;;;N;;;;; +135A6;EGYPTIAN HIEROGLYPH-135A6;Lo;0;L;;;;;N;;;;; +135A7;EGYPTIAN HIEROGLYPH-135A7;Lo;0;L;;;;;N;;;;; +135A8;EGYPTIAN HIEROGLYPH-135A8;Lo;0;L;;;;;N;;;;; +135A9;EGYPTIAN HIEROGLYPH-135A9;Lo;0;L;;;;;N;;;;; +135AA;EGYPTIAN HIEROGLYPH-135AA;Lo;0;L;;;;;N;;;;; +135AB;EGYPTIAN HIEROGLYPH-135AB;Lo;0;L;;;;;N;;;;; +135AC;EGYPTIAN HIEROGLYPH-135AC;Lo;0;L;;;;;N;;;;; +135AD;EGYPTIAN HIEROGLYPH-135AD;Lo;0;L;;;;;N;;;;; +135AE;EGYPTIAN HIEROGLYPH-135AE;Lo;0;L;;;;;N;;;;; +135AF;EGYPTIAN HIEROGLYPH-135AF;Lo;0;L;;;;;N;;;;; +135B0;EGYPTIAN HIEROGLYPH-135B0;Lo;0;L;;;;;N;;;;; +135B1;EGYPTIAN HIEROGLYPH-135B1;Lo;0;L;;;;;N;;;;; +135B2;EGYPTIAN HIEROGLYPH-135B2;Lo;0;L;;;;;N;;;;; +135B3;EGYPTIAN HIEROGLYPH-135B3;Lo;0;L;;;;;N;;;;; +135B4;EGYPTIAN HIEROGLYPH-135B4;Lo;0;L;;;;;N;;;;; +135B5;EGYPTIAN HIEROGLYPH-135B5;Lo;0;L;;;;;N;;;;; +135B6;EGYPTIAN HIEROGLYPH-135B6;Lo;0;L;;;;;N;;;;; +135B7;EGYPTIAN HIEROGLYPH-135B7;Lo;0;L;;;;;N;;;;; +135B8;EGYPTIAN HIEROGLYPH-135B8;Lo;0;L;;;;;N;;;;; +135B9;EGYPTIAN HIEROGLYPH-135B9;Lo;0;L;;;;;N;;;;; +135BA;EGYPTIAN HIEROGLYPH-135BA;Lo;0;L;;;;;N;;;;; +135BB;EGYPTIAN HIEROGLYPH-135BB;Lo;0;L;;;;;N;;;;; +135BC;EGYPTIAN HIEROGLYPH-135BC;Lo;0;L;;;;;N;;;;; +135BD;EGYPTIAN HIEROGLYPH-135BD;Lo;0;L;;;;;N;;;;; +135BE;EGYPTIAN HIEROGLYPH-135BE;Lo;0;L;;;;;N;;;;; +135BF;EGYPTIAN HIEROGLYPH-135BF;Lo;0;L;;;;;N;;;;; +135C0;EGYPTIAN HIEROGLYPH-135C0;Lo;0;L;;;;;N;;;;; +135C1;EGYPTIAN HIEROGLYPH-135C1;Lo;0;L;;;;;N;;;;; +135C2;EGYPTIAN HIEROGLYPH-135C2;Lo;0;L;;;;;N;;;;; +135C3;EGYPTIAN HIEROGLYPH-135C3;Lo;0;L;;;;;N;;;;; +135C4;EGYPTIAN HIEROGLYPH-135C4;Lo;0;L;;;;;N;;;;; +135C5;EGYPTIAN HIEROGLYPH-135C5;Lo;0;L;;;;;N;;;;; +135C6;EGYPTIAN HIEROGLYPH-135C6;Lo;0;L;;;;;N;;;;; +135C7;EGYPTIAN HIEROGLYPH-135C7;Lo;0;L;;;;;N;;;;; +135C8;EGYPTIAN HIEROGLYPH-135C8;Lo;0;L;;;;;N;;;;; +135C9;EGYPTIAN HIEROGLYPH-135C9;Lo;0;L;;;;;N;;;;; +135CA;EGYPTIAN HIEROGLYPH-135CA;Lo;0;L;;;;;N;;;;; +135CB;EGYPTIAN HIEROGLYPH-135CB;Lo;0;L;;;;;N;;;;; +135CC;EGYPTIAN HIEROGLYPH-135CC;Lo;0;L;;;;;N;;;;; +135CD;EGYPTIAN HIEROGLYPH-135CD;Lo;0;L;;;;;N;;;;; +135CE;EGYPTIAN HIEROGLYPH-135CE;Lo;0;L;;;;;N;;;;; +135CF;EGYPTIAN HIEROGLYPH-135CF;Lo;0;L;;;;;N;;;;; +135D0;EGYPTIAN HIEROGLYPH-135D0;Lo;0;L;;;;;N;;;;; +135D1;EGYPTIAN HIEROGLYPH-135D1;Lo;0;L;;;;;N;;;;; +135D2;EGYPTIAN HIEROGLYPH-135D2;Lo;0;L;;;;;N;;;;; +135D3;EGYPTIAN HIEROGLYPH-135D3;Lo;0;L;;;;;N;;;;; +135D4;EGYPTIAN HIEROGLYPH-135D4;Lo;0;L;;;;;N;;;;; +135D5;EGYPTIAN HIEROGLYPH-135D5;Lo;0;L;;;;;N;;;;; +135D6;EGYPTIAN HIEROGLYPH-135D6;Lo;0;L;;;;;N;;;;; +135D7;EGYPTIAN HIEROGLYPH-135D7;Lo;0;L;;;;;N;;;;; +135D8;EGYPTIAN HIEROGLYPH-135D8;Lo;0;L;;;;;N;;;;; +135D9;EGYPTIAN HIEROGLYPH-135D9;Lo;0;L;;;;;N;;;;; +135DA;EGYPTIAN HIEROGLYPH-135DA;Lo;0;L;;;;;N;;;;; +135DB;EGYPTIAN HIEROGLYPH-135DB;Lo;0;L;;;;;N;;;;; +135DC;EGYPTIAN HIEROGLYPH-135DC;Lo;0;L;;;;;N;;;;; +135DD;EGYPTIAN HIEROGLYPH-135DD;Lo;0;L;;;;;N;;;;; +135DE;EGYPTIAN HIEROGLYPH-135DE;Lo;0;L;;;;;N;;;;; +135DF;EGYPTIAN HIEROGLYPH-135DF;Lo;0;L;;;;;N;;;;; +135E0;EGYPTIAN HIEROGLYPH-135E0;Lo;0;L;;;;;N;;;;; +135E1;EGYPTIAN HIEROGLYPH-135E1;Lo;0;L;;;;;N;;;;; +135E2;EGYPTIAN HIEROGLYPH-135E2;Lo;0;L;;;;;N;;;;; +135E3;EGYPTIAN HIEROGLYPH-135E3;Lo;0;L;;;;;N;;;;; +135E4;EGYPTIAN HIEROGLYPH-135E4;Lo;0;L;;;;;N;;;;; +135E5;EGYPTIAN HIEROGLYPH-135E5;Lo;0;L;;;;;N;;;;; +135E6;EGYPTIAN HIEROGLYPH-135E6;Lo;0;L;;;;;N;;;;; +135E7;EGYPTIAN HIEROGLYPH-135E7;Lo;0;L;;;;;N;;;;; +135E8;EGYPTIAN HIEROGLYPH-135E8;Lo;0;L;;;;;N;;;;; +135E9;EGYPTIAN HIEROGLYPH-135E9;Lo;0;L;;;;;N;;;;; +135EA;EGYPTIAN HIEROGLYPH-135EA;Lo;0;L;;;;;N;;;;; +135EB;EGYPTIAN HIEROGLYPH-135EB;Lo;0;L;;;;;N;;;;; +135EC;EGYPTIAN HIEROGLYPH-135EC;Lo;0;L;;;;;N;;;;; +135ED;EGYPTIAN HIEROGLYPH-135ED;Lo;0;L;;;;;N;;;;; +135EE;EGYPTIAN HIEROGLYPH-135EE;Lo;0;L;;;;;N;;;;; +135EF;EGYPTIAN HIEROGLYPH-135EF;Lo;0;L;;;;;N;;;;; +135F0;EGYPTIAN HIEROGLYPH-135F0;Lo;0;L;;;;;N;;;;; +135F1;EGYPTIAN HIEROGLYPH-135F1;Lo;0;L;;;;;N;;;;; +135F2;EGYPTIAN HIEROGLYPH-135F2;Lo;0;L;;;;;N;;;;; +135F3;EGYPTIAN HIEROGLYPH-135F3;Lo;0;L;;;;;N;;;;; +135F4;EGYPTIAN HIEROGLYPH-135F4;Lo;0;L;;;;;N;;;;; +135F5;EGYPTIAN HIEROGLYPH-135F5;Lo;0;L;;;;;N;;;;; +135F6;EGYPTIAN HIEROGLYPH-135F6;Lo;0;L;;;;;N;;;;; +135F7;EGYPTIAN HIEROGLYPH-135F7;Lo;0;L;;;;;N;;;;; +135F8;EGYPTIAN HIEROGLYPH-135F8;Lo;0;L;;;;;N;;;;; +135F9;EGYPTIAN HIEROGLYPH-135F9;Lo;0;L;;;;;N;;;;; +135FA;EGYPTIAN HIEROGLYPH-135FA;Lo;0;L;;;;;N;;;;; +135FB;EGYPTIAN HIEROGLYPH-135FB;Lo;0;L;;;;;N;;;;; +135FC;EGYPTIAN HIEROGLYPH-135FC;Lo;0;L;;;;;N;;;;; +135FD;EGYPTIAN HIEROGLYPH-135FD;Lo;0;L;;;;;N;;;;; +135FE;EGYPTIAN HIEROGLYPH-135FE;Lo;0;L;;;;;N;;;;; +135FF;EGYPTIAN HIEROGLYPH-135FF;Lo;0;L;;;;;N;;;;; +13600;EGYPTIAN HIEROGLYPH-13600;Lo;0;L;;;;;N;;;;; +13601;EGYPTIAN HIEROGLYPH-13601;Lo;0;L;;;;;N;;;;; +13602;EGYPTIAN HIEROGLYPH-13602;Lo;0;L;;;;;N;;;;; +13603;EGYPTIAN HIEROGLYPH-13603;Lo;0;L;;;;;N;;;;; +13604;EGYPTIAN HIEROGLYPH-13604;Lo;0;L;;;;;N;;;;; +13605;EGYPTIAN HIEROGLYPH-13605;Lo;0;L;;;;;N;;;;; +13606;EGYPTIAN HIEROGLYPH-13606;Lo;0;L;;;;;N;;;;; +13607;EGYPTIAN HIEROGLYPH-13607;Lo;0;L;;;;;N;;;;; +13608;EGYPTIAN HIEROGLYPH-13608;Lo;0;L;;;;;N;;;;; +13609;EGYPTIAN HIEROGLYPH-13609;Lo;0;L;;;;;N;;;;; +1360A;EGYPTIAN HIEROGLYPH-1360A;Lo;0;L;;;;;N;;;;; +1360B;EGYPTIAN HIEROGLYPH-1360B;Lo;0;L;;;;;N;;;;; +1360C;EGYPTIAN HIEROGLYPH-1360C;Lo;0;L;;;;;N;;;;; +1360D;EGYPTIAN HIEROGLYPH-1360D;Lo;0;L;;;;;N;;;;; +1360E;EGYPTIAN HIEROGLYPH-1360E;Lo;0;L;;;;;N;;;;; +1360F;EGYPTIAN HIEROGLYPH-1360F;Lo;0;L;;;;;N;;;;; +13610;EGYPTIAN HIEROGLYPH-13610;Lo;0;L;;;;;N;;;;; +13611;EGYPTIAN HIEROGLYPH-13611;Lo;0;L;;;;;N;;;;; +13612;EGYPTIAN HIEROGLYPH-13612;Lo;0;L;;;;;N;;;;; +13613;EGYPTIAN HIEROGLYPH-13613;Lo;0;L;;;;;N;;;;; +13614;EGYPTIAN HIEROGLYPH-13614;Lo;0;L;;;;;N;;;;; +13615;EGYPTIAN HIEROGLYPH-13615;Lo;0;L;;;;;N;;;;; +13616;EGYPTIAN HIEROGLYPH-13616;Lo;0;L;;;;;N;;;;; +13617;EGYPTIAN HIEROGLYPH-13617;Lo;0;L;;;;;N;;;;; +13618;EGYPTIAN HIEROGLYPH-13618;Lo;0;L;;;;;N;;;;; +13619;EGYPTIAN HIEROGLYPH-13619;Lo;0;L;;;;;N;;;;; +1361A;EGYPTIAN HIEROGLYPH-1361A;Lo;0;L;;;;;N;;;;; +1361B;EGYPTIAN HIEROGLYPH-1361B;Lo;0;L;;;;;N;;;;; +1361C;EGYPTIAN HIEROGLYPH-1361C;Lo;0;L;;;;;N;;;;; +1361D;EGYPTIAN HIEROGLYPH-1361D;Lo;0;L;;;;;N;;;;; +1361E;EGYPTIAN HIEROGLYPH-1361E;Lo;0;L;;;;;N;;;;; +1361F;EGYPTIAN HIEROGLYPH-1361F;Lo;0;L;;;;;N;;;;; +13620;EGYPTIAN HIEROGLYPH-13620;Lo;0;L;;;;;N;;;;; +13621;EGYPTIAN HIEROGLYPH-13621;Lo;0;L;;;;;N;;;;; +13622;EGYPTIAN HIEROGLYPH-13622;Lo;0;L;;;;;N;;;;; +13623;EGYPTIAN HIEROGLYPH-13623;Lo;0;L;;;;;N;;;;; +13624;EGYPTIAN HIEROGLYPH-13624;Lo;0;L;;;;;N;;;;; +13625;EGYPTIAN HIEROGLYPH-13625;Lo;0;L;;;;;N;;;;; +13626;EGYPTIAN HIEROGLYPH-13626;Lo;0;L;;;;;N;;;;; +13627;EGYPTIAN HIEROGLYPH-13627;Lo;0;L;;;;;N;;;;; +13628;EGYPTIAN HIEROGLYPH-13628;Lo;0;L;;;;;N;;;;; +13629;EGYPTIAN HIEROGLYPH-13629;Lo;0;L;;;;;N;;;;; +1362A;EGYPTIAN HIEROGLYPH-1362A;Lo;0;L;;;;;N;;;;; +1362B;EGYPTIAN HIEROGLYPH-1362B;Lo;0;L;;;;;N;;;;; +1362C;EGYPTIAN HIEROGLYPH-1362C;Lo;0;L;;;;;N;;;;; +1362D;EGYPTIAN HIEROGLYPH-1362D;Lo;0;L;;;;;N;;;;; +1362E;EGYPTIAN HIEROGLYPH-1362E;Lo;0;L;;;;;N;;;;; +1362F;EGYPTIAN HIEROGLYPH-1362F;Lo;0;L;;;;;N;;;;; +13630;EGYPTIAN HIEROGLYPH-13630;Lo;0;L;;;;;N;;;;; +13631;EGYPTIAN HIEROGLYPH-13631;Lo;0;L;;;;;N;;;;; +13632;EGYPTIAN HIEROGLYPH-13632;Lo;0;L;;;;;N;;;;; +13633;EGYPTIAN HIEROGLYPH-13633;Lo;0;L;;;;;N;;;;; +13634;EGYPTIAN HIEROGLYPH-13634;Lo;0;L;;;;;N;;;;; +13635;EGYPTIAN HIEROGLYPH-13635;Lo;0;L;;;;;N;;;;; +13636;EGYPTIAN HIEROGLYPH-13636;Lo;0;L;;;;;N;;;;; +13637;EGYPTIAN HIEROGLYPH-13637;Lo;0;L;;;;;N;;;;; +13638;EGYPTIAN HIEROGLYPH-13638;Lo;0;L;;;;;N;;;;; +13639;EGYPTIAN HIEROGLYPH-13639;Lo;0;L;;;;;N;;;;; +1363A;EGYPTIAN HIEROGLYPH-1363A;Lo;0;L;;;;;N;;;;; +1363B;EGYPTIAN HIEROGLYPH-1363B;Lo;0;L;;;;;N;;;;; +1363C;EGYPTIAN HIEROGLYPH-1363C;Lo;0;L;;;;;N;;;;; +1363D;EGYPTIAN HIEROGLYPH-1363D;Lo;0;L;;;;;N;;;;; +1363E;EGYPTIAN HIEROGLYPH-1363E;Lo;0;L;;;;;N;;;;; +1363F;EGYPTIAN HIEROGLYPH-1363F;Lo;0;L;;;;;N;;;;; +13640;EGYPTIAN HIEROGLYPH-13640;Lo;0;L;;;;;N;;;;; +13641;EGYPTIAN HIEROGLYPH-13641;Lo;0;L;;;;;N;;;;; +13642;EGYPTIAN HIEROGLYPH-13642;Lo;0;L;;;;;N;;;;; +13643;EGYPTIAN HIEROGLYPH-13643;Lo;0;L;;;;;N;;;;; +13644;EGYPTIAN HIEROGLYPH-13644;Lo;0;L;;;;;N;;;;; +13645;EGYPTIAN HIEROGLYPH-13645;Lo;0;L;;;;;N;;;;; +13646;EGYPTIAN HIEROGLYPH-13646;Lo;0;L;;;;;N;;;;; +13647;EGYPTIAN HIEROGLYPH-13647;Lo;0;L;;;;;N;;;;; +13648;EGYPTIAN HIEROGLYPH-13648;Lo;0;L;;;;;N;;;;; +13649;EGYPTIAN HIEROGLYPH-13649;Lo;0;L;;;;;N;;;;; +1364A;EGYPTIAN HIEROGLYPH-1364A;Lo;0;L;;;;;N;;;;; +1364B;EGYPTIAN HIEROGLYPH-1364B;Lo;0;L;;;;;N;;;;; +1364C;EGYPTIAN HIEROGLYPH-1364C;Lo;0;L;;;;;N;;;;; +1364D;EGYPTIAN HIEROGLYPH-1364D;Lo;0;L;;;;;N;;;;; +1364E;EGYPTIAN HIEROGLYPH-1364E;Lo;0;L;;;;;N;;;;; +1364F;EGYPTIAN HIEROGLYPH-1364F;Lo;0;L;;;;;N;;;;; +13650;EGYPTIAN HIEROGLYPH-13650;Lo;0;L;;;;;N;;;;; +13651;EGYPTIAN HIEROGLYPH-13651;Lo;0;L;;;;;N;;;;; +13652;EGYPTIAN HIEROGLYPH-13652;Lo;0;L;;;;;N;;;;; +13653;EGYPTIAN HIEROGLYPH-13653;Lo;0;L;;;;;N;;;;; +13654;EGYPTIAN HIEROGLYPH-13654;Lo;0;L;;;;;N;;;;; +13655;EGYPTIAN HIEROGLYPH-13655;Lo;0;L;;;;;N;;;;; +13656;EGYPTIAN HIEROGLYPH-13656;Lo;0;L;;;;;N;;;;; +13657;EGYPTIAN HIEROGLYPH-13657;Lo;0;L;;;;;N;;;;; +13658;EGYPTIAN HIEROGLYPH-13658;Lo;0;L;;;;;N;;;;; +13659;EGYPTIAN HIEROGLYPH-13659;Lo;0;L;;;;;N;;;;; +1365A;EGYPTIAN HIEROGLYPH-1365A;Lo;0;L;;;;;N;;;;; +1365B;EGYPTIAN HIEROGLYPH-1365B;Lo;0;L;;;;;N;;;;; +1365C;EGYPTIAN HIEROGLYPH-1365C;Lo;0;L;;;;;N;;;;; +1365D;EGYPTIAN HIEROGLYPH-1365D;Lo;0;L;;;;;N;;;;; +1365E;EGYPTIAN HIEROGLYPH-1365E;Lo;0;L;;;;;N;;;;; +1365F;EGYPTIAN HIEROGLYPH-1365F;Lo;0;L;;;;;N;;;;; +13660;EGYPTIAN HIEROGLYPH-13660;Lo;0;L;;;;;N;;;;; +13661;EGYPTIAN HIEROGLYPH-13661;Lo;0;L;;;;;N;;;;; +13662;EGYPTIAN HIEROGLYPH-13662;Lo;0;L;;;;;N;;;;; +13663;EGYPTIAN HIEROGLYPH-13663;Lo;0;L;;;;;N;;;;; +13664;EGYPTIAN HIEROGLYPH-13664;Lo;0;L;;;;;N;;;;; +13665;EGYPTIAN HIEROGLYPH-13665;Lo;0;L;;;;;N;;;;; +13666;EGYPTIAN HIEROGLYPH-13666;Lo;0;L;;;;;N;;;;; +13667;EGYPTIAN HIEROGLYPH-13667;Lo;0;L;;;;;N;;;;; +13668;EGYPTIAN HIEROGLYPH-13668;Lo;0;L;;;;;N;;;;; +13669;EGYPTIAN HIEROGLYPH-13669;Lo;0;L;;;;;N;;;;; +1366A;EGYPTIAN HIEROGLYPH-1366A;Lo;0;L;;;;;N;;;;; +1366B;EGYPTIAN HIEROGLYPH-1366B;Lo;0;L;;;;;N;;;;; +1366C;EGYPTIAN HIEROGLYPH-1366C;Lo;0;L;;;;;N;;;;; +1366D;EGYPTIAN HIEROGLYPH-1366D;Lo;0;L;;;;;N;;;;; +1366E;EGYPTIAN HIEROGLYPH-1366E;Lo;0;L;;;;;N;;;;; +1366F;EGYPTIAN HIEROGLYPH-1366F;Lo;0;L;;;;;N;;;;; +13670;EGYPTIAN HIEROGLYPH-13670;Lo;0;L;;;;;N;;;;; +13671;EGYPTIAN HIEROGLYPH-13671;Lo;0;L;;;;;N;;;;; +13672;EGYPTIAN HIEROGLYPH-13672;Lo;0;L;;;;;N;;;;; +13673;EGYPTIAN HIEROGLYPH-13673;Lo;0;L;;;;;N;;;;; +13674;EGYPTIAN HIEROGLYPH-13674;Lo;0;L;;;;;N;;;;; +13675;EGYPTIAN HIEROGLYPH-13675;Lo;0;L;;;;;N;;;;; +13676;EGYPTIAN HIEROGLYPH-13676;Lo;0;L;;;;;N;;;;; +13677;EGYPTIAN HIEROGLYPH-13677;Lo;0;L;;;;;N;;;;; +13678;EGYPTIAN HIEROGLYPH-13678;Lo;0;L;;;;;N;;;;; +13679;EGYPTIAN HIEROGLYPH-13679;Lo;0;L;;;;;N;;;;; +1367A;EGYPTIAN HIEROGLYPH-1367A;Lo;0;L;;;;;N;;;;; +1367B;EGYPTIAN HIEROGLYPH-1367B;Lo;0;L;;;;;N;;;;; +1367C;EGYPTIAN HIEROGLYPH-1367C;Lo;0;L;;;;;N;;;;; +1367D;EGYPTIAN HIEROGLYPH-1367D;Lo;0;L;;;;;N;;;;; +1367E;EGYPTIAN HIEROGLYPH-1367E;Lo;0;L;;;;;N;;;;; +1367F;EGYPTIAN HIEROGLYPH-1367F;Lo;0;L;;;;;N;;;;; +13680;EGYPTIAN HIEROGLYPH-13680;Lo;0;L;;;;;N;;;;; +13681;EGYPTIAN HIEROGLYPH-13681;Lo;0;L;;;;;N;;;;; +13682;EGYPTIAN HIEROGLYPH-13682;Lo;0;L;;;;;N;;;;; +13683;EGYPTIAN HIEROGLYPH-13683;Lo;0;L;;;;;N;;;;; +13684;EGYPTIAN HIEROGLYPH-13684;Lo;0;L;;;;;N;;;;; +13685;EGYPTIAN HIEROGLYPH-13685;Lo;0;L;;;;;N;;;;; +13686;EGYPTIAN HIEROGLYPH-13686;Lo;0;L;;;;;N;;;;; +13687;EGYPTIAN HIEROGLYPH-13687;Lo;0;L;;;;;N;;;;; +13688;EGYPTIAN HIEROGLYPH-13688;Lo;0;L;;;;;N;;;;; +13689;EGYPTIAN HIEROGLYPH-13689;Lo;0;L;;;;;N;;;;; +1368A;EGYPTIAN HIEROGLYPH-1368A;Lo;0;L;;;;;N;;;;; +1368B;EGYPTIAN HIEROGLYPH-1368B;Lo;0;L;;;;;N;;;;; +1368C;EGYPTIAN HIEROGLYPH-1368C;Lo;0;L;;;;;N;;;;; +1368D;EGYPTIAN HIEROGLYPH-1368D;Lo;0;L;;;;;N;;;;; +1368E;EGYPTIAN HIEROGLYPH-1368E;Lo;0;L;;;;;N;;;;; +1368F;EGYPTIAN HIEROGLYPH-1368F;Lo;0;L;;;;;N;;;;; +13690;EGYPTIAN HIEROGLYPH-13690;Lo;0;L;;;;;N;;;;; +13691;EGYPTIAN HIEROGLYPH-13691;Lo;0;L;;;;;N;;;;; +13692;EGYPTIAN HIEROGLYPH-13692;Lo;0;L;;;;;N;;;;; +13693;EGYPTIAN HIEROGLYPH-13693;Lo;0;L;;;;;N;;;;; +13694;EGYPTIAN HIEROGLYPH-13694;Lo;0;L;;;;;N;;;;; +13695;EGYPTIAN HIEROGLYPH-13695;Lo;0;L;;;;;N;;;;; +13696;EGYPTIAN HIEROGLYPH-13696;Lo;0;L;;;;;N;;;;; +13697;EGYPTIAN HIEROGLYPH-13697;Lo;0;L;;;;;N;;;;; +13698;EGYPTIAN HIEROGLYPH-13698;Lo;0;L;;;;;N;;;;; +13699;EGYPTIAN HIEROGLYPH-13699;Lo;0;L;;;;;N;;;;; +1369A;EGYPTIAN HIEROGLYPH-1369A;Lo;0;L;;;;;N;;;;; +1369B;EGYPTIAN HIEROGLYPH-1369B;Lo;0;L;;;;;N;;;;; +1369C;EGYPTIAN HIEROGLYPH-1369C;Lo;0;L;;;;;N;;;;; +1369D;EGYPTIAN HIEROGLYPH-1369D;Lo;0;L;;;;;N;;;;; +1369E;EGYPTIAN HIEROGLYPH-1369E;Lo;0;L;;;;;N;;;;; +1369F;EGYPTIAN HIEROGLYPH-1369F;Lo;0;L;;;;;N;;;;; +136A0;EGYPTIAN HIEROGLYPH-136A0;Lo;0;L;;;;;N;;;;; +136A1;EGYPTIAN HIEROGLYPH-136A1;Lo;0;L;;;;;N;;;;; +136A2;EGYPTIAN HIEROGLYPH-136A2;Lo;0;L;;;;;N;;;;; +136A3;EGYPTIAN HIEROGLYPH-136A3;Lo;0;L;;;;;N;;;;; +136A4;EGYPTIAN HIEROGLYPH-136A4;Lo;0;L;;;;;N;;;;; +136A5;EGYPTIAN HIEROGLYPH-136A5;Lo;0;L;;;;;N;;;;; +136A6;EGYPTIAN HIEROGLYPH-136A6;Lo;0;L;;;;;N;;;;; +136A7;EGYPTIAN HIEROGLYPH-136A7;Lo;0;L;;;;;N;;;;; +136A8;EGYPTIAN HIEROGLYPH-136A8;Lo;0;L;;;;;N;;;;; +136A9;EGYPTIAN HIEROGLYPH-136A9;Lo;0;L;;;;;N;;;;; +136AA;EGYPTIAN HIEROGLYPH-136AA;Lo;0;L;;;;;N;;;;; +136AB;EGYPTIAN HIEROGLYPH-136AB;Lo;0;L;;;;;N;;;;; +136AC;EGYPTIAN HIEROGLYPH-136AC;Lo;0;L;;;;;N;;;;; +136AD;EGYPTIAN HIEROGLYPH-136AD;Lo;0;L;;;;;N;;;;; +136AE;EGYPTIAN HIEROGLYPH-136AE;Lo;0;L;;;;;N;;;;; +136AF;EGYPTIAN HIEROGLYPH-136AF;Lo;0;L;;;;;N;;;;; +136B0;EGYPTIAN HIEROGLYPH-136B0;Lo;0;L;;;;;N;;;;; +136B1;EGYPTIAN HIEROGLYPH-136B1;Lo;0;L;;;;;N;;;;; +136B2;EGYPTIAN HIEROGLYPH-136B2;Lo;0;L;;;;;N;;;;; +136B3;EGYPTIAN HIEROGLYPH-136B3;Lo;0;L;;;;;N;;;;; +136B4;EGYPTIAN HIEROGLYPH-136B4;Lo;0;L;;;;;N;;;;; +136B5;EGYPTIAN HIEROGLYPH-136B5;Lo;0;L;;;;;N;;;;; +136B6;EGYPTIAN HIEROGLYPH-136B6;Lo;0;L;;;;;N;;;;; +136B7;EGYPTIAN HIEROGLYPH-136B7;Lo;0;L;;;;;N;;;;; +136B8;EGYPTIAN HIEROGLYPH-136B8;Lo;0;L;;;;;N;;;;; +136B9;EGYPTIAN HIEROGLYPH-136B9;Lo;0;L;;;;;N;;;;; +136BA;EGYPTIAN HIEROGLYPH-136BA;Lo;0;L;;;;;N;;;;; +136BB;EGYPTIAN HIEROGLYPH-136BB;Lo;0;L;;;;;N;;;;; +136BC;EGYPTIAN HIEROGLYPH-136BC;Lo;0;L;;;;;N;;;;; +136BD;EGYPTIAN HIEROGLYPH-136BD;Lo;0;L;;;;;N;;;;; +136BE;EGYPTIAN HIEROGLYPH-136BE;Lo;0;L;;;;;N;;;;; +136BF;EGYPTIAN HIEROGLYPH-136BF;Lo;0;L;;;;;N;;;;; +136C0;EGYPTIAN HIEROGLYPH-136C0;Lo;0;L;;;;;N;;;;; +136C1;EGYPTIAN HIEROGLYPH-136C1;Lo;0;L;;;;;N;;;;; +136C2;EGYPTIAN HIEROGLYPH-136C2;Lo;0;L;;;;;N;;;;; +136C3;EGYPTIAN HIEROGLYPH-136C3;Lo;0;L;;;;;N;;;;; +136C4;EGYPTIAN HIEROGLYPH-136C4;Lo;0;L;;;;;N;;;;; +136C5;EGYPTIAN HIEROGLYPH-136C5;Lo;0;L;;;;;N;;;;; +136C6;EGYPTIAN HIEROGLYPH-136C6;Lo;0;L;;;;;N;;;;; +136C7;EGYPTIAN HIEROGLYPH-136C7;Lo;0;L;;;;;N;;;;; +136C8;EGYPTIAN HIEROGLYPH-136C8;Lo;0;L;;;;;N;;;;; +136C9;EGYPTIAN HIEROGLYPH-136C9;Lo;0;L;;;;;N;;;;; +136CA;EGYPTIAN HIEROGLYPH-136CA;Lo;0;L;;;;;N;;;;; +136CB;EGYPTIAN HIEROGLYPH-136CB;Lo;0;L;;;;;N;;;;; +136CC;EGYPTIAN HIEROGLYPH-136CC;Lo;0;L;;;;;N;;;;; +136CD;EGYPTIAN HIEROGLYPH-136CD;Lo;0;L;;;;;N;;;;; +136CE;EGYPTIAN HIEROGLYPH-136CE;Lo;0;L;;;;;N;;;;; +136CF;EGYPTIAN HIEROGLYPH-136CF;Lo;0;L;;;;;N;;;;; +136D0;EGYPTIAN HIEROGLYPH-136D0;Lo;0;L;;;;;N;;;;; +136D1;EGYPTIAN HIEROGLYPH-136D1;Lo;0;L;;;;;N;;;;; +136D2;EGYPTIAN HIEROGLYPH-136D2;Lo;0;L;;;;;N;;;;; +136D3;EGYPTIAN HIEROGLYPH-136D3;Lo;0;L;;;;;N;;;;; +136D4;EGYPTIAN HIEROGLYPH-136D4;Lo;0;L;;;;;N;;;;; +136D5;EGYPTIAN HIEROGLYPH-136D5;Lo;0;L;;;;;N;;;;; +136D6;EGYPTIAN HIEROGLYPH-136D6;Lo;0;L;;;;;N;;;;; +136D7;EGYPTIAN HIEROGLYPH-136D7;Lo;0;L;;;;;N;;;;; +136D8;EGYPTIAN HIEROGLYPH-136D8;Lo;0;L;;;;;N;;;;; +136D9;EGYPTIAN HIEROGLYPH-136D9;Lo;0;L;;;;;N;;;;; +136DA;EGYPTIAN HIEROGLYPH-136DA;Lo;0;L;;;;;N;;;;; +136DB;EGYPTIAN HIEROGLYPH-136DB;Lo;0;L;;;;;N;;;;; +136DC;EGYPTIAN HIEROGLYPH-136DC;Lo;0;L;;;;;N;;;;; +136DD;EGYPTIAN HIEROGLYPH-136DD;Lo;0;L;;;;;N;;;;; +136DE;EGYPTIAN HIEROGLYPH-136DE;Lo;0;L;;;;;N;;;;; +136DF;EGYPTIAN HIEROGLYPH-136DF;Lo;0;L;;;;;N;;;;; +136E0;EGYPTIAN HIEROGLYPH-136E0;Lo;0;L;;;;;N;;;;; +136E1;EGYPTIAN HIEROGLYPH-136E1;Lo;0;L;;;;;N;;;;; +136E2;EGYPTIAN HIEROGLYPH-136E2;Lo;0;L;;;;;N;;;;; +136E3;EGYPTIAN HIEROGLYPH-136E3;Lo;0;L;;;;;N;;;;; +136E4;EGYPTIAN HIEROGLYPH-136E4;Lo;0;L;;;;;N;;;;; +136E5;EGYPTIAN HIEROGLYPH-136E5;Lo;0;L;;;;;N;;;;; +136E6;EGYPTIAN HIEROGLYPH-136E6;Lo;0;L;;;;;N;;;;; +136E7;EGYPTIAN HIEROGLYPH-136E7;Lo;0;L;;;;;N;;;;; +136E8;EGYPTIAN HIEROGLYPH-136E8;Lo;0;L;;;;;N;;;;; +136E9;EGYPTIAN HIEROGLYPH-136E9;Lo;0;L;;;;;N;;;;; +136EA;EGYPTIAN HIEROGLYPH-136EA;Lo;0;L;;;;;N;;;;; +136EB;EGYPTIAN HIEROGLYPH-136EB;Lo;0;L;;;;;N;;;;; +136EC;EGYPTIAN HIEROGLYPH-136EC;Lo;0;L;;;;;N;;;;; +136ED;EGYPTIAN HIEROGLYPH-136ED;Lo;0;L;;;;;N;;;;; +136EE;EGYPTIAN HIEROGLYPH-136EE;Lo;0;L;;;;;N;;;;; +136EF;EGYPTIAN HIEROGLYPH-136EF;Lo;0;L;;;;;N;;;;; +136F0;EGYPTIAN HIEROGLYPH-136F0;Lo;0;L;;;;;N;;;;; +136F1;EGYPTIAN HIEROGLYPH-136F1;Lo;0;L;;;;;N;;;;; +136F2;EGYPTIAN HIEROGLYPH-136F2;Lo;0;L;;;;;N;;;;; +136F3;EGYPTIAN HIEROGLYPH-136F3;Lo;0;L;;;;;N;;;;; +136F4;EGYPTIAN HIEROGLYPH-136F4;Lo;0;L;;;;;N;;;;; +136F5;EGYPTIAN HIEROGLYPH-136F5;Lo;0;L;;;;;N;;;;; +136F6;EGYPTIAN HIEROGLYPH-136F6;Lo;0;L;;;;;N;;;;; +136F7;EGYPTIAN HIEROGLYPH-136F7;Lo;0;L;;;;;N;;;;; +136F8;EGYPTIAN HIEROGLYPH-136F8;Lo;0;L;;;;;N;;;;; +136F9;EGYPTIAN HIEROGLYPH-136F9;Lo;0;L;;;;;N;;;;; +136FA;EGYPTIAN HIEROGLYPH-136FA;Lo;0;L;;;;;N;;;;; +136FB;EGYPTIAN HIEROGLYPH-136FB;Lo;0;L;;;;;N;;;;; +136FC;EGYPTIAN HIEROGLYPH-136FC;Lo;0;L;;;;;N;;;;; +136FD;EGYPTIAN HIEROGLYPH-136FD;Lo;0;L;;;;;N;;;;; +136FE;EGYPTIAN HIEROGLYPH-136FE;Lo;0;L;;;;;N;;;;; +136FF;EGYPTIAN HIEROGLYPH-136FF;Lo;0;L;;;;;N;;;;; +13700;EGYPTIAN HIEROGLYPH-13700;Lo;0;L;;;;;N;;;;; +13701;EGYPTIAN HIEROGLYPH-13701;Lo;0;L;;;;;N;;;;; +13702;EGYPTIAN HIEROGLYPH-13702;Lo;0;L;;;;;N;;;;; +13703;EGYPTIAN HIEROGLYPH-13703;Lo;0;L;;;;;N;;;;; +13704;EGYPTIAN HIEROGLYPH-13704;Lo;0;L;;;;;N;;;;; +13705;EGYPTIAN HIEROGLYPH-13705;Lo;0;L;;;;;N;;;;; +13706;EGYPTIAN HIEROGLYPH-13706;Lo;0;L;;;;;N;;;;; +13707;EGYPTIAN HIEROGLYPH-13707;Lo;0;L;;;;;N;;;;; +13708;EGYPTIAN HIEROGLYPH-13708;Lo;0;L;;;;;N;;;;; +13709;EGYPTIAN HIEROGLYPH-13709;Lo;0;L;;;;;N;;;;; +1370A;EGYPTIAN HIEROGLYPH-1370A;Lo;0;L;;;;;N;;;;; +1370B;EGYPTIAN HIEROGLYPH-1370B;Lo;0;L;;;;;N;;;;; +1370C;EGYPTIAN HIEROGLYPH-1370C;Lo;0;L;;;;;N;;;;; +1370D;EGYPTIAN HIEROGLYPH-1370D;Lo;0;L;;;;;N;;;;; +1370E;EGYPTIAN HIEROGLYPH-1370E;Lo;0;L;;;;;N;;;;; +1370F;EGYPTIAN HIEROGLYPH-1370F;Lo;0;L;;;;;N;;;;; +13710;EGYPTIAN HIEROGLYPH-13710;Lo;0;L;;;;;N;;;;; +13711;EGYPTIAN HIEROGLYPH-13711;Lo;0;L;;;;;N;;;;; +13712;EGYPTIAN HIEROGLYPH-13712;Lo;0;L;;;;;N;;;;; +13713;EGYPTIAN HIEROGLYPH-13713;Lo;0;L;;;;;N;;;;; +13714;EGYPTIAN HIEROGLYPH-13714;Lo;0;L;;;;;N;;;;; +13715;EGYPTIAN HIEROGLYPH-13715;Lo;0;L;;;;;N;;;;; +13716;EGYPTIAN HIEROGLYPH-13716;Lo;0;L;;;;;N;;;;; +13717;EGYPTIAN HIEROGLYPH-13717;Lo;0;L;;;;;N;;;;; +13718;EGYPTIAN HIEROGLYPH-13718;Lo;0;L;;;;;N;;;;; +13719;EGYPTIAN HIEROGLYPH-13719;Lo;0;L;;;;;N;;;;; +1371A;EGYPTIAN HIEROGLYPH-1371A;Lo;0;L;;;;;N;;;;; +1371B;EGYPTIAN HIEROGLYPH-1371B;Lo;0;L;;;;;N;;;;; +1371C;EGYPTIAN HIEROGLYPH-1371C;Lo;0;L;;;;;N;;;;; +1371D;EGYPTIAN HIEROGLYPH-1371D;Lo;0;L;;;;;N;;;;; +1371E;EGYPTIAN HIEROGLYPH-1371E;Lo;0;L;;;;;N;;;;; +1371F;EGYPTIAN HIEROGLYPH-1371F;Lo;0;L;;;;;N;;;;; +13720;EGYPTIAN HIEROGLYPH-13720;Lo;0;L;;;;;N;;;;; +13721;EGYPTIAN HIEROGLYPH-13721;Lo;0;L;;;;;N;;;;; +13722;EGYPTIAN HIEROGLYPH-13722;Lo;0;L;;;;;N;;;;; +13723;EGYPTIAN HIEROGLYPH-13723;Lo;0;L;;;;;N;;;;; +13724;EGYPTIAN HIEROGLYPH-13724;Lo;0;L;;;;;N;;;;; +13725;EGYPTIAN HIEROGLYPH-13725;Lo;0;L;;;;;N;;;;; +13726;EGYPTIAN HIEROGLYPH-13726;Lo;0;L;;;;;N;;;;; +13727;EGYPTIAN HIEROGLYPH-13727;Lo;0;L;;;;;N;;;;; +13728;EGYPTIAN HIEROGLYPH-13728;Lo;0;L;;;;;N;;;;; +13729;EGYPTIAN HIEROGLYPH-13729;Lo;0;L;;;;;N;;;;; +1372A;EGYPTIAN HIEROGLYPH-1372A;Lo;0;L;;;;;N;;;;; +1372B;EGYPTIAN HIEROGLYPH-1372B;Lo;0;L;;;;;N;;;;; +1372C;EGYPTIAN HIEROGLYPH-1372C;Lo;0;L;;;;;N;;;;; +1372D;EGYPTIAN HIEROGLYPH-1372D;Lo;0;L;;;;;N;;;;; +1372E;EGYPTIAN HIEROGLYPH-1372E;Lo;0;L;;;;;N;;;;; +1372F;EGYPTIAN HIEROGLYPH-1372F;Lo;0;L;;;;;N;;;;; +13730;EGYPTIAN HIEROGLYPH-13730;Lo;0;L;;;;;N;;;;; +13731;EGYPTIAN HIEROGLYPH-13731;Lo;0;L;;;;;N;;;;; +13732;EGYPTIAN HIEROGLYPH-13732;Lo;0;L;;;;;N;;;;; +13733;EGYPTIAN HIEROGLYPH-13733;Lo;0;L;;;;;N;;;;; +13734;EGYPTIAN HIEROGLYPH-13734;Lo;0;L;;;;;N;;;;; +13735;EGYPTIAN HIEROGLYPH-13735;Lo;0;L;;;;;N;;;;; +13736;EGYPTIAN HIEROGLYPH-13736;Lo;0;L;;;;;N;;;;; +13737;EGYPTIAN HIEROGLYPH-13737;Lo;0;L;;;;;N;;;;; +13738;EGYPTIAN HIEROGLYPH-13738;Lo;0;L;;;;;N;;;;; +13739;EGYPTIAN HIEROGLYPH-13739;Lo;0;L;;;;;N;;;;; +1373A;EGYPTIAN HIEROGLYPH-1373A;Lo;0;L;;;;;N;;;;; +1373B;EGYPTIAN HIEROGLYPH-1373B;Lo;0;L;;;;;N;;;;; +1373C;EGYPTIAN HIEROGLYPH-1373C;Lo;0;L;;;;;N;;;;; +1373D;EGYPTIAN HIEROGLYPH-1373D;Lo;0;L;;;;;N;;;;; +1373E;EGYPTIAN HIEROGLYPH-1373E;Lo;0;L;;;;;N;;;;; +1373F;EGYPTIAN HIEROGLYPH-1373F;Lo;0;L;;;;;N;;;;; +13740;EGYPTIAN HIEROGLYPH-13740;Lo;0;L;;;;;N;;;;; +13741;EGYPTIAN HIEROGLYPH-13741;Lo;0;L;;;;;N;;;;; +13742;EGYPTIAN HIEROGLYPH-13742;Lo;0;L;;;;;N;;;;; +13743;EGYPTIAN HIEROGLYPH-13743;Lo;0;L;;;;;N;;;;; +13744;EGYPTIAN HIEROGLYPH-13744;Lo;0;L;;;;;N;;;;; +13745;EGYPTIAN HIEROGLYPH-13745;Lo;0;L;;;;;N;;;;; +13746;EGYPTIAN HIEROGLYPH-13746;Lo;0;L;;;;;N;;;;; +13747;EGYPTIAN HIEROGLYPH-13747;Lo;0;L;;;;;N;;;;; +13748;EGYPTIAN HIEROGLYPH-13748;Lo;0;L;;;;;N;;;;; +13749;EGYPTIAN HIEROGLYPH-13749;Lo;0;L;;;;;N;;;;; +1374A;EGYPTIAN HIEROGLYPH-1374A;Lo;0;L;;;;;N;;;;; +1374B;EGYPTIAN HIEROGLYPH-1374B;Lo;0;L;;;;;N;;;;; +1374C;EGYPTIAN HIEROGLYPH-1374C;Lo;0;L;;;;;N;;;;; +1374D;EGYPTIAN HIEROGLYPH-1374D;Lo;0;L;;;;;N;;;;; +1374E;EGYPTIAN HIEROGLYPH-1374E;Lo;0;L;;;;;N;;;;; +1374F;EGYPTIAN HIEROGLYPH-1374F;Lo;0;L;;;;;N;;;;; +13750;EGYPTIAN HIEROGLYPH-13750;Lo;0;L;;;;;N;;;;; +13751;EGYPTIAN HIEROGLYPH-13751;Lo;0;L;;;;;N;;;;; +13752;EGYPTIAN HIEROGLYPH-13752;Lo;0;L;;;;;N;;;;; +13753;EGYPTIAN HIEROGLYPH-13753;Lo;0;L;;;;;N;;;;; +13754;EGYPTIAN HIEROGLYPH-13754;Lo;0;L;;;;;N;;;;; +13755;EGYPTIAN HIEROGLYPH-13755;Lo;0;L;;;;;N;;;;; +13756;EGYPTIAN HIEROGLYPH-13756;Lo;0;L;;;;;N;;;;; +13757;EGYPTIAN HIEROGLYPH-13757;Lo;0;L;;;;;N;;;;; +13758;EGYPTIAN HIEROGLYPH-13758;Lo;0;L;;;;;N;;;;; +13759;EGYPTIAN HIEROGLYPH-13759;Lo;0;L;;;;;N;;;;; +1375A;EGYPTIAN HIEROGLYPH-1375A;Lo;0;L;;;;;N;;;;; +1375B;EGYPTIAN HIEROGLYPH-1375B;Lo;0;L;;;;;N;;;;; +1375C;EGYPTIAN HIEROGLYPH-1375C;Lo;0;L;;;;;N;;;;; +1375D;EGYPTIAN HIEROGLYPH-1375D;Lo;0;L;;;;;N;;;;; +1375E;EGYPTIAN HIEROGLYPH-1375E;Lo;0;L;;;;;N;;;;; +1375F;EGYPTIAN HIEROGLYPH-1375F;Lo;0;L;;;;;N;;;;; +13760;EGYPTIAN HIEROGLYPH-13760;Lo;0;L;;;;;N;;;;; +13761;EGYPTIAN HIEROGLYPH-13761;Lo;0;L;;;;;N;;;;; +13762;EGYPTIAN HIEROGLYPH-13762;Lo;0;L;;;;;N;;;;; +13763;EGYPTIAN HIEROGLYPH-13763;Lo;0;L;;;;;N;;;;; +13764;EGYPTIAN HIEROGLYPH-13764;Lo;0;L;;;;;N;;;;; +13765;EGYPTIAN HIEROGLYPH-13765;Lo;0;L;;;;;N;;;;; +13766;EGYPTIAN HIEROGLYPH-13766;Lo;0;L;;;;;N;;;;; +13767;EGYPTIAN HIEROGLYPH-13767;Lo;0;L;;;;;N;;;;; +13768;EGYPTIAN HIEROGLYPH-13768;Lo;0;L;;;;;N;;;;; +13769;EGYPTIAN HIEROGLYPH-13769;Lo;0;L;;;;;N;;;;; +1376A;EGYPTIAN HIEROGLYPH-1376A;Lo;0;L;;;;;N;;;;; +1376B;EGYPTIAN HIEROGLYPH-1376B;Lo;0;L;;;;;N;;;;; +1376C;EGYPTIAN HIEROGLYPH-1376C;Lo;0;L;;;;;N;;;;; +1376D;EGYPTIAN HIEROGLYPH-1376D;Lo;0;L;;;;;N;;;;; +1376E;EGYPTIAN HIEROGLYPH-1376E;Lo;0;L;;;;;N;;;;; +1376F;EGYPTIAN HIEROGLYPH-1376F;Lo;0;L;;;;;N;;;;; +13770;EGYPTIAN HIEROGLYPH-13770;Lo;0;L;;;;;N;;;;; +13771;EGYPTIAN HIEROGLYPH-13771;Lo;0;L;;;;;N;;;;; +13772;EGYPTIAN HIEROGLYPH-13772;Lo;0;L;;;;;N;;;;; +13773;EGYPTIAN HIEROGLYPH-13773;Lo;0;L;;;;;N;;;;; +13774;EGYPTIAN HIEROGLYPH-13774;Lo;0;L;;;;;N;;;;; +13775;EGYPTIAN HIEROGLYPH-13775;Lo;0;L;;;;;N;;;;; +13776;EGYPTIAN HIEROGLYPH-13776;Lo;0;L;;;;;N;;;;; +13777;EGYPTIAN HIEROGLYPH-13777;Lo;0;L;;;;;N;;;;; +13778;EGYPTIAN HIEROGLYPH-13778;Lo;0;L;;;;;N;;;;; +13779;EGYPTIAN HIEROGLYPH-13779;Lo;0;L;;;;;N;;;;; +1377A;EGYPTIAN HIEROGLYPH-1377A;Lo;0;L;;;;;N;;;;; +1377B;EGYPTIAN HIEROGLYPH-1377B;Lo;0;L;;;;;N;;;;; +1377C;EGYPTIAN HIEROGLYPH-1377C;Lo;0;L;;;;;N;;;;; +1377D;EGYPTIAN HIEROGLYPH-1377D;Lo;0;L;;;;;N;;;;; +1377E;EGYPTIAN HIEROGLYPH-1377E;Lo;0;L;;;;;N;;;;; +1377F;EGYPTIAN HIEROGLYPH-1377F;Lo;0;L;;;;;N;;;;; +13780;EGYPTIAN HIEROGLYPH-13780;Lo;0;L;;;;;N;;;;; +13781;EGYPTIAN HIEROGLYPH-13781;Lo;0;L;;;;;N;;;;; +13782;EGYPTIAN HIEROGLYPH-13782;Lo;0;L;;;;;N;;;;; +13783;EGYPTIAN HIEROGLYPH-13783;Lo;0;L;;;;;N;;;;; +13784;EGYPTIAN HIEROGLYPH-13784;Lo;0;L;;;;;N;;;;; +13785;EGYPTIAN HIEROGLYPH-13785;Lo;0;L;;;;;N;;;;; +13786;EGYPTIAN HIEROGLYPH-13786;Lo;0;L;;;;;N;;;;; +13787;EGYPTIAN HIEROGLYPH-13787;Lo;0;L;;;;;N;;;;; +13788;EGYPTIAN HIEROGLYPH-13788;Lo;0;L;;;;;N;;;;; +13789;EGYPTIAN HIEROGLYPH-13789;Lo;0;L;;;;;N;;;;; +1378A;EGYPTIAN HIEROGLYPH-1378A;Lo;0;L;;;;;N;;;;; +1378B;EGYPTIAN HIEROGLYPH-1378B;Lo;0;L;;;;;N;;;;; +1378C;EGYPTIAN HIEROGLYPH-1378C;Lo;0;L;;;;;N;;;;; +1378D;EGYPTIAN HIEROGLYPH-1378D;Lo;0;L;;;;;N;;;;; +1378E;EGYPTIAN HIEROGLYPH-1378E;Lo;0;L;;;;;N;;;;; +1378F;EGYPTIAN HIEROGLYPH-1378F;Lo;0;L;;;;;N;;;;; +13790;EGYPTIAN HIEROGLYPH-13790;Lo;0;L;;;;;N;;;;; +13791;EGYPTIAN HIEROGLYPH-13791;Lo;0;L;;;;;N;;;;; +13792;EGYPTIAN HIEROGLYPH-13792;Lo;0;L;;;;;N;;;;; +13793;EGYPTIAN HIEROGLYPH-13793;Lo;0;L;;;;;N;;;;; +13794;EGYPTIAN HIEROGLYPH-13794;Lo;0;L;;;;;N;;;;; +13795;EGYPTIAN HIEROGLYPH-13795;Lo;0;L;;;;;N;;;;; +13796;EGYPTIAN HIEROGLYPH-13796;Lo;0;L;;;;;N;;;;; +13797;EGYPTIAN HIEROGLYPH-13797;Lo;0;L;;;;;N;;;;; +13798;EGYPTIAN HIEROGLYPH-13798;Lo;0;L;;;;;N;;;;; +13799;EGYPTIAN HIEROGLYPH-13799;Lo;0;L;;;;;N;;;;; +1379A;EGYPTIAN HIEROGLYPH-1379A;Lo;0;L;;;;;N;;;;; +1379B;EGYPTIAN HIEROGLYPH-1379B;Lo;0;L;;;;;N;;;;; +1379C;EGYPTIAN HIEROGLYPH-1379C;Lo;0;L;;;;;N;;;;; +1379D;EGYPTIAN HIEROGLYPH-1379D;Lo;0;L;;;;;N;;;;; +1379E;EGYPTIAN HIEROGLYPH-1379E;Lo;0;L;;;;;N;;;;; +1379F;EGYPTIAN HIEROGLYPH-1379F;Lo;0;L;;;;;N;;;;; +137A0;EGYPTIAN HIEROGLYPH-137A0;Lo;0;L;;;;;N;;;;; +137A1;EGYPTIAN HIEROGLYPH-137A1;Lo;0;L;;;;;N;;;;; +137A2;EGYPTIAN HIEROGLYPH-137A2;Lo;0;L;;;;;N;;;;; +137A3;EGYPTIAN HIEROGLYPH-137A3;Lo;0;L;;;;;N;;;;; +137A4;EGYPTIAN HIEROGLYPH-137A4;Lo;0;L;;;;;N;;;;; +137A5;EGYPTIAN HIEROGLYPH-137A5;Lo;0;L;;;;;N;;;;; +137A6;EGYPTIAN HIEROGLYPH-137A6;Lo;0;L;;;;;N;;;;; +137A7;EGYPTIAN HIEROGLYPH-137A7;Lo;0;L;;;;;N;;;;; +137A8;EGYPTIAN HIEROGLYPH-137A8;Lo;0;L;;;;;N;;;;; +137A9;EGYPTIAN HIEROGLYPH-137A9;Lo;0;L;;;;;N;;;;; +137AA;EGYPTIAN HIEROGLYPH-137AA;Lo;0;L;;;;;N;;;;; +137AB;EGYPTIAN HIEROGLYPH-137AB;Lo;0;L;;;;;N;;;;; +137AC;EGYPTIAN HIEROGLYPH-137AC;Lo;0;L;;;;;N;;;;; +137AD;EGYPTIAN HIEROGLYPH-137AD;Lo;0;L;;;;;N;;;;; +137AE;EGYPTIAN HIEROGLYPH-137AE;Lo;0;L;;;;;N;;;;; +137AF;EGYPTIAN HIEROGLYPH-137AF;Lo;0;L;;;;;N;;;;; +137B0;EGYPTIAN HIEROGLYPH-137B0;Lo;0;L;;;;;N;;;;; +137B1;EGYPTIAN HIEROGLYPH-137B1;Lo;0;L;;;;;N;;;;; +137B2;EGYPTIAN HIEROGLYPH-137B2;Lo;0;L;;;;;N;;;;; +137B3;EGYPTIAN HIEROGLYPH-137B3;Lo;0;L;;;;;N;;;;; +137B4;EGYPTIAN HIEROGLYPH-137B4;Lo;0;L;;;;;N;;;;; +137B5;EGYPTIAN HIEROGLYPH-137B5;Lo;0;L;;;;;N;;;;; +137B6;EGYPTIAN HIEROGLYPH-137B6;Lo;0;L;;;;;N;;;;; +137B7;EGYPTIAN HIEROGLYPH-137B7;Lo;0;L;;;;;N;;;;; +137B8;EGYPTIAN HIEROGLYPH-137B8;Lo;0;L;;;;;N;;;;; +137B9;EGYPTIAN HIEROGLYPH-137B9;Lo;0;L;;;;;N;;;;; +137BA;EGYPTIAN HIEROGLYPH-137BA;Lo;0;L;;;;;N;;;;; +137BB;EGYPTIAN HIEROGLYPH-137BB;Lo;0;L;;;;;N;;;;; +137BC;EGYPTIAN HIEROGLYPH-137BC;Lo;0;L;;;;;N;;;;; +137BD;EGYPTIAN HIEROGLYPH-137BD;Lo;0;L;;;;;N;;;;; +137BE;EGYPTIAN HIEROGLYPH-137BE;Lo;0;L;;;;;N;;;;; +137BF;EGYPTIAN HIEROGLYPH-137BF;Lo;0;L;;;;;N;;;;; +137C0;EGYPTIAN HIEROGLYPH-137C0;Lo;0;L;;;;;N;;;;; +137C1;EGYPTIAN HIEROGLYPH-137C1;Lo;0;L;;;;;N;;;;; +137C2;EGYPTIAN HIEROGLYPH-137C2;Lo;0;L;;;;;N;;;;; +137C3;EGYPTIAN HIEROGLYPH-137C3;Lo;0;L;;;;;N;;;;; +137C4;EGYPTIAN HIEROGLYPH-137C4;Lo;0;L;;;;;N;;;;; +137C5;EGYPTIAN HIEROGLYPH-137C5;Lo;0;L;;;;;N;;;;; +137C6;EGYPTIAN HIEROGLYPH-137C6;Lo;0;L;;;;;N;;;;; +137C7;EGYPTIAN HIEROGLYPH-137C7;Lo;0;L;;;;;N;;;;; +137C8;EGYPTIAN HIEROGLYPH-137C8;Lo;0;L;;;;;N;;;;; +137C9;EGYPTIAN HIEROGLYPH-137C9;Lo;0;L;;;;;N;;;;; +137CA;EGYPTIAN HIEROGLYPH-137CA;Lo;0;L;;;;;N;;;;; +137CB;EGYPTIAN HIEROGLYPH-137CB;Lo;0;L;;;;;N;;;;; +137CC;EGYPTIAN HIEROGLYPH-137CC;Lo;0;L;;;;;N;;;;; +137CD;EGYPTIAN HIEROGLYPH-137CD;Lo;0;L;;;;;N;;;;; +137CE;EGYPTIAN HIEROGLYPH-137CE;Lo;0;L;;;;;N;;;;; +137CF;EGYPTIAN HIEROGLYPH-137CF;Lo;0;L;;;;;N;;;;; +137D0;EGYPTIAN HIEROGLYPH-137D0;Lo;0;L;;;;;N;;;;; +137D1;EGYPTIAN HIEROGLYPH-137D1;Lo;0;L;;;;;N;;;;; +137D2;EGYPTIAN HIEROGLYPH-137D2;Lo;0;L;;;;;N;;;;; +137D3;EGYPTIAN HIEROGLYPH-137D3;Lo;0;L;;;;;N;;;;; +137D4;EGYPTIAN HIEROGLYPH-137D4;Lo;0;L;;;;;N;;;;; +137D5;EGYPTIAN HIEROGLYPH-137D5;Lo;0;L;;;;;N;;;;; +137D6;EGYPTIAN HIEROGLYPH-137D6;Lo;0;L;;;;;N;;;;; +137D7;EGYPTIAN HIEROGLYPH-137D7;Lo;0;L;;;;;N;;;;; +137D8;EGYPTIAN HIEROGLYPH-137D8;Lo;0;L;;;;;N;;;;; +137D9;EGYPTIAN HIEROGLYPH-137D9;Lo;0;L;;;;;N;;;;; +137DA;EGYPTIAN HIEROGLYPH-137DA;Lo;0;L;;;;;N;;;;; +137DB;EGYPTIAN HIEROGLYPH-137DB;Lo;0;L;;;;;N;;;;; +137DC;EGYPTIAN HIEROGLYPH-137DC;Lo;0;L;;;;;N;;;;; +137DD;EGYPTIAN HIEROGLYPH-137DD;Lo;0;L;;;;;N;;;;; +137DE;EGYPTIAN HIEROGLYPH-137DE;Lo;0;L;;;;;N;;;;; +137DF;EGYPTIAN HIEROGLYPH-137DF;Lo;0;L;;;;;N;;;;; +137E0;EGYPTIAN HIEROGLYPH-137E0;Lo;0;L;;;;;N;;;;; +137E1;EGYPTIAN HIEROGLYPH-137E1;Lo;0;L;;;;;N;;;;; +137E2;EGYPTIAN HIEROGLYPH-137E2;Lo;0;L;;;;;N;;;;; +137E3;EGYPTIAN HIEROGLYPH-137E3;Lo;0;L;;;;;N;;;;; +137E4;EGYPTIAN HIEROGLYPH-137E4;Lo;0;L;;;;;N;;;;; +137E5;EGYPTIAN HIEROGLYPH-137E5;Lo;0;L;;;;;N;;;;; +137E6;EGYPTIAN HIEROGLYPH-137E6;Lo;0;L;;;;;N;;;;; +137E7;EGYPTIAN HIEROGLYPH-137E7;Lo;0;L;;;;;N;;;;; +137E8;EGYPTIAN HIEROGLYPH-137E8;Lo;0;L;;;;;N;;;;; +137E9;EGYPTIAN HIEROGLYPH-137E9;Lo;0;L;;;;;N;;;;; +137EA;EGYPTIAN HIEROGLYPH-137EA;Lo;0;L;;;;;N;;;;; +137EB;EGYPTIAN HIEROGLYPH-137EB;Lo;0;L;;;;;N;;;;; +137EC;EGYPTIAN HIEROGLYPH-137EC;Lo;0;L;;;;;N;;;;; +137ED;EGYPTIAN HIEROGLYPH-137ED;Lo;0;L;;;;;N;;;;; +137EE;EGYPTIAN HIEROGLYPH-137EE;Lo;0;L;;;;;N;;;;; +137EF;EGYPTIAN HIEROGLYPH-137EF;Lo;0;L;;;;;N;;;;; +137F0;EGYPTIAN HIEROGLYPH-137F0;Lo;0;L;;;;;N;;;;; +137F1;EGYPTIAN HIEROGLYPH-137F1;Lo;0;L;;;;;N;;;;; +137F2;EGYPTIAN HIEROGLYPH-137F2;Lo;0;L;;;;;N;;;;; +137F3;EGYPTIAN HIEROGLYPH-137F3;Lo;0;L;;;;;N;;;;; +137F4;EGYPTIAN HIEROGLYPH-137F4;Lo;0;L;;;;;N;;;;; +137F5;EGYPTIAN HIEROGLYPH-137F5;Lo;0;L;;;;;N;;;;; +137F6;EGYPTIAN HIEROGLYPH-137F6;Lo;0;L;;;;;N;;;;; +137F7;EGYPTIAN HIEROGLYPH-137F7;Lo;0;L;;;;;N;;;;; +137F8;EGYPTIAN HIEROGLYPH-137F8;Lo;0;L;;;;;N;;;;; +137F9;EGYPTIAN HIEROGLYPH-137F9;Lo;0;L;;;;;N;;;;; +137FA;EGYPTIAN HIEROGLYPH-137FA;Lo;0;L;;;;;N;;;;; +137FB;EGYPTIAN HIEROGLYPH-137FB;Lo;0;L;;;;;N;;;;; +137FC;EGYPTIAN HIEROGLYPH-137FC;Lo;0;L;;;;;N;;;;; +137FD;EGYPTIAN HIEROGLYPH-137FD;Lo;0;L;;;;;N;;;;; +137FE;EGYPTIAN HIEROGLYPH-137FE;Lo;0;L;;;;;N;;;;; +137FF;EGYPTIAN HIEROGLYPH-137FF;Lo;0;L;;;;;N;;;;; +13800;EGYPTIAN HIEROGLYPH-13800;Lo;0;L;;;;;N;;;;; +13801;EGYPTIAN HIEROGLYPH-13801;Lo;0;L;;;;;N;;;;; +13802;EGYPTIAN HIEROGLYPH-13802;Lo;0;L;;;;;N;;;;; +13803;EGYPTIAN HIEROGLYPH-13803;Lo;0;L;;;;;N;;;;; +13804;EGYPTIAN HIEROGLYPH-13804;Lo;0;L;;;;;N;;;;; +13805;EGYPTIAN HIEROGLYPH-13805;Lo;0;L;;;;;N;;;;; +13806;EGYPTIAN HIEROGLYPH-13806;Lo;0;L;;;;;N;;;;; +13807;EGYPTIAN HIEROGLYPH-13807;Lo;0;L;;;;;N;;;;; +13808;EGYPTIAN HIEROGLYPH-13808;Lo;0;L;;;;;N;;;;; +13809;EGYPTIAN HIEROGLYPH-13809;Lo;0;L;;;;;N;;;;; +1380A;EGYPTIAN HIEROGLYPH-1380A;Lo;0;L;;;;;N;;;;; +1380B;EGYPTIAN HIEROGLYPH-1380B;Lo;0;L;;;;;N;;;;; +1380C;EGYPTIAN HIEROGLYPH-1380C;Lo;0;L;;;;;N;;;;; +1380D;EGYPTIAN HIEROGLYPH-1380D;Lo;0;L;;;;;N;;;;; +1380E;EGYPTIAN HIEROGLYPH-1380E;Lo;0;L;;;;;N;;;;; +1380F;EGYPTIAN HIEROGLYPH-1380F;Lo;0;L;;;;;N;;;;; +13810;EGYPTIAN HIEROGLYPH-13810;Lo;0;L;;;;;N;;;;; +13811;EGYPTIAN HIEROGLYPH-13811;Lo;0;L;;;;;N;;;;; +13812;EGYPTIAN HIEROGLYPH-13812;Lo;0;L;;;;;N;;;;; +13813;EGYPTIAN HIEROGLYPH-13813;Lo;0;L;;;;;N;;;;; +13814;EGYPTIAN HIEROGLYPH-13814;Lo;0;L;;;;;N;;;;; +13815;EGYPTIAN HIEROGLYPH-13815;Lo;0;L;;;;;N;;;;; +13816;EGYPTIAN HIEROGLYPH-13816;Lo;0;L;;;;;N;;;;; +13817;EGYPTIAN HIEROGLYPH-13817;Lo;0;L;;;;;N;;;;; +13818;EGYPTIAN HIEROGLYPH-13818;Lo;0;L;;;;;N;;;;; +13819;EGYPTIAN HIEROGLYPH-13819;Lo;0;L;;;;;N;;;;; +1381A;EGYPTIAN HIEROGLYPH-1381A;Lo;0;L;;;;;N;;;;; +1381B;EGYPTIAN HIEROGLYPH-1381B;Lo;0;L;;;;;N;;;;; +1381C;EGYPTIAN HIEROGLYPH-1381C;Lo;0;L;;;;;N;;;;; +1381D;EGYPTIAN HIEROGLYPH-1381D;Lo;0;L;;;;;N;;;;; +1381E;EGYPTIAN HIEROGLYPH-1381E;Lo;0;L;;;;;N;;;;; +1381F;EGYPTIAN HIEROGLYPH-1381F;Lo;0;L;;;;;N;;;;; +13820;EGYPTIAN HIEROGLYPH-13820;Lo;0;L;;;;;N;;;;; +13821;EGYPTIAN HIEROGLYPH-13821;Lo;0;L;;;;;N;;;;; +13822;EGYPTIAN HIEROGLYPH-13822;Lo;0;L;;;;;N;;;;; +13823;EGYPTIAN HIEROGLYPH-13823;Lo;0;L;;;;;N;;;;; +13824;EGYPTIAN HIEROGLYPH-13824;Lo;0;L;;;;;N;;;;; +13825;EGYPTIAN HIEROGLYPH-13825;Lo;0;L;;;;;N;;;;; +13826;EGYPTIAN HIEROGLYPH-13826;Lo;0;L;;;;;N;;;;; +13827;EGYPTIAN HIEROGLYPH-13827;Lo;0;L;;;;;N;;;;; +13828;EGYPTIAN HIEROGLYPH-13828;Lo;0;L;;;;;N;;;;; +13829;EGYPTIAN HIEROGLYPH-13829;Lo;0;L;;;;;N;;;;; +1382A;EGYPTIAN HIEROGLYPH-1382A;Lo;0;L;;;;;N;;;;; +1382B;EGYPTIAN HIEROGLYPH-1382B;Lo;0;L;;;;;N;;;;; +1382C;EGYPTIAN HIEROGLYPH-1382C;Lo;0;L;;;;;N;;;;; +1382D;EGYPTIAN HIEROGLYPH-1382D;Lo;0;L;;;;;N;;;;; +1382E;EGYPTIAN HIEROGLYPH-1382E;Lo;0;L;;;;;N;;;;; +1382F;EGYPTIAN HIEROGLYPH-1382F;Lo;0;L;;;;;N;;;;; +13830;EGYPTIAN HIEROGLYPH-13830;Lo;0;L;;;;;N;;;;; +13831;EGYPTIAN HIEROGLYPH-13831;Lo;0;L;;;;;N;;;;; +13832;EGYPTIAN HIEROGLYPH-13832;Lo;0;L;;;;;N;;;;; +13833;EGYPTIAN HIEROGLYPH-13833;Lo;0;L;;;;;N;;;;; +13834;EGYPTIAN HIEROGLYPH-13834;Lo;0;L;;;;;N;;;;; +13835;EGYPTIAN HIEROGLYPH-13835;Lo;0;L;;;;;N;;;;; +13836;EGYPTIAN HIEROGLYPH-13836;Lo;0;L;;;;;N;;;;; +13837;EGYPTIAN HIEROGLYPH-13837;Lo;0;L;;;;;N;;;;; +13838;EGYPTIAN HIEROGLYPH-13838;Lo;0;L;;;;;N;;;;; +13839;EGYPTIAN HIEROGLYPH-13839;Lo;0;L;;;;;N;;;;; +1383A;EGYPTIAN HIEROGLYPH-1383A;Lo;0;L;;;;;N;;;;; +1383B;EGYPTIAN HIEROGLYPH-1383B;Lo;0;L;;;;;N;;;;; +1383C;EGYPTIAN HIEROGLYPH-1383C;Lo;0;L;;;;;N;;;;; +1383D;EGYPTIAN HIEROGLYPH-1383D;Lo;0;L;;;;;N;;;;; +1383E;EGYPTIAN HIEROGLYPH-1383E;Lo;0;L;;;;;N;;;;; +1383F;EGYPTIAN HIEROGLYPH-1383F;Lo;0;L;;;;;N;;;;; +13840;EGYPTIAN HIEROGLYPH-13840;Lo;0;L;;;;;N;;;;; +13841;EGYPTIAN HIEROGLYPH-13841;Lo;0;L;;;;;N;;;;; +13842;EGYPTIAN HIEROGLYPH-13842;Lo;0;L;;;;;N;;;;; +13843;EGYPTIAN HIEROGLYPH-13843;Lo;0;L;;;;;N;;;;; +13844;EGYPTIAN HIEROGLYPH-13844;Lo;0;L;;;;;N;;;;; +13845;EGYPTIAN HIEROGLYPH-13845;Lo;0;L;;;;;N;;;;; +13846;EGYPTIAN HIEROGLYPH-13846;Lo;0;L;;;;;N;;;;; +13847;EGYPTIAN HIEROGLYPH-13847;Lo;0;L;;;;;N;;;;; +13848;EGYPTIAN HIEROGLYPH-13848;Lo;0;L;;;;;N;;;;; +13849;EGYPTIAN HIEROGLYPH-13849;Lo;0;L;;;;;N;;;;; +1384A;EGYPTIAN HIEROGLYPH-1384A;Lo;0;L;;;;;N;;;;; +1384B;EGYPTIAN HIEROGLYPH-1384B;Lo;0;L;;;;;N;;;;; +1384C;EGYPTIAN HIEROGLYPH-1384C;Lo;0;L;;;;;N;;;;; +1384D;EGYPTIAN HIEROGLYPH-1384D;Lo;0;L;;;;;N;;;;; +1384E;EGYPTIAN HIEROGLYPH-1384E;Lo;0;L;;;;;N;;;;; +1384F;EGYPTIAN HIEROGLYPH-1384F;Lo;0;L;;;;;N;;;;; +13850;EGYPTIAN HIEROGLYPH-13850;Lo;0;L;;;;;N;;;;; +13851;EGYPTIAN HIEROGLYPH-13851;Lo;0;L;;;;;N;;;;; +13852;EGYPTIAN HIEROGLYPH-13852;Lo;0;L;;;;;N;;;;; +13853;EGYPTIAN HIEROGLYPH-13853;Lo;0;L;;;;;N;;;;; +13854;EGYPTIAN HIEROGLYPH-13854;Lo;0;L;;;;;N;;;;; +13855;EGYPTIAN HIEROGLYPH-13855;Lo;0;L;;;;;N;;;;; +13856;EGYPTIAN HIEROGLYPH-13856;Lo;0;L;;;;;N;;;;; +13857;EGYPTIAN HIEROGLYPH-13857;Lo;0;L;;;;;N;;;;; +13858;EGYPTIAN HIEROGLYPH-13858;Lo;0;L;;;;;N;;;;; +13859;EGYPTIAN HIEROGLYPH-13859;Lo;0;L;;;;;N;;;;; +1385A;EGYPTIAN HIEROGLYPH-1385A;Lo;0;L;;;;;N;;;;; +1385B;EGYPTIAN HIEROGLYPH-1385B;Lo;0;L;;;;;N;;;;; +1385C;EGYPTIAN HIEROGLYPH-1385C;Lo;0;L;;;;;N;;;;; +1385D;EGYPTIAN HIEROGLYPH-1385D;Lo;0;L;;;;;N;;;;; +1385E;EGYPTIAN HIEROGLYPH-1385E;Lo;0;L;;;;;N;;;;; +1385F;EGYPTIAN HIEROGLYPH-1385F;Lo;0;L;;;;;N;;;;; +13860;EGYPTIAN HIEROGLYPH-13860;Lo;0;L;;;;;N;;;;; +13861;EGYPTIAN HIEROGLYPH-13861;Lo;0;L;;;;;N;;;;; +13862;EGYPTIAN HIEROGLYPH-13862;Lo;0;L;;;;;N;;;;; +13863;EGYPTIAN HIEROGLYPH-13863;Lo;0;L;;;;;N;;;;; +13864;EGYPTIAN HIEROGLYPH-13864;Lo;0;L;;;;;N;;;;; +13865;EGYPTIAN HIEROGLYPH-13865;Lo;0;L;;;;;N;;;;; +13866;EGYPTIAN HIEROGLYPH-13866;Lo;0;L;;;;;N;;;;; +13867;EGYPTIAN HIEROGLYPH-13867;Lo;0;L;;;;;N;;;;; +13868;EGYPTIAN HIEROGLYPH-13868;Lo;0;L;;;;;N;;;;; +13869;EGYPTIAN HIEROGLYPH-13869;Lo;0;L;;;;;N;;;;; +1386A;EGYPTIAN HIEROGLYPH-1386A;Lo;0;L;;;;;N;;;;; +1386B;EGYPTIAN HIEROGLYPH-1386B;Lo;0;L;;;;;N;;;;; +1386C;EGYPTIAN HIEROGLYPH-1386C;Lo;0;L;;;;;N;;;;; +1386D;EGYPTIAN HIEROGLYPH-1386D;Lo;0;L;;;;;N;;;;; +1386E;EGYPTIAN HIEROGLYPH-1386E;Lo;0;L;;;;;N;;;;; +1386F;EGYPTIAN HIEROGLYPH-1386F;Lo;0;L;;;;;N;;;;; +13870;EGYPTIAN HIEROGLYPH-13870;Lo;0;L;;;;;N;;;;; +13871;EGYPTIAN HIEROGLYPH-13871;Lo;0;L;;;;;N;;;;; +13872;EGYPTIAN HIEROGLYPH-13872;Lo;0;L;;;;;N;;;;; +13873;EGYPTIAN HIEROGLYPH-13873;Lo;0;L;;;;;N;;;;; +13874;EGYPTIAN HIEROGLYPH-13874;Lo;0;L;;;;;N;;;;; +13875;EGYPTIAN HIEROGLYPH-13875;Lo;0;L;;;;;N;;;;; +13876;EGYPTIAN HIEROGLYPH-13876;Lo;0;L;;;;;N;;;;; +13877;EGYPTIAN HIEROGLYPH-13877;Lo;0;L;;;;;N;;;;; +13878;EGYPTIAN HIEROGLYPH-13878;Lo;0;L;;;;;N;;;;; +13879;EGYPTIAN HIEROGLYPH-13879;Lo;0;L;;;;;N;;;;; +1387A;EGYPTIAN HIEROGLYPH-1387A;Lo;0;L;;;;;N;;;;; +1387B;EGYPTIAN HIEROGLYPH-1387B;Lo;0;L;;;;;N;;;;; +1387C;EGYPTIAN HIEROGLYPH-1387C;Lo;0;L;;;;;N;;;;; +1387D;EGYPTIAN HIEROGLYPH-1387D;Lo;0;L;;;;;N;;;;; +1387E;EGYPTIAN HIEROGLYPH-1387E;Lo;0;L;;;;;N;;;;; +1387F;EGYPTIAN HIEROGLYPH-1387F;Lo;0;L;;;;;N;;;;; +13880;EGYPTIAN HIEROGLYPH-13880;Lo;0;L;;;;;N;;;;; +13881;EGYPTIAN HIEROGLYPH-13881;Lo;0;L;;;;;N;;;;; +13882;EGYPTIAN HIEROGLYPH-13882;Lo;0;L;;;;;N;;;;; +13883;EGYPTIAN HIEROGLYPH-13883;Lo;0;L;;;;;N;;;;; +13884;EGYPTIAN HIEROGLYPH-13884;Lo;0;L;;;;;N;;;;; +13885;EGYPTIAN HIEROGLYPH-13885;Lo;0;L;;;;;N;;;;; +13886;EGYPTIAN HIEROGLYPH-13886;Lo;0;L;;;;;N;;;;; +13887;EGYPTIAN HIEROGLYPH-13887;Lo;0;L;;;;;N;;;;; +13888;EGYPTIAN HIEROGLYPH-13888;Lo;0;L;;;;;N;;;;; +13889;EGYPTIAN HIEROGLYPH-13889;Lo;0;L;;;;;N;;;;; +1388A;EGYPTIAN HIEROGLYPH-1388A;Lo;0;L;;;;;N;;;;; +1388B;EGYPTIAN HIEROGLYPH-1388B;Lo;0;L;;;;;N;;;;; +1388C;EGYPTIAN HIEROGLYPH-1388C;Lo;0;L;;;;;N;;;;; +1388D;EGYPTIAN HIEROGLYPH-1388D;Lo;0;L;;;;;N;;;;; +1388E;EGYPTIAN HIEROGLYPH-1388E;Lo;0;L;;;;;N;;;;; +1388F;EGYPTIAN HIEROGLYPH-1388F;Lo;0;L;;;;;N;;;;; +13890;EGYPTIAN HIEROGLYPH-13890;Lo;0;L;;;;;N;;;;; +13891;EGYPTIAN HIEROGLYPH-13891;Lo;0;L;;;;;N;;;;; +13892;EGYPTIAN HIEROGLYPH-13892;Lo;0;L;;;;;N;;;;; +13893;EGYPTIAN HIEROGLYPH-13893;Lo;0;L;;;;;N;;;;; +13894;EGYPTIAN HIEROGLYPH-13894;Lo;0;L;;;;;N;;;;; +13895;EGYPTIAN HIEROGLYPH-13895;Lo;0;L;;;;;N;;;;; +13896;EGYPTIAN HIEROGLYPH-13896;Lo;0;L;;;;;N;;;;; +13897;EGYPTIAN HIEROGLYPH-13897;Lo;0;L;;;;;N;;;;; +13898;EGYPTIAN HIEROGLYPH-13898;Lo;0;L;;;;;N;;;;; +13899;EGYPTIAN HIEROGLYPH-13899;Lo;0;L;;;;;N;;;;; +1389A;EGYPTIAN HIEROGLYPH-1389A;Lo;0;L;;;;;N;;;;; +1389B;EGYPTIAN HIEROGLYPH-1389B;Lo;0;L;;;;;N;;;;; +1389C;EGYPTIAN HIEROGLYPH-1389C;Lo;0;L;;;;;N;;;;; +1389D;EGYPTIAN HIEROGLYPH-1389D;Lo;0;L;;;;;N;;;;; +1389E;EGYPTIAN HIEROGLYPH-1389E;Lo;0;L;;;;;N;;;;; +1389F;EGYPTIAN HIEROGLYPH-1389F;Lo;0;L;;;;;N;;;;; +138A0;EGYPTIAN HIEROGLYPH-138A0;Lo;0;L;;;;;N;;;;; +138A1;EGYPTIAN HIEROGLYPH-138A1;Lo;0;L;;;;;N;;;;; +138A2;EGYPTIAN HIEROGLYPH-138A2;Lo;0;L;;;;;N;;;;; +138A3;EGYPTIAN HIEROGLYPH-138A3;Lo;0;L;;;;;N;;;;; +138A4;EGYPTIAN HIEROGLYPH-138A4;Lo;0;L;;;;;N;;;;; +138A5;EGYPTIAN HIEROGLYPH-138A5;Lo;0;L;;;;;N;;;;; +138A6;EGYPTIAN HIEROGLYPH-138A6;Lo;0;L;;;;;N;;;;; +138A7;EGYPTIAN HIEROGLYPH-138A7;Lo;0;L;;;;;N;;;;; +138A8;EGYPTIAN HIEROGLYPH-138A8;Lo;0;L;;;;;N;;;;; +138A9;EGYPTIAN HIEROGLYPH-138A9;Lo;0;L;;;;;N;;;;; +138AA;EGYPTIAN HIEROGLYPH-138AA;Lo;0;L;;;;;N;;;;; +138AB;EGYPTIAN HIEROGLYPH-138AB;Lo;0;L;;;;;N;;;;; +138AC;EGYPTIAN HIEROGLYPH-138AC;Lo;0;L;;;;;N;;;;; +138AD;EGYPTIAN HIEROGLYPH-138AD;Lo;0;L;;;;;N;;;;; +138AE;EGYPTIAN HIEROGLYPH-138AE;Lo;0;L;;;;;N;;;;; +138AF;EGYPTIAN HIEROGLYPH-138AF;Lo;0;L;;;;;N;;;;; +138B0;EGYPTIAN HIEROGLYPH-138B0;Lo;0;L;;;;;N;;;;; +138B1;EGYPTIAN HIEROGLYPH-138B1;Lo;0;L;;;;;N;;;;; +138B2;EGYPTIAN HIEROGLYPH-138B2;Lo;0;L;;;;;N;;;;; +138B3;EGYPTIAN HIEROGLYPH-138B3;Lo;0;L;;;;;N;;;;; +138B4;EGYPTIAN HIEROGLYPH-138B4;Lo;0;L;;;;;N;;;;; +138B5;EGYPTIAN HIEROGLYPH-138B5;Lo;0;L;;;;;N;;;;; +138B6;EGYPTIAN HIEROGLYPH-138B6;Lo;0;L;;;;;N;;;;; +138B7;EGYPTIAN HIEROGLYPH-138B7;Lo;0;L;;;;;N;;;;; +138B8;EGYPTIAN HIEROGLYPH-138B8;Lo;0;L;;;;;N;;;;; +138B9;EGYPTIAN HIEROGLYPH-138B9;Lo;0;L;;;;;N;;;;; +138BA;EGYPTIAN HIEROGLYPH-138BA;Lo;0;L;;;;;N;;;;; +138BB;EGYPTIAN HIEROGLYPH-138BB;Lo;0;L;;;;;N;;;;; +138BC;EGYPTIAN HIEROGLYPH-138BC;Lo;0;L;;;;;N;;;;; +138BD;EGYPTIAN HIEROGLYPH-138BD;Lo;0;L;;;;;N;;;;; +138BE;EGYPTIAN HIEROGLYPH-138BE;Lo;0;L;;;;;N;;;;; +138BF;EGYPTIAN HIEROGLYPH-138BF;Lo;0;L;;;;;N;;;;; +138C0;EGYPTIAN HIEROGLYPH-138C0;Lo;0;L;;;;;N;;;;; +138C1;EGYPTIAN HIEROGLYPH-138C1;Lo;0;L;;;;;N;;;;; +138C2;EGYPTIAN HIEROGLYPH-138C2;Lo;0;L;;;;;N;;;;; +138C3;EGYPTIAN HIEROGLYPH-138C3;Lo;0;L;;;;;N;;;;; +138C4;EGYPTIAN HIEROGLYPH-138C4;Lo;0;L;;;;;N;;;;; +138C5;EGYPTIAN HIEROGLYPH-138C5;Lo;0;L;;;;;N;;;;; +138C6;EGYPTIAN HIEROGLYPH-138C6;Lo;0;L;;;;;N;;;;; +138C7;EGYPTIAN HIEROGLYPH-138C7;Lo;0;L;;;;;N;;;;; +138C8;EGYPTIAN HIEROGLYPH-138C8;Lo;0;L;;;;;N;;;;; +138C9;EGYPTIAN HIEROGLYPH-138C9;Lo;0;L;;;;;N;;;;; +138CA;EGYPTIAN HIEROGLYPH-138CA;Lo;0;L;;;;;N;;;;; +138CB;EGYPTIAN HIEROGLYPH-138CB;Lo;0;L;;;;;N;;;;; +138CC;EGYPTIAN HIEROGLYPH-138CC;Lo;0;L;;;;;N;;;;; +138CD;EGYPTIAN HIEROGLYPH-138CD;Lo;0;L;;;;;N;;;;; +138CE;EGYPTIAN HIEROGLYPH-138CE;Lo;0;L;;;;;N;;;;; +138CF;EGYPTIAN HIEROGLYPH-138CF;Lo;0;L;;;;;N;;;;; +138D0;EGYPTIAN HIEROGLYPH-138D0;Lo;0;L;;;;;N;;;;; +138D1;EGYPTIAN HIEROGLYPH-138D1;Lo;0;L;;;;;N;;;;; +138D2;EGYPTIAN HIEROGLYPH-138D2;Lo;0;L;;;;;N;;;;; +138D3;EGYPTIAN HIEROGLYPH-138D3;Lo;0;L;;;;;N;;;;; +138D4;EGYPTIAN HIEROGLYPH-138D4;Lo;0;L;;;;;N;;;;; +138D5;EGYPTIAN HIEROGLYPH-138D5;Lo;0;L;;;;;N;;;;; +138D6;EGYPTIAN HIEROGLYPH-138D6;Lo;0;L;;;;;N;;;;; +138D7;EGYPTIAN HIEROGLYPH-138D7;Lo;0;L;;;;;N;;;;; +138D8;EGYPTIAN HIEROGLYPH-138D8;Lo;0;L;;;;;N;;;;; +138D9;EGYPTIAN HIEROGLYPH-138D9;Lo;0;L;;;;;N;;;;; +138DA;EGYPTIAN HIEROGLYPH-138DA;Lo;0;L;;;;;N;;;;; +138DB;EGYPTIAN HIEROGLYPH-138DB;Lo;0;L;;;;;N;;;;; +138DC;EGYPTIAN HIEROGLYPH-138DC;Lo;0;L;;;;;N;;;;; +138DD;EGYPTIAN HIEROGLYPH-138DD;Lo;0;L;;;;;N;;;;; +138DE;EGYPTIAN HIEROGLYPH-138DE;Lo;0;L;;;;;N;;;;; +138DF;EGYPTIAN HIEROGLYPH-138DF;Lo;0;L;;;;;N;;;;; +138E0;EGYPTIAN HIEROGLYPH-138E0;Lo;0;L;;;;;N;;;;; +138E1;EGYPTIAN HIEROGLYPH-138E1;Lo;0;L;;;;;N;;;;; +138E2;EGYPTIAN HIEROGLYPH-138E2;Lo;0;L;;;;;N;;;;; +138E3;EGYPTIAN HIEROGLYPH-138E3;Lo;0;L;;;;;N;;;;; +138E4;EGYPTIAN HIEROGLYPH-138E4;Lo;0;L;;;;;N;;;;; +138E5;EGYPTIAN HIEROGLYPH-138E5;Lo;0;L;;;;;N;;;;; +138E6;EGYPTIAN HIEROGLYPH-138E6;Lo;0;L;;;;;N;;;;; +138E7;EGYPTIAN HIEROGLYPH-138E7;Lo;0;L;;;;;N;;;;; +138E8;EGYPTIAN HIEROGLYPH-138E8;Lo;0;L;;;;;N;;;;; +138E9;EGYPTIAN HIEROGLYPH-138E9;Lo;0;L;;;;;N;;;;; +138EA;EGYPTIAN HIEROGLYPH-138EA;Lo;0;L;;;;;N;;;;; +138EB;EGYPTIAN HIEROGLYPH-138EB;Lo;0;L;;;;;N;;;;; +138EC;EGYPTIAN HIEROGLYPH-138EC;Lo;0;L;;;;;N;;;;; +138ED;EGYPTIAN HIEROGLYPH-138ED;Lo;0;L;;;;;N;;;;; +138EE;EGYPTIAN HIEROGLYPH-138EE;Lo;0;L;;;;;N;;;;; +138EF;EGYPTIAN HIEROGLYPH-138EF;Lo;0;L;;;;;N;;;;; +138F0;EGYPTIAN HIEROGLYPH-138F0;Lo;0;L;;;;;N;;;;; +138F1;EGYPTIAN HIEROGLYPH-138F1;Lo;0;L;;;;;N;;;;; +138F2;EGYPTIAN HIEROGLYPH-138F2;Lo;0;L;;;;;N;;;;; +138F3;EGYPTIAN HIEROGLYPH-138F3;Lo;0;L;;;;;N;;;;; +138F4;EGYPTIAN HIEROGLYPH-138F4;Lo;0;L;;;;;N;;;;; +138F5;EGYPTIAN HIEROGLYPH-138F5;Lo;0;L;;;;;N;;;;; +138F6;EGYPTIAN HIEROGLYPH-138F6;Lo;0;L;;;;;N;;;;; +138F7;EGYPTIAN HIEROGLYPH-138F7;Lo;0;L;;;;;N;;;;; +138F8;EGYPTIAN HIEROGLYPH-138F8;Lo;0;L;;;;;N;;;;; +138F9;EGYPTIAN HIEROGLYPH-138F9;Lo;0;L;;;;;N;;;;; +138FA;EGYPTIAN HIEROGLYPH-138FA;Lo;0;L;;;;;N;;;;; +138FB;EGYPTIAN HIEROGLYPH-138FB;Lo;0;L;;;;;N;;;;; +138FC;EGYPTIAN HIEROGLYPH-138FC;Lo;0;L;;;;;N;;;;; +138FD;EGYPTIAN HIEROGLYPH-138FD;Lo;0;L;;;;;N;;;;; +138FE;EGYPTIAN HIEROGLYPH-138FE;Lo;0;L;;;;;N;;;;; +138FF;EGYPTIAN HIEROGLYPH-138FF;Lo;0;L;;;;;N;;;;; +13900;EGYPTIAN HIEROGLYPH-13900;Lo;0;L;;;;;N;;;;; +13901;EGYPTIAN HIEROGLYPH-13901;Lo;0;L;;;;;N;;;;; +13902;EGYPTIAN HIEROGLYPH-13902;Lo;0;L;;;;;N;;;;; +13903;EGYPTIAN HIEROGLYPH-13903;Lo;0;L;;;;;N;;;;; +13904;EGYPTIAN HIEROGLYPH-13904;Lo;0;L;;;;;N;;;;; +13905;EGYPTIAN HIEROGLYPH-13905;Lo;0;L;;;;;N;;;;; +13906;EGYPTIAN HIEROGLYPH-13906;Lo;0;L;;;;;N;;;;; +13907;EGYPTIAN HIEROGLYPH-13907;Lo;0;L;;;;;N;;;;; +13908;EGYPTIAN HIEROGLYPH-13908;Lo;0;L;;;;;N;;;;; +13909;EGYPTIAN HIEROGLYPH-13909;Lo;0;L;;;;;N;;;;; +1390A;EGYPTIAN HIEROGLYPH-1390A;Lo;0;L;;;;;N;;;;; +1390B;EGYPTIAN HIEROGLYPH-1390B;Lo;0;L;;;;;N;;;;; +1390C;EGYPTIAN HIEROGLYPH-1390C;Lo;0;L;;;;;N;;;;; +1390D;EGYPTIAN HIEROGLYPH-1390D;Lo;0;L;;;;;N;;;;; +1390E;EGYPTIAN HIEROGLYPH-1390E;Lo;0;L;;;;;N;;;;; +1390F;EGYPTIAN HIEROGLYPH-1390F;Lo;0;L;;;;;N;;;;; +13910;EGYPTIAN HIEROGLYPH-13910;Lo;0;L;;;;;N;;;;; +13911;EGYPTIAN HIEROGLYPH-13911;Lo;0;L;;;;;N;;;;; +13912;EGYPTIAN HIEROGLYPH-13912;Lo;0;L;;;;;N;;;;; +13913;EGYPTIAN HIEROGLYPH-13913;Lo;0;L;;;;;N;;;;; +13914;EGYPTIAN HIEROGLYPH-13914;Lo;0;L;;;;;N;;;;; +13915;EGYPTIAN HIEROGLYPH-13915;Lo;0;L;;;;;N;;;;; +13916;EGYPTIAN HIEROGLYPH-13916;Lo;0;L;;;;;N;;;;; +13917;EGYPTIAN HIEROGLYPH-13917;Lo;0;L;;;;;N;;;;; +13918;EGYPTIAN HIEROGLYPH-13918;Lo;0;L;;;;;N;;;;; +13919;EGYPTIAN HIEROGLYPH-13919;Lo;0;L;;;;;N;;;;; +1391A;EGYPTIAN HIEROGLYPH-1391A;Lo;0;L;;;;;N;;;;; +1391B;EGYPTIAN HIEROGLYPH-1391B;Lo;0;L;;;;;N;;;;; +1391C;EGYPTIAN HIEROGLYPH-1391C;Lo;0;L;;;;;N;;;;; +1391D;EGYPTIAN HIEROGLYPH-1391D;Lo;0;L;;;;;N;;;;; +1391E;EGYPTIAN HIEROGLYPH-1391E;Lo;0;L;;;;;N;;;;; +1391F;EGYPTIAN HIEROGLYPH-1391F;Lo;0;L;;;;;N;;;;; +13920;EGYPTIAN HIEROGLYPH-13920;Lo;0;L;;;;;N;;;;; +13921;EGYPTIAN HIEROGLYPH-13921;Lo;0;L;;;;;N;;;;; +13922;EGYPTIAN HIEROGLYPH-13922;Lo;0;L;;;;;N;;;;; +13923;EGYPTIAN HIEROGLYPH-13923;Lo;0;L;;;;;N;;;;; +13924;EGYPTIAN HIEROGLYPH-13924;Lo;0;L;;;;;N;;;;; +13925;EGYPTIAN HIEROGLYPH-13925;Lo;0;L;;;;;N;;;;; +13926;EGYPTIAN HIEROGLYPH-13926;Lo;0;L;;;;;N;;;;; +13927;EGYPTIAN HIEROGLYPH-13927;Lo;0;L;;;;;N;;;;; +13928;EGYPTIAN HIEROGLYPH-13928;Lo;0;L;;;;;N;;;;; +13929;EGYPTIAN HIEROGLYPH-13929;Lo;0;L;;;;;N;;;;; +1392A;EGYPTIAN HIEROGLYPH-1392A;Lo;0;L;;;;;N;;;;; +1392B;EGYPTIAN HIEROGLYPH-1392B;Lo;0;L;;;;;N;;;;; +1392C;EGYPTIAN HIEROGLYPH-1392C;Lo;0;L;;;;;N;;;;; +1392D;EGYPTIAN HIEROGLYPH-1392D;Lo;0;L;;;;;N;;;;; +1392E;EGYPTIAN HIEROGLYPH-1392E;Lo;0;L;;;;;N;;;;; +1392F;EGYPTIAN HIEROGLYPH-1392F;Lo;0;L;;;;;N;;;;; +13930;EGYPTIAN HIEROGLYPH-13930;Lo;0;L;;;;;N;;;;; +13931;EGYPTIAN HIEROGLYPH-13931;Lo;0;L;;;;;N;;;;; +13932;EGYPTIAN HIEROGLYPH-13932;Lo;0;L;;;;;N;;;;; +13933;EGYPTIAN HIEROGLYPH-13933;Lo;0;L;;;;;N;;;;; +13934;EGYPTIAN HIEROGLYPH-13934;Lo;0;L;;;;;N;;;;; +13935;EGYPTIAN HIEROGLYPH-13935;Lo;0;L;;;;;N;;;;; +13936;EGYPTIAN HIEROGLYPH-13936;Lo;0;L;;;;;N;;;;; +13937;EGYPTIAN HIEROGLYPH-13937;Lo;0;L;;;;;N;;;;; +13938;EGYPTIAN HIEROGLYPH-13938;Lo;0;L;;;;;N;;;;; +13939;EGYPTIAN HIEROGLYPH-13939;Lo;0;L;;;;;N;;;;; +1393A;EGYPTIAN HIEROGLYPH-1393A;Lo;0;L;;;;;N;;;;; +1393B;EGYPTIAN HIEROGLYPH-1393B;Lo;0;L;;;;;N;;;;; +1393C;EGYPTIAN HIEROGLYPH-1393C;Lo;0;L;;;;;N;;;;; +1393D;EGYPTIAN HIEROGLYPH-1393D;Lo;0;L;;;;;N;;;;; +1393E;EGYPTIAN HIEROGLYPH-1393E;Lo;0;L;;;;;N;;;;; +1393F;EGYPTIAN HIEROGLYPH-1393F;Lo;0;L;;;;;N;;;;; +13940;EGYPTIAN HIEROGLYPH-13940;Lo;0;L;;;;;N;;;;; +13941;EGYPTIAN HIEROGLYPH-13941;Lo;0;L;;;;;N;;;;; +13942;EGYPTIAN HIEROGLYPH-13942;Lo;0;L;;;;;N;;;;; +13943;EGYPTIAN HIEROGLYPH-13943;Lo;0;L;;;;;N;;;;; +13944;EGYPTIAN HIEROGLYPH-13944;Lo;0;L;;;;;N;;;;; +13945;EGYPTIAN HIEROGLYPH-13945;Lo;0;L;;;;;N;;;;; +13946;EGYPTIAN HIEROGLYPH-13946;Lo;0;L;;;;;N;;;;; +13947;EGYPTIAN HIEROGLYPH-13947;Lo;0;L;;;;;N;;;;; +13948;EGYPTIAN HIEROGLYPH-13948;Lo;0;L;;;;;N;;;;; +13949;EGYPTIAN HIEROGLYPH-13949;Lo;0;L;;;;;N;;;;; +1394A;EGYPTIAN HIEROGLYPH-1394A;Lo;0;L;;;;;N;;;;; +1394B;EGYPTIAN HIEROGLYPH-1394B;Lo;0;L;;;;;N;;;;; +1394C;EGYPTIAN HIEROGLYPH-1394C;Lo;0;L;;;;;N;;;;; +1394D;EGYPTIAN HIEROGLYPH-1394D;Lo;0;L;;;;;N;;;;; +1394E;EGYPTIAN HIEROGLYPH-1394E;Lo;0;L;;;;;N;;;;; +1394F;EGYPTIAN HIEROGLYPH-1394F;Lo;0;L;;;;;N;;;;; +13950;EGYPTIAN HIEROGLYPH-13950;Lo;0;L;;;;;N;;;;; +13951;EGYPTIAN HIEROGLYPH-13951;Lo;0;L;;;;;N;;;;; +13952;EGYPTIAN HIEROGLYPH-13952;Lo;0;L;;;;;N;;;;; +13953;EGYPTIAN HIEROGLYPH-13953;Lo;0;L;;;;;N;;;;; +13954;EGYPTIAN HIEROGLYPH-13954;Lo;0;L;;;;;N;;;;; +13955;EGYPTIAN HIEROGLYPH-13955;Lo;0;L;;;;;N;;;;; +13956;EGYPTIAN HIEROGLYPH-13956;Lo;0;L;;;;;N;;;;; +13957;EGYPTIAN HIEROGLYPH-13957;Lo;0;L;;;;;N;;;;; +13958;EGYPTIAN HIEROGLYPH-13958;Lo;0;L;;;;;N;;;;; +13959;EGYPTIAN HIEROGLYPH-13959;Lo;0;L;;;;;N;;;;; +1395A;EGYPTIAN HIEROGLYPH-1395A;Lo;0;L;;;;;N;;;;; +1395B;EGYPTIAN HIEROGLYPH-1395B;Lo;0;L;;;;;N;;;;; +1395C;EGYPTIAN HIEROGLYPH-1395C;Lo;0;L;;;;;N;;;;; +1395D;EGYPTIAN HIEROGLYPH-1395D;Lo;0;L;;;;;N;;;;; +1395E;EGYPTIAN HIEROGLYPH-1395E;Lo;0;L;;;;;N;;;;; +1395F;EGYPTIAN HIEROGLYPH-1395F;Lo;0;L;;;;;N;;;;; +13960;EGYPTIAN HIEROGLYPH-13960;Lo;0;L;;;;;N;;;;; +13961;EGYPTIAN HIEROGLYPH-13961;Lo;0;L;;;;;N;;;;; +13962;EGYPTIAN HIEROGLYPH-13962;Lo;0;L;;;;;N;;;;; +13963;EGYPTIAN HIEROGLYPH-13963;Lo;0;L;;;;;N;;;;; +13964;EGYPTIAN HIEROGLYPH-13964;Lo;0;L;;;;;N;;;;; +13965;EGYPTIAN HIEROGLYPH-13965;Lo;0;L;;;;;N;;;;; +13966;EGYPTIAN HIEROGLYPH-13966;Lo;0;L;;;;;N;;;;; +13967;EGYPTIAN HIEROGLYPH-13967;Lo;0;L;;;;;N;;;;; +13968;EGYPTIAN HIEROGLYPH-13968;Lo;0;L;;;;;N;;;;; +13969;EGYPTIAN HIEROGLYPH-13969;Lo;0;L;;;;;N;;;;; +1396A;EGYPTIAN HIEROGLYPH-1396A;Lo;0;L;;;;;N;;;;; +1396B;EGYPTIAN HIEROGLYPH-1396B;Lo;0;L;;;;;N;;;;; +1396C;EGYPTIAN HIEROGLYPH-1396C;Lo;0;L;;;;;N;;;;; +1396D;EGYPTIAN HIEROGLYPH-1396D;Lo;0;L;;;;;N;;;;; +1396E;EGYPTIAN HIEROGLYPH-1396E;Lo;0;L;;;;;N;;;;; +1396F;EGYPTIAN HIEROGLYPH-1396F;Lo;0;L;;;;;N;;;;; +13970;EGYPTIAN HIEROGLYPH-13970;Lo;0;L;;;;;N;;;;; +13971;EGYPTIAN HIEROGLYPH-13971;Lo;0;L;;;;;N;;;;; +13972;EGYPTIAN HIEROGLYPH-13972;Lo;0;L;;;;;N;;;;; +13973;EGYPTIAN HIEROGLYPH-13973;Lo;0;L;;;;;N;;;;; +13974;EGYPTIAN HIEROGLYPH-13974;Lo;0;L;;;;;N;;;;; +13975;EGYPTIAN HIEROGLYPH-13975;Lo;0;L;;;;;N;;;;; +13976;EGYPTIAN HIEROGLYPH-13976;Lo;0;L;;;;;N;;;;; +13977;EGYPTIAN HIEROGLYPH-13977;Lo;0;L;;;;;N;;;;; +13978;EGYPTIAN HIEROGLYPH-13978;Lo;0;L;;;;;N;;;;; +13979;EGYPTIAN HIEROGLYPH-13979;Lo;0;L;;;;;N;;;;; +1397A;EGYPTIAN HIEROGLYPH-1397A;Lo;0;L;;;;;N;;;;; +1397B;EGYPTIAN HIEROGLYPH-1397B;Lo;0;L;;;;;N;;;;; +1397C;EGYPTIAN HIEROGLYPH-1397C;Lo;0;L;;;;;N;;;;; +1397D;EGYPTIAN HIEROGLYPH-1397D;Lo;0;L;;;;;N;;;;; +1397E;EGYPTIAN HIEROGLYPH-1397E;Lo;0;L;;;;;N;;;;; +1397F;EGYPTIAN HIEROGLYPH-1397F;Lo;0;L;;;;;N;;;;; +13980;EGYPTIAN HIEROGLYPH-13980;Lo;0;L;;;;;N;;;;; +13981;EGYPTIAN HIEROGLYPH-13981;Lo;0;L;;;;;N;;;;; +13982;EGYPTIAN HIEROGLYPH-13982;Lo;0;L;;;;;N;;;;; +13983;EGYPTIAN HIEROGLYPH-13983;Lo;0;L;;;;;N;;;;; +13984;EGYPTIAN HIEROGLYPH-13984;Lo;0;L;;;;;N;;;;; +13985;EGYPTIAN HIEROGLYPH-13985;Lo;0;L;;;;;N;;;;; +13986;EGYPTIAN HIEROGLYPH-13986;Lo;0;L;;;;;N;;;;; +13987;EGYPTIAN HIEROGLYPH-13987;Lo;0;L;;;;;N;;;;; +13988;EGYPTIAN HIEROGLYPH-13988;Lo;0;L;;;;;N;;;;; +13989;EGYPTIAN HIEROGLYPH-13989;Lo;0;L;;;;;N;;;;; +1398A;EGYPTIAN HIEROGLYPH-1398A;Lo;0;L;;;;;N;;;;; +1398B;EGYPTIAN HIEROGLYPH-1398B;Lo;0;L;;;;;N;;;;; +1398C;EGYPTIAN HIEROGLYPH-1398C;Lo;0;L;;;;;N;;;;; +1398D;EGYPTIAN HIEROGLYPH-1398D;Lo;0;L;;;;;N;;;;; +1398E;EGYPTIAN HIEROGLYPH-1398E;Lo;0;L;;;;;N;;;;; +1398F;EGYPTIAN HIEROGLYPH-1398F;Lo;0;L;;;;;N;;;;; +13990;EGYPTIAN HIEROGLYPH-13990;Lo;0;L;;;;;N;;;;; +13991;EGYPTIAN HIEROGLYPH-13991;Lo;0;L;;;;;N;;;;; +13992;EGYPTIAN HIEROGLYPH-13992;Lo;0;L;;;;;N;;;;; +13993;EGYPTIAN HIEROGLYPH-13993;Lo;0;L;;;;;N;;;;; +13994;EGYPTIAN HIEROGLYPH-13994;Lo;0;L;;;;;N;;;;; +13995;EGYPTIAN HIEROGLYPH-13995;Lo;0;L;;;;;N;;;;; +13996;EGYPTIAN HIEROGLYPH-13996;Lo;0;L;;;;;N;;;;; +13997;EGYPTIAN HIEROGLYPH-13997;Lo;0;L;;;;;N;;;;; +13998;EGYPTIAN HIEROGLYPH-13998;Lo;0;L;;;;;N;;;;; +13999;EGYPTIAN HIEROGLYPH-13999;Lo;0;L;;;;;N;;;;; +1399A;EGYPTIAN HIEROGLYPH-1399A;Lo;0;L;;;;;N;;;;; +1399B;EGYPTIAN HIEROGLYPH-1399B;Lo;0;L;;;;;N;;;;; +1399C;EGYPTIAN HIEROGLYPH-1399C;Lo;0;L;;;;;N;;;;; +1399D;EGYPTIAN HIEROGLYPH-1399D;Lo;0;L;;;;;N;;;;; +1399E;EGYPTIAN HIEROGLYPH-1399E;Lo;0;L;;;;;N;;;;; +1399F;EGYPTIAN HIEROGLYPH-1399F;Lo;0;L;;;;;N;;;;; +139A0;EGYPTIAN HIEROGLYPH-139A0;Lo;0;L;;;;;N;;;;; +139A1;EGYPTIAN HIEROGLYPH-139A1;Lo;0;L;;;;;N;;;;; +139A2;EGYPTIAN HIEROGLYPH-139A2;Lo;0;L;;;;;N;;;;; +139A3;EGYPTIAN HIEROGLYPH-139A3;Lo;0;L;;;;;N;;;;; +139A4;EGYPTIAN HIEROGLYPH-139A4;Lo;0;L;;;;;N;;;;; +139A5;EGYPTIAN HIEROGLYPH-139A5;Lo;0;L;;;;;N;;;;; +139A6;EGYPTIAN HIEROGLYPH-139A6;Lo;0;L;;;;;N;;;;; +139A7;EGYPTIAN HIEROGLYPH-139A7;Lo;0;L;;;;;N;;;;; +139A8;EGYPTIAN HIEROGLYPH-139A8;Lo;0;L;;;;;N;;;;; +139A9;EGYPTIAN HIEROGLYPH-139A9;Lo;0;L;;;;;N;;;;; +139AA;EGYPTIAN HIEROGLYPH-139AA;Lo;0;L;;;;;N;;;;; +139AB;EGYPTIAN HIEROGLYPH-139AB;Lo;0;L;;;;;N;;;;; +139AC;EGYPTIAN HIEROGLYPH-139AC;Lo;0;L;;;;;N;;;;; +139AD;EGYPTIAN HIEROGLYPH-139AD;Lo;0;L;;;;;N;;;;; +139AE;EGYPTIAN HIEROGLYPH-139AE;Lo;0;L;;;;;N;;;;; +139AF;EGYPTIAN HIEROGLYPH-139AF;Lo;0;L;;;;;N;;;;; +139B0;EGYPTIAN HIEROGLYPH-139B0;Lo;0;L;;;;;N;;;;; +139B1;EGYPTIAN HIEROGLYPH-139B1;Lo;0;L;;;;;N;;;;; +139B2;EGYPTIAN HIEROGLYPH-139B2;Lo;0;L;;;;;N;;;;; +139B3;EGYPTIAN HIEROGLYPH-139B3;Lo;0;L;;;;;N;;;;; +139B4;EGYPTIAN HIEROGLYPH-139B4;Lo;0;L;;;;;N;;;;; +139B5;EGYPTIAN HIEROGLYPH-139B5;Lo;0;L;;;;;N;;;;; +139B6;EGYPTIAN HIEROGLYPH-139B6;Lo;0;L;;;;;N;;;;; +139B7;EGYPTIAN HIEROGLYPH-139B7;Lo;0;L;;;;;N;;;;; +139B8;EGYPTIAN HIEROGLYPH-139B8;Lo;0;L;;;;;N;;;;; +139B9;EGYPTIAN HIEROGLYPH-139B9;Lo;0;L;;;;;N;;;;; +139BA;EGYPTIAN HIEROGLYPH-139BA;Lo;0;L;;;;;N;;;;; +139BB;EGYPTIAN HIEROGLYPH-139BB;Lo;0;L;;;;;N;;;;; +139BC;EGYPTIAN HIEROGLYPH-139BC;Lo;0;L;;;;;N;;;;; +139BD;EGYPTIAN HIEROGLYPH-139BD;Lo;0;L;;;;;N;;;;; +139BE;EGYPTIAN HIEROGLYPH-139BE;Lo;0;L;;;;;N;;;;; +139BF;EGYPTIAN HIEROGLYPH-139BF;Lo;0;L;;;;;N;;;;; +139C0;EGYPTIAN HIEROGLYPH-139C0;Lo;0;L;;;;;N;;;;; +139C1;EGYPTIAN HIEROGLYPH-139C1;Lo;0;L;;;;;N;;;;; +139C2;EGYPTIAN HIEROGLYPH-139C2;Lo;0;L;;;;;N;;;;; +139C3;EGYPTIAN HIEROGLYPH-139C3;Lo;0;L;;;;;N;;;;; +139C4;EGYPTIAN HIEROGLYPH-139C4;Lo;0;L;;;;;N;;;;; +139C5;EGYPTIAN HIEROGLYPH-139C5;Lo;0;L;;;;;N;;;;; +139C6;EGYPTIAN HIEROGLYPH-139C6;Lo;0;L;;;;;N;;;;; +139C7;EGYPTIAN HIEROGLYPH-139C7;Lo;0;L;;;;;N;;;;; +139C8;EGYPTIAN HIEROGLYPH-139C8;Lo;0;L;;;;;N;;;;; +139C9;EGYPTIAN HIEROGLYPH-139C9;Lo;0;L;;;;;N;;;;; +139CA;EGYPTIAN HIEROGLYPH-139CA;Lo;0;L;;;;;N;;;;; +139CB;EGYPTIAN HIEROGLYPH-139CB;Lo;0;L;;;;;N;;;;; +139CC;EGYPTIAN HIEROGLYPH-139CC;Lo;0;L;;;;;N;;;;; +139CD;EGYPTIAN HIEROGLYPH-139CD;Lo;0;L;;;;;N;;;;; +139CE;EGYPTIAN HIEROGLYPH-139CE;Lo;0;L;;;;;N;;;;; +139CF;EGYPTIAN HIEROGLYPH-139CF;Lo;0;L;;;;;N;;;;; +139D0;EGYPTIAN HIEROGLYPH-139D0;Lo;0;L;;;;;N;;;;; +139D1;EGYPTIAN HIEROGLYPH-139D1;Lo;0;L;;;;;N;;;;; +139D2;EGYPTIAN HIEROGLYPH-139D2;Lo;0;L;;;;;N;;;;; +139D3;EGYPTIAN HIEROGLYPH-139D3;Lo;0;L;;;;;N;;;;; +139D4;EGYPTIAN HIEROGLYPH-139D4;Lo;0;L;;;;;N;;;;; +139D5;EGYPTIAN HIEROGLYPH-139D5;Lo;0;L;;;;;N;;;;; +139D6;EGYPTIAN HIEROGLYPH-139D6;Lo;0;L;;;;;N;;;;; +139D7;EGYPTIAN HIEROGLYPH-139D7;Lo;0;L;;;;;N;;;;; +139D8;EGYPTIAN HIEROGLYPH-139D8;Lo;0;L;;;;;N;;;;; +139D9;EGYPTIAN HIEROGLYPH-139D9;Lo;0;L;;;;;N;;;;; +139DA;EGYPTIAN HIEROGLYPH-139DA;Lo;0;L;;;;;N;;;;; +139DB;EGYPTIAN HIEROGLYPH-139DB;Lo;0;L;;;;;N;;;;; +139DC;EGYPTIAN HIEROGLYPH-139DC;Lo;0;L;;;;;N;;;;; +139DD;EGYPTIAN HIEROGLYPH-139DD;Lo;0;L;;;;;N;;;;; +139DE;EGYPTIAN HIEROGLYPH-139DE;Lo;0;L;;;;;N;;;;; +139DF;EGYPTIAN HIEROGLYPH-139DF;Lo;0;L;;;;;N;;;;; +139E0;EGYPTIAN HIEROGLYPH-139E0;Lo;0;L;;;;;N;;;;; +139E1;EGYPTIAN HIEROGLYPH-139E1;Lo;0;L;;;;;N;;;;; +139E2;EGYPTIAN HIEROGLYPH-139E2;Lo;0;L;;;;;N;;;;; +139E3;EGYPTIAN HIEROGLYPH-139E3;Lo;0;L;;;;;N;;;;; +139E4;EGYPTIAN HIEROGLYPH-139E4;Lo;0;L;;;;;N;;;;; +139E5;EGYPTIAN HIEROGLYPH-139E5;Lo;0;L;;;;;N;;;;; +139E6;EGYPTIAN HIEROGLYPH-139E6;Lo;0;L;;;;;N;;;;; +139E7;EGYPTIAN HIEROGLYPH-139E7;Lo;0;L;;;;;N;;;;; +139E8;EGYPTIAN HIEROGLYPH-139E8;Lo;0;L;;;;;N;;;;; +139E9;EGYPTIAN HIEROGLYPH-139E9;Lo;0;L;;;;;N;;;;; +139EA;EGYPTIAN HIEROGLYPH-139EA;Lo;0;L;;;;;N;;;;; +139EB;EGYPTIAN HIEROGLYPH-139EB;Lo;0;L;;;;;N;;;;; +139EC;EGYPTIAN HIEROGLYPH-139EC;Lo;0;L;;;;;N;;;;; +139ED;EGYPTIAN HIEROGLYPH-139ED;Lo;0;L;;;;;N;;;;; +139EE;EGYPTIAN HIEROGLYPH-139EE;Lo;0;L;;;;;N;;;;; +139EF;EGYPTIAN HIEROGLYPH-139EF;Lo;0;L;;;;;N;;;;; +139F0;EGYPTIAN HIEROGLYPH-139F0;Lo;0;L;;;;;N;;;;; +139F1;EGYPTIAN HIEROGLYPH-139F1;Lo;0;L;;;;;N;;;;; +139F2;EGYPTIAN HIEROGLYPH-139F2;Lo;0;L;;;;;N;;;;; +139F3;EGYPTIAN HIEROGLYPH-139F3;Lo;0;L;;;;;N;;;;; +139F4;EGYPTIAN HIEROGLYPH-139F4;Lo;0;L;;;;;N;;;;; +139F5;EGYPTIAN HIEROGLYPH-139F5;Lo;0;L;;;;;N;;;;; +139F6;EGYPTIAN HIEROGLYPH-139F6;Lo;0;L;;;;;N;;;;; +139F7;EGYPTIAN HIEROGLYPH-139F7;Lo;0;L;;;;;N;;;;; +139F8;EGYPTIAN HIEROGLYPH-139F8;Lo;0;L;;;;;N;;;;; +139F9;EGYPTIAN HIEROGLYPH-139F9;Lo;0;L;;;;;N;;;;; +139FA;EGYPTIAN HIEROGLYPH-139FA;Lo;0;L;;;;;N;;;;; +139FB;EGYPTIAN HIEROGLYPH-139FB;Lo;0;L;;;;;N;;;;; +139FC;EGYPTIAN HIEROGLYPH-139FC;Lo;0;L;;;;;N;;;;; +139FD;EGYPTIAN HIEROGLYPH-139FD;Lo;0;L;;;;;N;;;;; +139FE;EGYPTIAN HIEROGLYPH-139FE;Lo;0;L;;;;;N;;;;; +139FF;EGYPTIAN HIEROGLYPH-139FF;Lo;0;L;;;;;N;;;;; +13A00;EGYPTIAN HIEROGLYPH-13A00;Lo;0;L;;;;;N;;;;; +13A01;EGYPTIAN HIEROGLYPH-13A01;Lo;0;L;;;;;N;;;;; +13A02;EGYPTIAN HIEROGLYPH-13A02;Lo;0;L;;;;;N;;;;; +13A03;EGYPTIAN HIEROGLYPH-13A03;Lo;0;L;;;;;N;;;;; +13A04;EGYPTIAN HIEROGLYPH-13A04;Lo;0;L;;;;;N;;;;; +13A05;EGYPTIAN HIEROGLYPH-13A05;Lo;0;L;;;;;N;;;;; +13A06;EGYPTIAN HIEROGLYPH-13A06;Lo;0;L;;;;;N;;;;; +13A07;EGYPTIAN HIEROGLYPH-13A07;Lo;0;L;;;;;N;;;;; +13A08;EGYPTIAN HIEROGLYPH-13A08;Lo;0;L;;;;;N;;;;; +13A09;EGYPTIAN HIEROGLYPH-13A09;Lo;0;L;;;;;N;;;;; +13A0A;EGYPTIAN HIEROGLYPH-13A0A;Lo;0;L;;;;;N;;;;; +13A0B;EGYPTIAN HIEROGLYPH-13A0B;Lo;0;L;;;;;N;;;;; +13A0C;EGYPTIAN HIEROGLYPH-13A0C;Lo;0;L;;;;;N;;;;; +13A0D;EGYPTIAN HIEROGLYPH-13A0D;Lo;0;L;;;;;N;;;;; +13A0E;EGYPTIAN HIEROGLYPH-13A0E;Lo;0;L;;;;;N;;;;; +13A0F;EGYPTIAN HIEROGLYPH-13A0F;Lo;0;L;;;;;N;;;;; +13A10;EGYPTIAN HIEROGLYPH-13A10;Lo;0;L;;;;;N;;;;; +13A11;EGYPTIAN HIEROGLYPH-13A11;Lo;0;L;;;;;N;;;;; +13A12;EGYPTIAN HIEROGLYPH-13A12;Lo;0;L;;;;;N;;;;; +13A13;EGYPTIAN HIEROGLYPH-13A13;Lo;0;L;;;;;N;;;;; +13A14;EGYPTIAN HIEROGLYPH-13A14;Lo;0;L;;;;;N;;;;; +13A15;EGYPTIAN HIEROGLYPH-13A15;Lo;0;L;;;;;N;;;;; +13A16;EGYPTIAN HIEROGLYPH-13A16;Lo;0;L;;;;;N;;;;; +13A17;EGYPTIAN HIEROGLYPH-13A17;Lo;0;L;;;;;N;;;;; +13A18;EGYPTIAN HIEROGLYPH-13A18;Lo;0;L;;;;;N;;;;; +13A19;EGYPTIAN HIEROGLYPH-13A19;Lo;0;L;;;;;N;;;;; +13A1A;EGYPTIAN HIEROGLYPH-13A1A;Lo;0;L;;;;;N;;;;; +13A1B;EGYPTIAN HIEROGLYPH-13A1B;Lo;0;L;;;;;N;;;;; +13A1C;EGYPTIAN HIEROGLYPH-13A1C;Lo;0;L;;;;;N;;;;; +13A1D;EGYPTIAN HIEROGLYPH-13A1D;Lo;0;L;;;;;N;;;;; +13A1E;EGYPTIAN HIEROGLYPH-13A1E;Lo;0;L;;;;;N;;;;; +13A1F;EGYPTIAN HIEROGLYPH-13A1F;Lo;0;L;;;;;N;;;;; +13A20;EGYPTIAN HIEROGLYPH-13A20;Lo;0;L;;;;;N;;;;; +13A21;EGYPTIAN HIEROGLYPH-13A21;Lo;0;L;;;;;N;;;;; +13A22;EGYPTIAN HIEROGLYPH-13A22;Lo;0;L;;;;;N;;;;; +13A23;EGYPTIAN HIEROGLYPH-13A23;Lo;0;L;;;;;N;;;;; +13A24;EGYPTIAN HIEROGLYPH-13A24;Lo;0;L;;;;;N;;;;; +13A25;EGYPTIAN HIEROGLYPH-13A25;Lo;0;L;;;;;N;;;;; +13A26;EGYPTIAN HIEROGLYPH-13A26;Lo;0;L;;;;;N;;;;; +13A27;EGYPTIAN HIEROGLYPH-13A27;Lo;0;L;;;;;N;;;;; +13A28;EGYPTIAN HIEROGLYPH-13A28;Lo;0;L;;;;;N;;;;; +13A29;EGYPTIAN HIEROGLYPH-13A29;Lo;0;L;;;;;N;;;;; +13A2A;EGYPTIAN HIEROGLYPH-13A2A;Lo;0;L;;;;;N;;;;; +13A2B;EGYPTIAN HIEROGLYPH-13A2B;Lo;0;L;;;;;N;;;;; +13A2C;EGYPTIAN HIEROGLYPH-13A2C;Lo;0;L;;;;;N;;;;; +13A2D;EGYPTIAN HIEROGLYPH-13A2D;Lo;0;L;;;;;N;;;;; +13A2E;EGYPTIAN HIEROGLYPH-13A2E;Lo;0;L;;;;;N;;;;; +13A2F;EGYPTIAN HIEROGLYPH-13A2F;Lo;0;L;;;;;N;;;;; +13A30;EGYPTIAN HIEROGLYPH-13A30;Lo;0;L;;;;;N;;;;; +13A31;EGYPTIAN HIEROGLYPH-13A31;Lo;0;L;;;;;N;;;;; +13A32;EGYPTIAN HIEROGLYPH-13A32;Lo;0;L;;;;;N;;;;; +13A33;EGYPTIAN HIEROGLYPH-13A33;Lo;0;L;;;;;N;;;;; +13A34;EGYPTIAN HIEROGLYPH-13A34;Lo;0;L;;;;;N;;;;; +13A35;EGYPTIAN HIEROGLYPH-13A35;Lo;0;L;;;;;N;;;;; +13A36;EGYPTIAN HIEROGLYPH-13A36;Lo;0;L;;;;;N;;;;; +13A37;EGYPTIAN HIEROGLYPH-13A37;Lo;0;L;;;;;N;;;;; +13A38;EGYPTIAN HIEROGLYPH-13A38;Lo;0;L;;;;;N;;;;; +13A39;EGYPTIAN HIEROGLYPH-13A39;Lo;0;L;;;;;N;;;;; +13A3A;EGYPTIAN HIEROGLYPH-13A3A;Lo;0;L;;;;;N;;;;; +13A3B;EGYPTIAN HIEROGLYPH-13A3B;Lo;0;L;;;;;N;;;;; +13A3C;EGYPTIAN HIEROGLYPH-13A3C;Lo;0;L;;;;;N;;;;; +13A3D;EGYPTIAN HIEROGLYPH-13A3D;Lo;0;L;;;;;N;;;;; +13A3E;EGYPTIAN HIEROGLYPH-13A3E;Lo;0;L;;;;;N;;;;; +13A3F;EGYPTIAN HIEROGLYPH-13A3F;Lo;0;L;;;;;N;;;;; +13A40;EGYPTIAN HIEROGLYPH-13A40;Lo;0;L;;;;;N;;;;; +13A41;EGYPTIAN HIEROGLYPH-13A41;Lo;0;L;;;;;N;;;;; +13A42;EGYPTIAN HIEROGLYPH-13A42;Lo;0;L;;;;;N;;;;; +13A43;EGYPTIAN HIEROGLYPH-13A43;Lo;0;L;;;;;N;;;;; +13A44;EGYPTIAN HIEROGLYPH-13A44;Lo;0;L;;;;;N;;;;; +13A45;EGYPTIAN HIEROGLYPH-13A45;Lo;0;L;;;;;N;;;;; +13A46;EGYPTIAN HIEROGLYPH-13A46;Lo;0;L;;;;;N;;;;; +13A47;EGYPTIAN HIEROGLYPH-13A47;Lo;0;L;;;;;N;;;;; +13A48;EGYPTIAN HIEROGLYPH-13A48;Lo;0;L;;;;;N;;;;; +13A49;EGYPTIAN HIEROGLYPH-13A49;Lo;0;L;;;;;N;;;;; +13A4A;EGYPTIAN HIEROGLYPH-13A4A;Lo;0;L;;;;;N;;;;; +13A4B;EGYPTIAN HIEROGLYPH-13A4B;Lo;0;L;;;;;N;;;;; +13A4C;EGYPTIAN HIEROGLYPH-13A4C;Lo;0;L;;;;;N;;;;; +13A4D;EGYPTIAN HIEROGLYPH-13A4D;Lo;0;L;;;;;N;;;;; +13A4E;EGYPTIAN HIEROGLYPH-13A4E;Lo;0;L;;;;;N;;;;; +13A4F;EGYPTIAN HIEROGLYPH-13A4F;Lo;0;L;;;;;N;;;;; +13A50;EGYPTIAN HIEROGLYPH-13A50;Lo;0;L;;;;;N;;;;; +13A51;EGYPTIAN HIEROGLYPH-13A51;Lo;0;L;;;;;N;;;;; +13A52;EGYPTIAN HIEROGLYPH-13A52;Lo;0;L;;;;;N;;;;; +13A53;EGYPTIAN HIEROGLYPH-13A53;Lo;0;L;;;;;N;;;;; +13A54;EGYPTIAN HIEROGLYPH-13A54;Lo;0;L;;;;;N;;;;; +13A55;EGYPTIAN HIEROGLYPH-13A55;Lo;0;L;;;;;N;;;;; +13A56;EGYPTIAN HIEROGLYPH-13A56;Lo;0;L;;;;;N;;;;; +13A57;EGYPTIAN HIEROGLYPH-13A57;Lo;0;L;;;;;N;;;;; +13A58;EGYPTIAN HIEROGLYPH-13A58;Lo;0;L;;;;;N;;;;; +13A59;EGYPTIAN HIEROGLYPH-13A59;Lo;0;L;;;;;N;;;;; +13A5A;EGYPTIAN HIEROGLYPH-13A5A;Lo;0;L;;;;;N;;;;; +13A5B;EGYPTIAN HIEROGLYPH-13A5B;Lo;0;L;;;;;N;;;;; +13A5C;EGYPTIAN HIEROGLYPH-13A5C;Lo;0;L;;;;;N;;;;; +13A5D;EGYPTIAN HIEROGLYPH-13A5D;Lo;0;L;;;;;N;;;;; +13A5E;EGYPTIAN HIEROGLYPH-13A5E;Lo;0;L;;;;;N;;;;; +13A5F;EGYPTIAN HIEROGLYPH-13A5F;Lo;0;L;;;;;N;;;;; +13A60;EGYPTIAN HIEROGLYPH-13A60;Lo;0;L;;;;;N;;;;; +13A61;EGYPTIAN HIEROGLYPH-13A61;Lo;0;L;;;;;N;;;;; +13A62;EGYPTIAN HIEROGLYPH-13A62;Lo;0;L;;;;;N;;;;; +13A63;EGYPTIAN HIEROGLYPH-13A63;Lo;0;L;;;;;N;;;;; +13A64;EGYPTIAN HIEROGLYPH-13A64;Lo;0;L;;;;;N;;;;; +13A65;EGYPTIAN HIEROGLYPH-13A65;Lo;0;L;;;;;N;;;;; +13A66;EGYPTIAN HIEROGLYPH-13A66;Lo;0;L;;;;;N;;;;; +13A67;EGYPTIAN HIEROGLYPH-13A67;Lo;0;L;;;;;N;;;;; +13A68;EGYPTIAN HIEROGLYPH-13A68;Lo;0;L;;;;;N;;;;; +13A69;EGYPTIAN HIEROGLYPH-13A69;Lo;0;L;;;;;N;;;;; +13A6A;EGYPTIAN HIEROGLYPH-13A6A;Lo;0;L;;;;;N;;;;; +13A6B;EGYPTIAN HIEROGLYPH-13A6B;Lo;0;L;;;;;N;;;;; +13A6C;EGYPTIAN HIEROGLYPH-13A6C;Lo;0;L;;;;;N;;;;; +13A6D;EGYPTIAN HIEROGLYPH-13A6D;Lo;0;L;;;;;N;;;;; +13A6E;EGYPTIAN HIEROGLYPH-13A6E;Lo;0;L;;;;;N;;;;; +13A6F;EGYPTIAN HIEROGLYPH-13A6F;Lo;0;L;;;;;N;;;;; +13A70;EGYPTIAN HIEROGLYPH-13A70;Lo;0;L;;;;;N;;;;; +13A71;EGYPTIAN HIEROGLYPH-13A71;Lo;0;L;;;;;N;;;;; +13A72;EGYPTIAN HIEROGLYPH-13A72;Lo;0;L;;;;;N;;;;; +13A73;EGYPTIAN HIEROGLYPH-13A73;Lo;0;L;;;;;N;;;;; +13A74;EGYPTIAN HIEROGLYPH-13A74;Lo;0;L;;;;;N;;;;; +13A75;EGYPTIAN HIEROGLYPH-13A75;Lo;0;L;;;;;N;;;;; +13A76;EGYPTIAN HIEROGLYPH-13A76;Lo;0;L;;;;;N;;;;; +13A77;EGYPTIAN HIEROGLYPH-13A77;Lo;0;L;;;;;N;;;;; +13A78;EGYPTIAN HIEROGLYPH-13A78;Lo;0;L;;;;;N;;;;; +13A79;EGYPTIAN HIEROGLYPH-13A79;Lo;0;L;;;;;N;;;;; +13A7A;EGYPTIAN HIEROGLYPH-13A7A;Lo;0;L;;;;;N;;;;; +13A7B;EGYPTIAN HIEROGLYPH-13A7B;Lo;0;L;;;;;N;;;;; +13A7C;EGYPTIAN HIEROGLYPH-13A7C;Lo;0;L;;;;;N;;;;; +13A7D;EGYPTIAN HIEROGLYPH-13A7D;Lo;0;L;;;;;N;;;;; +13A7E;EGYPTIAN HIEROGLYPH-13A7E;Lo;0;L;;;;;N;;;;; +13A7F;EGYPTIAN HIEROGLYPH-13A7F;Lo;0;L;;;;;N;;;;; +13A80;EGYPTIAN HIEROGLYPH-13A80;Lo;0;L;;;;;N;;;;; +13A81;EGYPTIAN HIEROGLYPH-13A81;Lo;0;L;;;;;N;;;;; +13A82;EGYPTIAN HIEROGLYPH-13A82;Lo;0;L;;;;;N;;;;; +13A83;EGYPTIAN HIEROGLYPH-13A83;Lo;0;L;;;;;N;;;;; +13A84;EGYPTIAN HIEROGLYPH-13A84;Lo;0;L;;;;;N;;;;; +13A85;EGYPTIAN HIEROGLYPH-13A85;Lo;0;L;;;;;N;;;;; +13A86;EGYPTIAN HIEROGLYPH-13A86;Lo;0;L;;;;;N;;;;; +13A87;EGYPTIAN HIEROGLYPH-13A87;Lo;0;L;;;;;N;;;;; +13A88;EGYPTIAN HIEROGLYPH-13A88;Lo;0;L;;;;;N;;;;; +13A89;EGYPTIAN HIEROGLYPH-13A89;Lo;0;L;;;;;N;;;;; +13A8A;EGYPTIAN HIEROGLYPH-13A8A;Lo;0;L;;;;;N;;;;; +13A8B;EGYPTIAN HIEROGLYPH-13A8B;Lo;0;L;;;;;N;;;;; +13A8C;EGYPTIAN HIEROGLYPH-13A8C;Lo;0;L;;;;;N;;;;; +13A8D;EGYPTIAN HIEROGLYPH-13A8D;Lo;0;L;;;;;N;;;;; +13A8E;EGYPTIAN HIEROGLYPH-13A8E;Lo;0;L;;;;;N;;;;; +13A8F;EGYPTIAN HIEROGLYPH-13A8F;Lo;0;L;;;;;N;;;;; +13A90;EGYPTIAN HIEROGLYPH-13A90;Lo;0;L;;;;;N;;;;; +13A91;EGYPTIAN HIEROGLYPH-13A91;Lo;0;L;;;;;N;;;;; +13A92;EGYPTIAN HIEROGLYPH-13A92;Lo;0;L;;;;;N;;;;; +13A93;EGYPTIAN HIEROGLYPH-13A93;Lo;0;L;;;;;N;;;;; +13A94;EGYPTIAN HIEROGLYPH-13A94;Lo;0;L;;;;;N;;;;; +13A95;EGYPTIAN HIEROGLYPH-13A95;Lo;0;L;;;;;N;;;;; +13A96;EGYPTIAN HIEROGLYPH-13A96;Lo;0;L;;;;;N;;;;; +13A97;EGYPTIAN HIEROGLYPH-13A97;Lo;0;L;;;;;N;;;;; +13A98;EGYPTIAN HIEROGLYPH-13A98;Lo;0;L;;;;;N;;;;; +13A99;EGYPTIAN HIEROGLYPH-13A99;Lo;0;L;;;;;N;;;;; +13A9A;EGYPTIAN HIEROGLYPH-13A9A;Lo;0;L;;;;;N;;;;; +13A9B;EGYPTIAN HIEROGLYPH-13A9B;Lo;0;L;;;;;N;;;;; +13A9C;EGYPTIAN HIEROGLYPH-13A9C;Lo;0;L;;;;;N;;;;; +13A9D;EGYPTIAN HIEROGLYPH-13A9D;Lo;0;L;;;;;N;;;;; +13A9E;EGYPTIAN HIEROGLYPH-13A9E;Lo;0;L;;;;;N;;;;; +13A9F;EGYPTIAN HIEROGLYPH-13A9F;Lo;0;L;;;;;N;;;;; +13AA0;EGYPTIAN HIEROGLYPH-13AA0;Lo;0;L;;;;;N;;;;; +13AA1;EGYPTIAN HIEROGLYPH-13AA1;Lo;0;L;;;;;N;;;;; +13AA2;EGYPTIAN HIEROGLYPH-13AA2;Lo;0;L;;;;;N;;;;; +13AA3;EGYPTIAN HIEROGLYPH-13AA3;Lo;0;L;;;;;N;;;;; +13AA4;EGYPTIAN HIEROGLYPH-13AA4;Lo;0;L;;;;;N;;;;; +13AA5;EGYPTIAN HIEROGLYPH-13AA5;Lo;0;L;;;;;N;;;;; +13AA6;EGYPTIAN HIEROGLYPH-13AA6;Lo;0;L;;;;;N;;;;; +13AA7;EGYPTIAN HIEROGLYPH-13AA7;Lo;0;L;;;;;N;;;;; +13AA8;EGYPTIAN HIEROGLYPH-13AA8;Lo;0;L;;;;;N;;;;; +13AA9;EGYPTIAN HIEROGLYPH-13AA9;Lo;0;L;;;;;N;;;;; +13AAA;EGYPTIAN HIEROGLYPH-13AAA;Lo;0;L;;;;;N;;;;; +13AAB;EGYPTIAN HIEROGLYPH-13AAB;Lo;0;L;;;;;N;;;;; +13AAC;EGYPTIAN HIEROGLYPH-13AAC;Lo;0;L;;;;;N;;;;; +13AAD;EGYPTIAN HIEROGLYPH-13AAD;Lo;0;L;;;;;N;;;;; +13AAE;EGYPTIAN HIEROGLYPH-13AAE;Lo;0;L;;;;;N;;;;; +13AAF;EGYPTIAN HIEROGLYPH-13AAF;Lo;0;L;;;;;N;;;;; +13AB0;EGYPTIAN HIEROGLYPH-13AB0;Lo;0;L;;;;;N;;;;; +13AB1;EGYPTIAN HIEROGLYPH-13AB1;Lo;0;L;;;;;N;;;;; +13AB2;EGYPTIAN HIEROGLYPH-13AB2;Lo;0;L;;;;;N;;;;; +13AB3;EGYPTIAN HIEROGLYPH-13AB3;Lo;0;L;;;;;N;;;;; +13AB4;EGYPTIAN HIEROGLYPH-13AB4;Lo;0;L;;;;;N;;;;; +13AB5;EGYPTIAN HIEROGLYPH-13AB5;Lo;0;L;;;;;N;;;;; +13AB6;EGYPTIAN HIEROGLYPH-13AB6;Lo;0;L;;;;;N;;;;; +13AB7;EGYPTIAN HIEROGLYPH-13AB7;Lo;0;L;;;;;N;;;;; +13AB8;EGYPTIAN HIEROGLYPH-13AB8;Lo;0;L;;;;;N;;;;; +13AB9;EGYPTIAN HIEROGLYPH-13AB9;Lo;0;L;;;;;N;;;;; +13ABA;EGYPTIAN HIEROGLYPH-13ABA;Lo;0;L;;;;;N;;;;; +13ABB;EGYPTIAN HIEROGLYPH-13ABB;Lo;0;L;;;;;N;;;;; +13ABC;EGYPTIAN HIEROGLYPH-13ABC;Lo;0;L;;;;;N;;;;; +13ABD;EGYPTIAN HIEROGLYPH-13ABD;Lo;0;L;;;;;N;;;;; +13ABE;EGYPTIAN HIEROGLYPH-13ABE;Lo;0;L;;;;;N;;;;; +13ABF;EGYPTIAN HIEROGLYPH-13ABF;Lo;0;L;;;;;N;;;;; +13AC0;EGYPTIAN HIEROGLYPH-13AC0;Lo;0;L;;;;;N;;;;; +13AC1;EGYPTIAN HIEROGLYPH-13AC1;Lo;0;L;;;;;N;;;;; +13AC2;EGYPTIAN HIEROGLYPH-13AC2;Lo;0;L;;;;;N;;;;; +13AC3;EGYPTIAN HIEROGLYPH-13AC3;Lo;0;L;;;;;N;;;;; +13AC4;EGYPTIAN HIEROGLYPH-13AC4;Lo;0;L;;;;;N;;;;; +13AC5;EGYPTIAN HIEROGLYPH-13AC5;Lo;0;L;;;;;N;;;;; +13AC6;EGYPTIAN HIEROGLYPH-13AC6;Lo;0;L;;;;;N;;;;; +13AC7;EGYPTIAN HIEROGLYPH-13AC7;Lo;0;L;;;;;N;;;;; +13AC8;EGYPTIAN HIEROGLYPH-13AC8;Lo;0;L;;;;;N;;;;; +13AC9;EGYPTIAN HIEROGLYPH-13AC9;Lo;0;L;;;;;N;;;;; +13ACA;EGYPTIAN HIEROGLYPH-13ACA;Lo;0;L;;;;;N;;;;; +13ACB;EGYPTIAN HIEROGLYPH-13ACB;Lo;0;L;;;;;N;;;;; +13ACC;EGYPTIAN HIEROGLYPH-13ACC;Lo;0;L;;;;;N;;;;; +13ACD;EGYPTIAN HIEROGLYPH-13ACD;Lo;0;L;;;;;N;;;;; +13ACE;EGYPTIAN HIEROGLYPH-13ACE;Lo;0;L;;;;;N;;;;; +13ACF;EGYPTIAN HIEROGLYPH-13ACF;Lo;0;L;;;;;N;;;;; +13AD0;EGYPTIAN HIEROGLYPH-13AD0;Lo;0;L;;;;;N;;;;; +13AD1;EGYPTIAN HIEROGLYPH-13AD1;Lo;0;L;;;;;N;;;;; +13AD2;EGYPTIAN HIEROGLYPH-13AD2;Lo;0;L;;;;;N;;;;; +13AD3;EGYPTIAN HIEROGLYPH-13AD3;Lo;0;L;;;;;N;;;;; +13AD4;EGYPTIAN HIEROGLYPH-13AD4;Lo;0;L;;;;;N;;;;; +13AD5;EGYPTIAN HIEROGLYPH-13AD5;Lo;0;L;;;;;N;;;;; +13AD6;EGYPTIAN HIEROGLYPH-13AD6;Lo;0;L;;;;;N;;;;; +13AD7;EGYPTIAN HIEROGLYPH-13AD7;Lo;0;L;;;;;N;;;;; +13AD8;EGYPTIAN HIEROGLYPH-13AD8;Lo;0;L;;;;;N;;;;; +13AD9;EGYPTIAN HIEROGLYPH-13AD9;Lo;0;L;;;;;N;;;;; +13ADA;EGYPTIAN HIEROGLYPH-13ADA;Lo;0;L;;;;;N;;;;; +13ADB;EGYPTIAN HIEROGLYPH-13ADB;Lo;0;L;;;;;N;;;;; +13ADC;EGYPTIAN HIEROGLYPH-13ADC;Lo;0;L;;;;;N;;;;; +13ADD;EGYPTIAN HIEROGLYPH-13ADD;Lo;0;L;;;;;N;;;;; +13ADE;EGYPTIAN HIEROGLYPH-13ADE;Lo;0;L;;;;;N;;;;; +13ADF;EGYPTIAN HIEROGLYPH-13ADF;Lo;0;L;;;;;N;;;;; +13AE0;EGYPTIAN HIEROGLYPH-13AE0;Lo;0;L;;;;;N;;;;; +13AE1;EGYPTIAN HIEROGLYPH-13AE1;Lo;0;L;;;;;N;;;;; +13AE2;EGYPTIAN HIEROGLYPH-13AE2;Lo;0;L;;;;;N;;;;; +13AE3;EGYPTIAN HIEROGLYPH-13AE3;Lo;0;L;;;;;N;;;;; +13AE4;EGYPTIAN HIEROGLYPH-13AE4;Lo;0;L;;;;;N;;;;; +13AE5;EGYPTIAN HIEROGLYPH-13AE5;Lo;0;L;;;;;N;;;;; +13AE6;EGYPTIAN HIEROGLYPH-13AE6;Lo;0;L;;;;;N;;;;; +13AE7;EGYPTIAN HIEROGLYPH-13AE7;Lo;0;L;;;;;N;;;;; +13AE8;EGYPTIAN HIEROGLYPH-13AE8;Lo;0;L;;;;;N;;;;; +13AE9;EGYPTIAN HIEROGLYPH-13AE9;Lo;0;L;;;;;N;;;;; +13AEA;EGYPTIAN HIEROGLYPH-13AEA;Lo;0;L;;;;;N;;;;; +13AEB;EGYPTIAN HIEROGLYPH-13AEB;Lo;0;L;;;;;N;;;;; +13AEC;EGYPTIAN HIEROGLYPH-13AEC;Lo;0;L;;;;;N;;;;; +13AED;EGYPTIAN HIEROGLYPH-13AED;Lo;0;L;;;;;N;;;;; +13AEE;EGYPTIAN HIEROGLYPH-13AEE;Lo;0;L;;;;;N;;;;; +13AEF;EGYPTIAN HIEROGLYPH-13AEF;Lo;0;L;;;;;N;;;;; +13AF0;EGYPTIAN HIEROGLYPH-13AF0;Lo;0;L;;;;;N;;;;; +13AF1;EGYPTIAN HIEROGLYPH-13AF1;Lo;0;L;;;;;N;;;;; +13AF2;EGYPTIAN HIEROGLYPH-13AF2;Lo;0;L;;;;;N;;;;; +13AF3;EGYPTIAN HIEROGLYPH-13AF3;Lo;0;L;;;;;N;;;;; +13AF4;EGYPTIAN HIEROGLYPH-13AF4;Lo;0;L;;;;;N;;;;; +13AF5;EGYPTIAN HIEROGLYPH-13AF5;Lo;0;L;;;;;N;;;;; +13AF6;EGYPTIAN HIEROGLYPH-13AF6;Lo;0;L;;;;;N;;;;; +13AF7;EGYPTIAN HIEROGLYPH-13AF7;Lo;0;L;;;;;N;;;;; +13AF8;EGYPTIAN HIEROGLYPH-13AF8;Lo;0;L;;;;;N;;;;; +13AF9;EGYPTIAN HIEROGLYPH-13AF9;Lo;0;L;;;;;N;;;;; +13AFA;EGYPTIAN HIEROGLYPH-13AFA;Lo;0;L;;;;;N;;;;; +13AFB;EGYPTIAN HIEROGLYPH-13AFB;Lo;0;L;;;;;N;;;;; +13AFC;EGYPTIAN HIEROGLYPH-13AFC;Lo;0;L;;;;;N;;;;; +13AFD;EGYPTIAN HIEROGLYPH-13AFD;Lo;0;L;;;;;N;;;;; +13AFE;EGYPTIAN HIEROGLYPH-13AFE;Lo;0;L;;;;;N;;;;; +13AFF;EGYPTIAN HIEROGLYPH-13AFF;Lo;0;L;;;;;N;;;;; +13B00;EGYPTIAN HIEROGLYPH-13B00;Lo;0;L;;;;;N;;;;; +13B01;EGYPTIAN HIEROGLYPH-13B01;Lo;0;L;;;;;N;;;;; +13B02;EGYPTIAN HIEROGLYPH-13B02;Lo;0;L;;;;;N;;;;; +13B03;EGYPTIAN HIEROGLYPH-13B03;Lo;0;L;;;;;N;;;;; +13B04;EGYPTIAN HIEROGLYPH-13B04;Lo;0;L;;;;;N;;;;; +13B05;EGYPTIAN HIEROGLYPH-13B05;Lo;0;L;;;;;N;;;;; +13B06;EGYPTIAN HIEROGLYPH-13B06;Lo;0;L;;;;;N;;;;; +13B07;EGYPTIAN HIEROGLYPH-13B07;Lo;0;L;;;;;N;;;;; +13B08;EGYPTIAN HIEROGLYPH-13B08;Lo;0;L;;;;;N;;;;; +13B09;EGYPTIAN HIEROGLYPH-13B09;Lo;0;L;;;;;N;;;;; +13B0A;EGYPTIAN HIEROGLYPH-13B0A;Lo;0;L;;;;;N;;;;; +13B0B;EGYPTIAN HIEROGLYPH-13B0B;Lo;0;L;;;;;N;;;;; +13B0C;EGYPTIAN HIEROGLYPH-13B0C;Lo;0;L;;;;;N;;;;; +13B0D;EGYPTIAN HIEROGLYPH-13B0D;Lo;0;L;;;;;N;;;;; +13B0E;EGYPTIAN HIEROGLYPH-13B0E;Lo;0;L;;;;;N;;;;; +13B0F;EGYPTIAN HIEROGLYPH-13B0F;Lo;0;L;;;;;N;;;;; +13B10;EGYPTIAN HIEROGLYPH-13B10;Lo;0;L;;;;;N;;;;; +13B11;EGYPTIAN HIEROGLYPH-13B11;Lo;0;L;;;;;N;;;;; +13B12;EGYPTIAN HIEROGLYPH-13B12;Lo;0;L;;;;;N;;;;; +13B13;EGYPTIAN HIEROGLYPH-13B13;Lo;0;L;;;;;N;;;;; +13B14;EGYPTIAN HIEROGLYPH-13B14;Lo;0;L;;;;;N;;;;; +13B15;EGYPTIAN HIEROGLYPH-13B15;Lo;0;L;;;;;N;;;;; +13B16;EGYPTIAN HIEROGLYPH-13B16;Lo;0;L;;;;;N;;;;; +13B17;EGYPTIAN HIEROGLYPH-13B17;Lo;0;L;;;;;N;;;;; +13B18;EGYPTIAN HIEROGLYPH-13B18;Lo;0;L;;;;;N;;;;; +13B19;EGYPTIAN HIEROGLYPH-13B19;Lo;0;L;;;;;N;;;;; +13B1A;EGYPTIAN HIEROGLYPH-13B1A;Lo;0;L;;;;;N;;;;; +13B1B;EGYPTIAN HIEROGLYPH-13B1B;Lo;0;L;;;;;N;;;;; +13B1C;EGYPTIAN HIEROGLYPH-13B1C;Lo;0;L;;;;;N;;;;; +13B1D;EGYPTIAN HIEROGLYPH-13B1D;Lo;0;L;;;;;N;;;;; +13B1E;EGYPTIAN HIEROGLYPH-13B1E;Lo;0;L;;;;;N;;;;; +13B1F;EGYPTIAN HIEROGLYPH-13B1F;Lo;0;L;;;;;N;;;;; +13B20;EGYPTIAN HIEROGLYPH-13B20;Lo;0;L;;;;;N;;;;; +13B21;EGYPTIAN HIEROGLYPH-13B21;Lo;0;L;;;;;N;;;;; +13B22;EGYPTIAN HIEROGLYPH-13B22;Lo;0;L;;;;;N;;;;; +13B23;EGYPTIAN HIEROGLYPH-13B23;Lo;0;L;;;;;N;;;;; +13B24;EGYPTIAN HIEROGLYPH-13B24;Lo;0;L;;;;;N;;;;; +13B25;EGYPTIAN HIEROGLYPH-13B25;Lo;0;L;;;;;N;;;;; +13B26;EGYPTIAN HIEROGLYPH-13B26;Lo;0;L;;;;;N;;;;; +13B27;EGYPTIAN HIEROGLYPH-13B27;Lo;0;L;;;;;N;;;;; +13B28;EGYPTIAN HIEROGLYPH-13B28;Lo;0;L;;;;;N;;;;; +13B29;EGYPTIAN HIEROGLYPH-13B29;Lo;0;L;;;;;N;;;;; +13B2A;EGYPTIAN HIEROGLYPH-13B2A;Lo;0;L;;;;;N;;;;; +13B2B;EGYPTIAN HIEROGLYPH-13B2B;Lo;0;L;;;;;N;;;;; +13B2C;EGYPTIAN HIEROGLYPH-13B2C;Lo;0;L;;;;;N;;;;; +13B2D;EGYPTIAN HIEROGLYPH-13B2D;Lo;0;L;;;;;N;;;;; +13B2E;EGYPTIAN HIEROGLYPH-13B2E;Lo;0;L;;;;;N;;;;; +13B2F;EGYPTIAN HIEROGLYPH-13B2F;Lo;0;L;;;;;N;;;;; +13B30;EGYPTIAN HIEROGLYPH-13B30;Lo;0;L;;;;;N;;;;; +13B31;EGYPTIAN HIEROGLYPH-13B31;Lo;0;L;;;;;N;;;;; +13B32;EGYPTIAN HIEROGLYPH-13B32;Lo;0;L;;;;;N;;;;; +13B33;EGYPTIAN HIEROGLYPH-13B33;Lo;0;L;;;;;N;;;;; +13B34;EGYPTIAN HIEROGLYPH-13B34;Lo;0;L;;;;;N;;;;; +13B35;EGYPTIAN HIEROGLYPH-13B35;Lo;0;L;;;;;N;;;;; +13B36;EGYPTIAN HIEROGLYPH-13B36;Lo;0;L;;;;;N;;;;; +13B37;EGYPTIAN HIEROGLYPH-13B37;Lo;0;L;;;;;N;;;;; +13B38;EGYPTIAN HIEROGLYPH-13B38;Lo;0;L;;;;;N;;;;; +13B39;EGYPTIAN HIEROGLYPH-13B39;Lo;0;L;;;;;N;;;;; +13B3A;EGYPTIAN HIEROGLYPH-13B3A;Lo;0;L;;;;;N;;;;; +13B3B;EGYPTIAN HIEROGLYPH-13B3B;Lo;0;L;;;;;N;;;;; +13B3C;EGYPTIAN HIEROGLYPH-13B3C;Lo;0;L;;;;;N;;;;; +13B3D;EGYPTIAN HIEROGLYPH-13B3D;Lo;0;L;;;;;N;;;;; +13B3E;EGYPTIAN HIEROGLYPH-13B3E;Lo;0;L;;;;;N;;;;; +13B3F;EGYPTIAN HIEROGLYPH-13B3F;Lo;0;L;;;;;N;;;;; +13B40;EGYPTIAN HIEROGLYPH-13B40;Lo;0;L;;;;;N;;;;; +13B41;EGYPTIAN HIEROGLYPH-13B41;Lo;0;L;;;;;N;;;;; +13B42;EGYPTIAN HIEROGLYPH-13B42;Lo;0;L;;;;;N;;;;; +13B43;EGYPTIAN HIEROGLYPH-13B43;Lo;0;L;;;;;N;;;;; +13B44;EGYPTIAN HIEROGLYPH-13B44;Lo;0;L;;;;;N;;;;; +13B45;EGYPTIAN HIEROGLYPH-13B45;Lo;0;L;;;;;N;;;;; +13B46;EGYPTIAN HIEROGLYPH-13B46;Lo;0;L;;;;;N;;;;; +13B47;EGYPTIAN HIEROGLYPH-13B47;Lo;0;L;;;;;N;;;;; +13B48;EGYPTIAN HIEROGLYPH-13B48;Lo;0;L;;;;;N;;;;; +13B49;EGYPTIAN HIEROGLYPH-13B49;Lo;0;L;;;;;N;;;;; +13B4A;EGYPTIAN HIEROGLYPH-13B4A;Lo;0;L;;;;;N;;;;; +13B4B;EGYPTIAN HIEROGLYPH-13B4B;Lo;0;L;;;;;N;;;;; +13B4C;EGYPTIAN HIEROGLYPH-13B4C;Lo;0;L;;;;;N;;;;; +13B4D;EGYPTIAN HIEROGLYPH-13B4D;Lo;0;L;;;;;N;;;;; +13B4E;EGYPTIAN HIEROGLYPH-13B4E;Lo;0;L;;;;;N;;;;; +13B4F;EGYPTIAN HIEROGLYPH-13B4F;Lo;0;L;;;;;N;;;;; +13B50;EGYPTIAN HIEROGLYPH-13B50;Lo;0;L;;;;;N;;;;; +13B51;EGYPTIAN HIEROGLYPH-13B51;Lo;0;L;;;;;N;;;;; +13B52;EGYPTIAN HIEROGLYPH-13B52;Lo;0;L;;;;;N;;;;; +13B53;EGYPTIAN HIEROGLYPH-13B53;Lo;0;L;;;;;N;;;;; +13B54;EGYPTIAN HIEROGLYPH-13B54;Lo;0;L;;;;;N;;;;; +13B55;EGYPTIAN HIEROGLYPH-13B55;Lo;0;L;;;;;N;;;;; +13B56;EGYPTIAN HIEROGLYPH-13B56;Lo;0;L;;;;;N;;;;; +13B57;EGYPTIAN HIEROGLYPH-13B57;Lo;0;L;;;;;N;;;;; +13B58;EGYPTIAN HIEROGLYPH-13B58;Lo;0;L;;;;;N;;;;; +13B59;EGYPTIAN HIEROGLYPH-13B59;Lo;0;L;;;;;N;;;;; +13B5A;EGYPTIAN HIEROGLYPH-13B5A;Lo;0;L;;;;;N;;;;; +13B5B;EGYPTIAN HIEROGLYPH-13B5B;Lo;0;L;;;;;N;;;;; +13B5C;EGYPTIAN HIEROGLYPH-13B5C;Lo;0;L;;;;;N;;;;; +13B5D;EGYPTIAN HIEROGLYPH-13B5D;Lo;0;L;;;;;N;;;;; +13B5E;EGYPTIAN HIEROGLYPH-13B5E;Lo;0;L;;;;;N;;;;; +13B5F;EGYPTIAN HIEROGLYPH-13B5F;Lo;0;L;;;;;N;;;;; +13B60;EGYPTIAN HIEROGLYPH-13B60;Lo;0;L;;;;;N;;;;; +13B61;EGYPTIAN HIEROGLYPH-13B61;Lo;0;L;;;;;N;;;;; +13B62;EGYPTIAN HIEROGLYPH-13B62;Lo;0;L;;;;;N;;;;; +13B63;EGYPTIAN HIEROGLYPH-13B63;Lo;0;L;;;;;N;;;;; +13B64;EGYPTIAN HIEROGLYPH-13B64;Lo;0;L;;;;;N;;;;; +13B65;EGYPTIAN HIEROGLYPH-13B65;Lo;0;L;;;;;N;;;;; +13B66;EGYPTIAN HIEROGLYPH-13B66;Lo;0;L;;;;;N;;;;; +13B67;EGYPTIAN HIEROGLYPH-13B67;Lo;0;L;;;;;N;;;;; +13B68;EGYPTIAN HIEROGLYPH-13B68;Lo;0;L;;;;;N;;;;; +13B69;EGYPTIAN HIEROGLYPH-13B69;Lo;0;L;;;;;N;;;;; +13B6A;EGYPTIAN HIEROGLYPH-13B6A;Lo;0;L;;;;;N;;;;; +13B6B;EGYPTIAN HIEROGLYPH-13B6B;Lo;0;L;;;;;N;;;;; +13B6C;EGYPTIAN HIEROGLYPH-13B6C;Lo;0;L;;;;;N;;;;; +13B6D;EGYPTIAN HIEROGLYPH-13B6D;Lo;0;L;;;;;N;;;;; +13B6E;EGYPTIAN HIEROGLYPH-13B6E;Lo;0;L;;;;;N;;;;; +13B6F;EGYPTIAN HIEROGLYPH-13B6F;Lo;0;L;;;;;N;;;;; +13B70;EGYPTIAN HIEROGLYPH-13B70;Lo;0;L;;;;;N;;;;; +13B71;EGYPTIAN HIEROGLYPH-13B71;Lo;0;L;;;;;N;;;;; +13B72;EGYPTIAN HIEROGLYPH-13B72;Lo;0;L;;;;;N;;;;; +13B73;EGYPTIAN HIEROGLYPH-13B73;Lo;0;L;;;;;N;;;;; +13B74;EGYPTIAN HIEROGLYPH-13B74;Lo;0;L;;;;;N;;;;; +13B75;EGYPTIAN HIEROGLYPH-13B75;Lo;0;L;;;;;N;;;;; +13B76;EGYPTIAN HIEROGLYPH-13B76;Lo;0;L;;;;;N;;;;; +13B77;EGYPTIAN HIEROGLYPH-13B77;Lo;0;L;;;;;N;;;;; +13B78;EGYPTIAN HIEROGLYPH-13B78;Lo;0;L;;;;;N;;;;; +13B79;EGYPTIAN HIEROGLYPH-13B79;Lo;0;L;;;;;N;;;;; +13B7A;EGYPTIAN HIEROGLYPH-13B7A;Lo;0;L;;;;;N;;;;; +13B7B;EGYPTIAN HIEROGLYPH-13B7B;Lo;0;L;;;;;N;;;;; +13B7C;EGYPTIAN HIEROGLYPH-13B7C;Lo;0;L;;;;;N;;;;; +13B7D;EGYPTIAN HIEROGLYPH-13B7D;Lo;0;L;;;;;N;;;;; +13B7E;EGYPTIAN HIEROGLYPH-13B7E;Lo;0;L;;;;;N;;;;; +13B7F;EGYPTIAN HIEROGLYPH-13B7F;Lo;0;L;;;;;N;;;;; +13B80;EGYPTIAN HIEROGLYPH-13B80;Lo;0;L;;;;;N;;;;; +13B81;EGYPTIAN HIEROGLYPH-13B81;Lo;0;L;;;;;N;;;;; +13B82;EGYPTIAN HIEROGLYPH-13B82;Lo;0;L;;;;;N;;;;; +13B83;EGYPTIAN HIEROGLYPH-13B83;Lo;0;L;;;;;N;;;;; +13B84;EGYPTIAN HIEROGLYPH-13B84;Lo;0;L;;;;;N;;;;; +13B85;EGYPTIAN HIEROGLYPH-13B85;Lo;0;L;;;;;N;;;;; +13B86;EGYPTIAN HIEROGLYPH-13B86;Lo;0;L;;;;;N;;;;; +13B87;EGYPTIAN HIEROGLYPH-13B87;Lo;0;L;;;;;N;;;;; +13B88;EGYPTIAN HIEROGLYPH-13B88;Lo;0;L;;;;;N;;;;; +13B89;EGYPTIAN HIEROGLYPH-13B89;Lo;0;L;;;;;N;;;;; +13B8A;EGYPTIAN HIEROGLYPH-13B8A;Lo;0;L;;;;;N;;;;; +13B8B;EGYPTIAN HIEROGLYPH-13B8B;Lo;0;L;;;;;N;;;;; +13B8C;EGYPTIAN HIEROGLYPH-13B8C;Lo;0;L;;;;;N;;;;; +13B8D;EGYPTIAN HIEROGLYPH-13B8D;Lo;0;L;;;;;N;;;;; +13B8E;EGYPTIAN HIEROGLYPH-13B8E;Lo;0;L;;;;;N;;;;; +13B8F;EGYPTIAN HIEROGLYPH-13B8F;Lo;0;L;;;;;N;;;;; +13B90;EGYPTIAN HIEROGLYPH-13B90;Lo;0;L;;;;;N;;;;; +13B91;EGYPTIAN HIEROGLYPH-13B91;Lo;0;L;;;;;N;;;;; +13B92;EGYPTIAN HIEROGLYPH-13B92;Lo;0;L;;;;;N;;;;; +13B93;EGYPTIAN HIEROGLYPH-13B93;Lo;0;L;;;;;N;;;;; +13B94;EGYPTIAN HIEROGLYPH-13B94;Lo;0;L;;;;;N;;;;; +13B95;EGYPTIAN HIEROGLYPH-13B95;Lo;0;L;;;;;N;;;;; +13B96;EGYPTIAN HIEROGLYPH-13B96;Lo;0;L;;;;;N;;;;; +13B97;EGYPTIAN HIEROGLYPH-13B97;Lo;0;L;;;;;N;;;;; +13B98;EGYPTIAN HIEROGLYPH-13B98;Lo;0;L;;;;;N;;;;; +13B99;EGYPTIAN HIEROGLYPH-13B99;Lo;0;L;;;;;N;;;;; +13B9A;EGYPTIAN HIEROGLYPH-13B9A;Lo;0;L;;;;;N;;;;; +13B9B;EGYPTIAN HIEROGLYPH-13B9B;Lo;0;L;;;;;N;;;;; +13B9C;EGYPTIAN HIEROGLYPH-13B9C;Lo;0;L;;;;;N;;;;; +13B9D;EGYPTIAN HIEROGLYPH-13B9D;Lo;0;L;;;;;N;;;;; +13B9E;EGYPTIAN HIEROGLYPH-13B9E;Lo;0;L;;;;;N;;;;; +13B9F;EGYPTIAN HIEROGLYPH-13B9F;Lo;0;L;;;;;N;;;;; +13BA0;EGYPTIAN HIEROGLYPH-13BA0;Lo;0;L;;;;;N;;;;; +13BA1;EGYPTIAN HIEROGLYPH-13BA1;Lo;0;L;;;;;N;;;;; +13BA2;EGYPTIAN HIEROGLYPH-13BA2;Lo;0;L;;;;;N;;;;; +13BA3;EGYPTIAN HIEROGLYPH-13BA3;Lo;0;L;;;;;N;;;;; +13BA4;EGYPTIAN HIEROGLYPH-13BA4;Lo;0;L;;;;;N;;;;; +13BA5;EGYPTIAN HIEROGLYPH-13BA5;Lo;0;L;;;;;N;;;;; +13BA6;EGYPTIAN HIEROGLYPH-13BA6;Lo;0;L;;;;;N;;;;; +13BA7;EGYPTIAN HIEROGLYPH-13BA7;Lo;0;L;;;;;N;;;;; +13BA8;EGYPTIAN HIEROGLYPH-13BA8;Lo;0;L;;;;;N;;;;; +13BA9;EGYPTIAN HIEROGLYPH-13BA9;Lo;0;L;;;;;N;;;;; +13BAA;EGYPTIAN HIEROGLYPH-13BAA;Lo;0;L;;;;;N;;;;; +13BAB;EGYPTIAN HIEROGLYPH-13BAB;Lo;0;L;;;;;N;;;;; +13BAC;EGYPTIAN HIEROGLYPH-13BAC;Lo;0;L;;;;;N;;;;; +13BAD;EGYPTIAN HIEROGLYPH-13BAD;Lo;0;L;;;;;N;;;;; +13BAE;EGYPTIAN HIEROGLYPH-13BAE;Lo;0;L;;;;;N;;;;; +13BAF;EGYPTIAN HIEROGLYPH-13BAF;Lo;0;L;;;;;N;;;;; +13BB0;EGYPTIAN HIEROGLYPH-13BB0;Lo;0;L;;;;;N;;;;; +13BB1;EGYPTIAN HIEROGLYPH-13BB1;Lo;0;L;;;;;N;;;;; +13BB2;EGYPTIAN HIEROGLYPH-13BB2;Lo;0;L;;;;;N;;;;; +13BB3;EGYPTIAN HIEROGLYPH-13BB3;Lo;0;L;;;;;N;;;;; +13BB4;EGYPTIAN HIEROGLYPH-13BB4;Lo;0;L;;;;;N;;;;; +13BB5;EGYPTIAN HIEROGLYPH-13BB5;Lo;0;L;;;;;N;;;;; +13BB6;EGYPTIAN HIEROGLYPH-13BB6;Lo;0;L;;;;;N;;;;; +13BB7;EGYPTIAN HIEROGLYPH-13BB7;Lo;0;L;;;;;N;;;;; +13BB8;EGYPTIAN HIEROGLYPH-13BB8;Lo;0;L;;;;;N;;;;; +13BB9;EGYPTIAN HIEROGLYPH-13BB9;Lo;0;L;;;;;N;;;;; +13BBA;EGYPTIAN HIEROGLYPH-13BBA;Lo;0;L;;;;;N;;;;; +13BBB;EGYPTIAN HIEROGLYPH-13BBB;Lo;0;L;;;;;N;;;;; +13BBC;EGYPTIAN HIEROGLYPH-13BBC;Lo;0;L;;;;;N;;;;; +13BBD;EGYPTIAN HIEROGLYPH-13BBD;Lo;0;L;;;;;N;;;;; +13BBE;EGYPTIAN HIEROGLYPH-13BBE;Lo;0;L;;;;;N;;;;; +13BBF;EGYPTIAN HIEROGLYPH-13BBF;Lo;0;L;;;;;N;;;;; +13BC0;EGYPTIAN HIEROGLYPH-13BC0;Lo;0;L;;;;;N;;;;; +13BC1;EGYPTIAN HIEROGLYPH-13BC1;Lo;0;L;;;;;N;;;;; +13BC2;EGYPTIAN HIEROGLYPH-13BC2;Lo;0;L;;;;;N;;;;; +13BC3;EGYPTIAN HIEROGLYPH-13BC3;Lo;0;L;;;;;N;;;;; +13BC4;EGYPTIAN HIEROGLYPH-13BC4;Lo;0;L;;;;;N;;;;; +13BC5;EGYPTIAN HIEROGLYPH-13BC5;Lo;0;L;;;;;N;;;;; +13BC6;EGYPTIAN HIEROGLYPH-13BC6;Lo;0;L;;;;;N;;;;; +13BC7;EGYPTIAN HIEROGLYPH-13BC7;Lo;0;L;;;;;N;;;;; +13BC8;EGYPTIAN HIEROGLYPH-13BC8;Lo;0;L;;;;;N;;;;; +13BC9;EGYPTIAN HIEROGLYPH-13BC9;Lo;0;L;;;;;N;;;;; +13BCA;EGYPTIAN HIEROGLYPH-13BCA;Lo;0;L;;;;;N;;;;; +13BCB;EGYPTIAN HIEROGLYPH-13BCB;Lo;0;L;;;;;N;;;;; +13BCC;EGYPTIAN HIEROGLYPH-13BCC;Lo;0;L;;;;;N;;;;; +13BCD;EGYPTIAN HIEROGLYPH-13BCD;Lo;0;L;;;;;N;;;;; +13BCE;EGYPTIAN HIEROGLYPH-13BCE;Lo;0;L;;;;;N;;;;; +13BCF;EGYPTIAN HIEROGLYPH-13BCF;Lo;0;L;;;;;N;;;;; +13BD0;EGYPTIAN HIEROGLYPH-13BD0;Lo;0;L;;;;;N;;;;; +13BD1;EGYPTIAN HIEROGLYPH-13BD1;Lo;0;L;;;;;N;;;;; +13BD2;EGYPTIAN HIEROGLYPH-13BD2;Lo;0;L;;;;;N;;;;; +13BD3;EGYPTIAN HIEROGLYPH-13BD3;Lo;0;L;;;;;N;;;;; +13BD4;EGYPTIAN HIEROGLYPH-13BD4;Lo;0;L;;;;;N;;;;; +13BD5;EGYPTIAN HIEROGLYPH-13BD5;Lo;0;L;;;;;N;;;;; +13BD6;EGYPTIAN HIEROGLYPH-13BD6;Lo;0;L;;;;;N;;;;; +13BD7;EGYPTIAN HIEROGLYPH-13BD7;Lo;0;L;;;;;N;;;;; +13BD8;EGYPTIAN HIEROGLYPH-13BD8;Lo;0;L;;;;;N;;;;; +13BD9;EGYPTIAN HIEROGLYPH-13BD9;Lo;0;L;;;;;N;;;;; +13BDA;EGYPTIAN HIEROGLYPH-13BDA;Lo;0;L;;;;;N;;;;; +13BDB;EGYPTIAN HIEROGLYPH-13BDB;Lo;0;L;;;;;N;;;;; +13BDC;EGYPTIAN HIEROGLYPH-13BDC;Lo;0;L;;;;;N;;;;; +13BDD;EGYPTIAN HIEROGLYPH-13BDD;Lo;0;L;;;;;N;;;;; +13BDE;EGYPTIAN HIEROGLYPH-13BDE;Lo;0;L;;;;;N;;;;; +13BDF;EGYPTIAN HIEROGLYPH-13BDF;Lo;0;L;;;;;N;;;;; +13BE0;EGYPTIAN HIEROGLYPH-13BE0;Lo;0;L;;;;;N;;;;; +13BE1;EGYPTIAN HIEROGLYPH-13BE1;Lo;0;L;;;;;N;;;;; +13BE2;EGYPTIAN HIEROGLYPH-13BE2;Lo;0;L;;;;;N;;;;; +13BE3;EGYPTIAN HIEROGLYPH-13BE3;Lo;0;L;;;;;N;;;;; +13BE4;EGYPTIAN HIEROGLYPH-13BE4;Lo;0;L;;;;;N;;;;; +13BE5;EGYPTIAN HIEROGLYPH-13BE5;Lo;0;L;;;;;N;;;;; +13BE6;EGYPTIAN HIEROGLYPH-13BE6;Lo;0;L;;;;;N;;;;; +13BE7;EGYPTIAN HIEROGLYPH-13BE7;Lo;0;L;;;;;N;;;;; +13BE8;EGYPTIAN HIEROGLYPH-13BE8;Lo;0;L;;;;;N;;;;; +13BE9;EGYPTIAN HIEROGLYPH-13BE9;Lo;0;L;;;;;N;;;;; +13BEA;EGYPTIAN HIEROGLYPH-13BEA;Lo;0;L;;;;;N;;;;; +13BEB;EGYPTIAN HIEROGLYPH-13BEB;Lo;0;L;;;;;N;;;;; +13BEC;EGYPTIAN HIEROGLYPH-13BEC;Lo;0;L;;;;;N;;;;; +13BED;EGYPTIAN HIEROGLYPH-13BED;Lo;0;L;;;;;N;;;;; +13BEE;EGYPTIAN HIEROGLYPH-13BEE;Lo;0;L;;;;;N;;;;; +13BEF;EGYPTIAN HIEROGLYPH-13BEF;Lo;0;L;;;;;N;;;;; +13BF0;EGYPTIAN HIEROGLYPH-13BF0;Lo;0;L;;;;;N;;;;; +13BF1;EGYPTIAN HIEROGLYPH-13BF1;Lo;0;L;;;;;N;;;;; +13BF2;EGYPTIAN HIEROGLYPH-13BF2;Lo;0;L;;;;;N;;;;; +13BF3;EGYPTIAN HIEROGLYPH-13BF3;Lo;0;L;;;;;N;;;;; +13BF4;EGYPTIAN HIEROGLYPH-13BF4;Lo;0;L;;;;;N;;;;; +13BF5;EGYPTIAN HIEROGLYPH-13BF5;Lo;0;L;;;;;N;;;;; +13BF6;EGYPTIAN HIEROGLYPH-13BF6;Lo;0;L;;;;;N;;;;; +13BF7;EGYPTIAN HIEROGLYPH-13BF7;Lo;0;L;;;;;N;;;;; +13BF8;EGYPTIAN HIEROGLYPH-13BF8;Lo;0;L;;;;;N;;;;; +13BF9;EGYPTIAN HIEROGLYPH-13BF9;Lo;0;L;;;;;N;;;;; +13BFA;EGYPTIAN HIEROGLYPH-13BFA;Lo;0;L;;;;;N;;;;; +13BFB;EGYPTIAN HIEROGLYPH-13BFB;Lo;0;L;;;;;N;;;;; +13BFC;EGYPTIAN HIEROGLYPH-13BFC;Lo;0;L;;;;;N;;;;; +13BFD;EGYPTIAN HIEROGLYPH-13BFD;Lo;0;L;;;;;N;;;;; +13BFE;EGYPTIAN HIEROGLYPH-13BFE;Lo;0;L;;;;;N;;;;; +13BFF;EGYPTIAN HIEROGLYPH-13BFF;Lo;0;L;;;;;N;;;;; +13C00;EGYPTIAN HIEROGLYPH-13C00;Lo;0;L;;;;;N;;;;; +13C01;EGYPTIAN HIEROGLYPH-13C01;Lo;0;L;;;;;N;;;;; +13C02;EGYPTIAN HIEROGLYPH-13C02;Lo;0;L;;;;;N;;;;; +13C03;EGYPTIAN HIEROGLYPH-13C03;Lo;0;L;;;;;N;;;;; +13C04;EGYPTIAN HIEROGLYPH-13C04;Lo;0;L;;;;;N;;;;; +13C05;EGYPTIAN HIEROGLYPH-13C05;Lo;0;L;;;;;N;;;;; +13C06;EGYPTIAN HIEROGLYPH-13C06;Lo;0;L;;;;;N;;;;; +13C07;EGYPTIAN HIEROGLYPH-13C07;Lo;0;L;;;;;N;;;;; +13C08;EGYPTIAN HIEROGLYPH-13C08;Lo;0;L;;;;;N;;;;; +13C09;EGYPTIAN HIEROGLYPH-13C09;Lo;0;L;;;;;N;;;;; +13C0A;EGYPTIAN HIEROGLYPH-13C0A;Lo;0;L;;;;;N;;;;; +13C0B;EGYPTIAN HIEROGLYPH-13C0B;Lo;0;L;;;;;N;;;;; +13C0C;EGYPTIAN HIEROGLYPH-13C0C;Lo;0;L;;;;;N;;;;; +13C0D;EGYPTIAN HIEROGLYPH-13C0D;Lo;0;L;;;;;N;;;;; +13C0E;EGYPTIAN HIEROGLYPH-13C0E;Lo;0;L;;;;;N;;;;; +13C0F;EGYPTIAN HIEROGLYPH-13C0F;Lo;0;L;;;;;N;;;;; +13C10;EGYPTIAN HIEROGLYPH-13C10;Lo;0;L;;;;;N;;;;; +13C11;EGYPTIAN HIEROGLYPH-13C11;Lo;0;L;;;;;N;;;;; +13C12;EGYPTIAN HIEROGLYPH-13C12;Lo;0;L;;;;;N;;;;; +13C13;EGYPTIAN HIEROGLYPH-13C13;Lo;0;L;;;;;N;;;;; +13C14;EGYPTIAN HIEROGLYPH-13C14;Lo;0;L;;;;;N;;;;; +13C15;EGYPTIAN HIEROGLYPH-13C15;Lo;0;L;;;;;N;;;;; +13C16;EGYPTIAN HIEROGLYPH-13C16;Lo;0;L;;;;;N;;;;; +13C17;EGYPTIAN HIEROGLYPH-13C17;Lo;0;L;;;;;N;;;;; +13C18;EGYPTIAN HIEROGLYPH-13C18;Lo;0;L;;;;;N;;;;; +13C19;EGYPTIAN HIEROGLYPH-13C19;Lo;0;L;;;;;N;;;;; +13C1A;EGYPTIAN HIEROGLYPH-13C1A;Lo;0;L;;;;;N;;;;; +13C1B;EGYPTIAN HIEROGLYPH-13C1B;Lo;0;L;;;;;N;;;;; +13C1C;EGYPTIAN HIEROGLYPH-13C1C;Lo;0;L;;;;;N;;;;; +13C1D;EGYPTIAN HIEROGLYPH-13C1D;Lo;0;L;;;;;N;;;;; +13C1E;EGYPTIAN HIEROGLYPH-13C1E;Lo;0;L;;;;;N;;;;; +13C1F;EGYPTIAN HIEROGLYPH-13C1F;Lo;0;L;;;;;N;;;;; +13C20;EGYPTIAN HIEROGLYPH-13C20;Lo;0;L;;;;;N;;;;; +13C21;EGYPTIAN HIEROGLYPH-13C21;Lo;0;L;;;;;N;;;;; +13C22;EGYPTIAN HIEROGLYPH-13C22;Lo;0;L;;;;;N;;;;; +13C23;EGYPTIAN HIEROGLYPH-13C23;Lo;0;L;;;;;N;;;;; +13C24;EGYPTIAN HIEROGLYPH-13C24;Lo;0;L;;;;;N;;;;; +13C25;EGYPTIAN HIEROGLYPH-13C25;Lo;0;L;;;;;N;;;;; +13C26;EGYPTIAN HIEROGLYPH-13C26;Lo;0;L;;;;;N;;;;; +13C27;EGYPTIAN HIEROGLYPH-13C27;Lo;0;L;;;;;N;;;;; +13C28;EGYPTIAN HIEROGLYPH-13C28;Lo;0;L;;;;;N;;;;; +13C29;EGYPTIAN HIEROGLYPH-13C29;Lo;0;L;;;;;N;;;;; +13C2A;EGYPTIAN HIEROGLYPH-13C2A;Lo;0;L;;;;;N;;;;; +13C2B;EGYPTIAN HIEROGLYPH-13C2B;Lo;0;L;;;;;N;;;;; +13C2C;EGYPTIAN HIEROGLYPH-13C2C;Lo;0;L;;;;;N;;;;; +13C2D;EGYPTIAN HIEROGLYPH-13C2D;Lo;0;L;;;;;N;;;;; +13C2E;EGYPTIAN HIEROGLYPH-13C2E;Lo;0;L;;;;;N;;;;; +13C2F;EGYPTIAN HIEROGLYPH-13C2F;Lo;0;L;;;;;N;;;;; +13C30;EGYPTIAN HIEROGLYPH-13C30;Lo;0;L;;;;;N;;;;; +13C31;EGYPTIAN HIEROGLYPH-13C31;Lo;0;L;;;;;N;;;;; +13C32;EGYPTIAN HIEROGLYPH-13C32;Lo;0;L;;;;;N;;;;; +13C33;EGYPTIAN HIEROGLYPH-13C33;Lo;0;L;;;;;N;;;;; +13C34;EGYPTIAN HIEROGLYPH-13C34;Lo;0;L;;;;;N;;;;; +13C35;EGYPTIAN HIEROGLYPH-13C35;Lo;0;L;;;;;N;;;;; +13C36;EGYPTIAN HIEROGLYPH-13C36;Lo;0;L;;;;;N;;;;; +13C37;EGYPTIAN HIEROGLYPH-13C37;Lo;0;L;;;;;N;;;;; +13C38;EGYPTIAN HIEROGLYPH-13C38;Lo;0;L;;;;;N;;;;; +13C39;EGYPTIAN HIEROGLYPH-13C39;Lo;0;L;;;;;N;;;;; +13C3A;EGYPTIAN HIEROGLYPH-13C3A;Lo;0;L;;;;;N;;;;; +13C3B;EGYPTIAN HIEROGLYPH-13C3B;Lo;0;L;;;;;N;;;;; +13C3C;EGYPTIAN HIEROGLYPH-13C3C;Lo;0;L;;;;;N;;;;; +13C3D;EGYPTIAN HIEROGLYPH-13C3D;Lo;0;L;;;;;N;;;;; +13C3E;EGYPTIAN HIEROGLYPH-13C3E;Lo;0;L;;;;;N;;;;; +13C3F;EGYPTIAN HIEROGLYPH-13C3F;Lo;0;L;;;;;N;;;;; +13C40;EGYPTIAN HIEROGLYPH-13C40;Lo;0;L;;;;;N;;;;; +13C41;EGYPTIAN HIEROGLYPH-13C41;Lo;0;L;;;;;N;;;;; +13C42;EGYPTIAN HIEROGLYPH-13C42;Lo;0;L;;;;;N;;;;; +13C43;EGYPTIAN HIEROGLYPH-13C43;Lo;0;L;;;;;N;;;;; +13C44;EGYPTIAN HIEROGLYPH-13C44;Lo;0;L;;;;;N;;;;; +13C45;EGYPTIAN HIEROGLYPH-13C45;Lo;0;L;;;;;N;;;;; +13C46;EGYPTIAN HIEROGLYPH-13C46;Lo;0;L;;;;;N;;;;; +13C47;EGYPTIAN HIEROGLYPH-13C47;Lo;0;L;;;;;N;;;;; +13C48;EGYPTIAN HIEROGLYPH-13C48;Lo;0;L;;;;;N;;;;; +13C49;EGYPTIAN HIEROGLYPH-13C49;Lo;0;L;;;;;N;;;;; +13C4A;EGYPTIAN HIEROGLYPH-13C4A;Lo;0;L;;;;;N;;;;; +13C4B;EGYPTIAN HIEROGLYPH-13C4B;Lo;0;L;;;;;N;;;;; +13C4C;EGYPTIAN HIEROGLYPH-13C4C;Lo;0;L;;;;;N;;;;; +13C4D;EGYPTIAN HIEROGLYPH-13C4D;Lo;0;L;;;;;N;;;;; +13C4E;EGYPTIAN HIEROGLYPH-13C4E;Lo;0;L;;;;;N;;;;; +13C4F;EGYPTIAN HIEROGLYPH-13C4F;Lo;0;L;;;;;N;;;;; +13C50;EGYPTIAN HIEROGLYPH-13C50;Lo;0;L;;;;;N;;;;; +13C51;EGYPTIAN HIEROGLYPH-13C51;Lo;0;L;;;;;N;;;;; +13C52;EGYPTIAN HIEROGLYPH-13C52;Lo;0;L;;;;;N;;;;; +13C53;EGYPTIAN HIEROGLYPH-13C53;Lo;0;L;;;;;N;;;;; +13C54;EGYPTIAN HIEROGLYPH-13C54;Lo;0;L;;;;;N;;;;; +13C55;EGYPTIAN HIEROGLYPH-13C55;Lo;0;L;;;;;N;;;;; +13C56;EGYPTIAN HIEROGLYPH-13C56;Lo;0;L;;;;;N;;;;; +13C57;EGYPTIAN HIEROGLYPH-13C57;Lo;0;L;;;;;N;;;;; +13C58;EGYPTIAN HIEROGLYPH-13C58;Lo;0;L;;;;;N;;;;; +13C59;EGYPTIAN HIEROGLYPH-13C59;Lo;0;L;;;;;N;;;;; +13C5A;EGYPTIAN HIEROGLYPH-13C5A;Lo;0;L;;;;;N;;;;; +13C5B;EGYPTIAN HIEROGLYPH-13C5B;Lo;0;L;;;;;N;;;;; +13C5C;EGYPTIAN HIEROGLYPH-13C5C;Lo;0;L;;;;;N;;;;; +13C5D;EGYPTIAN HIEROGLYPH-13C5D;Lo;0;L;;;;;N;;;;; +13C5E;EGYPTIAN HIEROGLYPH-13C5E;Lo;0;L;;;;;N;;;;; +13C5F;EGYPTIAN HIEROGLYPH-13C5F;Lo;0;L;;;;;N;;;;; +13C60;EGYPTIAN HIEROGLYPH-13C60;Lo;0;L;;;;;N;;;;; +13C61;EGYPTIAN HIEROGLYPH-13C61;Lo;0;L;;;;;N;;;;; +13C62;EGYPTIAN HIEROGLYPH-13C62;Lo;0;L;;;;;N;;;;; +13C63;EGYPTIAN HIEROGLYPH-13C63;Lo;0;L;;;;;N;;;;; +13C64;EGYPTIAN HIEROGLYPH-13C64;Lo;0;L;;;;;N;;;;; +13C65;EGYPTIAN HIEROGLYPH-13C65;Lo;0;L;;;;;N;;;;; +13C66;EGYPTIAN HIEROGLYPH-13C66;Lo;0;L;;;;;N;;;;; +13C67;EGYPTIAN HIEROGLYPH-13C67;Lo;0;L;;;;;N;;;;; +13C68;EGYPTIAN HIEROGLYPH-13C68;Lo;0;L;;;;;N;;;;; +13C69;EGYPTIAN HIEROGLYPH-13C69;Lo;0;L;;;;;N;;;;; +13C6A;EGYPTIAN HIEROGLYPH-13C6A;Lo;0;L;;;;;N;;;;; +13C6B;EGYPTIAN HIEROGLYPH-13C6B;Lo;0;L;;;;;N;;;;; +13C6C;EGYPTIAN HIEROGLYPH-13C6C;Lo;0;L;;;;;N;;;;; +13C6D;EGYPTIAN HIEROGLYPH-13C6D;Lo;0;L;;;;;N;;;;; +13C6E;EGYPTIAN HIEROGLYPH-13C6E;Lo;0;L;;;;;N;;;;; +13C6F;EGYPTIAN HIEROGLYPH-13C6F;Lo;0;L;;;;;N;;;;; +13C70;EGYPTIAN HIEROGLYPH-13C70;Lo;0;L;;;;;N;;;;; +13C71;EGYPTIAN HIEROGLYPH-13C71;Lo;0;L;;;;;N;;;;; +13C72;EGYPTIAN HIEROGLYPH-13C72;Lo;0;L;;;;;N;;;;; +13C73;EGYPTIAN HIEROGLYPH-13C73;Lo;0;L;;;;;N;;;;; +13C74;EGYPTIAN HIEROGLYPH-13C74;Lo;0;L;;;;;N;;;;; +13C75;EGYPTIAN HIEROGLYPH-13C75;Lo;0;L;;;;;N;;;;; +13C76;EGYPTIAN HIEROGLYPH-13C76;Lo;0;L;;;;;N;;;;; +13C77;EGYPTIAN HIEROGLYPH-13C77;Lo;0;L;;;;;N;;;;; +13C78;EGYPTIAN HIEROGLYPH-13C78;Lo;0;L;;;;;N;;;;; +13C79;EGYPTIAN HIEROGLYPH-13C79;Lo;0;L;;;;;N;;;;; +13C7A;EGYPTIAN HIEROGLYPH-13C7A;Lo;0;L;;;;;N;;;;; +13C7B;EGYPTIAN HIEROGLYPH-13C7B;Lo;0;L;;;;;N;;;;; +13C7C;EGYPTIAN HIEROGLYPH-13C7C;Lo;0;L;;;;;N;;;;; +13C7D;EGYPTIAN HIEROGLYPH-13C7D;Lo;0;L;;;;;N;;;;; +13C7E;EGYPTIAN HIEROGLYPH-13C7E;Lo;0;L;;;;;N;;;;; +13C7F;EGYPTIAN HIEROGLYPH-13C7F;Lo;0;L;;;;;N;;;;; +13C80;EGYPTIAN HIEROGLYPH-13C80;Lo;0;L;;;;;N;;;;; +13C81;EGYPTIAN HIEROGLYPH-13C81;Lo;0;L;;;;;N;;;;; +13C82;EGYPTIAN HIEROGLYPH-13C82;Lo;0;L;;;;;N;;;;; +13C83;EGYPTIAN HIEROGLYPH-13C83;Lo;0;L;;;;;N;;;;; +13C84;EGYPTIAN HIEROGLYPH-13C84;Lo;0;L;;;;;N;;;;; +13C85;EGYPTIAN HIEROGLYPH-13C85;Lo;0;L;;;;;N;;;;; +13C86;EGYPTIAN HIEROGLYPH-13C86;Lo;0;L;;;;;N;;;;; +13C87;EGYPTIAN HIEROGLYPH-13C87;Lo;0;L;;;;;N;;;;; +13C88;EGYPTIAN HIEROGLYPH-13C88;Lo;0;L;;;;;N;;;;; +13C89;EGYPTIAN HIEROGLYPH-13C89;Lo;0;L;;;;;N;;;;; +13C8A;EGYPTIAN HIEROGLYPH-13C8A;Lo;0;L;;;;;N;;;;; +13C8B;EGYPTIAN HIEROGLYPH-13C8B;Lo;0;L;;;;;N;;;;; +13C8C;EGYPTIAN HIEROGLYPH-13C8C;Lo;0;L;;;;;N;;;;; +13C8D;EGYPTIAN HIEROGLYPH-13C8D;Lo;0;L;;;;;N;;;;; +13C8E;EGYPTIAN HIEROGLYPH-13C8E;Lo;0;L;;;;;N;;;;; +13C8F;EGYPTIAN HIEROGLYPH-13C8F;Lo;0;L;;;;;N;;;;; +13C90;EGYPTIAN HIEROGLYPH-13C90;Lo;0;L;;;;;N;;;;; +13C91;EGYPTIAN HIEROGLYPH-13C91;Lo;0;L;;;;;N;;;;; +13C92;EGYPTIAN HIEROGLYPH-13C92;Lo;0;L;;;;;N;;;;; +13C93;EGYPTIAN HIEROGLYPH-13C93;Lo;0;L;;;;;N;;;;; +13C94;EGYPTIAN HIEROGLYPH-13C94;Lo;0;L;;;;;N;;;;; +13C95;EGYPTIAN HIEROGLYPH-13C95;Lo;0;L;;;;;N;;;;; +13C96;EGYPTIAN HIEROGLYPH-13C96;Lo;0;L;;;;;N;;;;; +13C97;EGYPTIAN HIEROGLYPH-13C97;Lo;0;L;;;;;N;;;;; +13C98;EGYPTIAN HIEROGLYPH-13C98;Lo;0;L;;;;;N;;;;; +13C99;EGYPTIAN HIEROGLYPH-13C99;Lo;0;L;;;;;N;;;;; +13C9A;EGYPTIAN HIEROGLYPH-13C9A;Lo;0;L;;;;;N;;;;; +13C9B;EGYPTIAN HIEROGLYPH-13C9B;Lo;0;L;;;;;N;;;;; +13C9C;EGYPTIAN HIEROGLYPH-13C9C;Lo;0;L;;;;;N;;;;; +13C9D;EGYPTIAN HIEROGLYPH-13C9D;Lo;0;L;;;;;N;;;;; +13C9E;EGYPTIAN HIEROGLYPH-13C9E;Lo;0;L;;;;;N;;;;; +13C9F;EGYPTIAN HIEROGLYPH-13C9F;Lo;0;L;;;;;N;;;;; +13CA0;EGYPTIAN HIEROGLYPH-13CA0;Lo;0;L;;;;;N;;;;; +13CA1;EGYPTIAN HIEROGLYPH-13CA1;Lo;0;L;;;;;N;;;;; +13CA2;EGYPTIAN HIEROGLYPH-13CA2;Lo;0;L;;;;;N;;;;; +13CA3;EGYPTIAN HIEROGLYPH-13CA3;Lo;0;L;;;;;N;;;;; +13CA4;EGYPTIAN HIEROGLYPH-13CA4;Lo;0;L;;;;;N;;;;; +13CA5;EGYPTIAN HIEROGLYPH-13CA5;Lo;0;L;;;;;N;;;;; +13CA6;EGYPTIAN HIEROGLYPH-13CA6;Lo;0;L;;;;;N;;;;; +13CA7;EGYPTIAN HIEROGLYPH-13CA7;Lo;0;L;;;;;N;;;;; +13CA8;EGYPTIAN HIEROGLYPH-13CA8;Lo;0;L;;;;;N;;;;; +13CA9;EGYPTIAN HIEROGLYPH-13CA9;Lo;0;L;;;;;N;;;;; +13CAA;EGYPTIAN HIEROGLYPH-13CAA;Lo;0;L;;;;;N;;;;; +13CAB;EGYPTIAN HIEROGLYPH-13CAB;Lo;0;L;;;;;N;;;;; +13CAC;EGYPTIAN HIEROGLYPH-13CAC;Lo;0;L;;;;;N;;;;; +13CAD;EGYPTIAN HIEROGLYPH-13CAD;Lo;0;L;;;;;N;;;;; +13CAE;EGYPTIAN HIEROGLYPH-13CAE;Lo;0;L;;;;;N;;;;; +13CAF;EGYPTIAN HIEROGLYPH-13CAF;Lo;0;L;;;;;N;;;;; +13CB0;EGYPTIAN HIEROGLYPH-13CB0;Lo;0;L;;;;;N;;;;; +13CB1;EGYPTIAN HIEROGLYPH-13CB1;Lo;0;L;;;;;N;;;;; +13CB2;EGYPTIAN HIEROGLYPH-13CB2;Lo;0;L;;;;;N;;;;; +13CB3;EGYPTIAN HIEROGLYPH-13CB3;Lo;0;L;;;;;N;;;;; +13CB4;EGYPTIAN HIEROGLYPH-13CB4;Lo;0;L;;;;;N;;;;; +13CB5;EGYPTIAN HIEROGLYPH-13CB5;Lo;0;L;;;;;N;;;;; +13CB6;EGYPTIAN HIEROGLYPH-13CB6;Lo;0;L;;;;;N;;;;; +13CB7;EGYPTIAN HIEROGLYPH-13CB7;Lo;0;L;;;;;N;;;;; +13CB8;EGYPTIAN HIEROGLYPH-13CB8;Lo;0;L;;;;;N;;;;; +13CB9;EGYPTIAN HIEROGLYPH-13CB9;Lo;0;L;;;;;N;;;;; +13CBA;EGYPTIAN HIEROGLYPH-13CBA;Lo;0;L;;;;;N;;;;; +13CBB;EGYPTIAN HIEROGLYPH-13CBB;Lo;0;L;;;;;N;;;;; +13CBC;EGYPTIAN HIEROGLYPH-13CBC;Lo;0;L;;;;;N;;;;; +13CBD;EGYPTIAN HIEROGLYPH-13CBD;Lo;0;L;;;;;N;;;;; +13CBE;EGYPTIAN HIEROGLYPH-13CBE;Lo;0;L;;;;;N;;;;; +13CBF;EGYPTIAN HIEROGLYPH-13CBF;Lo;0;L;;;;;N;;;;; +13CC0;EGYPTIAN HIEROGLYPH-13CC0;Lo;0;L;;;;;N;;;;; +13CC1;EGYPTIAN HIEROGLYPH-13CC1;Lo;0;L;;;;;N;;;;; +13CC2;EGYPTIAN HIEROGLYPH-13CC2;Lo;0;L;;;;;N;;;;; +13CC3;EGYPTIAN HIEROGLYPH-13CC3;Lo;0;L;;;;;N;;;;; +13CC4;EGYPTIAN HIEROGLYPH-13CC4;Lo;0;L;;;;;N;;;;; +13CC5;EGYPTIAN HIEROGLYPH-13CC5;Lo;0;L;;;;;N;;;;; +13CC6;EGYPTIAN HIEROGLYPH-13CC6;Lo;0;L;;;;;N;;;;; +13CC7;EGYPTIAN HIEROGLYPH-13CC7;Lo;0;L;;;;;N;;;;; +13CC8;EGYPTIAN HIEROGLYPH-13CC8;Lo;0;L;;;;;N;;;;; +13CC9;EGYPTIAN HIEROGLYPH-13CC9;Lo;0;L;;;;;N;;;;; +13CCA;EGYPTIAN HIEROGLYPH-13CCA;Lo;0;L;;;;;N;;;;; +13CCB;EGYPTIAN HIEROGLYPH-13CCB;Lo;0;L;;;;;N;;;;; +13CCC;EGYPTIAN HIEROGLYPH-13CCC;Lo;0;L;;;;;N;;;;; +13CCD;EGYPTIAN HIEROGLYPH-13CCD;Lo;0;L;;;;;N;;;;; +13CCE;EGYPTIAN HIEROGLYPH-13CCE;Lo;0;L;;;;;N;;;;; +13CCF;EGYPTIAN HIEROGLYPH-13CCF;Lo;0;L;;;;;N;;;;; +13CD0;EGYPTIAN HIEROGLYPH-13CD0;Lo;0;L;;;;;N;;;;; +13CD1;EGYPTIAN HIEROGLYPH-13CD1;Lo;0;L;;;;;N;;;;; +13CD2;EGYPTIAN HIEROGLYPH-13CD2;Lo;0;L;;;;;N;;;;; +13CD3;EGYPTIAN HIEROGLYPH-13CD3;Lo;0;L;;;;;N;;;;; +13CD4;EGYPTIAN HIEROGLYPH-13CD4;Lo;0;L;;;;;N;;;;; +13CD5;EGYPTIAN HIEROGLYPH-13CD5;Lo;0;L;;;;;N;;;;; +13CD6;EGYPTIAN HIEROGLYPH-13CD6;Lo;0;L;;;;;N;;;;; +13CD7;EGYPTIAN HIEROGLYPH-13CD7;Lo;0;L;;;;;N;;;;; +13CD8;EGYPTIAN HIEROGLYPH-13CD8;Lo;0;L;;;;;N;;;;; +13CD9;EGYPTIAN HIEROGLYPH-13CD9;Lo;0;L;;;;;N;;;;; +13CDA;EGYPTIAN HIEROGLYPH-13CDA;Lo;0;L;;;;;N;;;;; +13CDB;EGYPTIAN HIEROGLYPH-13CDB;Lo;0;L;;;;;N;;;;; +13CDC;EGYPTIAN HIEROGLYPH-13CDC;Lo;0;L;;;;;N;;;;; +13CDD;EGYPTIAN HIEROGLYPH-13CDD;Lo;0;L;;;;;N;;;;; +13CDE;EGYPTIAN HIEROGLYPH-13CDE;Lo;0;L;;;;;N;;;;; +13CDF;EGYPTIAN HIEROGLYPH-13CDF;Lo;0;L;;;;;N;;;;; +13CE0;EGYPTIAN HIEROGLYPH-13CE0;Lo;0;L;;;;;N;;;;; +13CE1;EGYPTIAN HIEROGLYPH-13CE1;Lo;0;L;;;;;N;;;;; +13CE2;EGYPTIAN HIEROGLYPH-13CE2;Lo;0;L;;;;;N;;;;; +13CE3;EGYPTIAN HIEROGLYPH-13CE3;Lo;0;L;;;;;N;;;;; +13CE4;EGYPTIAN HIEROGLYPH-13CE4;Lo;0;L;;;;;N;;;;; +13CE5;EGYPTIAN HIEROGLYPH-13CE5;Lo;0;L;;;;;N;;;;; +13CE6;EGYPTIAN HIEROGLYPH-13CE6;Lo;0;L;;;;;N;;;;; +13CE7;EGYPTIAN HIEROGLYPH-13CE7;Lo;0;L;;;;;N;;;;; +13CE8;EGYPTIAN HIEROGLYPH-13CE8;Lo;0;L;;;;;N;;;;; +13CE9;EGYPTIAN HIEROGLYPH-13CE9;Lo;0;L;;;;;N;;;;; +13CEA;EGYPTIAN HIEROGLYPH-13CEA;Lo;0;L;;;;;N;;;;; +13CEB;EGYPTIAN HIEROGLYPH-13CEB;Lo;0;L;;;;;N;;;;; +13CEC;EGYPTIAN HIEROGLYPH-13CEC;Lo;0;L;;;;;N;;;;; +13CED;EGYPTIAN HIEROGLYPH-13CED;Lo;0;L;;;;;N;;;;; +13CEE;EGYPTIAN HIEROGLYPH-13CEE;Lo;0;L;;;;;N;;;;; +13CEF;EGYPTIAN HIEROGLYPH-13CEF;Lo;0;L;;;;;N;;;;; +13CF0;EGYPTIAN HIEROGLYPH-13CF0;Lo;0;L;;;;;N;;;;; +13CF1;EGYPTIAN HIEROGLYPH-13CF1;Lo;0;L;;;;;N;;;;; +13CF2;EGYPTIAN HIEROGLYPH-13CF2;Lo;0;L;;;;;N;;;;; +13CF3;EGYPTIAN HIEROGLYPH-13CF3;Lo;0;L;;;;;N;;;;; +13CF4;EGYPTIAN HIEROGLYPH-13CF4;Lo;0;L;;;;;N;;;;; +13CF5;EGYPTIAN HIEROGLYPH-13CF5;Lo;0;L;;;;;N;;;;; +13CF6;EGYPTIAN HIEROGLYPH-13CF6;Lo;0;L;;;;;N;;;;; +13CF7;EGYPTIAN HIEROGLYPH-13CF7;Lo;0;L;;;;;N;;;;; +13CF8;EGYPTIAN HIEROGLYPH-13CF8;Lo;0;L;;;;;N;;;;; +13CF9;EGYPTIAN HIEROGLYPH-13CF9;Lo;0;L;;;;;N;;;;; +13CFA;EGYPTIAN HIEROGLYPH-13CFA;Lo;0;L;;;;;N;;;;; +13CFB;EGYPTIAN HIEROGLYPH-13CFB;Lo;0;L;;;;;N;;;;; +13CFC;EGYPTIAN HIEROGLYPH-13CFC;Lo;0;L;;;;;N;;;;; +13CFD;EGYPTIAN HIEROGLYPH-13CFD;Lo;0;L;;;;;N;;;;; +13CFE;EGYPTIAN HIEROGLYPH-13CFE;Lo;0;L;;;;;N;;;;; +13CFF;EGYPTIAN HIEROGLYPH-13CFF;Lo;0;L;;;;;N;;;;; +13D00;EGYPTIAN HIEROGLYPH-13D00;Lo;0;L;;;;;N;;;;; +13D01;EGYPTIAN HIEROGLYPH-13D01;Lo;0;L;;;;;N;;;;; +13D02;EGYPTIAN HIEROGLYPH-13D02;Lo;0;L;;;;;N;;;;; +13D03;EGYPTIAN HIEROGLYPH-13D03;Lo;0;L;;;;;N;;;;; +13D04;EGYPTIAN HIEROGLYPH-13D04;Lo;0;L;;;;;N;;;;; +13D05;EGYPTIAN HIEROGLYPH-13D05;Lo;0;L;;;;;N;;;;; +13D06;EGYPTIAN HIEROGLYPH-13D06;Lo;0;L;;;;;N;;;;; +13D07;EGYPTIAN HIEROGLYPH-13D07;Lo;0;L;;;;;N;;;;; +13D08;EGYPTIAN HIEROGLYPH-13D08;Lo;0;L;;;;;N;;;;; +13D09;EGYPTIAN HIEROGLYPH-13D09;Lo;0;L;;;;;N;;;;; +13D0A;EGYPTIAN HIEROGLYPH-13D0A;Lo;0;L;;;;;N;;;;; +13D0B;EGYPTIAN HIEROGLYPH-13D0B;Lo;0;L;;;;;N;;;;; +13D0C;EGYPTIAN HIEROGLYPH-13D0C;Lo;0;L;;;;;N;;;;; +13D0D;EGYPTIAN HIEROGLYPH-13D0D;Lo;0;L;;;;;N;;;;; +13D0E;EGYPTIAN HIEROGLYPH-13D0E;Lo;0;L;;;;;N;;;;; +13D0F;EGYPTIAN HIEROGLYPH-13D0F;Lo;0;L;;;;;N;;;;; +13D10;EGYPTIAN HIEROGLYPH-13D10;Lo;0;L;;;;;N;;;;; +13D11;EGYPTIAN HIEROGLYPH-13D11;Lo;0;L;;;;;N;;;;; +13D12;EGYPTIAN HIEROGLYPH-13D12;Lo;0;L;;;;;N;;;;; +13D13;EGYPTIAN HIEROGLYPH-13D13;Lo;0;L;;;;;N;;;;; +13D14;EGYPTIAN HIEROGLYPH-13D14;Lo;0;L;;;;;N;;;;; +13D15;EGYPTIAN HIEROGLYPH-13D15;Lo;0;L;;;;;N;;;;; +13D16;EGYPTIAN HIEROGLYPH-13D16;Lo;0;L;;;;;N;;;;; +13D17;EGYPTIAN HIEROGLYPH-13D17;Lo;0;L;;;;;N;;;;; +13D18;EGYPTIAN HIEROGLYPH-13D18;Lo;0;L;;;;;N;;;;; +13D19;EGYPTIAN HIEROGLYPH-13D19;Lo;0;L;;;;;N;;;;; +13D1A;EGYPTIAN HIEROGLYPH-13D1A;Lo;0;L;;;;;N;;;;; +13D1B;EGYPTIAN HIEROGLYPH-13D1B;Lo;0;L;;;;;N;;;;; +13D1C;EGYPTIAN HIEROGLYPH-13D1C;Lo;0;L;;;;;N;;;;; +13D1D;EGYPTIAN HIEROGLYPH-13D1D;Lo;0;L;;;;;N;;;;; +13D1E;EGYPTIAN HIEROGLYPH-13D1E;Lo;0;L;;;;;N;;;;; +13D1F;EGYPTIAN HIEROGLYPH-13D1F;Lo;0;L;;;;;N;;;;; +13D20;EGYPTIAN HIEROGLYPH-13D20;Lo;0;L;;;;;N;;;;; +13D21;EGYPTIAN HIEROGLYPH-13D21;Lo;0;L;;;;;N;;;;; +13D22;EGYPTIAN HIEROGLYPH-13D22;Lo;0;L;;;;;N;;;;; +13D23;EGYPTIAN HIEROGLYPH-13D23;Lo;0;L;;;;;N;;;;; +13D24;EGYPTIAN HIEROGLYPH-13D24;Lo;0;L;;;;;N;;;;; +13D25;EGYPTIAN HIEROGLYPH-13D25;Lo;0;L;;;;;N;;;;; +13D26;EGYPTIAN HIEROGLYPH-13D26;Lo;0;L;;;;;N;;;;; +13D27;EGYPTIAN HIEROGLYPH-13D27;Lo;0;L;;;;;N;;;;; +13D28;EGYPTIAN HIEROGLYPH-13D28;Lo;0;L;;;;;N;;;;; +13D29;EGYPTIAN HIEROGLYPH-13D29;Lo;0;L;;;;;N;;;;; +13D2A;EGYPTIAN HIEROGLYPH-13D2A;Lo;0;L;;;;;N;;;;; +13D2B;EGYPTIAN HIEROGLYPH-13D2B;Lo;0;L;;;;;N;;;;; +13D2C;EGYPTIAN HIEROGLYPH-13D2C;Lo;0;L;;;;;N;;;;; +13D2D;EGYPTIAN HIEROGLYPH-13D2D;Lo;0;L;;;;;N;;;;; +13D2E;EGYPTIAN HIEROGLYPH-13D2E;Lo;0;L;;;;;N;;;;; +13D2F;EGYPTIAN HIEROGLYPH-13D2F;Lo;0;L;;;;;N;;;;; +13D30;EGYPTIAN HIEROGLYPH-13D30;Lo;0;L;;;;;N;;;;; +13D31;EGYPTIAN HIEROGLYPH-13D31;Lo;0;L;;;;;N;;;;; +13D32;EGYPTIAN HIEROGLYPH-13D32;Lo;0;L;;;;;N;;;;; +13D33;EGYPTIAN HIEROGLYPH-13D33;Lo;0;L;;;;;N;;;;; +13D34;EGYPTIAN HIEROGLYPH-13D34;Lo;0;L;;;;;N;;;;; +13D35;EGYPTIAN HIEROGLYPH-13D35;Lo;0;L;;;;;N;;;;; +13D36;EGYPTIAN HIEROGLYPH-13D36;Lo;0;L;;;;;N;;;;; +13D37;EGYPTIAN HIEROGLYPH-13D37;Lo;0;L;;;;;N;;;;; +13D38;EGYPTIAN HIEROGLYPH-13D38;Lo;0;L;;;;;N;;;;; +13D39;EGYPTIAN HIEROGLYPH-13D39;Lo;0;L;;;;;N;;;;; +13D3A;EGYPTIAN HIEROGLYPH-13D3A;Lo;0;L;;;;;N;;;;; +13D3B;EGYPTIAN HIEROGLYPH-13D3B;Lo;0;L;;;;;N;;;;; +13D3C;EGYPTIAN HIEROGLYPH-13D3C;Lo;0;L;;;;;N;;;;; +13D3D;EGYPTIAN HIEROGLYPH-13D3D;Lo;0;L;;;;;N;;;;; +13D3E;EGYPTIAN HIEROGLYPH-13D3E;Lo;0;L;;;;;N;;;;; +13D3F;EGYPTIAN HIEROGLYPH-13D3F;Lo;0;L;;;;;N;;;;; +13D40;EGYPTIAN HIEROGLYPH-13D40;Lo;0;L;;;;;N;;;;; +13D41;EGYPTIAN HIEROGLYPH-13D41;Lo;0;L;;;;;N;;;;; +13D42;EGYPTIAN HIEROGLYPH-13D42;Lo;0;L;;;;;N;;;;; +13D43;EGYPTIAN HIEROGLYPH-13D43;Lo;0;L;;;;;N;;;;; +13D44;EGYPTIAN HIEROGLYPH-13D44;Lo;0;L;;;;;N;;;;; +13D45;EGYPTIAN HIEROGLYPH-13D45;Lo;0;L;;;;;N;;;;; +13D46;EGYPTIAN HIEROGLYPH-13D46;Lo;0;L;;;;;N;;;;; +13D47;EGYPTIAN HIEROGLYPH-13D47;Lo;0;L;;;;;N;;;;; +13D48;EGYPTIAN HIEROGLYPH-13D48;Lo;0;L;;;;;N;;;;; +13D49;EGYPTIAN HIEROGLYPH-13D49;Lo;0;L;;;;;N;;;;; +13D4A;EGYPTIAN HIEROGLYPH-13D4A;Lo;0;L;;;;;N;;;;; +13D4B;EGYPTIAN HIEROGLYPH-13D4B;Lo;0;L;;;;;N;;;;; +13D4C;EGYPTIAN HIEROGLYPH-13D4C;Lo;0;L;;;;;N;;;;; +13D4D;EGYPTIAN HIEROGLYPH-13D4D;Lo;0;L;;;;;N;;;;; +13D4E;EGYPTIAN HIEROGLYPH-13D4E;Lo;0;L;;;;;N;;;;; +13D4F;EGYPTIAN HIEROGLYPH-13D4F;Lo;0;L;;;;;N;;;;; +13D50;EGYPTIAN HIEROGLYPH-13D50;Lo;0;L;;;;;N;;;;; +13D51;EGYPTIAN HIEROGLYPH-13D51;Lo;0;L;;;;;N;;;;; +13D52;EGYPTIAN HIEROGLYPH-13D52;Lo;0;L;;;;;N;;;;; +13D53;EGYPTIAN HIEROGLYPH-13D53;Lo;0;L;;;;;N;;;;; +13D54;EGYPTIAN HIEROGLYPH-13D54;Lo;0;L;;;;;N;;;;; +13D55;EGYPTIAN HIEROGLYPH-13D55;Lo;0;L;;;;;N;;;;; +13D56;EGYPTIAN HIEROGLYPH-13D56;Lo;0;L;;;;;N;;;;; +13D57;EGYPTIAN HIEROGLYPH-13D57;Lo;0;L;;;;;N;;;;; +13D58;EGYPTIAN HIEROGLYPH-13D58;Lo;0;L;;;;;N;;;;; +13D59;EGYPTIAN HIEROGLYPH-13D59;Lo;0;L;;;;;N;;;;; +13D5A;EGYPTIAN HIEROGLYPH-13D5A;Lo;0;L;;;;;N;;;;; +13D5B;EGYPTIAN HIEROGLYPH-13D5B;Lo;0;L;;;;;N;;;;; +13D5C;EGYPTIAN HIEROGLYPH-13D5C;Lo;0;L;;;;;N;;;;; +13D5D;EGYPTIAN HIEROGLYPH-13D5D;Lo;0;L;;;;;N;;;;; +13D5E;EGYPTIAN HIEROGLYPH-13D5E;Lo;0;L;;;;;N;;;;; +13D5F;EGYPTIAN HIEROGLYPH-13D5F;Lo;0;L;;;;;N;;;;; +13D60;EGYPTIAN HIEROGLYPH-13D60;Lo;0;L;;;;;N;;;;; +13D61;EGYPTIAN HIEROGLYPH-13D61;Lo;0;L;;;;;N;;;;; +13D62;EGYPTIAN HIEROGLYPH-13D62;Lo;0;L;;;;;N;;;;; +13D63;EGYPTIAN HIEROGLYPH-13D63;Lo;0;L;;;;;N;;;;; +13D64;EGYPTIAN HIEROGLYPH-13D64;Lo;0;L;;;;;N;;;;; +13D65;EGYPTIAN HIEROGLYPH-13D65;Lo;0;L;;;;;N;;;;; +13D66;EGYPTIAN HIEROGLYPH-13D66;Lo;0;L;;;;;N;;;;; +13D67;EGYPTIAN HIEROGLYPH-13D67;Lo;0;L;;;;;N;;;;; +13D68;EGYPTIAN HIEROGLYPH-13D68;Lo;0;L;;;;;N;;;;; +13D69;EGYPTIAN HIEROGLYPH-13D69;Lo;0;L;;;;;N;;;;; +13D6A;EGYPTIAN HIEROGLYPH-13D6A;Lo;0;L;;;;;N;;;;; +13D6B;EGYPTIAN HIEROGLYPH-13D6B;Lo;0;L;;;;;N;;;;; +13D6C;EGYPTIAN HIEROGLYPH-13D6C;Lo;0;L;;;;;N;;;;; +13D6D;EGYPTIAN HIEROGLYPH-13D6D;Lo;0;L;;;;;N;;;;; +13D6E;EGYPTIAN HIEROGLYPH-13D6E;Lo;0;L;;;;;N;;;;; +13D6F;EGYPTIAN HIEROGLYPH-13D6F;Lo;0;L;;;;;N;;;;; +13D70;EGYPTIAN HIEROGLYPH-13D70;Lo;0;L;;;;;N;;;;; +13D71;EGYPTIAN HIEROGLYPH-13D71;Lo;0;L;;;;;N;;;;; +13D72;EGYPTIAN HIEROGLYPH-13D72;Lo;0;L;;;;;N;;;;; +13D73;EGYPTIAN HIEROGLYPH-13D73;Lo;0;L;;;;;N;;;;; +13D74;EGYPTIAN HIEROGLYPH-13D74;Lo;0;L;;;;;N;;;;; +13D75;EGYPTIAN HIEROGLYPH-13D75;Lo;0;L;;;;;N;;;;; +13D76;EGYPTIAN HIEROGLYPH-13D76;Lo;0;L;;;;;N;;;;; +13D77;EGYPTIAN HIEROGLYPH-13D77;Lo;0;L;;;;;N;;;;; +13D78;EGYPTIAN HIEROGLYPH-13D78;Lo;0;L;;;;;N;;;;; +13D79;EGYPTIAN HIEROGLYPH-13D79;Lo;0;L;;;;;N;;;;; +13D7A;EGYPTIAN HIEROGLYPH-13D7A;Lo;0;L;;;;;N;;;;; +13D7B;EGYPTIAN HIEROGLYPH-13D7B;Lo;0;L;;;;;N;;;;; +13D7C;EGYPTIAN HIEROGLYPH-13D7C;Lo;0;L;;;;;N;;;;; +13D7D;EGYPTIAN HIEROGLYPH-13D7D;Lo;0;L;;;;;N;;;;; +13D7E;EGYPTIAN HIEROGLYPH-13D7E;Lo;0;L;;;;;N;;;;; +13D7F;EGYPTIAN HIEROGLYPH-13D7F;Lo;0;L;;;;;N;;;;; +13D80;EGYPTIAN HIEROGLYPH-13D80;Lo;0;L;;;;;N;;;;; +13D81;EGYPTIAN HIEROGLYPH-13D81;Lo;0;L;;;;;N;;;;; +13D82;EGYPTIAN HIEROGLYPH-13D82;Lo;0;L;;;;;N;;;;; +13D83;EGYPTIAN HIEROGLYPH-13D83;Lo;0;L;;;;;N;;;;; +13D84;EGYPTIAN HIEROGLYPH-13D84;Lo;0;L;;;;;N;;;;; +13D85;EGYPTIAN HIEROGLYPH-13D85;Lo;0;L;;;;;N;;;;; +13D86;EGYPTIAN HIEROGLYPH-13D86;Lo;0;L;;;;;N;;;;; +13D87;EGYPTIAN HIEROGLYPH-13D87;Lo;0;L;;;;;N;;;;; +13D88;EGYPTIAN HIEROGLYPH-13D88;Lo;0;L;;;;;N;;;;; +13D89;EGYPTIAN HIEROGLYPH-13D89;Lo;0;L;;;;;N;;;;; +13D8A;EGYPTIAN HIEROGLYPH-13D8A;Lo;0;L;;;;;N;;;;; +13D8B;EGYPTIAN HIEROGLYPH-13D8B;Lo;0;L;;;;;N;;;;; +13D8C;EGYPTIAN HIEROGLYPH-13D8C;Lo;0;L;;;;;N;;;;; +13D8D;EGYPTIAN HIEROGLYPH-13D8D;Lo;0;L;;;;;N;;;;; +13D8E;EGYPTIAN HIEROGLYPH-13D8E;Lo;0;L;;;;;N;;;;; +13D8F;EGYPTIAN HIEROGLYPH-13D8F;Lo;0;L;;;;;N;;;;; +13D90;EGYPTIAN HIEROGLYPH-13D90;Lo;0;L;;;;;N;;;;; +13D91;EGYPTIAN HIEROGLYPH-13D91;Lo;0;L;;;;;N;;;;; +13D92;EGYPTIAN HIEROGLYPH-13D92;Lo;0;L;;;;;N;;;;; +13D93;EGYPTIAN HIEROGLYPH-13D93;Lo;0;L;;;;;N;;;;; +13D94;EGYPTIAN HIEROGLYPH-13D94;Lo;0;L;;;;;N;;;;; +13D95;EGYPTIAN HIEROGLYPH-13D95;Lo;0;L;;;;;N;;;;; +13D96;EGYPTIAN HIEROGLYPH-13D96;Lo;0;L;;;;;N;;;;; +13D97;EGYPTIAN HIEROGLYPH-13D97;Lo;0;L;;;;;N;;;;; +13D98;EGYPTIAN HIEROGLYPH-13D98;Lo;0;L;;;;;N;;;;; +13D99;EGYPTIAN HIEROGLYPH-13D99;Lo;0;L;;;;;N;;;;; +13D9A;EGYPTIAN HIEROGLYPH-13D9A;Lo;0;L;;;;;N;;;;; +13D9B;EGYPTIAN HIEROGLYPH-13D9B;Lo;0;L;;;;;N;;;;; +13D9C;EGYPTIAN HIEROGLYPH-13D9C;Lo;0;L;;;;;N;;;;; +13D9D;EGYPTIAN HIEROGLYPH-13D9D;Lo;0;L;;;;;N;;;;; +13D9E;EGYPTIAN HIEROGLYPH-13D9E;Lo;0;L;;;;;N;;;;; +13D9F;EGYPTIAN HIEROGLYPH-13D9F;Lo;0;L;;;;;N;;;;; +13DA0;EGYPTIAN HIEROGLYPH-13DA0;Lo;0;L;;;;;N;;;;; +13DA1;EGYPTIAN HIEROGLYPH-13DA1;Lo;0;L;;;;;N;;;;; +13DA2;EGYPTIAN HIEROGLYPH-13DA2;Lo;0;L;;;;;N;;;;; +13DA3;EGYPTIAN HIEROGLYPH-13DA3;Lo;0;L;;;;;N;;;;; +13DA4;EGYPTIAN HIEROGLYPH-13DA4;Lo;0;L;;;;;N;;;;; +13DA5;EGYPTIAN HIEROGLYPH-13DA5;Lo;0;L;;;;;N;;;;; +13DA6;EGYPTIAN HIEROGLYPH-13DA6;Lo;0;L;;;;;N;;;;; +13DA7;EGYPTIAN HIEROGLYPH-13DA7;Lo;0;L;;;;;N;;;;; +13DA8;EGYPTIAN HIEROGLYPH-13DA8;Lo;0;L;;;;;N;;;;; +13DA9;EGYPTIAN HIEROGLYPH-13DA9;Lo;0;L;;;;;N;;;;; +13DAA;EGYPTIAN HIEROGLYPH-13DAA;Lo;0;L;;;;;N;;;;; +13DAB;EGYPTIAN HIEROGLYPH-13DAB;Lo;0;L;;;;;N;;;;; +13DAC;EGYPTIAN HIEROGLYPH-13DAC;Lo;0;L;;;;;N;;;;; +13DAD;EGYPTIAN HIEROGLYPH-13DAD;Lo;0;L;;;;;N;;;;; +13DAE;EGYPTIAN HIEROGLYPH-13DAE;Lo;0;L;;;;;N;;;;; +13DAF;EGYPTIAN HIEROGLYPH-13DAF;Lo;0;L;;;;;N;;;;; +13DB0;EGYPTIAN HIEROGLYPH-13DB0;Lo;0;L;;;;;N;;;;; +13DB1;EGYPTIAN HIEROGLYPH-13DB1;Lo;0;L;;;;;N;;;;; +13DB2;EGYPTIAN HIEROGLYPH-13DB2;Lo;0;L;;;;;N;;;;; +13DB3;EGYPTIAN HIEROGLYPH-13DB3;Lo;0;L;;;;;N;;;;; +13DB4;EGYPTIAN HIEROGLYPH-13DB4;Lo;0;L;;;;;N;;;;; +13DB5;EGYPTIAN HIEROGLYPH-13DB5;Lo;0;L;;;;;N;;;;; +13DB6;EGYPTIAN HIEROGLYPH-13DB6;Lo;0;L;;;;;N;;;;; +13DB7;EGYPTIAN HIEROGLYPH-13DB7;Lo;0;L;;;;;N;;;;; +13DB8;EGYPTIAN HIEROGLYPH-13DB8;Lo;0;L;;;;;N;;;;; +13DB9;EGYPTIAN HIEROGLYPH-13DB9;Lo;0;L;;;;;N;;;;; +13DBA;EGYPTIAN HIEROGLYPH-13DBA;Lo;0;L;;;;;N;;;;; +13DBB;EGYPTIAN HIEROGLYPH-13DBB;Lo;0;L;;;;;N;;;;; +13DBC;EGYPTIAN HIEROGLYPH-13DBC;Lo;0;L;;;;;N;;;;; +13DBD;EGYPTIAN HIEROGLYPH-13DBD;Lo;0;L;;;;;N;;;;; +13DBE;EGYPTIAN HIEROGLYPH-13DBE;Lo;0;L;;;;;N;;;;; +13DBF;EGYPTIAN HIEROGLYPH-13DBF;Lo;0;L;;;;;N;;;;; +13DC0;EGYPTIAN HIEROGLYPH-13DC0;Lo;0;L;;;;;N;;;;; +13DC1;EGYPTIAN HIEROGLYPH-13DC1;Lo;0;L;;;;;N;;;;; +13DC2;EGYPTIAN HIEROGLYPH-13DC2;Lo;0;L;;;;;N;;;;; +13DC3;EGYPTIAN HIEROGLYPH-13DC3;Lo;0;L;;;;;N;;;;; +13DC4;EGYPTIAN HIEROGLYPH-13DC4;Lo;0;L;;;;;N;;;;; +13DC5;EGYPTIAN HIEROGLYPH-13DC5;Lo;0;L;;;;;N;;;;; +13DC6;EGYPTIAN HIEROGLYPH-13DC6;Lo;0;L;;;;;N;;;;; +13DC7;EGYPTIAN HIEROGLYPH-13DC7;Lo;0;L;;;;;N;;;;; +13DC8;EGYPTIAN HIEROGLYPH-13DC8;Lo;0;L;;;;;N;;;;; +13DC9;EGYPTIAN HIEROGLYPH-13DC9;Lo;0;L;;;;;N;;;;; +13DCA;EGYPTIAN HIEROGLYPH-13DCA;Lo;0;L;;;;;N;;;;; +13DCB;EGYPTIAN HIEROGLYPH-13DCB;Lo;0;L;;;;;N;;;;; +13DCC;EGYPTIAN HIEROGLYPH-13DCC;Lo;0;L;;;;;N;;;;; +13DCD;EGYPTIAN HIEROGLYPH-13DCD;Lo;0;L;;;;;N;;;;; +13DCE;EGYPTIAN HIEROGLYPH-13DCE;Lo;0;L;;;;;N;;;;; +13DCF;EGYPTIAN HIEROGLYPH-13DCF;Lo;0;L;;;;;N;;;;; +13DD0;EGYPTIAN HIEROGLYPH-13DD0;Lo;0;L;;;;;N;;;;; +13DD1;EGYPTIAN HIEROGLYPH-13DD1;Lo;0;L;;;;;N;;;;; +13DD2;EGYPTIAN HIEROGLYPH-13DD2;Lo;0;L;;;;;N;;;;; +13DD3;EGYPTIAN HIEROGLYPH-13DD3;Lo;0;L;;;;;N;;;;; +13DD4;EGYPTIAN HIEROGLYPH-13DD4;Lo;0;L;;;;;N;;;;; +13DD5;EGYPTIAN HIEROGLYPH-13DD5;Lo;0;L;;;;;N;;;;; +13DD6;EGYPTIAN HIEROGLYPH-13DD6;Lo;0;L;;;;;N;;;;; +13DD7;EGYPTIAN HIEROGLYPH-13DD7;Lo;0;L;;;;;N;;;;; +13DD8;EGYPTIAN HIEROGLYPH-13DD8;Lo;0;L;;;;;N;;;;; +13DD9;EGYPTIAN HIEROGLYPH-13DD9;Lo;0;L;;;;;N;;;;; +13DDA;EGYPTIAN HIEROGLYPH-13DDA;Lo;0;L;;;;;N;;;;; +13DDB;EGYPTIAN HIEROGLYPH-13DDB;Lo;0;L;;;;;N;;;;; +13DDC;EGYPTIAN HIEROGLYPH-13DDC;Lo;0;L;;;;;N;;;;; +13DDD;EGYPTIAN HIEROGLYPH-13DDD;Lo;0;L;;;;;N;;;;; +13DDE;EGYPTIAN HIEROGLYPH-13DDE;Lo;0;L;;;;;N;;;;; +13DDF;EGYPTIAN HIEROGLYPH-13DDF;Lo;0;L;;;;;N;;;;; +13DE0;EGYPTIAN HIEROGLYPH-13DE0;Lo;0;L;;;;;N;;;;; +13DE1;EGYPTIAN HIEROGLYPH-13DE1;Lo;0;L;;;;;N;;;;; +13DE2;EGYPTIAN HIEROGLYPH-13DE2;Lo;0;L;;;;;N;;;;; +13DE3;EGYPTIAN HIEROGLYPH-13DE3;Lo;0;L;;;;;N;;;;; +13DE4;EGYPTIAN HIEROGLYPH-13DE4;Lo;0;L;;;;;N;;;;; +13DE5;EGYPTIAN HIEROGLYPH-13DE5;Lo;0;L;;;;;N;;;;; +13DE6;EGYPTIAN HIEROGLYPH-13DE6;Lo;0;L;;;;;N;;;;; +13DE7;EGYPTIAN HIEROGLYPH-13DE7;Lo;0;L;;;;;N;;;;; +13DE8;EGYPTIAN HIEROGLYPH-13DE8;Lo;0;L;;;;;N;;;;; +13DE9;EGYPTIAN HIEROGLYPH-13DE9;Lo;0;L;;;;;N;;;;; +13DEA;EGYPTIAN HIEROGLYPH-13DEA;Lo;0;L;;;;;N;;;;; +13DEB;EGYPTIAN HIEROGLYPH-13DEB;Lo;0;L;;;;;N;;;;; +13DEC;EGYPTIAN HIEROGLYPH-13DEC;Lo;0;L;;;;;N;;;;; +13DED;EGYPTIAN HIEROGLYPH-13DED;Lo;0;L;;;;;N;;;;; +13DEE;EGYPTIAN HIEROGLYPH-13DEE;Lo;0;L;;;;;N;;;;; +13DEF;EGYPTIAN HIEROGLYPH-13DEF;Lo;0;L;;;;;N;;;;; +13DF0;EGYPTIAN HIEROGLYPH-13DF0;Lo;0;L;;;;;N;;;;; +13DF1;EGYPTIAN HIEROGLYPH-13DF1;Lo;0;L;;;;;N;;;;; +13DF2;EGYPTIAN HIEROGLYPH-13DF2;Lo;0;L;;;;;N;;;;; +13DF3;EGYPTIAN HIEROGLYPH-13DF3;Lo;0;L;;;;;N;;;;; +13DF4;EGYPTIAN HIEROGLYPH-13DF4;Lo;0;L;;;;;N;;;;; +13DF5;EGYPTIAN HIEROGLYPH-13DF5;Lo;0;L;;;;;N;;;;; +13DF6;EGYPTIAN HIEROGLYPH-13DF6;Lo;0;L;;;;;N;;;;; +13DF7;EGYPTIAN HIEROGLYPH-13DF7;Lo;0;L;;;;;N;;;;; +13DF8;EGYPTIAN HIEROGLYPH-13DF8;Lo;0;L;;;;;N;;;;; +13DF9;EGYPTIAN HIEROGLYPH-13DF9;Lo;0;L;;;;;N;;;;; +13DFA;EGYPTIAN HIEROGLYPH-13DFA;Lo;0;L;;;;;N;;;;; +13DFB;EGYPTIAN HIEROGLYPH-13DFB;Lo;0;L;;;;;N;;;;; +13DFC;EGYPTIAN HIEROGLYPH-13DFC;Lo;0;L;;;;;N;;;;; +13DFD;EGYPTIAN HIEROGLYPH-13DFD;Lo;0;L;;;;;N;;;;; +13DFE;EGYPTIAN HIEROGLYPH-13DFE;Lo;0;L;;;;;N;;;;; +13DFF;EGYPTIAN HIEROGLYPH-13DFF;Lo;0;L;;;;;N;;;;; +13E00;EGYPTIAN HIEROGLYPH-13E00;Lo;0;L;;;;;N;;;;; +13E01;EGYPTIAN HIEROGLYPH-13E01;Lo;0;L;;;;;N;;;;; +13E02;EGYPTIAN HIEROGLYPH-13E02;Lo;0;L;;;;;N;;;;; +13E03;EGYPTIAN HIEROGLYPH-13E03;Lo;0;L;;;;;N;;;;; +13E04;EGYPTIAN HIEROGLYPH-13E04;Lo;0;L;;;;;N;;;;; +13E05;EGYPTIAN HIEROGLYPH-13E05;Lo;0;L;;;;;N;;;;; +13E06;EGYPTIAN HIEROGLYPH-13E06;Lo;0;L;;;;;N;;;;; +13E07;EGYPTIAN HIEROGLYPH-13E07;Lo;0;L;;;;;N;;;;; +13E08;EGYPTIAN HIEROGLYPH-13E08;Lo;0;L;;;;;N;;;;; +13E09;EGYPTIAN HIEROGLYPH-13E09;Lo;0;L;;;;;N;;;;; +13E0A;EGYPTIAN HIEROGLYPH-13E0A;Lo;0;L;;;;;N;;;;; +13E0B;EGYPTIAN HIEROGLYPH-13E0B;Lo;0;L;;;;;N;;;;; +13E0C;EGYPTIAN HIEROGLYPH-13E0C;Lo;0;L;;;;;N;;;;; +13E0D;EGYPTIAN HIEROGLYPH-13E0D;Lo;0;L;;;;;N;;;;; +13E0E;EGYPTIAN HIEROGLYPH-13E0E;Lo;0;L;;;;;N;;;;; +13E0F;EGYPTIAN HIEROGLYPH-13E0F;Lo;0;L;;;;;N;;;;; +13E10;EGYPTIAN HIEROGLYPH-13E10;Lo;0;L;;;;;N;;;;; +13E11;EGYPTIAN HIEROGLYPH-13E11;Lo;0;L;;;;;N;;;;; +13E12;EGYPTIAN HIEROGLYPH-13E12;Lo;0;L;;;;;N;;;;; +13E13;EGYPTIAN HIEROGLYPH-13E13;Lo;0;L;;;;;N;;;;; +13E14;EGYPTIAN HIEROGLYPH-13E14;Lo;0;L;;;;;N;;;;; +13E15;EGYPTIAN HIEROGLYPH-13E15;Lo;0;L;;;;;N;;;;; +13E16;EGYPTIAN HIEROGLYPH-13E16;Lo;0;L;;;;;N;;;;; +13E17;EGYPTIAN HIEROGLYPH-13E17;Lo;0;L;;;;;N;;;;; +13E18;EGYPTIAN HIEROGLYPH-13E18;Lo;0;L;;;;;N;;;;; +13E19;EGYPTIAN HIEROGLYPH-13E19;Lo;0;L;;;;;N;;;;; +13E1A;EGYPTIAN HIEROGLYPH-13E1A;Lo;0;L;;;;;N;;;;; +13E1B;EGYPTIAN HIEROGLYPH-13E1B;Lo;0;L;;;;;N;;;;; +13E1C;EGYPTIAN HIEROGLYPH-13E1C;Lo;0;L;;;;;N;;;;; +13E1D;EGYPTIAN HIEROGLYPH-13E1D;Lo;0;L;;;;;N;;;;; +13E1E;EGYPTIAN HIEROGLYPH-13E1E;Lo;0;L;;;;;N;;;;; +13E1F;EGYPTIAN HIEROGLYPH-13E1F;Lo;0;L;;;;;N;;;;; +13E20;EGYPTIAN HIEROGLYPH-13E20;Lo;0;L;;;;;N;;;;; +13E21;EGYPTIAN HIEROGLYPH-13E21;Lo;0;L;;;;;N;;;;; +13E22;EGYPTIAN HIEROGLYPH-13E22;Lo;0;L;;;;;N;;;;; +13E23;EGYPTIAN HIEROGLYPH-13E23;Lo;0;L;;;;;N;;;;; +13E24;EGYPTIAN HIEROGLYPH-13E24;Lo;0;L;;;;;N;;;;; +13E25;EGYPTIAN HIEROGLYPH-13E25;Lo;0;L;;;;;N;;;;; +13E26;EGYPTIAN HIEROGLYPH-13E26;Lo;0;L;;;;;N;;;;; +13E27;EGYPTIAN HIEROGLYPH-13E27;Lo;0;L;;;;;N;;;;; +13E28;EGYPTIAN HIEROGLYPH-13E28;Lo;0;L;;;;;N;;;;; +13E29;EGYPTIAN HIEROGLYPH-13E29;Lo;0;L;;;;;N;;;;; +13E2A;EGYPTIAN HIEROGLYPH-13E2A;Lo;0;L;;;;;N;;;;; +13E2B;EGYPTIAN HIEROGLYPH-13E2B;Lo;0;L;;;;;N;;;;; +13E2C;EGYPTIAN HIEROGLYPH-13E2C;Lo;0;L;;;;;N;;;;; +13E2D;EGYPTIAN HIEROGLYPH-13E2D;Lo;0;L;;;;;N;;;;; +13E2E;EGYPTIAN HIEROGLYPH-13E2E;Lo;0;L;;;;;N;;;;; +13E2F;EGYPTIAN HIEROGLYPH-13E2F;Lo;0;L;;;;;N;;;;; +13E30;EGYPTIAN HIEROGLYPH-13E30;Lo;0;L;;;;;N;;;;; +13E31;EGYPTIAN HIEROGLYPH-13E31;Lo;0;L;;;;;N;;;;; +13E32;EGYPTIAN HIEROGLYPH-13E32;Lo;0;L;;;;;N;;;;; +13E33;EGYPTIAN HIEROGLYPH-13E33;Lo;0;L;;;;;N;;;;; +13E34;EGYPTIAN HIEROGLYPH-13E34;Lo;0;L;;;;;N;;;;; +13E35;EGYPTIAN HIEROGLYPH-13E35;Lo;0;L;;;;;N;;;;; +13E36;EGYPTIAN HIEROGLYPH-13E36;Lo;0;L;;;;;N;;;;; +13E37;EGYPTIAN HIEROGLYPH-13E37;Lo;0;L;;;;;N;;;;; +13E38;EGYPTIAN HIEROGLYPH-13E38;Lo;0;L;;;;;N;;;;; +13E39;EGYPTIAN HIEROGLYPH-13E39;Lo;0;L;;;;;N;;;;; +13E3A;EGYPTIAN HIEROGLYPH-13E3A;Lo;0;L;;;;;N;;;;; +13E3B;EGYPTIAN HIEROGLYPH-13E3B;Lo;0;L;;;;;N;;;;; +13E3C;EGYPTIAN HIEROGLYPH-13E3C;Lo;0;L;;;;;N;;;;; +13E3D;EGYPTIAN HIEROGLYPH-13E3D;Lo;0;L;;;;;N;;;;; +13E3E;EGYPTIAN HIEROGLYPH-13E3E;Lo;0;L;;;;;N;;;;; +13E3F;EGYPTIAN HIEROGLYPH-13E3F;Lo;0;L;;;;;N;;;;; +13E40;EGYPTIAN HIEROGLYPH-13E40;Lo;0;L;;;;;N;;;;; +13E41;EGYPTIAN HIEROGLYPH-13E41;Lo;0;L;;;;;N;;;;; +13E42;EGYPTIAN HIEROGLYPH-13E42;Lo;0;L;;;;;N;;;;; +13E43;EGYPTIAN HIEROGLYPH-13E43;Lo;0;L;;;;;N;;;;; +13E44;EGYPTIAN HIEROGLYPH-13E44;Lo;0;L;;;;;N;;;;; +13E45;EGYPTIAN HIEROGLYPH-13E45;Lo;0;L;;;;;N;;;;; +13E46;EGYPTIAN HIEROGLYPH-13E46;Lo;0;L;;;;;N;;;;; +13E47;EGYPTIAN HIEROGLYPH-13E47;Lo;0;L;;;;;N;;;;; +13E48;EGYPTIAN HIEROGLYPH-13E48;Lo;0;L;;;;;N;;;;; +13E49;EGYPTIAN HIEROGLYPH-13E49;Lo;0;L;;;;;N;;;;; +13E4A;EGYPTIAN HIEROGLYPH-13E4A;Lo;0;L;;;;;N;;;;; +13E4B;EGYPTIAN HIEROGLYPH-13E4B;Lo;0;L;;;;;N;;;;; +13E4C;EGYPTIAN HIEROGLYPH-13E4C;Lo;0;L;;;;;N;;;;; +13E4D;EGYPTIAN HIEROGLYPH-13E4D;Lo;0;L;;;;;N;;;;; +13E4E;EGYPTIAN HIEROGLYPH-13E4E;Lo;0;L;;;;;N;;;;; +13E4F;EGYPTIAN HIEROGLYPH-13E4F;Lo;0;L;;;;;N;;;;; +13E50;EGYPTIAN HIEROGLYPH-13E50;Lo;0;L;;;;;N;;;;; +13E51;EGYPTIAN HIEROGLYPH-13E51;Lo;0;L;;;;;N;;;;; +13E52;EGYPTIAN HIEROGLYPH-13E52;Lo;0;L;;;;;N;;;;; +13E53;EGYPTIAN HIEROGLYPH-13E53;Lo;0;L;;;;;N;;;;; +13E54;EGYPTIAN HIEROGLYPH-13E54;Lo;0;L;;;;;N;;;;; +13E55;EGYPTIAN HIEROGLYPH-13E55;Lo;0;L;;;;;N;;;;; +13E56;EGYPTIAN HIEROGLYPH-13E56;Lo;0;L;;;;;N;;;;; +13E57;EGYPTIAN HIEROGLYPH-13E57;Lo;0;L;;;;;N;;;;; +13E58;EGYPTIAN HIEROGLYPH-13E58;Lo;0;L;;;;;N;;;;; +13E59;EGYPTIAN HIEROGLYPH-13E59;Lo;0;L;;;;;N;;;;; +13E5A;EGYPTIAN HIEROGLYPH-13E5A;Lo;0;L;;;;;N;;;;; +13E5B;EGYPTIAN HIEROGLYPH-13E5B;Lo;0;L;;;;;N;;;;; +13E5C;EGYPTIAN HIEROGLYPH-13E5C;Lo;0;L;;;;;N;;;;; +13E5D;EGYPTIAN HIEROGLYPH-13E5D;Lo;0;L;;;;;N;;;;; +13E5E;EGYPTIAN HIEROGLYPH-13E5E;Lo;0;L;;;;;N;;;;; +13E5F;EGYPTIAN HIEROGLYPH-13E5F;Lo;0;L;;;;;N;;;;; +13E60;EGYPTIAN HIEROGLYPH-13E60;Lo;0;L;;;;;N;;;;; +13E61;EGYPTIAN HIEROGLYPH-13E61;Lo;0;L;;;;;N;;;;; +13E62;EGYPTIAN HIEROGLYPH-13E62;Lo;0;L;;;;;N;;;;; +13E63;EGYPTIAN HIEROGLYPH-13E63;Lo;0;L;;;;;N;;;;; +13E64;EGYPTIAN HIEROGLYPH-13E64;Lo;0;L;;;;;N;;;;; +13E65;EGYPTIAN HIEROGLYPH-13E65;Lo;0;L;;;;;N;;;;; +13E66;EGYPTIAN HIEROGLYPH-13E66;Lo;0;L;;;;;N;;;;; +13E67;EGYPTIAN HIEROGLYPH-13E67;Lo;0;L;;;;;N;;;;; +13E68;EGYPTIAN HIEROGLYPH-13E68;Lo;0;L;;;;;N;;;;; +13E69;EGYPTIAN HIEROGLYPH-13E69;Lo;0;L;;;;;N;;;;; +13E6A;EGYPTIAN HIEROGLYPH-13E6A;Lo;0;L;;;;;N;;;;; +13E6B;EGYPTIAN HIEROGLYPH-13E6B;Lo;0;L;;;;;N;;;;; +13E6C;EGYPTIAN HIEROGLYPH-13E6C;Lo;0;L;;;;;N;;;;; +13E6D;EGYPTIAN HIEROGLYPH-13E6D;Lo;0;L;;;;;N;;;;; +13E6E;EGYPTIAN HIEROGLYPH-13E6E;Lo;0;L;;;;;N;;;;; +13E6F;EGYPTIAN HIEROGLYPH-13E6F;Lo;0;L;;;;;N;;;;; +13E70;EGYPTIAN HIEROGLYPH-13E70;Lo;0;L;;;;;N;;;;; +13E71;EGYPTIAN HIEROGLYPH-13E71;Lo;0;L;;;;;N;;;;; +13E72;EGYPTIAN HIEROGLYPH-13E72;Lo;0;L;;;;;N;;;;; +13E73;EGYPTIAN HIEROGLYPH-13E73;Lo;0;L;;;;;N;;;;; +13E74;EGYPTIAN HIEROGLYPH-13E74;Lo;0;L;;;;;N;;;;; +13E75;EGYPTIAN HIEROGLYPH-13E75;Lo;0;L;;;;;N;;;;; +13E76;EGYPTIAN HIEROGLYPH-13E76;Lo;0;L;;;;;N;;;;; +13E77;EGYPTIAN HIEROGLYPH-13E77;Lo;0;L;;;;;N;;;;; +13E78;EGYPTIAN HIEROGLYPH-13E78;Lo;0;L;;;;;N;;;;; +13E79;EGYPTIAN HIEROGLYPH-13E79;Lo;0;L;;;;;N;;;;; +13E7A;EGYPTIAN HIEROGLYPH-13E7A;Lo;0;L;;;;;N;;;;; +13E7B;EGYPTIAN HIEROGLYPH-13E7B;Lo;0;L;;;;;N;;;;; +13E7C;EGYPTIAN HIEROGLYPH-13E7C;Lo;0;L;;;;;N;;;;; +13E7D;EGYPTIAN HIEROGLYPH-13E7D;Lo;0;L;;;;;N;;;;; +13E7E;EGYPTIAN HIEROGLYPH-13E7E;Lo;0;L;;;;;N;;;;; +13E7F;EGYPTIAN HIEROGLYPH-13E7F;Lo;0;L;;;;;N;;;;; +13E80;EGYPTIAN HIEROGLYPH-13E80;Lo;0;L;;;;;N;;;;; +13E81;EGYPTIAN HIEROGLYPH-13E81;Lo;0;L;;;;;N;;;;; +13E82;EGYPTIAN HIEROGLYPH-13E82;Lo;0;L;;;;;N;;;;; +13E83;EGYPTIAN HIEROGLYPH-13E83;Lo;0;L;;;;;N;;;;; +13E84;EGYPTIAN HIEROGLYPH-13E84;Lo;0;L;;;;;N;;;;; +13E85;EGYPTIAN HIEROGLYPH-13E85;Lo;0;L;;;;;N;;;;; +13E86;EGYPTIAN HIEROGLYPH-13E86;Lo;0;L;;;;;N;;;;; +13E87;EGYPTIAN HIEROGLYPH-13E87;Lo;0;L;;;;;N;;;;; +13E88;EGYPTIAN HIEROGLYPH-13E88;Lo;0;L;;;;;N;;;;; +13E89;EGYPTIAN HIEROGLYPH-13E89;Lo;0;L;;;;;N;;;;; +13E8A;EGYPTIAN HIEROGLYPH-13E8A;Lo;0;L;;;;;N;;;;; +13E8B;EGYPTIAN HIEROGLYPH-13E8B;Lo;0;L;;;;;N;;;;; +13E8C;EGYPTIAN HIEROGLYPH-13E8C;Lo;0;L;;;;;N;;;;; +13E8D;EGYPTIAN HIEROGLYPH-13E8D;Lo;0;L;;;;;N;;;;; +13E8E;EGYPTIAN HIEROGLYPH-13E8E;Lo;0;L;;;;;N;;;;; +13E8F;EGYPTIAN HIEROGLYPH-13E8F;Lo;0;L;;;;;N;;;;; +13E90;EGYPTIAN HIEROGLYPH-13E90;Lo;0;L;;;;;N;;;;; +13E91;EGYPTIAN HIEROGLYPH-13E91;Lo;0;L;;;;;N;;;;; +13E92;EGYPTIAN HIEROGLYPH-13E92;Lo;0;L;;;;;N;;;;; +13E93;EGYPTIAN HIEROGLYPH-13E93;Lo;0;L;;;;;N;;;;; +13E94;EGYPTIAN HIEROGLYPH-13E94;Lo;0;L;;;;;N;;;;; +13E95;EGYPTIAN HIEROGLYPH-13E95;Lo;0;L;;;;;N;;;;; +13E96;EGYPTIAN HIEROGLYPH-13E96;Lo;0;L;;;;;N;;;;; +13E97;EGYPTIAN HIEROGLYPH-13E97;Lo;0;L;;;;;N;;;;; +13E98;EGYPTIAN HIEROGLYPH-13E98;Lo;0;L;;;;;N;;;;; +13E99;EGYPTIAN HIEROGLYPH-13E99;Lo;0;L;;;;;N;;;;; +13E9A;EGYPTIAN HIEROGLYPH-13E9A;Lo;0;L;;;;;N;;;;; +13E9B;EGYPTIAN HIEROGLYPH-13E9B;Lo;0;L;;;;;N;;;;; +13E9C;EGYPTIAN HIEROGLYPH-13E9C;Lo;0;L;;;;;N;;;;; +13E9D;EGYPTIAN HIEROGLYPH-13E9D;Lo;0;L;;;;;N;;;;; +13E9E;EGYPTIAN HIEROGLYPH-13E9E;Lo;0;L;;;;;N;;;;; +13E9F;EGYPTIAN HIEROGLYPH-13E9F;Lo;0;L;;;;;N;;;;; +13EA0;EGYPTIAN HIEROGLYPH-13EA0;Lo;0;L;;;;;N;;;;; +13EA1;EGYPTIAN HIEROGLYPH-13EA1;Lo;0;L;;;;;N;;;;; +13EA2;EGYPTIAN HIEROGLYPH-13EA2;Lo;0;L;;;;;N;;;;; +13EA3;EGYPTIAN HIEROGLYPH-13EA3;Lo;0;L;;;;;N;;;;; +13EA4;EGYPTIAN HIEROGLYPH-13EA4;Lo;0;L;;;;;N;;;;; +13EA5;EGYPTIAN HIEROGLYPH-13EA5;Lo;0;L;;;;;N;;;;; +13EA6;EGYPTIAN HIEROGLYPH-13EA6;Lo;0;L;;;;;N;;;;; +13EA7;EGYPTIAN HIEROGLYPH-13EA7;Lo;0;L;;;;;N;;;;; +13EA8;EGYPTIAN HIEROGLYPH-13EA8;Lo;0;L;;;;;N;;;;; +13EA9;EGYPTIAN HIEROGLYPH-13EA9;Lo;0;L;;;;;N;;;;; +13EAA;EGYPTIAN HIEROGLYPH-13EAA;Lo;0;L;;;;;N;;;;; +13EAB;EGYPTIAN HIEROGLYPH-13EAB;Lo;0;L;;;;;N;;;;; +13EAC;EGYPTIAN HIEROGLYPH-13EAC;Lo;0;L;;;;;N;;;;; +13EAD;EGYPTIAN HIEROGLYPH-13EAD;Lo;0;L;;;;;N;;;;; +13EAE;EGYPTIAN HIEROGLYPH-13EAE;Lo;0;L;;;;;N;;;;; +13EAF;EGYPTIAN HIEROGLYPH-13EAF;Lo;0;L;;;;;N;;;;; +13EB0;EGYPTIAN HIEROGLYPH-13EB0;Lo;0;L;;;;;N;;;;; +13EB1;EGYPTIAN HIEROGLYPH-13EB1;Lo;0;L;;;;;N;;;;; +13EB2;EGYPTIAN HIEROGLYPH-13EB2;Lo;0;L;;;;;N;;;;; +13EB3;EGYPTIAN HIEROGLYPH-13EB3;Lo;0;L;;;;;N;;;;; +13EB4;EGYPTIAN HIEROGLYPH-13EB4;Lo;0;L;;;;;N;;;;; +13EB5;EGYPTIAN HIEROGLYPH-13EB5;Lo;0;L;;;;;N;;;;; +13EB6;EGYPTIAN HIEROGLYPH-13EB6;Lo;0;L;;;;;N;;;;; +13EB7;EGYPTIAN HIEROGLYPH-13EB7;Lo;0;L;;;;;N;;;;; +13EB8;EGYPTIAN HIEROGLYPH-13EB8;Lo;0;L;;;;;N;;;;; +13EB9;EGYPTIAN HIEROGLYPH-13EB9;Lo;0;L;;;;;N;;;;; +13EBA;EGYPTIAN HIEROGLYPH-13EBA;Lo;0;L;;;;;N;;;;; +13EBB;EGYPTIAN HIEROGLYPH-13EBB;Lo;0;L;;;;;N;;;;; +13EBC;EGYPTIAN HIEROGLYPH-13EBC;Lo;0;L;;;;;N;;;;; +13EBD;EGYPTIAN HIEROGLYPH-13EBD;Lo;0;L;;;;;N;;;;; +13EBE;EGYPTIAN HIEROGLYPH-13EBE;Lo;0;L;;;;;N;;;;; +13EBF;EGYPTIAN HIEROGLYPH-13EBF;Lo;0;L;;;;;N;;;;; +13EC0;EGYPTIAN HIEROGLYPH-13EC0;Lo;0;L;;;;;N;;;;; +13EC1;EGYPTIAN HIEROGLYPH-13EC1;Lo;0;L;;;;;N;;;;; +13EC2;EGYPTIAN HIEROGLYPH-13EC2;Lo;0;L;;;;;N;;;;; +13EC3;EGYPTIAN HIEROGLYPH-13EC3;Lo;0;L;;;;;N;;;;; +13EC4;EGYPTIAN HIEROGLYPH-13EC4;Lo;0;L;;;;;N;;;;; +13EC5;EGYPTIAN HIEROGLYPH-13EC5;Lo;0;L;;;;;N;;;;; +13EC6;EGYPTIAN HIEROGLYPH-13EC6;Lo;0;L;;;;;N;;;;; +13EC7;EGYPTIAN HIEROGLYPH-13EC7;Lo;0;L;;;;;N;;;;; +13EC8;EGYPTIAN HIEROGLYPH-13EC8;Lo;0;L;;;;;N;;;;; +13EC9;EGYPTIAN HIEROGLYPH-13EC9;Lo;0;L;;;;;N;;;;; +13ECA;EGYPTIAN HIEROGLYPH-13ECA;Lo;0;L;;;;;N;;;;; +13ECB;EGYPTIAN HIEROGLYPH-13ECB;Lo;0;L;;;;;N;;;;; +13ECC;EGYPTIAN HIEROGLYPH-13ECC;Lo;0;L;;;;;N;;;;; +13ECD;EGYPTIAN HIEROGLYPH-13ECD;Lo;0;L;;;;;N;;;;; +13ECE;EGYPTIAN HIEROGLYPH-13ECE;Lo;0;L;;;;;N;;;;; +13ECF;EGYPTIAN HIEROGLYPH-13ECF;Lo;0;L;;;;;N;;;;; +13ED0;EGYPTIAN HIEROGLYPH-13ED0;Lo;0;L;;;;;N;;;;; +13ED1;EGYPTIAN HIEROGLYPH-13ED1;Lo;0;L;;;;;N;;;;; +13ED2;EGYPTIAN HIEROGLYPH-13ED2;Lo;0;L;;;;;N;;;;; +13ED3;EGYPTIAN HIEROGLYPH-13ED3;Lo;0;L;;;;;N;;;;; +13ED4;EGYPTIAN HIEROGLYPH-13ED4;Lo;0;L;;;;;N;;;;; +13ED5;EGYPTIAN HIEROGLYPH-13ED5;Lo;0;L;;;;;N;;;;; +13ED6;EGYPTIAN HIEROGLYPH-13ED6;Lo;0;L;;;;;N;;;;; +13ED7;EGYPTIAN HIEROGLYPH-13ED7;Lo;0;L;;;;;N;;;;; +13ED8;EGYPTIAN HIEROGLYPH-13ED8;Lo;0;L;;;;;N;;;;; +13ED9;EGYPTIAN HIEROGLYPH-13ED9;Lo;0;L;;;;;N;;;;; +13EDA;EGYPTIAN HIEROGLYPH-13EDA;Lo;0;L;;;;;N;;;;; +13EDB;EGYPTIAN HIEROGLYPH-13EDB;Lo;0;L;;;;;N;;;;; +13EDC;EGYPTIAN HIEROGLYPH-13EDC;Lo;0;L;;;;;N;;;;; +13EDD;EGYPTIAN HIEROGLYPH-13EDD;Lo;0;L;;;;;N;;;;; +13EDE;EGYPTIAN HIEROGLYPH-13EDE;Lo;0;L;;;;;N;;;;; +13EDF;EGYPTIAN HIEROGLYPH-13EDF;Lo;0;L;;;;;N;;;;; +13EE0;EGYPTIAN HIEROGLYPH-13EE0;Lo;0;L;;;;;N;;;;; +13EE1;EGYPTIAN HIEROGLYPH-13EE1;Lo;0;L;;;;;N;;;;; +13EE2;EGYPTIAN HIEROGLYPH-13EE2;Lo;0;L;;;;;N;;;;; +13EE3;EGYPTIAN HIEROGLYPH-13EE3;Lo;0;L;;;;;N;;;;; +13EE4;EGYPTIAN HIEROGLYPH-13EE4;Lo;0;L;;;;;N;;;;; +13EE5;EGYPTIAN HIEROGLYPH-13EE5;Lo;0;L;;;;;N;;;;; +13EE6;EGYPTIAN HIEROGLYPH-13EE6;Lo;0;L;;;;;N;;;;; +13EE7;EGYPTIAN HIEROGLYPH-13EE7;Lo;0;L;;;;;N;;;;; +13EE8;EGYPTIAN HIEROGLYPH-13EE8;Lo;0;L;;;;;N;;;;; +13EE9;EGYPTIAN HIEROGLYPH-13EE9;Lo;0;L;;;;;N;;;;; +13EEA;EGYPTIAN HIEROGLYPH-13EEA;Lo;0;L;;;;;N;;;;; +13EEB;EGYPTIAN HIEROGLYPH-13EEB;Lo;0;L;;;;;N;;;;; +13EEC;EGYPTIAN HIEROGLYPH-13EEC;Lo;0;L;;;;;N;;;;; +13EED;EGYPTIAN HIEROGLYPH-13EED;Lo;0;L;;;;;N;;;;; +13EEE;EGYPTIAN HIEROGLYPH-13EEE;Lo;0;L;;;;;N;;;;; +13EEF;EGYPTIAN HIEROGLYPH-13EEF;Lo;0;L;;;;;N;;;;; +13EF0;EGYPTIAN HIEROGLYPH-13EF0;Lo;0;L;;;;;N;;;;; +13EF1;EGYPTIAN HIEROGLYPH-13EF1;Lo;0;L;;;;;N;;;;; +13EF2;EGYPTIAN HIEROGLYPH-13EF2;Lo;0;L;;;;;N;;;;; +13EF3;EGYPTIAN HIEROGLYPH-13EF3;Lo;0;L;;;;;N;;;;; +13EF4;EGYPTIAN HIEROGLYPH-13EF4;Lo;0;L;;;;;N;;;;; +13EF5;EGYPTIAN HIEROGLYPH-13EF5;Lo;0;L;;;;;N;;;;; +13EF6;EGYPTIAN HIEROGLYPH-13EF6;Lo;0;L;;;;;N;;;;; +13EF7;EGYPTIAN HIEROGLYPH-13EF7;Lo;0;L;;;;;N;;;;; +13EF8;EGYPTIAN HIEROGLYPH-13EF8;Lo;0;L;;;;;N;;;;; +13EF9;EGYPTIAN HIEROGLYPH-13EF9;Lo;0;L;;;;;N;;;;; +13EFA;EGYPTIAN HIEROGLYPH-13EFA;Lo;0;L;;;;;N;;;;; +13EFB;EGYPTIAN HIEROGLYPH-13EFB;Lo;0;L;;;;;N;;;;; +13EFC;EGYPTIAN HIEROGLYPH-13EFC;Lo;0;L;;;;;N;;;;; +13EFD;EGYPTIAN HIEROGLYPH-13EFD;Lo;0;L;;;;;N;;;;; +13EFE;EGYPTIAN HIEROGLYPH-13EFE;Lo;0;L;;;;;N;;;;; +13EFF;EGYPTIAN HIEROGLYPH-13EFF;Lo;0;L;;;;;N;;;;; +13F00;EGYPTIAN HIEROGLYPH-13F00;Lo;0;L;;;;;N;;;;; +13F01;EGYPTIAN HIEROGLYPH-13F01;Lo;0;L;;;;;N;;;;; +13F02;EGYPTIAN HIEROGLYPH-13F02;Lo;0;L;;;;;N;;;;; +13F03;EGYPTIAN HIEROGLYPH-13F03;Lo;0;L;;;;;N;;;;; +13F04;EGYPTIAN HIEROGLYPH-13F04;Lo;0;L;;;;;N;;;;; +13F05;EGYPTIAN HIEROGLYPH-13F05;Lo;0;L;;;;;N;;;;; +13F06;EGYPTIAN HIEROGLYPH-13F06;Lo;0;L;;;;;N;;;;; +13F07;EGYPTIAN HIEROGLYPH-13F07;Lo;0;L;;;;;N;;;;; +13F08;EGYPTIAN HIEROGLYPH-13F08;Lo;0;L;;;;;N;;;;; +13F09;EGYPTIAN HIEROGLYPH-13F09;Lo;0;L;;;;;N;;;;; +13F0A;EGYPTIAN HIEROGLYPH-13F0A;Lo;0;L;;;;;N;;;;; +13F0B;EGYPTIAN HIEROGLYPH-13F0B;Lo;0;L;;;;;N;;;;; +13F0C;EGYPTIAN HIEROGLYPH-13F0C;Lo;0;L;;;;;N;;;;; +13F0D;EGYPTIAN HIEROGLYPH-13F0D;Lo;0;L;;;;;N;;;;; +13F0E;EGYPTIAN HIEROGLYPH-13F0E;Lo;0;L;;;;;N;;;;; +13F0F;EGYPTIAN HIEROGLYPH-13F0F;Lo;0;L;;;;;N;;;;; +13F10;EGYPTIAN HIEROGLYPH-13F10;Lo;0;L;;;;;N;;;;; +13F11;EGYPTIAN HIEROGLYPH-13F11;Lo;0;L;;;;;N;;;;; +13F12;EGYPTIAN HIEROGLYPH-13F12;Lo;0;L;;;;;N;;;;; +13F13;EGYPTIAN HIEROGLYPH-13F13;Lo;0;L;;;;;N;;;;; +13F14;EGYPTIAN HIEROGLYPH-13F14;Lo;0;L;;;;;N;;;;; +13F15;EGYPTIAN HIEROGLYPH-13F15;Lo;0;L;;;;;N;;;;; +13F16;EGYPTIAN HIEROGLYPH-13F16;Lo;0;L;;;;;N;;;;; +13F17;EGYPTIAN HIEROGLYPH-13F17;Lo;0;L;;;;;N;;;;; +13F18;EGYPTIAN HIEROGLYPH-13F18;Lo;0;L;;;;;N;;;;; +13F19;EGYPTIAN HIEROGLYPH-13F19;Lo;0;L;;;;;N;;;;; +13F1A;EGYPTIAN HIEROGLYPH-13F1A;Lo;0;L;;;;;N;;;;; +13F1B;EGYPTIAN HIEROGLYPH-13F1B;Lo;0;L;;;;;N;;;;; +13F1C;EGYPTIAN HIEROGLYPH-13F1C;Lo;0;L;;;;;N;;;;; +13F1D;EGYPTIAN HIEROGLYPH-13F1D;Lo;0;L;;;;;N;;;;; +13F1E;EGYPTIAN HIEROGLYPH-13F1E;Lo;0;L;;;;;N;;;;; +13F1F;EGYPTIAN HIEROGLYPH-13F1F;Lo;0;L;;;;;N;;;;; +13F20;EGYPTIAN HIEROGLYPH-13F20;Lo;0;L;;;;;N;;;;; +13F21;EGYPTIAN HIEROGLYPH-13F21;Lo;0;L;;;;;N;;;;; +13F22;EGYPTIAN HIEROGLYPH-13F22;Lo;0;L;;;;;N;;;;; +13F23;EGYPTIAN HIEROGLYPH-13F23;Lo;0;L;;;;;N;;;;; +13F24;EGYPTIAN HIEROGLYPH-13F24;Lo;0;L;;;;;N;;;;; +13F25;EGYPTIAN HIEROGLYPH-13F25;Lo;0;L;;;;;N;;;;; +13F26;EGYPTIAN HIEROGLYPH-13F26;Lo;0;L;;;;;N;;;;; +13F27;EGYPTIAN HIEROGLYPH-13F27;Lo;0;L;;;;;N;;;;; +13F28;EGYPTIAN HIEROGLYPH-13F28;Lo;0;L;;;;;N;;;;; +13F29;EGYPTIAN HIEROGLYPH-13F29;Lo;0;L;;;;;N;;;;; +13F2A;EGYPTIAN HIEROGLYPH-13F2A;Lo;0;L;;;;;N;;;;; +13F2B;EGYPTIAN HIEROGLYPH-13F2B;Lo;0;L;;;;;N;;;;; +13F2C;EGYPTIAN HIEROGLYPH-13F2C;Lo;0;L;;;;;N;;;;; +13F2D;EGYPTIAN HIEROGLYPH-13F2D;Lo;0;L;;;;;N;;;;; +13F2E;EGYPTIAN HIEROGLYPH-13F2E;Lo;0;L;;;;;N;;;;; +13F2F;EGYPTIAN HIEROGLYPH-13F2F;Lo;0;L;;;;;N;;;;; +13F30;EGYPTIAN HIEROGLYPH-13F30;Lo;0;L;;;;;N;;;;; +13F31;EGYPTIAN HIEROGLYPH-13F31;Lo;0;L;;;;;N;;;;; +13F32;EGYPTIAN HIEROGLYPH-13F32;Lo;0;L;;;;;N;;;;; +13F33;EGYPTIAN HIEROGLYPH-13F33;Lo;0;L;;;;;N;;;;; +13F34;EGYPTIAN HIEROGLYPH-13F34;Lo;0;L;;;;;N;;;;; +13F35;EGYPTIAN HIEROGLYPH-13F35;Lo;0;L;;;;;N;;;;; +13F36;EGYPTIAN HIEROGLYPH-13F36;Lo;0;L;;;;;N;;;;; +13F37;EGYPTIAN HIEROGLYPH-13F37;Lo;0;L;;;;;N;;;;; +13F38;EGYPTIAN HIEROGLYPH-13F38;Lo;0;L;;;;;N;;;;; +13F39;EGYPTIAN HIEROGLYPH-13F39;Lo;0;L;;;;;N;;;;; +13F3A;EGYPTIAN HIEROGLYPH-13F3A;Lo;0;L;;;;;N;;;;; +13F3B;EGYPTIAN HIEROGLYPH-13F3B;Lo;0;L;;;;;N;;;;; +13F3C;EGYPTIAN HIEROGLYPH-13F3C;Lo;0;L;;;;;N;;;;; +13F3D;EGYPTIAN HIEROGLYPH-13F3D;Lo;0;L;;;;;N;;;;; +13F3E;EGYPTIAN HIEROGLYPH-13F3E;Lo;0;L;;;;;N;;;;; +13F3F;EGYPTIAN HIEROGLYPH-13F3F;Lo;0;L;;;;;N;;;;; +13F40;EGYPTIAN HIEROGLYPH-13F40;Lo;0;L;;;;;N;;;;; +13F41;EGYPTIAN HIEROGLYPH-13F41;Lo;0;L;;;;;N;;;;; +13F42;EGYPTIAN HIEROGLYPH-13F42;Lo;0;L;;;;;N;;;;; +13F43;EGYPTIAN HIEROGLYPH-13F43;Lo;0;L;;;;;N;;;;; +13F44;EGYPTIAN HIEROGLYPH-13F44;Lo;0;L;;;;;N;;;;; +13F45;EGYPTIAN HIEROGLYPH-13F45;Lo;0;L;;;;;N;;;;; +13F46;EGYPTIAN HIEROGLYPH-13F46;Lo;0;L;;;;;N;;;;; +13F47;EGYPTIAN HIEROGLYPH-13F47;Lo;0;L;;;;;N;;;;; +13F48;EGYPTIAN HIEROGLYPH-13F48;Lo;0;L;;;;;N;;;;; +13F49;EGYPTIAN HIEROGLYPH-13F49;Lo;0;L;;;;;N;;;;; +13F4A;EGYPTIAN HIEROGLYPH-13F4A;Lo;0;L;;;;;N;;;;; +13F4B;EGYPTIAN HIEROGLYPH-13F4B;Lo;0;L;;;;;N;;;;; +13F4C;EGYPTIAN HIEROGLYPH-13F4C;Lo;0;L;;;;;N;;;;; +13F4D;EGYPTIAN HIEROGLYPH-13F4D;Lo;0;L;;;;;N;;;;; +13F4E;EGYPTIAN HIEROGLYPH-13F4E;Lo;0;L;;;;;N;;;;; +13F4F;EGYPTIAN HIEROGLYPH-13F4F;Lo;0;L;;;;;N;;;;; +13F50;EGYPTIAN HIEROGLYPH-13F50;Lo;0;L;;;;;N;;;;; +13F51;EGYPTIAN HIEROGLYPH-13F51;Lo;0;L;;;;;N;;;;; +13F52;EGYPTIAN HIEROGLYPH-13F52;Lo;0;L;;;;;N;;;;; +13F53;EGYPTIAN HIEROGLYPH-13F53;Lo;0;L;;;;;N;;;;; +13F54;EGYPTIAN HIEROGLYPH-13F54;Lo;0;L;;;;;N;;;;; +13F55;EGYPTIAN HIEROGLYPH-13F55;Lo;0;L;;;;;N;;;;; +13F56;EGYPTIAN HIEROGLYPH-13F56;Lo;0;L;;;;;N;;;;; +13F57;EGYPTIAN HIEROGLYPH-13F57;Lo;0;L;;;;;N;;;;; +13F58;EGYPTIAN HIEROGLYPH-13F58;Lo;0;L;;;;;N;;;;; +13F59;EGYPTIAN HIEROGLYPH-13F59;Lo;0;L;;;;;N;;;;; +13F5A;EGYPTIAN HIEROGLYPH-13F5A;Lo;0;L;;;;;N;;;;; +13F5B;EGYPTIAN HIEROGLYPH-13F5B;Lo;0;L;;;;;N;;;;; +13F5C;EGYPTIAN HIEROGLYPH-13F5C;Lo;0;L;;;;;N;;;;; +13F5D;EGYPTIAN HIEROGLYPH-13F5D;Lo;0;L;;;;;N;;;;; +13F5E;EGYPTIAN HIEROGLYPH-13F5E;Lo;0;L;;;;;N;;;;; +13F5F;EGYPTIAN HIEROGLYPH-13F5F;Lo;0;L;;;;;N;;;;; +13F60;EGYPTIAN HIEROGLYPH-13F60;Lo;0;L;;;;;N;;;;; +13F61;EGYPTIAN HIEROGLYPH-13F61;Lo;0;L;;;;;N;;;;; +13F62;EGYPTIAN HIEROGLYPH-13F62;Lo;0;L;;;;;N;;;;; +13F63;EGYPTIAN HIEROGLYPH-13F63;Lo;0;L;;;;;N;;;;; +13F64;EGYPTIAN HIEROGLYPH-13F64;Lo;0;L;;;;;N;;;;; +13F65;EGYPTIAN HIEROGLYPH-13F65;Lo;0;L;;;;;N;;;;; +13F66;EGYPTIAN HIEROGLYPH-13F66;Lo;0;L;;;;;N;;;;; +13F67;EGYPTIAN HIEROGLYPH-13F67;Lo;0;L;;;;;N;;;;; +13F68;EGYPTIAN HIEROGLYPH-13F68;Lo;0;L;;;;;N;;;;; +13F69;EGYPTIAN HIEROGLYPH-13F69;Lo;0;L;;;;;N;;;;; +13F6A;EGYPTIAN HIEROGLYPH-13F6A;Lo;0;L;;;;;N;;;;; +13F6B;EGYPTIAN HIEROGLYPH-13F6B;Lo;0;L;;;;;N;;;;; +13F6C;EGYPTIAN HIEROGLYPH-13F6C;Lo;0;L;;;;;N;;;;; +13F6D;EGYPTIAN HIEROGLYPH-13F6D;Lo;0;L;;;;;N;;;;; +13F6E;EGYPTIAN HIEROGLYPH-13F6E;Lo;0;L;;;;;N;;;;; +13F6F;EGYPTIAN HIEROGLYPH-13F6F;Lo;0;L;;;;;N;;;;; +13F70;EGYPTIAN HIEROGLYPH-13F70;Lo;0;L;;;;;N;;;;; +13F71;EGYPTIAN HIEROGLYPH-13F71;Lo;0;L;;;;;N;;;;; +13F72;EGYPTIAN HIEROGLYPH-13F72;Lo;0;L;;;;;N;;;;; +13F73;EGYPTIAN HIEROGLYPH-13F73;Lo;0;L;;;;;N;;;;; +13F74;EGYPTIAN HIEROGLYPH-13F74;Lo;0;L;;;;;N;;;;; +13F75;EGYPTIAN HIEROGLYPH-13F75;Lo;0;L;;;;;N;;;;; +13F76;EGYPTIAN HIEROGLYPH-13F76;Lo;0;L;;;;;N;;;;; +13F77;EGYPTIAN HIEROGLYPH-13F77;Lo;0;L;;;;;N;;;;; +13F78;EGYPTIAN HIEROGLYPH-13F78;Lo;0;L;;;;;N;;;;; +13F79;EGYPTIAN HIEROGLYPH-13F79;Lo;0;L;;;;;N;;;;; +13F7A;EGYPTIAN HIEROGLYPH-13F7A;Lo;0;L;;;;;N;;;;; +13F7B;EGYPTIAN HIEROGLYPH-13F7B;Lo;0;L;;;;;N;;;;; +13F7C;EGYPTIAN HIEROGLYPH-13F7C;Lo;0;L;;;;;N;;;;; +13F7D;EGYPTIAN HIEROGLYPH-13F7D;Lo;0;L;;;;;N;;;;; +13F7E;EGYPTIAN HIEROGLYPH-13F7E;Lo;0;L;;;;;N;;;;; +13F7F;EGYPTIAN HIEROGLYPH-13F7F;Lo;0;L;;;;;N;;;;; +13F80;EGYPTIAN HIEROGLYPH-13F80;Lo;0;L;;;;;N;;;;; +13F81;EGYPTIAN HIEROGLYPH-13F81;Lo;0;L;;;;;N;;;;; +13F82;EGYPTIAN HIEROGLYPH-13F82;Lo;0;L;;;;;N;;;;; +13F83;EGYPTIAN HIEROGLYPH-13F83;Lo;0;L;;;;;N;;;;; +13F84;EGYPTIAN HIEROGLYPH-13F84;Lo;0;L;;;;;N;;;;; +13F85;EGYPTIAN HIEROGLYPH-13F85;Lo;0;L;;;;;N;;;;; +13F86;EGYPTIAN HIEROGLYPH-13F86;Lo;0;L;;;;;N;;;;; +13F87;EGYPTIAN HIEROGLYPH-13F87;Lo;0;L;;;;;N;;;;; +13F88;EGYPTIAN HIEROGLYPH-13F88;Lo;0;L;;;;;N;;;;; +13F89;EGYPTIAN HIEROGLYPH-13F89;Lo;0;L;;;;;N;;;;; +13F8A;EGYPTIAN HIEROGLYPH-13F8A;Lo;0;L;;;;;N;;;;; +13F8B;EGYPTIAN HIEROGLYPH-13F8B;Lo;0;L;;;;;N;;;;; +13F8C;EGYPTIAN HIEROGLYPH-13F8C;Lo;0;L;;;;;N;;;;; +13F8D;EGYPTIAN HIEROGLYPH-13F8D;Lo;0;L;;;;;N;;;;; +13F8E;EGYPTIAN HIEROGLYPH-13F8E;Lo;0;L;;;;;N;;;;; +13F8F;EGYPTIAN HIEROGLYPH-13F8F;Lo;0;L;;;;;N;;;;; +13F90;EGYPTIAN HIEROGLYPH-13F90;Lo;0;L;;;;;N;;;;; +13F91;EGYPTIAN HIEROGLYPH-13F91;Lo;0;L;;;;;N;;;;; +13F92;EGYPTIAN HIEROGLYPH-13F92;Lo;0;L;;;;;N;;;;; +13F93;EGYPTIAN HIEROGLYPH-13F93;Lo;0;L;;;;;N;;;;; +13F94;EGYPTIAN HIEROGLYPH-13F94;Lo;0;L;;;;;N;;;;; +13F95;EGYPTIAN HIEROGLYPH-13F95;Lo;0;L;;;;;N;;;;; +13F96;EGYPTIAN HIEROGLYPH-13F96;Lo;0;L;;;;;N;;;;; +13F97;EGYPTIAN HIEROGLYPH-13F97;Lo;0;L;;;;;N;;;;; +13F98;EGYPTIAN HIEROGLYPH-13F98;Lo;0;L;;;;;N;;;;; +13F99;EGYPTIAN HIEROGLYPH-13F99;Lo;0;L;;;;;N;;;;; +13F9A;EGYPTIAN HIEROGLYPH-13F9A;Lo;0;L;;;;;N;;;;; +13F9B;EGYPTIAN HIEROGLYPH-13F9B;Lo;0;L;;;;;N;;;;; +13F9C;EGYPTIAN HIEROGLYPH-13F9C;Lo;0;L;;;;;N;;;;; +13F9D;EGYPTIAN HIEROGLYPH-13F9D;Lo;0;L;;;;;N;;;;; +13F9E;EGYPTIAN HIEROGLYPH-13F9E;Lo;0;L;;;;;N;;;;; +13F9F;EGYPTIAN HIEROGLYPH-13F9F;Lo;0;L;;;;;N;;;;; +13FA0;EGYPTIAN HIEROGLYPH-13FA0;Lo;0;L;;;;;N;;;;; +13FA1;EGYPTIAN HIEROGLYPH-13FA1;Lo;0;L;;;;;N;;;;; +13FA2;EGYPTIAN HIEROGLYPH-13FA2;Lo;0;L;;;;;N;;;;; +13FA3;EGYPTIAN HIEROGLYPH-13FA3;Lo;0;L;;;;;N;;;;; +13FA4;EGYPTIAN HIEROGLYPH-13FA4;Lo;0;L;;;;;N;;;;; +13FA5;EGYPTIAN HIEROGLYPH-13FA5;Lo;0;L;;;;;N;;;;; +13FA6;EGYPTIAN HIEROGLYPH-13FA6;Lo;0;L;;;;;N;;;;; +13FA7;EGYPTIAN HIEROGLYPH-13FA7;Lo;0;L;;;;;N;;;;; +13FA8;EGYPTIAN HIEROGLYPH-13FA8;Lo;0;L;;;;;N;;;;; +13FA9;EGYPTIAN HIEROGLYPH-13FA9;Lo;0;L;;;;;N;;;;; +13FAA;EGYPTIAN HIEROGLYPH-13FAA;Lo;0;L;;;;;N;;;;; +13FAB;EGYPTIAN HIEROGLYPH-13FAB;Lo;0;L;;;;;N;;;;; +13FAC;EGYPTIAN HIEROGLYPH-13FAC;Lo;0;L;;;;;N;;;;; +13FAD;EGYPTIAN HIEROGLYPH-13FAD;Lo;0;L;;;;;N;;;;; +13FAE;EGYPTIAN HIEROGLYPH-13FAE;Lo;0;L;;;;;N;;;;; +13FAF;EGYPTIAN HIEROGLYPH-13FAF;Lo;0;L;;;;;N;;;;; +13FB0;EGYPTIAN HIEROGLYPH-13FB0;Lo;0;L;;;;;N;;;;; +13FB1;EGYPTIAN HIEROGLYPH-13FB1;Lo;0;L;;;;;N;;;;; +13FB2;EGYPTIAN HIEROGLYPH-13FB2;Lo;0;L;;;;;N;;;;; +13FB3;EGYPTIAN HIEROGLYPH-13FB3;Lo;0;L;;;;;N;;;;; +13FB4;EGYPTIAN HIEROGLYPH-13FB4;Lo;0;L;;;;;N;;;;; +13FB5;EGYPTIAN HIEROGLYPH-13FB5;Lo;0;L;;;;;N;;;;; +13FB6;EGYPTIAN HIEROGLYPH-13FB6;Lo;0;L;;;;;N;;;;; +13FB7;EGYPTIAN HIEROGLYPH-13FB7;Lo;0;L;;;;;N;;;;; +13FB8;EGYPTIAN HIEROGLYPH-13FB8;Lo;0;L;;;;;N;;;;; +13FB9;EGYPTIAN HIEROGLYPH-13FB9;Lo;0;L;;;;;N;;;;; +13FBA;EGYPTIAN HIEROGLYPH-13FBA;Lo;0;L;;;;;N;;;;; +13FBB;EGYPTIAN HIEROGLYPH-13FBB;Lo;0;L;;;;;N;;;;; +13FBC;EGYPTIAN HIEROGLYPH-13FBC;Lo;0;L;;;;;N;;;;; +13FBD;EGYPTIAN HIEROGLYPH-13FBD;Lo;0;L;;;;;N;;;;; +13FBE;EGYPTIAN HIEROGLYPH-13FBE;Lo;0;L;;;;;N;;;;; +13FBF;EGYPTIAN HIEROGLYPH-13FBF;Lo;0;L;;;;;N;;;;; +13FC0;EGYPTIAN HIEROGLYPH-13FC0;Lo;0;L;;;;;N;;;;; +13FC1;EGYPTIAN HIEROGLYPH-13FC1;Lo;0;L;;;;;N;;;;; +13FC2;EGYPTIAN HIEROGLYPH-13FC2;Lo;0;L;;;;;N;;;;; +13FC3;EGYPTIAN HIEROGLYPH-13FC3;Lo;0;L;;;;;N;;;;; +13FC4;EGYPTIAN HIEROGLYPH-13FC4;Lo;0;L;;;;;N;;;;; +13FC5;EGYPTIAN HIEROGLYPH-13FC5;Lo;0;L;;;;;N;;;;; +13FC6;EGYPTIAN HIEROGLYPH-13FC6;Lo;0;L;;;;;N;;;;; +13FC7;EGYPTIAN HIEROGLYPH-13FC7;Lo;0;L;;;;;N;;;;; +13FC8;EGYPTIAN HIEROGLYPH-13FC8;Lo;0;L;;;;;N;;;;; +13FC9;EGYPTIAN HIEROGLYPH-13FC9;Lo;0;L;;;;;N;;;;; +13FCA;EGYPTIAN HIEROGLYPH-13FCA;Lo;0;L;;;;;N;;;;; +13FCB;EGYPTIAN HIEROGLYPH-13FCB;Lo;0;L;;;;;N;;;;; +13FCC;EGYPTIAN HIEROGLYPH-13FCC;Lo;0;L;;;;;N;;;;; +13FCD;EGYPTIAN HIEROGLYPH-13FCD;Lo;0;L;;;;;N;;;;; +13FCE;EGYPTIAN HIEROGLYPH-13FCE;Lo;0;L;;;;;N;;;;; +13FCF;EGYPTIAN HIEROGLYPH-13FCF;Lo;0;L;;;;;N;;;;; +13FD0;EGYPTIAN HIEROGLYPH-13FD0;Lo;0;L;;;;;N;;;;; +13FD1;EGYPTIAN HIEROGLYPH-13FD1;Lo;0;L;;;;;N;;;;; +13FD2;EGYPTIAN HIEROGLYPH-13FD2;Lo;0;L;;;;;N;;;;; +13FD3;EGYPTIAN HIEROGLYPH-13FD3;Lo;0;L;;;;;N;;;;; +13FD4;EGYPTIAN HIEROGLYPH-13FD4;Lo;0;L;;;;;N;;;;; +13FD5;EGYPTIAN HIEROGLYPH-13FD5;Lo;0;L;;;;;N;;;;; +13FD6;EGYPTIAN HIEROGLYPH-13FD6;Lo;0;L;;;;;N;;;;; +13FD7;EGYPTIAN HIEROGLYPH-13FD7;Lo;0;L;;;;;N;;;;; +13FD8;EGYPTIAN HIEROGLYPH-13FD8;Lo;0;L;;;;;N;;;;; +13FD9;EGYPTIAN HIEROGLYPH-13FD9;Lo;0;L;;;;;N;;;;; +13FDA;EGYPTIAN HIEROGLYPH-13FDA;Lo;0;L;;;;;N;;;;; +13FDB;EGYPTIAN HIEROGLYPH-13FDB;Lo;0;L;;;;;N;;;;; +13FDC;EGYPTIAN HIEROGLYPH-13FDC;Lo;0;L;;;;;N;;;;; +13FDD;EGYPTIAN HIEROGLYPH-13FDD;Lo;0;L;;;;;N;;;;; +13FDE;EGYPTIAN HIEROGLYPH-13FDE;Lo;0;L;;;;;N;;;;; +13FDF;EGYPTIAN HIEROGLYPH-13FDF;Lo;0;L;;;;;N;;;;; +13FE0;EGYPTIAN HIEROGLYPH-13FE0;Lo;0;L;;;;;N;;;;; +13FE1;EGYPTIAN HIEROGLYPH-13FE1;Lo;0;L;;;;;N;;;;; +13FE2;EGYPTIAN HIEROGLYPH-13FE2;Lo;0;L;;;;;N;;;;; +13FE3;EGYPTIAN HIEROGLYPH-13FE3;Lo;0;L;;;;;N;;;;; +13FE4;EGYPTIAN HIEROGLYPH-13FE4;Lo;0;L;;;;;N;;;;; +13FE5;EGYPTIAN HIEROGLYPH-13FE5;Lo;0;L;;;;;N;;;;; +13FE6;EGYPTIAN HIEROGLYPH-13FE6;Lo;0;L;;;;;N;;;;; +13FE7;EGYPTIAN HIEROGLYPH-13FE7;Lo;0;L;;;;;N;;;;; +13FE8;EGYPTIAN HIEROGLYPH-13FE8;Lo;0;L;;;;;N;;;;; +13FE9;EGYPTIAN HIEROGLYPH-13FE9;Lo;0;L;;;;;N;;;;; +13FEA;EGYPTIAN HIEROGLYPH-13FEA;Lo;0;L;;;;;N;;;;; +13FEB;EGYPTIAN HIEROGLYPH-13FEB;Lo;0;L;;;;;N;;;;; +13FEC;EGYPTIAN HIEROGLYPH-13FEC;Lo;0;L;;;;;N;;;;; +13FED;EGYPTIAN HIEROGLYPH-13FED;Lo;0;L;;;;;N;;;;; +13FEE;EGYPTIAN HIEROGLYPH-13FEE;Lo;0;L;;;;;N;;;;; +13FEF;EGYPTIAN HIEROGLYPH-13FEF;Lo;0;L;;;;;N;;;;; +13FF0;EGYPTIAN HIEROGLYPH-13FF0;Lo;0;L;;;;;N;;;;; +13FF1;EGYPTIAN HIEROGLYPH-13FF1;Lo;0;L;;;;;N;;;;; +13FF2;EGYPTIAN HIEROGLYPH-13FF2;Lo;0;L;;;;;N;;;;; +13FF3;EGYPTIAN HIEROGLYPH-13FF3;Lo;0;L;;;;;N;;;;; +13FF4;EGYPTIAN HIEROGLYPH-13FF4;Lo;0;L;;;;;N;;;;; +13FF5;EGYPTIAN HIEROGLYPH-13FF5;Lo;0;L;;;;;N;;;;; +13FF6;EGYPTIAN HIEROGLYPH-13FF6;Lo;0;L;;;;;N;;;;; +13FF7;EGYPTIAN HIEROGLYPH-13FF7;Lo;0;L;;;;;N;;;;; +13FF8;EGYPTIAN HIEROGLYPH-13FF8;Lo;0;L;;;;;N;;;;; +13FF9;EGYPTIAN HIEROGLYPH-13FF9;Lo;0;L;;;;;N;;;;; +13FFA;EGYPTIAN HIEROGLYPH-13FFA;Lo;0;L;;;;;N;;;;; +13FFB;EGYPTIAN HIEROGLYPH-13FFB;Lo;0;L;;;;;N;;;;; +13FFC;EGYPTIAN HIEROGLYPH-13FFC;Lo;0;L;;;;;N;;;;; +13FFD;EGYPTIAN HIEROGLYPH-13FFD;Lo;0;L;;;;;N;;;;; +13FFE;EGYPTIAN HIEROGLYPH-13FFE;Lo;0;L;;;;;N;;;;; +13FFF;EGYPTIAN HIEROGLYPH-13FFF;Lo;0;L;;;;;N;;;;; +14000;EGYPTIAN HIEROGLYPH-14000;Lo;0;L;;;;;N;;;;; +14001;EGYPTIAN HIEROGLYPH-14001;Lo;0;L;;;;;N;;;;; +14002;EGYPTIAN HIEROGLYPH-14002;Lo;0;L;;;;;N;;;;; +14003;EGYPTIAN HIEROGLYPH-14003;Lo;0;L;;;;;N;;;;; +14004;EGYPTIAN HIEROGLYPH-14004;Lo;0;L;;;;;N;;;;; +14005;EGYPTIAN HIEROGLYPH-14005;Lo;0;L;;;;;N;;;;; +14006;EGYPTIAN HIEROGLYPH-14006;Lo;0;L;;;;;N;;;;; +14007;EGYPTIAN HIEROGLYPH-14007;Lo;0;L;;;;;N;;;;; +14008;EGYPTIAN HIEROGLYPH-14008;Lo;0;L;;;;;N;;;;; +14009;EGYPTIAN HIEROGLYPH-14009;Lo;0;L;;;;;N;;;;; +1400A;EGYPTIAN HIEROGLYPH-1400A;Lo;0;L;;;;;N;;;;; +1400B;EGYPTIAN HIEROGLYPH-1400B;Lo;0;L;;;;;N;;;;; +1400C;EGYPTIAN HIEROGLYPH-1400C;Lo;0;L;;;;;N;;;;; +1400D;EGYPTIAN HIEROGLYPH-1400D;Lo;0;L;;;;;N;;;;; +1400E;EGYPTIAN HIEROGLYPH-1400E;Lo;0;L;;;;;N;;;;; +1400F;EGYPTIAN HIEROGLYPH-1400F;Lo;0;L;;;;;N;;;;; +14010;EGYPTIAN HIEROGLYPH-14010;Lo;0;L;;;;;N;;;;; +14011;EGYPTIAN HIEROGLYPH-14011;Lo;0;L;;;;;N;;;;; +14012;EGYPTIAN HIEROGLYPH-14012;Lo;0;L;;;;;N;;;;; +14013;EGYPTIAN HIEROGLYPH-14013;Lo;0;L;;;;;N;;;;; +14014;EGYPTIAN HIEROGLYPH-14014;Lo;0;L;;;;;N;;;;; +14015;EGYPTIAN HIEROGLYPH-14015;Lo;0;L;;;;;N;;;;; +14016;EGYPTIAN HIEROGLYPH-14016;Lo;0;L;;;;;N;;;;; +14017;EGYPTIAN HIEROGLYPH-14017;Lo;0;L;;;;;N;;;;; +14018;EGYPTIAN HIEROGLYPH-14018;Lo;0;L;;;;;N;;;;; +14019;EGYPTIAN HIEROGLYPH-14019;Lo;0;L;;;;;N;;;;; +1401A;EGYPTIAN HIEROGLYPH-1401A;Lo;0;L;;;;;N;;;;; +1401B;EGYPTIAN HIEROGLYPH-1401B;Lo;0;L;;;;;N;;;;; +1401C;EGYPTIAN HIEROGLYPH-1401C;Lo;0;L;;;;;N;;;;; +1401D;EGYPTIAN HIEROGLYPH-1401D;Lo;0;L;;;;;N;;;;; +1401E;EGYPTIAN HIEROGLYPH-1401E;Lo;0;L;;;;;N;;;;; +1401F;EGYPTIAN HIEROGLYPH-1401F;Lo;0;L;;;;;N;;;;; +14020;EGYPTIAN HIEROGLYPH-14020;Lo;0;L;;;;;N;;;;; +14021;EGYPTIAN HIEROGLYPH-14021;Lo;0;L;;;;;N;;;;; +14022;EGYPTIAN HIEROGLYPH-14022;Lo;0;L;;;;;N;;;;; +14023;EGYPTIAN HIEROGLYPH-14023;Lo;0;L;;;;;N;;;;; +14024;EGYPTIAN HIEROGLYPH-14024;Lo;0;L;;;;;N;;;;; +14025;EGYPTIAN HIEROGLYPH-14025;Lo;0;L;;;;;N;;;;; +14026;EGYPTIAN HIEROGLYPH-14026;Lo;0;L;;;;;N;;;;; +14027;EGYPTIAN HIEROGLYPH-14027;Lo;0;L;;;;;N;;;;; +14028;EGYPTIAN HIEROGLYPH-14028;Lo;0;L;;;;;N;;;;; +14029;EGYPTIAN HIEROGLYPH-14029;Lo;0;L;;;;;N;;;;; +1402A;EGYPTIAN HIEROGLYPH-1402A;Lo;0;L;;;;;N;;;;; +1402B;EGYPTIAN HIEROGLYPH-1402B;Lo;0;L;;;;;N;;;;; +1402C;EGYPTIAN HIEROGLYPH-1402C;Lo;0;L;;;;;N;;;;; +1402D;EGYPTIAN HIEROGLYPH-1402D;Lo;0;L;;;;;N;;;;; +1402E;EGYPTIAN HIEROGLYPH-1402E;Lo;0;L;;;;;N;;;;; +1402F;EGYPTIAN HIEROGLYPH-1402F;Lo;0;L;;;;;N;;;;; +14030;EGYPTIAN HIEROGLYPH-14030;Lo;0;L;;;;;N;;;;; +14031;EGYPTIAN HIEROGLYPH-14031;Lo;0;L;;;;;N;;;;; +14032;EGYPTIAN HIEROGLYPH-14032;Lo;0;L;;;;;N;;;;; +14033;EGYPTIAN HIEROGLYPH-14033;Lo;0;L;;;;;N;;;;; +14034;EGYPTIAN HIEROGLYPH-14034;Lo;0;L;;;;;N;;;;; +14035;EGYPTIAN HIEROGLYPH-14035;Lo;0;L;;;;;N;;;;; +14036;EGYPTIAN HIEROGLYPH-14036;Lo;0;L;;;;;N;;;;; +14037;EGYPTIAN HIEROGLYPH-14037;Lo;0;L;;;;;N;;;;; +14038;EGYPTIAN HIEROGLYPH-14038;Lo;0;L;;;;;N;;;;; +14039;EGYPTIAN HIEROGLYPH-14039;Lo;0;L;;;;;N;;;;; +1403A;EGYPTIAN HIEROGLYPH-1403A;Lo;0;L;;;;;N;;;;; +1403B;EGYPTIAN HIEROGLYPH-1403B;Lo;0;L;;;;;N;;;;; +1403C;EGYPTIAN HIEROGLYPH-1403C;Lo;0;L;;;;;N;;;;; +1403D;EGYPTIAN HIEROGLYPH-1403D;Lo;0;L;;;;;N;;;;; +1403E;EGYPTIAN HIEROGLYPH-1403E;Lo;0;L;;;;;N;;;;; +1403F;EGYPTIAN HIEROGLYPH-1403F;Lo;0;L;;;;;N;;;;; +14040;EGYPTIAN HIEROGLYPH-14040;Lo;0;L;;;;;N;;;;; +14041;EGYPTIAN HIEROGLYPH-14041;Lo;0;L;;;;;N;;;;; +14042;EGYPTIAN HIEROGLYPH-14042;Lo;0;L;;;;;N;;;;; +14043;EGYPTIAN HIEROGLYPH-14043;Lo;0;L;;;;;N;;;;; +14044;EGYPTIAN HIEROGLYPH-14044;Lo;0;L;;;;;N;;;;; +14045;EGYPTIAN HIEROGLYPH-14045;Lo;0;L;;;;;N;;;;; +14046;EGYPTIAN HIEROGLYPH-14046;Lo;0;L;;;;;N;;;;; +14047;EGYPTIAN HIEROGLYPH-14047;Lo;0;L;;;;;N;;;;; +14048;EGYPTIAN HIEROGLYPH-14048;Lo;0;L;;;;;N;;;;; +14049;EGYPTIAN HIEROGLYPH-14049;Lo;0;L;;;;;N;;;;; +1404A;EGYPTIAN HIEROGLYPH-1404A;Lo;0;L;;;;;N;;;;; +1404B;EGYPTIAN HIEROGLYPH-1404B;Lo;0;L;;;;;N;;;;; +1404C;EGYPTIAN HIEROGLYPH-1404C;Lo;0;L;;;;;N;;;;; +1404D;EGYPTIAN HIEROGLYPH-1404D;Lo;0;L;;;;;N;;;;; +1404E;EGYPTIAN HIEROGLYPH-1404E;Lo;0;L;;;;;N;;;;; +1404F;EGYPTIAN HIEROGLYPH-1404F;Lo;0;L;;;;;N;;;;; +14050;EGYPTIAN HIEROGLYPH-14050;Lo;0;L;;;;;N;;;;; +14051;EGYPTIAN HIEROGLYPH-14051;Lo;0;L;;;;;N;;;;; +14052;EGYPTIAN HIEROGLYPH-14052;Lo;0;L;;;;;N;;;;; +14053;EGYPTIAN HIEROGLYPH-14053;Lo;0;L;;;;;N;;;;; +14054;EGYPTIAN HIEROGLYPH-14054;Lo;0;L;;;;;N;;;;; +14055;EGYPTIAN HIEROGLYPH-14055;Lo;0;L;;;;;N;;;;; +14056;EGYPTIAN HIEROGLYPH-14056;Lo;0;L;;;;;N;;;;; +14057;EGYPTIAN HIEROGLYPH-14057;Lo;0;L;;;;;N;;;;; +14058;EGYPTIAN HIEROGLYPH-14058;Lo;0;L;;;;;N;;;;; +14059;EGYPTIAN HIEROGLYPH-14059;Lo;0;L;;;;;N;;;;; +1405A;EGYPTIAN HIEROGLYPH-1405A;Lo;0;L;;;;;N;;;;; +1405B;EGYPTIAN HIEROGLYPH-1405B;Lo;0;L;;;;;N;;;;; +1405C;EGYPTIAN HIEROGLYPH-1405C;Lo;0;L;;;;;N;;;;; +1405D;EGYPTIAN HIEROGLYPH-1405D;Lo;0;L;;;;;N;;;;; +1405E;EGYPTIAN HIEROGLYPH-1405E;Lo;0;L;;;;;N;;;;; +1405F;EGYPTIAN HIEROGLYPH-1405F;Lo;0;L;;;;;N;;;;; +14060;EGYPTIAN HIEROGLYPH-14060;Lo;0;L;;;;;N;;;;; +14061;EGYPTIAN HIEROGLYPH-14061;Lo;0;L;;;;;N;;;;; +14062;EGYPTIAN HIEROGLYPH-14062;Lo;0;L;;;;;N;;;;; +14063;EGYPTIAN HIEROGLYPH-14063;Lo;0;L;;;;;N;;;;; +14064;EGYPTIAN HIEROGLYPH-14064;Lo;0;L;;;;;N;;;;; +14065;EGYPTIAN HIEROGLYPH-14065;Lo;0;L;;;;;N;;;;; +14066;EGYPTIAN HIEROGLYPH-14066;Lo;0;L;;;;;N;;;;; +14067;EGYPTIAN HIEROGLYPH-14067;Lo;0;L;;;;;N;;;;; +14068;EGYPTIAN HIEROGLYPH-14068;Lo;0;L;;;;;N;;;;; +14069;EGYPTIAN HIEROGLYPH-14069;Lo;0;L;;;;;N;;;;; +1406A;EGYPTIAN HIEROGLYPH-1406A;Lo;0;L;;;;;N;;;;; +1406B;EGYPTIAN HIEROGLYPH-1406B;Lo;0;L;;;;;N;;;;; +1406C;EGYPTIAN HIEROGLYPH-1406C;Lo;0;L;;;;;N;;;;; +1406D;EGYPTIAN HIEROGLYPH-1406D;Lo;0;L;;;;;N;;;;; +1406E;EGYPTIAN HIEROGLYPH-1406E;Lo;0;L;;;;;N;;;;; +1406F;EGYPTIAN HIEROGLYPH-1406F;Lo;0;L;;;;;N;;;;; +14070;EGYPTIAN HIEROGLYPH-14070;Lo;0;L;;;;;N;;;;; +14071;EGYPTIAN HIEROGLYPH-14071;Lo;0;L;;;;;N;;;;; +14072;EGYPTIAN HIEROGLYPH-14072;Lo;0;L;;;;;N;;;;; +14073;EGYPTIAN HIEROGLYPH-14073;Lo;0;L;;;;;N;;;;; +14074;EGYPTIAN HIEROGLYPH-14074;Lo;0;L;;;;;N;;;;; +14075;EGYPTIAN HIEROGLYPH-14075;Lo;0;L;;;;;N;;;;; +14076;EGYPTIAN HIEROGLYPH-14076;Lo;0;L;;;;;N;;;;; +14077;EGYPTIAN HIEROGLYPH-14077;Lo;0;L;;;;;N;;;;; +14078;EGYPTIAN HIEROGLYPH-14078;Lo;0;L;;;;;N;;;;; +14079;EGYPTIAN HIEROGLYPH-14079;Lo;0;L;;;;;N;;;;; +1407A;EGYPTIAN HIEROGLYPH-1407A;Lo;0;L;;;;;N;;;;; +1407B;EGYPTIAN HIEROGLYPH-1407B;Lo;0;L;;;;;N;;;;; +1407C;EGYPTIAN HIEROGLYPH-1407C;Lo;0;L;;;;;N;;;;; +1407D;EGYPTIAN HIEROGLYPH-1407D;Lo;0;L;;;;;N;;;;; +1407E;EGYPTIAN HIEROGLYPH-1407E;Lo;0;L;;;;;N;;;;; +1407F;EGYPTIAN HIEROGLYPH-1407F;Lo;0;L;;;;;N;;;;; +14080;EGYPTIAN HIEROGLYPH-14080;Lo;0;L;;;;;N;;;;; +14081;EGYPTIAN HIEROGLYPH-14081;Lo;0;L;;;;;N;;;;; +14082;EGYPTIAN HIEROGLYPH-14082;Lo;0;L;;;;;N;;;;; +14083;EGYPTIAN HIEROGLYPH-14083;Lo;0;L;;;;;N;;;;; +14084;EGYPTIAN HIEROGLYPH-14084;Lo;0;L;;;;;N;;;;; +14085;EGYPTIAN HIEROGLYPH-14085;Lo;0;L;;;;;N;;;;; +14086;EGYPTIAN HIEROGLYPH-14086;Lo;0;L;;;;;N;;;;; +14087;EGYPTIAN HIEROGLYPH-14087;Lo;0;L;;;;;N;;;;; +14088;EGYPTIAN HIEROGLYPH-14088;Lo;0;L;;;;;N;;;;; +14089;EGYPTIAN HIEROGLYPH-14089;Lo;0;L;;;;;N;;;;; +1408A;EGYPTIAN HIEROGLYPH-1408A;Lo;0;L;;;;;N;;;;; +1408B;EGYPTIAN HIEROGLYPH-1408B;Lo;0;L;;;;;N;;;;; +1408C;EGYPTIAN HIEROGLYPH-1408C;Lo;0;L;;;;;N;;;;; +1408D;EGYPTIAN HIEROGLYPH-1408D;Lo;0;L;;;;;N;;;;; +1408E;EGYPTIAN HIEROGLYPH-1408E;Lo;0;L;;;;;N;;;;; +1408F;EGYPTIAN HIEROGLYPH-1408F;Lo;0;L;;;;;N;;;;; +14090;EGYPTIAN HIEROGLYPH-14090;Lo;0;L;;;;;N;;;;; +14091;EGYPTIAN HIEROGLYPH-14091;Lo;0;L;;;;;N;;;;; +14092;EGYPTIAN HIEROGLYPH-14092;Lo;0;L;;;;;N;;;;; +14093;EGYPTIAN HIEROGLYPH-14093;Lo;0;L;;;;;N;;;;; +14094;EGYPTIAN HIEROGLYPH-14094;Lo;0;L;;;;;N;;;;; +14095;EGYPTIAN HIEROGLYPH-14095;Lo;0;L;;;;;N;;;;; +14096;EGYPTIAN HIEROGLYPH-14096;Lo;0;L;;;;;N;;;;; +14097;EGYPTIAN HIEROGLYPH-14097;Lo;0;L;;;;;N;;;;; +14098;EGYPTIAN HIEROGLYPH-14098;Lo;0;L;;;;;N;;;;; +14099;EGYPTIAN HIEROGLYPH-14099;Lo;0;L;;;;;N;;;;; +1409A;EGYPTIAN HIEROGLYPH-1409A;Lo;0;L;;;;;N;;;;; +1409B;EGYPTIAN HIEROGLYPH-1409B;Lo;0;L;;;;;N;;;;; +1409C;EGYPTIAN HIEROGLYPH-1409C;Lo;0;L;;;;;N;;;;; +1409D;EGYPTIAN HIEROGLYPH-1409D;Lo;0;L;;;;;N;;;;; +1409E;EGYPTIAN HIEROGLYPH-1409E;Lo;0;L;;;;;N;;;;; +1409F;EGYPTIAN HIEROGLYPH-1409F;Lo;0;L;;;;;N;;;;; +140A0;EGYPTIAN HIEROGLYPH-140A0;Lo;0;L;;;;;N;;;;; +140A1;EGYPTIAN HIEROGLYPH-140A1;Lo;0;L;;;;;N;;;;; +140A2;EGYPTIAN HIEROGLYPH-140A2;Lo;0;L;;;;;N;;;;; +140A3;EGYPTIAN HIEROGLYPH-140A3;Lo;0;L;;;;;N;;;;; +140A4;EGYPTIAN HIEROGLYPH-140A4;Lo;0;L;;;;;N;;;;; +140A5;EGYPTIAN HIEROGLYPH-140A5;Lo;0;L;;;;;N;;;;; +140A6;EGYPTIAN HIEROGLYPH-140A6;Lo;0;L;;;;;N;;;;; +140A7;EGYPTIAN HIEROGLYPH-140A7;Lo;0;L;;;;;N;;;;; +140A8;EGYPTIAN HIEROGLYPH-140A8;Lo;0;L;;;;;N;;;;; +140A9;EGYPTIAN HIEROGLYPH-140A9;Lo;0;L;;;;;N;;;;; +140AA;EGYPTIAN HIEROGLYPH-140AA;Lo;0;L;;;;;N;;;;; +140AB;EGYPTIAN HIEROGLYPH-140AB;Lo;0;L;;;;;N;;;;; +140AC;EGYPTIAN HIEROGLYPH-140AC;Lo;0;L;;;;;N;;;;; +140AD;EGYPTIAN HIEROGLYPH-140AD;Lo;0;L;;;;;N;;;;; +140AE;EGYPTIAN HIEROGLYPH-140AE;Lo;0;L;;;;;N;;;;; +140AF;EGYPTIAN HIEROGLYPH-140AF;Lo;0;L;;;;;N;;;;; +140B0;EGYPTIAN HIEROGLYPH-140B0;Lo;0;L;;;;;N;;;;; +140B1;EGYPTIAN HIEROGLYPH-140B1;Lo;0;L;;;;;N;;;;; +140B2;EGYPTIAN HIEROGLYPH-140B2;Lo;0;L;;;;;N;;;;; +140B3;EGYPTIAN HIEROGLYPH-140B3;Lo;0;L;;;;;N;;;;; +140B4;EGYPTIAN HIEROGLYPH-140B4;Lo;0;L;;;;;N;;;;; +140B5;EGYPTIAN HIEROGLYPH-140B5;Lo;0;L;;;;;N;;;;; +140B6;EGYPTIAN HIEROGLYPH-140B6;Lo;0;L;;;;;N;;;;; +140B7;EGYPTIAN HIEROGLYPH-140B7;Lo;0;L;;;;;N;;;;; +140B8;EGYPTIAN HIEROGLYPH-140B8;Lo;0;L;;;;;N;;;;; +140B9;EGYPTIAN HIEROGLYPH-140B9;Lo;0;L;;;;;N;;;;; +140BA;EGYPTIAN HIEROGLYPH-140BA;Lo;0;L;;;;;N;;;;; +140BB;EGYPTIAN HIEROGLYPH-140BB;Lo;0;L;;;;;N;;;;; +140BC;EGYPTIAN HIEROGLYPH-140BC;Lo;0;L;;;;;N;;;;; +140BD;EGYPTIAN HIEROGLYPH-140BD;Lo;0;L;;;;;N;;;;; +140BE;EGYPTIAN HIEROGLYPH-140BE;Lo;0;L;;;;;N;;;;; +140BF;EGYPTIAN HIEROGLYPH-140BF;Lo;0;L;;;;;N;;;;; +140C0;EGYPTIAN HIEROGLYPH-140C0;Lo;0;L;;;;;N;;;;; +140C1;EGYPTIAN HIEROGLYPH-140C1;Lo;0;L;;;;;N;;;;; +140C2;EGYPTIAN HIEROGLYPH-140C2;Lo;0;L;;;;;N;;;;; +140C3;EGYPTIAN HIEROGLYPH-140C3;Lo;0;L;;;;;N;;;;; +140C4;EGYPTIAN HIEROGLYPH-140C4;Lo;0;L;;;;;N;;;;; +140C5;EGYPTIAN HIEROGLYPH-140C5;Lo;0;L;;;;;N;;;;; +140C6;EGYPTIAN HIEROGLYPH-140C6;Lo;0;L;;;;;N;;;;; +140C7;EGYPTIAN HIEROGLYPH-140C7;Lo;0;L;;;;;N;;;;; +140C8;EGYPTIAN HIEROGLYPH-140C8;Lo;0;L;;;;;N;;;;; +140C9;EGYPTIAN HIEROGLYPH-140C9;Lo;0;L;;;;;N;;;;; +140CA;EGYPTIAN HIEROGLYPH-140CA;Lo;0;L;;;;;N;;;;; +140CB;EGYPTIAN HIEROGLYPH-140CB;Lo;0;L;;;;;N;;;;; +140CC;EGYPTIAN HIEROGLYPH-140CC;Lo;0;L;;;;;N;;;;; +140CD;EGYPTIAN HIEROGLYPH-140CD;Lo;0;L;;;;;N;;;;; +140CE;EGYPTIAN HIEROGLYPH-140CE;Lo;0;L;;;;;N;;;;; +140CF;EGYPTIAN HIEROGLYPH-140CF;Lo;0;L;;;;;N;;;;; +140D0;EGYPTIAN HIEROGLYPH-140D0;Lo;0;L;;;;;N;;;;; +140D1;EGYPTIAN HIEROGLYPH-140D1;Lo;0;L;;;;;N;;;;; +140D2;EGYPTIAN HIEROGLYPH-140D2;Lo;0;L;;;;;N;;;;; +140D3;EGYPTIAN HIEROGLYPH-140D3;Lo;0;L;;;;;N;;;;; +140D4;EGYPTIAN HIEROGLYPH-140D4;Lo;0;L;;;;;N;;;;; +140D5;EGYPTIAN HIEROGLYPH-140D5;Lo;0;L;;;;;N;;;;; +140D6;EGYPTIAN HIEROGLYPH-140D6;Lo;0;L;;;;;N;;;;; +140D7;EGYPTIAN HIEROGLYPH-140D7;Lo;0;L;;;;;N;;;;; +140D8;EGYPTIAN HIEROGLYPH-140D8;Lo;0;L;;;;;N;;;;; +140D9;EGYPTIAN HIEROGLYPH-140D9;Lo;0;L;;;;;N;;;;; +140DA;EGYPTIAN HIEROGLYPH-140DA;Lo;0;L;;;;;N;;;;; +140DB;EGYPTIAN HIEROGLYPH-140DB;Lo;0;L;;;;;N;;;;; +140DC;EGYPTIAN HIEROGLYPH-140DC;Lo;0;L;;;;;N;;;;; +140DD;EGYPTIAN HIEROGLYPH-140DD;Lo;0;L;;;;;N;;;;; +140DE;EGYPTIAN HIEROGLYPH-140DE;Lo;0;L;;;;;N;;;;; +140DF;EGYPTIAN HIEROGLYPH-140DF;Lo;0;L;;;;;N;;;;; +140E0;EGYPTIAN HIEROGLYPH-140E0;Lo;0;L;;;;;N;;;;; +140E1;EGYPTIAN HIEROGLYPH-140E1;Lo;0;L;;;;;N;;;;; +140E2;EGYPTIAN HIEROGLYPH-140E2;Lo;0;L;;;;;N;;;;; +140E3;EGYPTIAN HIEROGLYPH-140E3;Lo;0;L;;;;;N;;;;; +140E4;EGYPTIAN HIEROGLYPH-140E4;Lo;0;L;;;;;N;;;;; +140E5;EGYPTIAN HIEROGLYPH-140E5;Lo;0;L;;;;;N;;;;; +140E6;EGYPTIAN HIEROGLYPH-140E6;Lo;0;L;;;;;N;;;;; +140E7;EGYPTIAN HIEROGLYPH-140E7;Lo;0;L;;;;;N;;;;; +140E8;EGYPTIAN HIEROGLYPH-140E8;Lo;0;L;;;;;N;;;;; +140E9;EGYPTIAN HIEROGLYPH-140E9;Lo;0;L;;;;;N;;;;; +140EA;EGYPTIAN HIEROGLYPH-140EA;Lo;0;L;;;;;N;;;;; +140EB;EGYPTIAN HIEROGLYPH-140EB;Lo;0;L;;;;;N;;;;; +140EC;EGYPTIAN HIEROGLYPH-140EC;Lo;0;L;;;;;N;;;;; +140ED;EGYPTIAN HIEROGLYPH-140ED;Lo;0;L;;;;;N;;;;; +140EE;EGYPTIAN HIEROGLYPH-140EE;Lo;0;L;;;;;N;;;;; +140EF;EGYPTIAN HIEROGLYPH-140EF;Lo;0;L;;;;;N;;;;; +140F0;EGYPTIAN HIEROGLYPH-140F0;Lo;0;L;;;;;N;;;;; +140F1;EGYPTIAN HIEROGLYPH-140F1;Lo;0;L;;;;;N;;;;; +140F2;EGYPTIAN HIEROGLYPH-140F2;Lo;0;L;;;;;N;;;;; +140F3;EGYPTIAN HIEROGLYPH-140F3;Lo;0;L;;;;;N;;;;; +140F4;EGYPTIAN HIEROGLYPH-140F4;Lo;0;L;;;;;N;;;;; +140F5;EGYPTIAN HIEROGLYPH-140F5;Lo;0;L;;;;;N;;;;; +140F6;EGYPTIAN HIEROGLYPH-140F6;Lo;0;L;;;;;N;;;;; +140F7;EGYPTIAN HIEROGLYPH-140F7;Lo;0;L;;;;;N;;;;; +140F8;EGYPTIAN HIEROGLYPH-140F8;Lo;0;L;;;;;N;;;;; +140F9;EGYPTIAN HIEROGLYPH-140F9;Lo;0;L;;;;;N;;;;; +140FA;EGYPTIAN HIEROGLYPH-140FA;Lo;0;L;;;;;N;;;;; +140FB;EGYPTIAN HIEROGLYPH-140FB;Lo;0;L;;;;;N;;;;; +140FC;EGYPTIAN HIEROGLYPH-140FC;Lo;0;L;;;;;N;;;;; +140FD;EGYPTIAN HIEROGLYPH-140FD;Lo;0;L;;;;;N;;;;; +140FE;EGYPTIAN HIEROGLYPH-140FE;Lo;0;L;;;;;N;;;;; +140FF;EGYPTIAN HIEROGLYPH-140FF;Lo;0;L;;;;;N;;;;; +14100;EGYPTIAN HIEROGLYPH-14100;Lo;0;L;;;;;N;;;;; +14101;EGYPTIAN HIEROGLYPH-14101;Lo;0;L;;;;;N;;;;; +14102;EGYPTIAN HIEROGLYPH-14102;Lo;0;L;;;;;N;;;;; +14103;EGYPTIAN HIEROGLYPH-14103;Lo;0;L;;;;;N;;;;; +14104;EGYPTIAN HIEROGLYPH-14104;Lo;0;L;;;;;N;;;;; +14105;EGYPTIAN HIEROGLYPH-14105;Lo;0;L;;;;;N;;;;; +14106;EGYPTIAN HIEROGLYPH-14106;Lo;0;L;;;;;N;;;;; +14107;EGYPTIAN HIEROGLYPH-14107;Lo;0;L;;;;;N;;;;; +14108;EGYPTIAN HIEROGLYPH-14108;Lo;0;L;;;;;N;;;;; +14109;EGYPTIAN HIEROGLYPH-14109;Lo;0;L;;;;;N;;;;; +1410A;EGYPTIAN HIEROGLYPH-1410A;Lo;0;L;;;;;N;;;;; +1410B;EGYPTIAN HIEROGLYPH-1410B;Lo;0;L;;;;;N;;;;; +1410C;EGYPTIAN HIEROGLYPH-1410C;Lo;0;L;;;;;N;;;;; +1410D;EGYPTIAN HIEROGLYPH-1410D;Lo;0;L;;;;;N;;;;; +1410E;EGYPTIAN HIEROGLYPH-1410E;Lo;0;L;;;;;N;;;;; +1410F;EGYPTIAN HIEROGLYPH-1410F;Lo;0;L;;;;;N;;;;; +14110;EGYPTIAN HIEROGLYPH-14110;Lo;0;L;;;;;N;;;;; +14111;EGYPTIAN HIEROGLYPH-14111;Lo;0;L;;;;;N;;;;; +14112;EGYPTIAN HIEROGLYPH-14112;Lo;0;L;;;;;N;;;;; +14113;EGYPTIAN HIEROGLYPH-14113;Lo;0;L;;;;;N;;;;; +14114;EGYPTIAN HIEROGLYPH-14114;Lo;0;L;;;;;N;;;;; +14115;EGYPTIAN HIEROGLYPH-14115;Lo;0;L;;;;;N;;;;; +14116;EGYPTIAN HIEROGLYPH-14116;Lo;0;L;;;;;N;;;;; +14117;EGYPTIAN HIEROGLYPH-14117;Lo;0;L;;;;;N;;;;; +14118;EGYPTIAN HIEROGLYPH-14118;Lo;0;L;;;;;N;;;;; +14119;EGYPTIAN HIEROGLYPH-14119;Lo;0;L;;;;;N;;;;; +1411A;EGYPTIAN HIEROGLYPH-1411A;Lo;0;L;;;;;N;;;;; +1411B;EGYPTIAN HIEROGLYPH-1411B;Lo;0;L;;;;;N;;;;; +1411C;EGYPTIAN HIEROGLYPH-1411C;Lo;0;L;;;;;N;;;;; +1411D;EGYPTIAN HIEROGLYPH-1411D;Lo;0;L;;;;;N;;;;; +1411E;EGYPTIAN HIEROGLYPH-1411E;Lo;0;L;;;;;N;;;;; +1411F;EGYPTIAN HIEROGLYPH-1411F;Lo;0;L;;;;;N;;;;; +14120;EGYPTIAN HIEROGLYPH-14120;Lo;0;L;;;;;N;;;;; +14121;EGYPTIAN HIEROGLYPH-14121;Lo;0;L;;;;;N;;;;; +14122;EGYPTIAN HIEROGLYPH-14122;Lo;0;L;;;;;N;;;;; +14123;EGYPTIAN HIEROGLYPH-14123;Lo;0;L;;;;;N;;;;; +14124;EGYPTIAN HIEROGLYPH-14124;Lo;0;L;;;;;N;;;;; +14125;EGYPTIAN HIEROGLYPH-14125;Lo;0;L;;;;;N;;;;; +14126;EGYPTIAN HIEROGLYPH-14126;Lo;0;L;;;;;N;;;;; +14127;EGYPTIAN HIEROGLYPH-14127;Lo;0;L;;;;;N;;;;; +14128;EGYPTIAN HIEROGLYPH-14128;Lo;0;L;;;;;N;;;;; +14129;EGYPTIAN HIEROGLYPH-14129;Lo;0;L;;;;;N;;;;; +1412A;EGYPTIAN HIEROGLYPH-1412A;Lo;0;L;;;;;N;;;;; +1412B;EGYPTIAN HIEROGLYPH-1412B;Lo;0;L;;;;;N;;;;; +1412C;EGYPTIAN HIEROGLYPH-1412C;Lo;0;L;;;;;N;;;;; +1412D;EGYPTIAN HIEROGLYPH-1412D;Lo;0;L;;;;;N;;;;; +1412E;EGYPTIAN HIEROGLYPH-1412E;Lo;0;L;;;;;N;;;;; +1412F;EGYPTIAN HIEROGLYPH-1412F;Lo;0;L;;;;;N;;;;; +14130;EGYPTIAN HIEROGLYPH-14130;Lo;0;L;;;;;N;;;;; +14131;EGYPTIAN HIEROGLYPH-14131;Lo;0;L;;;;;N;;;;; +14132;EGYPTIAN HIEROGLYPH-14132;Lo;0;L;;;;;N;;;;; +14133;EGYPTIAN HIEROGLYPH-14133;Lo;0;L;;;;;N;;;;; +14134;EGYPTIAN HIEROGLYPH-14134;Lo;0;L;;;;;N;;;;; +14135;EGYPTIAN HIEROGLYPH-14135;Lo;0;L;;;;;N;;;;; +14136;EGYPTIAN HIEROGLYPH-14136;Lo;0;L;;;;;N;;;;; +14137;EGYPTIAN HIEROGLYPH-14137;Lo;0;L;;;;;N;;;;; +14138;EGYPTIAN HIEROGLYPH-14138;Lo;0;L;;;;;N;;;;; +14139;EGYPTIAN HIEROGLYPH-14139;Lo;0;L;;;;;N;;;;; +1413A;EGYPTIAN HIEROGLYPH-1413A;Lo;0;L;;;;;N;;;;; +1413B;EGYPTIAN HIEROGLYPH-1413B;Lo;0;L;;;;;N;;;;; +1413C;EGYPTIAN HIEROGLYPH-1413C;Lo;0;L;;;;;N;;;;; +1413D;EGYPTIAN HIEROGLYPH-1413D;Lo;0;L;;;;;N;;;;; +1413E;EGYPTIAN HIEROGLYPH-1413E;Lo;0;L;;;;;N;;;;; +1413F;EGYPTIAN HIEROGLYPH-1413F;Lo;0;L;;;;;N;;;;; +14140;EGYPTIAN HIEROGLYPH-14140;Lo;0;L;;;;;N;;;;; +14141;EGYPTIAN HIEROGLYPH-14141;Lo;0;L;;;;;N;;;;; +14142;EGYPTIAN HIEROGLYPH-14142;Lo;0;L;;;;;N;;;;; +14143;EGYPTIAN HIEROGLYPH-14143;Lo;0;L;;;;;N;;;;; +14144;EGYPTIAN HIEROGLYPH-14144;Lo;0;L;;;;;N;;;;; +14145;EGYPTIAN HIEROGLYPH-14145;Lo;0;L;;;;;N;;;;; +14146;EGYPTIAN HIEROGLYPH-14146;Lo;0;L;;;;;N;;;;; +14147;EGYPTIAN HIEROGLYPH-14147;Lo;0;L;;;;;N;;;;; +14148;EGYPTIAN HIEROGLYPH-14148;Lo;0;L;;;;;N;;;;; +14149;EGYPTIAN HIEROGLYPH-14149;Lo;0;L;;;;;N;;;;; +1414A;EGYPTIAN HIEROGLYPH-1414A;Lo;0;L;;;;;N;;;;; +1414B;EGYPTIAN HIEROGLYPH-1414B;Lo;0;L;;;;;N;;;;; +1414C;EGYPTIAN HIEROGLYPH-1414C;Lo;0;L;;;;;N;;;;; +1414D;EGYPTIAN HIEROGLYPH-1414D;Lo;0;L;;;;;N;;;;; +1414E;EGYPTIAN HIEROGLYPH-1414E;Lo;0;L;;;;;N;;;;; +1414F;EGYPTIAN HIEROGLYPH-1414F;Lo;0;L;;;;;N;;;;; +14150;EGYPTIAN HIEROGLYPH-14150;Lo;0;L;;;;;N;;;;; +14151;EGYPTIAN HIEROGLYPH-14151;Lo;0;L;;;;;N;;;;; +14152;EGYPTIAN HIEROGLYPH-14152;Lo;0;L;;;;;N;;;;; +14153;EGYPTIAN HIEROGLYPH-14153;Lo;0;L;;;;;N;;;;; +14154;EGYPTIAN HIEROGLYPH-14154;Lo;0;L;;;;;N;;;;; +14155;EGYPTIAN HIEROGLYPH-14155;Lo;0;L;;;;;N;;;;; +14156;EGYPTIAN HIEROGLYPH-14156;Lo;0;L;;;;;N;;;;; +14157;EGYPTIAN HIEROGLYPH-14157;Lo;0;L;;;;;N;;;;; +14158;EGYPTIAN HIEROGLYPH-14158;Lo;0;L;;;;;N;;;;; +14159;EGYPTIAN HIEROGLYPH-14159;Lo;0;L;;;;;N;;;;; +1415A;EGYPTIAN HIEROGLYPH-1415A;Lo;0;L;;;;;N;;;;; +1415B;EGYPTIAN HIEROGLYPH-1415B;Lo;0;L;;;;;N;;;;; +1415C;EGYPTIAN HIEROGLYPH-1415C;Lo;0;L;;;;;N;;;;; +1415D;EGYPTIAN HIEROGLYPH-1415D;Lo;0;L;;;;;N;;;;; +1415E;EGYPTIAN HIEROGLYPH-1415E;Lo;0;L;;;;;N;;;;; +1415F;EGYPTIAN HIEROGLYPH-1415F;Lo;0;L;;;;;N;;;;; +14160;EGYPTIAN HIEROGLYPH-14160;Lo;0;L;;;;;N;;;;; +14161;EGYPTIAN HIEROGLYPH-14161;Lo;0;L;;;;;N;;;;; +14162;EGYPTIAN HIEROGLYPH-14162;Lo;0;L;;;;;N;;;;; +14163;EGYPTIAN HIEROGLYPH-14163;Lo;0;L;;;;;N;;;;; +14164;EGYPTIAN HIEROGLYPH-14164;Lo;0;L;;;;;N;;;;; +14165;EGYPTIAN HIEROGLYPH-14165;Lo;0;L;;;;;N;;;;; +14166;EGYPTIAN HIEROGLYPH-14166;Lo;0;L;;;;;N;;;;; +14167;EGYPTIAN HIEROGLYPH-14167;Lo;0;L;;;;;N;;;;; +14168;EGYPTIAN HIEROGLYPH-14168;Lo;0;L;;;;;N;;;;; +14169;EGYPTIAN HIEROGLYPH-14169;Lo;0;L;;;;;N;;;;; +1416A;EGYPTIAN HIEROGLYPH-1416A;Lo;0;L;;;;;N;;;;; +1416B;EGYPTIAN HIEROGLYPH-1416B;Lo;0;L;;;;;N;;;;; +1416C;EGYPTIAN HIEROGLYPH-1416C;Lo;0;L;;;;;N;;;;; +1416D;EGYPTIAN HIEROGLYPH-1416D;Lo;0;L;;;;;N;;;;; +1416E;EGYPTIAN HIEROGLYPH-1416E;Lo;0;L;;;;;N;;;;; +1416F;EGYPTIAN HIEROGLYPH-1416F;Lo;0;L;;;;;N;;;;; +14170;EGYPTIAN HIEROGLYPH-14170;Lo;0;L;;;;;N;;;;; +14171;EGYPTIAN HIEROGLYPH-14171;Lo;0;L;;;;;N;;;;; +14172;EGYPTIAN HIEROGLYPH-14172;Lo;0;L;;;;;N;;;;; +14173;EGYPTIAN HIEROGLYPH-14173;Lo;0;L;;;;;N;;;;; +14174;EGYPTIAN HIEROGLYPH-14174;Lo;0;L;;;;;N;;;;; +14175;EGYPTIAN HIEROGLYPH-14175;Lo;0;L;;;;;N;;;;; +14176;EGYPTIAN HIEROGLYPH-14176;Lo;0;L;;;;;N;;;;; +14177;EGYPTIAN HIEROGLYPH-14177;Lo;0;L;;;;;N;;;;; +14178;EGYPTIAN HIEROGLYPH-14178;Lo;0;L;;;;;N;;;;; +14179;EGYPTIAN HIEROGLYPH-14179;Lo;0;L;;;;;N;;;;; +1417A;EGYPTIAN HIEROGLYPH-1417A;Lo;0;L;;;;;N;;;;; +1417B;EGYPTIAN HIEROGLYPH-1417B;Lo;0;L;;;;;N;;;;; +1417C;EGYPTIAN HIEROGLYPH-1417C;Lo;0;L;;;;;N;;;;; +1417D;EGYPTIAN HIEROGLYPH-1417D;Lo;0;L;;;;;N;;;;; +1417E;EGYPTIAN HIEROGLYPH-1417E;Lo;0;L;;;;;N;;;;; +1417F;EGYPTIAN HIEROGLYPH-1417F;Lo;0;L;;;;;N;;;;; +14180;EGYPTIAN HIEROGLYPH-14180;Lo;0;L;;;;;N;;;;; +14181;EGYPTIAN HIEROGLYPH-14181;Lo;0;L;;;;;N;;;;; +14182;EGYPTIAN HIEROGLYPH-14182;Lo;0;L;;;;;N;;;;; +14183;EGYPTIAN HIEROGLYPH-14183;Lo;0;L;;;;;N;;;;; +14184;EGYPTIAN HIEROGLYPH-14184;Lo;0;L;;;;;N;;;;; +14185;EGYPTIAN HIEROGLYPH-14185;Lo;0;L;;;;;N;;;;; +14186;EGYPTIAN HIEROGLYPH-14186;Lo;0;L;;;;;N;;;;; +14187;EGYPTIAN HIEROGLYPH-14187;Lo;0;L;;;;;N;;;;; +14188;EGYPTIAN HIEROGLYPH-14188;Lo;0;L;;;;;N;;;;; +14189;EGYPTIAN HIEROGLYPH-14189;Lo;0;L;;;;;N;;;;; +1418A;EGYPTIAN HIEROGLYPH-1418A;Lo;0;L;;;;;N;;;;; +1418B;EGYPTIAN HIEROGLYPH-1418B;Lo;0;L;;;;;N;;;;; +1418C;EGYPTIAN HIEROGLYPH-1418C;Lo;0;L;;;;;N;;;;; +1418D;EGYPTIAN HIEROGLYPH-1418D;Lo;0;L;;;;;N;;;;; +1418E;EGYPTIAN HIEROGLYPH-1418E;Lo;0;L;;;;;N;;;;; +1418F;EGYPTIAN HIEROGLYPH-1418F;Lo;0;L;;;;;N;;;;; +14190;EGYPTIAN HIEROGLYPH-14190;Lo;0;L;;;;;N;;;;; +14191;EGYPTIAN HIEROGLYPH-14191;Lo;0;L;;;;;N;;;;; +14192;EGYPTIAN HIEROGLYPH-14192;Lo;0;L;;;;;N;;;;; +14193;EGYPTIAN HIEROGLYPH-14193;Lo;0;L;;;;;N;;;;; +14194;EGYPTIAN HIEROGLYPH-14194;Lo;0;L;;;;;N;;;;; +14195;EGYPTIAN HIEROGLYPH-14195;Lo;0;L;;;;;N;;;;; +14196;EGYPTIAN HIEROGLYPH-14196;Lo;0;L;;;;;N;;;;; +14197;EGYPTIAN HIEROGLYPH-14197;Lo;0;L;;;;;N;;;;; +14198;EGYPTIAN HIEROGLYPH-14198;Lo;0;L;;;;;N;;;;; +14199;EGYPTIAN HIEROGLYPH-14199;Lo;0;L;;;;;N;;;;; +1419A;EGYPTIAN HIEROGLYPH-1419A;Lo;0;L;;;;;N;;;;; +1419B;EGYPTIAN HIEROGLYPH-1419B;Lo;0;L;;;;;N;;;;; +1419C;EGYPTIAN HIEROGLYPH-1419C;Lo;0;L;;;;;N;;;;; +1419D;EGYPTIAN HIEROGLYPH-1419D;Lo;0;L;;;;;N;;;;; +1419E;EGYPTIAN HIEROGLYPH-1419E;Lo;0;L;;;;;N;;;;; +1419F;EGYPTIAN HIEROGLYPH-1419F;Lo;0;L;;;;;N;;;;; +141A0;EGYPTIAN HIEROGLYPH-141A0;Lo;0;L;;;;;N;;;;; +141A1;EGYPTIAN HIEROGLYPH-141A1;Lo;0;L;;;;;N;;;;; +141A2;EGYPTIAN HIEROGLYPH-141A2;Lo;0;L;;;;;N;;;;; +141A3;EGYPTIAN HIEROGLYPH-141A3;Lo;0;L;;;;;N;;;;; +141A4;EGYPTIAN HIEROGLYPH-141A4;Lo;0;L;;;;;N;;;;; +141A5;EGYPTIAN HIEROGLYPH-141A5;Lo;0;L;;;;;N;;;;; +141A6;EGYPTIAN HIEROGLYPH-141A6;Lo;0;L;;;;;N;;;;; +141A7;EGYPTIAN HIEROGLYPH-141A7;Lo;0;L;;;;;N;;;;; +141A8;EGYPTIAN HIEROGLYPH-141A8;Lo;0;L;;;;;N;;;;; +141A9;EGYPTIAN HIEROGLYPH-141A9;Lo;0;L;;;;;N;;;;; +141AA;EGYPTIAN HIEROGLYPH-141AA;Lo;0;L;;;;;N;;;;; +141AB;EGYPTIAN HIEROGLYPH-141AB;Lo;0;L;;;;;N;;;;; +141AC;EGYPTIAN HIEROGLYPH-141AC;Lo;0;L;;;;;N;;;;; +141AD;EGYPTIAN HIEROGLYPH-141AD;Lo;0;L;;;;;N;;;;; +141AE;EGYPTIAN HIEROGLYPH-141AE;Lo;0;L;;;;;N;;;;; +141AF;EGYPTIAN HIEROGLYPH-141AF;Lo;0;L;;;;;N;;;;; +141B0;EGYPTIAN HIEROGLYPH-141B0;Lo;0;L;;;;;N;;;;; +141B1;EGYPTIAN HIEROGLYPH-141B1;Lo;0;L;;;;;N;;;;; +141B2;EGYPTIAN HIEROGLYPH-141B2;Lo;0;L;;;;;N;;;;; +141B3;EGYPTIAN HIEROGLYPH-141B3;Lo;0;L;;;;;N;;;;; +141B4;EGYPTIAN HIEROGLYPH-141B4;Lo;0;L;;;;;N;;;;; +141B5;EGYPTIAN HIEROGLYPH-141B5;Lo;0;L;;;;;N;;;;; +141B6;EGYPTIAN HIEROGLYPH-141B6;Lo;0;L;;;;;N;;;;; +141B7;EGYPTIAN HIEROGLYPH-141B7;Lo;0;L;;;;;N;;;;; +141B8;EGYPTIAN HIEROGLYPH-141B8;Lo;0;L;;;;;N;;;;; +141B9;EGYPTIAN HIEROGLYPH-141B9;Lo;0;L;;;;;N;;;;; +141BA;EGYPTIAN HIEROGLYPH-141BA;Lo;0;L;;;;;N;;;;; +141BB;EGYPTIAN HIEROGLYPH-141BB;Lo;0;L;;;;;N;;;;; +141BC;EGYPTIAN HIEROGLYPH-141BC;Lo;0;L;;;;;N;;;;; +141BD;EGYPTIAN HIEROGLYPH-141BD;Lo;0;L;;;;;N;;;;; +141BE;EGYPTIAN HIEROGLYPH-141BE;Lo;0;L;;;;;N;;;;; +141BF;EGYPTIAN HIEROGLYPH-141BF;Lo;0;L;;;;;N;;;;; +141C0;EGYPTIAN HIEROGLYPH-141C0;Lo;0;L;;;;;N;;;;; +141C1;EGYPTIAN HIEROGLYPH-141C1;Lo;0;L;;;;;N;;;;; +141C2;EGYPTIAN HIEROGLYPH-141C2;Lo;0;L;;;;;N;;;;; +141C3;EGYPTIAN HIEROGLYPH-141C3;Lo;0;L;;;;;N;;;;; +141C4;EGYPTIAN HIEROGLYPH-141C4;Lo;0;L;;;;;N;;;;; +141C5;EGYPTIAN HIEROGLYPH-141C5;Lo;0;L;;;;;N;;;;; +141C6;EGYPTIAN HIEROGLYPH-141C6;Lo;0;L;;;;;N;;;;; +141C7;EGYPTIAN HIEROGLYPH-141C7;Lo;0;L;;;;;N;;;;; +141C8;EGYPTIAN HIEROGLYPH-141C8;Lo;0;L;;;;;N;;;;; +141C9;EGYPTIAN HIEROGLYPH-141C9;Lo;0;L;;;;;N;;;;; +141CA;EGYPTIAN HIEROGLYPH-141CA;Lo;0;L;;;;;N;;;;; +141CB;EGYPTIAN HIEROGLYPH-141CB;Lo;0;L;;;;;N;;;;; +141CC;EGYPTIAN HIEROGLYPH-141CC;Lo;0;L;;;;;N;;;;; +141CD;EGYPTIAN HIEROGLYPH-141CD;Lo;0;L;;;;;N;;;;; +141CE;EGYPTIAN HIEROGLYPH-141CE;Lo;0;L;;;;;N;;;;; +141CF;EGYPTIAN HIEROGLYPH-141CF;Lo;0;L;;;;;N;;;;; +141D0;EGYPTIAN HIEROGLYPH-141D0;Lo;0;L;;;;;N;;;;; +141D1;EGYPTIAN HIEROGLYPH-141D1;Lo;0;L;;;;;N;;;;; +141D2;EGYPTIAN HIEROGLYPH-141D2;Lo;0;L;;;;;N;;;;; +141D3;EGYPTIAN HIEROGLYPH-141D3;Lo;0;L;;;;;N;;;;; +141D4;EGYPTIAN HIEROGLYPH-141D4;Lo;0;L;;;;;N;;;;; +141D5;EGYPTIAN HIEROGLYPH-141D5;Lo;0;L;;;;;N;;;;; +141D6;EGYPTIAN HIEROGLYPH-141D6;Lo;0;L;;;;;N;;;;; +141D7;EGYPTIAN HIEROGLYPH-141D7;Lo;0;L;;;;;N;;;;; +141D8;EGYPTIAN HIEROGLYPH-141D8;Lo;0;L;;;;;N;;;;; +141D9;EGYPTIAN HIEROGLYPH-141D9;Lo;0;L;;;;;N;;;;; +141DA;EGYPTIAN HIEROGLYPH-141DA;Lo;0;L;;;;;N;;;;; +141DB;EGYPTIAN HIEROGLYPH-141DB;Lo;0;L;;;;;N;;;;; +141DC;EGYPTIAN HIEROGLYPH-141DC;Lo;0;L;;;;;N;;;;; +141DD;EGYPTIAN HIEROGLYPH-141DD;Lo;0;L;;;;;N;;;;; +141DE;EGYPTIAN HIEROGLYPH-141DE;Lo;0;L;;;;;N;;;;; +141DF;EGYPTIAN HIEROGLYPH-141DF;Lo;0;L;;;;;N;;;;; +141E0;EGYPTIAN HIEROGLYPH-141E0;Lo;0;L;;;;;N;;;;; +141E1;EGYPTIAN HIEROGLYPH-141E1;Lo;0;L;;;;;N;;;;; +141E2;EGYPTIAN HIEROGLYPH-141E2;Lo;0;L;;;;;N;;;;; +141E3;EGYPTIAN HIEROGLYPH-141E3;Lo;0;L;;;;;N;;;;; +141E4;EGYPTIAN HIEROGLYPH-141E4;Lo;0;L;;;;;N;;;;; +141E5;EGYPTIAN HIEROGLYPH-141E5;Lo;0;L;;;;;N;;;;; +141E6;EGYPTIAN HIEROGLYPH-141E6;Lo;0;L;;;;;N;;;;; +141E7;EGYPTIAN HIEROGLYPH-141E7;Lo;0;L;;;;;N;;;;; +141E8;EGYPTIAN HIEROGLYPH-141E8;Lo;0;L;;;;;N;;;;; +141E9;EGYPTIAN HIEROGLYPH-141E9;Lo;0;L;;;;;N;;;;; +141EA;EGYPTIAN HIEROGLYPH-141EA;Lo;0;L;;;;;N;;;;; +141EB;EGYPTIAN HIEROGLYPH-141EB;Lo;0;L;;;;;N;;;;; +141EC;EGYPTIAN HIEROGLYPH-141EC;Lo;0;L;;;;;N;;;;; +141ED;EGYPTIAN HIEROGLYPH-141ED;Lo;0;L;;;;;N;;;;; +141EE;EGYPTIAN HIEROGLYPH-141EE;Lo;0;L;;;;;N;;;;; +141EF;EGYPTIAN HIEROGLYPH-141EF;Lo;0;L;;;;;N;;;;; +141F0;EGYPTIAN HIEROGLYPH-141F0;Lo;0;L;;;;;N;;;;; +141F1;EGYPTIAN HIEROGLYPH-141F1;Lo;0;L;;;;;N;;;;; +141F2;EGYPTIAN HIEROGLYPH-141F2;Lo;0;L;;;;;N;;;;; +141F3;EGYPTIAN HIEROGLYPH-141F3;Lo;0;L;;;;;N;;;;; +141F4;EGYPTIAN HIEROGLYPH-141F4;Lo;0;L;;;;;N;;;;; +141F5;EGYPTIAN HIEROGLYPH-141F5;Lo;0;L;;;;;N;;;;; +141F6;EGYPTIAN HIEROGLYPH-141F6;Lo;0;L;;;;;N;;;;; +141F7;EGYPTIAN HIEROGLYPH-141F7;Lo;0;L;;;;;N;;;;; +141F8;EGYPTIAN HIEROGLYPH-141F8;Lo;0;L;;;;;N;;;;; +141F9;EGYPTIAN HIEROGLYPH-141F9;Lo;0;L;;;;;N;;;;; +141FA;EGYPTIAN HIEROGLYPH-141FA;Lo;0;L;;;;;N;;;;; +141FB;EGYPTIAN HIEROGLYPH-141FB;Lo;0;L;;;;;N;;;;; +141FC;EGYPTIAN HIEROGLYPH-141FC;Lo;0;L;;;;;N;;;;; +141FD;EGYPTIAN HIEROGLYPH-141FD;Lo;0;L;;;;;N;;;;; +141FE;EGYPTIAN HIEROGLYPH-141FE;Lo;0;L;;;;;N;;;;; +141FF;EGYPTIAN HIEROGLYPH-141FF;Lo;0;L;;;;;N;;;;; +14200;EGYPTIAN HIEROGLYPH-14200;Lo;0;L;;;;;N;;;;; +14201;EGYPTIAN HIEROGLYPH-14201;Lo;0;L;;;;;N;;;;; +14202;EGYPTIAN HIEROGLYPH-14202;Lo;0;L;;;;;N;;;;; +14203;EGYPTIAN HIEROGLYPH-14203;Lo;0;L;;;;;N;;;;; +14204;EGYPTIAN HIEROGLYPH-14204;Lo;0;L;;;;;N;;;;; +14205;EGYPTIAN HIEROGLYPH-14205;Lo;0;L;;;;;N;;;;; +14206;EGYPTIAN HIEROGLYPH-14206;Lo;0;L;;;;;N;;;;; +14207;EGYPTIAN HIEROGLYPH-14207;Lo;0;L;;;;;N;;;;; +14208;EGYPTIAN HIEROGLYPH-14208;Lo;0;L;;;;;N;;;;; +14209;EGYPTIAN HIEROGLYPH-14209;Lo;0;L;;;;;N;;;;; +1420A;EGYPTIAN HIEROGLYPH-1420A;Lo;0;L;;;;;N;;;;; +1420B;EGYPTIAN HIEROGLYPH-1420B;Lo;0;L;;;;;N;;;;; +1420C;EGYPTIAN HIEROGLYPH-1420C;Lo;0;L;;;;;N;;;;; +1420D;EGYPTIAN HIEROGLYPH-1420D;Lo;0;L;;;;;N;;;;; +1420E;EGYPTIAN HIEROGLYPH-1420E;Lo;0;L;;;;;N;;;;; +1420F;EGYPTIAN HIEROGLYPH-1420F;Lo;0;L;;;;;N;;;;; +14210;EGYPTIAN HIEROGLYPH-14210;Lo;0;L;;;;;N;;;;; +14211;EGYPTIAN HIEROGLYPH-14211;Lo;0;L;;;;;N;;;;; +14212;EGYPTIAN HIEROGLYPH-14212;Lo;0;L;;;;;N;;;;; +14213;EGYPTIAN HIEROGLYPH-14213;Lo;0;L;;;;;N;;;;; +14214;EGYPTIAN HIEROGLYPH-14214;Lo;0;L;;;;;N;;;;; +14215;EGYPTIAN HIEROGLYPH-14215;Lo;0;L;;;;;N;;;;; +14216;EGYPTIAN HIEROGLYPH-14216;Lo;0;L;;;;;N;;;;; +14217;EGYPTIAN HIEROGLYPH-14217;Lo;0;L;;;;;N;;;;; +14218;EGYPTIAN HIEROGLYPH-14218;Lo;0;L;;;;;N;;;;; +14219;EGYPTIAN HIEROGLYPH-14219;Lo;0;L;;;;;N;;;;; +1421A;EGYPTIAN HIEROGLYPH-1421A;Lo;0;L;;;;;N;;;;; +1421B;EGYPTIAN HIEROGLYPH-1421B;Lo;0;L;;;;;N;;;;; +1421C;EGYPTIAN HIEROGLYPH-1421C;Lo;0;L;;;;;N;;;;; +1421D;EGYPTIAN HIEROGLYPH-1421D;Lo;0;L;;;;;N;;;;; +1421E;EGYPTIAN HIEROGLYPH-1421E;Lo;0;L;;;;;N;;;;; +1421F;EGYPTIAN HIEROGLYPH-1421F;Lo;0;L;;;;;N;;;;; +14220;EGYPTIAN HIEROGLYPH-14220;Lo;0;L;;;;;N;;;;; +14221;EGYPTIAN HIEROGLYPH-14221;Lo;0;L;;;;;N;;;;; +14222;EGYPTIAN HIEROGLYPH-14222;Lo;0;L;;;;;N;;;;; +14223;EGYPTIAN HIEROGLYPH-14223;Lo;0;L;;;;;N;;;;; +14224;EGYPTIAN HIEROGLYPH-14224;Lo;0;L;;;;;N;;;;; +14225;EGYPTIAN HIEROGLYPH-14225;Lo;0;L;;;;;N;;;;; +14226;EGYPTIAN HIEROGLYPH-14226;Lo;0;L;;;;;N;;;;; +14227;EGYPTIAN HIEROGLYPH-14227;Lo;0;L;;;;;N;;;;; +14228;EGYPTIAN HIEROGLYPH-14228;Lo;0;L;;;;;N;;;;; +14229;EGYPTIAN HIEROGLYPH-14229;Lo;0;L;;;;;N;;;;; +1422A;EGYPTIAN HIEROGLYPH-1422A;Lo;0;L;;;;;N;;;;; +1422B;EGYPTIAN HIEROGLYPH-1422B;Lo;0;L;;;;;N;;;;; +1422C;EGYPTIAN HIEROGLYPH-1422C;Lo;0;L;;;;;N;;;;; +1422D;EGYPTIAN HIEROGLYPH-1422D;Lo;0;L;;;;;N;;;;; +1422E;EGYPTIAN HIEROGLYPH-1422E;Lo;0;L;;;;;N;;;;; +1422F;EGYPTIAN HIEROGLYPH-1422F;Lo;0;L;;;;;N;;;;; +14230;EGYPTIAN HIEROGLYPH-14230;Lo;0;L;;;;;N;;;;; +14231;EGYPTIAN HIEROGLYPH-14231;Lo;0;L;;;;;N;;;;; +14232;EGYPTIAN HIEROGLYPH-14232;Lo;0;L;;;;;N;;;;; +14233;EGYPTIAN HIEROGLYPH-14233;Lo;0;L;;;;;N;;;;; +14234;EGYPTIAN HIEROGLYPH-14234;Lo;0;L;;;;;N;;;;; +14235;EGYPTIAN HIEROGLYPH-14235;Lo;0;L;;;;;N;;;;; +14236;EGYPTIAN HIEROGLYPH-14236;Lo;0;L;;;;;N;;;;; +14237;EGYPTIAN HIEROGLYPH-14237;Lo;0;L;;;;;N;;;;; +14238;EGYPTIAN HIEROGLYPH-14238;Lo;0;L;;;;;N;;;;; +14239;EGYPTIAN HIEROGLYPH-14239;Lo;0;L;;;;;N;;;;; +1423A;EGYPTIAN HIEROGLYPH-1423A;Lo;0;L;;;;;N;;;;; +1423B;EGYPTIAN HIEROGLYPH-1423B;Lo;0;L;;;;;N;;;;; +1423C;EGYPTIAN HIEROGLYPH-1423C;Lo;0;L;;;;;N;;;;; +1423D;EGYPTIAN HIEROGLYPH-1423D;Lo;0;L;;;;;N;;;;; +1423E;EGYPTIAN HIEROGLYPH-1423E;Lo;0;L;;;;;N;;;;; +1423F;EGYPTIAN HIEROGLYPH-1423F;Lo;0;L;;;;;N;;;;; +14240;EGYPTIAN HIEROGLYPH-14240;Lo;0;L;;;;;N;;;;; +14241;EGYPTIAN HIEROGLYPH-14241;Lo;0;L;;;;;N;;;;; +14242;EGYPTIAN HIEROGLYPH-14242;Lo;0;L;;;;;N;;;;; +14243;EGYPTIAN HIEROGLYPH-14243;Lo;0;L;;;;;N;;;;; +14244;EGYPTIAN HIEROGLYPH-14244;Lo;0;L;;;;;N;;;;; +14245;EGYPTIAN HIEROGLYPH-14245;Lo;0;L;;;;;N;;;;; +14246;EGYPTIAN HIEROGLYPH-14246;Lo;0;L;;;;;N;;;;; +14247;EGYPTIAN HIEROGLYPH-14247;Lo;0;L;;;;;N;;;;; +14248;EGYPTIAN HIEROGLYPH-14248;Lo;0;L;;;;;N;;;;; +14249;EGYPTIAN HIEROGLYPH-14249;Lo;0;L;;;;;N;;;;; +1424A;EGYPTIAN HIEROGLYPH-1424A;Lo;0;L;;;;;N;;;;; +1424B;EGYPTIAN HIEROGLYPH-1424B;Lo;0;L;;;;;N;;;;; +1424C;EGYPTIAN HIEROGLYPH-1424C;Lo;0;L;;;;;N;;;;; +1424D;EGYPTIAN HIEROGLYPH-1424D;Lo;0;L;;;;;N;;;;; +1424E;EGYPTIAN HIEROGLYPH-1424E;Lo;0;L;;;;;N;;;;; +1424F;EGYPTIAN HIEROGLYPH-1424F;Lo;0;L;;;;;N;;;;; +14250;EGYPTIAN HIEROGLYPH-14250;Lo;0;L;;;;;N;;;;; +14251;EGYPTIAN HIEROGLYPH-14251;Lo;0;L;;;;;N;;;;; +14252;EGYPTIAN HIEROGLYPH-14252;Lo;0;L;;;;;N;;;;; +14253;EGYPTIAN HIEROGLYPH-14253;Lo;0;L;;;;;N;;;;; +14254;EGYPTIAN HIEROGLYPH-14254;Lo;0;L;;;;;N;;;;; +14255;EGYPTIAN HIEROGLYPH-14255;Lo;0;L;;;;;N;;;;; +14256;EGYPTIAN HIEROGLYPH-14256;Lo;0;L;;;;;N;;;;; +14257;EGYPTIAN HIEROGLYPH-14257;Lo;0;L;;;;;N;;;;; +14258;EGYPTIAN HIEROGLYPH-14258;Lo;0;L;;;;;N;;;;; +14259;EGYPTIAN HIEROGLYPH-14259;Lo;0;L;;;;;N;;;;; +1425A;EGYPTIAN HIEROGLYPH-1425A;Lo;0;L;;;;;N;;;;; +1425B;EGYPTIAN HIEROGLYPH-1425B;Lo;0;L;;;;;N;;;;; +1425C;EGYPTIAN HIEROGLYPH-1425C;Lo;0;L;;;;;N;;;;; +1425D;EGYPTIAN HIEROGLYPH-1425D;Lo;0;L;;;;;N;;;;; +1425E;EGYPTIAN HIEROGLYPH-1425E;Lo;0;L;;;;;N;;;;; +1425F;EGYPTIAN HIEROGLYPH-1425F;Lo;0;L;;;;;N;;;;; +14260;EGYPTIAN HIEROGLYPH-14260;Lo;0;L;;;;;N;;;;; +14261;EGYPTIAN HIEROGLYPH-14261;Lo;0;L;;;;;N;;;;; +14262;EGYPTIAN HIEROGLYPH-14262;Lo;0;L;;;;;N;;;;; +14263;EGYPTIAN HIEROGLYPH-14263;Lo;0;L;;;;;N;;;;; +14264;EGYPTIAN HIEROGLYPH-14264;Lo;0;L;;;;;N;;;;; +14265;EGYPTIAN HIEROGLYPH-14265;Lo;0;L;;;;;N;;;;; +14266;EGYPTIAN HIEROGLYPH-14266;Lo;0;L;;;;;N;;;;; +14267;EGYPTIAN HIEROGLYPH-14267;Lo;0;L;;;;;N;;;;; +14268;EGYPTIAN HIEROGLYPH-14268;Lo;0;L;;;;;N;;;;; +14269;EGYPTIAN HIEROGLYPH-14269;Lo;0;L;;;;;N;;;;; +1426A;EGYPTIAN HIEROGLYPH-1426A;Lo;0;L;;;;;N;;;;; +1426B;EGYPTIAN HIEROGLYPH-1426B;Lo;0;L;;;;;N;;;;; +1426C;EGYPTIAN HIEROGLYPH-1426C;Lo;0;L;;;;;N;;;;; +1426D;EGYPTIAN HIEROGLYPH-1426D;Lo;0;L;;;;;N;;;;; +1426E;EGYPTIAN HIEROGLYPH-1426E;Lo;0;L;;;;;N;;;;; +1426F;EGYPTIAN HIEROGLYPH-1426F;Lo;0;L;;;;;N;;;;; +14270;EGYPTIAN HIEROGLYPH-14270;Lo;0;L;;;;;N;;;;; +14271;EGYPTIAN HIEROGLYPH-14271;Lo;0;L;;;;;N;;;;; +14272;EGYPTIAN HIEROGLYPH-14272;Lo;0;L;;;;;N;;;;; +14273;EGYPTIAN HIEROGLYPH-14273;Lo;0;L;;;;;N;;;;; +14274;EGYPTIAN HIEROGLYPH-14274;Lo;0;L;;;;;N;;;;; +14275;EGYPTIAN HIEROGLYPH-14275;Lo;0;L;;;;;N;;;;; +14276;EGYPTIAN HIEROGLYPH-14276;Lo;0;L;;;;;N;;;;; +14277;EGYPTIAN HIEROGLYPH-14277;Lo;0;L;;;;;N;;;;; +14278;EGYPTIAN HIEROGLYPH-14278;Lo;0;L;;;;;N;;;;; +14279;EGYPTIAN HIEROGLYPH-14279;Lo;0;L;;;;;N;;;;; +1427A;EGYPTIAN HIEROGLYPH-1427A;Lo;0;L;;;;;N;;;;; +1427B;EGYPTIAN HIEROGLYPH-1427B;Lo;0;L;;;;;N;;;;; +1427C;EGYPTIAN HIEROGLYPH-1427C;Lo;0;L;;;;;N;;;;; +1427D;EGYPTIAN HIEROGLYPH-1427D;Lo;0;L;;;;;N;;;;; +1427E;EGYPTIAN HIEROGLYPH-1427E;Lo;0;L;;;;;N;;;;; +1427F;EGYPTIAN HIEROGLYPH-1427F;Lo;0;L;;;;;N;;;;; +14280;EGYPTIAN HIEROGLYPH-14280;Lo;0;L;;;;;N;;;;; +14281;EGYPTIAN HIEROGLYPH-14281;Lo;0;L;;;;;N;;;;; +14282;EGYPTIAN HIEROGLYPH-14282;Lo;0;L;;;;;N;;;;; +14283;EGYPTIAN HIEROGLYPH-14283;Lo;0;L;;;;;N;;;;; +14284;EGYPTIAN HIEROGLYPH-14284;Lo;0;L;;;;;N;;;;; +14285;EGYPTIAN HIEROGLYPH-14285;Lo;0;L;;;;;N;;;;; +14286;EGYPTIAN HIEROGLYPH-14286;Lo;0;L;;;;;N;;;;; +14287;EGYPTIAN HIEROGLYPH-14287;Lo;0;L;;;;;N;;;;; +14288;EGYPTIAN HIEROGLYPH-14288;Lo;0;L;;;;;N;;;;; +14289;EGYPTIAN HIEROGLYPH-14289;Lo;0;L;;;;;N;;;;; +1428A;EGYPTIAN HIEROGLYPH-1428A;Lo;0;L;;;;;N;;;;; +1428B;EGYPTIAN HIEROGLYPH-1428B;Lo;0;L;;;;;N;;;;; +1428C;EGYPTIAN HIEROGLYPH-1428C;Lo;0;L;;;;;N;;;;; +1428D;EGYPTIAN HIEROGLYPH-1428D;Lo;0;L;;;;;N;;;;; +1428E;EGYPTIAN HIEROGLYPH-1428E;Lo;0;L;;;;;N;;;;; +1428F;EGYPTIAN HIEROGLYPH-1428F;Lo;0;L;;;;;N;;;;; +14290;EGYPTIAN HIEROGLYPH-14290;Lo;0;L;;;;;N;;;;; +14291;EGYPTIAN HIEROGLYPH-14291;Lo;0;L;;;;;N;;;;; +14292;EGYPTIAN HIEROGLYPH-14292;Lo;0;L;;;;;N;;;;; +14293;EGYPTIAN HIEROGLYPH-14293;Lo;0;L;;;;;N;;;;; +14294;EGYPTIAN HIEROGLYPH-14294;Lo;0;L;;;;;N;;;;; +14295;EGYPTIAN HIEROGLYPH-14295;Lo;0;L;;;;;N;;;;; +14296;EGYPTIAN HIEROGLYPH-14296;Lo;0;L;;;;;N;;;;; +14297;EGYPTIAN HIEROGLYPH-14297;Lo;0;L;;;;;N;;;;; +14298;EGYPTIAN HIEROGLYPH-14298;Lo;0;L;;;;;N;;;;; +14299;EGYPTIAN HIEROGLYPH-14299;Lo;0;L;;;;;N;;;;; +1429A;EGYPTIAN HIEROGLYPH-1429A;Lo;0;L;;;;;N;;;;; +1429B;EGYPTIAN HIEROGLYPH-1429B;Lo;0;L;;;;;N;;;;; +1429C;EGYPTIAN HIEROGLYPH-1429C;Lo;0;L;;;;;N;;;;; +1429D;EGYPTIAN HIEROGLYPH-1429D;Lo;0;L;;;;;N;;;;; +1429E;EGYPTIAN HIEROGLYPH-1429E;Lo;0;L;;;;;N;;;;; +1429F;EGYPTIAN HIEROGLYPH-1429F;Lo;0;L;;;;;N;;;;; +142A0;EGYPTIAN HIEROGLYPH-142A0;Lo;0;L;;;;;N;;;;; +142A1;EGYPTIAN HIEROGLYPH-142A1;Lo;0;L;;;;;N;;;;; +142A2;EGYPTIAN HIEROGLYPH-142A2;Lo;0;L;;;;;N;;;;; +142A3;EGYPTIAN HIEROGLYPH-142A3;Lo;0;L;;;;;N;;;;; +142A4;EGYPTIAN HIEROGLYPH-142A4;Lo;0;L;;;;;N;;;;; +142A5;EGYPTIAN HIEROGLYPH-142A5;Lo;0;L;;;;;N;;;;; +142A6;EGYPTIAN HIEROGLYPH-142A6;Lo;0;L;;;;;N;;;;; +142A7;EGYPTIAN HIEROGLYPH-142A7;Lo;0;L;;;;;N;;;;; +142A8;EGYPTIAN HIEROGLYPH-142A8;Lo;0;L;;;;;N;;;;; +142A9;EGYPTIAN HIEROGLYPH-142A9;Lo;0;L;;;;;N;;;;; +142AA;EGYPTIAN HIEROGLYPH-142AA;Lo;0;L;;;;;N;;;;; +142AB;EGYPTIAN HIEROGLYPH-142AB;Lo;0;L;;;;;N;;;;; +142AC;EGYPTIAN HIEROGLYPH-142AC;Lo;0;L;;;;;N;;;;; +142AD;EGYPTIAN HIEROGLYPH-142AD;Lo;0;L;;;;;N;;;;; +142AE;EGYPTIAN HIEROGLYPH-142AE;Lo;0;L;;;;;N;;;;; +142AF;EGYPTIAN HIEROGLYPH-142AF;Lo;0;L;;;;;N;;;;; +142B0;EGYPTIAN HIEROGLYPH-142B0;Lo;0;L;;;;;N;;;;; +142B1;EGYPTIAN HIEROGLYPH-142B1;Lo;0;L;;;;;N;;;;; +142B2;EGYPTIAN HIEROGLYPH-142B2;Lo;0;L;;;;;N;;;;; +142B3;EGYPTIAN HIEROGLYPH-142B3;Lo;0;L;;;;;N;;;;; +142B4;EGYPTIAN HIEROGLYPH-142B4;Lo;0;L;;;;;N;;;;; +142B5;EGYPTIAN HIEROGLYPH-142B5;Lo;0;L;;;;;N;;;;; +142B6;EGYPTIAN HIEROGLYPH-142B6;Lo;0;L;;;;;N;;;;; +142B7;EGYPTIAN HIEROGLYPH-142B7;Lo;0;L;;;;;N;;;;; +142B8;EGYPTIAN HIEROGLYPH-142B8;Lo;0;L;;;;;N;;;;; +142B9;EGYPTIAN HIEROGLYPH-142B9;Lo;0;L;;;;;N;;;;; +142BA;EGYPTIAN HIEROGLYPH-142BA;Lo;0;L;;;;;N;;;;; +142BB;EGYPTIAN HIEROGLYPH-142BB;Lo;0;L;;;;;N;;;;; +142BC;EGYPTIAN HIEROGLYPH-142BC;Lo;0;L;;;;;N;;;;; +142BD;EGYPTIAN HIEROGLYPH-142BD;Lo;0;L;;;;;N;;;;; +142BE;EGYPTIAN HIEROGLYPH-142BE;Lo;0;L;;;;;N;;;;; +142BF;EGYPTIAN HIEROGLYPH-142BF;Lo;0;L;;;;;N;;;;; +142C0;EGYPTIAN HIEROGLYPH-142C0;Lo;0;L;;;;;N;;;;; +142C1;EGYPTIAN HIEROGLYPH-142C1;Lo;0;L;;;;;N;;;;; +142C2;EGYPTIAN HIEROGLYPH-142C2;Lo;0;L;;;;;N;;;;; +142C3;EGYPTIAN HIEROGLYPH-142C3;Lo;0;L;;;;;N;;;;; +142C4;EGYPTIAN HIEROGLYPH-142C4;Lo;0;L;;;;;N;;;;; +142C5;EGYPTIAN HIEROGLYPH-142C5;Lo;0;L;;;;;N;;;;; +142C6;EGYPTIAN HIEROGLYPH-142C6;Lo;0;L;;;;;N;;;;; +142C7;EGYPTIAN HIEROGLYPH-142C7;Lo;0;L;;;;;N;;;;; +142C8;EGYPTIAN HIEROGLYPH-142C8;Lo;0;L;;;;;N;;;;; +142C9;EGYPTIAN HIEROGLYPH-142C9;Lo;0;L;;;;;N;;;;; +142CA;EGYPTIAN HIEROGLYPH-142CA;Lo;0;L;;;;;N;;;;; +142CB;EGYPTIAN HIEROGLYPH-142CB;Lo;0;L;;;;;N;;;;; +142CC;EGYPTIAN HIEROGLYPH-142CC;Lo;0;L;;;;;N;;;;; +142CD;EGYPTIAN HIEROGLYPH-142CD;Lo;0;L;;;;;N;;;;; +142CE;EGYPTIAN HIEROGLYPH-142CE;Lo;0;L;;;;;N;;;;; +142CF;EGYPTIAN HIEROGLYPH-142CF;Lo;0;L;;;;;N;;;;; +142D0;EGYPTIAN HIEROGLYPH-142D0;Lo;0;L;;;;;N;;;;; +142D1;EGYPTIAN HIEROGLYPH-142D1;Lo;0;L;;;;;N;;;;; +142D2;EGYPTIAN HIEROGLYPH-142D2;Lo;0;L;;;;;N;;;;; +142D3;EGYPTIAN HIEROGLYPH-142D3;Lo;0;L;;;;;N;;;;; +142D4;EGYPTIAN HIEROGLYPH-142D4;Lo;0;L;;;;;N;;;;; +142D5;EGYPTIAN HIEROGLYPH-142D5;Lo;0;L;;;;;N;;;;; +142D6;EGYPTIAN HIEROGLYPH-142D6;Lo;0;L;;;;;N;;;;; +142D7;EGYPTIAN HIEROGLYPH-142D7;Lo;0;L;;;;;N;;;;; +142D8;EGYPTIAN HIEROGLYPH-142D8;Lo;0;L;;;;;N;;;;; +142D9;EGYPTIAN HIEROGLYPH-142D9;Lo;0;L;;;;;N;;;;; +142DA;EGYPTIAN HIEROGLYPH-142DA;Lo;0;L;;;;;N;;;;; +142DB;EGYPTIAN HIEROGLYPH-142DB;Lo;0;L;;;;;N;;;;; +142DC;EGYPTIAN HIEROGLYPH-142DC;Lo;0;L;;;;;N;;;;; +142DD;EGYPTIAN HIEROGLYPH-142DD;Lo;0;L;;;;;N;;;;; +142DE;EGYPTIAN HIEROGLYPH-142DE;Lo;0;L;;;;;N;;;;; +142DF;EGYPTIAN HIEROGLYPH-142DF;Lo;0;L;;;;;N;;;;; +142E0;EGYPTIAN HIEROGLYPH-142E0;Lo;0;L;;;;;N;;;;; +142E1;EGYPTIAN HIEROGLYPH-142E1;Lo;0;L;;;;;N;;;;; +142E2;EGYPTIAN HIEROGLYPH-142E2;Lo;0;L;;;;;N;;;;; +142E3;EGYPTIAN HIEROGLYPH-142E3;Lo;0;L;;;;;N;;;;; +142E4;EGYPTIAN HIEROGLYPH-142E4;Lo;0;L;;;;;N;;;;; +142E5;EGYPTIAN HIEROGLYPH-142E5;Lo;0;L;;;;;N;;;;; +142E6;EGYPTIAN HIEROGLYPH-142E6;Lo;0;L;;;;;N;;;;; +142E7;EGYPTIAN HIEROGLYPH-142E7;Lo;0;L;;;;;N;;;;; +142E8;EGYPTIAN HIEROGLYPH-142E8;Lo;0;L;;;;;N;;;;; +142E9;EGYPTIAN HIEROGLYPH-142E9;Lo;0;L;;;;;N;;;;; +142EA;EGYPTIAN HIEROGLYPH-142EA;Lo;0;L;;;;;N;;;;; +142EB;EGYPTIAN HIEROGLYPH-142EB;Lo;0;L;;;;;N;;;;; +142EC;EGYPTIAN HIEROGLYPH-142EC;Lo;0;L;;;;;N;;;;; +142ED;EGYPTIAN HIEROGLYPH-142ED;Lo;0;L;;;;;N;;;;; +142EE;EGYPTIAN HIEROGLYPH-142EE;Lo;0;L;;;;;N;;;;; +142EF;EGYPTIAN HIEROGLYPH-142EF;Lo;0;L;;;;;N;;;;; +142F0;EGYPTIAN HIEROGLYPH-142F0;Lo;0;L;;;;;N;;;;; +142F1;EGYPTIAN HIEROGLYPH-142F1;Lo;0;L;;;;;N;;;;; +142F2;EGYPTIAN HIEROGLYPH-142F2;Lo;0;L;;;;;N;;;;; +142F3;EGYPTIAN HIEROGLYPH-142F3;Lo;0;L;;;;;N;;;;; +142F4;EGYPTIAN HIEROGLYPH-142F4;Lo;0;L;;;;;N;;;;; +142F5;EGYPTIAN HIEROGLYPH-142F5;Lo;0;L;;;;;N;;;;; +142F6;EGYPTIAN HIEROGLYPH-142F6;Lo;0;L;;;;;N;;;;; +142F7;EGYPTIAN HIEROGLYPH-142F7;Lo;0;L;;;;;N;;;;; +142F8;EGYPTIAN HIEROGLYPH-142F8;Lo;0;L;;;;;N;;;;; +142F9;EGYPTIAN HIEROGLYPH-142F9;Lo;0;L;;;;;N;;;;; +142FA;EGYPTIAN HIEROGLYPH-142FA;Lo;0;L;;;;;N;;;;; +142FB;EGYPTIAN HIEROGLYPH-142FB;Lo;0;L;;;;;N;;;;; +142FC;EGYPTIAN HIEROGLYPH-142FC;Lo;0;L;;;;;N;;;;; +142FD;EGYPTIAN HIEROGLYPH-142FD;Lo;0;L;;;;;N;;;;; +142FE;EGYPTIAN HIEROGLYPH-142FE;Lo;0;L;;;;;N;;;;; +142FF;EGYPTIAN HIEROGLYPH-142FF;Lo;0;L;;;;;N;;;;; +14300;EGYPTIAN HIEROGLYPH-14300;Lo;0;L;;;;;N;;;;; +14301;EGYPTIAN HIEROGLYPH-14301;Lo;0;L;;;;;N;;;;; +14302;EGYPTIAN HIEROGLYPH-14302;Lo;0;L;;;;;N;;;;; +14303;EGYPTIAN HIEROGLYPH-14303;Lo;0;L;;;;;N;;;;; +14304;EGYPTIAN HIEROGLYPH-14304;Lo;0;L;;;;;N;;;;; +14305;EGYPTIAN HIEROGLYPH-14305;Lo;0;L;;;;;N;;;;; +14306;EGYPTIAN HIEROGLYPH-14306;Lo;0;L;;;;;N;;;;; +14307;EGYPTIAN HIEROGLYPH-14307;Lo;0;L;;;;;N;;;;; +14308;EGYPTIAN HIEROGLYPH-14308;Lo;0;L;;;;;N;;;;; +14309;EGYPTIAN HIEROGLYPH-14309;Lo;0;L;;;;;N;;;;; +1430A;EGYPTIAN HIEROGLYPH-1430A;Lo;0;L;;;;;N;;;;; +1430B;EGYPTIAN HIEROGLYPH-1430B;Lo;0;L;;;;;N;;;;; +1430C;EGYPTIAN HIEROGLYPH-1430C;Lo;0;L;;;;;N;;;;; +1430D;EGYPTIAN HIEROGLYPH-1430D;Lo;0;L;;;;;N;;;;; +1430E;EGYPTIAN HIEROGLYPH-1430E;Lo;0;L;;;;;N;;;;; +1430F;EGYPTIAN HIEROGLYPH-1430F;Lo;0;L;;;;;N;;;;; +14310;EGYPTIAN HIEROGLYPH-14310;Lo;0;L;;;;;N;;;;; +14311;EGYPTIAN HIEROGLYPH-14311;Lo;0;L;;;;;N;;;;; +14312;EGYPTIAN HIEROGLYPH-14312;Lo;0;L;;;;;N;;;;; +14313;EGYPTIAN HIEROGLYPH-14313;Lo;0;L;;;;;N;;;;; +14314;EGYPTIAN HIEROGLYPH-14314;Lo;0;L;;;;;N;;;;; +14315;EGYPTIAN HIEROGLYPH-14315;Lo;0;L;;;;;N;;;;; +14316;EGYPTIAN HIEROGLYPH-14316;Lo;0;L;;;;;N;;;;; +14317;EGYPTIAN HIEROGLYPH-14317;Lo;0;L;;;;;N;;;;; +14318;EGYPTIAN HIEROGLYPH-14318;Lo;0;L;;;;;N;;;;; +14319;EGYPTIAN HIEROGLYPH-14319;Lo;0;L;;;;;N;;;;; +1431A;EGYPTIAN HIEROGLYPH-1431A;Lo;0;L;;;;;N;;;;; +1431B;EGYPTIAN HIEROGLYPH-1431B;Lo;0;L;;;;;N;;;;; +1431C;EGYPTIAN HIEROGLYPH-1431C;Lo;0;L;;;;;N;;;;; +1431D;EGYPTIAN HIEROGLYPH-1431D;Lo;0;L;;;;;N;;;;; +1431E;EGYPTIAN HIEROGLYPH-1431E;Lo;0;L;;;;;N;;;;; +1431F;EGYPTIAN HIEROGLYPH-1431F;Lo;0;L;;;;;N;;;;; +14320;EGYPTIAN HIEROGLYPH-14320;Lo;0;L;;;;;N;;;;; +14321;EGYPTIAN HIEROGLYPH-14321;Lo;0;L;;;;;N;;;;; +14322;EGYPTIAN HIEROGLYPH-14322;Lo;0;L;;;;;N;;;;; +14323;EGYPTIAN HIEROGLYPH-14323;Lo;0;L;;;;;N;;;;; +14324;EGYPTIAN HIEROGLYPH-14324;Lo;0;L;;;;;N;;;;; +14325;EGYPTIAN HIEROGLYPH-14325;Lo;0;L;;;;;N;;;;; +14326;EGYPTIAN HIEROGLYPH-14326;Lo;0;L;;;;;N;;;;; +14327;EGYPTIAN HIEROGLYPH-14327;Lo;0;L;;;;;N;;;;; +14328;EGYPTIAN HIEROGLYPH-14328;Lo;0;L;;;;;N;;;;; +14329;EGYPTIAN HIEROGLYPH-14329;Lo;0;L;;;;;N;;;;; +1432A;EGYPTIAN HIEROGLYPH-1432A;Lo;0;L;;;;;N;;;;; +1432B;EGYPTIAN HIEROGLYPH-1432B;Lo;0;L;;;;;N;;;;; +1432C;EGYPTIAN HIEROGLYPH-1432C;Lo;0;L;;;;;N;;;;; +1432D;EGYPTIAN HIEROGLYPH-1432D;Lo;0;L;;;;;N;;;;; +1432E;EGYPTIAN HIEROGLYPH-1432E;Lo;0;L;;;;;N;;;;; +1432F;EGYPTIAN HIEROGLYPH-1432F;Lo;0;L;;;;;N;;;;; +14330;EGYPTIAN HIEROGLYPH-14330;Lo;0;L;;;;;N;;;;; +14331;EGYPTIAN HIEROGLYPH-14331;Lo;0;L;;;;;N;;;;; +14332;EGYPTIAN HIEROGLYPH-14332;Lo;0;L;;;;;N;;;;; +14333;EGYPTIAN HIEROGLYPH-14333;Lo;0;L;;;;;N;;;;; +14334;EGYPTIAN HIEROGLYPH-14334;Lo;0;L;;;;;N;;;;; +14335;EGYPTIAN HIEROGLYPH-14335;Lo;0;L;;;;;N;;;;; +14336;EGYPTIAN HIEROGLYPH-14336;Lo;0;L;;;;;N;;;;; +14337;EGYPTIAN HIEROGLYPH-14337;Lo;0;L;;;;;N;;;;; +14338;EGYPTIAN HIEROGLYPH-14338;Lo;0;L;;;;;N;;;;; +14339;EGYPTIAN HIEROGLYPH-14339;Lo;0;L;;;;;N;;;;; +1433A;EGYPTIAN HIEROGLYPH-1433A;Lo;0;L;;;;;N;;;;; +1433B;EGYPTIAN HIEROGLYPH-1433B;Lo;0;L;;;;;N;;;;; +1433C;EGYPTIAN HIEROGLYPH-1433C;Lo;0;L;;;;;N;;;;; +1433D;EGYPTIAN HIEROGLYPH-1433D;Lo;0;L;;;;;N;;;;; +1433E;EGYPTIAN HIEROGLYPH-1433E;Lo;0;L;;;;;N;;;;; +1433F;EGYPTIAN HIEROGLYPH-1433F;Lo;0;L;;;;;N;;;;; +14340;EGYPTIAN HIEROGLYPH-14340;Lo;0;L;;;;;N;;;;; +14341;EGYPTIAN HIEROGLYPH-14341;Lo;0;L;;;;;N;;;;; +14342;EGYPTIAN HIEROGLYPH-14342;Lo;0;L;;;;;N;;;;; +14343;EGYPTIAN HIEROGLYPH-14343;Lo;0;L;;;;;N;;;;; +14344;EGYPTIAN HIEROGLYPH-14344;Lo;0;L;;;;;N;;;;; +14345;EGYPTIAN HIEROGLYPH-14345;Lo;0;L;;;;;N;;;;; +14346;EGYPTIAN HIEROGLYPH-14346;Lo;0;L;;;;;N;;;;; +14347;EGYPTIAN HIEROGLYPH-14347;Lo;0;L;;;;;N;;;;; +14348;EGYPTIAN HIEROGLYPH-14348;Lo;0;L;;;;;N;;;;; +14349;EGYPTIAN HIEROGLYPH-14349;Lo;0;L;;;;;N;;;;; +1434A;EGYPTIAN HIEROGLYPH-1434A;Lo;0;L;;;;;N;;;;; +1434B;EGYPTIAN HIEROGLYPH-1434B;Lo;0;L;;;;;N;;;;; +1434C;EGYPTIAN HIEROGLYPH-1434C;Lo;0;L;;;;;N;;;;; +1434D;EGYPTIAN HIEROGLYPH-1434D;Lo;0;L;;;;;N;;;;; +1434E;EGYPTIAN HIEROGLYPH-1434E;Lo;0;L;;;;;N;;;;; +1434F;EGYPTIAN HIEROGLYPH-1434F;Lo;0;L;;;;;N;;;;; +14350;EGYPTIAN HIEROGLYPH-14350;Lo;0;L;;;;;N;;;;; +14351;EGYPTIAN HIEROGLYPH-14351;Lo;0;L;;;;;N;;;;; +14352;EGYPTIAN HIEROGLYPH-14352;Lo;0;L;;;;;N;;;;; +14353;EGYPTIAN HIEROGLYPH-14353;Lo;0;L;;;;;N;;;;; +14354;EGYPTIAN HIEROGLYPH-14354;Lo;0;L;;;;;N;;;;; +14355;EGYPTIAN HIEROGLYPH-14355;Lo;0;L;;;;;N;;;;; +14356;EGYPTIAN HIEROGLYPH-14356;Lo;0;L;;;;;N;;;;; +14357;EGYPTIAN HIEROGLYPH-14357;Lo;0;L;;;;;N;;;;; +14358;EGYPTIAN HIEROGLYPH-14358;Lo;0;L;;;;;N;;;;; +14359;EGYPTIAN HIEROGLYPH-14359;Lo;0;L;;;;;N;;;;; +1435A;EGYPTIAN HIEROGLYPH-1435A;Lo;0;L;;;;;N;;;;; +1435B;EGYPTIAN HIEROGLYPH-1435B;Lo;0;L;;;;;N;;;;; +1435C;EGYPTIAN HIEROGLYPH-1435C;Lo;0;L;;;;;N;;;;; +1435D;EGYPTIAN HIEROGLYPH-1435D;Lo;0;L;;;;;N;;;;; +1435E;EGYPTIAN HIEROGLYPH-1435E;Lo;0;L;;;;;N;;;;; +1435F;EGYPTIAN HIEROGLYPH-1435F;Lo;0;L;;;;;N;;;;; +14360;EGYPTIAN HIEROGLYPH-14360;Lo;0;L;;;;;N;;;;; +14361;EGYPTIAN HIEROGLYPH-14361;Lo;0;L;;;;;N;;;;; +14362;EGYPTIAN HIEROGLYPH-14362;Lo;0;L;;;;;N;;;;; +14363;EGYPTIAN HIEROGLYPH-14363;Lo;0;L;;;;;N;;;;; +14364;EGYPTIAN HIEROGLYPH-14364;Lo;0;L;;;;;N;;;;; +14365;EGYPTIAN HIEROGLYPH-14365;Lo;0;L;;;;;N;;;;; +14366;EGYPTIAN HIEROGLYPH-14366;Lo;0;L;;;;;N;;;;; +14367;EGYPTIAN HIEROGLYPH-14367;Lo;0;L;;;;;N;;;;; +14368;EGYPTIAN HIEROGLYPH-14368;Lo;0;L;;;;;N;;;;; +14369;EGYPTIAN HIEROGLYPH-14369;Lo;0;L;;;;;N;;;;; +1436A;EGYPTIAN HIEROGLYPH-1436A;Lo;0;L;;;;;N;;;;; +1436B;EGYPTIAN HIEROGLYPH-1436B;Lo;0;L;;;;;N;;;;; +1436C;EGYPTIAN HIEROGLYPH-1436C;Lo;0;L;;;;;N;;;;; +1436D;EGYPTIAN HIEROGLYPH-1436D;Lo;0;L;;;;;N;;;;; +1436E;EGYPTIAN HIEROGLYPH-1436E;Lo;0;L;;;;;N;;;;; +1436F;EGYPTIAN HIEROGLYPH-1436F;Lo;0;L;;;;;N;;;;; +14370;EGYPTIAN HIEROGLYPH-14370;Lo;0;L;;;;;N;;;;; +14371;EGYPTIAN HIEROGLYPH-14371;Lo;0;L;;;;;N;;;;; +14372;EGYPTIAN HIEROGLYPH-14372;Lo;0;L;;;;;N;;;;; +14373;EGYPTIAN HIEROGLYPH-14373;Lo;0;L;;;;;N;;;;; +14374;EGYPTIAN HIEROGLYPH-14374;Lo;0;L;;;;;N;;;;; +14375;EGYPTIAN HIEROGLYPH-14375;Lo;0;L;;;;;N;;;;; +14376;EGYPTIAN HIEROGLYPH-14376;Lo;0;L;;;;;N;;;;; +14377;EGYPTIAN HIEROGLYPH-14377;Lo;0;L;;;;;N;;;;; +14378;EGYPTIAN HIEROGLYPH-14378;Lo;0;L;;;;;N;;;;; +14379;EGYPTIAN HIEROGLYPH-14379;Lo;0;L;;;;;N;;;;; +1437A;EGYPTIAN HIEROGLYPH-1437A;Lo;0;L;;;;;N;;;;; +1437B;EGYPTIAN HIEROGLYPH-1437B;Lo;0;L;;;;;N;;;;; +1437C;EGYPTIAN HIEROGLYPH-1437C;Lo;0;L;;;;;N;;;;; +1437D;EGYPTIAN HIEROGLYPH-1437D;Lo;0;L;;;;;N;;;;; +1437E;EGYPTIAN HIEROGLYPH-1437E;Lo;0;L;;;;;N;;;;; +1437F;EGYPTIAN HIEROGLYPH-1437F;Lo;0;L;;;;;N;;;;; +14380;EGYPTIAN HIEROGLYPH-14380;Lo;0;L;;;;;N;;;;; +14381;EGYPTIAN HIEROGLYPH-14381;Lo;0;L;;;;;N;;;;; +14382;EGYPTIAN HIEROGLYPH-14382;Lo;0;L;;;;;N;;;;; +14383;EGYPTIAN HIEROGLYPH-14383;Lo;0;L;;;;;N;;;;; +14384;EGYPTIAN HIEROGLYPH-14384;Lo;0;L;;;;;N;;;;; +14385;EGYPTIAN HIEROGLYPH-14385;Lo;0;L;;;;;N;;;;; +14386;EGYPTIAN HIEROGLYPH-14386;Lo;0;L;;;;;N;;;;; +14387;EGYPTIAN HIEROGLYPH-14387;Lo;0;L;;;;;N;;;;; +14388;EGYPTIAN HIEROGLYPH-14388;Lo;0;L;;;;;N;;;;; +14389;EGYPTIAN HIEROGLYPH-14389;Lo;0;L;;;;;N;;;;; +1438A;EGYPTIAN HIEROGLYPH-1438A;Lo;0;L;;;;;N;;;;; +1438B;EGYPTIAN HIEROGLYPH-1438B;Lo;0;L;;;;;N;;;;; +1438C;EGYPTIAN HIEROGLYPH-1438C;Lo;0;L;;;;;N;;;;; +1438D;EGYPTIAN HIEROGLYPH-1438D;Lo;0;L;;;;;N;;;;; +1438E;EGYPTIAN HIEROGLYPH-1438E;Lo;0;L;;;;;N;;;;; +1438F;EGYPTIAN HIEROGLYPH-1438F;Lo;0;L;;;;;N;;;;; +14390;EGYPTIAN HIEROGLYPH-14390;Lo;0;L;;;;;N;;;;; +14391;EGYPTIAN HIEROGLYPH-14391;Lo;0;L;;;;;N;;;;; +14392;EGYPTIAN HIEROGLYPH-14392;Lo;0;L;;;;;N;;;;; +14393;EGYPTIAN HIEROGLYPH-14393;Lo;0;L;;;;;N;;;;; +14394;EGYPTIAN HIEROGLYPH-14394;Lo;0;L;;;;;N;;;;; +14395;EGYPTIAN HIEROGLYPH-14395;Lo;0;L;;;;;N;;;;; +14396;EGYPTIAN HIEROGLYPH-14396;Lo;0;L;;;;;N;;;;; +14397;EGYPTIAN HIEROGLYPH-14397;Lo;0;L;;;;;N;;;;; +14398;EGYPTIAN HIEROGLYPH-14398;Lo;0;L;;;;;N;;;;; +14399;EGYPTIAN HIEROGLYPH-14399;Lo;0;L;;;;;N;;;;; +1439A;EGYPTIAN HIEROGLYPH-1439A;Lo;0;L;;;;;N;;;;; +1439B;EGYPTIAN HIEROGLYPH-1439B;Lo;0;L;;;;;N;;;;; +1439C;EGYPTIAN HIEROGLYPH-1439C;Lo;0;L;;;;;N;;;;; +1439D;EGYPTIAN HIEROGLYPH-1439D;Lo;0;L;;;;;N;;;;; +1439E;EGYPTIAN HIEROGLYPH-1439E;Lo;0;L;;;;;N;;;;; +1439F;EGYPTIAN HIEROGLYPH-1439F;Lo;0;L;;;;;N;;;;; +143A0;EGYPTIAN HIEROGLYPH-143A0;Lo;0;L;;;;;N;;;;; +143A1;EGYPTIAN HIEROGLYPH-143A1;Lo;0;L;;;;;N;;;;; +143A2;EGYPTIAN HIEROGLYPH-143A2;Lo;0;L;;;;;N;;;;; +143A3;EGYPTIAN HIEROGLYPH-143A3;Lo;0;L;;;;;N;;;;; +143A4;EGYPTIAN HIEROGLYPH-143A4;Lo;0;L;;;;;N;;;;; +143A5;EGYPTIAN HIEROGLYPH-143A5;Lo;0;L;;;;;N;;;;; +143A6;EGYPTIAN HIEROGLYPH-143A6;Lo;0;L;;;;;N;;;;; +143A7;EGYPTIAN HIEROGLYPH-143A7;Lo;0;L;;;;;N;;;;; +143A8;EGYPTIAN HIEROGLYPH-143A8;Lo;0;L;;;;;N;;;;; +143A9;EGYPTIAN HIEROGLYPH-143A9;Lo;0;L;;;;;N;;;;; +143AA;EGYPTIAN HIEROGLYPH-143AA;Lo;0;L;;;;;N;;;;; +143AB;EGYPTIAN HIEROGLYPH-143AB;Lo;0;L;;;;;N;;;;; +143AC;EGYPTIAN HIEROGLYPH-143AC;Lo;0;L;;;;;N;;;;; +143AD;EGYPTIAN HIEROGLYPH-143AD;Lo;0;L;;;;;N;;;;; +143AE;EGYPTIAN HIEROGLYPH-143AE;Lo;0;L;;;;;N;;;;; +143AF;EGYPTIAN HIEROGLYPH-143AF;Lo;0;L;;;;;N;;;;; +143B0;EGYPTIAN HIEROGLYPH-143B0;Lo;0;L;;;;;N;;;;; +143B1;EGYPTIAN HIEROGLYPH-143B1;Lo;0;L;;;;;N;;;;; +143B2;EGYPTIAN HIEROGLYPH-143B2;Lo;0;L;;;;;N;;;;; +143B3;EGYPTIAN HIEROGLYPH-143B3;Lo;0;L;;;;;N;;;;; +143B4;EGYPTIAN HIEROGLYPH-143B4;Lo;0;L;;;;;N;;;;; +143B5;EGYPTIAN HIEROGLYPH-143B5;Lo;0;L;;;;;N;;;;; +143B6;EGYPTIAN HIEROGLYPH-143B6;Lo;0;L;;;;;N;;;;; +143B7;EGYPTIAN HIEROGLYPH-143B7;Lo;0;L;;;;;N;;;;; +143B8;EGYPTIAN HIEROGLYPH-143B8;Lo;0;L;;;;;N;;;;; +143B9;EGYPTIAN HIEROGLYPH-143B9;Lo;0;L;;;;;N;;;;; +143BA;EGYPTIAN HIEROGLYPH-143BA;Lo;0;L;;;;;N;;;;; +143BB;EGYPTIAN HIEROGLYPH-143BB;Lo;0;L;;;;;N;;;;; +143BC;EGYPTIAN HIEROGLYPH-143BC;Lo;0;L;;;;;N;;;;; +143BD;EGYPTIAN HIEROGLYPH-143BD;Lo;0;L;;;;;N;;;;; +143BE;EGYPTIAN HIEROGLYPH-143BE;Lo;0;L;;;;;N;;;;; +143BF;EGYPTIAN HIEROGLYPH-143BF;Lo;0;L;;;;;N;;;;; +143C0;EGYPTIAN HIEROGLYPH-143C0;Lo;0;L;;;;;N;;;;; +143C1;EGYPTIAN HIEROGLYPH-143C1;Lo;0;L;;;;;N;;;;; +143C2;EGYPTIAN HIEROGLYPH-143C2;Lo;0;L;;;;;N;;;;; +143C3;EGYPTIAN HIEROGLYPH-143C3;Lo;0;L;;;;;N;;;;; +143C4;EGYPTIAN HIEROGLYPH-143C4;Lo;0;L;;;;;N;;;;; +143C5;EGYPTIAN HIEROGLYPH-143C5;Lo;0;L;;;;;N;;;;; +143C6;EGYPTIAN HIEROGLYPH-143C6;Lo;0;L;;;;;N;;;;; +143C7;EGYPTIAN HIEROGLYPH-143C7;Lo;0;L;;;;;N;;;;; +143C8;EGYPTIAN HIEROGLYPH-143C8;Lo;0;L;;;;;N;;;;; +143C9;EGYPTIAN HIEROGLYPH-143C9;Lo;0;L;;;;;N;;;;; +143CA;EGYPTIAN HIEROGLYPH-143CA;Lo;0;L;;;;;N;;;;; +143CB;EGYPTIAN HIEROGLYPH-143CB;Lo;0;L;;;;;N;;;;; +143CC;EGYPTIAN HIEROGLYPH-143CC;Lo;0;L;;;;;N;;;;; +143CD;EGYPTIAN HIEROGLYPH-143CD;Lo;0;L;;;;;N;;;;; +143CE;EGYPTIAN HIEROGLYPH-143CE;Lo;0;L;;;;;N;;;;; +143CF;EGYPTIAN HIEROGLYPH-143CF;Lo;0;L;;;;;N;;;;; +143D0;EGYPTIAN HIEROGLYPH-143D0;Lo;0;L;;;;;N;;;;; +143D1;EGYPTIAN HIEROGLYPH-143D1;Lo;0;L;;;;;N;;;;; +143D2;EGYPTIAN HIEROGLYPH-143D2;Lo;0;L;;;;;N;;;;; +143D3;EGYPTIAN HIEROGLYPH-143D3;Lo;0;L;;;;;N;;;;; +143D4;EGYPTIAN HIEROGLYPH-143D4;Lo;0;L;;;;;N;;;;; +143D5;EGYPTIAN HIEROGLYPH-143D5;Lo;0;L;;;;;N;;;;; +143D6;EGYPTIAN HIEROGLYPH-143D6;Lo;0;L;;;;;N;;;;; +143D7;EGYPTIAN HIEROGLYPH-143D7;Lo;0;L;;;;;N;;;;; +143D8;EGYPTIAN HIEROGLYPH-143D8;Lo;0;L;;;;;N;;;;; +143D9;EGYPTIAN HIEROGLYPH-143D9;Lo;0;L;;;;;N;;;;; +143DA;EGYPTIAN HIEROGLYPH-143DA;Lo;0;L;;;;;N;;;;; +143DB;EGYPTIAN HIEROGLYPH-143DB;Lo;0;L;;;;;N;;;;; +143DC;EGYPTIAN HIEROGLYPH-143DC;Lo;0;L;;;;;N;;;;; +143DD;EGYPTIAN HIEROGLYPH-143DD;Lo;0;L;;;;;N;;;;; +143DE;EGYPTIAN HIEROGLYPH-143DE;Lo;0;L;;;;;N;;;;; +143DF;EGYPTIAN HIEROGLYPH-143DF;Lo;0;L;;;;;N;;;;; +143E0;EGYPTIAN HIEROGLYPH-143E0;Lo;0;L;;;;;N;;;;; +143E1;EGYPTIAN HIEROGLYPH-143E1;Lo;0;L;;;;;N;;;;; +143E2;EGYPTIAN HIEROGLYPH-143E2;Lo;0;L;;;;;N;;;;; +143E3;EGYPTIAN HIEROGLYPH-143E3;Lo;0;L;;;;;N;;;;; +143E4;EGYPTIAN HIEROGLYPH-143E4;Lo;0;L;;;;;N;;;;; +143E5;EGYPTIAN HIEROGLYPH-143E5;Lo;0;L;;;;;N;;;;; +143E6;EGYPTIAN HIEROGLYPH-143E6;Lo;0;L;;;;;N;;;;; +143E7;EGYPTIAN HIEROGLYPH-143E7;Lo;0;L;;;;;N;;;;; +143E8;EGYPTIAN HIEROGLYPH-143E8;Lo;0;L;;;;;N;;;;; +143E9;EGYPTIAN HIEROGLYPH-143E9;Lo;0;L;;;;;N;;;;; +143EA;EGYPTIAN HIEROGLYPH-143EA;Lo;0;L;;;;;N;;;;; +143EB;EGYPTIAN HIEROGLYPH-143EB;Lo;0;L;;;;;N;;;;; +143EC;EGYPTIAN HIEROGLYPH-143EC;Lo;0;L;;;;;N;;;;; +143ED;EGYPTIAN HIEROGLYPH-143ED;Lo;0;L;;;;;N;;;;; +143EE;EGYPTIAN HIEROGLYPH-143EE;Lo;0;L;;;;;N;;;;; +143EF;EGYPTIAN HIEROGLYPH-143EF;Lo;0;L;;;;;N;;;;; +143F0;EGYPTIAN HIEROGLYPH-143F0;Lo;0;L;;;;;N;;;;; +143F1;EGYPTIAN HIEROGLYPH-143F1;Lo;0;L;;;;;N;;;;; +143F2;EGYPTIAN HIEROGLYPH-143F2;Lo;0;L;;;;;N;;;;; +143F3;EGYPTIAN HIEROGLYPH-143F3;Lo;0;L;;;;;N;;;;; +143F4;EGYPTIAN HIEROGLYPH-143F4;Lo;0;L;;;;;N;;;;; +143F5;EGYPTIAN HIEROGLYPH-143F5;Lo;0;L;;;;;N;;;;; +143F6;EGYPTIAN HIEROGLYPH-143F6;Lo;0;L;;;;;N;;;;; +143F7;EGYPTIAN HIEROGLYPH-143F7;Lo;0;L;;;;;N;;;;; +143F8;EGYPTIAN HIEROGLYPH-143F8;Lo;0;L;;;;;N;;;;; +143F9;EGYPTIAN HIEROGLYPH-143F9;Lo;0;L;;;;;N;;;;; +143FA;EGYPTIAN HIEROGLYPH-143FA;Lo;0;L;;;;;N;;;;; 14400;ANATOLIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;; 14401;ANATOLIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;; 14402;ANATOLIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;; @@ -24771,6 +29053,64 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 14644;ANATOLIAN HIEROGLYPH A528;Lo;0;L;;;;;N;;;;; 14645;ANATOLIAN HIEROGLYPH A529;Lo;0;L;;;;;N;;;;; 14646;ANATOLIAN HIEROGLYPH A530;Lo;0;L;;;;;N;;;;; +16100;GURUNG KHEMA LETTER A;Lo;0;L;;;;;N;;;;; +16101;GURUNG KHEMA LETTER KA;Lo;0;L;;;;;N;;;;; +16102;GURUNG KHEMA LETTER KHA;Lo;0;L;;;;;N;;;;; +16103;GURUNG KHEMA LETTER GA;Lo;0;L;;;;;N;;;;; +16104;GURUNG KHEMA LETTER GHA;Lo;0;L;;;;;N;;;;; +16105;GURUNG KHEMA LETTER NGA;Lo;0;L;;;;;N;;;;; +16106;GURUNG KHEMA LETTER CA;Lo;0;L;;;;;N;;;;; +16107;GURUNG KHEMA LETTER CHA;Lo;0;L;;;;;N;;;;; +16108;GURUNG KHEMA LETTER JA;Lo;0;L;;;;;N;;;;; +16109;GURUNG KHEMA LETTER JHA;Lo;0;L;;;;;N;;;;; +1610A;GURUNG KHEMA LETTER HA;Lo;0;L;;;;;N;;;;; +1610B;GURUNG KHEMA LETTER TTA;Lo;0;L;;;;;N;;;;; +1610C;GURUNG KHEMA LETTER TTHA;Lo;0;L;;;;;N;;;;; +1610D;GURUNG KHEMA LETTER DDA;Lo;0;L;;;;;N;;;;; +1610E;GURUNG KHEMA LETTER DDHA;Lo;0;L;;;;;N;;;;; +1610F;GURUNG KHEMA LETTER VA;Lo;0;L;;;;;N;;;;; +16110;GURUNG KHEMA LETTER TA;Lo;0;L;;;;;N;;;;; +16111;GURUNG KHEMA LETTER THA;Lo;0;L;;;;;N;;;;; +16112;GURUNG KHEMA LETTER DA;Lo;0;L;;;;;N;;;;; +16113;GURUNG KHEMA LETTER DHA;Lo;0;L;;;;;N;;;;; +16114;GURUNG KHEMA LETTER NA;Lo;0;L;;;;;N;;;;; +16115;GURUNG KHEMA LETTER PA;Lo;0;L;;;;;N;;;;; +16116;GURUNG KHEMA LETTER PHA;Lo;0;L;;;;;N;;;;; +16117;GURUNG KHEMA LETTER BA;Lo;0;L;;;;;N;;;;; +16118;GURUNG KHEMA LETTER BHA;Lo;0;L;;;;;N;;;;; +16119;GURUNG KHEMA LETTER MA;Lo;0;L;;;;;N;;;;; +1611A;GURUNG KHEMA LETTER YA;Lo;0;L;;;;;N;;;;; +1611B;GURUNG KHEMA LETTER RA;Lo;0;L;;;;;N;;;;; +1611C;GURUNG KHEMA LETTER LA;Lo;0;L;;;;;N;;;;; +1611D;GURUNG KHEMA LETTER SA;Lo;0;L;;;;;N;;;;; +1611E;GURUNG KHEMA VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;; +1611F;GURUNG KHEMA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;; +16120;GURUNG KHEMA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;; +16121;GURUNG KHEMA VOWEL SIGN U;Mn;0;NSM;1611E 1611E;;;;N;;;;; +16122;GURUNG KHEMA VOWEL SIGN UU;Mn;0;NSM;1611E 16129;;;;N;;;;; +16123;GURUNG KHEMA VOWEL SIGN E;Mn;0;NSM;1611E 1611F;;;;N;;;;; +16124;GURUNG KHEMA VOWEL SIGN EE;Mn;0;NSM;16129 1611F;;;;N;;;;; +16125;GURUNG KHEMA VOWEL SIGN AI;Mn;0;NSM;1611E 16120;;;;N;;;;; +16126;GURUNG KHEMA VOWEL SIGN O;Mn;0;NSM;16121 1611F;;;;N;;;;; +16127;GURUNG KHEMA VOWEL SIGN OO;Mn;0;NSM;16122 1611F;;;;N;;;;; +16128;GURUNG KHEMA VOWEL SIGN AU;Mn;0;NSM;16121 16120;;;;N;;;;; +16129;GURUNG KHEMA VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;; +1612A;GURUNG KHEMA CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;; +1612B;GURUNG KHEMA CONSONANT SIGN MEDIAL VA;Mc;0;L;;;;;N;;;;; +1612C;GURUNG KHEMA CONSONANT SIGN MEDIAL HA;Mc;0;L;;;;;N;;;;; +1612D;GURUNG KHEMA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;; +1612E;GURUNG KHEMA CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;; +1612F;GURUNG KHEMA SIGN THOLHOMA;Mn;9;NSM;;;;;N;;;;; +16130;GURUNG KHEMA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16131;GURUNG KHEMA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16132;GURUNG KHEMA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16133;GURUNG KHEMA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16134;GURUNG KHEMA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16135;GURUNG KHEMA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16136;GURUNG KHEMA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16137;GURUNG KHEMA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16138;GURUNG KHEMA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16139;GURUNG KHEMA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 16800;BAMUM LETTER PHASE-A NGKUE MFON;Lo;0;L;;;;;N;;;;; 16801;BAMUM LETTER PHASE-A GBIEE FON;Lo;0;L;;;;;N;;;;; 16802;BAMUM LETTER PHASE-A PON MFON PIPAEMGBIEE;Lo;0;L;;;;;N;;;;; @@ -25635,6 +29975,64 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 16B8D;PAHAWH HMONG CLAN SIGN TSWB;Lo;0;L;;;;;N;;;;; 16B8E;PAHAWH HMONG CLAN SIGN KWM;Lo;0;L;;;;;N;;;;; 16B8F;PAHAWH HMONG CLAN SIGN VWJ;Lo;0;L;;;;;N;;;;; +16D40;KIRAT RAI SIGN ANUSVARA;Lm;0;L;;;;;N;;;;; +16D41;KIRAT RAI SIGN TONPI;Lm;0;L;;;;;N;;;;; +16D42;KIRAT RAI SIGN VISARGA;Lm;0;L;;;;;N;;;;; +16D43;KIRAT RAI LETTER A;Lo;0;L;;;;;N;;;;; +16D44;KIRAT RAI LETTER KA;Lo;0;L;;;;;N;;;;; +16D45;KIRAT RAI LETTER KHA;Lo;0;L;;;;;N;;;;; +16D46;KIRAT RAI LETTER GA;Lo;0;L;;;;;N;;;;; +16D47;KIRAT RAI LETTER GHA;Lo;0;L;;;;;N;;;;; +16D48;KIRAT RAI LETTER NGA;Lo;0;L;;;;;N;;;;; +16D49;KIRAT RAI LETTER CA;Lo;0;L;;;;;N;;;;; +16D4A;KIRAT RAI LETTER CHA;Lo;0;L;;;;;N;;;;; +16D4B;KIRAT RAI LETTER JA;Lo;0;L;;;;;N;;;;; +16D4C;KIRAT RAI LETTER JHA;Lo;0;L;;;;;N;;;;; +16D4D;KIRAT RAI LETTER NYA;Lo;0;L;;;;;N;;;;; +16D4E;KIRAT RAI LETTER TTA;Lo;0;L;;;;;N;;;;; +16D4F;KIRAT RAI LETTER TTHA;Lo;0;L;;;;;N;;;;; +16D50;KIRAT RAI LETTER DDA;Lo;0;L;;;;;N;;;;; +16D51;KIRAT RAI LETTER DDHA;Lo;0;L;;;;;N;;;;; +16D52;KIRAT RAI LETTER TA;Lo;0;L;;;;;N;;;;; +16D53;KIRAT RAI LETTER THA;Lo;0;L;;;;;N;;;;; +16D54;KIRAT RAI LETTER DA;Lo;0;L;;;;;N;;;;; +16D55;KIRAT RAI LETTER DHA;Lo;0;L;;;;;N;;;;; +16D56;KIRAT RAI LETTER NA;Lo;0;L;;;;;N;;;;; +16D57;KIRAT RAI LETTER PA;Lo;0;L;;;;;N;;;;; +16D58;KIRAT RAI LETTER PHA;Lo;0;L;;;;;N;;;;; +16D59;KIRAT RAI LETTER BA;Lo;0;L;;;;;N;;;;; +16D5A;KIRAT RAI LETTER BHA;Lo;0;L;;;;;N;;;;; +16D5B;KIRAT RAI LETTER MA;Lo;0;L;;;;;N;;;;; +16D5C;KIRAT RAI LETTER YA;Lo;0;L;;;;;N;;;;; +16D5D;KIRAT RAI LETTER RA;Lo;0;L;;;;;N;;;;; +16D5E;KIRAT RAI LETTER LA;Lo;0;L;;;;;N;;;;; +16D5F;KIRAT RAI LETTER VA;Lo;0;L;;;;;N;;;;; +16D60;KIRAT RAI LETTER SA;Lo;0;L;;;;;N;;;;; +16D61;KIRAT RAI LETTER SHA;Lo;0;L;;;;;N;;;;; +16D62;KIRAT RAI LETTER HA;Lo;0;L;;;;;N;;;;; +16D63;KIRAT RAI VOWEL SIGN AA;Lo;0;L;;;;;N;;;;; +16D64;KIRAT RAI VOWEL SIGN I;Lo;0;L;;;;;N;;;;; +16D65;KIRAT RAI VOWEL SIGN U;Lo;0;L;;;;;N;;;;; +16D66;KIRAT RAI VOWEL SIGN UE;Lo;0;L;;;;;N;;;;; +16D67;KIRAT RAI VOWEL SIGN E;Lo;0;L;;;;;N;;;;; +16D68;KIRAT RAI VOWEL SIGN AI;Lo;0;L;16D67 16D67;;;;N;;;;; +16D69;KIRAT RAI VOWEL SIGN O;Lo;0;L;16D63 16D67;;;;N;;;;; +16D6A;KIRAT RAI VOWEL SIGN AU;Lo;0;L;16D69 16D67;;;;N;;;;; +16D6B;KIRAT RAI SIGN VIRAMA;Lm;0;L;;;;;N;;;;; +16D6C;KIRAT RAI SIGN SAAT;Lm;0;L;;;;;N;;;;; +16D6D;KIRAT RAI SIGN YUPI;Po;0;L;;;;;N;;;;; +16D6E;KIRAT RAI DANDA;Po;0;L;;;;;N;;;;; +16D6F;KIRAT RAI DOUBLE DANDA;Po;0;L;;;;;N;;;;; +16D70;KIRAT RAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +16D71;KIRAT RAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +16D72;KIRAT RAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +16D73;KIRAT RAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +16D74;KIRAT RAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +16D75;KIRAT RAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +16D76;KIRAT RAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +16D77;KIRAT RAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +16D78;KIRAT RAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +16D79;KIRAT RAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; 16E40;MEDEFAIDRIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;16E60; 16E41;MEDEFAIDRIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;16E61; 16E42;MEDEFAIDRIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;16E62; @@ -27122,6 +31520,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 18CD3;KHITAN SMALL SCRIPT CHARACTER-18CD3;Lo;0;L;;;;;N;;;;; 18CD4;KHITAN SMALL SCRIPT CHARACTER-18CD4;Lo;0;L;;;;;N;;;;; 18CD5;KHITAN SMALL SCRIPT CHARACTER-18CD5;Lo;0;L;;;;;N;;;;; +18CFF;KHITAN SMALL SCRIPT CHARACTER-18CFF;Lo;0;L;;;;;N;;;;; 18D00;;Lo;0;L;;;;;N;;;;; 18D08;;Lo;0;L;;;;;N;;;;; 1AFF0;KATAKANA LETTER MINNAN TONE-2;Lm;0;L;;;;;N;;;;; @@ -27980,6 +32379,692 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1BCA1;SHORTHAND FORMAT CONTINUING OVERLAP;Cf;0;BN;;;;;N;;;;; 1BCA2;SHORTHAND FORMAT DOWN STEP;Cf;0;BN;;;;;N;;;;; 1BCA3;SHORTHAND FORMAT UP STEP;Cf;0;BN;;;;;N;;;;; +1CC00;UP-POINTING GO-KART;So;0;ON;;;;;N;;;;; +1CC01;RIGHT-POINTING GO-KART;So;0;ON;;;;;N;;;;; +1CC02;LEFT-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC03;RIGHT-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC04;DOWN-POINTING STICK FIGURE;So;0;ON;;;;;N;;;;; +1CC05;LOWER HORIZONTAL RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC06;RIGHT VERTICAL RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC07;LOWER RIGHT RULER SEGMENT;So;0;ON;;;;;N;;;;; +1CC08;ANTENNA;So;0;ON;;;;;N;;;;; +1CC09;HORIZONTAL RESISTOR SEGMENT;So;0;ON;;;;;N;;;;; +1CC0A;VERTICAL RESISTOR SEGMENT;So;0;ON;;;;;N;;;;; +1CC0B;LEFT THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0C;MIDDLE THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0D;RIGHT THIRD INDUCTOR;So;0;ON;;;;;N;;;;; +1CC0E;LEFT-POINTING DIODE;So;0;ON;;;;;N;;;;; +1CC0F;RIGHT-POINTING DIODE;So;0;ON;;;;;N;;;;; +1CC10;NPN TRANSISTOR;So;0;ON;;;;;N;;;;; +1CC11;PNP TRANSISTOR;So;0;ON;;;;;N;;;;; +1CC12;RECEPTACLE;So;0;ON;;;;;N;;;;; +1CC13;HORIZONTAL CAPACITOR;So;0;ON;;;;;N;;;;; +1CC14;VERTICAL CAPACITOR;So;0;ON;;;;;N;;;;; +1CC15;LOGIC GATE OR;So;0;ON;;;;;N;;;;; +1CC16;LOGIC GATE AND;So;0;ON;;;;;N;;;;; +1CC17;LOGIC GATE INVERTED INPUTS;So;0;ON;;;;;N;;;;; +1CC18;LOGIC GATE INVERTED OUTPUT;So;0;ON;;;;;N;;;;; +1CC19;LOGIC GATE BUFFER;So;0;ON;;;;;N;;;;; +1CC1A;LOGIC GATE BUFFER WITH INVERTED INPUT;So;0;ON;;;;;N;;;;; +1CC1B;BOX DRAWINGS LIGHT HORIZONTAL AND UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CC1C;BOX DRAWINGS LIGHT HORIZONTAL AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CC1D;BOX DRAWINGS LIGHT TOP AND UPPER LEFT;So;0;ON;;;;;N;;;;; +1CC1E;BOX DRAWINGS LIGHT BOTTOM AND LOWER LEFT;So;0;ON;;;;;N;;;;; +1CC1F;BOX DRAWINGS DOUBLE DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1CC20;BOX DRAWINGS DOUBLE DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CC21;SEPARATED BLOCK QUADRANT-1;So;0;ON;;;;;N;;;;; +1CC22;SEPARATED BLOCK QUADRANT-2;So;0;ON;;;;;N;;;;; +1CC23;SEPARATED BLOCK QUADRANT-12;So;0;ON;;;;;N;;;;; +1CC24;SEPARATED BLOCK QUADRANT-3;So;0;ON;;;;;N;;;;; +1CC25;SEPARATED BLOCK QUADRANT-13;So;0;ON;;;;;N;;;;; +1CC26;SEPARATED BLOCK QUADRANT-23;So;0;ON;;;;;N;;;;; +1CC27;SEPARATED BLOCK QUADRANT-123;So;0;ON;;;;;N;;;;; +1CC28;SEPARATED BLOCK QUADRANT-4;So;0;ON;;;;;N;;;;; +1CC29;SEPARATED BLOCK QUADRANT-14;So;0;ON;;;;;N;;;;; +1CC2A;SEPARATED BLOCK QUADRANT-24;So;0;ON;;;;;N;;;;; +1CC2B;SEPARATED BLOCK QUADRANT-124;So;0;ON;;;;;N;;;;; +1CC2C;SEPARATED BLOCK QUADRANT-34;So;0;ON;;;;;N;;;;; +1CC2D;SEPARATED BLOCK QUADRANT-134;So;0;ON;;;;;N;;;;; +1CC2E;SEPARATED BLOCK QUADRANT-234;So;0;ON;;;;;N;;;;; +1CC2F;SEPARATED BLOCK QUADRANT-1234;So;0;ON;;;;;N;;;;; +1CC30;UPPER LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC31;UPPER CENTRE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC32;UPPER CENTRE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC33;UPPER RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC34;UPPER MIDDLE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC35;UPPER LEFT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC36;UPPER RIGHT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC37;UPPER MIDDLE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC38;LOWER MIDDLE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC39;LOWER LEFT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC3A;LOWER RIGHT QUARTER CIRCLE;So;0;ON;;;;;N;;;;; +1CC3B;LOWER MIDDLE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3C;LOWER LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3D;LOWER CENTRE LEFT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3E;LOWER CENTRE RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC3F;LOWER RIGHT TWELFTH CIRCLE;So;0;ON;;;;;N;;;;; +1CC40;SPARSE HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +1CC41;SPARSE VERTICAL FILL;So;0;ON;;;;;N;;;;; +1CC42;ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +1CC43;DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;; +1CC44;DENSE VERTICAL FILL;So;0;ON;;;;;N;;;;; +1CC45;DENSE HORIZONTAL FILL;So;0;ON;;;;;N;;;;; +1CC46;SPECKLE FILL FRAME-1;So;0;ON;;;;;N;;;;; +1CC47;SPECKLE FILL FRAME-2;So;0;ON;;;;;N;;;;; +1CC48;LEFT-FACING BASSINET;So;0;ON;;;;;N;;;;; +1CC49;RIGHT-FACING BASSINET;So;0;ON;;;;;N;;;;; +1CC4A;FLYING SAUCER WITH BEAMS;So;0;ON;;;;;N;;;;; +1CC4B;FLYING SAUCER WITHOUT BEAMS;So;0;ON;;;;;N;;;;; +1CC4C;ALIEN MONSTER OPEN JAWS;So;0;ON;;;;;N;;;;; +1CC4D;ALIEN MONSTER CLOSED JAWS;So;0;ON;;;;;N;;;;; +1CC4E;ALIEN SQUID OPEN TENTACLES;So;0;ON;;;;;N;;;;; +1CC4F;ALIEN SQUID CLOSED TENTACLES;So;0;ON;;;;;N;;;;; +1CC50;ALIEN CRAB STEPPING RIGHT;So;0;ON;;;;;N;;;;; +1CC51;ALIEN CRAB STEPPING LEFT;So;0;ON;;;;;N;;;;; +1CC52;ALIEN SPIDER CROUCHING;So;0;ON;;;;;N;;;;; +1CC53;ALIEN SPIDER SPREAD;So;0;ON;;;;;N;;;;; +1CC54;ALIEN MONSTER STEP-1;So;0;ON;;;;;N;;;;; +1CC55;ALIEN MONSTER STEP-2;So;0;ON;;;;;N;;;;; +1CC56;LEFT-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC57;UP-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC58;RIGHT-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC59;DOWN-POINTING ROCKET SHIP;So;0;ON;;;;;N;;;;; +1CC5A;TOP HALF LEFT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5B;TOP HALF FORWARD-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5C;TOP HALF RIGHT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5D;BOTTOM HALF LEFT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5E;BOTTOM HALF FORWARD-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC5F;BOTTOM HALF RIGHT-FACING ROBOT;So;0;ON;;;;;N;;;;; +1CC60;LEFT-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC61;UP-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC62;RIGHT-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC63;DOWN-POINTING ATOMIC BOMB;So;0;ON;;;;;N;;;;; +1CC64;MUSHROOM CLOUD;So;0;ON;;;;;N;;;;; +1CC65;LEFT-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC66;UP-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC67;RIGHT-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC68;DOWN-POINTING RIFLE;So;0;ON;;;;;N;;;;; +1CC69;EIGHT RAYS INWARD;So;0;ON;;;;;N;;;;; +1CC6A;EIGHT RAYS OUTWARD;So;0;ON;;;;;N;;;;; +1CC6B;BLACK LARGE CIRCLE MINUS LEFT QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6C;BLACK LARGE CIRCLE MINUS UPPER QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6D;BLACK LARGE CIRCLE MINUS RIGHT QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6E;BLACK LARGE CIRCLE MINUS LOWER QUARTER SECTION;So;0;ON;;;;;N;;;;; +1CC6F;BLACK NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CC70;LEFT-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC71;UP-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC72;RIGHT-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC73;DOWN-FACING SNAKE HEAD WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC74;LEFT-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC75;UP-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC76;RIGHT-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC77;DOWN-FACING SNAKE HEAD WITH CLOSED MOUTH;So;0;ON;;;;;N;;;;; +1CC78;LEFT-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC79;UP-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7A;RIGHT-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7B;DOWN-POINTING ENERGY WAVE;So;0;ON;;;;;N;;;;; +1CC7C;SQUARE SPIRAL FROM TOP LEFT;So;0;ON;;;;;N;;;;; +1CC7D;SQUARE SPIRAL FROM TOP RIGHT;So;0;ON;;;;;N;;;;; +1CC7E;SQUARE SPIRAL FROM BOTTOM RIGHT;So;0;ON;;;;;N;;;;; +1CC7F;SQUARE SPIRAL FROM BOTTOM LEFT;So;0;ON;;;;;N;;;;; +1CC80;STRIPED LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC81;STRIPED UP-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC82;STRIPED RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC83;STRIPED DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;; +1CC84;VERTICAL LADDER;So;0;ON;;;;;N;;;;; +1CC85;HORIZONTAL LADDER;So;0;ON;;;;;N;;;;; +1CC86;WHITE LOWER LEFT POINTER;So;0;ON;;;;;N;;;;; +1CC87;WHITE LOWER RIGHT POINTER;So;0;ON;;;;;N;;;;; +1CC88;TWO RINGS ALIGNED HORIZONTALLY;So;0;ON;;;;;N;;;;; +1CC89;SQUARE FOUR CORNER SALTIRES;So;0;ON;;;;;N;;;;; +1CC8A;SQUARE FOUR CORNER DIAGONALS;So;0;ON;;;;;N;;;;; +1CC8B;SQUARE FOUR CORNER BLACK TRIANGLES;So;0;ON;;;;;N;;;;; +1CC8C;SQUARE APERTURE;So;0;ON;;;;;N;;;;; +1CC8D;INVERSE BLACK DIAMOND;So;0;ON;;;;;N;;;;; +1CC8E;LEFT AND UPPER ONE EIGHTH BLOCK CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CC8F;INVERSE BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CC90;VERTICAL LINE WITH FOUR TICK MARKS;So;0;ON;;;;;N;;;;; +1CC91;HORIZONTAL LINE WITH FOUR TICK MARKS;So;0;ON;;;;;N;;;;; +1CC92;LEFT-FACING FISH;So;0;ON;;;;;N;;;;; +1CC93;RIGHT-FACING FISH;So;0;ON;;;;;N;;;;; +1CC94;LEFT-FACING FISH WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC95;RIGHT-FACING FISH WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CC96;FLAPPING BIRD;So;0;ON;;;;;N;;;;; +1CC97;LEFT-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC98;UP-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC99;RIGHT-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC9A;DOWN-POINTING RACING CAR;So;0;ON;;;;;N;;;;; +1CC9B;HORIZONTAL RACING CAR;So;0;ON;;;;;N;;;;; +1CC9C;VERTICAL RACING CAR;So;0;ON;;;;;N;;;;; +1CC9D;VERTICAL GO-KART;So;0;ON;;;;;N;;;;; +1CC9E;LEFT-POINTING TANK;So;0;ON;;;;;N;;;;; +1CC9F;RIGHT-POINTING TANK;So;0;ON;;;;;N;;;;; +1CCA0;LEFT-POINTING ROCKET BOOSTER;So;0;ON;;;;;N;;;;; +1CCA1;RIGHT-POINTING ROCKET BOOSTER;So;0;ON;;;;;N;;;;; +1CCA2;LEFT-POINTING ROLLER COASTER CAR;So;0;ON;;;;;N;;;;; +1CCA3;RIGHT-POINTING ROLLER COASTER CAR;So;0;ON;;;;;N;;;;; +1CCA4;LEFT HALF FLYING SAUCER;So;0;ON;;;;;N;;;;; +1CCA5;RIGHT HALF FLYING SAUCER;So;0;ON;;;;;N;;;;; +1CCA6;UPPER LEFT QUADRANT FACE WITH OPEN EYES;So;0;ON;;;;;N;;;;; +1CCA7;UPPER RIGHT QUADRANT FACE WITH OPEN EYES;So;0;ON;;;;;N;;;;; +1CCA8;UPPER LEFT QUADRANT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1CCA9;UPPER RIGHT QUADRANT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;; +1CCAA;LOWER LEFT QUADRANT SMILING FACE;So;0;ON;;;;;N;;;;; +1CCAB;LOWER RIGHT QUADRANT SMILING FACE;So;0;ON;;;;;N;;;;; +1CCAC;LOWER LEFT QUADRANT NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CCAD;LOWER RIGHT QUADRANT NEUTRAL FACE;So;0;ON;;;;;N;;;;; +1CCAE;LOWER LEFT QUADRANT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CCAF;LOWER RIGHT QUADRANT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;; +1CCB0;LOWER LEFT QUADRANT FROWNING FACE;So;0;ON;;;;;N;;;;; +1CCB1;LOWER RIGHT QUADRANT FROWNING FACE;So;0;ON;;;;;N;;;;; +1CCB2;UPPER LEFT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB3;UPPER RIGHT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB4;LOWER LEFT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB5;LOWER RIGHT QUADRANT TELEVISION;So;0;ON;;;;;N;;;;; +1CCB6;UPPER LEFT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB7;UPPER RIGHT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB8;LOWER LEFT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCB9;LOWER RIGHT QUADRANT MICROCOMPUTER;So;0;ON;;;;;N;;;;; +1CCBA;UPPER LEFT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBB;UPPER RIGHT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBC;LOWER LEFT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBD;LOWER RIGHT QUADRANT CHESS KING;So;0;ON;;;;;N;;;;; +1CCBE;UPPER LEFT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCBF;UPPER RIGHT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC0;LOWER LEFT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC1;LOWER RIGHT QUADRANT CHESS QUEEN;So;0;ON;;;;;N;;;;; +1CCC2;UPPER LEFT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC3;UPPER RIGHT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC4;LOWER LEFT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC5;LOWER RIGHT QUADRANT CHESS ROOK;So;0;ON;;;;;N;;;;; +1CCC6;UPPER LEFT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC7;UPPER RIGHT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC8;LOWER LEFT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCC9;LOWER RIGHT QUADRANT CHESS BISHOP;So;0;ON;;;;;N;;;;; +1CCCA;UPPER LEFT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCB;UPPER RIGHT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCC;LOWER LEFT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCD;LOWER RIGHT QUADRANT CHESS KNIGHT;So;0;ON;;;;;N;;;;; +1CCCE;UPPER LEFT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCCF;UPPER RIGHT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD0;LOWER LEFT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD1;LOWER RIGHT QUADRANT CHESS PAWN;So;0;ON;;;;;N;;;;; +1CCD2;UPPER LEFT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD3;UPPER RIGHT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD4;LOWER LEFT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD5;LOWER RIGHT QUADRANT STANDING KNIGHT;So;0;ON;;;;;N;;;;; +1CCD6;OUTLINED LATIN CAPITAL LETTER A;So;0;L; 0041;;;;N;;;;; +1CCD7;OUTLINED LATIN CAPITAL LETTER B;So;0;L; 0042;;;;N;;;;; +1CCD8;OUTLINED LATIN CAPITAL LETTER C;So;0;L; 0043;;;;N;;;;; +1CCD9;OUTLINED LATIN CAPITAL LETTER D;So;0;L; 0044;;;;N;;;;; +1CCDA;OUTLINED LATIN CAPITAL LETTER E;So;0;L; 0045;;;;N;;;;; +1CCDB;OUTLINED LATIN CAPITAL LETTER F;So;0;L; 0046;;;;N;;;;; +1CCDC;OUTLINED LATIN CAPITAL LETTER G;So;0;L; 0047;;;;N;;;;; +1CCDD;OUTLINED LATIN CAPITAL LETTER H;So;0;L; 0048;;;;N;;;;; +1CCDE;OUTLINED LATIN CAPITAL LETTER I;So;0;L; 0049;;;;N;;;;; +1CCDF;OUTLINED LATIN CAPITAL LETTER J;So;0;L; 004A;;;;N;;;;; +1CCE0;OUTLINED LATIN CAPITAL LETTER K;So;0;L; 004B;;;;N;;;;; +1CCE1;OUTLINED LATIN CAPITAL LETTER L;So;0;L; 004C;;;;N;;;;; +1CCE2;OUTLINED LATIN CAPITAL LETTER M;So;0;L; 004D;;;;N;;;;; +1CCE3;OUTLINED LATIN CAPITAL LETTER N;So;0;L; 004E;;;;N;;;;; +1CCE4;OUTLINED LATIN CAPITAL LETTER O;So;0;L; 004F;;;;N;;;;; +1CCE5;OUTLINED LATIN CAPITAL LETTER P;So;0;L; 0050;;;;N;;;;; +1CCE6;OUTLINED LATIN CAPITAL LETTER Q;So;0;L; 0051;;;;N;;;;; +1CCE7;OUTLINED LATIN CAPITAL LETTER R;So;0;L; 0052;;;;N;;;;; +1CCE8;OUTLINED LATIN CAPITAL LETTER S;So;0;L; 0053;;;;N;;;;; +1CCE9;OUTLINED LATIN CAPITAL LETTER T;So;0;L; 0054;;;;N;;;;; +1CCEA;OUTLINED LATIN CAPITAL LETTER U;So;0;L; 0055;;;;N;;;;; +1CCEB;OUTLINED LATIN CAPITAL LETTER V;So;0;L; 0056;;;;N;;;;; +1CCEC;OUTLINED LATIN CAPITAL LETTER W;So;0;L; 0057;;;;N;;;;; +1CCED;OUTLINED LATIN CAPITAL LETTER X;So;0;L; 0058;;;;N;;;;; +1CCEE;OUTLINED LATIN CAPITAL LETTER Y;So;0;L; 0059;;;;N;;;;; +1CCEF;OUTLINED LATIN CAPITAL LETTER Z;So;0;L; 005A;;;;N;;;;; +1CCF0;OUTLINED DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; +1CCF1;OUTLINED DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; +1CCF2;OUTLINED DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; +1CCF3;OUTLINED DIGIT THREE;Nd;0;EN; 0033;3;3;3;N;;;;; +1CCF4;OUTLINED DIGIT FOUR;Nd;0;EN; 0034;4;4;4;N;;;;; +1CCF5;OUTLINED DIGIT FIVE;Nd;0;EN; 0035;5;5;5;N;;;;; +1CCF6;OUTLINED DIGIT SIX;Nd;0;EN; 0036;6;6;6;N;;;;; +1CCF7;OUTLINED DIGIT SEVEN;Nd;0;EN; 0037;7;7;7;N;;;;; +1CCF8;OUTLINED DIGIT EIGHT;Nd;0;EN; 0038;8;8;8;N;;;;; +1CCF9;OUTLINED DIGIT NINE;Nd;0;EN; 0039;9;9;9;N;;;;; +1CD00;BLOCK OCTANT-3;So;0;ON;;;;;N;;;;; +1CD01;BLOCK OCTANT-23;So;0;ON;;;;;N;;;;; +1CD02;BLOCK OCTANT-123;So;0;ON;;;;;N;;;;; +1CD03;BLOCK OCTANT-4;So;0;ON;;;;;N;;;;; +1CD04;BLOCK OCTANT-14;So;0;ON;;;;;N;;;;; +1CD05;BLOCK OCTANT-124;So;0;ON;;;;;N;;;;; +1CD06;BLOCK OCTANT-34;So;0;ON;;;;;N;;;;; +1CD07;BLOCK OCTANT-134;So;0;ON;;;;;N;;;;; +1CD08;BLOCK OCTANT-234;So;0;ON;;;;;N;;;;; +1CD09;BLOCK OCTANT-5;So;0;ON;;;;;N;;;;; +1CD0A;BLOCK OCTANT-15;So;0;ON;;;;;N;;;;; +1CD0B;BLOCK OCTANT-25;So;0;ON;;;;;N;;;;; +1CD0C;BLOCK OCTANT-125;So;0;ON;;;;;N;;;;; +1CD0D;BLOCK OCTANT-135;So;0;ON;;;;;N;;;;; +1CD0E;BLOCK OCTANT-235;So;0;ON;;;;;N;;;;; +1CD0F;BLOCK OCTANT-1235;So;0;ON;;;;;N;;;;; +1CD10;BLOCK OCTANT-45;So;0;ON;;;;;N;;;;; +1CD11;BLOCK OCTANT-145;So;0;ON;;;;;N;;;;; +1CD12;BLOCK OCTANT-245;So;0;ON;;;;;N;;;;; +1CD13;BLOCK OCTANT-1245;So;0;ON;;;;;N;;;;; +1CD14;BLOCK OCTANT-345;So;0;ON;;;;;N;;;;; +1CD15;BLOCK OCTANT-1345;So;0;ON;;;;;N;;;;; +1CD16;BLOCK OCTANT-2345;So;0;ON;;;;;N;;;;; +1CD17;BLOCK OCTANT-12345;So;0;ON;;;;;N;;;;; +1CD18;BLOCK OCTANT-6;So;0;ON;;;;;N;;;;; +1CD19;BLOCK OCTANT-16;So;0;ON;;;;;N;;;;; +1CD1A;BLOCK OCTANT-26;So;0;ON;;;;;N;;;;; +1CD1B;BLOCK OCTANT-126;So;0;ON;;;;;N;;;;; +1CD1C;BLOCK OCTANT-36;So;0;ON;;;;;N;;;;; +1CD1D;BLOCK OCTANT-136;So;0;ON;;;;;N;;;;; +1CD1E;BLOCK OCTANT-236;So;0;ON;;;;;N;;;;; +1CD1F;BLOCK OCTANT-1236;So;0;ON;;;;;N;;;;; +1CD20;BLOCK OCTANT-146;So;0;ON;;;;;N;;;;; +1CD21;BLOCK OCTANT-246;So;0;ON;;;;;N;;;;; +1CD22;BLOCK OCTANT-1246;So;0;ON;;;;;N;;;;; +1CD23;BLOCK OCTANT-346;So;0;ON;;;;;N;;;;; +1CD24;BLOCK OCTANT-1346;So;0;ON;;;;;N;;;;; +1CD25;BLOCK OCTANT-2346;So;0;ON;;;;;N;;;;; +1CD26;BLOCK OCTANT-12346;So;0;ON;;;;;N;;;;; +1CD27;BLOCK OCTANT-56;So;0;ON;;;;;N;;;;; +1CD28;BLOCK OCTANT-156;So;0;ON;;;;;N;;;;; +1CD29;BLOCK OCTANT-256;So;0;ON;;;;;N;;;;; +1CD2A;BLOCK OCTANT-1256;So;0;ON;;;;;N;;;;; +1CD2B;BLOCK OCTANT-356;So;0;ON;;;;;N;;;;; +1CD2C;BLOCK OCTANT-1356;So;0;ON;;;;;N;;;;; +1CD2D;BLOCK OCTANT-2356;So;0;ON;;;;;N;;;;; +1CD2E;BLOCK OCTANT-12356;So;0;ON;;;;;N;;;;; +1CD2F;BLOCK OCTANT-456;So;0;ON;;;;;N;;;;; +1CD30;BLOCK OCTANT-1456;So;0;ON;;;;;N;;;;; +1CD31;BLOCK OCTANT-2456;So;0;ON;;;;;N;;;;; +1CD32;BLOCK OCTANT-12456;So;0;ON;;;;;N;;;;; +1CD33;BLOCK OCTANT-3456;So;0;ON;;;;;N;;;;; +1CD34;BLOCK OCTANT-13456;So;0;ON;;;;;N;;;;; +1CD35;BLOCK OCTANT-23456;So;0;ON;;;;;N;;;;; +1CD36;BLOCK OCTANT-17;So;0;ON;;;;;N;;;;; +1CD37;BLOCK OCTANT-27;So;0;ON;;;;;N;;;;; +1CD38;BLOCK OCTANT-127;So;0;ON;;;;;N;;;;; +1CD39;BLOCK OCTANT-37;So;0;ON;;;;;N;;;;; +1CD3A;BLOCK OCTANT-137;So;0;ON;;;;;N;;;;; +1CD3B;BLOCK OCTANT-237;So;0;ON;;;;;N;;;;; +1CD3C;BLOCK OCTANT-1237;So;0;ON;;;;;N;;;;; +1CD3D;BLOCK OCTANT-47;So;0;ON;;;;;N;;;;; +1CD3E;BLOCK OCTANT-147;So;0;ON;;;;;N;;;;; +1CD3F;BLOCK OCTANT-247;So;0;ON;;;;;N;;;;; +1CD40;BLOCK OCTANT-1247;So;0;ON;;;;;N;;;;; +1CD41;BLOCK OCTANT-347;So;0;ON;;;;;N;;;;; +1CD42;BLOCK OCTANT-1347;So;0;ON;;;;;N;;;;; +1CD43;BLOCK OCTANT-2347;So;0;ON;;;;;N;;;;; +1CD44;BLOCK OCTANT-12347;So;0;ON;;;;;N;;;;; +1CD45;BLOCK OCTANT-157;So;0;ON;;;;;N;;;;; +1CD46;BLOCK OCTANT-257;So;0;ON;;;;;N;;;;; +1CD47;BLOCK OCTANT-1257;So;0;ON;;;;;N;;;;; +1CD48;BLOCK OCTANT-357;So;0;ON;;;;;N;;;;; +1CD49;BLOCK OCTANT-2357;So;0;ON;;;;;N;;;;; +1CD4A;BLOCK OCTANT-12357;So;0;ON;;;;;N;;;;; +1CD4B;BLOCK OCTANT-457;So;0;ON;;;;;N;;;;; +1CD4C;BLOCK OCTANT-1457;So;0;ON;;;;;N;;;;; +1CD4D;BLOCK OCTANT-12457;So;0;ON;;;;;N;;;;; +1CD4E;BLOCK OCTANT-3457;So;0;ON;;;;;N;;;;; +1CD4F;BLOCK OCTANT-13457;So;0;ON;;;;;N;;;;; +1CD50;BLOCK OCTANT-23457;So;0;ON;;;;;N;;;;; +1CD51;BLOCK OCTANT-67;So;0;ON;;;;;N;;;;; +1CD52;BLOCK OCTANT-167;So;0;ON;;;;;N;;;;; +1CD53;BLOCK OCTANT-267;So;0;ON;;;;;N;;;;; +1CD54;BLOCK OCTANT-1267;So;0;ON;;;;;N;;;;; +1CD55;BLOCK OCTANT-367;So;0;ON;;;;;N;;;;; +1CD56;BLOCK OCTANT-1367;So;0;ON;;;;;N;;;;; +1CD57;BLOCK OCTANT-2367;So;0;ON;;;;;N;;;;; +1CD58;BLOCK OCTANT-12367;So;0;ON;;;;;N;;;;; +1CD59;BLOCK OCTANT-467;So;0;ON;;;;;N;;;;; +1CD5A;BLOCK OCTANT-1467;So;0;ON;;;;;N;;;;; +1CD5B;BLOCK OCTANT-2467;So;0;ON;;;;;N;;;;; +1CD5C;BLOCK OCTANT-12467;So;0;ON;;;;;N;;;;; +1CD5D;BLOCK OCTANT-3467;So;0;ON;;;;;N;;;;; +1CD5E;BLOCK OCTANT-13467;So;0;ON;;;;;N;;;;; +1CD5F;BLOCK OCTANT-23467;So;0;ON;;;;;N;;;;; +1CD60;BLOCK OCTANT-123467;So;0;ON;;;;;N;;;;; +1CD61;BLOCK OCTANT-567;So;0;ON;;;;;N;;;;; +1CD62;BLOCK OCTANT-1567;So;0;ON;;;;;N;;;;; +1CD63;BLOCK OCTANT-2567;So;0;ON;;;;;N;;;;; +1CD64;BLOCK OCTANT-12567;So;0;ON;;;;;N;;;;; +1CD65;BLOCK OCTANT-3567;So;0;ON;;;;;N;;;;; +1CD66;BLOCK OCTANT-13567;So;0;ON;;;;;N;;;;; +1CD67;BLOCK OCTANT-23567;So;0;ON;;;;;N;;;;; +1CD68;BLOCK OCTANT-123567;So;0;ON;;;;;N;;;;; +1CD69;BLOCK OCTANT-4567;So;0;ON;;;;;N;;;;; +1CD6A;BLOCK OCTANT-14567;So;0;ON;;;;;N;;;;; +1CD6B;BLOCK OCTANT-24567;So;0;ON;;;;;N;;;;; +1CD6C;BLOCK OCTANT-124567;So;0;ON;;;;;N;;;;; +1CD6D;BLOCK OCTANT-34567;So;0;ON;;;;;N;;;;; +1CD6E;BLOCK OCTANT-134567;So;0;ON;;;;;N;;;;; +1CD6F;BLOCK OCTANT-234567;So;0;ON;;;;;N;;;;; +1CD70;BLOCK OCTANT-1234567;So;0;ON;;;;;N;;;;; +1CD71;BLOCK OCTANT-18;So;0;ON;;;;;N;;;;; +1CD72;BLOCK OCTANT-28;So;0;ON;;;;;N;;;;; +1CD73;BLOCK OCTANT-128;So;0;ON;;;;;N;;;;; +1CD74;BLOCK OCTANT-38;So;0;ON;;;;;N;;;;; +1CD75;BLOCK OCTANT-138;So;0;ON;;;;;N;;;;; +1CD76;BLOCK OCTANT-238;So;0;ON;;;;;N;;;;; +1CD77;BLOCK OCTANT-1238;So;0;ON;;;;;N;;;;; +1CD78;BLOCK OCTANT-48;So;0;ON;;;;;N;;;;; +1CD79;BLOCK OCTANT-148;So;0;ON;;;;;N;;;;; +1CD7A;BLOCK OCTANT-248;So;0;ON;;;;;N;;;;; +1CD7B;BLOCK OCTANT-1248;So;0;ON;;;;;N;;;;; +1CD7C;BLOCK OCTANT-348;So;0;ON;;;;;N;;;;; +1CD7D;BLOCK OCTANT-1348;So;0;ON;;;;;N;;;;; +1CD7E;BLOCK OCTANT-2348;So;0;ON;;;;;N;;;;; +1CD7F;BLOCK OCTANT-12348;So;0;ON;;;;;N;;;;; +1CD80;BLOCK OCTANT-58;So;0;ON;;;;;N;;;;; +1CD81;BLOCK OCTANT-158;So;0;ON;;;;;N;;;;; +1CD82;BLOCK OCTANT-258;So;0;ON;;;;;N;;;;; +1CD83;BLOCK OCTANT-1258;So;0;ON;;;;;N;;;;; +1CD84;BLOCK OCTANT-358;So;0;ON;;;;;N;;;;; +1CD85;BLOCK OCTANT-1358;So;0;ON;;;;;N;;;;; +1CD86;BLOCK OCTANT-2358;So;0;ON;;;;;N;;;;; +1CD87;BLOCK OCTANT-12358;So;0;ON;;;;;N;;;;; +1CD88;BLOCK OCTANT-458;So;0;ON;;;;;N;;;;; +1CD89;BLOCK OCTANT-1458;So;0;ON;;;;;N;;;;; +1CD8A;BLOCK OCTANT-2458;So;0;ON;;;;;N;;;;; +1CD8B;BLOCK OCTANT-12458;So;0;ON;;;;;N;;;;; +1CD8C;BLOCK OCTANT-3458;So;0;ON;;;;;N;;;;; +1CD8D;BLOCK OCTANT-13458;So;0;ON;;;;;N;;;;; +1CD8E;BLOCK OCTANT-23458;So;0;ON;;;;;N;;;;; +1CD8F;BLOCK OCTANT-123458;So;0;ON;;;;;N;;;;; +1CD90;BLOCK OCTANT-168;So;0;ON;;;;;N;;;;; +1CD91;BLOCK OCTANT-268;So;0;ON;;;;;N;;;;; +1CD92;BLOCK OCTANT-1268;So;0;ON;;;;;N;;;;; +1CD93;BLOCK OCTANT-368;So;0;ON;;;;;N;;;;; +1CD94;BLOCK OCTANT-2368;So;0;ON;;;;;N;;;;; +1CD95;BLOCK OCTANT-12368;So;0;ON;;;;;N;;;;; +1CD96;BLOCK OCTANT-468;So;0;ON;;;;;N;;;;; +1CD97;BLOCK OCTANT-1468;So;0;ON;;;;;N;;;;; +1CD98;BLOCK OCTANT-12468;So;0;ON;;;;;N;;;;; +1CD99;BLOCK OCTANT-3468;So;0;ON;;;;;N;;;;; +1CD9A;BLOCK OCTANT-13468;So;0;ON;;;;;N;;;;; +1CD9B;BLOCK OCTANT-23468;So;0;ON;;;;;N;;;;; +1CD9C;BLOCK OCTANT-568;So;0;ON;;;;;N;;;;; +1CD9D;BLOCK OCTANT-1568;So;0;ON;;;;;N;;;;; +1CD9E;BLOCK OCTANT-2568;So;0;ON;;;;;N;;;;; +1CD9F;BLOCK OCTANT-12568;So;0;ON;;;;;N;;;;; +1CDA0;BLOCK OCTANT-3568;So;0;ON;;;;;N;;;;; +1CDA1;BLOCK OCTANT-13568;So;0;ON;;;;;N;;;;; +1CDA2;BLOCK OCTANT-23568;So;0;ON;;;;;N;;;;; +1CDA3;BLOCK OCTANT-123568;So;0;ON;;;;;N;;;;; +1CDA4;BLOCK OCTANT-4568;So;0;ON;;;;;N;;;;; +1CDA5;BLOCK OCTANT-14568;So;0;ON;;;;;N;;;;; +1CDA6;BLOCK OCTANT-24568;So;0;ON;;;;;N;;;;; +1CDA7;BLOCK OCTANT-124568;So;0;ON;;;;;N;;;;; +1CDA8;BLOCK OCTANT-34568;So;0;ON;;;;;N;;;;; +1CDA9;BLOCK OCTANT-134568;So;0;ON;;;;;N;;;;; +1CDAA;BLOCK OCTANT-234568;So;0;ON;;;;;N;;;;; +1CDAB;BLOCK OCTANT-1234568;So;0;ON;;;;;N;;;;; +1CDAC;BLOCK OCTANT-178;So;0;ON;;;;;N;;;;; +1CDAD;BLOCK OCTANT-278;So;0;ON;;;;;N;;;;; +1CDAE;BLOCK OCTANT-1278;So;0;ON;;;;;N;;;;; +1CDAF;BLOCK OCTANT-378;So;0;ON;;;;;N;;;;; +1CDB0;BLOCK OCTANT-1378;So;0;ON;;;;;N;;;;; +1CDB1;BLOCK OCTANT-2378;So;0;ON;;;;;N;;;;; +1CDB2;BLOCK OCTANT-12378;So;0;ON;;;;;N;;;;; +1CDB3;BLOCK OCTANT-478;So;0;ON;;;;;N;;;;; +1CDB4;BLOCK OCTANT-1478;So;0;ON;;;;;N;;;;; +1CDB5;BLOCK OCTANT-2478;So;0;ON;;;;;N;;;;; +1CDB6;BLOCK OCTANT-12478;So;0;ON;;;;;N;;;;; +1CDB7;BLOCK OCTANT-3478;So;0;ON;;;;;N;;;;; +1CDB8;BLOCK OCTANT-13478;So;0;ON;;;;;N;;;;; +1CDB9;BLOCK OCTANT-23478;So;0;ON;;;;;N;;;;; +1CDBA;BLOCK OCTANT-123478;So;0;ON;;;;;N;;;;; +1CDBB;BLOCK OCTANT-578;So;0;ON;;;;;N;;;;; +1CDBC;BLOCK OCTANT-1578;So;0;ON;;;;;N;;;;; +1CDBD;BLOCK OCTANT-2578;So;0;ON;;;;;N;;;;; +1CDBE;BLOCK OCTANT-12578;So;0;ON;;;;;N;;;;; +1CDBF;BLOCK OCTANT-3578;So;0;ON;;;;;N;;;;; +1CDC0;BLOCK OCTANT-13578;So;0;ON;;;;;N;;;;; +1CDC1;BLOCK OCTANT-23578;So;0;ON;;;;;N;;;;; +1CDC2;BLOCK OCTANT-123578;So;0;ON;;;;;N;;;;; +1CDC3;BLOCK OCTANT-4578;So;0;ON;;;;;N;;;;; +1CDC4;BLOCK OCTANT-14578;So;0;ON;;;;;N;;;;; +1CDC5;BLOCK OCTANT-24578;So;0;ON;;;;;N;;;;; +1CDC6;BLOCK OCTANT-124578;So;0;ON;;;;;N;;;;; +1CDC7;BLOCK OCTANT-34578;So;0;ON;;;;;N;;;;; +1CDC8;BLOCK OCTANT-134578;So;0;ON;;;;;N;;;;; +1CDC9;BLOCK OCTANT-234578;So;0;ON;;;;;N;;;;; +1CDCA;BLOCK OCTANT-1234578;So;0;ON;;;;;N;;;;; +1CDCB;BLOCK OCTANT-678;So;0;ON;;;;;N;;;;; +1CDCC;BLOCK OCTANT-1678;So;0;ON;;;;;N;;;;; +1CDCD;BLOCK OCTANT-2678;So;0;ON;;;;;N;;;;; +1CDCE;BLOCK OCTANT-12678;So;0;ON;;;;;N;;;;; +1CDCF;BLOCK OCTANT-3678;So;0;ON;;;;;N;;;;; +1CDD0;BLOCK OCTANT-13678;So;0;ON;;;;;N;;;;; +1CDD1;BLOCK OCTANT-23678;So;0;ON;;;;;N;;;;; +1CDD2;BLOCK OCTANT-123678;So;0;ON;;;;;N;;;;; +1CDD3;BLOCK OCTANT-4678;So;0;ON;;;;;N;;;;; +1CDD4;BLOCK OCTANT-14678;So;0;ON;;;;;N;;;;; +1CDD5;BLOCK OCTANT-24678;So;0;ON;;;;;N;;;;; +1CDD6;BLOCK OCTANT-124678;So;0;ON;;;;;N;;;;; +1CDD7;BLOCK OCTANT-34678;So;0;ON;;;;;N;;;;; +1CDD8;BLOCK OCTANT-134678;So;0;ON;;;;;N;;;;; +1CDD9;BLOCK OCTANT-234678;So;0;ON;;;;;N;;;;; +1CDDA;BLOCK OCTANT-1234678;So;0;ON;;;;;N;;;;; +1CDDB;BLOCK OCTANT-15678;So;0;ON;;;;;N;;;;; +1CDDC;BLOCK OCTANT-25678;So;0;ON;;;;;N;;;;; +1CDDD;BLOCK OCTANT-125678;So;0;ON;;;;;N;;;;; +1CDDE;BLOCK OCTANT-35678;So;0;ON;;;;;N;;;;; +1CDDF;BLOCK OCTANT-235678;So;0;ON;;;;;N;;;;; +1CDE0;BLOCK OCTANT-1235678;So;0;ON;;;;;N;;;;; +1CDE1;BLOCK OCTANT-45678;So;0;ON;;;;;N;;;;; +1CDE2;BLOCK OCTANT-145678;So;0;ON;;;;;N;;;;; +1CDE3;BLOCK OCTANT-1245678;So;0;ON;;;;;N;;;;; +1CDE4;BLOCK OCTANT-1345678;So;0;ON;;;;;N;;;;; +1CDE5;BLOCK OCTANT-2345678;So;0;ON;;;;;N;;;;; +1CDE6;TOP HALF STANDING PERSON;So;0;ON;;;;;N;;;;; +1CDE7;BOTTOM HALF STANDING PERSON;So;0;ON;;;;;N;;;;; +1CDE8;TOP HALF RIGHT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDE9;BOTTOM HALF RIGHT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDEA;TOP HALF RIGHT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEB;BOTTOM HALF RIGHT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEC;TOP HALF LEFT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDED;BOTTOM HALF LEFT-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDEE;TOP HALF LEFT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDEF;BOTTOM HALF LEFT-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDF0;TOP HALF FORWARD-FACING RUNNER;So;0;ON;;;;;N;;;;; +1CDF1;BOTTOM HALF FORWARD-FACING RUNNER FRAME-1;So;0;ON;;;;;N;;;;; +1CDF2;BOTTOM HALF FORWARD-FACING RUNNER FRAME-2;So;0;ON;;;;;N;;;;; +1CDF3;BOTTOM HALF FORWARD-FACING RUNNER FRAME-3;So;0;ON;;;;;N;;;;; +1CDF4;BOTTOM HALF FORWARD-FACING RUNNER FRAME-4;So;0;ON;;;;;N;;;;; +1CDF5;MOON LANDER;So;0;ON;;;;;N;;;;; +1CDF6;TOP HALF FLAILING ROBOT FRAME-1;So;0;ON;;;;;N;;;;; +1CDF7;TOP HALF FLAILING ROBOT FRAME-2;So;0;ON;;;;;N;;;;; +1CDF8;DOWN-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDF9;LEFT-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDFA;SMALL UP-POINTING AIRPLANE;So;0;ON;;;;;N;;;;; +1CDFB;UP-POINTING FROG;So;0;ON;;;;;N;;;;; +1CDFC;DOWN-POINTING FROG;So;0;ON;;;;;N;;;;; +1CDFD;EXPLOSION FRAME-1;So;0;ON;;;;;N;;;;; +1CDFE;EXPLOSION FRAME-2;So;0;ON;;;;;N;;;;; +1CDFF;EXPLOSION FRAME-3;So;0;ON;;;;;N;;;;; +1CE00;RIGHT HALF AND LEFT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1CE01;LOWER HALF AND UPPER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1CE02;EXPLOSION AT HORIZON;So;0;ON;;;;;N;;;;; +1CE03;UPPER HALF HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1CE04;LOWER HALF HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;; +1CE05;HEAVY WHITE SQUARE CONTAINING BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;; +1CE06;WHITE VERTICAL RECTANGLE WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;; +1CE07;TOP LEFT BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;;;;; +1CE08;FUNNEL;So;0;ON;;;;;N;;;;; +1CE09;BOX DRAWINGS DOUBLE DIAGONAL LOWER LEFT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE0A;BOX DRAWINGS DOUBLE DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CE0B;LEFT HALF WHITE ELLIPSE;So;0;ON;;;;;N;;;;; +1CE0C;RIGHT HALF WHITE ELLIPSE;So;0;ON;;;;;N;;;;; +1CE0D;LEFT HALF TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;;;;; +1CE0E;RIGHT HALF TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;;;;; +1CE0F;HORIZONTAL LINE WITH TICK MARK;So;0;ON;;;;;N;;;;; +1CE10;LEFT HALF HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE11;RIGHT HALF HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE12;HORIZONTAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE13;LOWER HALF VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE14;UPPER HALF VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE15;VERTICAL LINE WITH THREE TICK MARKS;So;0;ON;;;;;N;;;;; +1CE16;BOX DRAWINGS LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;; +1CE17;BOX DRAWINGS LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;; +1CE18;BOX DRAWINGS LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;; +1CE19;BOX DRAWINGS LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;; +1CE1A;LARGE TYPE PIECE UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE1B;LARGE TYPE PIECE UPPER LEFT CORNER;So;0;ON;;;;;N;;;;; +1CE1C;LARGE TYPE PIECE UPPER TERMINAL;So;0;ON;;;;;N;;;;; +1CE1D;LARGE TYPE PIECE UPPER LEFT CROTCH;So;0;ON;;;;;N;;;;; +1CE1E;LARGE TYPE PIECE LEFT ARM;So;0;ON;;;;;N;;;;; +1CE1F;LARGE TYPE PIECE CROSSBAR;So;0;ON;;;;;N;;;;; +1CE20;LARGE TYPE PIECE CROSSBAR WITH LOWER STEM;So;0;ON;;;;;N;;;;; +1CE21;LARGE TYPE PIECE UPPER HALF VERTEX OF M;So;0;ON;;;;;N;;;;; +1CE22;LARGE TYPE PIECE DIAGONAL LOWER LEFT;So;0;ON;;;;;N;;;;; +1CE23;LARGE TYPE PIECE SHORT UPPER TERMINAL;So;0;ON;;;;;N;;;;; +1CE24;LARGE TYPE PIECE UPPER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE25;LARGE TYPE PIECE RIGHT ARM;So;0;ON;;;;;N;;;;; +1CE26;LARGE TYPE PIECE UPPER RIGHT CROTCH;So;0;ON;;;;;N;;;;; +1CE27;LARGE TYPE PIECE UPPER RIGHT CORNER;So;0;ON;;;;;N;;;;; +1CE28;LARGE TYPE PIECE STEM WITH RIGHT CROSSBAR;So;0;ON;;;;;N;;;;; +1CE29;LARGE TYPE PIECE STEM;So;0;ON;;;;;N;;;;; +1CE2A;LARGE TYPE PIECE DIAGONAL UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE2B;LARGE TYPE PIECE DIAGONAL UPPER RIGHT;So;0;ON;;;;;N;;;;; +1CE2C;LARGE TYPE PIECE DIAGONAL LOWER RIGHT;So;0;ON;;;;;N;;;;; +1CE2D;LARGE TYPE PIECE SHORT LOWER TERMINAL;So;0;ON;;;;;N;;;;; +1CE2E;LARGE TYPE PIECE LOWER LEFT AND UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE2F;LARGE TYPE PIECE CENTRE OF K;So;0;ON;;;;;N;;;;; +1CE30;LARGE TYPE PIECE LOWER HALF VERTEX OF M;So;0;ON;;;;;N;;;;; +1CE31;LARGE TYPE PIECE UPPER HALF VERTEX OF W;So;0;ON;;;;;N;;;;; +1CE32;LARGE TYPE PIECE CENTRE OF X;So;0;ON;;;;;N;;;;; +1CE33;LARGE TYPE PIECE CENTRE OF Y;So;0;ON;;;;;N;;;;; +1CE34;LARGE TYPE PIECE CENTRE OF Z WITH CROSSBAR;So;0;ON;;;;;N;;;;; +1CE35;LARGE TYPE PIECE RAISED UPPER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE36;LARGE TYPE PIECE STEM WITH LEFT CROSSBAR;So;0;ON;;;;;N;;;;; +1CE37;LARGE TYPE PIECE LOWER RIGHT AND UPPER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE38;LARGE TYPE PIECE DIAGONAL UPPER LEFT AND LOWER LEFT;So;0;ON;;;;;N;;;;; +1CE39;LARGE TYPE PIECE STEM WITH LEFT JOINT;So;0;ON;;;;;N;;;;; +1CE3A;LARGE TYPE PIECE STEM WITH CROSSBAR;So;0;ON;;;;;N;;;;; +1CE3B;LARGE TYPE PIECE DIAGONAL UPPER LEFT;So;0;ON;;;;;N;;;;; +1CE3C;LARGE TYPE PIECE LOWER TERMINAL;So;0;ON;;;;;N;;;;; +1CE3D;LARGE TYPE PIECE LOWER LEFT CORNER;So;0;ON;;;;;N;;;;; +1CE3E;LARGE TYPE PIECE LOWER LEFT ARC;So;0;ON;;;;;N;;;;; +1CE3F;LARGE TYPE PIECE LOWER LEFT CROTCH;So;0;ON;;;;;N;;;;; +1CE40;LARGE TYPE PIECE CROSSBAR WITH UPPER STEM;So;0;ON;;;;;N;;;;; +1CE41;LARGE TYPE PIECE VERTEX OF V;So;0;ON;;;;;N;;;;; +1CE42;LARGE TYPE PIECE LOWER HALF VERTEX OF W;So;0;ON;;;;;N;;;;; +1CE43;LARGE TYPE PIECE LOWER RIGHT ARC;So;0;ON;;;;;N;;;;; +1CE44;LARGE TYPE PIECE LOWER RIGHT CORNER;So;0;ON;;;;;N;;;;; +1CE45;LARGE TYPE PIECE LOWER RIGHT ARC WITH TAIL;So;0;ON;;;;;N;;;;; +1CE46;LARGE TYPE PIECE LOWER RIGHT CROTCH;So;0;ON;;;;;N;;;;; +1CE47;LARGE TYPE PIECE STEM-45;So;0;ON;;;;;N;;;;; +1CE48;LARGE TYPE PIECE STEM-2345;So;0;ON;;;;;N;;;;; +1CE49;LARGE TYPE PIECE STEM-4;So;0;ON;;;;;N;;;;; +1CE4A;LARGE TYPE PIECE STEM-34;So;0;ON;;;;;N;;;;; +1CE4B;LARGE TYPE PIECE STEM-234;So;0;ON;;;;;N;;;;; +1CE4C;LARGE TYPE PIECE STEM-1234;So;0;ON;;;;;N;;;;; +1CE4D;LARGE TYPE PIECE STEM-3;So;0;ON;;;;;N;;;;; +1CE4E;LARGE TYPE PIECE STEM-23;So;0;ON;;;;;N;;;;; +1CE4F;LARGE TYPE PIECE STEM-2;So;0;ON;;;;;N;;;;; +1CE50;LARGE TYPE PIECE STEM-12;So;0;ON;;;;;N;;;;; +1CE51;SEPARATED BLOCK SEXTANT-1;So;0;ON;;;;;N;;;;; +1CE52;SEPARATED BLOCK SEXTANT-2;So;0;ON;;;;;N;;;;; +1CE53;SEPARATED BLOCK SEXTANT-12;So;0;ON;;;;;N;;;;; +1CE54;SEPARATED BLOCK SEXTANT-3;So;0;ON;;;;;N;;;;; +1CE55;SEPARATED BLOCK SEXTANT-13;So;0;ON;;;;;N;;;;; +1CE56;SEPARATED BLOCK SEXTANT-23;So;0;ON;;;;;N;;;;; +1CE57;SEPARATED BLOCK SEXTANT-123;So;0;ON;;;;;N;;;;; +1CE58;SEPARATED BLOCK SEXTANT-4;So;0;ON;;;;;N;;;;; +1CE59;SEPARATED BLOCK SEXTANT-14;So;0;ON;;;;;N;;;;; +1CE5A;SEPARATED BLOCK SEXTANT-24;So;0;ON;;;;;N;;;;; +1CE5B;SEPARATED BLOCK SEXTANT-124;So;0;ON;;;;;N;;;;; +1CE5C;SEPARATED BLOCK SEXTANT-34;So;0;ON;;;;;N;;;;; +1CE5D;SEPARATED BLOCK SEXTANT-134;So;0;ON;;;;;N;;;;; +1CE5E;SEPARATED BLOCK SEXTANT-234;So;0;ON;;;;;N;;;;; +1CE5F;SEPARATED BLOCK SEXTANT-1234;So;0;ON;;;;;N;;;;; +1CE60;SEPARATED BLOCK SEXTANT-5;So;0;ON;;;;;N;;;;; +1CE61;SEPARATED BLOCK SEXTANT-15;So;0;ON;;;;;N;;;;; +1CE62;SEPARATED BLOCK SEXTANT-25;So;0;ON;;;;;N;;;;; +1CE63;SEPARATED BLOCK SEXTANT-125;So;0;ON;;;;;N;;;;; +1CE64;SEPARATED BLOCK SEXTANT-35;So;0;ON;;;;;N;;;;; +1CE65;SEPARATED BLOCK SEXTANT-135;So;0;ON;;;;;N;;;;; +1CE66;SEPARATED BLOCK SEXTANT-235;So;0;ON;;;;;N;;;;; +1CE67;SEPARATED BLOCK SEXTANT-1235;So;0;ON;;;;;N;;;;; +1CE68;SEPARATED BLOCK SEXTANT-45;So;0;ON;;;;;N;;;;; +1CE69;SEPARATED BLOCK SEXTANT-145;So;0;ON;;;;;N;;;;; +1CE6A;SEPARATED BLOCK SEXTANT-245;So;0;ON;;;;;N;;;;; +1CE6B;SEPARATED BLOCK SEXTANT-1245;So;0;ON;;;;;N;;;;; +1CE6C;SEPARATED BLOCK SEXTANT-345;So;0;ON;;;;;N;;;;; +1CE6D;SEPARATED BLOCK SEXTANT-1345;So;0;ON;;;;;N;;;;; +1CE6E;SEPARATED BLOCK SEXTANT-2345;So;0;ON;;;;;N;;;;; +1CE6F;SEPARATED BLOCK SEXTANT-12345;So;0;ON;;;;;N;;;;; +1CE70;SEPARATED BLOCK SEXTANT-6;So;0;ON;;;;;N;;;;; +1CE71;SEPARATED BLOCK SEXTANT-16;So;0;ON;;;;;N;;;;; +1CE72;SEPARATED BLOCK SEXTANT-26;So;0;ON;;;;;N;;;;; +1CE73;SEPARATED BLOCK SEXTANT-126;So;0;ON;;;;;N;;;;; +1CE74;SEPARATED BLOCK SEXTANT-36;So;0;ON;;;;;N;;;;; +1CE75;SEPARATED BLOCK SEXTANT-136;So;0;ON;;;;;N;;;;; +1CE76;SEPARATED BLOCK SEXTANT-236;So;0;ON;;;;;N;;;;; +1CE77;SEPARATED BLOCK SEXTANT-1236;So;0;ON;;;;;N;;;;; +1CE78;SEPARATED BLOCK SEXTANT-46;So;0;ON;;;;;N;;;;; +1CE79;SEPARATED BLOCK SEXTANT-146;So;0;ON;;;;;N;;;;; +1CE7A;SEPARATED BLOCK SEXTANT-246;So;0;ON;;;;;N;;;;; +1CE7B;SEPARATED BLOCK SEXTANT-1246;So;0;ON;;;;;N;;;;; +1CE7C;SEPARATED BLOCK SEXTANT-346;So;0;ON;;;;;N;;;;; +1CE7D;SEPARATED BLOCK SEXTANT-1346;So;0;ON;;;;;N;;;;; +1CE7E;SEPARATED BLOCK SEXTANT-2346;So;0;ON;;;;;N;;;;; +1CE7F;SEPARATED BLOCK SEXTANT-12346;So;0;ON;;;;;N;;;;; +1CE80;SEPARATED BLOCK SEXTANT-56;So;0;ON;;;;;N;;;;; +1CE81;SEPARATED BLOCK SEXTANT-156;So;0;ON;;;;;N;;;;; +1CE82;SEPARATED BLOCK SEXTANT-256;So;0;ON;;;;;N;;;;; +1CE83;SEPARATED BLOCK SEXTANT-1256;So;0;ON;;;;;N;;;;; +1CE84;SEPARATED BLOCK SEXTANT-356;So;0;ON;;;;;N;;;;; +1CE85;SEPARATED BLOCK SEXTANT-1356;So;0;ON;;;;;N;;;;; +1CE86;SEPARATED BLOCK SEXTANT-2356;So;0;ON;;;;;N;;;;; +1CE87;SEPARATED BLOCK SEXTANT-12356;So;0;ON;;;;;N;;;;; +1CE88;SEPARATED BLOCK SEXTANT-456;So;0;ON;;;;;N;;;;; +1CE89;SEPARATED BLOCK SEXTANT-1456;So;0;ON;;;;;N;;;;; +1CE8A;SEPARATED BLOCK SEXTANT-2456;So;0;ON;;;;;N;;;;; +1CE8B;SEPARATED BLOCK SEXTANT-12456;So;0;ON;;;;;N;;;;; +1CE8C;SEPARATED BLOCK SEXTANT-3456;So;0;ON;;;;;N;;;;; +1CE8D;SEPARATED BLOCK SEXTANT-13456;So;0;ON;;;;;N;;;;; +1CE8E;SEPARATED BLOCK SEXTANT-23456;So;0;ON;;;;;N;;;;; +1CE8F;SEPARATED BLOCK SEXTANT-123456;So;0;ON;;;;;N;;;;; +1CE90;UPPER LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE91;UPPER CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE92;UPPER CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE93;UPPER RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE94;UPPER MIDDLE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE95;UPPER MIDDLE CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE96;UPPER MIDDLE CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE97;UPPER MIDDLE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE98;LOWER MIDDLE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE99;LOWER MIDDLE CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9A;LOWER MIDDLE CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9B;LOWER MIDDLE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9C;LOWER LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9D;LOWER CENTRE LEFT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9E;LOWER CENTRE RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CE9F;LOWER RIGHT ONE SIXTEENTH BLOCK;So;0;ON;;;;;N;;;;; +1CEA0;RIGHT HALF LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA1;RIGHT THREE QUARTERS LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA2;LEFT THREE QUARTERS LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA3;LEFT HALF LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA4;LOWER HALF LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA5;LOWER THREE QUARTERS LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA6;UPPER THREE QUARTERS LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA7;UPPER HALF LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA8;LEFT HALF UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEA9;LEFT THREE QUARTERS UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAA;RIGHT THREE QUARTERS UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAB;RIGHT HALF UPPER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAC;UPPER HALF RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAD;UPPER THREE QUARTERS RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAE;LOWER THREE QUARTERS RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEAF;LOWER HALF RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1CEB0;HORIZONTAL ZIGZAG LINE;So;0;ON;;;;;N;;;;; +1CEB1;KEYHOLE;So;0;ON;;;;;N;;;;; +1CEB2;OLD PERSONAL COMPUTER WITH MONITOR IN PORTRAIT ORIENTATION;So;0;ON;;;;;N;;;;; +1CEB3;BLACK RIGHT TRIANGLE CARET;So;0;ON;;;;;N;;;;; 1CF00;ZNAMENNY COMBINING MARK GORAZDO NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; 1CF01;ZNAMENNY COMBINING MARK NIZKO S KRYZHEM ON LEFT;Mn;0;NSM;;;;;N;;;;; 1CF02;ZNAMENNY COMBINING MARK TSATA ON LEFT;Mn;0;NSM;;;;;N;;;;; @@ -29545,7 +34630,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D6BE;MATHEMATICAL BOLD CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; 1D6BF;MATHEMATICAL BOLD CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; 1D6C0;MATHEMATICAL BOLD CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; -1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;L; 2207;;;;N;;;;; +1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;ON; 2207;;;;N;;;;; 1D6C2;MATHEMATICAL BOLD SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; 1D6C3;MATHEMATICAL BOLD SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; 1D6C4;MATHEMATICAL BOLD SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; @@ -29603,7 +34688,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D6F8;MATHEMATICAL ITALIC CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; 1D6F9;MATHEMATICAL ITALIC CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; 1D6FA;MATHEMATICAL ITALIC CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; -1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;L; 2207;;;;N;;;;; +1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;ON; 2207;;;;N;;;;; 1D6FC;MATHEMATICAL ITALIC SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; 1D6FD;MATHEMATICAL ITALIC SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; 1D6FE;MATHEMATICAL ITALIC SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; @@ -29661,7 +34746,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D732;MATHEMATICAL BOLD ITALIC CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; 1D733;MATHEMATICAL BOLD ITALIC CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; 1D734;MATHEMATICAL BOLD ITALIC CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; -1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;L; 2207;;;;N;;;;; +1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;ON; 2207;;;;N;;;;; 1D736;MATHEMATICAL BOLD ITALIC SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; 1D737;MATHEMATICAL BOLD ITALIC SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; 1D738;MATHEMATICAL BOLD ITALIC SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; @@ -29719,7 +34804,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D76C;MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; 1D76D;MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; 1D76E;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; -1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;L; 2207;;;;N;;;;; +1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;ON; 2207;;;;N;;;;; 1D770;MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; 1D771;MATHEMATICAL SANS-SERIF BOLD SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; 1D772;MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; @@ -29777,7 +34862,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1D7A6;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI;Lu;0;L; 03A7;;;;N;;;;; 1D7A7;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI;Lu;0;L; 03A8;;;;N;;;;; 1D7A8;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA;Lu;0;L; 03A9;;;;N;;;;; -1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;L; 2207;;;;N;;;;; +1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;ON; 2207;;;;N;;;;; 1D7AA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA;Ll;0;L; 03B1;;;;N;;;;; 1D7AB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA;Ll;0;L; 03B2;;;;N;;;;; 1D7AC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA;Ll;0;L; 03B3;;;;N;;;;; @@ -30875,6 +35960,50 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1E4F7;NAG MUNDARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; 1E4F8;NAG MUNDARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; 1E4F9;NAG MUNDARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E5D0;OL ONAL LETTER O;Lo;0;L;;;;;N;;;;; +1E5D1;OL ONAL LETTER OM;Lo;0;L;;;;;N;;;;; +1E5D2;OL ONAL LETTER ONG;Lo;0;L;;;;;N;;;;; +1E5D3;OL ONAL LETTER ORR;Lo;0;L;;;;;N;;;;; +1E5D4;OL ONAL LETTER OO;Lo;0;L;;;;;N;;;;; +1E5D5;OL ONAL LETTER OY;Lo;0;L;;;;;N;;;;; +1E5D6;OL ONAL LETTER A;Lo;0;L;;;;;N;;;;; +1E5D7;OL ONAL LETTER AD;Lo;0;L;;;;;N;;;;; +1E5D8;OL ONAL LETTER AB;Lo;0;L;;;;;N;;;;; +1E5D9;OL ONAL LETTER AH;Lo;0;L;;;;;N;;;;; +1E5DA;OL ONAL LETTER AL;Lo;0;L;;;;;N;;;;; +1E5DB;OL ONAL LETTER AW;Lo;0;L;;;;;N;;;;; +1E5DC;OL ONAL LETTER I;Lo;0;L;;;;;N;;;;; +1E5DD;OL ONAL LETTER IT;Lo;0;L;;;;;N;;;;; +1E5DE;OL ONAL LETTER IP;Lo;0;L;;;;;N;;;;; +1E5DF;OL ONAL LETTER ITT;Lo;0;L;;;;;N;;;;; +1E5E0;OL ONAL LETTER ID;Lo;0;L;;;;;N;;;;; +1E5E1;OL ONAL LETTER IN;Lo;0;L;;;;;N;;;;; +1E5E2;OL ONAL LETTER U;Lo;0;L;;;;;N;;;;; +1E5E3;OL ONAL LETTER UK;Lo;0;L;;;;;N;;;;; +1E5E4;OL ONAL LETTER UDD;Lo;0;L;;;;;N;;;;; +1E5E5;OL ONAL LETTER UJ;Lo;0;L;;;;;N;;;;; +1E5E6;OL ONAL LETTER UNY;Lo;0;L;;;;;N;;;;; +1E5E7;OL ONAL LETTER UR;Lo;0;L;;;;;N;;;;; +1E5E8;OL ONAL LETTER E;Lo;0;L;;;;;N;;;;; +1E5E9;OL ONAL LETTER ES;Lo;0;L;;;;;N;;;;; +1E5EA;OL ONAL LETTER EH;Lo;0;L;;;;;N;;;;; +1E5EB;OL ONAL LETTER EC;Lo;0;L;;;;;N;;;;; +1E5EC;OL ONAL LETTER ENN;Lo;0;L;;;;;N;;;;; +1E5ED;OL ONAL LETTER EG;Lo;0;L;;;;;N;;;;; +1E5EE;OL ONAL SIGN MU;Mn;230;NSM;;;;;N;;;;; +1E5EF;OL ONAL SIGN IKIR;Mn;220;NSM;;;;;N;;;;; +1E5F0;OL ONAL SIGN HODDOND;Lo;0;L;;;;;N;;;;; +1E5F1;OL ONAL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;; +1E5F2;OL ONAL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;; +1E5F3;OL ONAL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;; +1E5F4;OL ONAL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;; +1E5F5;OL ONAL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;; +1E5F6;OL ONAL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;; +1E5F7;OL ONAL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;; +1E5F8;OL ONAL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;; +1E5F9;OL ONAL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;; +1E5FA;OL ONAL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;; +1E5FF;OL ONAL ABBREVIATION SIGN;Po;0;L;;;;;N;;;;; 1E7E0;ETHIOPIC SYLLABLE HHYA;Lo;0;L;;;;;N;;;;; 1E7E1;ETHIOPIC SYLLABLE HHYU;Lo;0;L;;;;;N;;;;; 1E7E2;ETHIOPIC SYLLABLE HHYI;Lo;0;L;;;;;N;;;;; @@ -33357,6 +38486,18 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1F8AD;WHITE ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;; 1F8B0;ARROW POINTING UPWARDS THEN NORTH WEST;So;0;ON;;;;;N;;;;; 1F8B1;ARROW POINTING RIGHTWARDS THEN CURVING SOUTH WEST;So;0;ON;;;;;N;;;;; +1F8B2;RIGHTWARDS ARROW WITH LOWER HOOK;So;0;ON;;;;;N;;;;; +1F8B3;DOWNWARDS BLACK ARROW TO BAR;So;0;ON;;;;;N;;;;; +1F8B4;NEGATIVE SQUARED LEFTWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B5;NEGATIVE SQUARED UPWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B6;NEGATIVE SQUARED RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B7;NEGATIVE SQUARED DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8B8;NORTH WEST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8B9;NORTH EAST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8BA;SOUTH EAST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8BB;SOUTH WEST ARROW FROM BAR;So;0;ON;;;;;N;;;;; +1F8C0;LEFTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; +1F8C1;RIGHTWARDS ARROW FROM DOWNWARDS ARROW;So;0;ON;;;;;N;;;;; 1F900;CIRCLED CROSS FORMEE WITH FOUR DOTS;So;0;ON;;;;;N;;;;; 1F901;CIRCLED CROSS FORMEE WITH TWO DOTS;So;0;ON;;;;;N;;;;; 1F902;CIRCLED CROSS FORMEE;So;0;ON;;;;;N;;;;; @@ -33733,6 +38874,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FA86;NESTING DOLLS;So;0;ON;;;;;N;;;;; 1FA87;MARACAS;So;0;ON;;;;;N;;;;; 1FA88;FLUTE;So;0;ON;;;;;N;;;;; +1FA89;HARP;So;0;ON;;;;;N;;;;; +1FA8F;SHOVEL;So;0;ON;;;;;N;;;;; 1FA90;RINGED PLANET;So;0;ON;;;;;N;;;;; 1FA91;CHAIR;So;0;ON;;;;;N;;;;; 1FA92;RAZOR;So;0;ON;;;;;N;;;;; @@ -33779,6 +38922,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FABB;HYACINTH;So;0;ON;;;;;N;;;;; 1FABC;JELLYFISH;So;0;ON;;;;;N;;;;; 1FABD;WING;So;0;ON;;;;;N;;;;; +1FABE;LEAFLESS TREE;So;0;ON;;;;;N;;;;; 1FABF;GOOSE;So;0;ON;;;;;N;;;;; 1FAC0;ANATOMICAL HEART;So;0;ON;;;;;N;;;;; 1FAC1;LUNGS;So;0;ON;;;;;N;;;;; @@ -33786,6 +38930,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAC3;PREGNANT MAN;So;0;ON;;;;;N;;;;; 1FAC4;PREGNANT PERSON;So;0;ON;;;;;N;;;;; 1FAC5;PERSON WITH CROWN;So;0;ON;;;;;N;;;;; +1FAC6;FINGERPRINT;So;0;ON;;;;;N;;;;; 1FACE;MOOSE;So;0;ON;;;;;N;;;;; 1FACF;DONKEY;So;0;ON;;;;;N;;;;; 1FAD0;BLUEBERRIES;So;0;ON;;;;;N;;;;; @@ -33800,6 +38945,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAD9;JAR;So;0;ON;;;;;N;;;;; 1FADA;GINGER ROOT;So;0;ON;;;;;N;;;;; 1FADB;PEA POD;So;0;ON;;;;;N;;;;; +1FADC;ROOT VEGETABLE;So;0;ON;;;;;N;;;;; +1FADF;SPLATTER;So;0;ON;;;;;N;;;;; 1FAE0;MELTING FACE;So;0;ON;;;;;N;;;;; 1FAE1;SALUTING FACE;So;0;ON;;;;;N;;;;; 1FAE2;FACE WITH OPEN EYES AND HAND OVER MOUTH;So;0;ON;;;;;N;;;;; @@ -33809,6 +38956,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FAE6;BITING LIP;So;0;ON;;;;;N;;;;; 1FAE7;BUBBLES;So;0;ON;;;;;N;;;;; 1FAE8;SHAKING FACE;So;0;ON;;;;;N;;;;; +1FAE9;FACE WITH BAGS UNDER EYES;So;0;ON;;;;;N;;;;; 1FAF0;HAND WITH INDEX FINGER AND THUMB CROSSED;So;0;ON;;;;;N;;;;; 1FAF1;RIGHTWARDS HAND;So;0;ON;;;;;N;;;;; 1FAF2;LEFTWARDS HAND;So;0;ON;;;;;N;;;;; @@ -34020,6 +39168,43 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;; 1FBC8;STICK FIGURE LEANING RIGHT;So;0;ON;;;;;N;;;;; 1FBC9;STICK FIGURE WITH DRESS;So;0;ON;;;;;N;;;;; 1FBCA;WHITE UP-POINTING CHEVRON;So;0;ON;;;;;N;;;;; +1FBCB;WHITE CROSS MARK;So;0;ON;;;;;N;;;;; +1FBCC;RAISED SMALL LEFT SQUARE BRACKET;So;0;ON;;;;;N;;;;; +1FBCD;BLACK SMALL UP-POINTING CHEVRON;So;0;ON;;;;;N;;;;; +1FBCE;LEFT TWO THIRDS BLOCK;So;0;ON;;;;;N;;;;; +1FBCF;LEFT ONE THIRD BLOCK;So;0;ON;;;;;N;;;;; +1FBD0;BOX DRAWINGS LIGHT DIAGONAL MIDDLE RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBD1;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE LEFT;So;0;ON;;;;;N;;;;; +1FBD2;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE RIGHT;So;0;ON;;;;;N;;;;; +1FBD3;BOX DRAWINGS LIGHT DIAGONAL MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBD4;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBD5;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBD6;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER CENTRE;So;0;ON;;;;;N;;;;; +1FBD7;BOX DRAWINGS LIGHT DIAGONAL UPPER CENTRE TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBD8;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FBD9;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDA;BOX DRAWINGS LIGHT DIAGONAL LOWER LEFT TO MIDDLE CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDB;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE CENTRE TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBDC;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER CENTRE TO UPPER RIGHT;So;0;ON;;;;;N;;;;; +1FBDD;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO MIDDLE LEFT TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDE;BOX DRAWINGS LIGHT DIAGONAL LOWER LEFT TO UPPER CENTRE TO LOWER RIGHT;So;0;ON;;;;;N;;;;; +1FBDF;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO MIDDLE RIGHT TO LOWER LEFT;So;0;ON;;;;;N;;;;; +1FBE0;TOP JUSTIFIED LOWER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE1;RIGHT JUSTIFIED LEFT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE2;BOTTOM JUSTIFIED UPPER HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE3;LEFT JUSTIFIED RIGHT HALF WHITE CIRCLE;So;0;ON;;;;;N;;;;; +1FBE4;UPPER CENTRE ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE5;LOWER CENTRE ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE6;MIDDLE LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE7;MIDDLE RIGHT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;; +1FBE8;TOP JUSTIFIED LOWER HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBE9;RIGHT JUSTIFIED LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEA;BOTTOM JUSTIFIED UPPER HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEB;LEFT JUSTIFIED RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEC;TOP RIGHT JUSTIFIED LOWER LEFT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBED;BOTTOM LEFT JUSTIFIED UPPER RIGHT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEE;BOTTOM RIGHT JUSTIFIED UPPER LEFT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; +1FBEF;TOP LEFT JUSTIFIED LOWER RIGHT QUARTER BLACK CIRCLE;So;0;ON;;;;;N;;;;; 1FBF0;SEGMENTED DIGIT ZERO;Nd;0;EN; 0030;0;0;0;N;;;;; 1FBF1;SEGMENTED DIGIT ONE;Nd;0;EN; 0031;1;1;1;N;;;;; 1FBF2;SEGMENTED DIGIT TWO;Nd;0;EN; 0032;2;2;2;N;;;;; diff --git a/resources/standards-data/unicode-character-database/WordBreakProperty.txt b/resources/standards-data/unicode-character-database/WordBreakProperty.txt index 302a2769b39..e557c3d0ded 100644 --- a/resources/standards-data/unicode-character-database/WordBreakProperty.txt +++ b/resources/standards-data/unicode-character-database/WordBreakProperty.txt @@ -1,8 +1,8 @@ -# WordBreakProperty-15.1.0.txt -# Date: 2023-03-31, 03:19:05 GMT -# © 2023 Unicode®, Inc. +# WordBreakProperty-16.0.0.txt +# Date: 2024-07-29, 16:27:36 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Unicode Character Database # For documentation, see https://www.unicode.org/reports/tr44/ @@ -91,7 +91,7 @@ FB46..FB4F ; Hebrew_Letter # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW 0825..0827 ; Extend # Mn [3] SAMARITAN VOWEL SIGN SHORT A..SAMARITAN VOWEL SIGN U 0829..082D ; Extend # Mn [5] SAMARITAN VOWEL SIGN LONG I..SAMARITAN MARK NEQUDAA 0859..085B ; Extend # Mn [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK -0898..089F ; Extend # Mn [8] ARABIC SMALL HIGH WORD AL-JUZ..ARABIC HALF MADDA OVER MADDA +0897..089F ; Extend # Mn [9] ARABIC PEPET..ARABIC HALF MADDA OVER MADDA 08CA..08E1 ; Extend # Mn [24] ARABIC SMALL HIGH FARSI YEH..ARABIC SMALL HIGH SIGN SAFHA 08E3..0902 ; Extend # Mn [32] ARABIC TURNED DAMMA BELOW..DEVANAGARI SIGN ANUSVARA 0903 ; Extend # Mc DEVANAGARI SIGN VISARGA @@ -407,8 +407,9 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 10A3F ; Extend # Mn KHAROSHTHI VIRAMA 10AE5..10AE6 ; Extend # Mn [2] MANICHAEAN ABBREVIATION MARK ABOVE..MANICHAEAN ABBREVIATION MARK BELOW 10D24..10D27 ; Extend # Mn [4] HANIFI ROHINGYA SIGN HARBAHAY..HANIFI ROHINGYA SIGN TASSI +10D69..10D6D ; Extend # Mn [5] GARAY VOWEL SIGN E..GARAY CONSONANT NASALIZATION MARK 10EAB..10EAC ; Extend # Mn [2] YEZIDI COMBINING HAMZA MARK..YEZIDI COMBINING MADDA MARK -10EFD..10EFF ; Extend # Mn [3] ARABIC SMALL LOW WORD SAKTA..ARABIC SMALL LOW WORD MADDA +10EFC..10EFF ; Extend # Mn [4] ARABIC COMBINING ALEF OVERLAY..ARABIC SMALL LOW WORD MADDA 10F46..10F50 ; Extend # Mn [11] SOGDIAN COMBINING DOT BELOW..SOGDIAN COMBINING STROKE BELOW 10F82..10F85 ; Extend # Mn [4] OLD UYGHUR COMBINING DOT ABOVE..OLD UYGHUR COMBINING TWO DOTS BELOW 11000 ; Extend # Mc BRAHMI SIGN CANDRABINDU @@ -461,6 +462,17 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 11362..11363 ; Extend # Mc [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL 11366..1136C ; Extend # Mn [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX 11370..11374 ; Extend # Mn [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA +113B8..113BA ; Extend # Mc [3] TULU-TIGALARI VOWEL SIGN AA..TULU-TIGALARI VOWEL SIGN II +113BB..113C0 ; Extend # Mn [6] TULU-TIGALARI VOWEL SIGN U..TULU-TIGALARI VOWEL SIGN VOCALIC LL +113C2 ; Extend # Mc TULU-TIGALARI VOWEL SIGN EE +113C5 ; Extend # Mc TULU-TIGALARI VOWEL SIGN AI +113C7..113CA ; Extend # Mc [4] TULU-TIGALARI VOWEL SIGN OO..TULU-TIGALARI SIGN CANDRA ANUNASIKA +113CC..113CD ; Extend # Mc [2] TULU-TIGALARI SIGN ANUSVARA..TULU-TIGALARI SIGN VISARGA +113CE ; Extend # Mn TULU-TIGALARI SIGN VIRAMA +113CF ; Extend # Mc TULU-TIGALARI SIGN LOOPED VIRAMA +113D0 ; Extend # Mn TULU-TIGALARI CONJOINER +113D2 ; Extend # Mn TULU-TIGALARI GEMINATION MARK +113E1..113E2 ; Extend # Mn [2] TULU-TIGALARI VEDIC TONE SVARITA..TULU-TIGALARI VEDIC TONE ANUDATTA 11435..11437 ; Extend # Mc [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II 11438..1143F ; Extend # Mn [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI 11440..11441 ; Extend # Mc [2] NEWA VOWEL SIGN O..NEWA VOWEL SIGN AU @@ -496,7 +508,9 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 116B0..116B5 ; Extend # Mn [6] TAKRI VOWEL SIGN U..TAKRI VOWEL SIGN AU 116B6 ; Extend # Mc TAKRI SIGN VIRAMA 116B7 ; Extend # Mn TAKRI SIGN NUKTA -1171D..1171F ; Extend # Mn [3] AHOM CONSONANT SIGN MEDIAL LA..AHOM CONSONANT SIGN MEDIAL LIGATING RA +1171D ; Extend # Mn AHOM CONSONANT SIGN MEDIAL LA +1171E ; Extend # Mc AHOM CONSONANT SIGN MEDIAL RA +1171F ; Extend # Mn AHOM CONSONANT SIGN MEDIAL LIGATING RA 11720..11721 ; Extend # Mc [2] AHOM VOWEL SIGN A..AHOM VOWEL SIGN AA 11722..11725 ; Extend # Mn [4] AHOM VOWEL SIGN I..AHOM VOWEL SIGN UU 11726 ; Extend # Mc AHOM VOWEL SIGN E @@ -563,8 +577,12 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 11F40 ; Extend # Mn KAWI VOWEL SIGN EU 11F41 ; Extend # Mc KAWI SIGN KILLER 11F42 ; Extend # Mn KAWI CONJOINER +11F5A ; Extend # Mn KAWI SIGN NUKTA 13440 ; Extend # Mn EGYPTIAN HIEROGLYPH MIRROR HORIZONTALLY 13447..13455 ; Extend # Mn [15] EGYPTIAN HIEROGLYPH MODIFIER DAMAGED AT TOP START..EGYPTIAN HIEROGLYPH MODIFIER DAMAGED +1611E..16129 ; Extend # Mn [12] GURUNG KHEMA VOWEL SIGN AA..GURUNG KHEMA VOWEL LENGTH MARK +1612A..1612C ; Extend # Mc [3] GURUNG KHEMA CONSONANT SIGN MEDIAL YA..GURUNG KHEMA CONSONANT SIGN MEDIAL HA +1612D..1612F ; Extend # Mn [3] GURUNG KHEMA SIGN ANUSVARA..GURUNG KHEMA SIGN THOLHOMA 16AF0..16AF4 ; Extend # Mn [5] BASSA VAH COMBINING HIGH TONE..BASSA VAH COMBINING HIGH-LOW TONE 16B30..16B36 ; Extend # Mn [7] PAHAWH HMONG MARK CIM TUB..PAHAWH HMONG MARK CIM TAUM 16F4F ; Extend # Mn MIAO SIGN CONSONANT MODIFIER BAR @@ -598,13 +616,14 @@ FF9E..FF9F ; Extend # Lm [2] HALFWIDTH KATAKANA VOICED SOUND MARK..HALFWIDT 1E2AE ; Extend # Mn TOTO SIGN RISING TONE 1E2EC..1E2EF ; Extend # Mn [4] WANCHO TONE TUP..WANCHO TONE KOINI 1E4EC..1E4EF ; Extend # Mn [4] NAG MUNDARI SIGN MUHOR..NAG MUNDARI SIGN SUTUH +1E5EE..1E5EF ; Extend # Mn [2] OL ONAL SIGN MU..OL ONAL SIGN IKIR 1E8D0..1E8D6 ; Extend # Mn [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS 1E944..1E94A ; Extend # Mn [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA 1F3FB..1F3FF ; Extend # Sk [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6 E0020..E007F ; Extend # Cf [96] TAG SPACE..CANCEL TAG E0100..E01EF ; Extend # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 -# Total code points: 2554 +# Total code points: 2605 # ================================================ @@ -877,7 +896,7 @@ FF71..FF9D ; Katakana # Lo [45] HALFWIDTH KATAKANA LETTER A..HALFWIDTH KATAK 1C4D..1C4F ; ALetter # Lo [3] LEPCHA LETTER TTA..LEPCHA LETTER DDA 1C5A..1C77 ; ALetter # Lo [30] OL CHIKI LETTER LA..OL CHIKI LETTER OH 1C78..1C7D ; ALetter # Lm [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD -1C80..1C88 ; ALetter # L& [9] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER UNBLENDED UK +1C80..1C8A ; ALetter # L& [11] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER TJE 1C90..1CBA ; ALetter # L& [43] GEORGIAN MTAVRULI CAPITAL LETTER AN..GEORGIAN MTAVRULI CAPITAL LETTER AIN 1CBD..1CBF ; ALetter # L& [3] GEORGIAN MTAVRULI CAPITAL LETTER AEN..GEORGIAN MTAVRULI CAPITAL LETTER LABIAL SIGN 1CE9..1CEC ; ALetter # Lo [4] VEDIC SIGN ANUSVARA ANTARGOMUKHA..VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL @@ -983,10 +1002,10 @@ A788 ; ALetter # Lm MODIFIER LETTER LOW CIRCUMFLEX ACCENT A789..A78A ; ALetter # Sk [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN A78B..A78E ; ALetter # L& [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT A78F ; ALetter # Lo LATIN LETTER SINOLOGICAL DOT -A790..A7CA ; ALetter # L& [59] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH SHORT STROKE OVERLAY +A790..A7CD ; ALetter # L& [62] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN SMALL LETTER S WITH DIAGONAL STROKE A7D0..A7D1 ; ALetter # L& [2] LATIN CAPITAL LETTER CLOSED INSULAR G..LATIN SMALL LETTER CLOSED INSULAR G A7D3 ; ALetter # L& LATIN SMALL LETTER DOUBLE THORN -A7D5..A7D9 ; ALetter # L& [5] LATIN SMALL LETTER DOUBLE WYNN..LATIN SMALL LETTER SIGMOID S +A7D5..A7DC ; ALetter # L& [8] LATIN SMALL LETTER DOUBLE WYNN..LATIN CAPITAL LETTER LAMBDA WITH STROKE A7F2..A7F4 ; ALetter # Lm [3] MODIFIER LETTER CAPITAL C..MODIFIER LETTER CAPITAL Q A7F5..A7F6 ; ALetter # L& [2] LATIN CAPITAL LETTER REVERSED HALF H..LATIN SMALL LETTER REVERSED HALF H A7F7 ; ALetter # Lo LATIN EPIGRAPHIC LETTER SIDEWAYS I @@ -1077,6 +1096,7 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 105A3..105B1 ; ALetter # L& [15] VITHKUQI SMALL LETTER HA..VITHKUQI SMALL LETTER RE 105B3..105B9 ; ALetter # L& [7] VITHKUQI SMALL LETTER SE..VITHKUQI SMALL LETTER XE 105BB..105BC ; ALetter # L& [2] VITHKUQI SMALL LETTER Y..VITHKUQI SMALL LETTER ZE +105C0..105F3 ; ALetter # Lo [52] TODHRI LETTER A..TODHRI LETTER OO 10600..10736 ; ALetter # Lo [311] LINEAR A SIGN AB001..LINEAR A SIGN A664 10740..10755 ; ALetter # Lo [22] LINEAR A SIGN A701 A..LINEAR A SIGN A732 JE 10760..10767 ; ALetter # Lo [8] LINEAR A SIGN A800..LINEAR A SIGN A807 @@ -1113,8 +1133,15 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 10C80..10CB2 ; ALetter # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US 10CC0..10CF2 ; ALetter # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US 10D00..10D23 ; ALetter # Lo [36] HANIFI ROHINGYA LETTER A..HANIFI ROHINGYA MARK NA KHONNA +10D4A..10D4D ; ALetter # Lo [4] GARAY VOWEL SIGN A..GARAY VOWEL SIGN EE +10D4E ; ALetter # Lm GARAY VOWEL LENGTH MARK +10D4F ; ALetter # Lo GARAY SUKUN +10D50..10D65 ; ALetter # L& [22] GARAY CAPITAL LETTER A..GARAY CAPITAL LETTER OLD NA +10D6F ; ALetter # Lm GARAY REDUPLICATION MARK +10D70..10D85 ; ALetter # L& [22] GARAY SMALL LETTER A..GARAY SMALL LETTER OLD NA 10E80..10EA9 ; ALetter # Lo [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET 10EB0..10EB1 ; ALetter # Lo [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE +10EC2..10EC4 ; ALetter # Lo [3] ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW..ARABIC LETTER KAF WITH TWO DOTS VERTICALLY BELOW 10F00..10F1C ; ALetter # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F27 ; ALetter # Lo OLD SOGDIAN LIGATURE AYIN-DALETH 10F30..10F45 ; ALetter # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN @@ -1153,6 +1180,13 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1133D ; ALetter # Lo GRANTHA SIGN AVAGRAHA 11350 ; ALetter # Lo GRANTHA OM 1135D..11361 ; ALetter # Lo [5] GRANTHA SIGN PLUTA..GRANTHA LETTER VOCALIC LL +11380..11389 ; ALetter # Lo [10] TULU-TIGALARI LETTER A..TULU-TIGALARI LETTER VOCALIC LL +1138B ; ALetter # Lo TULU-TIGALARI LETTER EE +1138E ; ALetter # Lo TULU-TIGALARI LETTER AI +11390..113B5 ; ALetter # Lo [38] TULU-TIGALARI LETTER OO..TULU-TIGALARI LETTER LLLA +113B7 ; ALetter # Lo TULU-TIGALARI SIGN AVAGRAHA +113D1 ; ALetter # Lo TULU-TIGALARI REPHA +113D3 ; ALetter # Lo TULU-TIGALARI SIGN PLUTA 11400..11434 ; ALetter # Lo [53] NEWA LETTER A..NEWA LETTER HA 11447..1144A ; ALetter # Lo [4] NEWA SIGN AVAGRAHA..NEWA SIDDHI 1145F..11461 ; ALetter # Lo [3] NEWA LETTER VEDIC ANUSVARA..NEWA SIGN UPADHMANIYA @@ -1185,6 +1219,7 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 11A5C..11A89 ; ALetter # Lo [46] SOYOMBO LETTER KA..SOYOMBO CLUSTER-INITIAL LETTER SA 11A9D ; ALetter # Lo SOYOMBO MARK PLUTA 11AB0..11AF8 ; ALetter # Lo [73] CANADIAN SYLLABICS NATTILIK HI..PAU CIN HAU GLOTTAL STOP FINAL +11BC0..11BE0 ; ALetter # Lo [33] SUNUWAR LETTER DEVI..SUNUWAR LETTER KLOKO 11C00..11C08 ; ALetter # Lo [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L 11C0A..11C2E ; ALetter # Lo [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA 11C40 ; ALetter # Lo BHAIKSUKI SIGN AVAGRAHA @@ -1208,7 +1243,9 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 12F90..12FF0 ; ALetter # Lo [97] CYPRO-MINOAN SIGN CM001..CYPRO-MINOAN SIGN CM114 13000..1342F ; ALetter # Lo [1072] EGYPTIAN HIEROGLYPH A001..EGYPTIAN HIEROGLYPH V011D 13441..13446 ; ALetter # Lo [6] EGYPTIAN HIEROGLYPH FULL BLANK..EGYPTIAN HIEROGLYPH WIDE LOST SIGN +13460..143FA ; ALetter # Lo [3995] EGYPTIAN HIEROGLYPH-13460..EGYPTIAN HIEROGLYPH-143FA 14400..14646 ; ALetter # Lo [583] ANATOLIAN HIEROGLYPH A001..ANATOLIAN HIEROGLYPH A530 +16100..1611D ; ALetter # Lo [30] GURUNG KHEMA LETTER A..GURUNG KHEMA LETTER SA 16800..16A38 ; ALetter # Lo [569] BAMUM LETTER PHASE-A NGKUE MFON..BAMUM LETTER PHASE-F VUEQ 16A40..16A5E ; ALetter # Lo [31] MRO LETTER TA..MRO LETTER TEK 16A70..16ABE ; ALetter # Lo [79] TANGSA LETTER OZ..TANGSA LETTER ZA @@ -1217,6 +1254,9 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 16B40..16B43 ; ALetter # Lm [4] PAHAWH HMONG SIGN VOS SEEV..PAHAWH HMONG SIGN IB YAM 16B63..16B77 ; ALetter # Lo [21] PAHAWH HMONG SIGN VOS LUB..PAHAWH HMONG SIGN CIM NRES TOS 16B7D..16B8F ; ALetter # Lo [19] PAHAWH HMONG CLAN SIGN TSHEEJ..PAHAWH HMONG CLAN SIGN VWJ +16D40..16D42 ; ALetter # Lm [3] KIRAT RAI SIGN ANUSVARA..KIRAT RAI SIGN VISARGA +16D43..16D6A ; ALetter # Lo [40] KIRAT RAI LETTER A..KIRAT RAI VOWEL SIGN AU +16D6B..16D6C ; ALetter # Lm [2] KIRAT RAI SIGN VIRAMA..KIRAT RAI SIGN SAAT 16E40..16E7F ; ALetter # L& [64] MEDEFAIDRIN CAPITAL LETTER M..MEDEFAIDRIN SMALL LETTER Y 16F00..16F4A ; ALetter # Lo [75] MIAO LETTER PA..MIAO LETTER RTE 16F50 ; ALetter # Lo MIAO LETTER NASALIZATION @@ -1269,6 +1309,8 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1E2C0..1E2EB ; ALetter # Lo [44] WANCHO LETTER AA..WANCHO LETTER YIH 1E4D0..1E4EA ; ALetter # Lo [27] NAG MUNDARI LETTER O..NAG MUNDARI LETTER ELL 1E4EB ; ALetter # Lm NAG MUNDARI SIGN OJOD +1E5D0..1E5ED ; ALetter # Lo [30] OL ONAL LETTER O..OL ONAL LETTER EG +1E5F0 ; ALetter # Lo OL ONAL SIGN HODDOND 1E7E0..1E7E6 ; ALetter # Lo [7] ETHIOPIC SYLLABLE HHYA..ETHIOPIC SYLLABLE HHYO 1E7E8..1E7EB ; ALetter # Lo [4] ETHIOPIC SYLLABLE GURAGE HHWA..ETHIOPIC SYLLABLE HHWE 1E7ED..1E7EE ; ALetter # Lo [2] ETHIOPIC SYLLABLE GURAGE MWI..ETHIOPIC SYLLABLE GURAGE MWEE @@ -1313,7 +1355,7 @@ FFDA..FFDC ; ALetter # Lo [3] HALFWIDTH HANGUL LETTER EU..HALFWIDTH HANGUL 1F150..1F169 ; ALetter # So [26] NEGATIVE CIRCLED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z 1F170..1F189 ; ALetter # So [26] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER Z -# Total code points: 29490 +# Total code points: 33791 # ================================================ @@ -1339,14 +1381,12 @@ FF1A ; MidLetter # Po FULLWIDTH COLON 066C ; MidNum # Po ARABIC THOUSANDS SEPARATOR 07F8 ; MidNum # Po NKO COMMA 2044 ; MidNum # Sm FRACTION SLASH -FE10 ; MidNum # Po PRESENTATION FORM FOR VERTICAL COMMA -FE14 ; MidNum # Po PRESENTATION FORM FOR VERTICAL SEMICOLON FE50 ; MidNum # Po SMALL COMMA FE54 ; MidNum # Po SMALL SEMICOLON FF0C ; MidNum # Po FULLWIDTH COMMA FF1B ; MidNum # Po FULLWIDTH SEMICOLON -# Total code points: 15 +# Total code points: 13 # ================================================ @@ -1390,6 +1430,7 @@ FF0E ; MidNumLet # Po FULLWIDTH FULL STOP 1810..1819 ; Numeric # Nd [10] MONGOLIAN DIGIT ZERO..MONGOLIAN DIGIT NINE 1946..194F ; Numeric # Nd [10] LIMBU DIGIT ZERO..LIMBU DIGIT NINE 19D0..19D9 ; Numeric # Nd [10] NEW TAI LUE DIGIT ZERO..NEW TAI LUE DIGIT NINE +19DA ; Numeric # No NEW TAI LUE THAM DIGIT ONE 1A80..1A89 ; Numeric # Nd [10] TAI THAM HORA DIGIT ZERO..TAI THAM HORA DIGIT NINE 1A90..1A99 ; Numeric # Nd [10] TAI THAM THAM DIGIT ZERO..TAI THAM THAM DIGIT NINE 1B50..1B59 ; Numeric # Nd [10] BALINESE DIGIT ZERO..BALINESE DIGIT NINE @@ -1406,6 +1447,7 @@ ABF0..ABF9 ; Numeric # Nd [10] MEETEI MAYEK DIGIT ZERO..MEETEI MAYEK DIGIT N FF10..FF19 ; Numeric # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE 104A0..104A9 ; Numeric # Nd [10] OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE 10D30..10D39 ; Numeric # Nd [10] HANIFI ROHINGYA DIGIT ZERO..HANIFI ROHINGYA DIGIT NINE +10D40..10D49 ; Numeric # Nd [10] GARAY DIGIT ZERO..GARAY DIGIT NINE 11066..1106F ; Numeric # Nd [10] BRAHMI DIGIT ZERO..BRAHMI DIGIT NINE 110BD ; Numeric # Cf KAITHI NUMBER SIGN 110CD ; Numeric # Cf KAITHI NUMBER SIGN ABOVE @@ -1417,24 +1459,30 @@ FF10..FF19 ; Numeric # Nd [10] FULLWIDTH DIGIT ZERO..FULLWIDTH DIGIT NINE 114D0..114D9 ; Numeric # Nd [10] TIRHUTA DIGIT ZERO..TIRHUTA DIGIT NINE 11650..11659 ; Numeric # Nd [10] MODI DIGIT ZERO..MODI DIGIT NINE 116C0..116C9 ; Numeric # Nd [10] TAKRI DIGIT ZERO..TAKRI DIGIT NINE +116D0..116E3 ; Numeric # Nd [20] MYANMAR PAO DIGIT ZERO..MYANMAR EASTERN PWO KAREN DIGIT NINE 11730..11739 ; Numeric # Nd [10] AHOM DIGIT ZERO..AHOM DIGIT NINE 118E0..118E9 ; Numeric # Nd [10] WARANG CITI DIGIT ZERO..WARANG CITI DIGIT NINE 11950..11959 ; Numeric # Nd [10] DIVES AKURU DIGIT ZERO..DIVES AKURU DIGIT NINE +11BF0..11BF9 ; Numeric # Nd [10] SUNUWAR DIGIT ZERO..SUNUWAR DIGIT NINE 11C50..11C59 ; Numeric # Nd [10] BHAIKSUKI DIGIT ZERO..BHAIKSUKI DIGIT NINE 11D50..11D59 ; Numeric # Nd [10] MASARAM GONDI DIGIT ZERO..MASARAM GONDI DIGIT NINE 11DA0..11DA9 ; Numeric # Nd [10] GUNJALA GONDI DIGIT ZERO..GUNJALA GONDI DIGIT NINE 11F50..11F59 ; Numeric # Nd [10] KAWI DIGIT ZERO..KAWI DIGIT NINE +16130..16139 ; Numeric # Nd [10] GURUNG KHEMA DIGIT ZERO..GURUNG KHEMA DIGIT NINE 16A60..16A69 ; Numeric # Nd [10] MRO DIGIT ZERO..MRO DIGIT NINE 16AC0..16AC9 ; Numeric # Nd [10] TANGSA DIGIT ZERO..TANGSA DIGIT NINE 16B50..16B59 ; Numeric # Nd [10] PAHAWH HMONG DIGIT ZERO..PAHAWH HMONG DIGIT NINE +16D70..16D79 ; Numeric # Nd [10] KIRAT RAI DIGIT ZERO..KIRAT RAI DIGIT NINE +1CCF0..1CCF9 ; Numeric # Nd [10] OUTLINED DIGIT ZERO..OUTLINED DIGIT NINE 1D7CE..1D7FF ; Numeric # Nd [50] MATHEMATICAL BOLD DIGIT ZERO..MATHEMATICAL MONOSPACE DIGIT NINE 1E140..1E149 ; Numeric # Nd [10] NYIAKENG PUACHUE HMONG DIGIT ZERO..NYIAKENG PUACHUE HMONG DIGIT NINE 1E2F0..1E2F9 ; Numeric # Nd [10] WANCHO DIGIT ZERO..WANCHO DIGIT NINE 1E4F0..1E4F9 ; Numeric # Nd [10] NAG MUNDARI DIGIT ZERO..NAG MUNDARI DIGIT NINE +1E5F1..1E5FA ; Numeric # Nd [10] OL ONAL DIGIT ZERO..OL ONAL DIGIT NINE 1E950..1E959 ; Numeric # Nd [10] ADLAM DIGIT ZERO..ADLAM DIGIT NINE 1FBF0..1FBF9 ; Numeric # Nd [10] SEGMENTED DIGIT ZERO..SEGMENTED DIGIT NINE -# Total code points: 693 +# Total code points: 774 # ================================================ diff --git a/resources/standards-data/unicode-character-database/download.sh b/resources/standards-data/unicode-character-database/download.sh index 4b972e7afa1..a6675d28741 100755 --- a/resources/standards-data/unicode-character-database/download.sh +++ b/resources/standards-data/unicode-character-database/download.sh @@ -26,7 +26,7 @@ BLOCKS_SRC_LOCAL="./Blocks.txt" UNICODE_DATA_SRC_HREF="https://www.unicode.org/Public/$KEYMAN_VERSION_UNICODE/ucd/UnicodeData.txt" UNICODE_DATA_SRC_LOCAL="./UnicodeData.txt" -# Used by common/models/wordbreakers for the default Unicode wordbreaker. +# Used by web/src/engine/predictive-text/wordbreakers for the default Unicode wordbreaker. WORDBREAK_PROP_SRC_HREF="https://www.unicode.org/Public/$KEYMAN_VERSION_UNICODE/ucd/auxiliary/WordBreakProperty.txt" WORDBREAK_PROP_SRC_LOCAL="./WordBreakProperty.txt" @@ -55,4 +55,4 @@ do_download() { downloadPropertyFile "${EMOJI_DATA_SRC_HREF}" "${EMOJI_DATA_SRC_LOCAL}" } -builder_run_action download do_download \ No newline at end of file +builder_run_action download do_download diff --git a/resources/standards-data/unicode-character-database/emoji-data.txt b/resources/standards-data/unicode-character-database/emoji-data.txt index 0ba10e9ce4c..ff99028248b 100644 --- a/resources/standards-data/unicode-character-database/emoji-data.txt +++ b/resources/standards-data/unicode-character-database/emoji-data.txt @@ -1,11 +1,11 @@ # emoji-data.txt -# Date: 2023-02-01, 02:22:54 GMT -# © 2023 Unicode®, Inc. +# Date: 2024-05-01, 21:25:24 GMT +# © 2024 Unicode®, Inc. # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. -# For terms of use, see https://www.unicode.org/terms_of_use.html +# For terms of use and license, see https://www.unicode.org/terms_of_use.html # # Emoji Data for UTS #51 -# Used with Emoji Version 15.1 and subsequent minor revisions (if any) +# Used with Emoji Version 16.0 and subsequent minor revisions (if any) # # For documentation and usage, see https://www.unicode.org/reports/tr51 # @@ -407,6 +407,8 @@ 1FA80..1FA82 ; Emoji # E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Emoji # E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA87..1FA88 ; Emoji # E15.0 [2] (🪇..🪈) maracas..flute +1FA89 ; Emoji # E16.0 [1] (🪉) harp +1FA8F ; Emoji # E16.0 [1] (🪏) shovel 1FA90..1FA95 ; Emoji # E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Emoji # E13.0 [19] (🪖..🪨) military helmet..rock 1FAA9..1FAAC ; Emoji # E14.0 [4] (🪩..🪬) mirror ball..hamsa @@ -414,19 +416,24 @@ 1FAB0..1FAB6 ; Emoji # E13.0 [7] (🪰..🪶) fly..feather 1FAB7..1FABA ; Emoji # E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FABB..1FABD ; Emoji # E15.0 [3] (🪻..🪽) hyacinth..wing +1FABE ; Emoji # E16.0 [1] (🪾) leafless tree 1FABF ; Emoji # E15.0 [1] (🪿) goose 1FAC0..1FAC2 ; Emoji # E13.0 [3] (🫀..🫂) anatomical heart..people hugging 1FAC3..1FAC5 ; Emoji # E14.0 [3] (🫃..🫅) pregnant man..person with crown +1FAC6 ; Emoji # E16.0 [1] (🫆) fingerprint 1FACE..1FACF ; Emoji # E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Emoji # E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Emoji # E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Emoji # E15.0 [2] (🫚..🫛) ginger root..pea pod +1FADC ; Emoji # E16.0 [1] (🫜) root vegetable +1FADF ; Emoji # E16.0 [1] (🫟) splatter 1FAE0..1FAE7 ; Emoji # E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Emoji # E15.0 [1] (🫨) shaking face +1FAE9 ; Emoji # E16.0 [1] (🫩) face with bags under eyes 1FAF0..1FAF6 ; Emoji # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Emoji # E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand -# Total elements: 1424 +# Total elements: 1431 # ================================================ @@ -696,6 +703,8 @@ 1FA80..1FA82 ; Emoji_Presentation # E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Emoji_Presentation # E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA87..1FA88 ; Emoji_Presentation # E15.0 [2] (🪇..🪈) maracas..flute +1FA89 ; Emoji_Presentation # E16.0 [1] (🪉) harp +1FA8F ; Emoji_Presentation # E16.0 [1] (🪏) shovel 1FA90..1FA95 ; Emoji_Presentation # E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Emoji_Presentation # E13.0 [19] (🪖..🪨) military helmet..rock 1FAA9..1FAAC ; Emoji_Presentation # E14.0 [4] (🪩..🪬) mirror ball..hamsa @@ -703,19 +712,24 @@ 1FAB0..1FAB6 ; Emoji_Presentation # E13.0 [7] (🪰..🪶) fly..feather 1FAB7..1FABA ; Emoji_Presentation # E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FABB..1FABD ; Emoji_Presentation # E15.0 [3] (🪻..🪽) hyacinth..wing +1FABE ; Emoji_Presentation # E16.0 [1] (🪾) leafless tree 1FABF ; Emoji_Presentation # E15.0 [1] (🪿) goose 1FAC0..1FAC2 ; Emoji_Presentation # E13.0 [3] (🫀..🫂) anatomical heart..people hugging 1FAC3..1FAC5 ; Emoji_Presentation # E14.0 [3] (🫃..🫅) pregnant man..person with crown +1FAC6 ; Emoji_Presentation # E16.0 [1] (🫆) fingerprint 1FACE..1FACF ; Emoji_Presentation # E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Emoji_Presentation # E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Emoji_Presentation # E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Emoji_Presentation # E15.0 [2] (🫚..🫛) ginger root..pea pod +1FADC ; Emoji_Presentation # E16.0 [1] (🫜) root vegetable +1FADF ; Emoji_Presentation # E16.0 [1] (🫟) splatter 1FAE0..1FAE7 ; Emoji_Presentation # E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Emoji_Presentation # E15.0 [1] (🫨) shaking face +1FAE9 ; Emoji_Presentation # E16.0 [1] (🫩) face with bags under eyes 1FAF0..1FAF6 ; Emoji_Presentation # E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Emoji_Presentation # E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand -# Total elements: 1205 +# Total elements: 1212 # ================================================ @@ -1289,7 +1303,9 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1FA80..1FA82 ; Extended_Pictographic# E12.0 [3] (🪀..🪂) yo-yo..parachute 1FA83..1FA86 ; Extended_Pictographic# E13.0 [4] (🪃..🪆) boomerang..nesting dolls 1FA87..1FA88 ; Extended_Pictographic# E15.0 [2] (🪇..🪈) maracas..flute -1FA89..1FA8F ; Extended_Pictographic# E0.0 [7] (🪉..🪏) .. +1FA89 ; Extended_Pictographic# E16.0 [1] (🪉) harp +1FA8A..1FA8E ; Extended_Pictographic# E0.0 [5] (🪊..🪎) .. +1FA8F ; Extended_Pictographic# E16.0 [1] (🪏) shovel 1FA90..1FA95 ; Extended_Pictographic# E12.0 [6] (🪐..🪕) ringed planet..banjo 1FA96..1FAA8 ; Extended_Pictographic# E13.0 [19] (🪖..🪨) military helmet..rock 1FAA9..1FAAC ; Extended_Pictographic# E14.0 [4] (🪩..🪬) mirror ball..hamsa @@ -1297,19 +1313,23 @@ E0020..E007F ; Emoji_Component # E0.0 [96] (󠀠..󠁿) tag space..c 1FAB0..1FAB6 ; Extended_Pictographic# E13.0 [7] (🪰..🪶) fly..feather 1FAB7..1FABA ; Extended_Pictographic# E14.0 [4] (🪷..🪺) lotus..nest with eggs 1FABB..1FABD ; Extended_Pictographic# E15.0 [3] (🪻..🪽) hyacinth..wing -1FABE ; Extended_Pictographic# E0.0 [1] (🪾) +1FABE ; Extended_Pictographic# E16.0 [1] (🪾) leafless tree 1FABF ; Extended_Pictographic# E15.0 [1] (🪿) goose 1FAC0..1FAC2 ; Extended_Pictographic# E13.0 [3] (🫀..🫂) anatomical heart..people hugging 1FAC3..1FAC5 ; Extended_Pictographic# E14.0 [3] (🫃..🫅) pregnant man..person with crown -1FAC6..1FACD ; Extended_Pictographic# E0.0 [8] (🫆..🫍) .. +1FAC6 ; Extended_Pictographic# E16.0 [1] (🫆) fingerprint +1FAC7..1FACD ; Extended_Pictographic# E0.0 [7] (🫇..🫍) .. 1FACE..1FACF ; Extended_Pictographic# E15.0 [2] (🫎..🫏) moose..donkey 1FAD0..1FAD6 ; Extended_Pictographic# E13.0 [7] (🫐..🫖) blueberries..teapot 1FAD7..1FAD9 ; Extended_Pictographic# E14.0 [3] (🫗..🫙) pouring liquid..jar 1FADA..1FADB ; Extended_Pictographic# E15.0 [2] (🫚..🫛) ginger root..pea pod -1FADC..1FADF ; Extended_Pictographic# E0.0 [4] (🫜..🫟) .. +1FADC ; Extended_Pictographic# E16.0 [1] (🫜) root vegetable +1FADD..1FADE ; Extended_Pictographic# E0.0 [2] (🫝..🫞) .. +1FADF ; Extended_Pictographic# E16.0 [1] (🫟) splatter 1FAE0..1FAE7 ; Extended_Pictographic# E14.0 [8] (🫠..🫧) melting face..bubbles 1FAE8 ; Extended_Pictographic# E15.0 [1] (🫨) shaking face -1FAE9..1FAEF ; Extended_Pictographic# E0.0 [7] (🫩..🫯) .. +1FAE9 ; Extended_Pictographic# E16.0 [1] (🫩) face with bags under eyes +1FAEA..1FAEF ; Extended_Pictographic# E0.0 [6] (🫪..🫯) .. 1FAF0..1FAF6 ; Extended_Pictographic# E14.0 [7] (🫰..🫶) hand with index finger and thumb crossed..heart hands 1FAF7..1FAF8 ; Extended_Pictographic# E15.0 [2] (🫷..🫸) leftwards pushing hand..rightwards pushing hand 1FAF9..1FAFF ; Extended_Pictographic# E0.0 [7] (🫹..🫿) .. diff --git a/resources/stats/stats.sh b/resources/stats/stats.sh index 791aba8e14d..949d137e4bd 100755 --- a/resources/stats/stats.sh +++ b/resources/stats/stats.sh @@ -13,7 +13,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" cd "$THIS_SCRIPT_PATH" -platforms=(android/ ios/ linux/ mac/ web/ windows/ developer/ core/ common/models/) +platforms=(android/ ios/ linux/ mac/ web/ windows/ developer/ core/) builder_describe "Stats collector for Keyman PRs and issues diff --git a/tsconfig.base.json b/tsconfig.base.json index 7f69376372d..9369051820d 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -27,10 +27,9 @@ "paths": { "@keymanapp/common-types": ["./common/web/types/src/main"], "@keymanapp/keyman": ["./web" ], - "@keymanapp/models-types": ["./common/models/types"], - "@keymanapp/models-templates": ["./common/models/templates"], - "@keymanapp/models-wordbreakers": ["./common/models/wordbreakers"], - "@keymanapp/web-utils": ["./common/web/utils"], + "@keymanapp/models-templates": ["./web/src/engine/predictive-text/templates/"], + "@keymanapp/models-wordbreakers": ["./web/src/engine/predictive-text/wordbreakers"], + "@keymanapp/web-utils": ["./web/src/engine/common/web-utils"], "@keymanapp/lm-message-types": ["./web/src/engine/predictive-text/types"], "@keymanapp/keyman-version": ["./common/web/keyman-version"], "@keymanapp/ldml-keyboard-constants": [ "./core/include/ldml" ], diff --git a/tsconfig.json b/tsconfig.json index fc9c15a34f6..28f8eab2937 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,16 +2,10 @@ "references": [ { "path": "./core/include/ldml/tsconfig.json" }, - { "path": "./common/models/templates/tsconfig.json" }, - { "path": "./common/models/types/tsconfig.json" }, - { "path": "./common/models/wordbreakers/tsconfig.json" }, { "path": "./common/tools/hextobin/" }, { "path": "./common/web/keyman-version" }, - { "path": "./common/web/recorder/tsconfig.json" }, - { "path": "./common/web/sentry-manager/src/tsconfig.json" }, { "path": "./common/web/types/" }, - { "path": "./common/web/utils/tsconfig.json" }, { "path": "./developer/src/common/web/test-helpers/tsconfig.json" }, { "path": "./developer/src/common/web/utils/tsconfig.json" }, @@ -38,11 +32,17 @@ { "path": "./resources/build/version/" }, { "path": "./web/src/tsconfig.all.json" }, + { "path": "./web/src/engine/common/web-utils" }, { "path": "./web/src/engine/predictive-text/types/" }, + { "path": "./web/src/engine/predictive-text/templates" }, + { "path": "./web/src/engine/predictive-text/wordbreakers" }, { "path": "./web/src/engine/predictive-text/worker-main/tsconfig.all.json" }, { "path": "./web/src/engine/predictive-text/worker-thread" }, { "path": "./web/src/engine/osk/gesture-processor/tsconfig.json" }, { "path": "./web/src/engine/osk/gesture-processor/src/tools/unit-test-resources/tsconfig.json" }, + { "path": "./web/src/engine/sentry-manager" }, + + { "path": "./web/src/tools/recorder-recorder" }, // { "path": "./web/tools/recorder/tsconfig.json" }, // { "path": "./web/tools/sourcemap-root/tsconfig.json" }, ] diff --git a/web/README.md b/web/README.md index 5c2b0514a63..54173090674 100644 --- a/web/README.md +++ b/web/README.md @@ -85,10 +85,10 @@ graph TD; KeyboardSpec["/web/src/engine/keyboard"]; JSProc["/web/src/engine/js-processor"]; OSK-->KeyboardSpec; - WebUtils["@keymanapp/web-utils
(/common/web/utils)"]; + WebUtils["@keymanapp/web-utils
(/web/src/engine/common/web-utils)"]; KeyboardSpec---->WebUtils; - Wordbreakers["@keymanapp/models-wordbreakers
(/common/models/wordbreakers)"]; - Models["@keymanapp/models-templates
(/common/models/templates)"]; + Wordbreakers["@keymanapp/models-wordbreakers
(/web/src/engine/predictive-text/wordbreakers)"]; + Models["@keymanapp/models-templates
(/web/src/engine/predictive-text/templates/)"]; Models-->WebUtils; LMWorker["@keymanapp/lm-worker
(/web/src/engine/predictive-text/worker-thread)"]; LMWorker-->Models; @@ -117,8 +117,6 @@ graph TD; subgraph ClassicWeb["`**ClassicWeb** Intermediate-level engine modules`"] - Device["/web/src/engine/device-detect"]; - Device----->WebUtils; Elements["/web/src/engine/element-wrappers"]; Elements-->JSProc; KeyboardStorage["/web/src/engine/keyboard-storage"]; diff --git a/web/build.sh b/web/build.sh index 50fc14e09e9..63c03eeaa34 100755 --- a/web/build.sh +++ b/web/build.sh @@ -25,7 +25,6 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \ ":app/ui Builds KMW's desktop form-factor keyboard-selection UI modules" \ ":engine/attachment Subset used for detecting valid page contexts for use in text editing " \ ":engine/core-processor Keyman Core WASM integration" \ - ":engine/device-detect Subset used for device-detection " \ ":engine/dom-utils A common subset of function used for DOM calculations, layout, etc" \ ":engine/events Specialized classes utilized to support KMW API events" \ ":engine/element-wrappers Subset used to integrate with website elements" \ @@ -59,7 +58,6 @@ builder_describe_outputs \ build:app/ui "/web/build/app/ui/${config}/kmwuitoggle.js" \ build:engine/attachment "/web/build/engine/attachment/lib/index.mjs" \ build:engine/core-processor "/web/build/engine/core-processor/lib/index.mjs" \ - build:engine/device-detect "/web/build/engine/device-detect/lib/index.mjs" \ build:engine/dom-utils "/web/build/engine/dom-utils/obj/index.js" \ build:engine/events "/web/build/engine/events/lib/index.mjs" \ build:engine/element-wrappers "/web/build/engine/element-wrappers/lib/index.mjs" \ @@ -74,7 +72,7 @@ builder_describe_outputs \ build:tools "/web/build/tools/building/sourcemap-root/index.js" \ build:test-pages "/web/build/test-resources/sentry-manager.js" -BUNDLE_CMD="node ${KEYMAN_ROOT}/common/web/es-bundling/build/common-bundle.mjs" +BUNDLE_CMD="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs" #### Build action definitions #### @@ -149,7 +147,6 @@ coverage_action() { cd web } -builder_run_child_actions build:engine/device-detect builder_run_child_actions build:engine/dom-utils builder_run_child_actions build:engine/keyboard @@ -169,7 +166,7 @@ builder_run_child_actions build:engine/keyboard-storage builder_run_child_actions build:engine/core-processor -# Uses engine/interfaces, engine/device-detect, engine/keyboard-storage, & engine/osk +# Uses engine/interfaces, engine/keyboard-storage, & engine/osk builder_run_child_actions build:engine/main # Uses all but engine/element-wrappers and engine/attachment diff --git a/web/ci.sh b/web/ci.sh index 0dd42fa61e3..43f176fdd68 100755 --- a/web/ci.sh +++ b/web/ci.sh @@ -63,10 +63,10 @@ if builder_start_action build; then # Upload the sentry-configuration engine used by the mobile apps to sentry # Also, clean 'em first. - for sourcemap in "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/"*.map; do + for sourcemap in "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/"*.map; do node "$KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.js" null "$sourcemap" --clean done - web_sentry_upload "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/" + web_sentry_upload "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/" # And, of course, the main build-products too web_sentry_upload "$KEYMAN_ROOT/web/build/app/webview/release/" diff --git a/web/common.inc.sh b/web/common.inc.sh index 8edfb9f4fa3..429c9a9a8d3 100644 --- a/web/common.inc.sh +++ b/web/common.inc.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # -BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs" +BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs" # Compiles all build products corresponding to the specified target. # This should be called from the working directory of a child project's diff --git a/web/package.json b/web/package.json index 5dee2b63221..85d1057e4cf 100644 --- a/web/package.json +++ b/web/package.json @@ -17,11 +17,6 @@ "types": "./build/engine/core-processor/obj/index.d.ts", "import": "./build/engine/core-processor/obj/index.js" }, - "./engine/device-detect": { - "es6-bundling": "./src/engine/device-detect/src/index.ts", - "types": "./build/engine/device-detect/obj/index.d.ts", - "import": "./build/engine/device-detect/obj/index.js" - }, "./engine/dom-utils": { "es6-bundling": "./src/engine/dom-utils/src/index.ts", "types": "./build/engine/dom-utils/obj/index.d.ts", @@ -133,7 +128,7 @@ "dependencies": { "@keymanapp/keyman-version": "*", "@keymanapp/lexical-model-layer": "*", - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@keymanapp/recorder-core": "*", "@keymanapp/web-utils": "*", "core-js": "^3.34.0", diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts index 1fbc9052033..c2254c1fdd5 100644 --- a/web/src/app/browser/src/contextManager.ts +++ b/web/src/app/browser/src/contextManager.ts @@ -415,7 +415,7 @@ export default class ContextManager extends ContextManagerBase void; diff --git a/common/web/utils/.c8rc.json b/web/src/engine/common/web-utils/.c8rc.json similarity index 100% rename from common/web/utils/.c8rc.json rename to web/src/engine/common/web-utils/.c8rc.json diff --git a/common/web/utils/.gitignore b/web/src/engine/common/web-utils/.gitignore similarity index 100% rename from common/web/utils/.gitignore rename to web/src/engine/common/web-utils/.gitignore diff --git a/common/web/utils/build.sh b/web/src/engine/common/web-utils/build.sh similarity index 69% rename from common/web/utils/build.sh rename to web/src/engine/common/web-utils/build.sh index 19ab8960325..303bd2664b0 100755 --- a/common/web/utils/build.sh +++ b/web/src/engine/common/web-utils/build.sh @@ -5,39 +5,43 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE +. "${KEYMAN_ROOT}/web/common.inc.sh" . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" -BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs" +SUBPROJECT_NAME=engine/common/web-utils +BUILD_DIR="/web/src/engine/common/web-utils/build" + +BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs" ################################ Main script ################################ builder_describe \ "Compiles the web-oriented utility function module." \ "@/common/web/keyman-version" \ - "@/common/web/es-bundling" \ + "@/web/src/tools/es-bundling" \ clean configure build test \ "--ci For use with action ${BUILDER_TERM_START}test${BUILDER_TERM_END} - emits CI-friendly test reports" builder_describe_outputs \ configure "/node_modules" \ - build "/common/web/utils/build/obj/index.js" + build "${BUILD_DIR}/obj/index.js" builder_parse "$@" function do_build() { - tsc --build "$THIS_SCRIPT_PATH/tsconfig.json" + tsc --build $builder_verbose "$THIS_SCRIPT_PATH/tsconfig.json" # May be useful one day, for building a mass .d.ts for KMW as a whole. # So... tsc does declaration-bundling on its own pretty well, at least for local development. - tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts + tsc --emitDeclarationOnly --outFile "${KEYMAN_ROOT}/${BUILD_DIR}/lib/index.d.ts" # One of the functions (timedPromise) is quite helpful for automated testing, even in the DOM. # So, to make sure it's easily-accessible for the DOM-based tests... - $BUNDLE_CMD "${KEYMAN_ROOT}/common/web/utils/build/obj/index.js" \ - --out "${KEYMAN_ROOT}/common/web/utils/build/lib/index.mjs" \ + $BUNDLE_CMD "${KEYMAN_ROOT}/${BUILD_DIR}/obj/index.js" \ + --out "${KEYMAN_ROOT}/${BUILD_DIR}/lib/index.mjs" \ --format esm } @@ -56,4 +60,4 @@ function do_test() { builder_run_action configure verify_npm_setup builder_run_action clean rm -rf build/ builder_run_action build do_build -builder_run_action test do_test \ No newline at end of file +builder_run_action test do_test diff --git a/common/web/utils/package.json b/web/src/engine/common/web-utils/package.json similarity index 100% rename from common/web/utils/package.json rename to web/src/engine/common/web-utils/package.json diff --git a/common/web/utils/src/deepCopy.ts b/web/src/engine/common/web-utils/src/deepCopy.ts similarity index 100% rename from common/web/utils/src/deepCopy.ts rename to web/src/engine/common/web-utils/src/deepCopy.ts diff --git a/common/web/utils/src/deviceSpec.ts b/web/src/engine/common/web-utils/src/deviceSpec.ts similarity index 100% rename from common/web/utils/src/deviceSpec.ts rename to web/src/engine/common/web-utils/src/deviceSpec.ts diff --git a/common/web/utils/src/globalObject.ts b/web/src/engine/common/web-utils/src/globalObject.ts similarity index 100% rename from common/web/utils/src/globalObject.ts rename to web/src/engine/common/web-utils/src/globalObject.ts diff --git a/common/web/utils/src/index.ts b/web/src/engine/common/web-utils/src/index.ts similarity index 100% rename from common/web/utils/src/index.ts rename to web/src/engine/common/web-utils/src/index.ts diff --git a/common/web/utils/src/kmwstring.ts b/web/src/engine/common/web-utils/src/kmwstring.ts similarity index 100% rename from common/web/utils/src/kmwstring.ts rename to web/src/engine/common/web-utils/src/kmwstring.ts diff --git a/common/web/utils/src/managedPromise.ts b/web/src/engine/common/web-utils/src/managedPromise.ts similarity index 100% rename from common/web/utils/src/managedPromise.ts rename to web/src/engine/common/web-utils/src/managedPromise.ts diff --git a/common/web/utils/src/priority-queue.ts b/web/src/engine/common/web-utils/src/priority-queue.ts similarity index 100% rename from common/web/utils/src/priority-queue.ts rename to web/src/engine/common/web-utils/src/priority-queue.ts diff --git a/common/web/utils/src/test/deepCopy.js b/web/src/engine/common/web-utils/src/test/deepCopy.js similarity index 100% rename from common/web/utils/src/test/deepCopy.js rename to web/src/engine/common/web-utils/src/test/deepCopy.js diff --git a/common/web/utils/src/test/managedPromise.js b/web/src/engine/common/web-utils/src/test/managedPromise.js similarity index 100% rename from common/web/utils/src/test/managedPromise.js rename to web/src/engine/common/web-utils/src/test/managedPromise.js diff --git a/common/web/utils/src/test/priorityQueue.js b/web/src/engine/common/web-utils/src/test/priorityQueue.js similarity index 100% rename from common/web/utils/src/test/priorityQueue.js rename to web/src/engine/common/web-utils/src/test/priorityQueue.js diff --git a/common/web/utils/src/test/timeoutPromise.js b/web/src/engine/common/web-utils/src/test/timeoutPromise.js similarity index 100% rename from common/web/utils/src/test/timeoutPromise.js rename to web/src/engine/common/web-utils/src/test/timeoutPromise.js diff --git a/common/web/utils/src/test/versions.js b/web/src/engine/common/web-utils/src/test/versions.js similarity index 100% rename from common/web/utils/src/test/versions.js rename to web/src/engine/common/web-utils/src/test/versions.js diff --git a/common/web/utils/src/timeoutPromise.ts b/web/src/engine/common/web-utils/src/timeoutPromise.ts similarity index 100% rename from common/web/utils/src/timeoutPromise.ts rename to web/src/engine/common/web-utils/src/timeoutPromise.ts diff --git a/common/web/utils/src/version.ts b/web/src/engine/common/web-utils/src/version.ts similarity index 100% rename from common/web/utils/src/version.ts rename to web/src/engine/common/web-utils/src/version.ts diff --git a/common/web/utils/tsconfig.json b/web/src/engine/common/web-utils/tsconfig.json similarity index 71% rename from common/web/utils/tsconfig.json rename to web/src/engine/common/web-utils/tsconfig.json index cb87a6a7c4a..a4d2e57702d 100644 --- a/common/web/utils/tsconfig.json +++ b/web/src/engine/common/web-utils/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../tsconfig.kmw-main-base.json", + "extends": "../../../../tsconfig.base.json", "compilerOptions": { "tsBuildInfoFile": "./build/obj/tsconfig.tsbuildinfo", "baseUrl": "./", @@ -7,7 +7,7 @@ "rootDir": "./src" }, "references": [ - { "path": "../keyman-version"} + { "path": "../../../../../common/web/keyman-version" }, ], "include": [ "src/*.ts" diff --git a/web/src/engine/core-processor/build.sh b/web/src/engine/core-processor/build.sh index cee72fea011..16cb5947d8e 100755 --- a/web/src/engine/core-processor/build.sh +++ b/web/src/engine/core-processor/build.sh @@ -15,7 +15,7 @@ SUBPROJECT_NAME=engine/core-processor builder_describe "Keyman Core WASM integration" \ "@/core:wasm" \ - "@/common/web/utils" \ + "@/web/src/engine/common/web-utils" \ "clean" \ "configure" \ "build" \ @@ -39,7 +39,7 @@ do_configure() { verify_npm_setup mkdir -p "src/import/core/" - # we don't need this file for release builds, but it's nice to have + # we don't need this file for release builds, but it's nice to have # for reference and auto-completion cp "${KEYMAN_ROOT}/core/build/wasm/${BUILDER_CONFIGURATION}/src/core-interface.d.ts" "src/import/core/" } diff --git a/web/src/engine/device-detect/build.sh b/web/src/engine/device-detect/build.sh deleted file mode 100755 index 4e25f55bd79..00000000000 --- a/web/src/engine/device-detect/build.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -## START STANDARD BUILD SCRIPT INCLUDE -# adjust relative paths as necessary -THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" -## END STANDARD BUILD SCRIPT INCLUDE - -SUBPROJECT_NAME=engine/device-detect -. "$KEYMAN_ROOT/web/common.inc.sh" -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" - -# ################################ Main script ################################ - -builder_describe "Builds the device-detection component of Keyman Engine for Web (KMW)." \ - "@/common/web/keyman-version" \ - "@/common/web/utils" \ - "clean" \ - "configure" \ - "build" \ - "test" \ - "--ci+ Set to utilize CI-based test configurations & reporting." - -# Possible TODO? -# "upload-symbols Uploads build product to Sentry for error report symbolification. Only defined for $DOC_BUILD_EMBED_WEB" \ - -builder_describe_outputs \ - configure /node_modules \ - build /web/build/$SUBPROJECT_NAME/lib/index.mjs - -builder_parse "$@" - -#### Build action definitions #### - -do_build () { - compile $SUBPROJECT_NAME - - $BUNDLE_CMD "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/obj/index.js" \ - --out "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}/lib/index.mjs" \ - --format esm -} - -builder_run_action configure verify_npm_setup -builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME" -builder_run_action build do_build -builder_run_action test - -# No headless tests for this child project. Currently, DOM-based unit & -# integrated tests are run solely by the top-level $KEYMAN_ROOT/web project. \ No newline at end of file diff --git a/web/src/engine/device-detect/readme.md b/web/src/engine/device-detect/readme.md deleted file mode 100644 index aa3d7258357..00000000000 --- a/web/src/engine/device-detect/readme.md +++ /dev/null @@ -1,6 +0,0 @@ -## engine/device-detect - -This submodule provides the subset of the main engine's Web-oriented code that's used to detect -the user's device in isolation from the rest of KMW code. Fortunately, it doesn't have any -cross-references with other top-level KMW code, so it was possible to modularize in the form -seen here. \ No newline at end of file diff --git a/web/src/engine/device-detect/tsconfig.json b/web/src/engine/device-detect/tsconfig.json deleted file mode 100644 index a53bb60766b..00000000000 --- a/web/src/engine/device-detect/tsconfig.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": "../../tsconfig.dom.json", - - "compilerOptions": { - "baseUrl": "./", - "outDir": "../../../build/engine/device-detect/obj/", - "tsBuildInfoFile": "../../../build/engine/device-detect/obj/tsconfig.tsbuildinfo", - "rootDir": "./src" - }, - - "include": [ "**/*.ts" ], - - "references": [ - { "path": "../../../../common/web/keyman-version" }, - { "path": "../../../../common/web/utils" } - ] -} diff --git a/web/src/engine/dom-utils/build.sh b/web/src/engine/dom-utils/build.sh index d2e424db209..f842655c454 100755 --- a/web/src/engine/dom-utils/build.sh +++ b/web/src/engine/dom-utils/build.sh @@ -15,7 +15,7 @@ SUBPROJECT_NAME=engine/dom-utils # ################################ Main script ################################ builder_describe "Builds DOM-utility modules used by the Keyman Engine for Web (KMW)." \ - "@/common/web/utils" \ + "@/web/src/engine/common/web-utils" \ "@/web/src/engine/keyboard" \ "clean" \ "configure" \ diff --git a/web/src/engine/dom-utils/tsconfig.json b/web/src/engine/dom-utils/tsconfig.json index dadf4db5c8c..aab3cabf873 100644 --- a/web/src/engine/dom-utils/tsconfig.json +++ b/web/src/engine/dom-utils/tsconfig.json @@ -12,6 +12,6 @@ "references": [ { "path": "../keyboard" }, - { "path": "../../../../common/web/utils" } + { "path": "../common/web-utils" } ] } diff --git a/web/src/engine/events/build.sh b/web/src/engine/events/build.sh index 1b8993f5705..600ca8dc0cb 100755 --- a/web/src/engine/events/build.sh +++ b/web/src/engine/events/build.sh @@ -13,7 +13,7 @@ SUBPROJECT_NAME=engine/events # ################################ Main script ################################ builder_describe "Builds specialized event-related modules utilized by Keyman Engine for Web." \ - "@/common/web/utils build" \ + "@/web/src/engine/common/web-utils build" \ "@/web/src/engine/keyboard build" \ "clean" \ "configure" \ diff --git a/web/src/engine/events/tsconfig.json b/web/src/engine/events/tsconfig.json index 5d0a45bbab9..8ab284c473b 100644 --- a/web/src/engine/events/tsconfig.json +++ b/web/src/engine/events/tsconfig.json @@ -11,7 +11,7 @@ "include": [ "src/**/*.ts" ], "references": [ - { "path": "../../../../common/web/utils" }, + { "path": "../common/web-utils" }, { "path": "../keyboard" } ] } diff --git a/web/src/engine/interfaces/build.sh b/web/src/engine/interfaces/build.sh index 568bd7940d6..94bb267cbc4 100755 --- a/web/src/engine/interfaces/build.sh +++ b/web/src/engine/interfaces/build.sh @@ -13,7 +13,7 @@ SUBPROJECT_NAME=engine/interfaces # ################################ Main script ################################ builder_describe "Builds configuration subclasses used by the Keyman Engine for Web (KMW)." \ - "@/common/web/es-bundling" \ + "@/web/src/tools/es-bundling" \ "@/web/src/engine/keyboard" \ "@/web/src/engine/js-processor" \ "clean" \ diff --git a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts index 84e78519879..303fa99fc3d 100644 --- a/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts +++ b/web/src/engine/interfaces/src/prediction/languageProcessor.interface.ts @@ -1,5 +1,4 @@ -/// - +import { Suggestion, Reversion } from '@keymanapp/common-types'; import { EventEmitter } from "eventemitter3"; import { OutputTarget } from "keyman/engine/keyboard"; diff --git a/web/src/engine/interfaces/src/prediction/predictionContext.ts b/web/src/engine/interfaces/src/prediction/predictionContext.ts index cd856153b23..758ef8f46b2 100644 --- a/web/src/engine/interfaces/src/prediction/predictionContext.ts +++ b/web/src/engine/interfaces/src/prediction/predictionContext.ts @@ -1,4 +1,5 @@ import { EventEmitter } from "eventemitter3"; +import { Keep, Reversion, Suggestion } from '@keymanapp/common-types'; import { type LanguageProcessorSpec , ReadySuggestions, type InvalidateSourceEnum, StateChangeHandler } from './languageProcessor.interface.js'; import { type OutputTarget } from "keyman/engine/keyboard"; @@ -209,7 +210,9 @@ export default class PredictionContext extends EventEmitter - import { extendString } from "@keymanapp/web-utils"; import { findCommonSubstringEndIndex } from "./stringDivergence.js"; import { Mock } from "./mock.js"; @@ -10,6 +8,7 @@ extendString(); // Defines deadkey management in a manner attachable to each element interface. import { type KeyEvent } from 'keyman/engine/keyboard'; import { Deadkey, DeadkeyTracker } from "./deadkeys.js"; +import { ProbabilityMass, Transform } from '@keymanapp/common-types'; // Also relies on string-extensions provided by the web-utils package. diff --git a/web/src/engine/js-processor/src/ruleBehavior.ts b/web/src/engine/js-processor/src/ruleBehavior.ts index a6b2c9973a1..29234506221 100644 --- a/web/src/engine/js-processor/src/ruleBehavior.ts +++ b/web/src/engine/js-processor/src/ruleBehavior.ts @@ -1,10 +1,9 @@ -/// - import KeyboardProcessor from "./keyboardProcessor.js"; import { VariableStoreDictionary } from "keyman/engine/keyboard"; import OutputTarget, { type Transcription } from './outputTarget.js'; import { Mock } from "./mock.js"; import { type VariableStore } from "./systemStores.js"; +import { Suggestion } from '@keymanapp/common-types'; /** * Represents the commands and state changes that result from a matched keyboard rule. diff --git a/web/src/engine/keyboard-storage/build.sh b/web/src/engine/keyboard-storage/build.sh index 33873355ff1..b7ffc4d6b34 100755 --- a/web/src/engine/keyboard-storage/build.sh +++ b/web/src/engine/keyboard-storage/build.sh @@ -13,7 +13,7 @@ SUBPROJECT_NAME=engine/keyboard-storage # ################################ Main script ################################ builder_describe "Builds Keyman Engine modules for keyboard cloud-querying & caching + model caching." \ - "@/common/web/es-bundling" \ + "@/web/src/tools/es-bundling" \ "clean" \ "configure" \ "build" \ diff --git a/web/src/engine/keyboard/build.sh b/web/src/engine/keyboard/build.sh index 7222ba7680b..6390243b9a3 100755 --- a/web/src/engine/keyboard/build.sh +++ b/web/src/engine/keyboard/build.sh @@ -17,11 +17,11 @@ SUBPROJECT_NAME=engine/keyboard builder_describe \ "Compiles the web-oriented utility function module." \ - "@/web/src/tools/testing/recorder-core test" \ "@/common/web/keyman-version" \ - "@/common/web/es-bundling" \ "@/common/web/types" \ - "@/common/web/utils" \ + "@/web/src/tools/testing/recorder-core test" \ + "@/web/src/tools/es-bundling" \ + "@/web/src/engine/common/web-utils" \ configure \ clean \ build \ diff --git a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts index eb12472dd8a..5ca3d4c8ced 100644 --- a/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts +++ b/web/src/engine/keyboard/src/keyboards/keyboardLoaderBase.ts @@ -22,7 +22,7 @@ export abstract class KeyboardLoaderBase { * @param uri The URI of the keyboard to load. * @returns A Promise that resolves to the loaded keyboard. */ - public async loadKeyboardFromPath(uri: string): Promise { + public loadKeyboardFromPath(uri: string): Promise { this.harness.install(); return this.loadKeyboardInternal(uri, new UriBasedErrorBuilder(uri)); } @@ -39,26 +39,26 @@ export abstract class KeyboardLoaderBase { } private async loadKeyboardInternal(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise { - const blob = await this.loadKeyboardBlob(uri, errorBuilder); + const byteArray = await this.loadKeyboardBlob(uri, errorBuilder); + + if (byteArray.slice(0, 4) == Uint8Array.from([0x4b, 0x58, 0x54, 0x53])) { // 'KXTS' + // KMX or LDML (KMX+) keyboard + console.error("KMX keyboard loading is not yet implemented!"); + return null; + } let script: string; try { - script = await blob.text(); + script = new TextDecoder('utf-8', { fatal: true }).decode(byteArray); } catch (e) { throw errorBuilder.invalidKeyboard(e); } - if (script.startsWith('KXTS', 0)) { - // KMX or LDML (KMX+) keyboard - console.error("KMX keyboard loading is not yet implemented!"); - return null; - } - // .js keyboard return await this.loadKeyboardFromScript(script, errorBuilder); } - protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise; + protected abstract loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise; protected abstract loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise; } \ No newline at end of file diff --git a/web/src/engine/keyboard/src/keyboards/keyboardProperties.ts b/web/src/engine/keyboard/src/keyboards/keyboardProperties.ts index 690f85bf530..7f1d43282e3 100644 --- a/web/src/engine/keyboard/src/keyboards/keyboardProperties.ts +++ b/web/src/engine/keyboard/src/keyboards/keyboardProperties.ts @@ -75,7 +75,7 @@ export type LanguageAPIPropertySpec = { * Corresponds to the documented API for the Web engine's `addKeyboards` function * when a single language object is specified - not an array. * - * See https://help.keyman.com/DEVELOPER/ENGINE/WEB/15.0/reference/core/addKeyboards, + * See https://help.keyman.com/developer/engine/web/15.0/reference/core/addKeyboards, * "Using an `object`". */ export type KeyboardAPIPropertySpec = { @@ -93,7 +93,7 @@ export type KeyboardAPIPropertySpec = { * Corresponds to the documented API for the Web engine's `addKeyboards` function * when a language array is specified for the object. * - * See https://help.keyman.com/DEVELOPER/ENGINE/WEB/15.0/reference/core/addKeyboards, + * See https://help.keyman.com/developer/engine/web/15.0/reference/core/addKeyboards, * "Using an `object`". */ export type KeyboardAPIPropertyMultilangSpec = { diff --git a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts index 96d00bf4fda..a6df76aff1b 100644 --- a/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts +++ b/web/src/engine/keyboard/src/keyboards/loaders/domKeyboardLoader.ts @@ -29,7 +29,7 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase { this.performCacheBusting = cacheBust || false; } - protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise { + protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise { if (this.performCacheBusting) { uri = this.cacheBust(uri); } @@ -45,11 +45,13 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase { throw errorBuilder.keyboardDownloadError(new Error(`HTTP ${response.status} ${response.statusText}`)); } + let buffer: ArrayBuffer; try { - return await response.blob(); + buffer = await response.arrayBuffer(); } catch (e) { throw errorBuilder.invalidKeyboard(e); } + return new Uint8Array(buffer); } protected async loadKeyboardFromScript(script: string, errorBuilder: KeyboardLoadErrorBuilder): Promise { @@ -59,6 +61,10 @@ export class DOMKeyboardLoader extends KeyboardLoaderBase { throw errorBuilder.scriptError(e); } const keyboard = this.harness.loadedKeyboard; + if (!keyboard) { + throw errorBuilder.scriptError(); + } + this.harness.loadedKeyboard = null; return keyboard; } diff --git a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts index 8f568840ffd..6ec27364fce 100644 --- a/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts +++ b/web/src/engine/keyboard/src/keyboards/loaders/nodeKeyboardLoader.ts @@ -26,7 +26,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase { } } - protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise { + protected async loadKeyboardBlob(uri: string, errorBuilder: KeyboardLoadErrorBuilder): Promise { // `fs` does not like 'file:///'; it IS "File System" oriented, after all, and wants a path, not a URI. if (uri.indexOf('file:///') == 0) { uri = uri.substring('file:///'.length); @@ -38,7 +38,7 @@ export class NodeKeyboardLoader extends KeyboardLoaderBase { } catch (err) { throw errorBuilder.keyboardDownloadError(err); } - return new Blob([buffer]); + return Uint8Array.from(buffer); } protected async loadKeyboardFromScript(scriptSrc: string, errorBuilder: KeyboardLoadErrorBuilder): Promise { diff --git a/web/src/engine/main/build.sh b/web/src/engine/main/build.sh index 5abcb59008c..3958f6f7142 100755 --- a/web/src/engine/main/build.sh +++ b/web/src/engine/main/build.sh @@ -17,7 +17,6 @@ builder_describe "Builds the Keyman Engine for Web's common top-level base class "@/web/src/engine/core-processor" \ "@/web/src/engine/keyboard" \ "@/web/src/engine/interfaces build" \ - "@/web/src/engine/device-detect build" \ "@/web/src/engine/js-processor build" \ "@/web/src/engine/keyboard-storage build" \ "@/web/src/engine/osk build" \ diff --git a/web/src/engine/main/src/engineConfiguration.ts b/web/src/engine/main/src/engineConfiguration.ts index aac559acabd..40485c0f0f0 100644 --- a/web/src/engine/main/src/engineConfiguration.ts +++ b/web/src/engine/main/src/engineConfiguration.ts @@ -3,7 +3,7 @@ import { EventEmitter } from "eventemitter3"; import { DeviceSpec, KeyboardProperties, ManagedPromise, physicalKeyDeviceAlias, SpacebarText } from "keyman/engine/keyboard"; import { OutputTarget, RuleBehavior } from 'keyman/engine/js-processor'; import { PathConfiguration, PathOptionDefaults, PathOptionSpec } from "keyman/engine/interfaces"; -import { Device } from "keyman/engine/device-detect"; +import { DeviceDetector } from "./headless/deviceDetector.js"; import { KeyboardStub } from "keyman/engine/keyboard-storage"; interface EventMap { @@ -31,7 +31,7 @@ export class EngineConfiguration extends EventEmitter { super(); if(!device) { - const deviceDetector = new Device(); + const deviceDetector = new DeviceDetector(); deviceDetector.detect(); device = deviceDetector.coreSpec; diff --git a/web/src/engine/main/src/headless/contextWindow.ts b/web/src/engine/main/src/headless/contextWindow.ts index 9fcd1458b2a..fd8385f45ef 100644 --- a/web/src/engine/main/src/headless/contextWindow.ts +++ b/web/src/engine/main/src/headless/contextWindow.ts @@ -1,3 +1,4 @@ +import { CasingForm, Configuration, Context } from '@keymanapp/common-types'; import { Mock } from "keyman/engine/js-processor"; export default class ContextWindow implements Context { diff --git a/web/src/engine/device-detect/src/index.ts b/web/src/engine/main/src/headless/deviceDetector.ts similarity index 98% rename from web/src/engine/device-detect/src/index.ts rename to web/src/engine/main/src/headless/deviceDetector.ts index 97b14280b35..cd0bf7a185d 100644 --- a/web/src/engine/device-detect/src/index.ts +++ b/web/src/engine/main/src/headless/deviceDetector.ts @@ -1,9 +1,12 @@ +/* + * Keyman is copyright (C) SIL International. MIT License. + * + * Detect the user's device. + */ import StyleConstants from './utils/styleConstants.js'; import { DeviceSpec, Version } from "@keymanapp/web-utils"; -// The Device object definition ------------------------------------------------- - -export class Device { +export class DeviceDetector { // These correspond directly to the properties & parameters for `DeviceSpec`. touchable: boolean; OS: string; @@ -203,5 +206,3 @@ export class Device { return new DeviceSpec(this.browser, this.formFactor, this.OS, this.touchable); } } - -export default Device; \ No newline at end of file diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts index 94c95f56012..2b3a992390f 100644 --- a/web/src/engine/main/src/headless/inputProcessor.ts +++ b/web/src/engine/main/src/headless/inputProcessor.ts @@ -1,7 +1,5 @@ // Defines a 'polyfill' of sorts for NPM's events module -/// - import ContextWindow from "./contextWindow.js"; import { LanguageProcessor } from "./languageProcessor.js"; import type { ModelSpec, PathConfiguration } from "keyman/engine/interfaces"; @@ -22,6 +20,7 @@ import { } from 'keyman/engine/js-processor'; import { TranscriptionCache } from "./transcriptionCache.js"; +import { Transform } from '@keymanapp/common-types'; export class InputProcessor { public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = { diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts index cd39afc672b..ed82943565b 100644 --- a/web/src/engine/main/src/headless/languageProcessor.ts +++ b/web/src/engine/main/src/headless/languageProcessor.ts @@ -4,6 +4,7 @@ import { OutputTarget, Transcription, Mock } from "keyman/engine/js-processor"; import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces'; import ContextWindow from "./contextWindow.js"; import { TranscriptionCache } from "./transcriptionCache.js"; +import { Capabilities, Configuration, Reversion, Suggestion } from '@keymanapp/common-types'; /* Is more like the model configuration engine */ export class LanguageProcessor extends EventEmitter { diff --git a/web/src/engine/device-detect/src/utils/styleConstants.ts b/web/src/engine/main/src/headless/utils/styleConstants.ts similarity index 100% rename from web/src/engine/device-detect/src/utils/styleConstants.ts rename to web/src/engine/main/src/headless/utils/styleConstants.ts diff --git a/web/src/engine/main/src/index.ts b/web/src/engine/main/src/index.ts index b928d72c8a7..9e33d0d4ef5 100644 --- a/web/src/engine/main/src/index.ts +++ b/web/src/engine/main/src/index.ts @@ -7,4 +7,5 @@ export { LegacyAPIEvents } from './legacyAPIEvents.js'; export { VariableStoreCookieSerializer } from './variableStoreCookieSerializer.js'; export { LanguageProcessor } from './headless/languageProcessor.js'; export { TranscriptionCache } from './headless/transcriptionCache.js'; -export { InputProcessor } from './headless/inputProcessor.js'; \ No newline at end of file +export { InputProcessor } from './headless/inputProcessor.js'; +export { DeviceDetector } from './headless/deviceDetector.js'; \ No newline at end of file diff --git a/web/src/engine/main/src/keyboardInterface.ts b/web/src/engine/main/src/keyboardInterface.ts index 10194785948..83f3cf0e624 100644 --- a/web/src/engine/main/src/keyboardInterface.ts +++ b/web/src/engine/main/src/keyboardInterface.ts @@ -82,7 +82,7 @@ export default class KeyboardInterface +import { Configuration, Reversion, Suggestion, USVString } from '@keymanapp/common-types'; /** * Tokens are signed 31-bit integers! diff --git a/web/src/engine/predictive-text/types/package.json b/web/src/engine/predictive-text/types/package.json index 835a95045b5..b6c98eba962 100644 --- a/web/src/engine/predictive-text/types/package.json +++ b/web/src/engine/predictive-text/types/package.json @@ -1,6 +1,7 @@ { "name": "@keymanapp/lm-message-types", "description": "Type definitions in used in the lm layer (lexical model/predictive text) component of Keyman.", + "type": "module", "types": "./message.d.ts", "scripts": { "test": "tsc test.ts -lib es6" diff --git a/common/models/wordbreakers/.c8rc.json b/web/src/engine/predictive-text/wordbreakers/.c8rc.json similarity index 100% rename from common/models/wordbreakers/.c8rc.json rename to web/src/engine/predictive-text/wordbreakers/.c8rc.json diff --git a/common/models/wordbreakers/.gitignore b/web/src/engine/predictive-text/wordbreakers/.gitignore similarity index 100% rename from common/models/wordbreakers/.gitignore rename to web/src/engine/predictive-text/wordbreakers/.gitignore diff --git a/common/models/wordbreakers/README.md b/web/src/engine/predictive-text/wordbreakers/README.md similarity index 62% rename from common/models/wordbreakers/README.md rename to web/src/engine/predictive-text/wordbreakers/README.md index 29ba5d51c73..8f6ac0b3989 100644 --- a/common/models/wordbreakers/README.md +++ b/web/src/engine/predictive-text/wordbreakers/README.md @@ -4,13 +4,13 @@ The word breakers bundled in Keyman's modeling layer (common/models). Includes: - - `default` — a word breaker based on the Unicode default word boundary specification - - _deprecated_ `ascii` — an example word breaker - - _deprecated_ `placeholder` — an example word breaker +- `default` — a word breaker based on the Unicode default word boundary specification +- _deprecated_ `ascii` — an example word breaker +- _deprecated_ `placeholder` — an example word breaker ## Usage -``` +```typescript import {wordBreakers} from '@keymanapp/models-wordbreakers'; const breakWords = wordBreakers['default']; diff --git a/common/models/wordbreakers/build.sh b/web/src/engine/predictive-text/wordbreakers/build.sh similarity index 95% rename from common/models/wordbreakers/build.sh rename to web/src/engine/predictive-text/wordbreakers/build.sh index 725436c60eb..4591cc34e13 100755 --- a/common/models/wordbreakers/build.sh +++ b/web/src/engine/predictive-text/wordbreakers/build.sh @@ -5,7 +5,7 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder.inc.sh" +. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" diff --git a/common/models/wordbreakers/package.json b/web/src/engine/predictive-text/wordbreakers/package.json similarity index 97% rename from common/models/wordbreakers/package.json rename to web/src/engine/predictive-text/wordbreakers/package.json index f896050ecb6..5ac5fd4a28f 100644 --- a/common/models/wordbreakers/package.json +++ b/web/src/engine/predictive-text/wordbreakers/package.json @@ -54,7 +54,7 @@ "url": "https://github.com/keymanapp/keyman/issues" }, "devDependencies": { - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@keymanapp/resources-gosh": "*", "@types/mocha": "^7.0.2", "c8": "^7.12.0", diff --git a/common/models/wordbreakers/src/main/ascii.ts b/web/src/engine/predictive-text/wordbreakers/src/main/ascii.ts similarity index 94% rename from common/models/wordbreakers/src/main/ascii.ts rename to web/src/engine/predictive-text/wordbreakers/src/main/ascii.ts index 902a6e70583..1b3a91a1459 100644 --- a/common/models/wordbreakers/src/main/ascii.ts +++ b/web/src/engine/predictive-text/wordbreakers/src/main/ascii.ts @@ -1,4 +1,4 @@ -/// +import { Span } from '@keymanapp/common-types'; /** * Splits ASCII words. diff --git a/common/models/wordbreakers/src/main/default/index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts similarity index 99% rename from common/models/wordbreakers/src/main/default/index.ts rename to web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts index 7771f1c9a66..bebed01cc44 100644 --- a/common/models/wordbreakers/src/main/default/index.ts +++ b/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts @@ -1,3 +1,4 @@ +import { Span } from '@keymanapp/common-types'; import { WordBreakProperty, propertyMap } from "./data.inc.js"; import { searchForProperty } from "./searchForProperty.js"; @@ -576,4 +577,4 @@ function propertyVal(propName: string, options?: DefaultWordBreakerOptions) { const customIndex = options?.customProperties?.findIndex(matcher) ?? -1; return customIndex != -1 ? -customIndex - 1 : propertyMap.findIndex(matcher); -} \ No newline at end of file +} diff --git a/common/models/wordbreakers/src/main/default/searchForProperty.ts b/web/src/engine/predictive-text/wordbreakers/src/main/default/searchForProperty.ts similarity index 100% rename from common/models/wordbreakers/src/main/default/searchForProperty.ts rename to web/src/engine/predictive-text/wordbreakers/src/main/default/searchForProperty.ts diff --git a/common/models/wordbreakers/src/main/index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/index.ts similarity index 100% rename from common/models/wordbreakers/src/main/index.ts rename to web/src/engine/predictive-text/wordbreakers/src/main/index.ts diff --git a/common/models/wordbreakers/src/main/placeholder.ts b/web/src/engine/predictive-text/wordbreakers/src/main/placeholder.ts similarity index 92% rename from common/models/wordbreakers/src/main/placeholder.ts rename to web/src/engine/predictive-text/wordbreakers/src/main/placeholder.ts index 87832505ed0..1d6f55d9674 100644 --- a/common/models/wordbreakers/src/main/placeholder.ts +++ b/web/src/engine/predictive-text/wordbreakers/src/main/placeholder.ts @@ -1,3 +1,5 @@ +import { Span } from '@keymanapp/common-types'; + /** * A **VERY** dumb word breaker that simply splits at words. Do not use this * word breaker! diff --git a/common/models/wordbreakers/src/main/test-index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts similarity index 100% rename from common/models/wordbreakers/src/main/test-index.ts rename to web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts diff --git a/common/models/wordbreakers/test/test-ascii-word-breaker.js b/web/src/engine/predictive-text/wordbreakers/test/test-ascii-word-breaker.js similarity index 100% rename from common/models/wordbreakers/test/test-ascii-word-breaker.js rename to web/src/engine/predictive-text/wordbreakers/test/test-ascii-word-breaker.js diff --git a/common/models/wordbreakers/test/test-default-word-breaker.js b/web/src/engine/predictive-text/wordbreakers/test/test-default-word-breaker.js similarity index 100% rename from common/models/wordbreakers/test/test-default-word-breaker.js rename to web/src/engine/predictive-text/wordbreakers/test/test-default-word-breaker.js diff --git a/common/models/wordbreakers/test/test-placeholder-word-breaker.js b/web/src/engine/predictive-text/wordbreakers/test/test-placeholder-word-breaker.js similarity index 100% rename from common/models/wordbreakers/test/test-placeholder-word-breaker.js rename to web/src/engine/predictive-text/wordbreakers/test/test-placeholder-word-breaker.js diff --git a/common/models/wordbreakers/test/test-search-property.js b/web/src/engine/predictive-text/wordbreakers/test/test-search-property.js similarity index 100% rename from common/models/wordbreakers/test/test-search-property.js rename to web/src/engine/predictive-text/wordbreakers/test/test-search-property.js diff --git a/common/models/wordbreakers/tools/data-compiler/LICENSE b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/LICENSE similarity index 100% rename from common/models/wordbreakers/tools/data-compiler/LICENSE rename to web/src/engine/predictive-text/wordbreakers/tools/data-compiler/LICENSE diff --git a/common/models/wordbreakers/tools/data-compiler/index.ts b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/index.ts similarity index 96% rename from common/models/wordbreakers/tools/data-compiler/index.ts rename to web/src/engine/predictive-text/wordbreakers/tools/data-compiler/index.ts index 8f3c41bad37..7feb16e5b19 100644 --- a/common/models/wordbreakers/tools/data-compiler/index.ts +++ b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/index.ts @@ -33,8 +33,8 @@ const generatedFilename = path.join(projectDir, 'src', 'main', 'default', 'data. // The data files should be in this repository, with names matching the // Unicode version. -const wordBoundaryFilename = path.join(projectDir, `../../../resources/standards-data/unicode-character-database/WordBreakProperty.txt`); -const emojiDataFilename = path.join(projectDir, `../../../resources/standards-data/unicode-character-database/emoji-data.txt`); +const wordBoundaryFilename = path.join(projectDir, `../../../../../resources/standards-data/unicode-character-database/WordBreakProperty.txt`); +const emojiDataFilename = path.join(projectDir, `../../../../../resources/standards-data/unicode-character-database/emoji-data.txt`); ///////////////////////////// Word_Boundary file ///////////////////////////// @@ -144,7 +144,7 @@ function escape(codedChar: string) { // Generate the file! stream.write(`// Automatically generated file. DO NOT MODIFY. -// The generator script is defined at /common/models/wordbreakers/src/data-compiler/index.ts. +// The generator script is defined at /web/src/engine/predictive-text/wordbreakers/src/data-compiler/index.ts. /** * Valid values for a word break property. diff --git a/common/models/wordbreakers/tools/data-compiler/tsconfig.json b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json similarity index 76% rename from common/models/wordbreakers/tools/data-compiler/tsconfig.json rename to web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json index 577d1174dfa..2cef116f608 100644 --- a/common/models/wordbreakers/tools/data-compiler/tsconfig.json +++ b/web/src/engine/predictive-text/wordbreakers/tools/data-compiler/tsconfig.json @@ -1,6 +1,5 @@ { - "extends": "../../../tsconfig.kmw-worker-base.json", - + "extends": "../../../../../../tsconfig.base.json", "compilerOptions": { "baseUrl": "./", "outDir": "../../build/tools/data-compiler/obj", @@ -10,7 +9,7 @@ "moduleResolution": "node16" }, "references": [ - { "path": "../../../types" } + { "path": "../../../../../../../common/web/types" } ], "include": [ "./**/*" diff --git a/common/models/wordbreakers/tsconfig.json b/web/src/engine/predictive-text/wordbreakers/tsconfig.json similarity index 71% rename from common/models/wordbreakers/tsconfig.json rename to web/src/engine/predictive-text/wordbreakers/tsconfig.json index 46095418b27..b122825413f 100644 --- a/common/models/wordbreakers/tsconfig.json +++ b/web/src/engine/predictive-text/wordbreakers/tsconfig.json @@ -1,19 +1,15 @@ { - "extends": "../tsconfig.kmw-worker-base.json", - + "extends": "../../../../tsconfig.base.json", "compilerOptions": { "baseUrl": "./", "outDir": "./build/main/obj", "tsBuildInfoFile": "./build/main/obj/tsconfig.tsbuildinfo", "rootDir": "./src/main" }, - "references": [ - { "path": "../types" } - ], "include": [ "./src/main/**/*" ], "exclude": [ "node_modules" ] -} \ No newline at end of file +} diff --git a/web/src/engine/predictive-text/worker-main/build.sh b/web/src/engine/predictive-text/worker-main/build.sh index 33e5eaebeb6..f7b788b6ef8 100755 --- a/web/src/engine/predictive-text/worker-main/build.sh +++ b/web/src/engine/predictive-text/worker-main/build.sh @@ -13,15 +13,14 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" -BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs" +BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs" ################################ Main script ################################ -# "@../models/types" \ # is just a .d.ts, so there's nothing to actually BUILD. - builder_describe "Builds the lm-layer module" \ "@/common/web/keyman-version" \ - "@/common/web/es-bundling" \ + "@/common/web/types" \ + "@/web/src/tools/es-bundling" \ "@/web/src/engine/predictive-text/worker-thread" \ "clean" \ "configure" \ diff --git a/web/src/engine/predictive-text/worker-main/package.json b/web/src/engine/predictive-text/worker-main/package.json index 978bcd6dcfa..29c0f9c3291 100644 --- a/web/src/engine/predictive-text/worker-main/package.json +++ b/web/src/engine/predictive-text/worker-main/package.json @@ -42,7 +42,7 @@ }, "homepage": "https://github.com/keymanapp/keyman#readme", "devDependencies": { - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@keymanapp/resources-gosh": "*", "mocha": "^10.0.0", "mocha-teamcity-reporter": "^4.0.0", diff --git a/web/src/engine/predictive-text/worker-main/src/lmlayer.ts b/web/src/engine/predictive-text/worker-main/src/lmlayer.ts index d9dfb8e867c..9153c0ed64b 100644 --- a/web/src/engine/predictive-text/worker-main/src/lmlayer.ts +++ b/web/src/engine/predictive-text/worker-main/src/lmlayer.ts @@ -20,9 +20,10 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +import { Capabilities, Configuration, Context, Distribution, Reversion, Suggestion, Transform, USVString } from '@keymanapp/common-types'; import PromiseStore from "./promise-store.js"; +import { OutgoingMessage } from '@keymanapp/lm-message-types'; -/// /// /** diff --git a/web/src/engine/predictive-text/worker-main/src/promise-store.ts b/web/src/engine/predictive-text/worker-main/src/promise-store.ts index 890ba592392..9548dd1c971 100644 --- a/web/src/engine/predictive-text/worker-main/src/promise-store.ts +++ b/web/src/engine/predictive-text/worker-main/src/promise-store.ts @@ -22,6 +22,8 @@ /// +import { Token } from '@keymanapp/lm-message-types'; + type Resolve = (value?: T | PromiseLike) => void; type Reject = (reason?: any) => void; interface PromiseCallbacks { diff --git a/web/src/engine/predictive-text/worker-main/src/tsconfig.json b/web/src/engine/predictive-text/worker-main/src/tsconfig.json index edf6195b3ab..0ee72aedbad 100644 --- a/web/src/engine/predictive-text/worker-main/src/tsconfig.json +++ b/web/src/engine/predictive-text/worker-main/src/tsconfig.json @@ -8,8 +8,8 @@ "rootDir": "./" }, "references": [ - { "path": "../../../../../../common/web/utils" }, - { "path": "../../../../../../common/models/types"}, + { "path": "../../../common/web-utils" }, + { "path": "../../../../../../common/web/types"}, { "path": "../../types"} ], "include" : [ "./*.ts" ], diff --git a/web/src/engine/predictive-text/worker-main/tsconfig.all.json b/web/src/engine/predictive-text/worker-main/tsconfig.all.json index 722ce0114bd..6e7eb4cc803 100644 --- a/web/src/engine/predictive-text/worker-main/tsconfig.all.json +++ b/web/src/engine/predictive-text/worker-main/tsconfig.all.json @@ -13,8 +13,8 @@ }, "files": [], "references": [ - { "path": "../../../../../common/web/utils" }, - { "path": "../../../../../common/models/types"}, + { "path": "../../common/web-utils" }, + { "path": "../../../../../common/web/types"}, { "path": "../types"}, { "path": "src/node" }, { "path": "src/web" } diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh index dda8d578640..2ade97b5994 100755 --- a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh +++ b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh @@ -48,13 +48,13 @@ if builder_start_action test:libraries; then # So, for now, we add a text header to clarify what is running at each stage, in # addition to fair bit of `pushd` and `popd`. echo - echo "### Running $(builder_term common/models/wordbreakers) tests" - "$KEYMAN_ROOT/common/models/wordbreakers/build.sh" test $TEST_OPTS + echo "### Running $(builder_term web/src/engine/predictive-text/wordbreakers) tests" + "$KEYMAN_ROOT/web/src/engine/predictive-text/wordbreakers/build.sh" test $TEST_OPTS - pushd "$KEYMAN_ROOT/common/models/templates" + pushd "$KEYMAN_ROOT/web/src/engine/predictive-text/templates/" echo - echo "### Running $(builder_term common/models/templates) tests" - "$KEYMAN_ROOT/common/models/templates/build.sh" test $TEST_OPTS + echo "### Running $(builder_term web/src/engine/predictive-text/templates/) tests" + "$KEYMAN_ROOT/web/src/engine/predictive-text/templates/build.sh" test $TEST_OPTS popd pushd "$KEYMAN_ROOT/web/src/engine/predictive-text/worker-thread" diff --git a/web/src/engine/predictive-text/worker-thread/build.sh b/web/src/engine/predictive-text/worker-thread/build.sh index a77e863c739..05c7326cd05 100755 --- a/web/src/engine/predictive-text/worker-thread/build.sh +++ b/web/src/engine/predictive-text/worker-thread/build.sh @@ -17,7 +17,7 @@ WORKER_OUTPUT_FILENAME=build/lib/worker-main.js INTERMEDIATE=./build/intermediate LIB=./build/lib -bundle_cmd="node ${KEYMAN_ROOT}/common/web/es-bundling/build/common-bundle.mjs" +bundle_cmd="node ${KEYMAN_ROOT}/web/src/tools/es-bundling/build/common-bundle.mjs" SRCMAP_CLEANER="node $KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.js" @@ -25,11 +25,11 @@ SRCMAP_CLEANER="node $KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index. builder_describe \ "Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications." \ - "@/web/src/tools/building/sourcemap-root" \ "@/common/web/keyman-version" \ - "@/common/web/es-bundling" \ - "@/common/models/wordbreakers" \ - "@/common/models/templates" \ + "@/web/src/tools/building/sourcemap-root" \ + "@/web/src/tools/es-bundling" \ + "@../wordbreakers" \ + "@../templates" \ configure clean build test --ci builder_describe_outputs \ diff --git a/web/src/engine/predictive-text/worker-thread/package.json b/web/src/engine/predictive-text/worker-thread/package.json index 9ebc26a4eb3..6c9bf52da7b 100644 --- a/web/src/engine/predictive-text/worker-thread/package.json +++ b/web/src/engine/predictive-text/worker-thread/package.json @@ -26,7 +26,7 @@ "license": "MIT", "devDependencies": { "@keymanapp/common-test-resources": "*", - "@keymanapp/models-types": "*", + "@keymanapp/common-types": "*", "@keymanapp/resources-gosh": "*", "c8": "^7.12.0", "combine-source-map": "^0.8.0", diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts index 9dc8b0f6761..69472bf02ba 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tracker.ts @@ -5,6 +5,7 @@ import { SearchSpace } from './distance-modeler.js'; import TransformUtils from '../transformUtils.js'; import { determineModelTokenizer } from '../model-helpers.js'; import { tokenizeTransform, tokenizeTransformDistribution } from './transform-tokenization.js'; +import { Context, Distribution, LexicalModel, Suggestion, Transform, USVString } from '@keymanapp/common-types'; function textToCharTransforms(text: string, transformId?: number) { let perCharTransforms: Transform[] = []; diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts index e06e9e30592..c102af9eef1 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts @@ -3,6 +3,7 @@ import { QueueComparator as Comparator, PriorityQueue } from '@keymanapp/web-uti import { ClassicalDistanceCalculation, EditToken } from './classical-calculation.js'; import { ExecutionTimer, STANDARD_TIME_BETWEEN_DEFERS } from './execution-timer.js'; +import { Distribution, LexicalModel, LexiconTraversal, ProbabilityMass, Transform, USVString } from '@keymanapp/common-types'; type RealizedInput = ProbabilityMass[]; // NOT Distribution - they're masses from separate distributions. diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/transform-tokenization.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/transform-tokenization.ts index 5dc428c0c37..a5d3c1bf0ea 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/correction/transform-tokenization.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/transform-tokenization.ts @@ -1,3 +1,4 @@ +import { Context, Distribution, Transform } from '@keymanapp/common-types'; import { applyTransform, type Tokenization } from "@keymanapp/models-templates"; /** diff --git a/web/src/engine/predictive-text/worker-thread/src/main/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/index.ts index 3873dd19abc..3abc9ddcd09 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/index.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/index.ts @@ -40,6 +40,8 @@ import * as wordBreakers from '@keymanapp/models-wordbreakers'; import ModelCompositor from './model-compositor.js'; import { ImportScripts, IncomingMessage, LMLayerWorkerState, LoadMessage, ModelEval, ModelFile, ModelSourceSpec, PostMessage } from './worker-interfaces.js'; +import { Capabilities, LexicalModel } from '@keymanapp/common-types'; +import { OutgoingMessageKind } from '@keymanapp/lm-message-types'; /** * Encapsulates all the state required for the LMLayer's worker thread. diff --git a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts index c6b8367b782..2a8f67a5478 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts @@ -4,6 +4,7 @@ import * as correction from './correction/index.js' import TransformUtils from './transformUtils.js'; import { correctAndEnumerate, dedupeSuggestions, finalizeSuggestions, predictionAutoSelect, processSimilarity, toAnnotatedSuggestion, tupleDisplayOrderSort } from './predict-helpers.js'; import { detectCurrentCasing, determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js'; +import { CasingForm, Context, Distribution, LexicalModel, LexicalModelPunctuation, Reversion, Suggestion, Transform, USVString } from '@keymanapp/common-types'; export class ModelCompositor { private lexicalModel: LexicalModel; diff --git a/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts index 17ad212671c..0f0fa02de62 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/model-helpers.ts @@ -1,3 +1,4 @@ +import { CasingForm, Context, LexicalModel, LexicalModelPunctuation } from '@keymanapp/common-types'; import * as models from '@keymanapp/models-templates'; import * as wordBreakers from '@keymanapp/models-wordbreakers'; diff --git a/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts b/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts index 0b1fbf3cfc0..254b881883c 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/models/dummy-model.ts @@ -1,5 +1,7 @@ /// +import { Capabilities, CasingForm, Configuration, Context, Distribution, LexicalModel, LexicalModelPunctuation, Outcome, Suggestion, Transform, WordBreakingFunction } from '@keymanapp/common-types'; + /* * Copyright (c) 2018 National Research Council Canada (author: Eddie A. Santos) * Copyright (c) 2018 SIL International diff --git a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts index 44bfb29c0b3..bd7d19cd89e 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts @@ -5,6 +5,7 @@ import { determineModelTokenizer, determineModelWordbreaker, determinePunctuatio import { ContextTracker, TrackedContextState } from './correction/context-tracker.js'; import { ExecutionTimer } from './correction/execution-timer.js'; import ModelCompositor from './model-compositor.js'; +import { ProbabilityMass, Suggestion, LexicalModel, Distribution, Outcome, Keep, SuggestionTag, Reversion, Transform, Context } from '@keymanapp/common-types'; /* * The functions in this file exist to provide unit-testable stateless components for the diff --git a/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts b/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts index f9d8d8a63f1..5cbc6f2d0d3 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/transformUtils.ts @@ -1,3 +1,5 @@ +import { Transform } from '@keymanapp/common-types'; + export default class TransformUtils { static isWhitespace(transform: Transform): boolean { // Matches a string that is entirely one or more characters with Unicode general property Z* or the following: CR, LF, and Tab. diff --git a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts index bcde9b56fd1..c57c1c09468 100644 --- a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts +++ b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts @@ -28,7 +28,9 @@ /// +import { Capabilities, Context, Distribution, LexicalModel, Reversion, Suggestion, Transform } from '@keymanapp/common-types'; import type ModelCompositor from './model-compositor.js'; +import { Token } from '@keymanapp/models-templates'; /** * The signature of self.postMessage(), so that unit tests can mock it. diff --git a/web/src/engine/predictive-text/worker-thread/tsconfig.json b/web/src/engine/predictive-text/worker-thread/tsconfig.json index bfc8498730b..252ec84cebc 100644 --- a/web/src/engine/predictive-text/worker-thread/tsconfig.json +++ b/web/src/engine/predictive-text/worker-thread/tsconfig.json @@ -18,13 +18,13 @@ }, "references": [ // types - { "path": "../../../../../common/models/types" }, + { "path": "../../../../../common/web/types" }, { "path": "../types" }, // modules { "path": "../../../../../common/web/keyman-version" }, - { "path": "../../../../../common/web/utils" }, - { "path": "../../../../../common/models/templates" }, - { "path": "../../../../../common/models/wordbreakers" }, + { "path": "../../common/web-utils" }, + { "path": "../templates" }, + { "path": "../wordbreakers" }, ], "include": [ "src/main/**/*.ts" diff --git a/common/web/sentry-manager/.gitignore b/web/src/engine/sentry-manager/.gitignore similarity index 100% rename from common/web/sentry-manager/.gitignore rename to web/src/engine/sentry-manager/.gitignore diff --git a/common/web/sentry-manager/build.sh b/web/src/engine/sentry-manager/build.sh similarity index 62% rename from common/web/sentry-manager/build.sh rename to web/src/engine/sentry-manager/build.sh index b2541eb769b..e91b78ce7e9 100755 --- a/common/web/sentry-manager/build.sh +++ b/web/src/engine/sentry-manager/build.sh @@ -5,12 +5,11 @@ ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" -. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh" +. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh" ## END STANDARD BUILD SCRIPT INCLUDE -. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh" - -BUNDLE_CMD="node $KEYMAN_ROOT/common/web/es-bundling/build/common-bundle.mjs" +. "${KEYMAN_ROOT}/web/common.inc.sh" +. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh" builder_describe "Builds the Sentry-reporting module used with Keyman Engine for Web" \ "@/common/web/keyman-version" \ @@ -18,7 +17,7 @@ builder_describe "Builds the Sentry-reporting module used with Keyman Engine for builder_describe_outputs \ configure /node_modules \ - build /common/web/sentry-manager/build/lib/index.js + build /web/src/engine/sentry-manager/build/lib/index.js builder_parse "$@" @@ -39,9 +38,9 @@ fi if builder_start_action build; then tsc --build "$THIS_SCRIPT_PATH/src/tsconfig.json" - $BUNDLE_CMD "${KEYMAN_ROOT}/common/web/sentry-manager/build/obj/index.js" \ - --out "${KEYMAN_ROOT}/common/web/sentry-manager/build/lib/index.js" \ - --sourceRoot "@keymanapp/keyman/common/web/sentry-manager/build/lib/" + $BUNDLE_CMD "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/obj/index.js" \ + --out "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/index.js" \ + --sourceRoot "@keymanapp/keyman/web/src/engine/sentry-manager/build/lib/" builder_finish_action success build fi diff --git a/common/web/sentry-manager/package.json b/web/src/engine/sentry-manager/package.json similarity index 100% rename from common/web/sentry-manager/package.json rename to web/src/engine/sentry-manager/package.json diff --git a/common/web/sentry-manager/src/index.ts b/web/src/engine/sentry-manager/src/index.ts similarity index 100% rename from common/web/sentry-manager/src/index.ts rename to web/src/engine/sentry-manager/src/index.ts diff --git a/common/web/sentry-manager/src/tsconfig.json b/web/src/engine/sentry-manager/src/tsconfig.json similarity index 81% rename from common/web/sentry-manager/src/tsconfig.json rename to web/src/engine/sentry-manager/src/tsconfig.json index 9bcc311d102..c15e3394574 100644 --- a/common/web/sentry-manager/src/tsconfig.json +++ b/web/src/engine/sentry-manager/src/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.kmw-main-base.json", + "extends": "../../../../tsconfig.base.json", "compilerOptions": { "baseUrl": "./", "lib": ["es6", "dom"], diff --git a/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts b/web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts similarity index 100% rename from web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.spec.ts rename to web/src/test/auto/dom/cases/keyboard/domKeyboardLoader.tests.ts diff --git a/web/src/test/auto/dom/cases/osk/activation.spec.ts b/web/src/test/auto/dom/cases/osk/activation.spec.ts index 48f82bede3e..a78c5f0d4a5 100644 --- a/web/src/test/auto/dom/cases/osk/activation.spec.ts +++ b/web/src/test/auto/dom/cases/osk/activation.spec.ts @@ -1,5 +1,5 @@ import * as KeymanOSK from 'keyman/engine/osk'; -import Device from 'keyman/engine/device-detect'; +import { DeviceDetector } from 'keyman/engine/main'; import { loadKeyboardsFromStubs } from '../../kbdLoader.js'; import { timedPromise } from '@keymanapp/web-utils'; @@ -7,7 +7,7 @@ import { timedPromise } from '@keymanapp/web-utils'; import { assert } from 'chai'; import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs'; -const device = new Device(); +const device = new DeviceDetector(); device.detect(); const TestResources = { diff --git a/web/src/test/auto/dom/cases/osk/events.spec.ts b/web/src/test/auto/dom/cases/osk/events.spec.ts index efe5570df04..c0a5932c0b2 100644 --- a/web/src/test/auto/dom/cases/osk/events.spec.ts +++ b/web/src/test/auto/dom/cases/osk/events.spec.ts @@ -1,5 +1,5 @@ import * as KeymanOSK from 'keyman/engine/osk'; -import Device from 'keyman/engine/device-detect'; +import { DeviceDetector } from 'keyman/engine/main'; import { loadKeyboardsFromStubs } from '../../kbdLoader.js'; import { timedPromise } from '@keymanapp/web-utils'; @@ -9,7 +9,7 @@ import sinon from 'sinon'; import { assert } from 'chai'; import { DEFAULT_BROWSER_TIMEOUT } from '@keymanapp/common-test-resources/test-timeouts.mjs'; -const device = new Device(); +const device = new DeviceDetector(); device.detect(); const TestResources = { diff --git a/web/src/test/auto/dom/test_init_check.spec.ts b/web/src/test/auto/dom/test_init_check.spec.ts index ad694e9543b..46ad413673d 100644 --- a/web/src/test/auto/dom/test_init_check.spec.ts +++ b/web/src/test/auto/dom/test_init_check.spec.ts @@ -2,7 +2,7 @@ // We'll let things break after this reports, since this will likely signal a LOT of other failures. import { assert } from 'chai'; -import Device from 'keyman/engine/device-detect'; +import { DeviceDetector } from 'keyman/engine/main'; /* Note - we still have to prevent errors setting up test resources; * Karma will fail to report errors for affected browsers otherwise. @@ -17,7 +17,7 @@ describe('Test Initialization', function() { it("Detects device without JS errors", function() { try { - const device = new Device(); + const device = new DeviceDetector(); device.detect(); console.log("Detected platform: " + device.browser + " on " + device.OS + " with form factor " + device.formFactor); diff --git a/web/src/test/auto/dom/web-test-runner.config.mjs b/web/src/test/auto/dom/web-test-runner.config.mjs index d7df41baccb..5871f4e61e3 100644 --- a/web/src/test/auto/dom/web-test-runner.config.mjs +++ b/web/src/test/auto/dom/web-test-runner.config.mjs @@ -74,7 +74,7 @@ export default { { name: 'engine/keyboard', // Relative, from the containing package.json - files: ['build/test/dom/cases/keyboard/**/*.spec.mjs'] + files: ['build/test/dom/cases/keyboard/**/*.tests.mjs'] }, { name: 'engine/keyboard-storage', diff --git a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.js b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts similarity index 72% rename from web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.js rename to web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts index 0d084964425..c58a7d91910 100644 --- a/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.js +++ b/web/src/test/auto/headless/engine/js-processor/kbdInterface.tests.ts @@ -3,7 +3,7 @@ import { assert } from 'chai'; import { createRequire } from 'module'; const require = createRequire(import.meta.url); -import { MinimalKeymanGlobal } from 'keyman/engine/keyboard'; +import { DeviceSpec, MinimalKeymanGlobal } from 'keyman/engine/keyboard'; import { KeyboardInterface, Mock } from 'keyman/engine/js-processor'; import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader'; @@ -11,21 +11,22 @@ describe('Headless keyboard loading', function () { const laoPath = require.resolve('@keymanapp/common-test-resources/keyboards/lao_2008_basic.js'); const khmerPath = require.resolve('@keymanapp/common-test-resources/keyboards/khmer_angkor.js'); const nonKeyboardPath = require.resolve('@keymanapp/common-test-resources/index.mjs'); - const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js'); + // const ipaPath = require.resolve('@keymanapp/common-test-resources/keyboards/sil_ipa.js'); // Common test suite setup. - let device = { - formFactor: 'desktop', - OS: 'windows', - browser: 'native' + const device = { + formFactor: DeviceSpec.FormFactor.Desktop, + OS: DeviceSpec.OperatingSystem.Windows, + browser: DeviceSpec.Browser.Native, + touchable: false } describe('Full harness loading', () => { it('successfully loads', async function () { // -- START: Standard Recorder-based unit test loading boilerplate -- - let harness = new KeyboardInterface({}, MinimalKeymanGlobal); - let keyboardLoader = new NodeKeyboardLoader(harness); - let keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath); + const harness = new KeyboardInterface({}, MinimalKeymanGlobal); + const keyboardLoader = new NodeKeyboardLoader(harness); + const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath); harness.activeKeyboard = keyboard; // -- END: Standard Recorder-based unit test loading boilerplate -- @@ -35,9 +36,9 @@ describe('Headless keyboard loading', function () { it('can evaluate rules', async function () { // -- START: Standard Recorder-based unit test loading boilerplate -- - let harness = new KeyboardInterface({}, MinimalKeymanGlobal); - let keyboardLoader = new NodeKeyboardLoader(harness); - let keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath); + const harness = new KeyboardInterface({}, MinimalKeymanGlobal); + const keyboardLoader = new NodeKeyboardLoader(harness); + const keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath); harness.activeKeyboard = keyboard; // -- END: Standard Recorder-based unit test loading boilerplate -- @@ -46,8 +47,8 @@ describe('Headless keyboard loading', function () { }); it('does not change the active kehboard', async function () { - let harness = new KeyboardInterface({}, MinimalKeymanGlobal); - let keyboardLoader = new NodeKeyboardLoader(harness); + const harness = new KeyboardInterface({}, MinimalKeymanGlobal); + const keyboardLoader = new NodeKeyboardLoader(harness); const lao_keyboard = await keyboardLoader.loadKeyboardFromPath(laoPath); assert.isNotOk(harness.activeKeyboard); assert.isOk(lao_keyboard); @@ -66,8 +67,8 @@ describe('Headless keyboard loading', function () { it('throws distinct errors', async function () { const invalidPath = 'totally_invalid_path.js'; - let harness = new KeyboardInterface({}, MinimalKeymanGlobal); - let keyboardLoader = new NodeKeyboardLoader(harness); + const harness = new KeyboardInterface({}, MinimalKeymanGlobal); + const keyboardLoader = new NodeKeyboardLoader(harness); let missingError; try { await keyboardLoader.loadKeyboardFromPath(invalidPath); diff --git a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts index 80fd0a21c2f..96699df9767 100644 --- a/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts +++ b/web/src/test/auto/headless/engine/keyboard/keyboardLoaderBase.tests.ts @@ -67,6 +67,8 @@ describe('Headless keyboard loading', function() { assert.equal(keyboard.id, "Keyboard_sil_ipa"); }); + // TODO-WEB-CORE: figure out what the purpose of this test is + // TODO-WEB-CORE: move to kbdInterface.tests.ts it('cannot evaluate rules', async function() { // -- START: Standard Recorder-based unit test loading boilerplate -- const harness = new KeyboardHarness({}, MinimalKeymanGlobal); diff --git a/web/src/test/auto/integrated/cases/basics.spec.ts b/web/src/test/auto/integrated/cases/basics.spec.ts index 2ca272b7e84..6103701fd83 100644 --- a/web/src/test/auto/integrated/cases/basics.spec.ts +++ b/web/src/test/auto/integrated/cases/basics.spec.ts @@ -1,7 +1,7 @@ import { assert } from 'chai'; import { DEVICE_DETECT_FAILURE, setupKMW, teardownKMW } from "../test_utils.js"; -import { Device } from "keyman/engine/device-detect"; +import { DeviceDetector } from "keyman/engine/main"; import { KeymanEngine } from "keyman/app/browser"; const baseTimeout = 5000; @@ -49,7 +49,7 @@ describe('Basic KeymanWeb', function() { }); }); -const device = new Device(); +const device = new DeviceDetector(); device.detect(); if(!device.touchable) { describe('Basic Toggle UI', function() { diff --git a/web/src/test/auto/integrated/test_init_check.spec.ts b/web/src/test/auto/integrated/test_init_check.spec.ts index f51a280f560..813ac7ba45c 100644 --- a/web/src/test/auto/integrated/test_init_check.spec.ts +++ b/web/src/test/auto/integrated/test_init_check.spec.ts @@ -2,7 +2,7 @@ // We'll let things break after this reports, since this will likely signal a LOT of other failures. import { assert } from 'chai'; -import Device from 'keyman/engine/device-detect'; +import { DeviceDetector } from 'keyman/engine/main'; /* Note - we still have to prevent errors setting up test resources; * Karma will fail to report errors for affected browsers otherwise. @@ -16,9 +16,9 @@ describe('Test Initialization', function() { this.timeout(15000); it("Detects device without JS errors", function() { - let device: Device; + let device: DeviceDetector; try { - device = new Device(); + device = new DeviceDetector(); device.detect(); console.log("Detected platform: " + device.browser + " on " + device.OS + " with form factor " + device.formFactor); diff --git a/web/src/test/auto/integrated/test_utils.ts b/web/src/test/auto/integrated/test_utils.ts index 6e04885b1a5..9cacb46cb04 100644 --- a/web/src/test/auto/integrated/test_utils.ts +++ b/web/src/test/auto/integrated/test_utils.ts @@ -1,6 +1,6 @@ -// // KeymanWeb test suite - processing of the Karma configuration's client.args parameter. +// KeymanWeb test suite - processing of the Karma configuration's client.args parameter. -import Device from 'keyman/engine/device-detect'; +import { DeviceDetector } from 'keyman/engine/main'; import * as KMWRecorder from '#recorder'; import { type BrowserInitOptionSpec, type KeymanEngine } from 'keyman/app/browser'; import { ErrorStub, type KeyboardAPISpec, type KeyboardStub } from 'keyman/engine/keyboard-storage'; @@ -17,7 +17,7 @@ const domain = `${loc.protocol}/${loc.host}` // If we've set things up to support Device dection without loading KMW... try { - const device = new Device(); + const device = new DeviceDetector(); device.detect(); } catch (err) { // Sets a warning flag that unit-test files can use to disable themselves. @@ -233,7 +233,7 @@ export async function runKeyboardTestFromJSON(jsonPath: any, params: any, assert const testJSON = await jsonResponse.json(); const testSpec = new KMWRecorder.KeyboardTest(testJSON); - const device = new Device(); + const device = new DeviceDetector(); device.detect(); // @ts-ignore // Types are a bit messy here. diff --git a/web/src/test/manual/README.md b/web/src/test/manual/README.md new file mode 100644 index 00000000000..b875c617102 --- /dev/null +++ b/web/src/test/manual/README.md @@ -0,0 +1,10 @@ +# Manual tests + +To run the the manual tests, start the test web server with: + +```bash +cd "$KEYMAN_ROOT" +web/build.sh start +``` + +Then open in your browser. diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh index 13931c5443c..97894a2c541 100755 --- a/web/src/test/manual/build.sh +++ b/web/src/test/manual/build.sh @@ -11,7 +11,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" # ################################ Main script ################################ builder_describe "Builds the Keyman Engine for Web's sample page setups." \ - "@/common/web/sentry-manager build" \ + "@/web/src/engine/sentry-manager build" \ "@/web/src/app/browser build" \ "@/web/src/app/ui build" \ "@/web/src/tools build" \ @@ -33,8 +33,8 @@ builder_describe_outputs \ #### Resource paths #### -SENTRY_MANAGER_SRC="$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" -SENTRY_MANAGER_MAP="$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js.map" +SENTRY_MANAGER_SRC="$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" +SENTRY_MANAGER_MAP="$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js.map" SENTRY_SRC="$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js" SENTRY_MAP="$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js.map" diff --git a/web/src/test/manual/embed/android-harness/build.sh b/web/src/test/manual/embed/android-harness/build.sh index 1f9c8066dde..015660cb0b7 100755 --- a/web/src/test/manual/embed/android-harness/build.sh +++ b/web/src/test/manual/embed/android-harness/build.sh @@ -9,7 +9,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" builder_describe "Builds a debug-host page simulating Keyman Android's WebView setup for KMW use" \ "@/common/web/keyman-version" \ "@/web/src/app/webview" \ - "@/common/web/sentry-manager" \ + "@/web/src/engine/sentry-manager" \ clean configure build builder_describe_outputs \ @@ -43,7 +43,7 @@ if builder_start_action build; then cp "$KEYMAN_ROOT/web/build/app/resources/osk/keymanweb-osk.ttf" "host/keymanweb-osk.ttf" # We shouldn't rely on a prior Android build for these files! We can retrieve them separately. - cp "$KEYMAN_ROOT/common/web/sentry-manager/build/lib/index.js" "host/keyman-sentry.js" + cp "$KEYMAN_ROOT/web/src/engine/sentry-manager/build/lib/index.js" "host/keyman-sentry.js" cp "$KEYMAN_ROOT/node_modules/es6-shim/es6-shim.min.js" "host/es6-shim.min.js" cp "$KEYMAN_ROOT/node_modules/@sentry/browser/build/bundle.min.js" "host/sentry.min.js" diff --git a/web/src/test/manual/web/index.html b/web/src/test/manual/web/index.html index 8ee99a5ac32..6d608b08d33 100644 --- a/web/src/test/manual/web/index.html +++ b/web/src/test/manual/web/index.html @@ -29,7 +29,7 @@

Tests keyboard documentation re

Stand-alone gesture recognition

Miscellaneous tests for smaller features

-

Chirality testing/bootstrapping

+

Chirality testing/bootstrapping

Tests option/variable store functionality

Platform testing

Prediction UI testing

@@ -40,7 +40,7 @@

Integration with CKEditor

Tests toggling & use of desktop OSK config & help buttons

Page integration (attachment) tests

-

Tests the Attachment/Enablement API functionality

+

Tests the Attachment/Enablement API functionality

Test desktop MutationObserver functionality

Light test for touch-based MutationObserver functionality

Test/stress-test touch-based MutationObserver functionality

diff --git a/web/src/test/manual/web/keyboard-errors/errorhdr.js b/web/src/test/manual/web/keyboard-errors/errorhdr.js index b784f6a476c..9a0ad75939d 100644 --- a/web/src/test/manual/web/keyboard-errors/errorhdr.js +++ b/web/src/test/manual/web/keyboard-errors/errorhdr.js @@ -1,17 +1,15 @@ -// JavaScript Document samplehdr.js: Keyboard management for KeymanWeb demonstration pages - -/* +/* This script is designed to test KeymanWeb error message handling. */ - function loadKeyboards() - { + function loadKeyboards() + { var kmw=keyman; - + // We start by adding a keyboard correctly. It's best to include a 'control' in our experiment. kmw.addKeyboards({id:'us',name:'English',languages:{id:'en',name:'English'}, filename:'../us-1.0.js'}); - + // Insert a keyboard that cannot be found. kmw.addKeyboards({id:'lao_2008_basic',name:'wrong-filename', languages:{ @@ -19,9 +17,9 @@ font:{family:'LaoWeb',source:['../font/saysettha_web.ttf','../font/saysettha_web.woff','../font/saysettha_web.eot']} }, filename:'./missing_file.js' // Intentional error - the file doesn't exist, so the + - Add/remove language... + Přidat/odebrat jazyk... @@ -71,15 +71,15 @@ - Uninstall + Odinstalovat - Enable + Povolit - Disable + Zakázat @@ -191,7 +191,7 @@ - Add/remove language + Přidat/odebrat jazyk @@ -243,7 +243,7 @@ - Keyboard options... + Možnosti klávesnice... @@ -361,7 +361,7 @@ - (no hotkey) + (žádná klávesová zkratka) @@ -610,13 +610,16 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky - Klíč Počáteční klíč + + Spustit %1$s + + Ukončit @@ -658,7 +661,6 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky - Klíč @@ -782,7 +784,6 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky - Klíč @@ -905,6 +906,10 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky Vyberte klávesnici klávesnice pro nalezení souvisejících písma. + + + + Pro klávesnici %1$s nebyla nalezena žádná písma. diff --git a/windows/src/desktop/kmshell/locale/it-IT/strings.xml b/windows/src/desktop/kmshell/locale/it-IT/strings.xml index 40088f6e8d2..13e1cee8164 100644 --- a/windows/src/desktop/kmshell/locale/it-IT/strings.xml +++ b/windows/src/desktop/kmshell/locale/it-IT/strings.xml @@ -46,6 +46,10 @@ Annulla + + Aggiungi/rimuovi lingua... + + Fare clic su questa icona per selezionare una tastiera @@ -64,6 +68,18 @@ Aiuto + + + + Disinstalla + + + + Abilita + + + + Disabilita @@ -174,6 +190,10 @@ Aggiungi lingua + + Aggiungi/rimuovi lingua + + Tastiera A Schermo: @@ -223,7 +243,7 @@ - Opzioni tastiera + Opzioni tastiera… @@ -275,6 +295,10 @@ Simula AltGr con Ctrl+Alt + + Allow right modifier for hotkeys + + Tratta i morti hardware come semplici tasti @@ -341,7 +365,7 @@ - (nessuno) + (Nessun tasto) @@ -400,6 +424,14 @@ Copyright © SIL International. Tutti I Diritti Riservati. + + Created by %1$s + + + + Copyright © %1$s. All Rights Reserved. + + Versione @@ -590,13 +622,16 @@ che usi in Windows. Le tastiere Keyman si adatteranno automaticamente al layout - Keyman Avvia Keyman + + Start %1$s + + Esci @@ -638,7 +673,6 @@ che usi in Windows. Le tastiere Keyman si adatteranno automaticamente al layout - Keyman @@ -762,7 +796,6 @@ che usi in Windows. Le tastiere Keyman si adatteranno automaticamente al layout - Keyman @@ -885,6 +918,10 @@ che usi in Windows. Le tastiere Keyman si adatteranno automaticamente al layout Seleziona una tastiera Keyman per trovare i caratteri correlati. + + + + Nessun carattere trovato come suggerimento per la tastiera %1$s. diff --git a/windows/src/desktop/kmshell/xml/config.css b/windows/src/desktop/kmshell/xml/config.css index 88c8d22b39c..851964112bf 100644 --- a/windows/src/desktop/kmshell/xml/config.css +++ b/windows/src/desktop/kmshell/xml/config.css @@ -840,10 +840,10 @@ th color: #444; position: absolute; bottom: 32px; - left: 80px; - height: 50px; - padding-top: 25px; - padding-left: 56px; + left: 73px; + height: 64px; + padding-top: 32px; + padding-left: 110px; box-sizing: border-box; } diff --git a/windows/src/desktop/kmshell/xml/keyman_support.xsl b/windows/src/desktop/kmshell/xml/keyman_support.xsl index d472f88155d..4bf93f89bd5 100644 --- a/windows/src/desktop/kmshell/xml/keyman_support.xsl +++ b/windows/src/desktop/kmshell/xml/keyman_support.xsl @@ -29,11 +29,19 @@
- + + + + +
- + + + + +
diff --git a/windows/src/desktop/kmshell/xml/sil-logo-blue.png b/windows/src/desktop/kmshell/xml/sil-logo-blue.png index e0d7ab6b373..b65c2a4e086 100644 Binary files a/windows/src/desktop/kmshell/xml/sil-logo-blue.png and b/windows/src/desktop/kmshell/xml/sil-logo-blue.png differ diff --git a/windows/src/desktop/kmshell/xml/splash.css b/windows/src/desktop/kmshell/xml/splash.css index 413280ce057..de0a33b188f 100644 --- a/windows/src/desktop/kmshell/xml/splash.css +++ b/windows/src/desktop/kmshell/xml/splash.css @@ -33,7 +33,7 @@ div { } #silLogo { - position: absolute; right: 20px; top: 24px; background: url("sil-logo-blue.png"); width: 48px; height: 50px; + position: absolute; right: 20px; top: 15px; background: url("sil-logo-blue.png"); width: 107px; height: 64px; } #family { diff --git a/windows/src/desktop/kmshell/xml/strings.xml b/windows/src/desktop/kmshell/xml/strings.xml index 774a4d5e425..c8910b55b9d 100644 --- a/windows/src/desktop/kmshell/xml/strings.xml +++ b/windows/src/desktop/kmshell/xml/strings.xml @@ -377,6 +377,11 @@ Simulate AltGr with Ctrl+Alt + + + + Allow right modifier for hotkeys + @@ -536,6 +541,16 @@ Copyright © SIL International. All Rights Reserved. + + + + Created by %1$s + + + + + Copyright © %1$s. All Rights Reserved. + diff --git a/windows/src/desktop/setup/UfrmRunDesktop.dfm b/windows/src/desktop/setup/UfrmRunDesktop.dfm index c9872c3b511..c298bf1243f 100644 --- a/windows/src/desktop/setup/UfrmRunDesktop.dfm +++ b/windows/src/desktop/setup/UfrmRunDesktop.dfm @@ -30,412 +30,575 @@ object frmRunDesktop: TfrmRunDesktop AutoSize = True Picture.Data = { 0954506E67496D61676589504E470D0A1A0A0000000D49484452000002BB0000 - 0067080600000000008AFF000000017352474200AECE1CE90000000467414D41 - 0000B18F0BFC6105000000097048597300000D8A00000D8A01FD2DA348000032 - 5A4944415478DAED9D097C54D5D9FF9F3B6B32931D02041209229B828A056BF1 - 558322B5B56EADEBEB025671EFDF0DB10256D00275A9A27D5BADD58A5A972E2A - 2E6D5544032AB24A70615F12CC0209D993C93699F99F27F74EBC33B9F7CEB977 - EECC2433CFD7CFF94466EE3DDBDCE577CE79CEF308DEBBC00F0441104452B2FA - CD29F1AE0291C4AC7CFAAFF1AE029104082476098220921712BB443C21B14BC4 - 0212BB044110490C895D229E90D8256201895D8220882486C42E114F48EC12B1 - 80C42E411044124362978827247689584062972008228921B14BC41312BB442C - 10FC7ED2BA0441100441104462426297200882200882485848EC120441100441 - 10090B895D822008822008226121B14B100441100441242C2476098220088220 - 888485C42E41100441100491B090D825088220088220121612BB044110044110 - 44C2426297200882200882485848EC12044110044110090B895D822008822008 - 226121B14B100441100441242C2476098220088220888485C42E411004411004 - 91B090D825088220088220121612BB04411004411044C2426297200882200882 - 485848EC12044110044110090B895D822008822008226121B14B100441100431 - 8011AE7936A1C49CFFA51B0433F323B14B1004411004318021B1AB0D895D8220 - 08822088010C895D6D48EC1204411004410C6048EC6A43629720088220086200 - 4362571B12BB044110044110031812BBDA90D825088220088218C090D8D586C4 - 2E4110044110C40086C4AE36247609822008822006302476B521B14B10044110 - 04318021B1AB4DD289DDB9AB77CE028B7F76CF3FFCFE524180958F4E3FF6ED78 - D78B2008225A088290CDFE4C65691A4B53583A86A571B24376B154C6D25E96BE - 64690B7EC6DE0F6DF1AE3B4110E121B1AB4D5289DDB91F6F7F813579B6C2570D - 2C15835F58D96D6D7FFB89A2131BE25D573DB01719BEB4FECED209610EDDC6D2 - 65EC37DF65429967B03F2FB23492F3141C50DCCACAAE88675F1144B2C0EE5127 - FB339DA55B59FA99812C9A595ACDD2B32C1593F02588FE0B895D6D9246EC6A08 - DDBE084CF8FA80095F8109DFF1A5F1AE7BD8EAC658EC92D02588FE0BBB3FF125 - 3199A5C5604CE42A81B3BE7F606905BB8F6BE3DD4682208221B1AB4D52885D5D - 42B72FA5AC87565A2DFE171F293AB624DE6D5122966297953591FD798EA51F72 - 9EF2214BB7B132F7C4BB9F0822D19166736F6069094BE95128029F1D0FB2F406 - BBA73BE2DD5E9DFD82038014D9C75E96B6B17634C7BB7E0411292476B54968B1 - 7B67714996D5EF7C0BFC506452960DEC2758D9DFEC7C632576593913D81F3670 - E016BA1B58BA9695B723DE7D4410890EBB3FDDECCF7C29A981C20E07EDEB590A - CCD05A599AC452214BA77016F7164B73D9BDBD3FDEEDE6EC9B41ECCF2B2CFD58 - F6B169665D04116F48EC6A93B062775EF1F6137DDDC20B20C0896AC7D8AC42D3 - A014CB6E6F77B7B3C6E39B64B158F414D1E00761F9EFCF1CBF38DE6D8D85D865 - 658C607FFEC8D2059CA790D0258818C1EE4F1BFB73374BBF5339E43596FEC4D2 - 46764F766AE4930AA2F0BD9CA59F83B6A9123E47EE60F9BD1FEFF673F40F895D - 22A121B1AB4D428ADDB9AB77DCCE44EEA2E16ECBFEA64E5F8ADBEA1B7AB8DD82 - 0F3B18ECB26FC9B0FBB35D0EFBA0B45467A6FCBC5D15D50DF5DD8E2C3D65592C - FEC9F1366F88B6D865F90F657FFE0CFA842EDAE86E8967BF1044B2C0EED15341 - 1473A1E214EFF97B585ACDEE479FCE3C71A6F8621045F42485437076F746966F - 4DBCDBCFD11612BB44424362579B8412BBF77CB2FD02BF4F5884B3B9D9A9F612 - ABB76D58B7603B227477E5D575DB7BC4EEA4A1AE52B7D3511838A7AAAEB1C3E9 - B07565A4A6B86D56AB5072A0A2D623A40EE29DE5EDB608A3E2BD892D9A6297E5 - 9D03E26CD11CCE5330EF1B58196BE3D92704912CB07B3403C4CD63D7847C65CA - EA8A247AD10E78214B39D2C798E7E52CEFAFE2DD7ECE3690D825121A12BBDA0C - 78B18BE60ADD3E6116EB950B41B439EB25DD61DB75DCB0B471D50DCDB0F38807 - 1C0E67606637674866DAA8F223F5D0D025EC28C8700ECE74A7E6E2395DDE6EF8 - F6BB43B5ED56F7A0403E68EE906EB7EC6FF0740CF75B6C43BEEF3D78F1B1E913 - 66C7BB0FA22576A597DC232CDDC25915DCB13D8BE5BF26DE7D4210C902BB4FCF - 02719655BE21CDD47B51E6E161194B3F62E926965EF30F901708895D22D121B1 - ABCD8013BBB8E9CCE2733E20E0A6330D7B5C64689A75B3C7D391E5B4DB5B335D - F6D4EE6E5F4A63AB2763507A5A4D5D53D3D195AD3E6B4E7ADA9E3183538F4A75 - D871B72EECADAC69CF4A733794D6B678BB7CFE144F47A77FFAF811199BF7957B - DC2E57CD91968E7C67AADBC50E6DECB60827CA67758B474DCEEAF2DA67E1FFDB - 6D5D2F161DD81A137FBDD110BB9C9B5DE4E0CBF5972C7D32505E800431D09144 - E802961E0AF9EA2996E699ED31415AE9B988A5570792DF5D12BB44A24362579B - 012776EFF9686791DFE2FF44EDFB3487757757479BA34370148E1DEC5A93E372 - 9C117A4CA3A7ADA3BCBEA522D3ED3AE2F37A3306A7A78EB6DBAC56BBD51A64BB - D0D8DAD6D5D4D6E139DCD279B80B2CC3058B2DADB7E398EE7EF4CC09CBE5C77F - 943F15EB5524FDB3C466F74E8F85E0355BEC726C76090585EE5D2CBD45429720 - 6207BB57713617378E5E1DF2D54C762BAE8A77FDFA0B2476894447AFD8C561F2 - 4985B970C6F83C38664806DE235076A419B61DAC852F4B8FC0E1A6BE6359AB45 - 00FC2F800FFCE0F305176B67324A0891A95D5E3C521F492F7691B91FEF409139 - 9BA5A00D662874270C71175A2D164793A7DDE372DA7B34AC1965767577FBBE39 - 585D357C50567963ABA763FE69138344F4EAFC29CBFD20DC1E725AC98CF24D93 - A3DD1F668A5D49E8E212E552E0F3D3D90C262E694AE58F66E97FA4846D92F7E1 - 5610ED82D749E96BADDDE5898CD457E80E0E4D787083128683C599B73A107F6B - 742FF51F08B3033F244F7CC0E4B33413C4FE1F0FDFBBA3C2410DFA4BDE04A2FF - E40D036976CF0CA4150FEC6BDCAC795248DF7C0B629FA37782ADAC6FBC31A80F - 9A5FBDCAD20CD9C75FB374292B7F67BCFBABBF4062974874F488DD1F8D190A4F - 5D350D4E1A99DB4798223EF62ABFFF8DCDB0ECDDADBD9FA5D8ADF0F5D24BA030 - F77B59F0EABABD30EBD9E0B9C7B50BCE87696386067D36F4B697A1B6A55D577B - 48EC4AA03983CDE7B88309CC3B4012BDE307A79664B99CBDA60D0D2D1EA86E6A - 3D929F9399ED4A7158CD28B7AEC5537AB0AEA9E8B7674E2E0B7CF651C1D42236 - 6C519C6D16C0BFE2ACF2CDD746B32FCC12BB92D0B982A56720C64257DA647325 - 4B3783F2CE6F35F077789EA51759150EAAE43D0A44D74B3CFE816F62F9FCD960 - 1BD06DD3132CDDC87138CE9CA3107D1DC2FF6E1F60DF042257B1727005E24C10 - 07245339CA42F183B6966FAA2D6B4B79E2000E67E879A36E61DF3FC9D2B32CDF - 56837DE6607FD0AD1DDEB728DCF1B747C18ED783DCE72B3E7571D77F254B9FB1 - 849E3EB6EB1DE8B0F2F01AFB1BC7A1BF61793F243B4F699356447D6E062AF73E - 89B81048EC12890EAFD8BDE0A44278FD96B3C069D7964437BEF029FCA5F8FBBD - AD2876BF5D76298C9289DD57D6ED81ABFF1C2C7D3E5B78411FB19B7BEB4B2476 - 2325207A339CB673321C82B3BDCB6BF7777B0795D7B7B81CAE8C8C805785B139 - 293B5ADBDB87170CCECA345A161BED7898783DF59231237A5D8D952E5E9EB56D - D5E77BDCA5A583D5CE8BB6E03543EC4A42F732109744795EE62874EF0451641A - 9EC192221BFD82A5DFB0342E826EC0D9CC47B1FEA1119158197857A370B98F23 - 9F9741749BA63BAA928EDFA10AC4D9D846CEE37BC5AE6433896DE1DD3428E79F - 2CDD191AB699E5390CC4885BBF34902782B3BCB7F3CE24B2F2B241141DE8C715 - 3757F15C6F4AE06F8E8398BFB254C2E35ACB88D865E7E00C2EDAC09E6AA08E78 - 3DA1EDEC21836D0CD79E012B76A5670EBE158B583A0D8267CA119C25C76B0A07 - 371FB1F49D5EF769B2B248EC2A20DD8BD358FA2988034D1C74A29A09041FC141 - 1B3E7FD6B37EAA8E777D097578C4EEB0CC54D8F1F0659099EA089BDF49BF7903 - 4ACABE8F0C4E62378A7816E4BD037E388F35FB73BF5F78CB39F607DB6CD7BEF7 - 91DAF18F7CF6D573992ED7150D9EF63AAF5F68AEEBF01504EC6CD11599A5CB93 - 376AE8A04136ABC5A6B72EAC979AC0EF3B432E74918F27CE5CED1F9493EFDDB7 - 6FACD638299A82D724B18BB37A2F82B613F900F8204421F04484421745167A7B - B8DA681E0ABCC7D25DA1E1895576AC2B81E75D6CC4A5920E21D523A8591A0E3A - C42E88A14E71E6F89208FA0723FFA16FD4C3529D7167FDD31C750887A69B2B69 - E61867D67125003738991DCAF625961E60E5976A1DA447ECB2F45B1067BB71A5 - 23928158509F9B096B0F5E4328E28A42BE3AA3BFBAFF33B88A807C0AE24AC27B - 5AB3E53A575878095D5DC181CF6721C7E08AD09D6699F6A89411B4E2C0D1E6FF - 61C77FAE707C2188D738FA51E65DC543F31C1CF4AD333AE820A2078FD8FDDDA5 - 27C3BC73FBEEEB6FEDE8823D879AC0EBF3C1886C3764B91C9075D30AE8EAFEFE - 6726B11B253CF3F37049BA00FFDF923964A7FFE893C1969D3BBEBDA6A6BAABA5 - 7169CE9C7F3CA976EE931B77FCCEE570DC989DE6CADA515E7DA8C96F73DB05A1 - 657CAE3BA5B9ADA36568567A819EBAB01EDAD6ED152EBC7CFCB052F9E7ABF3A7 - BCE00761366F3E4CF03EC904EF1D66F755A462979D7F3AFBF32CF0BFD07FCDD2 - EF2314BA58169A1F18992D0B479FA016D20C06967711C7F9D7B3739FD7D91E9C - A146E1FEFF78F3D7F1BBE18B16CD1E70F69537B08716FFC7D23C964E06FE010E - 0FAAA24E3203C072679B5496123D11BDB0BFD4CC6A748ADDB526F60F462F9B67 - D4DC430DD61E5CA97A0E44D12207AF9727FADB8651565FB401C715183D223714 - 1CD0DECF9AA618CC87C46E104162573A0EEF91B9607C45856B6049C496706217 - 378E6D79F0E730313FF8675FB7E7305CF4E4074C8C76F41E37B970106CD85B1D - B4A98CC46E1468BB2FEF36BFD0E3241DACC7CF28B60C2E280A3DA6ABB9A9ADA3 - F6C8CBD9D7BFAEFA407BF4F3AFAE670395BB2A5A7D13C6E5BA0FEEA8ACCF9D7A - F4D0C39EF6CE82DCCC34EBB60315AD8DDD36F7292307B73478DABA8664A66587 - 64D1C8BA7CF9C5C70C5F149AF7FAABE6BDEEA9AF3BC55352323245E0FF4D9838 - BEF6ECF28D2BCCECAF48C42E3B17ED245F003E7B56045D913D1E891DA281328D - D067A691958B66178F739CBB82A5DBF4081396370A22DC28342DCCA1BDBF81CE - DFED3B884C20C8C1591A147CB8746996D00D802FD2A79444166BEF75200AB368 - A2E95F5687D8C5592C7C1E98758D629F63B095D7CD6CAC86890E5E3357F49770 - DDD26C2E9A2BA1D035E39A4313965FB1F47AE82C2389DD207AC5AE14F23DD295 - A100789F6164BE376896B77F104EECA6A5D861D72397415EA62BE8F3E9CBDE85 - 353BABC2E64F62D76C168F70793A7C3D22C37ECACFD7812B53533C74B7B77B3B - 6AABD7648E1C7331143DA0E8E6EBCEE29D85369F6F36CEC21E3B38A5B3ACBA6E - 48E1D0412D95758DCE4EB0D53577C1D8F1B9A9DFE4B85327E2F13EBFBFC222C0 - 73365BE7F20B0B0BFBE4B9F186074ADA1B1A0A3A76ED6EB2646576E68C19E76D - F7768EAE5DB5CAC9237CCD16BC46C5AE01D1891BA29646323B6520F47024E00C - C4AF587D9BA4B28F03D16E754298F350205CC2CEFB5647BBCE077166331CBDFE - 4F75FC6E03091C64A0C83AA0D047BCFD6F461D144D2A7488DD68F00E4B73CCB6 - 7D646D42DBE73714BEC2EBF1D6501BED58C3E1E10585EBBF411C60544A9FA188 - 3F16C48D9867A99C870308B45D7F552EB848EC06D12376D9F763405C5999A950 - 14F63F7AB6D9C852A7D4F7F84CC2F782D6C004FB1F273F9E8985E711421B2EB1 - FB3013BB59C16277C6C3FF868FB7877F4490D83519CFFCE11FB2669E0D29EEC3 - F66997E2D2671ACF797E5FB7BFBDA6669BB7BDFDBE9CEB5E7D5FEDB85BDEDD74 - 43BA3BF5948943D37F9AEA74F4FC221B761F6CB0B932BF1D3728A52CDDE5FCE7 - 2F46E7AD543A1737A3D555377F9199331897E2A072EFDE4ECFA76B1DEEDCDC5D - D63163BD5D020C3EF2D9A7433384F0A186CD14BC46C4AE34CAC7CD68BCA233E2 - 6558E9A58726100F19CDC300BD338D464C0D38DB85D6FEE893F84E8EC32F60F9 - BE239D97886217B98AB5F195D00F6364CA10405178C459ECA238B888D569B599 - 99B236E58138B09BA1F035BA89C37BE08B78983484F1F082836E5CC17B393020 - 55C9033797E1E6497C76842EBDF7993197EE479C453E4A761C8AC14B2178A085 - D359683F5FC7D114DC4CFA37564E8B54C68011BB2CED85BE130CD86FB88701CD - D7362889556936BE10442F247340D9ECC1948DCA44E48413BBE823F7D385E7C3 - 29A38385E86A26742F58FE01783AB47F3E12BB26D271DF8899DD820F47D0609D - 34BDD8925B5864249FF62335FBBDEDADCF64CF7EF551B86F64362C2BAB8FB46E - 9B6E5C7C434666E6C336A7334BFEF986E79F832192C787A13FFEF1BA0307CBA6 - D976EC0007C46E8657AFD8650967ABF5CCAE9A626F28D906E34B298FF314DC69 - BF42AA37DE89289671B6011FBCBC4BFAA1B3D96AB360A160B95CA60C1A9B8442 - C1CD95D7B03CABA4F31255ECE24BF7D74A6EC16264CA80280ACB388B5D04DD91 - A1BD69B79999B2765D0EA27051DB6C8462184D08B6C772D95963E32B0AADB9AC - 2EFB75E4A5E615437373A474AEA9DE180690D83D87255C75927B6F41EF2968F6 - B2957700246D68C399F92B14BEC6E7190E703F36A3DD84317836A8CD3E6D2CFC - F5FAA23E9F6F3A5003B39F2D861D95EA5289C4AE592C166C9E8E615D817FDA4F - BBA204EC292746926567637DB5B7A9FEADCC6B5FBFC9681E6BAFBA77566676D6 - 436959597D36B5757576C2972FBFD42B76475C76D98E92E24F46E71EAE0EEFD7 - 438209DEC94CF096F01EAF844EB18B4211BD42DCCC99FD5F40142E3CB31F5A75 - 44BFA9388B730DC7E1F8F2C10D36FF557A314B330E3F0171669AC7FEAF77B34E - 98593039DCA60C2CCFB3417C8184E37E9696045E3006C52E8A38140F3868D80D - 18C4469C7D3997250C6A6274D309123AB81802E2CB125FA07ABC11E092F4D5AC - 997D9E9C614C19D0D55493547EC0E70D3E5931A8089EA7D7D6B38FE8362876F1 - DA7F526A57A9F4592118EBF37F81B86AD0A8B30E9A48B3E6B86A11CE251D7A34 - C0DF197D3C1B76E5C55927F4B6F29CD44F727036F56E56768D813CD596E37B36 - 5DAA09CD2416BB78CDCAFB1F9FC10B0CBA56C49531F4A0B154E16BB40BBE8A36 - ADC50F1EB18B9BCF3EB9EFBC3E6214C199DDE51F7E0D0FADFC123ABC7DC7E224 - 764DC2333F0F6FC2DB02FF8E64663708D6BEF623D5ADA9B9C316DB042672CE5A - C2E5FE67E39C0716399CCE39E9D9D9C3B58E3BB0ADA4213523C3DF527AA02E6F - F20F5277BDF9AFE1D91C660C321A98E09D1E89E0D5E9DF15FD7DEA89EA8662F7 - 4E136675795D7F696E300AC913EDF950B8849B29EE9D5195965517009F294558 - 53066983D003200A592D7A7CEBB2FC36CACED52B7671060B37E56C56D90086E6 - 3528CA6672E61700FB1C5DA1A90D2EF4BA88D37271173065C065669C75459323 - 5CCD29D75A0695063868C3899B6278064C483188769695B27CF48A5D45DFC4B2 - FC8E0671B6F15CCEFCD043C8E52CBFBD3AEAC085E48319CD69E6709E82BFCF9B - 523F61BDEACC327590EE3334175A1EF255C46ED8241188C2553EF8D134114962 - B12B079F0D0B4C3045530B258FF6BB8F98BD6A41F0C11B54A220270D56DD7B2E - 8C1DA61C720067792F7EEA43F8AE2EF83221B16B02EDF7E715F9BA8323905986 - 1DBDDE7AEC19A718CD53CEA18FDEED1876D6CFEC4C5456B29BF571FB8C254F28 - 1D57BAF899C2C6BAFA67535DEE33AC36BBE6EC6C6D4545D3A15D3BBB5CDDDE7A - D7D061AD35BB761664E70DAFA8DFBD7B925B87770689069BDD3BAAE8C0D606BD - 272231580E4737558F1B7D88E9B49545FBB0E7785EBA3A6D80E5B6B2E8720BED - B2C389E41510C69481E585C14470A6EA9C3079F599D1D3F9BB710D02589EC783 - 38EBCBBB098C2B0A9E64E38DED9CCE91A7A6AF626976EEB0969DA6463DF0379F - 05E28B9DC73F6890BF599D62179F495787DBE0A573A3675443F94AA207C5C83C - CEFE9183A20FC522CEFAAE539A99D7510FA5A885A62C776B08E9DECD9F0AE724 - BBD8C541DB8D91FCA6B2B2DC5259A1832ADD1B7B09F3D0132E78707A0ABC7CE3 - 74387B623E5814F4CAAEAA0698F6E0DB50EFF9FE5622B16B02729FBABD1573BA - 0ED94EBD6C9819F91F2AFED03BE4B8B19F7D3F532C3CCB046FD04301379F7575 - D9BFB30816AE0D715FAD5DD3993F6AD4A1CA55AB8E32206E95B87346F9A6E546 - 4E8C81D8E59E6D55A91FAF5BAE209B56CEBC794301F72E69EBD82815F6E12DBD - 90FE0BE185459F59629DBF9BEA8B3C244FDE99E60038DB7E1DCF4B50A7BDADA2 - 337B3390064FE873F86E8EC3F1BA7D4976AE1EB1FB0B76EE9B9C75E2756B17D5 - BE91EA820F245CBD590CC6DDD5E12008852FDA0117EB117052F9D74BE7CAF93D - 88338B11874F56197CA9DEAF492E76B15F2E37122847A36E6A83EA7EE9DF3919 - D0237611DCB076E5B431F087AB4F85F4147B9FEF577CBA1BAE7BAEB8D7D72E89 - DD08699F3F7CA10FFC8A3373669932547DF2210C9D3836282FBF0D26388A96F6 - CEAEECBDFF992201FC9FE8CDBBEE5095AFDDD3D25EF9F917D6415EAFD3702505 - 583CE3BB4D8B0C9D1A9B8D4E866DB274B8E5BA89E5FF679D79F386024621FDBF - 013B411DC24DD59441874984E24B58E7EF36939DBF8AB34F702320EFC084BBCF - 2533897F801856341CD11674BCB3F341E24087D82D8610138830F5C1973FCEDE - 8F8977DFC8EA14885A87A62F574490150E76D1CC6C45C0F556987295025DF431 - E389B06D6AF79EE2F59CE462D774F3028D4135F7E0993017BD6237009A33BC7D - C78F615C5ED0DE7B6869EF82D1735F839A6651A492D88D80B68523A6F97D3ECD - 87BE75E8D15F76A60C72415A768AD5959E6D4FCFC8E4CD3F008ADD21E347ADB1 - E68D3923F0995FF0CF779CB56C59E0DF7B16FCE9448B45D86AB42D8DB5B5B07F - F5AAA6F4564F86D54806024C6762B7D8D0A9B1DBD56FC82B03AB1F0AD1A5610E - 8B244C2FCF06317CD99E1788AAA6634658F505A6232A9BE2ACAC19619E55FAE3 - 1810675D7EC07138B7F092DA8BB3693CF6A9D116BBB920AE1684DB6888D72C6E - 866A97CEE315BBBA848B8A988A4BDFA8D40F371B5E08A2FBADB30C6683D7DF83 - 200612D00AD78BD7DDBB103C10E909916D64639446394AAB2A41BFB7ECD86415 - BB51332D501970063D6789D86154EC226398E0FD7AC925E0B005EF37BAE24FAB - E1EF1BF6F5FC3F89DD08E8F5A9AB03EBB853FF6B1931F6277ACEA9DBF625A45A - DABF4D9D34EDB8DE0FFDFE75F6B39705B9B0D97DDF1F0E5B6DB62146DBF3CD9A - 4F1A1C35D55DF6E6D65C9DA7AE9951BEA9C868B9317661859B945ED1E1B286D7 - C1BBEA0E7E8E3278671CE576BBBCCBFD5A9BAD945EEA4A282E87EB0C177C25CF - AC9A942FAFF0D22BA2F538EB0F2BE824FB5BBC27A7B0846EA5C68238332ADF78 - 8403D01AA9AEB889139DDF978328707884779000D1132E584954C4AA6FA28934 - 68990AA2AB3CB435D7B36115414179BF9A8716953EBE8B1DFF44D89CF5B543C9 - E55FD00A8EECD86415BBA6D629A44CB550D541A643446C8844ECA249C3C6453F - 87C92307057DBEF08D4DB0F41D710E90C4AE41DAE6E7CD63253F6CE45CEBC917 - 6EB5A465733FA05BCB0F42FBC19DF583A6CD0C0A076CCF2E74C00F6EE87577B6 - 77C19F5E162CC25546DBB4E59FAFB7E4B478D26C191915DEDC5C0FECDB177649 - 5300FF36ABBDBBC8E8E6B49E3C622B767149F34A1DB381BCC20B67089E063182 - 8F5EF0A18B4B9A53C31C17F4C2D5E121422D48028F9D6631A82C8727ABD865F9 - A0B37FDC6486A6244642C7E23588261D682F786A986349EC86AF3BDE3F183D12 - 852F0E1E789EAD8A5E1524F38207A42487DB0C4747BD3114147A18B85EF6B1E2 - 06C02416BBBA4DC374D44FEDB7D675EF10E61089D8B531B1BB6DC925306178B0 - 29C3DDAFAD8727DE17175B49EC1AC0B370F814F0F937193DDF7ECACFD7822BF3 - 743DE794BFF152C7E0A93FDADDD9D631C2027E8FBFABA3C1D2EDDD9875F7C7D7 - 058ED977FFD3B8CCF796913AEDFE720B7496944060B35A46D1F45DEDDECEACE6 - 3D7BBD368FC76E6D6E569A316EF4835014433FBB4AE04B0B378EA0494738E120 - 3F87CB7D90CE25F568136ABFC96B86D0E725A631AB110A96B758C95E2ED9C4AE - B43110BD6D2C84C8FC01EB81C4AE0E240193CF12065FC167A3D66A491FB32695 - 7E306CA2C4515725B1A574ED25ABD88DB63991D2FD14B5D964421DE72F9FF787 - 5587020485BBB25A2C302C33156E3C7302CCFD49DFD7D0E94BDE81CF761FEAF9 - FF48C46EC11DAF405D6B07F0EA4D3CAAFDF9EB1240EC2EC87B87B5E63CA3E71B - 0938D1527600BA0E95D5A53ABCD5FE6EBF0DEA2B8EB158FC8BD396552D921FC7 - 04AFEE0E69AAAB85C6AACA8ACAF51B4604024C205E87A33975E2C4CA8C11C3D3 - 2BB77C09CECA4AB9CF5E53842E1281D8453B5774ADB54723D2911A5C3BABFB59 - 94B03EF67CAC7EF8727826CC797D5E8A9C1B92D03EF1271A339C492376D9B9F8 - F4C34D4E97F094652224760D22B509BD39A06F63B55593A0550F9D76DDD1023D - 0FFC3DA42DC92876A3EAE64E2A576933ACE9F6D944781A5A3BF9B48B10FCBF28 - 621DB6BE3B8DCA6A5BE0D85FFF03DA3A45F7E79188DDE6B62EF0813E6995E572 - 0C6CB1DB367FF81D7E88CC762B92E86ADD6D6D50FDC13F61704637FED2EFBA96 - 549D2FFF7EE7BCE5ABED4EE7997AF23C54560A759B36D4399B5B73E4E6DD68A2 - C004ED0996C1B9FBBD9D6D2E4B53CB30DB8993F779F7EFF5FBC64E583873E51F - FFAEA71C350C0ACAA0109B619C852BC1EB9FB53F895DA5195AAD885E72425FEA - 3C2259736772B2885D4900A1D0BD92A71C9321B11B2152B00AEC0BA5E86C6803 - 3F87B5A75A3A56CF46BD68D1C7EC2849C5AEE1F64558475DCF2BC21CD85BD854 - 3177CB8B9FC1331F6FEFFD772462D7088200035BEC7AE6E77D03E2A614C3D87F - 78D13A706785F3D9DA075F571734EDDDE9B1946D71A53A7ADADD068277B46B49 - 4DAF5FD7FD0B9FBEC32F806E31EE696E064F636353D5964D5D6975F5BD56DED9 - A79FB1A17CEBE6B1EEE6D66C183CB8CCDFD4946DE9E8987556C5E69566F5A9C1 - 485C7D62C94BA2041FD8BCB36FF830BD224C4CFAFE2E7679035EF49EABC34FAF - E6A69C6410BB1A01006205895D13D008471C14B98CC42E895D20B11B17CC12BB - DD3E3F2CFFE06B98F7FAFAA00C49ECEA84895D9C01D0EBAD2008EB0FCE5D6BC9 - 1CA268B38B6EC6864D1CF337217754EF46B3B6C395DECE9A4375C2E13DA9A982 - 27643392FF3CD7D243EF05FE8551D4BABDFE0346EB86B6BBFE6D25E0907EA7C2 - 59B33D5B3FFEC89AD6D0D024389C1DD6DABAFBCF2EDFB8C2CC3ED5292851E8A2 - EFD86F54F2D2130D0AD1B4DFD51150221628BE8C38FD00F7BE3838FB9B272045 - 32885D5E176F0170961DCD69D01F6B6D207CB15436B60BBD36A09D342E93F3D8 - FD92D83509D6C64210FB2ED4B67F3E6BCF32E918255B7614C468AE152B1BCE3F - B1FA04DDCF2476A3834A1DF1F7BF9D95EB8956B9445F2215BB1DDE6EF8B6BC1E - 16BDB519FEBDED20844A4312BB3AF1CC1FCE6E04FF758633B0D85BADD32EA9B1 - 389C85F28FBDAD2DD0DDD1D164B1D9D2EC1999BDD604351B3E6D7337ED4BB55B - 95DBC93E7DC4BDB4EA5EF9673BE73DB9DFEE748C523ABEB6AA0A8EECDC593168 - E4C8D6ECA38E1A8533BAE9D9D9F6B21DDFB6A7BADC4D75E5E516FBEEDD83B102 - 1687A369E4955765E0795B56BED99477C2092F9EF6B7C77842E6EA4287680A1B - AE539A894307F4B844CF1B6E1443F6FE9EE5EB55C8AF3FD8F005507B51A0EB30 - 749513CE676BCF8C11A7605A01E1430D2783D8E50DDE8175B803DBCA192A1AC3 - 34A3FFE270C11248EC9A84462007F9AA87523FC4DDF76A928A5D8436A8250977 - BFB63E48EE86D3BE81A7ACB7DB07E5F5ADB0B5EC0854D4B582D7A77C9ECD6A81 - 7B7E7A3CE4B8BF8F9DF565692DBCB67E6FD071B7CE380E0A077305A2D564EE4F - 4F18D862B7737EDEB15E515818DA9D6F3F6146310C2A280AFDBCED5015F83ADA - EADD238FEE712FD6D9500F0DEB3EE8CC4E697384C9F22BD7D2AA20B1B1F3DEE5 - 7FB63B9C37281D8C33B7F66DDB823E4B2938EA2BA1706476EDDAB5052E59E8E0 - F471E3360E9E76EAC93D79AEFFE2837357BD744E34FAD4ECE0043AC3B1223873 - 7375E86C8A94570A889BD96E099387A27FCC5820BDC4EF94EAA9053EC417487D - 134ED4840D359BE86297A52DC0F7DBAB5E3F26D485C4AE89A8AC8204F9C866C7 - A0EFEA07438EE9F5711DA77A27ABD855749B68162A0183C8F5581C88C4F5587F - 24215C8F219EFB865DCF8A9F0542CF4B910BEBD0C22D96E3A6AB8AE483EFFCB3 - E5A8F32FE9195234EEDA01B07F03B89CE1DB27586CF9A9BFFDAE22F06FADD0C1 - DB3E2DEECED8BBBFCFD6C594DCDC5DED0505C3DD3983EC7EAFB7E5F0E68DB6CC - CE2E61E879E7D7B7B4B6B4FDF0B9878E8D565F46231297B47B1E1FDE17705643 - D10E58CA8B67335790ED5FACE10C3F8BFD87A1377F03DACBF2D81768CBAC690E - 9304627727673D74871825B11B1F786C3455FA1805F012DE603451A8772CC4AE - A9CBF72AFDA857ECE267BF66E718F15F1EAE7EB8F2F74710030DC989AAC02694 - 21B1AB4D5C23A8216DF70DFF85DFE29FC5E38A2C9C1786FA6FBE82ECF1133683 - CD3EE5D0DA8F21ABB30CAC9670B962270817A72EAB7C43FED9DEF9FFE711ACD6 - D4D063BFFCCFBF5BB20F1FEE33478F260BCE3163F7B70B9069B73B5B3CF547D2 - 2D757529BEC6E64FCEA9D8F4BFD1ECC328869DD5EB8E0C67EC7FC5F26F0AC947 - 29ACA7128A617563818E4D67FF61E9A7618E41FBC5FBC3C5A24F02B17B84B37D - 8B41F445CCFD30D278D1864262D74454445EE8CCAE526441DD031A93EB1D0BB1 - 6BDAEA94DE800D1AD71FD7C0DB601D953CD9C4DD64255921B1AB4DDCC56E8096 - F97967B096A11761D59797FDE40B3E83B41CD599E0E6FD7BC19D7FD4115F6767 - 4ED5076F5A86656B6A8D5E5817BCE45E56354BFED9F6BB1E7BCF62B79FDBD6D2 - 0C1939DF87D02B595BEC4BDDB7CFE250B09D7616147CDDED74DAB2274ECC49CB - CE195A535EBEEF9417961C13EDBE8BA2D8C5466274A2677554A78FFDAE8EE00D - BA97B343EA8BA21C9DE0BFAF643FCC713E3AD27F43EF790A6DE09AA126B1DB8B - EE654F1D7D97F06257721BE86679369A95A746594A660CA17DACB6492D9E2B37 - 668B5DA5EBCFB4E0191ACF4CBD6217415BF8A7CC9C55D730FD8AEBA0269921B1 - AB4DBF11BB019AE60D1963B5D96E13C08FE23353FE9D75D2F4624B6E61916AE7 - 78BD20D86C3D33BC50B615D2527DBCC5D6BB965605EDEC5E957FF26C4766DA43 - 2D6D1D59479D7AEA662664A759AD36475767276CFBCF7B2D83EA1B342DB0D1C7 - EEE8395715153E7087E130C0BC444BEC4A79ABB91C520343B9626CF435B23CF4 - 8866ACE3CDECFC2F74D411F3FF1188EEADC6B3F45B969ED43B436CC0738012EF - 8328D88F709447625744D752AB4E7766092D76651B4AE7B2F42B96D645CB5440 - 63835A9F9979958D892B20CCA6CD681105B18B1E85D0CB4CE8A6565396F03542 - 991B11BBA67B65D0F0CCA1E96E91881E2476B5E9776237C0E17B86B9D36CC26D - ECF17A3348CBE8E1C46E7BF561E8A82E6F80EFBECE425B5DCBD153FED301CE51 - 9DDBBF98E04ED116BE16104E4F595AF969E0DFC5A3266779BB6CBDA3538BC3D1 - 9872FCA483D963C68DAAADACB4A7656494EF7967E5E86CA1AF9D040A5DABBDBB - A8E8C0D6A80BDD9EF2A22876A5FCF5BA23C3A533147C7B64791482F2C35109AC - 1F6E70798323421B2E95DE0EA21897BF183038C6523D517C585E688B8DCB86F7 - EBE99F107053DF139C1E05125DECF2DAEC46D3BC26D1C5AEBC2F70A08936E5FF - 30B2B2C151D608103DAB4C0FF9AACFE633958123DE8B37B0635F37B14EB899D6 - 1ACE4E360A6257EDF75634E5D299B75BCA7B8EC2D746C42ED227B47304F5C395 - 041CE0CC0FF92AEAAECE087548EC6AD36FC5AE9CD6F9C3AF6602F23626763D6A - 62B7B5E23B68DFFA3164B87A82D235D94FBFB256B03946D56EDD0CA935DF80DD - 16C60D07C063EEA555F7C83F5B9D3FA50423A0F5E934267C3B9DF64E4B736B6E - E84EB5580BDD9E32A32C76A5326682181E97D71D59D0C3559A1542A1F1B28E62 - 31DC250A135CFA2C957D8EEEDCD0761B97F8B4FCAD625977EBB1A1D3615FAC84 - 2E7BB52410BB5FEA38FE2F20CEEED669948FC206039EE0CC3DAF1D79C28A5D8D - 41E8632C3D62A667138D088BEB40B4532D0B395E6DF65DD3CFB7CE3AE1F57017 - 8803E85B43EB1072AC9A0BC433D8796B0D96AFB4F1362241CFE1FAD1A8D84550 - 9C3E1EC99E8830F5C3FC1F09B75781880E2476B51910623740FBAB973D68C939 - EA56C1660F12371DB547A069DBBA962CA8ED312DB08E995262299874A2B7B515 - 6A56BD2186060ED71102EC4A5D52355EFED9470553173115FC40D893BFA7D1DB - 6D3BF19CAA2F4A63D92F3112BB7AC30923E8BEEDB9C02CA701930833C0CD339A - 2FC29076F2DA172BB102742CD326BAD895FCECF278E208B009447184EDADC3EB - 46BAEEF259C2194C5C1A3F8D33AF0009297659792EA9AFE6A81C827D89E2E3E3 - 40608E08CAC2E52BDC648B03586E81232DF563FF87DE4B110B5E8510C6D89FD7 - A95DCB1ABF0FF74A8C429E6AA1C60DB54F1292386BFE57501FCCE915BB380097 - 6F14C419D9478DCCF04AD7C1E52086FE0E9D6040EF45B89A57A1375FC21C48EC - 6A33A0C46E0FC58B535A8E1CBA57B05A6F76A4670C6DDCBD03FC7B37803B456A - 476AD676FB8F2E3A16430357AFF9B0335BA8765838BBACBBDB323EFDE18ADE87 - E5AAFC934F14C0BF95B3668D7E108ACE2EDF5812EB2E8985D895CAD1EB8E4CC9 - 7E57AF4984193C09E2AC613B673B79032184822FB8E7790F4E12B1AB26086245 - 428A5DA94C1493B84148CB23055E3B8FB2B4C6E0A64D1CA0E2EC29AE7A850A5D - 6C03DAA8966A9C3F05C415A150F186D7DC4296DED423C625C185AB06E8DB35D4 - 246A9D549F032AE72AF9840D1BF25CA32E6ACBF9817C6F054E1B6A69961A0714 - 382B1F109238500F9D89D62B762F656956483E1831142771B6F28A7CE95AC381 - 41A8B918D2E7394FC41E12BBDA0C3CB12BE3D06F4FBDB7BDA2ECD221D9DD7823 - 16F47C6873001CF3A30DAD7BB78F4DEDAAC9E615BA3D9DC11EE8A94BAB1E937F - F651FED45208BF641A37A1DB53EF18895DA9ACE3D91F5CA2E3152F7DC209B33C - 2682282663217835C319ABB4D18840D3EDE22749C4AE1976D09190B06257562E - 0A10EC632DD31BB949D0D75A9B01A519461CD8A237055C9D99A4701897C091F2 - C299DDC741F939FA96D46F5F688971960D06073A596AAB52D43CAC0FEEEF785F - 4DC0699828E12C380AB9CF4385B7AC2FD08CEBDD502F03ECEB31209A47283DCB - D0A401AF3F749157A6542FA95DA783B8C1507EBFE22C3ADA41BF1F728AEE086A - 2C619B9E86E0E70CD6ED5FD2393B54A25F62DBF3A5FEBE45E5F7C37C6E62E9B5 - 78F950264406AAD8C5ABECD21F8E86821C37941D69817F6DDCDF13FB8DC4AE12 - 8B8F73B4B6D5DE2C58045CD23BCE6836AC273E752FAD3A5DFED9AAFC9357489E - 2134CE1326C74BE8223116BB46C209A3FFDA79F2C84292A0C41701CF8635A3E8 - B6D995EA86B32C686EA127B4B36E1FC1C92076A5F3F4AE08F08075CF82F003D1 - 8416BB52D9784FA26F5B346BE0BD9F70C50A7F7714C10113041C98A0B09DCCD2 - 388D7375091C0EC18BA0582D6669A3542FAC13CE2AE373026787D13B819A6DFE - 2EA93E6BB4EA239928E1F57089469FA0179883D2BF8F02D1CB0BF687E23DA8E3 - 79B84BCA7BA7F4EF74A95D5315DAD533406709DD569A122E987D8FEF35F486A3 - F4BBA29DFC3AA9EF7110A4E73AC059ED67A2B12192D0C74015BBF94CE4CE9C98 - 0F3327E5C3EA6F2BE0D52FF6426B8797C46E38DA17E45DE3F3FB6F604D3324A2 - BAFC8E9CCC6565BDA3F7D523A65CE81784B7D48E6742F75A267457C4B3CDB114 - BB5279F8604531781BE7298A2F4769696C11986FC38BE5E1D2EDE346771FB3BA - 9DCDFE7CA8E39499ACAC553ACB480AB12B9D6BA6F90A0E6270397A39471B135E - ECCAEA80E2106762D13B09EF063EBDE0B5827E5B3FD0190444EE1E70AA89F5C1 - 25F97B585576F21C2CCDEEBE62A07F54EF41C99C012744F0F737B2B1550E3E73 - D0EE7F8F49E182E583CE93401C949B31C160C80C85881E0355ECA6A5D8E1CE1F - 4F82D223CD307A48062C7D772B747A7D247679F12CC83B177C7033087D6C9E34 - B108302B6549D54B817F87BA2093D31F842E126BB12B95A9E686480DB489BB3C - D4E1BA6483772688E2C58C97E07B525EEB235956935C9AE1753083E3708C9C74 - 0D2BAE4A6719492376A5F3474AE71BD9FC87E020066D247189D7C5D9C6A411BB - B2BAE0EF3F1B44BFBB668A5EBC1F1ED0B2D1E5A89B96EDA71E703612BD723CAB - 67402B89EECB40342DC8E13D0FC2DC8352BE782DA2981FA7235F39785D2F0AAC - 44992D76A5E3CC986088F83A20CC67A08A5DC4EDB4C3B1C3B3607B6503B47674 - F57C466257279E85C3A7F87DBE3B04E879C9F1F4C8DBAE25872E947FF451C1D4 - 954CD9062DC1F617A1DB53E538885DA95CBDE18455ED6725D30114CEF8B0C625 - 4B3D2F42144138FB8ECB741BCC5852D38810A404DAA32ED12BAE934DEC4A79E0 - EFFC3396EE05FEC14DC0BE10C5CD01C94B036F1B934EEC86D40967D2AF01D184 - 448FB80B80A21207B5D88F3BCDB2CB64754313019C0DC5CDA07A04399A5DE07D - FE1AEFFDA05036DEDBB8448F03A79F719C82D71F3EE7EE6365B684C91BC5245E - 03F8ECE0ED6FBCBF1F06D10CC327CBCB74B11BD27E9C99E51D78069EB168AEB1 - 816673FB1FC2357F492831E77F690E895D23B42D1C51E0F3F9E7B206DF080238 - 350EDDEB5A5A3546FE818229C39D33CA37F1446F220C20D9D6A1109A06A25D1B - DAAEC9674BD0B60E6DFC706309DA9A6D8D46A854CEF0C1389B7B212B7F63BCFB - 6D20212DFD8E05716083BF33FEBE93A5AF5160A1105F0FA21DE7FA489CF413BD - FD8D9B8DB08F7183282E6963844A1C68054459A0DF03F7166EBAD4DCCC6642BD - 708316DA874E93D250599D764975D926FD3FAEA07C6796D09256958E0551F09D - 02A27D704078E3B587A6112844D17D5BB5CEBC03038D22109F65F2BC03CF2FDC - DC879BD04A4D700FC72D7665E70436DF611D4F937E07F45F8E130D286E711FCA - D7521FACD7DB0704D19F481AB1DBCBE2E31C9E8EDAB97EBF703BBBD587847E8D - 0129DC4BAB32433FEF11BC16011F04C533BEDB541CEF66109123B945C2DFBA8F - 5B261D36A638EB75AB9E486D044110666244EC124432917C62578667FEB0EBD8 - 53E26EA6707B5D4CB1A16E71EAD22A5E3B54628012E27101678DD0D518465242 - 83219CFDC297068FED9D2EDFBA0441106643629720B4496AB11B0037B3097E98 - EB17A0C6B5A4EAD278D787883E1ACEEEF56068631A4110849990D825086D48EC - 12498789810ED005D353E44C9D20887842629720B421B14B241D2685B0A558F0 - 0441F40B48EC128436247689A442A74B313570331A0ADDB7E3DD1E82200812BB - 04A10D895D22A9602F8551ECCF6B105924AF5FB3F47B0A914910447F80C42E41 - 68436297482AD84B019DEBFF158C39D84716B1F448204801411044BC21B14B10 - DA90D825920E83E154D1B9FA22965652F4208220FA13247609421B12BB44D222 - 45953A9E250CCB89D19B0A418CA48404A249A1C8C5E8791B6836972088FE0889 - 5D82D086C42E41100441100491B090D825088220088220121612BB0441100441 - 1044C2426297200882200882485848EC12044110044110090B895D8220088220 - 08226121B14B100441100441242C24760982200882208884E5FF037933C780A7 - F045C20000000049454E44AE426082} + 0067080600000000008AFF000000C67A5458745261772070726F66696C652074 + 7970652065786966000078DA6D505B0E032108FCE7143D02022A1EC77D25BD41 + 8F5F5036A99B4EE2803C4604CECFFB8297839280E4AAA595820669D2A89BA338 + D1072794C103DB8614D1250EA546135988CDF2BC6A9936DDF168B86DEAE6E51F + 21DD23B1AD8926A1AF0FA178887D229FED08A116424C339142A0CF6F61695A97 + AF9DB842E701A73D6309B181E75DAA6DEFC8F60E139D9C188D9975D6B01F01EE + E6A831B17AA195B95F8D33D798C416F26F4F37E00BBA4A59FA71D652FC000001 + 84694343504943432070726F66696C650000789C7D913D48C3401CC55F53B545 + 2A0E7610E990A13AD9C58A38962A16C142692BB4EA6072E917343124292E8E82 + 6BC1C18FC5AA838BB3AE0EAE8220F801E2ECE0A4E82225FE2F29B488F1E0B81F + EFEE3DEEDE0142ABCE54B32F01A89A65645349B1505C1103AF08228201C41097 + 98A9A7730B79788EAF7BF8F87A17E359DEE7FE1C434AC964804F244E30DDB088 + D78967362D9DF33E7198552585F89C78D2A00B123F725D76F98D73C561816786 + 8D7C768E384C2C567A58EE61563554E269E2A8A26A942F145C56386F7156EB0D + D6B9277F61A8A42DE7B84E3382141691460622643450431D16F55583468A892C + ED273DFC638E3F432E995C353072CC63032A24C70FFE07BFBB35CBF129372994 + 04FA5F6CFB631C08EC02EDA66D7F1FDB76FB04F03F03575AD7BFD102663F496F + 76B5E81130BC0D5C5C7735790FB8DC01469F74C9901CC94F53289781F733FAA6 + 2230720B0CAEBABD75F671FA00E4A9ABA51BE0E01098A850F69AC7BB83BDBDFD + 7BA6D3DF0F168772E851144DAD00000D7669545874584D4C3A636F6D2E61646F + 62652E786D7000000000003C3F787061636B657420626567696E3D22EFBBBF22 + 2069643D2257354D304D7043656869487A7265537A4E54637A6B633964223F3E + 0A3C783A786D706D65746120786D6C6E733A783D2261646F62653A6E733A6D65 + 74612F2220783A786D70746B3D22584D5020436F726520342E342E302D457869 + 7632223E0A203C7264663A52444620786D6C6E733A7264663D22687474703A2F + 2F7777772E77332E6F72672F313939392F30322F32322D7264662D73796E7461 + 782D6E7323223E0A20203C7264663A4465736372697074696F6E207264663A61 + 626F75743D22220A20202020786D6C6E733A786D704D4D3D22687474703A2F2F + 6E732E61646F62652E636F6D2F7861702F312E302F6D6D2F220A20202020786D + 6C6E733A73744576743D22687474703A2F2F6E732E61646F62652E636F6D2F78 + 61702F312E302F73547970652F5265736F757263654576656E7423220A202020 + 20786D6C6E733A64633D22687474703A2F2F7075726C2E6F72672F64632F656C + 656D656E74732F312E312F220A20202020786D6C6E733A47494D503D22687474 + 703A2F2F7777772E67696D702E6F72672F786D702F220A20202020786D6C6E73 + 3A746966663D22687474703A2F2F6E732E61646F62652E636F6D2F746966662F + 312E302F220A20202020786D6C6E733A786D703D22687474703A2F2F6E732E61 + 646F62652E636F6D2F7861702F312E302F220A202020786D704D4D3A446F6375 + 6D656E7449443D2267696D703A646F6369643A67696D703A6161396535366135 + 2D333431342D343666352D613332652D636634366131363238666130220A2020 + 20786D704D4D3A496E7374616E636549443D22786D702E6969643A3338336433 + 3663392D303533352D343866372D613937392D39376362663636653861386522 + 0A202020786D704D4D3A4F726967696E616C446F63756D656E7449443D22786D + 702E6469643A33393739313537392D393962652D346132322D393138362D3261 + 66363332643536316464220A20202064633A466F726D61743D22696D6167652F + 706E67220A20202047494D503A4150493D22322E30220A20202047494D503A50 + 6C6174666F726D3D2257696E646F7773220A20202047494D503A54696D655374 + 616D703D2231373234383434343935383930383934220A20202047494D503A56 + 657273696F6E3D22322E31302E3338220A202020746966663A4F7269656E7461 + 74696F6E3D2231220A202020786D703A43726561746F72546F6F6C3D2247494D + 5020322E3130220A202020786D703A4D65746164617461446174653D22323032 + 343A30383A32385432313A32373A35372B31303A3030220A202020786D703A4D + 6F64696679446174653D22323032343A30383A32385432313A32373A35372B31 + 303A3030223E0A2020203C786D704D4D3A486973746F72793E0A202020203C72 + 64663A5365713E0A20202020203C7264663A6C690A2020202020207374457674 + 3A616374696F6E3D227361766564220A20202020202073744576743A6368616E + 6765643D222F220A20202020202073744576743A696E7374616E636549443D22 + 786D702E6969643A65363665353134362D313361392D346661642D393062322D + 393933653737386139353165220A20202020202073744576743A736F66747761 + 72654167656E743D2247696D7020322E3130202857696E646F777329220A2020 + 2020202073744576743A7768656E3D22323032342D30382D32385432313A3238 + 3A3135222F3E0A202020203C2F7264663A5365713E0A2020203C2F786D704D4D + 3A486973746F72793E0A20203C2F7264663A4465736372697074696F6E3E0A20 + 3C2F7264663A5244463E0A3C2F783A786D706D6574613E0A2020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 202020202020202020202020202020202020202020202020202020200A202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 200A202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020200A20202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 20202020202020202020200A2020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 202020202020202020202020202020200A202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020200A20202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 20202020202020202020202020202020202020202020202020200A2020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 202020202020202020202020202020202020202020202020202020202020200A + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 202020200A202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020200A20202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 20202020202020202020202020200A2020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 202020202020202020202020202020202020200A202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020200A20202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 20202020202020202020202020202020202020202020202020202020200A2020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 20200A2020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 202020202020200A202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020200A20202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 20202020202020202020202020202020200A2020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 202020202020202020202020202020202020202020200A202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020202020202020 + 2020202020202020202020202020202020202020202020202020200A20202020 + 20202020202020202020202020202020202020202020200A3C3F787061636B65 + 7420656E643D2277223F3EDC58905300000006624B474400FF00FF00FFA0BDA7 + 93000000097048597300000D8A00000D8A01FD2DA3480000000774494D4507E8 + 081C0B1C0F66E13F84000036CA4944415478DAED9D099C1C6599FF9FEA73667A + EEC9E44E980472410209240A412111C2211EE80A2E8B0AC8A1ACEC7F410E09A0 + 06C50485D5B8BBCAEAA2465C76659143D6658580098781404212AE1CE49884CC + 643293B9677AA6A78FFAD76FAA7BA6BA52D5FD56754DF74CF7F3FD7C5EC854D7 + F9D6F1FEDEE77DDEE79122DF24991886619882E4C52717E7FA149802E6E9877E + 9DEB53600A0089C52EC3304CE1C26297C9252C76996CC062976118A68061B1CB + E41216BB4C3660B1CB300C53C0B0D86572098B5D261BB0D8651886296058EC32 + B984C52E930D58EC320CC314302C76995CC26297C90652AE4F80611886611886 + 61460A16BB0CC3300CC3304CDEC26297611886611886C95B58EC320CC3300CC3 + 30790B8B5D866118866118266F61B1CB300CC3300CC3E42D2C76198661188661 + 98BC85C52EC3300CC3300C93B7B0D865188661188661F21616BB0CC3300CC330 + 4CDEC26297611886611886C95B58EC320CC3300CC330790B8B5D866118866118 + 266F61B1CB300CC3300CC3E42D2C7619866118866198BC85C52EC3300CC3300C + 93B7B0D865188661188661F21616BB0CC3300CC3304CDEC26297611886611886 + C95B58EC320CC3300CC330790B8B5D866118866118266F61B1CB300CC3300CC3 + E42D2C7619866118866198BC85C52EC3300CC3300C93B7B0D865188661188661 + F21616BB0CC3300CC3304CDEC26297611886611886C95B58EC320CC3300CC318 + 50FEE8812AE57F1FC9F5791851ED77D1BC4ADF713AAE2314AB7FED9229BB127F + CFBAE6897931994EC8F5F95AC12D496FEEF9CDE75B9DDA1F8B5D866118866118 + 0314B17BB6F2BF57737D1E462CA8F25185CF95B4AC2F2AD33B6D036B8F5D5177 + 4B62D9CCABFEB05696E91F737DBE5670B9A415FBD6FDCD0B4EED8FC52EC3300C + C3308C01A355EC4E29F1D08C324FD2B2984CF476DB00F544626BBBAE9CC16257 + 43C189DD5B5FD87915B9E4AB07FF90E57A49A2A71FFCC4297FCCF579310CC38C + 20188A5DA294A54A59AC9493943247F3FB6EA51C54CA5EA5BCA594ADF1657DB9 + 3E7186C925A351EC16B9253ABDC64F2E9D823BD01DA1866004FF64B1ABA3A0C4 + EEAD2FBEF71BE592AF36F8A943291B49969E8EBAFBFFB876F9A28E5C9FAB45D0 + 683DA694D3D2ACB743295F24B511CB947395F25BA588FA01A143F10DA534E4A8 + 8E18A6D0F02B6539A9EFDDA76C6CDFAD941795F24BC2F791852F53808C46B17B + 4AA58FAAFCC9EE0B5DE118DC174856FF64B1ABA360C46E0AA17B3C92F2618F91 + 227C2545F8CEABCFF5B90B906DB1CB429761462FF8AE2F52CABD644FE41A01AB + EFBF28659D521C9B34C230A39DD126763129ED6445EC6A81FBC2B6B610F545E4 + C42216BB3A0A42EC5A12BAC753AF3C3E4FBB5DF26F1F587ECAF65C5F8B09D914 + BBF395F2B0523E2AB8FEF34AB949291FE4B88E18A6108035F706A5FC40296523 + B07F7C3BBEA794279412CAF5C55AAC1774008A34CB30DE8B6F6277AE4F8E19BD + 8C26B13BD88BADF153892759BA7DD81BA1833D11ED2216BB3AF25AECDEBC615B + A55BF63F45322D7368971D44F2D3A3D0CF375B62779E52948E83B0D0DDAC946B + 94B233D715C4300540402977C58B191076E8B4BF4EC3165AB7521628A54E2967 + 0A1EEB29A5DCA694FDB9BE68416A94F2A8522ED42C73D2AD8BC9534693D89D50 + ECA659E5DEA465A1A84C5B5B4383D65D0D2C7675E4ADD8BD7DC37B0B6351E937 + CA152E345BC7E396BA6A8A5C7B22D1A8BF25185BE072B9AC1CA2432669ED8FCF + 9B776FAEAF95B22376A728E5674AF9ACE0FA2C7419267B605AF6AD4AB9DFE4F7 + FF52CACF95F286520652ECA79854E1FBB74AF93CA57655C277E466A5FC39D717 + 2F008B5DC616A345EC42AC9D3ECE4FC5EE64D9B6A7334CCDFD51FDEA2C7675E4 + A5D8BDF585F7FF51B9B2559303AEFD5D03B1A2803B36E168BF0B1F3B1A57E2DD + 5AEE95AB4A7CDE9AD2627F8576BBDD0DCD1DED515FA59563B95CF2A251E0DE30 + D2627782527E41D6842E7C74B7E6B85E18A65040830C31A717A778E76F2775A2 + 59CCE23E6129FE02A9227A81C1EFB0EE7E4D292DB9BE780158EC32B6182D6277 + 5C919BE656245B75831199B6B586483E7E7516BB3AF24AECDEF697F73E2BC7A4 + 55B0E656157BB7BB237D13A392E798140D4F6A8B7A07C5EE820925F501BFAF2E + B1CD91B6CE90DFE709971717053C6EB7B4FD40436B502AAE11B5F2465DD28C51 + 30896D24C56E35A9D6A2EB05D7C7BEE133F8728EEB84610A857252278F7D45B7 + DCA9D115885EBCD3F790FA3DA0F83E61FD7D3BD7172F088B5DC616E9C42E0CAD + 357E3795FB5C835657FC1D56D467E7408C8E042314952D1C2C05A756FBA8DC9B + AC4B767786A9E578AB2E60B1AB63CC8B5DB82B4463D255CA855C4AAACFD91065 + 3ECFEE532696CE69EEE8A65DC782E4F3F91396DDEAF115A5330E1F6BA78EB0B4 + 735AB97F5C45A0B816DB8423517AEFC3A6D67E77A026B11FB83B94795DFB3B82 + A1C9B2CB335E537BBFFDA74F9C7C75AEEB80464EECA291FB9152FE5E707DCCD8 + BE4A292FE5BA4218A680388F542BAB76429AD3EF6222C2C31AA59CA594AF93EA + 1AE150533EE2B0D8656C61267611E3765AC043934B3CE4365152F0A77DAF6360 + D0029B09989086B8BAFA7D6F3916327B0159ECEA1873621793CE5C31FF77254C + 3A4BE18F0B2694BAB70483A14ABFD7DB5B51E22D8E4663459DBDC1F29AB2D296 + B6AEAE998DBD31777559E907B3C6154F2FF679079FA4BD8D2DFD95A5818EFAD6 + 9E48382617054303F2F2B953CAB7EC3B1C0C9494B41CEB094DF517074A94553B + A32E69A1D6AABBA16E616538E24503435E4FF8B7CBEBB7672B5EEF48885D91C9 + 2E5AD0B87E15D54063A7016498B10EBEE1772BE5FBBAE5FFAC943BC8F98809B0 + EC7E4E29FF49632BEE2E8B5DC6164662B7D4EBA23915DEE3FC678D802885AB41 + 267A1799D290314D4B7D4F840EF746CC3661B1AB63CC89DDDBD6EF5C26BBE40D + 66BF97FADC7BC2A13E5F48F2D5CD1E57F2527589EF5CFD3A9DC1BED0E1F69E86 + 8A40C9B15824523EAEACF844AFC7EDF6BADD4963049DBD7DE1AEBE50F068CFC0 + D130B9264B2E4FA9A6E26E79F0BC93D76AD75F3F6531CE6B59FCCFED1E6F6479 + 9604AFD36237DD64173D10BADF24D5BAC4429761B207ACB99838FA65DDF20B94 + B23ED727378A60B1CBD8422F76E13B3BBBDC7B5CF6B2544094D6F744C437D0B1 + 649C9FFC1A618D46F6CD96100DC44C9B5B16BB3AC69CD805B7BEF83E44E6D54A + 499A6006A13B6F7CA0CEED72F9BA82FDC112BF7750C33A71CC70341A7BF750F3 + 91C93595873B7B83A1BBCF599024A25F9872C65A9924FDC3B47D45C3964559A8 + 1227C52E842E86285793589CCE6E72764813C73F51291F8B175C93B60EB7C5CF + 7F53BCBC43A96797E733A82B8483830B0F3EC848070BCB5B1BA9F71AE1A59EA5 + F433F0B5E09B309554B184FA9F4BC3E1A8D0A941BCE437498D9F0C9FD0B164DD + 73028C78A0AE3159F3745DDDBC476A9D233A019E53FBAD9B3870BF8295F57CCD + 32BC13972B6557AE2B6B14C16297B18556EC8E5784EEAC0AAFA970420368F45B + 5811A56FB4846C3590655E179D569D9C44A23D141B748F48018B5D1D6352EC02 + B8337862BE9B158189D03783A277EEB8E2ED9525FE21D7868E9E203577F51E9B + 5A5D515552E4733B71DCB69E60FDA1B6AE653F38EFF4838965EBA72E5EA63CC5 + 86D66689E475E7376CBD6684ABC329B18BE7E10AA5FC1B655FE86292CD954AB9 + 918C677E9B81FBF02B5233BA1D32596746FC1C45E203E37A7E61F31A10B6E927 + A4CE504F072CE710A2BFA7F4F7EDB978DD24E2A26204E213A4764896081C0BE2 + 07BE964F92F9B036F6890E1C2CF4A259B750F73F25359D6CAFCD3AC3571C61ED + F0DE42B8E3DE43B0E379D0C67C8578C4ACFF46521B1E44FA789FAC7774508FFF + 21B0DE7728D935C06892562A44EADC098CDE7D1671C7C36297B14542EC56FA5C + 744A95CF5034750CC406933A748763831658A4F3D5277ED8D13630F8BB554E28 + F50CFA066BF9A02B4C47FBA2A93663B1AB63CC8ADD0409D15BEEF75C54EE93FC + FDE188578E466A0EB7F794F84ACACB135115665717EDECEDEF9F3C6D5C6585DD + 63C56439A888D7B32F9F3D7528D4D881553FA9DCB1FEAF1F04EAEBC7996D9705 + C1EB84D895E2BF614854A43187D0C5CB04919989050BBED27F43AAB89893C17E + 60CD7C207EFEFA8C48E8E840B8AC14D8CFEF480D9B6627AB92E87D3842AA35B6 + 53707DADD8AD8E5F8BE8A4412D8F937ACFF4699B27929A71EBAB36F60960E5C5 + 8754D4925845AAE8401CD7F348EC793302F71C9D985F939A2841A425B1237661 + C1850FECD936CE11CF137C679B6C5E633AC6B2D8C53707610D9729E5E3946C29 + 07B092E39942E7068DDE87643D7C5A0216BBC6E05D5CAA944F92DAD144A71386 + 8E44F21174DAF0FDC1BD68CEF5C9E60288DD22B7F4EAC26A1F790C7C170EF546 + E890CE45A1B6C83DE8D3AB65AF22509B520B544370DC525D1486CD2DA1416B71 + 0A58ECEA18D562B7F7AE89CF904C9F2692FF2ACBD253FED967ECF07EF57F4D2F + FE87AFEC78B8A2A4E48A8E607F5B4496BADB42B169093F5B842273858393664C + A8A9F1B85D1EF1B350511EAB2E9263E76A852E78F194152FCA35D55323FBF6CD + 4E653A1E61C1EB84D885550FC2F5044A0F3E841002B06266227421B210EDE1CB + 19EC43CF9F48B54EEAD3131BCD583702DB21B6A89D904AA2422A21A8279335B1 + 8B54A7A8F3CB32A81F64FE83E5F968FC6FCCAC7F48E01CD2912ECC15BED6B0AC + C3728E094E4EA7B27D4429DF554A7D9AF5AC88DDFB487D2F30D29149474C5FE7 + 4E826708226E996E39CE7BB486FFB3338A005E21752401EF782A6BB995111651 + F4A32B4633F431220481E1946B8FD131F4230EE9AE19AE487F3558BF2EBE2F7C + EB4447F1E09E834E1FDCC7EC763AC61C55FF79E0EC53AA7CAFEAC37E0158733F + 34982466E47A60248AD301E3F047C7172509B5DE488CB6B5A61DD062B1AB63D4 + 8ADDDE951331243D6DF0A22BC6EF92677E843C55B573FB5B5A9AC33D9DAB6B6E + 78FCA766DBAEDDFCFEFD253EDFD7AA4A4B2A771E6E6EEA923D01AF24F5CCAD0D + 1475F7857A2654964DB3722E8AD0DD118D48975E316F52BD76F90B53CEF88D4C + D2D5A2FB5104EF4F15C17BF3085457A662F71C5287A2451BF43B95F24F9499D0 + C5B1E07E60C75A960EA3A41655F1E37D4E60FBEBE2EB5A01166A08F7FF6761FF + A2F70D0D2DDC1E607D154DEC918A7F25D5DAF81112EFE088904AD405E2C7BDDA + A1631991C8E885FA32337B5811BB2F3B583FC85E863AB7EBEE610646AA1E2655 + B468C1F3F2131A7D1346E1038E11182B22570FC4EEB749B53C1AC1627718BDD8 + C57A784790EAD9EE888A68C7322FB870FD918FB9A5C18E5612C85A86EC654640 + 189FAA13BB7626A955C55D27B43406A3B4BF3B9C6E53DB62D7254974DACC2A3A + F9844A0A1479A8B52B44BB3EEC1C2CD158F63E2705217683774EBC49960683A4 + 93FBD4F337BAC64D5BA65F27DCDDD5176A3DF6BBEAEB1F33FDA0FDE8D51DD7C5 + 62F4CD86DED8BC39B581433B1BDB6B97CC9C7034D83F30ADB6A2D4BDE340436F + 67D41338F384713D1DC1BEF0F88AD22ADD2E3A95B662ED65B3A6ACD2EFFBB52B + 6FFF7DB0BDEDCCE0F6ED271449E2D5A888E36B2E6878739DC3559689D8859FE4 + 6F48CC9F152014D98F29333F44ABC7B48391A5F196F8B9A7639D526E226BC204 + 8208138596A6594F7B0FACDC370CE1662210B4C04A03C1F749724EE82640430A + EB8FD157F15A5285D948922EBEACA8D885150BDF03A79E51D4397C7E7FEFF0F5 + 9AB9E8E09981FFFD6849D70DB318DC9520749D78E6E0C2F20FA4D6A7DECAC862 + 7718ADD89D42998F0C25C07B86CC7C4F509E5B792F7EE1C8C7244A16BB7D5199 + B6B7864C1346C0BF77BE4EA4C2027CD0A2D885AF2E7C76B5A44824A1C596D83D + F7D409F49D2B17D28C89A5C7FDD6D93B405FB86F23ED6B1CF6F07BECAE73E9C4 + C9C303034B6F7E960622C38FC3EB3FBD84B4D3A53EFD9D17E9C316B16635EFC5 + AEBC6A724930141BAC0DEF999FDF44251529C543B4BF3F126A6D7EA9E284595F + 9096AF320CF375F3869D759E58EC6A58614F1E573470B0B96D7CDD849A9EC6B6 + 4EFF0079DA944ED2ECB9B5C5EF56078AE763FD982C37B8247AD8E31958FBB919 + 338EDBE7E6EBBFB3BDBFA3635A68F79E2E5765C540F5AC3991FEC8C089ADEBD7 + FB4584EF08085EBB62D7AAE85C1D2F9958A7ACA61ECE045820D02076C5FF3E85 + 54BFD57969B683404083F09E85637D8654CB663AB4F14F45EFDB58029D0C88AC + 0306BF89D6BF13E760E652212A7647826748CD44E8B4EF237C9F9F30588EE711 + 231C0DD676E738E922BC40B8FE2FA91D8CC6F832B49027933A11F33C93EDD0EA + C2771D9D4CADE062B13B4C42ECCE227564E502836D51FF704D48446D41DDE39B + 84762155C704F50FE307DC7CB2117924271889DD77DA070633A4996194DAD7CC + E52115D807F6A5E52D45640B24A9B02C763F73D634FAF1D7960C5A768D50B6A7 + 85373E43DD7DC356E5FFFBC10A9A33B57CF87CAF7D2A49ECEE7CF852F27B87CF + 7FF91DCFD1C1A33D42D79EF762B777E5A4E7956A5D414581A3DEA59763E8B354 + 643B391695FB5B5A7644FAFB57D65CF75F7F365BEFC667DEB8A12C507CE6FC09 + 659F2CF6FB20BC68F39E431D9E928AF7E6D4141D2C2BF13FFE8593263F6DB42D + 26A3B53577BF56513D0E4371D4B877EF40F095977D81DADADDEE59B3236189C6 + 1D7BF59509E552FA54C30E0B5E3B6217BD7C4CE612159D4E0CC3A2D1830BC4F7 + 33D88755B496463BAE0622A00B8F98C4B708AC8BFA7E26FEEF7C14BBE04BA4FA + 91EAC9862B430233E1914BB10B7100379A171DDEEF24523B76E71BFC86307178 + 075EA3DCB834A48AF082EF1046F0E0C3DE95621F985C86C993F876E887DE8D2C + E6781F61459EAE59063188706CDA8ED691F8B1DB04AE039349F1DC245AEAB124 + 76F7D2F10606D41BE630C07D0D9D4323158686AC2E5EBFE8A419B93D38355179 + D4A217BBA9DC171220ABDACCB2648BECBEEE301D095A9BA0B6A8C64F014F727C + DD4D47FB455E644B62B7BACC4F2F3D78D1A0DB8219879A7B69D9EDC9D28AC5AE + 4DFAEF9C7C41548AA1074DEE05CB37BA6AEB96D9DACFB196FD91FEDE7FABBEE6 + BF1E90EF9C5E25DD7FA83DD3737BE3865537945754FCD0E3F7576A976FFED5C3 + 343E1EF161C285176E3A70E8E052CFCE9DE413A85A0705AF55B10B6BB515EBAA + 53FE86F00D46A33449707DCCB45F173F6F7C48F126C2DA800FAFE890BEDE9A6D + 6605D383E38ABA32984D12D28317F72BA436B2205FC52E1A5D0813A35914D970 + 650066C232976217201C19FC4DAD4FCB4ECDDF922A5CCC261B410CC38500E1DA + B239EC6C36F115420B7EA3FB2DECCB2C2A46BAC991C0E9680C6345EC5E44EAA8 + 93367A0BA2A7C0ED05E1FC443B4075A45AE6AF30F80DDF337470FFE2D0758F2A + B462172EAB5B5B438359D15231B3CCAB08DE648BEC2E45201F4BEF7E90C459E3 + 8B925211C37D62EB31210F424B62F7EA1527D177BE94DC0CBD73A09DFEF0CA41 + EAEA0BD38993CAA8C4EFA6FBFE3379DE368B5D1BC8ABC8130C4D1CEA2E793F7E + C576F2162DCC649F039DEDCD91AEF6A72ABFFAD8D7EDEEE3A52BEFB8AAA2AAF2 + FBA59595C74D6A0B0F0CD05BBF7B6448EC4EF9E217776EDFB8E1C4DAA3CD3ED1 + FD2B8277912278B78BAE6F8215B10BA18886E146C17DFF3BA9C245C4FA910ABC + 11B0E27C45605D343E9860F37F64DC30A3C22F26D5322DE2FFA79DAC93CA0AA6 + C58A2BC30A521B907440E4FC80861B183B6217220EE2019D863DF1FAA953CA25 + A486FFB23BE904E83B17E3496D2CBF46D6A21160481A11368C3A99A95C1910DE + A82B7EFCC47031C4DBA2F876567D3D8D44B71DB18B67FFA7F1EBAA8F2FAB237B + 75FE0752470D3A2D9E433A6035C7A845BA907468B4719F11E33993505E2220DA + CAC3F17AD2026B2ADEC9161BFB341B8E4F4CBA34139A852A76F1CC6AEB1FDF60 + A497B6135A11236388A0B1DAE037B84A40F0D63B74EDA306ADD8159C1C361867 + B7CA9F3CC26B35CE2EC29C9D59EB4F5A06D709B850086049EC3E78FD62FAFCC7 + 863FAFCD1DFDB4ECB63F537F38B53867B16B83DE9513F112DE94F83B13CB6E12 + CA1DEE3FD6DC5B5C3BF15E8F448F48E7AF160AFFB3F9BAEFACF2F9FDD7975555 + 4D4EB5DE811DDB3B8ACBCBE59EFA036D93169D51BCFBC93F4CAE127063D0D0A1 + 08DEE5190A5E2BF15D11EFD34A5637885DBC34995A7545437FA59B60A405FE7C + 102EE92CC55A8B2A9E797CEC455C29445C19F0266366F2B7D3AC9788ADFB8666 + 9955B10B0B167C90B790B14506EE3510651708EE2F01EA1CBE9D669D0BAB21E2 + 528988842B0386996175C5B81846730E53EA6150BC54F0E1C4A418910E13D848 + AAB86DD42CB32A76CD6213279849AAB5F112C1FD214208ACB07B2D9C832810DD + 70A7B95E707DDC9F27E3F584F382A877CAD501EF19DC85D6EA963B11860D2210 + C255DBF949E72252A862570BBE0DF8F665EA8A66964A1EFEBBF84E383D6A9153 + 1262172FC69663E9ADBA60F1383F15B993E5D51BA9D3FB1E0792529C5E932C76 + 31316D77677AB14D16C5EECF6E3A932E5E3265E8EFB7F7B7D3A5F7A637D4B3D8 + B548DF3D1397C5A2C919C85C1367BEEE3EF9DC33EDEE534BD30BFF139A78DEA7 + BC8AA86C9424E9C7BE15AB7F62B4DE81550FD575B6B5FFB2B82470AEDBE34D69 + 9D6D6D68E86ADABD2B5C128DB4974C98D8DBB27BD7B4AA49931BDAF7EC5910B0 + 109D214E87C71B99B1BC7E7B87D50DE38CF470382C26886260F72366C55716FE + 61B006897C15ACF8006B7D6511720B7ED9E944F23A4AEFCA806422B0545D9466 + 5F46163D2BF74DB413702AA9565FD14960A259F0A6C4AF73B9C03ED3C52A8675 + 0E62A74B605F7A3CF17AC03B2C121F541F6FD68AD8C53709023FDD042F2B133D + 473A952F440FC4C81D82F5A305A20F6211565F4C58CAC4FDCB286BA153C3DD66 + 425A3BF9534FA18BDDC7E3BF65ECD2476A8715C7D277AAEC4CEC1DF524C4AEA8 + D044DE89B374B171A1713735F75B3AAE51F832F8FCEE13B02C9345B17BFB65F3 + E9C64F0D0FDE45A231BA74D5067AFF506A49C262D722DA98BA4327E62F69F29C + FDC5894EECBF69E3F391F1A7CC7E75D8522CFD5211BC491F054C3E0B87BD1FBA + 2497D084B8B75F7E6960EA8C194D8DEBD74FB7216E8DB86545C396B536B71D69 + B16BC5DA6A8468582EBD4FAB08A2A980B543DAA213A5443EDE689060114D272C + 8CACC456EE5BAA865C8BA8A53901ACEDF0A3156904ADF8DB9A05B37702749EE0 + 0E72ABC0BA786E1FD1FC6D45ECC2FAFCA4E0BAA261ED46BA6E003E4818BDB997 + EC87AB432708C2177EC01BC99A80C3F1AF8B6FAB05B1B9615974227DB251E72B + D5FB5AC86217F582D1043B8972CC30EB548FD6F8CEB64988DDB7DB06A84BC00D + C1C8228BE80988A26005A318BB1662F55A12BBB315C1FAEC7DE7274562E80A86 + E9BB8F6CA33FBEF6A1E94158EC5AA06FE5A47B62241B5AE69C726538B2E1799A + 307F76D2BE640FCDF32F5F33645DF9E09E879649246FB0BAEFB6A623B1FE604F + 7FE35F5F73D744227EABDB0F21D1BD2B0E6F596573EB6C4C74CAC4274B342C17 + 2C8CBFB0B86FD154C07869FE8E86FD0445855B2A5706519708B346D8CA7D836B + C27AC13AC14440D18E89953A879BC47F939A56341D232DE844ADF37A71202A76 + 37D2F12E10A940E30FEBFDAC515037091259EBE0FA724506FB4167176E66EB68 + D8973A1546892E8CDC7832C1ECDD337B9E0B59EC8E847B8159A7DA4AE7794C00 + B1DB1F955F119C18661876AC2D14A3F73B847C6D87A8F1BB685EA52E0B9B2274 + 0F89852FB31C7AECEEBF3B95AEBDF0F8CFD7ABEF1EA53B7FFD1635B6068FFB8D + C5AE20C1BB272F9563B1941F7DF784996F0D14D59450695591BBA4ACCA5B565E + 61F53810BBE3E7CE78C93D69D6B98965B224DFE53FFFFE3589BFF7DCF5B3854A + E56EB37B2D9DADADB4FFC5F55D65BDC172B79D1D48B45C11BB1B6D1E3E5BB3FA + ED466580105D9D669D4CD2F48A4C104363FB691ACEAA266A114ED58089666533 + B3CA3A91E6D9889348B5BA9C21B0AE15E185EB85354DC43F75A4055D2DA9A305 + E9261AE29985B5293186282A76AD0A17233195ABBA3102930D2136E142719ECD + 7DE0F9FB1EA9D14C52B5FC78EEFE87923B228914D9762646996134AAA2BFDF09 + 0A55EC8EA46B81518753FF9D1DF340EC7ED81379455064D2F48087A6EB124134 + 042374A0DB5A64B61ABF5B11BBB663F55A16BB6E97440F5CBF982E5D3AFDB8DF + DABA4374D503AFD27B0793DD1A58EC0A321453D702EE3967FF9F6BCAEC8BAD6C + D3B6E32D2A76F5BF57BC60E929430B657993EF82FB9342D8ECBEF39F8FBA3D9E + F176AFE7DD973674F85A9AC3DEEEDE5A8B9BBEB4A261CB32DB1599DD1056F061 + 44A3213A4C251AE03DD50CFE74885A1CB57EBBA2C3FDA91A44A346DD08B3E170 + 2BE982B501EDD3212ABCAC36F65682F58B083AB408782717931A566A36A99651 + EDC42374405BE2E78A499CF025C56436081C11E1AD172056D2055B8907ED74DD + 8C24E8B42C2135541E7CCDAD4C58051094786FCC22B418D5F137E3F5E3244621 + FFF42338090A55EC3A7D4E5ACC5255EB5D87C63410BBDB5A43AF08247218644E + 85976A758920F67685A9A9CF9A613DDB621740107EE9BC13E98ECBE71F177317 + 111A2EBE7B3DB5F70C5BA859EC0A105C39F10EE5D1F9A19D6DDD1FB9749BABB4 + 4AF803DD7BF810F51FDAD55EB3F482A474C0DEAA3A9FB4F86B43DEDE1FDCF5B3 + DF492EE94B76AF69EBE3BFEFA9EE09967ACACB1B22B5B541DAB72FED90A644F2 + 0EB737BA2C83C969209B6217439A68CC441B6B51E1050BC143641C9B351DF8E8 + 624873499AF5F40DAE688408B32409227E9A1BC97C38BC50C52E4C07681031DC + 6927752C9E41B874C05FF0EC34EBB2D84D0FDE1F648F84F045E741E4DB6A1655 + 016DCA77E3458B15371C514A488D30709D6699D904C04215BB765CC34431BBD7 + 56DF9D51CDDCA70E7DAC31187D4574FD85D53E2AF52647647AB77D803A06AC45 + F9ABF6BBE8E44ADB29876D89DD04D36A03F4AFDFF8282D98912499E897CFEEA1 + FB1F7B67E86F16BB69E8BD7BD2628AC96FDADDDE7BE6E75FA6928A73AC6C73F8 + 894742E3969CB567A02F34C54572500E873A5CD1C81B55B76DB836B1CEDE7B7E + 8E61BEA7EC9CD39EB7B6D2C0F6ED9498AC56BE6CF9EEFEC84065F7077B239E60 + D0EBEEEE36B21877CA242DCB629C5D23D06861E2085C3AD20907ED36A2E183AC + 0CA98F34FA8FB0A81B8251236666D5D083E361A29051B7BED0C42E260622DAC6 + 3D94593C602BB0D8B5063E6053494DBE826F63AAD11223B726A37AC8C44529DD + B91A892DA3FA2D54B13BD2CF9AD1FB3492D6E4AC53FEE801A3FB608A3E110440 + C8B27E8190655A2A7C2E5AA09BA066C11D2223B10B4A8BBD8A983D9FA6D4940C + 2D3BDCD24BE7DC369C458DC56E1A7AEF9AF80CC9837E3DB6B09370A2E7E0010A + 371D6C2BF6459AE5A8ECA1F686935C2EF9DEB2FB9B5669D75304AFE559A45D6D + ADD479A4B1A1F1F5CD5312092640C4E7EB2E9E3FBFB17CCAE4B2C6AD6F91BFB1 + 511BB3D729A10BEC8A5DF8B922B4161A23B34C476688CEAC1E4D59C28CFCF9D0 + 38FC5B9AED8C1A45910949F04F84CB8D596353486217A9B931C9E932C1633905 + 8B5DFBE09A10CD01B18DCD464DF4A31E56FCBA470A441E784CB7AC10C5EE4887 + B90346936147C23F3B675811BB5E97441FD52582B090E23789528F8B16D6248B + 5DB842C02542808CC52EB8EB8A53E9BA8B869B38651F34FBAB4F52341E2F98C5 + 6E0A822B27DD2C939C91EF5626D9D5A27D7DD4FCDCE334AE3C8AABFF9FC0EAA6 + CF687FDF79FB4F5EF4FAFD9FB0B2CFA683F5D4F6E6E6367F776FB576F0022E0A + 8AA03DCD35AE767F64A0AFC4D5D533D1B370D1BEC8FEBD726CF6BC7B2EFCE3CF + 1FB3729C14D81194FA149BA982851B211A9F7534895DA3C62855462F2DFA465D + 4424A79B995C28621702E85FE2D7906D58EC664E75BC2E8CB2B3C1071EF1569B + E37F5B99A8375218B91D15A2D8CDE4FA323947ABDFAB518D15B11BF048B44817 + 760C892490504214651783111DE0B3ABCFC206E370AF22269149ADB93F4A7DE6 + 7EC48E88DDEF5FB588AEFCC4CCA1BFC3CAB1E75EF7D4A0E8052C7653D0BB72E2 + BBA40A0CDB783FFAB94D14A84C17B3F53862E13075EDDD15741DDC5A52EC1BBC + 5B7D24454E0CAC3E3614D775DFDD3FBF5996AC4FA408767753B0B3B3EBC8D637 + C3A56DED3589E555E79CBBF9F0B62DB303DDBD55346EDC41B9ABABCA150A5D75 + 7EE3D6A71DAC563B99B88C72C94394E0832D6A7DC3C7F40A4A9D937EB48B5DD1 + 8417DA6D45E3F4A69B94530862D72C0140B660B1EB0C66E988F599CB58ECB2D8 + 2D58B16BE47A0071BAAD35FD54145885A706DC34B1D8739C1B84194874B1BF3B + 42E1E333B32589DD0B573EBF562663B16B74A8D2122F7D7CFE04FAFB4FCF21AF + 7B5870BF7DA09D2E5D359C13C6AAD8BDF6C77F3D2E84993CF49FE46592442B9E + 5B7DC19816BBB000588D569084FB8C4B5E76558C37F4D94598B189F367FD8754 + 3B6368A259DFD1C6C8404B539B74F483E26229A89B8C247F3AB0E6E89F127F21 + 8B5A34221FB07B6EF0DD95776C275FBC6AEBAEBA3AB8ED2F2FB84B3B3ABA249F + 3FE46E6DFBF6050D6FAE73B85AAD084A085D4CE878D7E4772BD9A0403AFF5DD1 + 8412D9C0AC31128903AC6D3844EA5B24E44F21885DD1106F096065873BCD1BF1 + EB4D7C398BE3D785A80DF0FFC430B988DF2F8B5DE7A823B5EEF4BEFD88E39A08 + E368E4CB0E410C77AD6CF970C25D49FF3EB3D81D198CCE11F71FC22A687D77A3 + 0F2B62D7685219125120218519C8B836B5C4435302E222570B2CC7EFB787A927 + 9234012E49ECCAB20C638365CBAE9E6FFF761B3DFA97FD437F5B15BB16395F92 + A417ED6EAC2707627792F222C8D7DADE81CBDBEB5E7A598BCBE7AFD32E8EF4F6 + 503414EA72793CA5DEF28AA1AE48CBE657FA025DFB8ABD6E6373BFB2F447A56B + 9ABEA55DB6F3F6B5FBBD7EDF0CA3F55B8F1CA163BB7635D49C70426FD5F4E933 + 60D12DABAAF21EDCF95E7F7149A0ABEDF0619777CF9E71380197CFD775C2955F + 1A7C12B63EFD64D7A4D34EFBED398FFE9348CA5CAB888A2691749D782660ADC5 + 10BD68BA516426830FAF91E7FC68F0E14B60D65020741842E5A48BD99AB01889 + 08A675943ED57021885DD1E41D38879BE3D72AE2DE8634CD885F9C2E59028B5D + E7304BE4A0AD63A37A180DB1570B51EC029EA0962156C4AE51B8B0546217E278 + 6699978AECA85C0DB0ECEE508EA19904E7B8D8DDF47EF360ACDDA8C68ACC6237 + 05A195134F8EA8C2C2D6EC7CEF69E76FA49A69CBF4CBFB9A8E502CD4D71E3861 + E660AC8C818E76EAD8F4DC4055519F2FCD2EDF0EAC694A121B3BEFF8C92FBC3E + FF0D462BC372EBDDB1236959D1B4E96F4B752754B5BEFCF2B4124DBABDB23973 + DE18B7F46C04DEA65DAFBFF6DCA75EF8DD452354AD4E2727B0928E15C0728318 + B946D6D1225285F0DFA7D987597CCC6C809B764BFC3C53818FF8DDF1BA49276A + 4452CDE6BBD885B811B9F7A99E9F4CCF85C5AEB3188D82E863642306EFF774EB + 68635CE7824215BB6661139DC22861505E851EB32276E1637B8ACEB26BE4B35B + AC88DB198AC8ADD6F9E4EA0929E2D5AF13C248190C4D8B6DCB3421CEDA43317A + 6F384B9B636217E2F6BF5FAEA7FB1EDD417D03C9418558EC0AD07BE784EB94C3 + 5FA59CC1C744B7714FA8DBEA3A65B9A9483EF4CCE33DD33F735929FEDDB97B27 + D1FECD54E24F6F24925C9EA9253F38DC90F83B55EAE01DAF6C8C96EFDD7FDCDD + 2BAAADDDDD3F6DDAE440758D578E447A8E6E79C353311096267CFA33ED3DBD3D + 7D67FEEABE9347B03A4722131766CFE3E3FD59C17330F303062293B9F4BE7FD9 + 4624FD2CEA0F43B6F898A71A96475DC0E298CE1D26DFC5EE2EC1F3B0936294C5 + 6E6E10F1D134AA63086074122D47BB71886C885DA787EF8DEAD1AAD8C5328CBC + D9895F9E0E8CFCFD8CD48E8E969116D859C58AD82DF14874BA6E821A400485A3 + 7D512A567E9F5CE2A109C5EE94E20B93CF206A91C8E2B46A5F92A86D56F6B327 + 1E91618AB2AF1965C3C91FDE3C161A14C8A413BB4FBE7A5048ECCAF2F0EB190C + 45696F6317BDB8FD08351C337EA4EFFDF2429A326E3834D9D7FFF9758A4487C5 + EE43FF7026793DA9057D0A569CB768F2D8F5D9D513BC73D2DFC82EF92A915064 + E9A230B4BFFB3655CD9DB7853CDEC54D2FFF852A070E925BA09E2559FA42C9FD + 479ED02EFB60E5BF0425B7BB58BFEE5BCFFE6F4FD5D1A3A5FAE57059F0CF9ABD + BF5FA20AAFD7DF136C3F56E66A6B2B8A75766FB8B871CBDF8D70358E54DA59AB + E1C860B1FF07A574E9961BA5F534C22CAD6E36109D74F6AC523E99661DF82FA2 + 714F973227DFC5EE31C1EBBB375EAC0821B386560F8B5D67316AF8F5965DA3CC + 82763A344E920DB1EBE4E894D5840D66CF9F68C7DB0E46916C4683CB8AA35811 + BBB869671AC4D915057EB7FBBA22D41D1E168CE58AD03DB53AD95AACCDC88650 + 6798DC0634C92B1C89C6904BC67C340633BA574E3C5739996BA5148D97F7239F + 7D954AAB4D2DC1DDFBF75260EAF463B18181EA23CF3DE99A5825969E4F79081E + 29BDBFE92AEDB2F76E79E04F2EAFF792BE9E6E2AAF1E0AAE40DB5FDE182BDEB7 + CFE533A83AFFB469EF44FD7E4FD5FCF9D5A555D5135A0E1FDE77D6BAD52765A1 + FA464AECE2223199ED9716CEC5C87F573479839DE16C2D10E50882FF6732F61F + 4E0702E93F61633BFD35885AA859ECAAD819F614ADBB4210BB30EDA0B3D6E9E0 + 3ECD307263D0D7B1D924B55C8EDC382D768D9E3F279367987D33AD8A5D005F78 + 18129CB4AA9BB97EE5BA53E33856934ACC2AF70E5A6EAD0083EAA1DEC8A035D7 + E826D5957A686A20397D6F6B283AE8A30B4B71428DC037B82BCC62D788512376 + 1374DE5E3BCBEDF1DC24910CF159A1FDCDBD60F946576DDD32B36DE54884248F + 67D0C24B07B75169B1707ABEF6C09AA6A499DDCF4F5972B5AFA2F4FB3D7DA1CA + E9679FBD4511B24BDD6E8F2F3C30403B9EFD534F4D7B4769AA1D22C6EE89D77F + 69D98C55B764920658949112BBC02CE4901948E58A7BA70D346E4534E31C6F54 + CA6B16CE11FB3F8BD4F0567395721FA96944AD5A88AD460E3002421B82FD98C0 + BA2C7655AC0EB55A096796EF623731A1F43652475536D1C8B90A984D5033B2CC + 1B4D4C5C47E9276D8E144E8B5D4414429419FDA456A786F0CD5299DB11BB2311 + 95A18E8C2373A40BB738E6B02A7631D90CAE0C2E4175D51B91694F6778304499 + 19D8D5EC0A2FD516998B68CC1BDBDCD24FF1396A2C76758C3AB19BA0E9B60981 + 528F7493240D0A9FC161F47462B7BFF928859A0F77D087EF54C257D73573F1B3 + 21F2CF1878FFB57981A2D4C2D745D239C56B8E0CE5BFDE50B7B03212F60CF54E + 5D3E5F67D1A90B0E55CD9A33A3B5B1D15B5A5E7EF883679E3EB14A3ADE4F0242 + D7ED8D2E5B5EBF3D1B42178CA4D80556C39161E80C82EF03CDB23A32FE381A81 + F3C304175859D309560C95E2258618D7360C488E81891356B2F8E04B8261C36F + 5BAC1F2D98D4878FBD88E0C877B12BEAB33B92EE35F92E76B575818E267CCAFF + 9BEC8D6CA4630AA9915596EB961B4D3E33EA38E25DC4C4DFDF3B784E7090C47B + 9BCE4FD669B16B76BFCD5CB9AC1088EFFB7A83DFEC885D6094DAD92E3031A273 + 73976E7936429D651DAB62172029C49C722F4929141622287CD81BA123C1A870 + EF745AC043D39562B45F58860FF50CBDF62C76758C5AB1ABA567E5A42F2B02F2 + 2645EC06CDC46E6FC387D4BFED2F545E12C383D3E53DE7CA56C9E39BD1BA6D0B + 15B7BC4B5E4FEAC749F9F5C1D2354DB76B97BD30E58CEDC880765CA529C277C0 + EF1D7075F7D6EAFB593910BA60A4C52EB880D4F4B8A2E1C8F41F573C6B101ABF + B3704CA4BB8430C1D067BD6639A67FC2771B437CA9E2ADE258109F567CE844FD + 8B8DB0EAAF96EF62F72D0BEBFF3BA9D6DDB614EB40D82076312CF7A27EE4F92C + 76CD3AA10F923A1AE3646413B30C8BB024C34FF5A06EB999F53D5D9C6F2BE079 + 802511EFEC370CCE418B59084474165EB6797CA389B7990AFA74A11FED8A5D00 + 71FA63CA6C4E44AAF3C3FEF1DC89F90F8E11EC885D806C6AD34B3D54E5730F59 + 79617D859B019241A0C46C8CC1C0723CA9D84DE53E1779941D433463D25AC287 + 370E8B5D1D6342EC26E87BF4F2EFB9AAA77F43F27893C44DA8F51875EDD8D453 + 49AD83AE05EE598BB7BBA62D5818E9EDA596F54FA8A981D3558444BB4B5637CD + D52E5B3F75F12A45057F37EDC6C37446A29E851737BD5E9FE5AAC986D8B59A4E + 18E0A38FA1CCC42B6DD525C2093079265D43A845D4BFD88875646D9836DFC5EE + 5F492C12478237491547B85E885E3C3778EEA6922A4A3034FE71C17D25C857B1 + 5B12AFABEB4D7E475D427C20A6B6B03F970918BE82A04507D68AC0C1503FEA5F + FF2E392178F5298C13319DCD9E65B3FB636524468F59AA71BBD787F61856F35F + 937967CEAAD845075C3B511016D907C89E8517CFC1DF929AFA5B6F6040F4228C + E63558DDE968C7AED84D809BEA89ABDDB01D756B0F16BB3AC694D805F2865545 + 3DC79ABE25B9DD37FACACA2774EED949F2DECD14288A3F44C595EF7BCFFADCC9 + 480DDCFCD2F3035552B34FD477261A75CD2DFF51E3D0C7F2F9294B164A246F13 + 3CB54E99A4651734BCB93D07D5920DB10BAC862333F2DFB5EA12E104F0DF85D5 + B05F707DD144087AD0C0FDCAC2FA852076CD0441B6C857B10B20263141285544 + 0A3C3B10377807EDB836A0830AEB2946BDF44217D7001FD5FA14DB2F26754448 + 2FDEF0CCDD436A2C6A2B62DC15AF3FB828E95DA236C5CFC72CF280514C589194 + E766980DE727F6FB0D12F7A186951A1D0A58E51342121D75BD25DAAAD8BD9CD4 + 6FB0763FC8180A23CE36C1730378D6D031D0BB8B01A3EF7CDE90A9D8CD112C76 + 758C39B1ABE5C8F7977EABBFE1E0E5E3ABA27811A70D2EF4F8884E3A6B73EFDE + F76717875BAA44856EBC326E2F59D3F4A076D9FA298BEB29FD90692E852EC896 + D805A7923A44272A5E8CD209CF27554C6643F0A64B676C841D816627C44F2188 + 5D27FCA033219FC56EE2B81020A8E354AE375A9720FC3BD564407C35D1B14564 + 018CCE2C30584754E0605FB0EC62F8DCE83BFA54BCDE302135951847ECA58FC4 + AFD5286B1ECE07F33B3041D44CC099B928C10A0E21877BA217DE89BA801B17C2 + A9E9A30CCC22D53DC2E85B0697063C7F3F8B9F9FD179E1BACE217582A1F67D85 + 15FD99F8F568B193410DD7F410257F67706E7F886FB3D3A4EE71ED53E3F58D7A + 37BA7FD8CFD749F5CFCE550CE51185C56E6E60B16B80BCEA645F6F5FEB8D924B + C290DE29B6F743F44AE99AA673B4CB9E9FB2645D3C32448AEDA4453914BA209B + 62D74E3A61C4AF85FFAE36B310EE131A0291096B76B1E3B30B6065C1D0AC95D4 + CE7662041782D80556470444C0B95752FA8E68BE8B5D807712B16DE1D620FA3E + C1AA87FB0EE19B704140C704C27611A9CFA61956054E3AC10B2006372AE58DF8 + 79E19C6055C67702D661442730F3CDDF1D3F9F97D29C0F5C94F03C5C96A24E20 + BA0FC5FF9E4E6A9417D487D93B28FA3DDC1DDFF7AEF8DF65F1EB5A62705D890E + 3AC2563A952E18ED1AA2E118DD57B80C6D8AD73D3A41569E83BBE2D73E121322 + 47052C76B3C315CB665065A98FB6EE6DA537761D63B19B8EBEBB267E2526CB37 + 2897664B4485655F75E5FD87867AEF2F4C3EE35259929E325B5F11BAD7284277 + 5D8E2F3B9B6217E0C30A317893E0FA668D232CF2ABC8791F5E1C0F43B7685CED + CE3E5EA194E72DAC0FCBCF7A8BC72814B10B9C745F412706C3D16B05AEB110C4 + 6E0288435862D1A8894EE0B30A9E15C46DC53369C592A70D0FB8C4C1F3C1903C + 5C2C7609AE8F76E1511BF593EA1D843B030C22B8FF7626B66AC13707DFD50FC8 + 9974C1DA67ED74523BE54E1818ECBAA18C3958EC8E3C1EB78BAEBD681645A331 + 3AD8DC4BEBDF6A64B12B4AEF5D132F515EC11B952BBCC4CA762E89AE2A5EDDF4 + 48E26F7D08322DA344E8826C8B5D601686C80C0C956172833EE03A7CF03E41AA + 7871A211FC537C5FAF5366C36A98D481E7E07C8175F1427E85D4C920562824B1 + 0B4E886F6F67F21F4027063E9218E22D11BCC64212BB0970FFAF2635049693A2 + 17EF03DC25EA33D8472ADF4F2BC01A89A81CB0565AE9D0A2CDC3330FD7826A0B + DBA57B07B15F3C8B10F3734477AA03CFF52A1A1E89725AEC02270C0C4E3C0763 + 0616BBD9E1AC79B554E473D381A61EAA3FDAC362D72ABD774F5A2CC762374B24 + 5D29B48124FF31B0FAE8A5DA45EBA72E7E5A914D4943B0A348E8825C885D6035 + 9D702AFF59B80E2C8FFF8E214B2B0D214410ACEF68F8E03BEBC4909A59862023 + E08FFA03B22EAE0B4DEC02DCE74F29E55B24DEB949F81742DCC0275AB6708D85 + 2876B5E7044B3A3A62F87E59117709202AD1A9453DC27AEA945F265C04600DC5 + 64502B821C6E1778CF314A24FA3EE8C1BB8D217A749C3E25B03E9E3F7CE730C1 + AD27CDBA10937806F0CC89D637DEEF1F92EA86A1B5928E84D8D55E3F2CB3A21D + CFC437162E0B9B29CFADB95A58ECE60616BB3609DE3D795A2C26DF26C9F2D794 + ABF6A758756F604DD32CED020357865B56346C11C9DEC4D803BE7510424B49F5 + 6B83EF9AD65A02DF3AF8F86162C9A6F8DF23912A55247D30ACB9E81CBD91DB2A + 1B7360E87736A91D1BDC67DCDF45F1DF20B020C4619DDF18FF7F2641FA99E110 + 6EA8634C10C590363254A2A3951065897A4FBC5B1035E926B3650A2668C13F74 + 69BC4CD09CD3EEF8B9EC88FF1B0DDF87E49CD0C2A8D2C9A40ABE3349F50F4E08 + 6F3C7310F710A208DFD66C71DF898EC63252BF65DA7D27BE5F10B7988456EFC0 + 355911BB091293EF708E08E987FB80F8E5303440DC621ECA3BF13A78DD461DE4 + 058AD84DC4751F4B342862775FE28F59D73C394796E5E9B93E292BB85DD2D6DD + BFFE7C5BE67B522918B19B0093D982A1D6DB6459FA4749A2F1C7FDAE34AAA56B + 9A2AF4CB0705AF4BC203BF71C5E12D1B737D1D8C234048E35E1B856512F53185 + D50B2186AC646A63188671123B6297610A868213BB5A7A574EB89624E95645E1 + 0E8598522A6463C99A26513F5466ECA28DB800AB11428D2193529854EB171A0D + 11DF3BABB1751986619C86C52EC3A4A0A0C56E024C669364BA4D96A825B0BAE9 + F25C9F0F9315CC82DD5BC1EEC4348661182761B1CB302960B1CB14224E253A40 + 082684F2C9CB60EA0CC38C1958EC324C0A58EC32858813296CF336173CC33063 + 0E16BB0C930216BB4CA16125A49819988C06A1FBC75C5F0CC3300CB1D8659894 + B0D8650A8D19A4C6E8CC2493D79DA48AE5BC4D91C930CC9882C52EC3A480C52E + 536820B8FEAFC95E807DB08AD4280E7D36B7671886711A16BB0C930216BB4C21 + 62279D2A82ABAF52CAD35440D98318861913B0D8659814B0D8650A1964953A95 + D4B49CC8DE54476A262590C82605918BEC79C826C5D65C866146232C76192605 + 2C7619866118866198BC85C52EC3300CC3300C93B7B0D865188661188661F216 + 16BB0CC3300CC3304CDEC26297611886611886C95B58EC320CC3300CC330790B + 8B5D866118866118266F61B1CB300CC3300CC3E42DFF1FCED20B5884D2840600 + 00000049454E44AE426082} end object panContent: TPanel Left = 0 diff --git a/windows/src/desktop/setup/keyman_setup_sil.xcf b/windows/src/desktop/setup/keyman_setup_sil.xcf new file mode 100644 index 00000000000..61a53506131 Binary files /dev/null and b/windows/src/desktop/setup/keyman_setup_sil.xcf differ diff --git a/windows/src/desktop/setup/locale/cs-CZ/strings.xml b/windows/src/desktop/setup/locale/cs-CZ/strings.xml index c5b42a648a4..196dc26a818 100644 --- a/windows/src/desktop/setup/locale/cs-CZ/strings.xml +++ b/windows/src/desktop/setup/locale/cs-CZ/strings.xml @@ -72,9 +72,7 @@ Restartovat nyní? Stahování %0:s Stahování %0:s - $APPNAME Instalace se nemohla připojit k keyman.com a stáhnout další zdroje. - -Zkontrolujte, zda jste online, a povolte $APPNAME nastavení přístupu k Internetu v nastavení firewall. - -Kliknutím na tlačítko Zrušit instalaci, zkuste znovu stáhnout zdroje znovu, nebo ignorujte pro pokračování v režimu offline. + $APPNAME Nastavení se nepodařilo připojit ke keyman.com a stáhnout další zdroje. + Zkontrolujte, zda jste online a zda jste v nastavení brány firewall udělili aplikaci $APPNAME Setup oprávnění k přístupu na internet. + Kliknutím na Přerušit ukončíte nastavení, kliknutím na Zkusit znovu se pokusíte znovu stáhnout prostředky nebo kliknutím na Ignorovat budete pokračovat v offline režimu. diff --git a/windows/src/desktop/setup/locale/it-IT/strings.xml b/windows/src/desktop/setup/locale/it-IT/strings.xml index a8b8a5a83c0..281c086f09d 100644 --- a/windows/src/desktop/setup/locale/it-IT/strings.xml +++ b/windows/src/desktop/setup/locale/it-IT/strings.xml @@ -72,9 +72,7 @@ Riavvia ora? Scaricamento di %0:s Scaricamento di %0:s - $APPNAME L\'impostazione non può connettersi a keyman.com per scaricare risorse aggiuntive. - -Verificare di essere online e dare a $APPNAME il permesso di configurazione per accedere a Internet nelle impostazioni del firewall. - -Fare clic su Interrompi per uscire dalla configurazione, Riprova a provare e scaricare nuovamente le risorse, oppure Ignora per continuare offline. + $APPNAME L\'impostazione non può connettersi a keyman.com per scaricare risorse aggiuntive. + Verificare di essere online e dare a $APPNAME il permesso di configurazione per accedere a Internet nelle impostazioni del firewall. + Fare clic su Interrompi per uscire dalla configurazione, Riprova a provare e scaricare nuovamente le risorse, oppure Ignora per continuare offline. diff --git a/windows/src/engine/keyman/UfrmKeyman7Main.pas b/windows/src/engine/keyman/UfrmKeyman7Main.pas index 5034c0e664f..d8cb3e30e73 100644 --- a/windows/src/engine/keyman/UfrmKeyman7Main.pas +++ b/windows/src/engine/keyman/UfrmKeyman7Main.pas @@ -228,9 +228,6 @@ TfrmKeyman7Main = class(TForm) FActiveHKL: Integer; FTrayIcon: TIcon; // I4359 - FHotkeyWindow: HWND; - FHotkeys: TIntegerList; - FInputPane: TFrameworkInputPane; FIsInputPaneVisible: Boolean; @@ -295,12 +292,6 @@ TfrmKeyman7Main = class(TForm) procedure UnregisterControllerWindows; // I4731 function IsSysTrayWindow(AHandle: THandle): Boolean; procedure GetTrayIconHandle; // I4731 - - procedure RegisterHotkeys; - procedure UnregisterHotkeys; - procedure HotkeyWndProc(var Message: TMessage); - - procedure DoLanguageHotkey(Index: Integer); protected procedure DoInterfaceHotkey(Target: Integer); @@ -550,8 +541,6 @@ procedure TfrmKeyman7Main.FormDestroy(Sender: TObject); FreeAndNil(FInputPane); - UnregisterHotkeys; - with TRegistryErrorControlled.Create do // I2890 try if OpenKey(SRegKey_KeymanOSK_CU, True) then @@ -833,7 +822,6 @@ function TfrmKeyman7Main.ProcessWMKeymanControl(Command, WParam: Word; LParam: D end; FOSKManuallyClosedThisSession := False; FRunningProduct.FLangSwitchConfiguration.Refresh; - RegisterHotkeys; end; KMC_NOTIFYWELCOME: // I1248 - Redesigned welcome begin @@ -869,23 +857,6 @@ function TfrmKeyman7Main.ProcessWMKeymanControl(Command, WParam: Word; LParam: D end; end; -procedure TfrmKeyman7Main.DoLanguageHotkey(Index: Integer); -var - FKeyboard: TLangSwitchKeyboard; -begin - if (Index >= 0) and (Index < kmcom.Languages.Count) then - begin - FKeyboard := FLangSwitchManager.FindKeyboard(kmcom.Languages[Index].HKL, kmcom.Languages[Index].ProfileGUID); - if not Assigned(FKeyboard) then Exit; - - // Handle toggle hotkey - if (FKeyboard = FLangSwitchManager.ActiveKeyboard) and (kmcom.Options['koKeyboardHotkeysAreToggle'].Value) then - FKeyboard := FLangSwitchManager.Languages[0].Keyboards[0]; - - ActivateKeyboard(FKeyboard); - end; -end; - procedure TfrmKeyman7Main.DoInterfaceHotkey(Target: Integer); begin if not Assigned(FRunningProduct) then @@ -1356,7 +1327,6 @@ function TfrmKeyman7Main.StartKeymanEngine: Boolean; // I1951 StartKeymanX64; - RegisterHotkeys; end; procedure TfrmKeyman7Main.RequestCurrentActiveKeyboard(Command: WORD); // I3961 @@ -2023,18 +1993,6 @@ procedure TfrmKeyman7Main.StartKeymanX64; end; end; -procedure TfrmKeyman7Main.HotkeyWndProc(var Message: TMessage); -begin - if Message.Msg = WM_HOTKEY then - begin - KL.Log('Hotkey %d', [Message.WParam]); - if Message.WParam > kh__High - then DoLanguageHotkey(Message.WParam - kh__High - 1) - else DoInterfaceHotkey(Message.WParam); - end; - Message.Result := DefWindowProc(FHotkeyWindow, Message.Msg, Message.WParam, Message.LParam); -end; - function KeymanHotkeyModifiersToWindowsHotkeyModifiers(v: KeymanHotkeyModifiers): Integer; begin Result := 0; @@ -2043,83 +2001,6 @@ function KeymanHotkeyModifiersToWindowsHotkeyModifiers(v: KeymanHotkeyModifiers) if (v and HK_ALT) = HK_ALT then Result := Result or MOD_ALT; end; -procedure TfrmKeyman7Main.RegisterHotkeys; -var - hk: IKeymanHotkey; - i: Integer; - language: IKeymanLanguage; - id: Integer; -begin - if not Reg_GetDebugFlag(SRegValue_Flag_UseRegisterHotkey) then Exit; - - TDebugLogClient.Instance.WriteMessage('Enter RegisterHotkeys', []); - - if FHotkeyWindow = 0 then - FHotkeyWindow := AllocateHWnd(HotkeyWndProc); - - if not Assigned(FHotkeys) then - FHotkeys := TIntegerList.Create; - - UnregisterHotkeys; - - for i := 0 to kmcom.Hotkeys.Count - 1 do - begin - hk := kmcom.Hotkeys[i]; - if not hk.IsEmpty and (hk.VirtualKey <> 0) then - begin - // Note, if hk.VirtualKey is 0, this indicates a modifier-only hotkey such - // as Alt+Left Shift. These are handled in keyman32 k32_lowlevelkeyboardhook - // because RegisterHotkey cannot handle modifier-only hotkeys. - if RegisterHotkey(FHotkeyWindow, hk.Target, KeymanHotkeyModifiersToWindowsHotkeyModifiers(hk.Modifiers), hk.VirtualKey) then - begin - TDebugLogClient.Instance.WriteMessage('Added hotkey %d -> %x %x', [hk.Target, - KeymanHotkeyModifiersToWindowsHotkeyModifiers(hk.Modifiers), hk.VirtualKey]); - FHotkeys.Add(hk.Target) - end - else - TDebugLogClient.Instance.WriteLastError('RegisterHotkeys', 'RegisterHotkey', 'Failed to register hotkey '+IntToStr(hk.Target)); - end; - end; - - for i := 0 to kmcom.Languages.Count - 1 do - begin - language := kmcom.Languages[i]; - hk := language.Hotkey; - if Assigned(hk) and not hk.IsEmpty and (hk.VirtualKey <> 0) then - begin - id := kh__High + 1 + i; - if RegisterHotkey(FHotkeyWindow, id, KeymanHotkeyModifiersToWindowsHotkeyModifiers(hk.Modifiers), hk.VirtualKey) then - begin - TDebugLogClient.Instance.WriteMessage('Added hotkey for language %s [%d] -> %x %x', [language.LocaleName, id, - KeymanHotkeyModifiersToWindowsHotkeyModifiers(hk.Modifiers), hk.VirtualKey]); - FHotkeys.Add(id); - end - else - TDebugLogClient.Instance.WriteLastError('RegisterHotkeys', 'RegisterHotkey', 'Failed to register hotkey '+IntToStr(id)); - end; - end; -end; - -procedure TfrmKeyman7Main.UnregisterHotkeys; -var - i, hk: Integer; -begin - if not Reg_GetDebugFlag(SRegValue_Flag_UseRegisterHotkey) then Exit; - - TDebugLogClient.Instance.WriteMessage('Enter UnregisterHotkeys', []); - - if not Assigned(FHotkeys) then - Exit; - - for i := 0 to FHotkeys.Count - 1 do - begin - hk := FHotkeys[i]; - if not UnregisterHotKey(FHotkeyWindow, hk) then - TDebugLogClient.Instance.WriteLastError('UnregisterHotkeys', 'UnregisterHotkey', 'Failed to unregister hotkey '+IntToStr(hk)); - end; - FHotkeys.Clear; -end; - { TLangSwitchRefreshWatcher } constructor TLangSwitchRefreshWatcher.Create(AOwnerHandle: THandle); diff --git a/windows/src/engine/keyman32/hotkeys.cpp b/windows/src/engine/keyman32/hotkeys.cpp index 8327a786498..1652397d77b 100644 --- a/windows/src/engine/keyman32/hotkeys.cpp +++ b/windows/src/engine/keyman32/hotkeys.cpp @@ -137,9 +137,11 @@ void Hotkeys::Load() { // I4390 Hotkey *Hotkeys::GetHotkey(DWORD hotkey) { - for(int i = 0; i < m_nHotkeys; i++) - if(m_hotkeys[i].HotkeyValue == hotkey) - return &m_hotkeys[i]; + for (int i = 0; i < m_nHotkeys; i++) { + if (m_hotkeys[i].HotkeyValue == hotkey) { + return &m_hotkeys[i]; + } + } return NULL; } diff --git a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp index 019f88b0737..a6a84faf44c 100644 --- a/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp +++ b/windows/src/engine/keyman32/k32_lowlevelkeyboardhook.cpp @@ -130,26 +130,22 @@ BOOL IsTouchPanelVisible() { } /* - Cache UseRegisterHotkey debug flag for this session + Cache AllowRightModifierHotKey for this session */ -BOOL UseRegisterHotkey() { - static BOOL flag_UseRegisterHotkey = FALSE; +BOOL AllowRightModifierHotKey() { + static BOOL flag_AllowRightModifierHotKey = FALSE; static BOOL loaded = FALSE; - if (!loaded) { - loaded = TRUE; - flag_UseRegisterHotkey = Reg_GetDebugFlag(REGSZ_Flag_UseRegisterHotkey, FALSE); - } - return flag_UseRegisterHotkey; -} -BOOL UseCachedHotkeyModifierState() { - static BOOL flag_UseCachedHotkeyModifierState = FALSE; - static BOOL loaded = FALSE; if (!loaded) { - loaded = TRUE; - flag_UseCachedHotkeyModifierState = Reg_GetDebugFlag(REGSZ_Flag_UseCachedHotkeyModifierState, FALSE); + RegistryReadOnly reg(HKEY_CURRENT_USER); + if (reg.OpenKeyReadOnly(REGSZ_KeymanCU)) { + if (reg.ValueExists(REGSZ_AllowRightModifierHotKey)) { + flag_AllowRightModifierHotKey = !!reg.ReadInteger(REGSZ_AllowRightModifierHotKey); + } + } + loaded = TRUE; // Set loaded to TRUE whether or not the key exists } - return flag_UseCachedHotkeyModifierState; + return flag_AllowRightModifierHotKey; } LRESULT _kmnLowLevelKeyboardProc( @@ -171,59 +167,35 @@ LRESULT _kmnLowLevelKeyboardProc( SendDebugMessageFormat("wparam: %x lparam: %x [vk:%s scan:%x flags:%x extra:%x]", wParam, lParam, Debug_VirtualKey((WORD) hs->vkCode), hs->scanCode, hs->flags, hs->dwExtraInfo); // I4674 - DWORD Flag = 0; - if (!UseCachedHotkeyModifierState()) { - // #5190: Don't cache modifier state because sometimes we won't receive - // modifier change events (e.g. on lock screen) - FHotkeyShiftState = 0; - if (GetKeyState(VK_LCONTROL) < 0) FHotkeyShiftState |= HK_CTRL; - if (GetKeyState(VK_RCONTROL) < 0) FHotkeyShiftState |= HK_RCTRL_INVALID; - if (GetKeyState(VK_LMENU) < 0) FHotkeyShiftState |= HK_ALT; - if (GetKeyState(VK_RMENU) < 0) FHotkeyShiftState |= HK_RALT_INVALID; - if (GetKeyState(VK_LSHIFT) < 0) FHotkeyShiftState |= HK_SHIFT; - if (GetKeyState(VK_RSHIFT) < 0) FHotkeyShiftState |= HK_RSHIFT_INVALID; - //TODO: #8064. Can remove debug message once issue #8064 is resolved - SendDebugMessageFormat("!UseCachedHotkeyModifierState [FHotkeyShiftState:%x Flag:%x]", FHotkeyShiftState, Flag); + // #5190: Don't cache modifier state because sometimes we won't receive + // modifier change events (e.g. on lock screen) + FHotkeyShiftState = 0; + + if (GetKeyState(VK_LCONTROL) < 0) { + FHotkeyShiftState |= HK_CTRL; } - else if (UseRegisterHotkey()) { - // The old RegisterHotkey pattern does not support chiral modifier keys - switch (hs->vkCode) { - case VK_LCONTROL: - case VK_RCONTROL: - case VK_CONTROL: Flag = HK_CTRL; break; - case VK_LMENU: - case VK_RMENU: - case VK_MENU: Flag = HK_ALT; break; - case VK_LSHIFT: - case VK_RSHIFT: - case VK_SHIFT: Flag = HK_SHIFT; break; - } - //TODO: #8064. Can remove debug message once issue #8064 is resolved - SendDebugMessageFormat("UseRegisterHotkey [FHotkeyShiftState:%x Flag:%x]", FHotkeyShiftState, Flag); + if (GetKeyState(VK_RCONTROL) < 0) { + FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_CTRL : HK_RCTRL_INVALID; } - else { - // #4619: We differentiate between Left and Right Ctrl/Shift/Alt. The right modifiers are - // not used for hotkeys, leaving them available for use as keystroke modifiers within a - // Keyman keyboard. But we need to track them anyway, so that a user doesn't press them - // and receive a hotkey event when they shouldn't (e.g. RALT+F4 if the hotkey is F4). - switch (hs->vkCode) { - case VK_LCONTROL: Flag = HK_CTRL; break; - case VK_RCONTROL: Flag = HK_RCTRL_INVALID; break; - case VK_CONTROL: Flag = extended ? HK_RCTRL_INVALID : HK_CTRL; break; - case VK_LMENU: Flag = HK_ALT; break; - case VK_RMENU: Flag = HK_RALT_INVALID; break; - case VK_MENU: Flag = extended ? HK_RALT_INVALID : HK_ALT; break; - case VK_LSHIFT: Flag = HK_SHIFT; break; - case VK_RSHIFT: Flag = HK_RSHIFT_INVALID; break; - case VK_SHIFT: Flag = hs->scanCode == SCANCODE_RSHIFT ? HK_RSHIFT_INVALID : HK_SHIFT; break; - } + + if (GetKeyState(VK_LMENU) < 0) { + FHotkeyShiftState |= HK_ALT; + } + + if (GetKeyState(VK_RMENU) < 0) { + FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_ALT : HK_RALT_INVALID; } - if(Flag != 0) { - if(isUp) FHotkeyShiftState &= ~Flag; - else FHotkeyShiftState |= Flag; + if (GetKeyState(VK_LSHIFT) < 0) { + FHotkeyShiftState |= HK_SHIFT; } + if (GetKeyState(VK_RSHIFT) < 0) { + FHotkeyShiftState |= AllowRightModifierHotKey() ? HK_SHIFT : HK_RSHIFT_INVALID; + } + + //TODO: #8064. Can remove debug message once issue #8064 is resolved + SendDebugMessageFormat("[FHotkeyShiftState:%x]", FHotkeyShiftState); // #7337 Post the modifier state ensuring the serialized queue is in sync // Note that the modifier key may be posted again with WM_KEYMAN_KEY_EVENT, @@ -304,9 +276,6 @@ LRESULT _kmnLowLevelKeyboardProc( } BOOL ProcessHotkey(UINT vkCode, BOOL isUp, DWORD ShiftState) { - if (UseRegisterHotkey()) { - return FALSE; - } Hotkeys *hotkeys = Hotkeys::Instance(); // I4641 if (!hotkeys) { @@ -328,7 +297,6 @@ BOOL ProcessHotkey(UINT vkCode, BOOL isUp, DWORD ShiftState) { else { ReportKeyboardChanged(PC_HOTKEYCHANGE, hotkey->hkl == 0 ? TF_PROFILETYPE_INPUTPROCESSOR : TF_PROFILETYPE_KEYBOARDLAYOUT, 0, hotkey->hkl, GUID_NULL, hotkey->profileGUID); } - /* Generate a dummy keystroke to block menu activations, etc but let the shift key through */ PostDummyKeyEvent(); // I3301 - this is imperfect because we don't deal with HC_NOREMOVE. But good enough? // I3534 // I4844 diff --git a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas index ce1b8af33a8..906e121f077 100644 --- a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas +++ b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas @@ -121,12 +121,13 @@ TKeymanOptionInfo = record GroupName: string; end; -const KeymanOptionInfo: array[0..15] of TKeymanOptionInfo = ( // I3331 // I3620 // I4552 +const KeymanOptionInfo: array[0..16] of TKeymanOptionInfo = ( // I3331 // I3620 // I4552 // Global options (opt: koKeyboardHotkeysAreToggle; RegistryName: SRegValue_KeyboardHotkeysAreToggle; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), (opt: koSwitchLanguageForAllApplications; RegistryName: SRegValue_SwitchLanguageForAllApplications; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'), // I2277 // I4393 (opt: koAltGrCtrlAlt; RegistryName: SRegValue_AltGrCtrlAlt; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), + (opt: koRightModifierHK; RegistryName: SRegValue_AllowRightModifierHotKey; OptionType: kotBool; BoolValue: False; GroupName: 'kogGeneral'), (opt: koShowHints; RegistryName: SRegValue_EnableHints; OptionType: kotBool; BoolValue: True; GroupName: 'kogGeneral'), (opt: koBaseLayout; RegistryName: SRegValue_UnderlyingLayout; OptionType: kotLong; IntValue: 0; GroupName: 'kogGeneral'), diff --git a/windows/src/global/delphi/general/Keyman.System.Settings.pas b/windows/src/global/delphi/general/Keyman.System.Settings.pas index b021e56cddf..d8acd9d25a6 100644 --- a/windows/src/global/delphi/general/Keyman.System.Settings.pas +++ b/windows/src/global/delphi/general/Keyman.System.Settings.pas @@ -95,7 +95,7 @@ TKeymanSettings = class(TObjectList) ValueType: kstInteger ); - BaseKeymanSettings: array[0..33] of TKeymanSettingBase = ( + BaseKeymanSettings: array[0..31] of TKeymanSettingBase = ( // TIKE:UTikeDebugMode.TikeDebugMode ( @@ -370,14 +370,6 @@ TKeymanSettings = class(TObjectList) // keyman:TfrmKeyman7Main.RegisterHotkeys, // keyman:TfrmKeyman7Main.UnregisterHotkeys // keyman32:k32_lowlevelkeyboardhook - ( - ID: 'engine.compatibility.old_hotkey_registration'; - Name: SRegValue_Flag_UseRegisterHotkey; - RootKey: HKCU; - Key: SRegKey_KeymanEngineDebug_CU; - Description: 'Set to 1 for old RegisterHotkey pathway'; - ValueType: kstInteger - ), ( ID: 'engine.compatibility.use_keyman_core'; @@ -391,18 +383,6 @@ TKeymanSettings = class(TObjectList) ValueType: kstInteger ), - // keyman32:k32_lowlevelkeyboardhook - ( - ID: 'engine.compatibility.old_cached_hotkey_modifier_state'; - Name: SRegValue_Flag_UseCachedHotkeyModifierState; - RootKey: HKCU; - Key: SRegKey_KeymanEngineDebug_CU; - Description: 'Set to 1 to use a cached modifer state when checking hotkeys; if '+ - 'set to 0 then engine.compatibility.old_hotkey_registration may not '+ - 'work'; - ValueType: kstInteger - ), - // keyman32:keyman32.Initialise_Flag_ShouldSerializeInput ( ID: 'engine.compatibility.serialize_input'; diff --git a/windows/src/global/delphi/general/KeymanOptionNames.pas b/windows/src/global/delphi/general/KeymanOptionNames.pas index 27aef82ab55..73356d19cb3 100644 --- a/windows/src/global/delphi/general/KeymanOptionNames.pas +++ b/windows/src/global/delphi/general/KeymanOptionNames.pas @@ -5,7 +5,10 @@ interface type TUtilKeymanOption = ( // General options - koKeyboardHotkeysAreToggle, koAltGrCtrlAlt, koReleaseShiftKeysAfterKeyPress, + koKeyboardHotkeysAreToggle, + koAltGrCtrlAlt, + koRightModifierHK, + koReleaseShiftKeysAfterKeyPress, koShowHints, // I1256 // Startup options koTestKeymanFunctioning,