erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-13 12:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 23

chore(resources): code changes for keyboard to keyboard3 🙀

Browse source
This commit is contained in:
Steven R. Loomis 2023-09-18 18:38:16 -05:00
parent 15de700db4
commit 8be00cb482
136 changed files with 443 additions and 443 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/web/types/build.sh
View file

@ -29,8 +29,8 @@ builder_parse "$@"
function compile_schemas() {
# We need the schema files at runtime and bundled, so always copy it for all actions except `clean`
local schemas=(
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard.schema.json"
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest.schema.json"
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json"
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json"
"$KEYMAN_ROOT/common/schemas/kvks/kvks.schema.json"
"$KEYMAN_ROOT/common/schemas/kpj/kpj.schema.json"
"$KEYMAN_ROOT/common/schemas/kpj-9.0/kpj-9.0.schema.json"

2
common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts
View file

@ -11,7 +11,7 @@ export interface LDMLKeyboardTestDataXMLSourceFile {
/**
* <keyboardTest> -- the root element.
*/
keyboardTest: LKTKeyboardTest;
keyboardTest3: LKTKeyboardTest;
}
export interface LKTKeyboardTest {

60
common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts
View file

@ -39,27 +39,27 @@ export class LDMLKeyboardXMLSourceFileReader {
* @returns true on success, false on failure
*/
private boxArrays(source: any) : boolean {
if (source?.keyboard) {
if (!source.keyboard.keys) {
source.keyboard.keys = {
if (source?.keyboard3) {
if (!source.keyboard3.keys) {
source.keyboard3.keys = {
key: [],
flicks: [],
};
}
if (!source.keyboard.keys.import) {
source.keyboard.keys.import = [];
if (!source.keyboard3.keys.import) {
source.keyboard3.keys.import = [];
}
}
boxXmlArray(source?.keyboard, 'layers');
boxXmlArray(source?.keyboard?.displays, 'display');
boxXmlArray(source?.keyboard?.names, 'name');
boxXmlArray(source?.keyboard?.vkeys, 'vkey');
boxXmlArray(source?.keyboard?.keys, 'key');
boxXmlArray(source?.keyboard?.keys, 'flicks');
boxXmlArray(source?.keyboard?.locales, 'locale');
boxXmlArray(source?.keyboard, 'transforms');
if(source?.keyboard?.layers) {
for(let layers of source?.keyboard?.layers) {
boxXmlArray(source?.keyboard3, 'layers');
boxXmlArray(source?.keyboard3?.displays, 'display');
boxXmlArray(source?.keyboard3?.names, 'name');
boxXmlArray(source?.keyboard3?.vkeys, 'vkey');
boxXmlArray(source?.keyboard3?.keys, 'key');
boxXmlArray(source?.keyboard3?.keys, 'flicks');
boxXmlArray(source?.keyboard3?.locales, 'locale');
boxXmlArray(source?.keyboard3, 'transforms');
if(source?.keyboard3?.layers) {
for(let layers of source?.keyboard3?.layers) {
boxXmlArray(layers, 'layer');
if(layers?.layer) {
for(let layer of layers?.layer) {
@ -68,18 +68,18 @@ export class LDMLKeyboardXMLSourceFileReader {
}
}
}
if(source?.keyboard?.keys?.flicks) {
for(let flicks of source?.keyboard?.keys?.flicks) {
if(source?.keyboard3?.keys?.flicks) {
for(let flicks of source?.keyboard3?.keys?.flicks) {
boxXmlArray(flicks, 'flick');
}
}
if(source?.keyboard?.variables) {
boxXmlArray(source?.keyboard?.variables, 'set');
boxXmlArray(source?.keyboard?.variables, 'string');
boxXmlArray(source?.keyboard?.variables, 'unicodeSet');
if(source?.keyboard3?.variables) {
boxXmlArray(source?.keyboard3?.variables, 'set');
boxXmlArray(source?.keyboard3?.variables, 'string');
boxXmlArray(source?.keyboard3?.variables, 'unicodeSet');
}
if(source?.keyboard?.transforms) {
for(let transforms of source.keyboard.transforms) {
if(source?.keyboard3?.transforms) {
for(let transforms of source.keyboard3.transforms) {
boxXmlArray(transforms, 'transformGroup');
for (let transformGroup of transforms.transformGroup) {
boxXmlArray(transformGroup, 'transform');
@ -208,7 +208,7 @@ export class LDMLKeyboardXMLSourceFileReader {
*/
public validate(source: LDMLKeyboardXMLSourceFile | LDMLKeyboardTestDataXMLSourceFile): boolean {
const ajv = new Ajv();
if(!ajv.validate(Schemas.ldmlKeyboard, source)) {
if(!ajv.validate(Schemas.ldmlKeyboard3, source)) {
for (let err of ajv.errors) {
this.callbacks.reportMessage(CommonTypesMessages.Error_SchemaValidationError({
instancePath: err.instancePath,
@ -345,16 +345,16 @@ export class LDMLKeyboardXMLSourceFileReader {
boxTestDataArrays(raw: any) : LDMLKeyboardTestDataXMLSourceFile | null {
if (!raw) return null;
const a : LDMLKeyboardTestDataXMLSourceFile = {
keyboardTest: {
conformsTo: raw?.keyboardTest?.$?.conformsTo,
keyboardTest3: {
conformsTo: raw?.keyboardTest3?.$?.conformsTo,
}
};
const $$ : NameAndProps[] = raw?.keyboardTest?.$$;
const $$ : NameAndProps[] = raw?.keyboardTest3?.$$;
this.stuffBoxes(a.keyboardTest, $$, 'info');
this.stuffBoxes(a.keyboardTest, $$, 'repertoire', true);
this.stuffBoxes(a.keyboardTest, $$, 'tests', true, (o, r) => {
this.stuffBoxes(a.keyboardTest3, $$, 'info');
this.stuffBoxes(a.keyboardTest3, $$, 'repertoire', true);
this.stuffBoxes(a.keyboardTest3, $$, 'tests', true, (o, r) => {
// start with basic unpack
const tests : LKTTests = LDMLKeyboardXMLSourceFileReader.defaultMapper(o, r);
// add ingredients

2
common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts
View file

@ -11,7 +11,7 @@ export interface LDMLKeyboardXMLSourceFile {
/**
* <keyboard> -- the root element.
*/
keyboard: LKKeyboard;
keyboard3: LKKeyboard;
}
export interface LKKeyboard {

10
common/web/types/src/schemas.ts
View file

@ -2,8 +2,8 @@
import kpj from './schemas/kpj.schema.js';
import kpj90 from './schemas/kpj-9.0.schema.js';
import kvks from './schemas/kvks.schema.js';
import ldmlKeyboard from './schemas/ldml-keyboard.schema.js';
import ldmlKeyboardTest from './schemas/ldml-keyboardtest.schema.js';
import ldmlKeyboard3 from './schemas/ldml-keyboard3.schema.js';
import ldmlKeyboardTest3 from './schemas/ldml-keyboardtest3.schema.js';
import displayMap from './schemas/displaymap.schema.js';
import touchLayoutClean from './schemas/keyman-touch-layout.clean.spec.js';
import touchLayout from './schemas/keyman-touch-layout.spec.js';
@ -12,11 +12,11 @@ const Schemas = {
kpj,
kpj90,
kvks,
ldmlKeyboard,
ldmlKeyboardTest,
ldmlKeyboard3,
ldmlKeyboardTest3,
displayMap,
touchLayoutClean,
touchLayout,
};
export default Schemas;
export default Schemas;

6
common/web/types/test/fixtures/import-minimal.xml vendored
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="und" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="und" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
<name value="Test Minimal Keyboard" />
</names>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/import-minimal1.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="und" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="und" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
<name value="Test Minimal Keyboard" />
@ -8,4 +8,4 @@
<keys>
</keys>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/import-minimal2.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="und" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="und" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
<name value="Test Minimal Keyboard" />
@ -8,4 +8,4 @@
<keys>
<key id="a" to="å"/> <!-- override -->
</keys>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/import-symbols.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="und" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="und" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
<name value="Test Minimal Keyboard" />
@ -10,4 +10,4 @@
<key id="zz" to="zz"/>
<key id="hash" to="##"/> <!-- override -->
</keys>
</keyboard>
</keyboard3>

4
common/web/types/test/fixtures/invalid-conforms-to.xml vendored
View file

@ -4,7 +4,7 @@
DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd"
Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
-->
<keyboard locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
<keyboard3 locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -16,4 +16,4 @@
<key id="that" to="ថា" />
</keys>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/invalid-import-base.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -13,4 +13,4 @@
<key id="that" to="ថា" />
</keys>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/invalid-import-path.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -13,4 +13,4 @@
<key id="that" to="ថា" />
</keys>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/invalid-import-readfail.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -13,4 +13,4 @@
<key id="that" to="ថា" />
</keys>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/invalid-import-wrongroot.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -13,4 +13,4 @@
<key id="that" to="ថា" />
</keys>
</keyboard>
</keyboard3>

6
common/web/types/test/fixtures/invalid-structure-per-dtd.xml vendored
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd"
DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd"
Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
-->
<keyboard locale="mt" conformsTo="techpreview">
</keyboard>
<keyboard3 locale="mt" conformsTo="techpreview">
</keyboard3>

6
common/web/types/test/fixtures/test-fr.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
<keyboardTest conformsTo="techpreview">
<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
<keyboardTest3 conformsTo="techpreview">
<info keyboard="fr-t-k0-azerty.xml" author="Team Keyboard" name="fr-test" />
<repertoire name="simple-repertoire" chars="[a b c d e \u{22}]" type="simple" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
<repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
@ -19,4 +19,4 @@
<check result="abc\u0022...stuv" />
</test>
</tests>
</keyboardTest>
</keyboardTest3>

2
common/web/types/test/helpers/reader-callback-test.ts
View file

@ -105,7 +105,7 @@ export function testReaderCases(cases : CompilationCase[]) {
assert.includeDeepMembers(callbacks.messages, testcase.warnings, 'expected warnings to be included');
} else if (!expectFailure) {
// no warnings, so expect zero messages
assert.strictEqual(callbacks.messages.length, 0, 'expected zero messages');
assert.deepEqual(callbacks.messages, [], 'expected zero messages');
}
// run the user-supplied callback if any

16
common/web/types/test/ldml-keyboard/test-ldml-keyboard-testdata-reader.ts
View file

@ -11,16 +11,16 @@ describe('ldml keyboard xml reader tests', function () {
subpath: 'test-fr.xml',
callback: (data, source) => {
assert.ok(source);
assert.ok(source.keyboardTest);
assert.equal(source.keyboardTest.conformsTo, constants.cldr_version_latest);
assert.ok(source.keyboardTest3);
assert.equal(source.keyboardTest3.conformsTo, constants.cldr_version_latest);
assert.deepEqual(source.keyboardTest.info, {
assert.deepEqual(source.keyboardTest3.info, {
keyboard: 'fr-t-k0-azerty.xml',
author: 'Team Keyboard',
name: 'fr-test'
});
assert.sameDeepMembers(source.keyboardTest.repertoire, [
assert.sameDeepMembers(source.keyboardTest3.repertoire, [
{
name: 'simple-repertoire',
chars: '[a b c d e \\u{22}]',
@ -29,10 +29,10 @@ describe('ldml keyboard xml reader tests', function () {
{ name: 'chars-repertoire', chars: '[á é ó]', type: 'gesture' }
]);
assert.equal(1, source.keyboardTest.tests?.length);
assert.equal('key-tests', source.keyboardTest.tests[0].name);
assert.equal(1, source.keyboardTest.tests[0].test?.length);
const test0 = source.keyboardTest.tests[0].test[0];
assert.equal(1, source.keyboardTest3.tests?.length);
assert.equal('key-tests', source.keyboardTest3.tests[0].name);
assert.equal(1, source.keyboardTest3.tests[0].test?.length);
const test0 = source.keyboardTest3.tests[0].test[0];
assert.equal('key-test', test0.name);
assert.equal('abc\\u0022...', test0.startContext?.to);
assert.sameDeepOrderedMembers([

20
common/web/types/test/ldml-keyboard/test-ldml-keyboard-xml-reader.ts
View file

@ -15,7 +15,7 @@ describe('ldml keyboard xml reader tests', function () {
{
subpath: 'invalid-structure-per-dtd.xml',
errors: [CommonTypesMessages.Error_SchemaValidationError({
instancePath: '/keyboard',
instancePath: '/keyboard3',
keyword: 'required',
message: `must have required property 'names'`,
params: 'missingProperty="names"',
@ -24,7 +24,7 @@ describe('ldml keyboard xml reader tests', function () {
{
subpath: 'invalid-conforms-to.xml',
errors: [CommonTypesMessages.Error_SchemaValidationError({
instancePath: '/keyboard/conformsTo',
instancePath: '/keyboard3/conformsTo',
keyword: 'enum',
message: `must be equal to one of the allowed values`,
params: 'allowedValues="techpreview"',
@ -33,8 +33,8 @@ describe('ldml keyboard xml reader tests', function () {
{
subpath: 'import-minimal.xml',
callback: (data, source, subpath, callbacks) => {
assert.ok(source?.keyboard?.keys);
const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c']);
assert.ok(source?.keyboard3?.keys);
const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
assert.sameDeepOrderedMembers(k, [
{id: 'a', to: 'a'},
{id: 'b', to: 'b'},
@ -45,8 +45,8 @@ describe('ldml keyboard xml reader tests', function () {
{
subpath: 'import-minimal1.xml',
callback: (data, source, subpath, callbacks) => {
assert.ok(source?.keyboard?.keys);
const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c']);
assert.ok(source?.keyboard3?.keys);
const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
assert.sameDeepOrderedMembers(k, [
{id: 'a', to: 'a'},
{id: 'b', to: 'b'},
@ -57,8 +57,8 @@ describe('ldml keyboard xml reader tests', function () {
{
subpath: 'import-minimal2.xml',
callback: (data, source, subpath, callbacks) => {
assert.ok(source?.keyboard?.keys);
const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c']);
assert.ok(source?.keyboard3?.keys);
const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c']);
assert.sameDeepOrderedMembers(k, [
{id: 'a', to: 'a'},
{id: 'b', to: 'b'},
@ -70,8 +70,8 @@ describe('ldml keyboard xml reader tests', function () {
{
subpath: 'import-symbols.xml',
callback: (data, source, subpath, callbacks) => {
assert.ok(source?.keyboard?.keys);
const k = pluckKeysFromKeybag(source?.keyboard?.keys.key, ['a', 'b', 'c', 'zz', 'hash', 'hyphen']);
assert.ok(source?.keyboard3?.keys);
const k = pluckKeysFromKeybag(source?.keyboard3?.keys.key, ['a', 'b', 'c', 'zz', 'hash', 'hyphen']);
assert.sameDeepOrderedMembers(k, [
{id: 'a', to: 'a'}, // implied
{id: 'b', to: 'b'},

2
core/tests/unit/ldml/invalid-keyboards/ik_000_null_invalid.xml
View file

@ -7,4 +7,4 @@
@@expect-error: This keyboard is invalid, so it will fail to load
-->
<keyboard />
<keyboard3 />

2
core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml
View file

@ -7,4 +7,4 @@
@@expect:
-->
<keyboard />
<keyboard3 />

6
core/tests/unit/ldml/keyboards/k_001_tiny-test.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
<keyboardTest conformsTo="techpreview">
<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
<keyboardTest3 conformsTo="techpreview">
<info keyboard="k_001_tiny.xml" author="srl295" name="k_001_tiny" />
<!-- <repertoire chars="[ħ ថា]" type="simple" name="our-little-language" /> TODO-LDML: not working yet -->
<repertoire chars="[ħ]" type="simple" name="minus-khmer" />
@ -13,4 +13,4 @@
<check result="ħថាħ"/>
</test>
</tests>
</keyboardTest>
</keyboardTest3>

6
core/tests/unit/ldml/keyboards/k_001_tiny.xml
View file

@ -8,8 +8,8 @@
@@expected: \u0127\u1790\u17B6\u0127
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -26,4 +26,4 @@
<row keys="hmaqtugha that" /> <!-- number row -->
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_002_tinyu32.xml
View file

@ -6,8 +6,8 @@
@@expected: \u0127\u1790\u17B6\u0127\uD83D\uDE40\u0127
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -25,4 +25,4 @@
<row keys="hmaqtugha that screamcat" /> <!-- number row -->
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_003_transform.xml
View file

@ -7,8 +7,8 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
@@expected: qu\u00ea
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -58,4 +58,4 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
<transform from="ab" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_004_tinyshift.xml
View file

@ -6,8 +6,8 @@
@@expected: \u0037\u1790\u17B6\u0127
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -29,4 +29,4 @@
<row keys="seven eee" /> <!-- number row -->
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_005_modbittest.xml
View file

@ -6,8 +6,8 @@
@@expected: \u0061\u0041\u0062\u0063\u0064\u0064\u0065\u0066\u0067\u0067
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -42,4 +42,4 @@
<row keys="g" /> <!-- K_BKQUOTE -->
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_006_backspace.xml
View file

@ -7,8 +7,8 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
@@expected: t
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -58,4 +58,4 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
<transform from="ab" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_007_transform_rgx-test.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
<keyboardTest conformsTo="techpreview">
<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
<keyboardTest3 conformsTo="techpreview">
<info keyboard="k_007_transform_rgx.xml" author="Team Keyboard" name="marker" />
<tests name="regex-tests">
<test name="regex-test-basic">
@ -21,4 +21,4 @@
<check result="ayy" />
</test>
</tests>
</keyboardTest>
</keyboardTest3>

6
core/tests/unit/ldml/keyboards/k_007_transform_rgx.xml
View file

@ -4,8 +4,8 @@
from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-keyboards.md#element-transform
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -45,4 +45,4 @@ from https://github.com/unicode-org/cldr/blob/keyboard-preview/docs/ldml/tr35-ke
<transform from="($[upper])`" to="$[1:lower]"/> <!-- Lowercase (and drop grave): A` » a -->
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_010_mt.xml
View file

@ -10,9 +10,9 @@ Gets part of the way,
Based on mt.xml from CLDR. 'TODO-LDML' denotes modifications.
Note this is the 47-key version.
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<!-- remainder entirely from resources/standards-data/ldml-keyboards/techpreview/3.0/mt-t-k0-47key.xml -->
<keyboard locale="mt-t-k0-47key" conformsTo="techpreview">
<keyboard3 locale="mt-t-k0-47key" conformsTo="techpreview">
<locales>
<!-- English is also an official language in Malta.-->
<locale id="en" />
@ -93,4 +93,4 @@ Gets part of the way,
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_011_mt_iso.xml
View file

@ -11,8 +11,8 @@ Exact copy of mt.xml from CLDR, but with:
- an updated DTD path
- test case
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<locales>
<!-- English is also an official language in Malta.-->
<locale id="en" />
@ -90,4 +90,4 @@ Exact copy of mt.xml from CLDR, but with:
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_020_fr-test.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Note: similar to, but slightly ahead of, fr-t-k0-azerty -->
<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
<keyboardTest conformsTo="techpreview">
<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
<keyboardTest3 conformsTo="techpreview">
<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" /> <!-- verify that these outputs are all available from simple keys on any layer, for all form factors -->
<repertoire name="chars-repertoire" chars="[á é ó]" type="gesture" /> <!-- verify that these outputs are all available from simple or gesture keys on any layer, for touch -->
@ -20,4 +20,4 @@
<check result="abc\u0022...stuv" />
</test>
</tests>
</keyboardTest>
</keyboardTest3>

6
core/tests/unit/ldml/keyboards/k_020_fr.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Note: similar to, but slightly ahead of, fr-t-k0-azerty -->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="fr-t-k0-azerty" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="fr-t-k0-azerty" conformsTo="techpreview">
<locales>
<locale id="br" /> <!-- example of including Breton -->
</locales>
@ -195,4 +195,4 @@
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_100_keytest.xml
View file

@ -5,8 +5,8 @@
@@expected: \u0061
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -23,4 +23,4 @@
<row keys="a gap"/>
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_101_keytest.xml
View file

@ -4,8 +4,8 @@
@@keys: [K_BKQUOTE]
@@expected: \u0061
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -26,4 +26,4 @@
<row keys="a" /> <!-- number row -->
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_102_keytest.xml
View file

@ -5,8 +5,8 @@
@@expected: \u0061
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
@ -19,4 +19,4 @@
</layer>
</layers>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana-test.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
<keyboardTest conformsTo="techpreview">
<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
<keyboardTest3 conformsTo="techpreview">
<info keyboard="k_200_reorder_nod_Lana.xml" author="Team Keyboard" name="nod-Lana" />
<tests name="reorder-tests">
<test name="roast00-orig-emit">
@ -54,4 +54,4 @@
<check result="\u1A21\u1A60\u1A45\u1A6B\u1A76" />
</test>
</tests>
</keyboardTest>
</keyboardTest3>

6
core/tests/unit/ldml/keyboards/k_200_reorder_nod_Lana.xml
View file

@ -5,8 +5,8 @@
see https://keyman.com/keyboards/sil_boonkit
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="nod" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="nod" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
<name value="nod-Lana Test" />
@ -46,4 +46,4 @@
<reorder before="\u1A6B" from="\u1A60[\u1A75-\u1A79]\u1A45" order="10 55 10" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
core/tests/unit/ldml/keyboards/k_210_marker-test.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboardTest SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest.dtd">
<keyboardTest conformsTo="techpreview">
<!DOCTYPE keyboard3Test3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboardTest3.dtd">
<keyboardTest3 conformsTo="techpreview">
<info keyboard="k_210_marker.xml" author="Team Keyboard" name="marker" />
<tests name="marker-tests">
<test name="marker-test-basic-grave">
@ -43,4 +43,4 @@
<check result="é" />
</test>
</tests>
</keyboardTest>
</keyboardTest3>

6
core/tests/unit/ldml/keyboards/k_210_marker.xml
View file

@ -4,8 +4,8 @@
Test Keyboard
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
<names>
<name value="Marker Test" />
@ -50,4 +50,4 @@
<!-- no cleanup for trailing acute -->
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

2
developer/src/inst/download.in.mak
View file

@ -127,7 +127,7 @@ make-kmcomp-install-zip: copy-schemas
# TODO: are these required?
# kpj.schema.json kvks.schema.json \
# ldml-keyboard.schema.json ldml-keyboardtest.schema.json \
# ldml-keyboard3.schema.json ldml-keyboardtest3.schema.json \
copy-schemas:
copy $(KEYMAN_ROOT)\common\schemas\keyboard_info\keyboard_info.source.json $(DEVELOPER_ROOT)\bin

8
developer/src/kmc-ldml/src/compiler/disp.ts
View file

@ -27,8 +27,8 @@ export class DispCompiler extends SectionCompiler {
const tos = new Set();
const ids = new Set();
if (this.keyboard.displays?.display) {
for (const { to, id } of this.keyboard.displays?.display) {
if (this.keyboard3.displays?.display) {
for (const { to, id } of this.keyboard3.displays?.display) {
if ((to && id) || (!to && !id)) {
this.callbacks.reportMessage(CompilerMessages.Error_DisplayNeedsToOrId({ to, id }));
return false;
@ -57,12 +57,12 @@ export class DispCompiler extends SectionCompiler {
let result = new Disp();
// displayOptions
result.baseCharacter = sections.strs.allocAndUnescapeString(this.keyboard.displays?.displayOptions?.baseCharacter);
result.baseCharacter = sections.strs.allocAndUnescapeString(this.keyboard3.displays?.displayOptions?.baseCharacter);
// TODO-LDML: substitute variables!
// displays
result.disps = this.keyboard.displays?.display.map(display => ({
result.disps = this.keyboard3.displays?.display.map(display => ({
to: sections.strs.allocAndUnescapeString(sections.vars.substituteMarkerString(display.to)),
id: sections.strs.allocString(display.id), // not escaped, not substituted
display: sections.strs.allocAndUnescapeString(display.display),

6
developer/src/kmc-ldml/src/compiler/keymanweb-compiler.ts
View file

@ -73,13 +73,13 @@ export class LdmlKeyboardKeymanWebCompiler {
// `${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.keyboard.names.name[0])};${nl}` +
`${tab}this.KN=${JSON.stringify(source.keyboard3.names.name[0])};${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.keyboard.version?.number || '0.0')};${nl}` +
`${tab}this.KBVER=${JSON.stringify(source.keyboard3.version?.number || '0.0')};${nl}` +
`${tab}this.KMBM=${modifierBitmask};${nl}`;
if(isRTL) {
@ -111,4 +111,4 @@ export class LdmlKeyboardKeymanWebCompiler {
result += `}${nl}`;
return result;
}
}
}

20
developer/src/kmc-ldml/src/compiler/keys.ts
View file

@ -30,15 +30,15 @@ export class KeysCompiler extends SectionCompiler {
* @returns just the non-touch layers.
*/
public hardwareLayers() {
return this.keyboard.layers?.filter(({ form }) => form !== "touch");
return this.keyboard3.layers?.filter(({ form }) => form !== "touch");
}
public validate() {
let valid = true;
// general key-level validation here, only of used keys
const usedKeys = allUsedKeyIdsInLayers(this.keyboard?.layers);
const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
const usedKeys = allUsedKeyIdsInLayers(this.keyboard3?.layers);
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
for (let key of uniqueKeys) {
const { id, flicks } = key;
if (!usedKeys.has(id)) {
@ -48,7 +48,7 @@ export class KeysCompiler extends SectionCompiler {
if (!flicks) {
continue; // no flicks
}
const flickEntry = this.keyboard.keys?.flicks?.find(
const flickEntry = this.keyboard3.keys?.flicks?.find(
(x) => x.id === flicks
);
if (!flickEntry) {
@ -80,7 +80,7 @@ export class KeysCompiler extends SectionCompiler {
public compile(sections: DependencySections): Keys {
/* c8 ignore next 4 */
if (!this.keyboard?.keys?.key && !this.keyboard?.keys?.flicks) {
if (!this.keyboard3?.keys?.key && !this.keyboard3?.keys?.flicks) {
// short-circuit if no keys or flicks. Doesn't happen in practice due to implied import.
return null;
}
@ -114,7 +114,7 @@ export class KeysCompiler extends SectionCompiler {
}
public loadFlicks(sections: DependencySections, sect: Keys) {
for (let lkflicks of this.keyboard.keys.flicks) {
for (let lkflicks of this.keyboard3.keys.flicks) {
let flicks: KeysFlicks = new KeysFlicks(
sections.strs.allocString(lkflicks.id)
);
@ -142,8 +142,8 @@ export class KeysCompiler extends SectionCompiler {
}
public loadKeys(sections: DependencySections, sect: Keys) {
const usedKeys = allUsedKeyIdsInLayers(this.keyboard?.layers);
const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
const usedKeys = allUsedKeyIdsInLayers(this.keyboard3?.layers);
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
for (let key of uniqueKeys) {
if (!usedKeys.has(key.id)) {
@ -227,7 +227,7 @@ export class KeysCompiler extends SectionCompiler {
valid = false;
}
const uniqueKeys = calculateUniqueKeys([...this.keyboard.keys?.key]);
const uniqueKeys = calculateUniqueKeys([...this.keyboard3.keys?.key]);
if (layer.row.length > keymap.length) {
this.callbacks.reportMessage(
CompilerMessages.Error_HardwareLayerHasTooManyRows()
@ -300,7 +300,7 @@ export class KeysCompiler extends SectionCompiler {
// TODO-LDML: we already validated that the key exists, above.
// So here we only need the ID?
// let keydef = this.keyboard.keys?.key?.find(x => x.id == key);
// let keydef = this.keyboard3.keys?.key?.find(x => x.id == key);
sect.kmap.push({
vkey: keymap[y][x],

4
developer/src/kmc-ldml/src/compiler/layr.ts
View file

@ -22,7 +22,7 @@ export class LayrCompiler extends SectionCompiler {
let totalLayerCount = 0;
let hardwareLayers = 0;
// let touchLayers = 0;
this.keyboard.layers?.forEach((layers) => {
this.keyboard3.layers?.forEach((layers) => {
const { form } = layers;
if (form === 'touch') {
// touchLayers++;
@ -62,7 +62,7 @@ export class LayrCompiler extends SectionCompiler {
public compile(sections: DependencySections): Layr {
const sect = new Layr();
sect.lists = this.keyboard.layers.map((layers) => {
sect.lists = this.keyboard3.layers.map((layers) => {
const hardware = constants.layr_list_hardware_map.get(layers.form);
// Already validated in validate
const list: LayrList = {

4
developer/src/kmc-ldml/src/compiler/loca.ts
View file

@ -24,7 +24,7 @@ export class LocaCompiler extends SectionCompiler {
public validate(): boolean {
let valid = true;
const locales = this.getLocales(this.keyboard);
const locales = this.getLocales(this.keyboard3);
for(let tag of locales) {
try {
new Intl.Locale(tag);
@ -46,7 +46,7 @@ export class LocaCompiler extends SectionCompiler {
// This also minimizes locales according to Remove Likely Subtags algorithm:
// https://www.unicode.org/reports/tr35/#Likely_Subtags
const sourceLocales = this.getLocales(this.keyboard);
const sourceLocales = this.getLocales(this.keyboard3);
const locales = sourceLocales.map((sourceLocale: string) => {
const locale = new Intl.Locale(sourceLocale).minimize().toString();
if(locale != sourceLocale) {

22
developer/src/kmc-ldml/src/compiler/meta.ts
View file

@ -20,8 +20,8 @@ export class MetaCompiler extends SectionCompiler {
public validate(): boolean {
let valid = true;
valid &&= this.validateNormalization(this.keyboard.info?.normalization);
valid &&= this.validateVersion(this.keyboard.version?.number);
valid &&= this.validateNormalization(this.keyboard3.info?.normalization);
valid &&= this.validateVersion(this.keyboard3.version?.number);
return valid;
}
@ -53,16 +53,16 @@ export class MetaCompiler extends SectionCompiler {
public compile(sections: DependencySections): Meta {
let result = new Meta();
result.author = sections.strs.allocString(this.keyboard.info?.author);
result.conform = sections.strs.allocString(this.keyboard.conformsTo);
result.layout = sections.strs.allocString(this.keyboard.info?.layout);
result.normalization = sections.strs.allocString(this.keyboard.info?.normalization);
result.indicator = sections.strs.allocString(this.keyboard.info?.indicator);
result.version = sections.strs.allocString(this.keyboard.version?.number ?? "0.0.0");
result.author = sections.strs.allocString(this.keyboard3.info?.author);
result.conform = sections.strs.allocString(this.keyboard3.conformsTo);
result.layout = sections.strs.allocString(this.keyboard3.info?.layout);
result.normalization = sections.strs.allocString(this.keyboard3.info?.normalization);
result.indicator = sections.strs.allocString(this.keyboard3.info?.indicator);
result.version = sections.strs.allocString(this.keyboard3.version?.number ?? "0.0.0");
result.settings =
(this.keyboard.settings?.fallback == "omit" ? KeyboardSettings.fallback : 0) |
(this.keyboard.settings?.transformFailure == "omit" ? KeyboardSettings.transformFailure : 0) |
(this.keyboard.settings?.transformPartial == "hide" ? KeyboardSettings.transformPartial : 0);
(this.keyboard3.settings?.fallback == "omit" ? KeyboardSettings.fallback : 0) |
(this.keyboard3.settings?.transformFailure == "omit" ? KeyboardSettings.transformFailure : 0) |
(this.keyboard3.settings?.transformPartial == "hide" ? KeyboardSettings.transformPartial : 0);
return result;
}
}

4
developer/src/kmc-ldml/src/compiler/name.ts
View file

@ -13,13 +13,13 @@ export class NameCompiler extends SectionCompiler {
public validate(): boolean {
let valid = true;
valid = (this.keyboard.names?.name?.length ?? 0) > 0;
valid = (this.keyboard3.names?.name?.length ?? 0) > 0;
return valid;
}
public compile(sections: DependencySections): Name {
let result = new Name();
result.names = this.keyboard.names?.name?.map(v => sections.strs.allocString(v.value)) ?? [];
result.names = this.keyboard3.names?.name?.map(v => sections.strs.allocString(v.value)) ?? [];
return result;
}
}

4
developer/src/kmc-ldml/src/compiler/section-compiler.ts
View file

@ -3,11 +3,11 @@ import { SectionIdent, constants } from '@keymanapp/ldml-keyboard-constants';
/* istanbul ignore next */
export class SectionCompiler {
protected readonly keyboard: LDMLKeyboard.LKKeyboard;
protected readonly keyboard3: LDMLKeyboard.LKKeyboard;
protected readonly callbacks: CompilerCallbacks;
constructor(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks) {
this.keyboard = source.keyboard;
this.keyboard3 = source.keyboard3;
this.callbacks = callbacks;
}

6
developer/src/kmc-ldml/src/compiler/touch-layout-compiler.ts
View file

@ -10,7 +10,7 @@ export class TouchLayoutCompiler {
layer: []
};
for(let layers of source.keyboard.layers) {
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);
@ -41,7 +41,7 @@ export class TouchLayoutCompiler {
const keys = row.keys.split(' ');
for(let key of keys) {
const keydef = source.keyboard.keys?.key?.find(x => x.id == key);
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,
@ -106,4 +106,4 @@ export class TouchLayoutCompiler {
// Not a standard key
return 'T_'+id;
}
}
}

4
developer/src/kmc-ldml/src/compiler/tran.ts
View file

@ -41,7 +41,7 @@ export class TransformCompiler<T extends TransformCompilerType, TranBase extends
const reportMessage = this.callbacks.reportMessage.bind(this.callbacks);
let valid = true;
const transforms = this?.keyboard?.transforms;
const transforms = this?.keyboard3?.transforms;
if (transforms) {
const types : string[] = transforms.map(({type}) => type);
if (!verifyValidAndUnique(types,
@ -167,7 +167,7 @@ export class TransformCompiler<T extends TransformCompilerType, TranBase extends
}
public compile(sections: DependencySections): TranBase {
for(let t of this.keyboard.transforms) {
for(let t of this.keyboard3.transforms) {
if(t.type == this.type) {
// compile only the transforms of the correct type
return this.compileTransforms(sections, t);

12
developer/src/kmc-ldml/src/compiler/vars.ts
View file

@ -43,7 +43,7 @@ export class VarsCompiler extends SectionCompiler {
private validateVars(): boolean {
let valid = true;
const variables = this.keyboard?.variables;
const variables = this.keyboard3?.variables;
if (!variables) {
return true; // nothing to check
@ -152,10 +152,10 @@ export class VarsCompiler extends SectionCompiler {
let valid = true;
// call our friends to validate
valid = this.validateVarsMarkers(this.keyboard, mt) && valid; // accumulate validity
valid = KeysCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
valid = TransformCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
valid = DispCompiler.validateMarkers(this.keyboard, mt) && valid; // accumulate validity
valid = this.validateVarsMarkers(this.keyboard3, mt) && valid; // accumulate validity
valid = KeysCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
valid = TransformCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
valid = DispCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
return valid;
}
@ -195,7 +195,7 @@ export class VarsCompiler extends SectionCompiler {
public compile(sections: DependencySections): Vars {
const result = new Vars();
const variables = this.keyboard?.variables;
const variables = this.keyboard3?.variables;
// we always have vars, it's depended on by other sections
// we already know the variables do not conflict with each other
// need to add these one by one, because they depend on each other.

4
developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
View file

@ -13,7 +13,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
result.header.ansiFont = {...VisualKeyboard.DEFAULT_KVK_FONT};
result.header.unicodeFont = {...VisualKeyboard.DEFAULT_KVK_FONT};
for(let layers of source.keyboard.layers) {
for(let layers of source.keyboard3.layers) {
for(let layer of layers.layer) {
this.compileHardwareLayer(source, result, layer);
}
@ -38,7 +38,7 @@ export class LdmlKeyboardVisualKeyboardCompiler {
for(let key of keys) {
x++;
let keydef = source.keyboard.keys?.key?.find(x => x.id == key);
let keydef = source.keyboard3.keys?.key?.find(x => x.id == key);
if (!keydef) {
throw Error(`Internal Error: could not find key id="${key}" in layer "${layer.id || '<none>'}", row "${y}"`);

8
developer/src/kmc-ldml/src/compiler/vkey.ts
View file

@ -14,10 +14,10 @@ export class VkeyCompiler extends SectionCompiler {
public validate(): boolean {
let valid = true;
if(this.keyboard.vkeys) {
if(this.keyboard3.vkeys) {
let from: string[] = [], to: string[] = [];
this.keyboard.vkeys.vkey.forEach(vk => {
this.keyboard3.vkeys.vkey.forEach(vk => {
if(LdmlVkeyNames[vk.from] === undefined) {
// TODO-LDML: When we do #7135 this may need to change back to an error.
this.callbacks.reportMessage(CompilerMessages.Hint_VkeyIsNotValid({vkey: vk.from}));
@ -51,12 +51,12 @@ export class VkeyCompiler extends SectionCompiler {
public compile(): Vkey {
let result = new Vkey();
if(!this.keyboard.vkeys) {
if(!this.keyboard3.vkeys) {
/* c8 ignore next 2 */
return result; // not hit due to boxing
}
result.vkeys = this.keyboard.vkeys?.vkey.map(vk => {
result.vkeys = this.keyboard3.vkeys?.vkey.map(vk => {
return {
vkey: LdmlVkeyNames[vk.from],
target: LdmlVkeyNames[vk.to]

6
developer/src/kmc-ldml/test/fixtures/basic.xml vendored
View file

@ -4,8 +4,8 @@
@@keys: [K_Q][K_W][K_Q]
@@expected: \u0127\u1790\u17B6\u0127
-->
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<version number="1.0.0" />
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
@ -65,4 +65,4 @@
<transform from="^e" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/bksp/minimal.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="bksp-minimal" />
</names>
@ -13,4 +13,4 @@
<transform from="្ម" to="" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/escaped.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-escaped" />
</names>
@ -11,4 +11,4 @@
<display to="\u{65}" display="(e)"/>
<displayOptions baseCharacter="\u{78}" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-both.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-invalid" />
</names>
@ -10,4 +10,4 @@
<display to="e" id="e" display="(e)"/> <!-- both to and id -->
<displayOptions baseCharacter="x" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupid.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-invalid" />
</names>
@ -12,4 +12,4 @@
<display id="e" display="(e)"/> <!-- duplicate -->
<displayOptions baseCharacter="x" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-dupto.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-invalid" />
</names>
@ -12,4 +12,4 @@
<display to="e" display="(e)"/> <!-- duplicate -->
<displayOptions baseCharacter="x" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/invalid-none.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-invalid" />
</names>
@ -10,4 +10,4 @@
<display display="(f)"/> <!-- Neither to nor id -->
<displayOptions baseCharacter="x" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/maximal.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-maximal" />
</names>
@ -12,4 +12,4 @@
<display to="e" display="(e)"/>
<displayOptions baseCharacter="x" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/minimal.xml vendored
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-minimal" />
</names>
<displays />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/options-only.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-maximal" />
</names>
@ -9,4 +9,4 @@
<displays>
<displayOptions baseCharacter="x" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/disp/typical.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="disp-typical" />
</names>
@ -9,4 +9,4 @@
<displays>
<display to="\u{0300}" display="`" />
</displays>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/finl/minimal.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="finl-minimal" />
</names>
@ -13,4 +13,4 @@
<transform from="xx" to="x" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/escaped.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-escaped" /> <!-- see maximal.xml -->
</names>
@ -34,4 +34,4 @@
<row keys="q w" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/escaped2.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="keys-escaped2" />
</names>
@ -16,4 +16,4 @@
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/gap-switch.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-gap-switch" />
</names>
@ -23,4 +23,4 @@
<row keys="q w" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/hardware.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-minimal" />
</names>
@ -23,4 +23,4 @@
<row keys="QQQ WWW" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_iso.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-minimal" />
</names>
@ -19,4 +19,4 @@
<row keys="space" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/hardware_us.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-minimal" />
</names>
@ -19,4 +19,4 @@
<row keys="space" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-bad-modifier.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="keys-minimal" />
</names>
@ -14,4 +14,4 @@
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-keys.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="keys-minimal" />
</names>
@ -30,4 +30,4 @@
<row keys="grave one two three four five six seven eight nine ten eleven minus equal" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-hardware-too-many-rows.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="keys-minimal" />
</names>
@ -22,4 +22,4 @@
<row keys="Q W" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-key-missing-attrs.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-missing-attrs" />
</names>
@ -16,4 +16,4 @@
<row keys="Q" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-missing-flick.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-missing-flick" />
</names>
@ -20,4 +20,4 @@
<row keys="Q W" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/invalid-undefined-key.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="keys-minimal" />
</names>
@ -15,4 +15,4 @@
<row keys="foo" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/markers.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="keys-markers" />
</names>
@ -24,6 +24,6 @@
<transform from="\m{w}" to="W" /> <!-- to quell marker err -->
</transformGroup>
</transforms>
</keyboard>
</keyboard3>
<!-- you can have any output you want, as long as it's an W ! -->

6
developer/src/kmc-ldml/test/fixtures/sections/keys/maximal.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="hardware-gap-switch" />
</names>
@ -34,4 +34,4 @@
<row keys="q w" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/keys/minimal.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="keys-minimal" />
</names>
@ -17,4 +17,4 @@
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-invalid-form.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="und" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="und" conformsTo="techpreview">
<names>
<name value="layr-invalid-form" />
</names>
@ -17,4 +17,4 @@
<row keys="grave one" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-hardware.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="und" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="und" conformsTo="techpreview">
<names>
<name value="layr-invalid-form" />
</names>
@ -17,4 +17,4 @@
<row keys="grave one " />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en" conformsTo="techpreview">
<names>
<name value="layr-invalid-form" />
</names>
@ -14,4 +14,4 @@
<layers form="touch">
<!-- INVALID: need at least one layer. -->
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer2.xml vendored
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="layr-invalid-missing-layer2" />
</names>
<keys />
<!-- invalid: need a layer! -->
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-multi-hardware.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="und" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="und" conformsTo="techpreview">
<names>
<name value="layr-invalid-form" />
</names>
@ -24,4 +24,4 @@
<row keys="one grave" />
</layer>
</layers>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/loca/invalid-locale.xml vendored
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="en-*" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="en-*" conformsTo="techpreview">
<names>
<name value="invalid-loca" />
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/loca/minimal.xml vendored
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="loca-minimal" />
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/loca/multiple.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<locales>
<locale id="fr-FR" />
<locale id="km-khmr-kh" />
@ -15,4 +15,4 @@
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-normalization.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<info normalization="NFQ" />
<names>
@ -9,4 +9,4 @@
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-1.0.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<version number="1.0" /> <!-- invalid because it's not "1.0.0" as required by semver -->
<names>
@ -9,4 +9,4 @@
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/meta/invalid-version-v1.0.3.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<version number="v1.0.3" />
<names>
@ -9,4 +9,4 @@
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/meta/maximal.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<version number="1.2.3" />
<info author="The Keyman Team" indicator="QW" layout="QWIRKY" normalization="NFC" />
@ -13,4 +13,4 @@
<settings fallback="omit" />
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/meta/minimal.xml vendored
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="meta-minimal" />
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/name/minimal.xml vendored
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="My First Keyboard" />
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/name/multiple.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="My Second Keyboard" />
<name value="My 2nd Keyboard" />
@ -12,4 +12,4 @@
</names>
<keys />
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/ordr/minimal.xml vendored
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="mt" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="mt" conformsTo="techpreview">
<names>
<name value="ordr-minimal" />
</names>
@ -14,4 +14,4 @@
<reorder from="ខែ្ម" order="1 3 4 2" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/ordr/multi-escape.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="nod-Lana" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="nod-Lana" conformsTo="techpreview">
<names>
<name value="nod-Lana Test2" />
</names>
@ -12,4 +12,4 @@
<reorder from="\u{1A60 1A45}" order="10" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

6
developer/src/kmc-ldml/test/fixtures/sections/ordr/nod-Lana.xml vendored
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE keyboard SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
<keyboard locale="nod-Lana" conformsTo="techpreview">
<!DOCTYPE keyboard3 SYSTEM "../../../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
<keyboard3 locale="nod-Lana" conformsTo="techpreview">
<names>
<name value="nod-Lana Test" />
</names>
@ -18,4 +18,4 @@
<reorder before="\u1A6B" from="\u1A60[\u1A75-\u1A79]\u1A45" order="10 55 10" />
</transformGroup>
</transforms>
</keyboard>
</keyboard3>

Some files were not shown because too many files have changed in this diff Show more