erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #13479 from keymanapp/fix/developer/13469-strip-markers-in-kvk-generation

Browse source 
fix(developer): strip markers when generating KVK from LDML
This commit is contained in:
Marc Durdin 2025-03-13 13:19:37 +07:00 • committed by GitHub
commit 1e4719c823
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,9 @@ export class LdmlKeyboardVisualKeyboardCompiler {
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;
const value = display?.display.value ?? keydef.to.value;
// strip markers from the output (these are valid in keydef.to, but not in display.display, nor in kvk)
return value.replaceAll(/\uffff\u0008./g, '');
}
private translateLayerModifiersToVisualKeyboardShift(modifiers: number): VisualKeyboard.VisualKeyboardShiftState {

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

@ -56,7 +56,13 @@ describe('disp', function () {
assert.equal(disp?.baseCharacter?.value, 'x');
assert.ok(disp?.disps);
});
it('should compile disp without converting markers', async function() {
let disp = await loadSectionFixture(DispCompiler, 'sections/disp/not-a-marker.xml', compilerTestCallbacks) as Disp;
assert.equal(compilerTestCallbacks.messages.length, 0);
assert.ok(disp?.disps);
assert.equal(disp.disps.length, 1);
assert.equal(disp.disps[0].display?.value, '\\m{hat}');
});
it('should reject duplicate tos', async function() {
let disp = await loadSectionFixture(DispCompiler, 'sections/disp/invalid-dupto.xml', compilerTestCallbacks) as Disp;
assert.isNull(disp);

10
developer/src/kmc-ldml/test/fixtures/sections/disp/not-a-marker.xml vendored Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
<info name="disp-marker"/>
<displays>
<!-- this is not a marker, just plain text -->
<display output="\u{0300}" display="\m{hat}" />
</displays>
</keyboard3>

20
developer/src/kmc-ldml/test/visual-keyboard-compiler.tests.ts
View file

@ -184,6 +184,26 @@ describe('visual-keyboard-compiler', function() {
assert.equal(vk.keys[0].text, '2');
});
it('should strip markers from key.output', async function() {
const xml = stripIndent`
<?xml version="1.0" encoding="UTF-8"?>
<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
<info name="minimal"/>
<keys>
<key id="x" output="1\\m{hat}2" />
</keys>
<layers formId="us">
<layer modifiers="none"><row keys="x" /></layer>
</layers>
</keyboard3>
`;
const vk = await loadVisualKeyboardFromXml(xml, 'test');
assert.equal(vk.keys.length, 1);
assert.equal(vk.keys[0].text, '12'); // marker stripped from `1<marker>2`
});
it('should read string variables in display.display', async function() {
const xml = stripIndent`
<?xml version="1.0" encoding="UTF-8"?>