Skip to content

Commit 2ac6357

Browse files
srl295srl295
authored
Merge pull request #9588 from keymanapp/chore/resources/keyboard3-epic-ldml
chore(resources): ldml: update to keyboard3 🙀
2 parents 8d86d50 + 60295ce commit 2ac6357

File tree

157 files changed

+519
-515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+519
-515
lines changed

‎common/web/types/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ builder_parse "$@"
2929
function compile_schemas() {
3030
# We need the schema files at runtime and bundled, so always copy it for all actions except `clean`
3131
local schemas=(
32-
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard.schema.json"
33-
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest.schema.json"
32+
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboard3.schema.json"
33+
"$KEYMAN_ROOT/resources/standards-data/ldml-keyboards/techpreview/ldml-keyboardtest3.schema.json"
3434
"$KEYMAN_ROOT/common/schemas/kvks/kvks.schema.json"
3535
"$KEYMAN_ROOT/common/schemas/kpj/kpj.schema.json"
3636
"$KEYMAN_ROOT/common/schemas/kpj-9.0/kpj-9.0.schema.json"

‎common/web/types/src/ldml-keyboard/ldml-keyboard-testdata-xml.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export interface LDMLKeyboardTestDataXMLSourceFile {
1111
/**
1212
* <keyboardTest> -- the root element.
1313
*/
14-
keyboardTest: LKTKeyboardTest;
14+
keyboardTest3: LKTKeyboardTest;
1515
}
1616

1717
export interface LKTKeyboardTest {

‎common/web/types/src/ldml-keyboard/ldml-keyboard-xml-reader.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,27 @@ export class LDMLKeyboardXMLSourceFileReader {
3939
* @returns true on success, false on failure
4040
*/
4141
private boxArrays(source: any) : boolean {
42-
if (source?.keyboard) {
43-
if (!source.keyboard.keys) {
44-
source.keyboard.keys = {
42+
if (source?.keyboard3) {
43+
if (!source.keyboard3.keys) {
44+
source.keyboard3.keys = {
4545
key: [],
4646
flicks: [],
4747
};
4848
}
49-
if (!source.keyboard.keys.import) {
50-
source.keyboard.keys.import = [];
49+
if (!source.keyboard3.keys.import) {
50+
source.keyboard3.keys.import = [];
5151
}
5252
}
53-
boxXmlArray(source?.keyboard, 'layers');
54-
boxXmlArray(source?.keyboard?.displays, 'display');
55-
boxXmlArray(source?.keyboard?.names, 'name');
56-
boxXmlArray(source?.keyboard?.vkeys, 'vkey');
57-
boxXmlArray(source?.keyboard?.keys, 'key');
58-
boxXmlArray(source?.keyboard?.keys, 'flicks');
59-
boxXmlArray(source?.keyboard?.locales, 'locale');
60-
boxXmlArray(source?.keyboard, 'transforms');
61-
if(source?.keyboard?.layers) {
62-
for(let layers of source?.keyboard?.layers) {
53+
boxXmlArray(source?.keyboard3, 'layers');
54+
boxXmlArray(source?.keyboard3?.displays, 'display');
55+
boxXmlArray(source?.keyboard3?.names, 'name');
56+
boxXmlArray(source?.keyboard3?.vkeys, 'vkey');
57+
boxXmlArray(source?.keyboard3?.keys, 'key');
58+
boxXmlArray(source?.keyboard3?.keys, 'flicks');
59+
boxXmlArray(source?.keyboard3?.locales, 'locale');
60+
boxXmlArray(source?.keyboard3, 'transforms');
61+
if(source?.keyboard3?.layers) {
62+
for(let layers of source?.keyboard3?.layers) {
6363
boxXmlArray(layers, 'layer');
6464
if(layers?.layer) {
6565
for(let layer of layers?.layer) {
@@ -68,18 +68,18 @@ export class LDMLKeyboardXMLSourceFileReader {
6868
}
6969
}
7070
}
71-
if(source?.keyboard?.keys?.flicks) {
72-
for(let flicks of source?.keyboard?.keys?.flicks) {
71+
if(source?.keyboard3?.keys?.flicks) {
72+
for(let flicks of source?.keyboard3?.keys?.flicks) {
7373
boxXmlArray(flicks, 'flick');
7474
}
7575
}
76-
if(source?.keyboard?.variables) {
77-
boxXmlArray(source?.keyboard?.variables, 'set');
78-
boxXmlArray(source?.keyboard?.variables, 'string');
79-
boxXmlArray(source?.keyboard?.variables, 'unicodeSet');
76+
if(source?.keyboard3?.variables) {
77+
boxXmlArray(source?.keyboard3?.variables, 'set');
78+
boxXmlArray(source?.keyboard3?.variables, 'string');
79+
boxXmlArray(source?.keyboard3?.variables, 'unicodeSet');
8080
}
81-
if(source?.keyboard?.transforms) {
82-
for(let transforms of source.keyboard.transforms) {
81+
if(source?.keyboard3?.transforms) {
82+
for(let transforms of source.keyboard3.transforms) {
8383
boxXmlArray(transforms, 'transformGroup');
8484
for (let transformGroup of transforms.transformGroup) {
8585
boxXmlArray(transformGroup, 'transform');
@@ -208,7 +208,7 @@ export class LDMLKeyboardXMLSourceFileReader {
208208
*/
209209
public validate(source: LDMLKeyboardXMLSourceFile | LDMLKeyboardTestDataXMLSourceFile): boolean {
210210
const ajv = new Ajv();
211-
if(!ajv.validate(Schemas.ldmlKeyboard, source)) {
211+
if(!ajv.validate(Schemas.ldmlKeyboard3, source)) {
212212
for (let err of ajv.errors) {
213213
this.callbacks.reportMessage(CommonTypesMessages.Error_SchemaValidationError({
214214
instancePath: err.instancePath,
@@ -345,16 +345,16 @@ export class LDMLKeyboardXMLSourceFileReader {
345345
boxTestDataArrays(raw: any) : LDMLKeyboardTestDataXMLSourceFile | null {
346346
if (!raw) return null;
347347
const a : LDMLKeyboardTestDataXMLSourceFile = {
348-
keyboardTest: {
349-
conformsTo: raw?.keyboardTest?.$?.conformsTo,
348+
keyboardTest3: {
349+
conformsTo: raw?.keyboardTest3?.$?.conformsTo,
350350
}
351351
};
352352

353-
const $$ : NameAndProps[] = raw?.keyboardTest?.$$;
353+
const $$ : NameAndProps[] = raw?.keyboardTest3?.$$;
354354

355-
this.stuffBoxes(a.keyboardTest, $$, 'info');
356-
this.stuffBoxes(a.keyboardTest, $$, 'repertoire', true);
357-
this.stuffBoxes(a.keyboardTest, $$, 'tests', true, (o, r) => {
355+
this.stuffBoxes(a.keyboardTest3, $$, 'info');
356+
this.stuffBoxes(a.keyboardTest3, $$, 'repertoire', true);
357+
this.stuffBoxes(a.keyboardTest3, $$, 'tests', true, (o, r) => {
358358
// start with basic unpack
359359
const tests : LKTTests = LDMLKeyboardXMLSourceFileReader.defaultMapper(o, r);
360360
// add ingredients

‎common/web/types/src/ldml-keyboard/ldml-keyboard-xml.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export interface LDMLKeyboardXMLSourceFile {
1111
/**
1212
* <keyboard> -- the root element.
1313
*/
14-
keyboard: LKKeyboard;
14+
keyboard3: LKKeyboard;
1515
}
1616

1717
export interface LKKeyboard {

‎common/web/types/src/schemas.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import kpj from './schemas/kpj.schema.js';
33
import kpj90 from './schemas/kpj-9.0.schema.js';
44
import kvks from './schemas/kvks.schema.js';
5-
import ldmlKeyboard from './schemas/ldml-keyboard.schema.js';
6-
import ldmlKeyboardTest from './schemas/ldml-keyboardtest.schema.js';
5+
import ldmlKeyboard3 from './schemas/ldml-keyboard3.schema.js';
6+
import ldmlKeyboardTest3 from './schemas/ldml-keyboardtest3.schema.js';
77
import displayMap from './schemas/displaymap.schema.js';
88
import touchLayoutClean from './schemas/keyman-touch-layout.clean.spec.js';
99
import touchLayout from './schemas/keyman-touch-layout.spec.js';
@@ -12,11 +12,11 @@ const Schemas = {
1212
kpj,
1313
kpj90,
1414
kvks,
15-
ldmlKeyboard,
16-
ldmlKeyboardTest,
15+
ldmlKeyboard3,
16+
ldmlKeyboardTest3,
1717
displayMap,
1818
touchLayoutClean,
1919
touchLayout,
2020
};
2121

22-
export default Schemas;
22+
export default Schemas;

‎common/web/types/test/fixtures/import-minimal.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
3-
<keyboard locale="und" conformsTo="techpreview">
2+
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
3+
<keyboard3 locale="und" conformsTo="techpreview">
44
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
55
<names>
66
<name value="Test Minimal Keyboard" />
77
</names>
8-
</keyboard>
8+
</keyboard3>

‎common/web/types/test/fixtures/import-minimal1.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
3-
<keyboard locale="und" conformsTo="techpreview">
2+
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
3+
<keyboard3 locale="und" conformsTo="techpreview">
44
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
55
<names>
66
<name value="Test Minimal Keyboard" />
77
</names>
88
<keys>
99

1010
</keys>
11-
</keyboard>
11+
</keyboard3>

‎common/web/types/test/fixtures/import-minimal2.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
3-
<keyboard locale="und" conformsTo="techpreview">
2+
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
3+
<keyboard3 locale="und" conformsTo="techpreview">
44
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
55
<names>
66
<name value="Test Minimal Keyboard" />
77
</names>
88
<keys>
99
<key id="a" to="å"/> <!-- override -->
1010
</keys>
11-
</keyboard>
11+
</keyboard3>

‎common/web/types/test/fixtures/import-symbols.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd">
3-
<keyboard locale="und" conformsTo="techpreview">
2+
<!DOCTYPE keyboard3 SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard3.dtd">
3+
<keyboard3 locale="und" conformsTo="techpreview">
44
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
55
<names>
66
<name value="Test Minimal Keyboard" />
@@ -10,4 +10,4 @@
1010
<key id="zz" to="zz"/>
1111
<key id="hash" to="##"/> <!-- override -->
1212
</keys>
13-
</keyboard>
13+
</keyboard3>

‎common/web/types/test/fixtures/invalid-conforms-to.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
DOCTYPE keyboard SYSTEM "../../../../../resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd"
55
Disabling doctype for this invalid file, not used by compiler, and avoids complaints in IDEs etc.
66
-->
7-
<keyboard locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
7+
<keyboard3 locale="mt" conformsTo="nothing-anyone-ever-heard-of"> <!-- invalid -->
88
<info author="srl295" indicator="🙀" layout="qwerty" normalization="NFC" />
99

1010
<names>
@@ -16,4 +16,4 @@
1616
<key id="that" to="ថា" />
1717
</keys>
1818

19-
</keyboard>
19+
</keyboard3>

0 commit comments

Comments
 (0)