diff --git a/release/k/khmer_angkor/HISTORY.md b/release/k/khmer_angkor/HISTORY.md index a5ca7dc1a1..9be200adc4 100644 --- a/release/k/khmer_angkor/HISTORY.md +++ b/release/k/khmer_angkor/HISTORY.md @@ -1,6 +1,13 @@ Khmer Angkor Change History ======================= +2.0 (03 Dec 2024) +---------------- +* update touch layout with flick gesture +* add shift and western layer +* add indepentdent vowels to numeric layer +* update English and Khmer documentation + 1.5 (3 Jul 2024) ---------------- * Update keyboard to support OSK font for better display diff --git a/release/k/khmer_angkor/LICENSE.md b/release/k/khmer_angkor/LICENSE.md index 577a874068..96321eed3a 100644 --- a/release/k/khmer_angkor/LICENSE.md +++ b/release/k/khmer_angkor/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2024 SIL International +Copyright (c) 2015-2024 SIL Global Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/release/k/khmer_angkor/README.md b/release/k/khmer_angkor/README.md index c751d6bff4..fd0094f331 100644 --- a/release/k/khmer_angkor/README.md +++ b/release/k/khmer_angkor/README.md @@ -1,7 +1,7 @@ Khmer Angkor keyboard ===================== -Copyright (C) SIL International +Copyright (C) SIL Global Description ----------- diff --git a/release/k/khmer_angkor/extras/KAK_Documentation_EN.docx b/release/k/khmer_angkor/extras/KAK_Documentation_EN.docx index 6f75fcc26c..485a1d6df9 100644 Binary files a/release/k/khmer_angkor/extras/KAK_Documentation_EN.docx and b/release/k/khmer_angkor/extras/KAK_Documentation_EN.docx differ diff --git a/release/k/khmer_angkor/extras/KAK_Documentation_EN.pdf b/release/k/khmer_angkor/extras/KAK_Documentation_EN.pdf index 23b6f62b8f..adc878fcc0 100644 Binary files a/release/k/khmer_angkor/extras/KAK_Documentation_EN.pdf and b/release/k/khmer_angkor/extras/KAK_Documentation_EN.pdf differ diff --git a/release/k/khmer_angkor/extras/KAK_Documentation_KH.docx b/release/k/khmer_angkor/extras/KAK_Documentation_KH.docx index 7215753046..e090faf204 100644 Binary files a/release/k/khmer_angkor/extras/KAK_Documentation_KH.docx and b/release/k/khmer_angkor/extras/KAK_Documentation_KH.docx differ diff --git a/release/k/khmer_angkor/extras/KAK_Documentation_KH.pdf b/release/k/khmer_angkor/extras/KAK_Documentation_KH.pdf index 85bd8c0b0b..6d38d04e01 100644 Binary files a/release/k/khmer_angkor/extras/KAK_Documentation_KH.pdf and b/release/k/khmer_angkor/extras/KAK_Documentation_KH.pdf differ diff --git a/release/k/khmer_angkor/source/help/KAK_Documentation_EN.pdf b/release/k/khmer_angkor/source/help/KAK_Documentation_EN.pdf index 23b6f62b8f..adc878fcc0 100644 Binary files a/release/k/khmer_angkor/source/help/KAK_Documentation_EN.pdf and b/release/k/khmer_angkor/source/help/KAK_Documentation_EN.pdf differ diff --git a/release/k/khmer_angkor/source/help/KAK_Documentation_KH.pdf b/release/k/khmer_angkor/source/help/KAK_Documentation_KH.pdf index 85bd8c0b0b..6d38d04e01 100644 Binary files a/release/k/khmer_angkor/source/help/KAK_Documentation_KH.pdf and b/release/k/khmer_angkor/source/help/KAK_Documentation_KH.pdf differ diff --git a/release/k/khmer_angkor/source/khmer_angkor.keyman-touch-layout b/release/k/khmer_angkor/source/khmer_angkor.keyman-touch-layout index 71af4c108f..30c74534eb 100644 --- a/release/k/khmer_angkor/source/khmer_angkor.keyman-touch-layout +++ b/release/k/khmer_angkor/source/khmer_angkor.keyman-touch-layout @@ -830,221 +830,117 @@ { "id": "K_Q", "text": "ឆ", - "sk": [ - { - "text": "ឈ", - "id": "K_Q", - "layer": "shift" - }, - { + "hint": "្ឆ", + "flick": { + "s": { "text": "្ឆ", "id": "T_17D2_1786" - }, - { - "text": "្ឈ", - "id": "T_17D2_1788" } - ] + } }, { "id": "K_W", "text": "ឹ", - "sk": [ - { + "hint": "ឺ", + "flick": { + "s": { "text": "ឺ", "id": "K_W", "layer": "shift" } - ] + } }, { "id": "K_E", "text": "េ", - "sk": [ - { + "hint": "ែ", + "flick": { + "s": { "text": "ែ", "id": "K_E", "layer": "shift" - }, - { - "text": "ៃ", - "id": "K_S", - "layer": "shift" - }, - { - "text": "េះ", - "id": "K_V", - "layer": "shift" - }, - { - "text": "ឯ", - "id": "U_17AF" - }, - { - "text": "ឰ", - "id": "U_17B0" } - ] + } }, { "id": "K_R", "text": "រ", - "sk": [ - { + "hint": "្រ", + "flick": { + "s": { "text": "្រ", "id": "T_17D2_179A" - }, - { - "text": "ឫ", - "id": "U_17AB" - }, - { - "text": "ឬ", - "id": "U_17AC" } - ] + } }, { "id": "K_T", "text": "ត", - "sk": [ - { - "text": "ទ", - "id": "K_T", - "layer": "shift" - }, - { + "hint": "្ត", + "flick": { + "s": { "text": "្ត", "id": "T_17D2_178F" - }, - { - "text": "្ទ", - "id": "T_17D2_1791", - "layer": "default" } - ] + } }, { "id": "K_Y", "text": "យ", - "sk": [ - { + "hint": "្យ", + "flick": { + "s": { "text": "្យ", "id": "T_17D2_1799" } - ] + } }, { "id": "K_U", "text": "ុ", - "sk": [ - { + "hint": "ូ", + "flick": { + "s": { "text": "ូ", "id": "K_U", "layer": "shift" - }, - { - "text": "ួ", - "id": "K_Y", - "layer": "shift" - }, - { - "text": "ឧ", - "id": "U_17A7" - }, - { - "text": "ឪ", - "id": "U_17AA", - "layer": "shift" - }, - { - "text": "ឩ", - "id": "U_17A9", - "layer": "shift" - }, - { - "text": "ឨ", - "id": "U_17A8" } - ] + } }, { "id": "K_I", "text": "ិ", - "sk": [ - { + "hint": "ី", + "flick": { + "s": { "text": "ី", "id": "K_I", "layer": "shift" - }, - { - "text": "ឥ", - "id": "U_17A5" - }, - { - "text": "ឦ", - "id": "U_17A6", - "layer": "shift" } - ] + } + }, + { + "id": "K_P", + "text": "ផ", + "hint": "្ផ", + "flick": { + "s": { + "text": "្ផ", + "id": "T_17D2_1795" + } + } }, { "id": "K_O", "text": "ោ", - "sk": [ - { + "hint": "ៅ", + "flick": { + "s": { "text": "ៅ", "id": "K_O", "layer": "shift" - }, - { - "text": "ៀ", - "id": "K_LBRKT" - }, - { - "text": "ឿ", - "id": "K_LBRKT", - "layer": "shift" - }, - { - "text": "ោះ", - "id": "K_COLON", - "layer": "shift" - }, - { - "text": "ឱ", - "id": "U_17B1" - }, - { - "text": "ឲ", - "id": "U_17B2" - }, - { - "text": "ឳ", - "id": "U_17B3", - "layer": "shift" - } - ] - }, - { - "id": "K_P", - "text": "ផ", - "sk": [ - { - "text": "ភ", - "id": "K_P", - "layer": "shift" - }, - { - "text": "្ផ", - "id": "T_17D2_1795" - }, - { - "text": "្ភ", - "id": "T_17D2_1797", - "layer": "default" } - ] + } } ] }, @@ -1055,359 +951,792 @@ "id": "K_A", "text": "ា", "width": 100, - "sk": [ - { + "hint": "ាំ", + "flick": { + "s": { "text": "ាំ", "id": "K_A", "layer": "shift" } - ] + } }, { "id": "K_S", "text": "ស", - "sk": [ - { + "hint": "្ស", + "flick": { + "s": { "text": "្ស", "id": "T_17D2_179F" - }, - { - "text": "ឝ", - "id": "U_179D" - }, - { - "text": "ឞ", - "id": "U_179E" } - ] + } }, { "id": "K_D", "text": "ដ", - "sk": [ - { - "text": "ឌ", - "id": "K_D", - "layer": "shift" - }, - { - "text": "្ដ", + "hint": "្ត", + "flick": { + "s": { + "text": "្ត", "id": "T_17D2_178A" - }, - { - "text": "្ឌ", - "id": "T_17D2_178C", - "layer": "default" } - ] + } }, { "id": "K_F", "text": "ថ", - "sk": [ - { - "text": "ធ", - "id": "K_F", - "layer": "shift" - }, - { + "hint": "្ថ", + "flick": { + "s": { "text": "្ថ", "id": "T_17D2_1790" - }, - { - "text": "្ធ", - "id": "T_17D2_1792", - "layer": "default" } - ] + } }, { "id": "K_G", "text": "ង", - "sk": [ - { - "text": "អ", - "id": "K_G", - "layer": "shift" - }, - { + "hint": "្ង", + "flick": { + "s": { "text": "្ង", "id": "T_17D2_1784" - }, - { - "text": "្អ", - "id": "T_17D2_17A2", - "layer": "default" } - ] + } }, { "id": "K_H", "text": "ហ", - "sk": [ - { + "hint": "្ហ", + "flick": { + "s": { "text": "្ហ", "id": "T_17D2_17A0" - }, - { - "text": "ះ", - "id": "K_H", - "layer": "shift" - }, - { - "text": "ៈ", - "id": "U_17C8" } - ] + } }, { "id": "K_J", "text": "ញ", "layer": "shift", - "sk": [ - { + "hint": "្ញ", + "flick": { + "s": { "text": "្ញ", "id": "T_17D2_1789" } - ] + } }, { "id": "K_K", "text": "ក", - "sk": [ - { - "text": "គ", - "id": "K_K", - "layer": "shift" - }, - { + "hint": "្ក", + "flick": { + "s": { "text": "្ក", "id": "T_17D2_1780" - }, - { - "text": "្គ", - "id": "T_17D2_1782" } - ] + } }, { "id": "K_L", "text": "ល", - "sk": [ - { - "text": "ឡ", - "id": "K_L", - "layer": "shift" - }, - { + "hint": "្ល", + "flick": { + "s": { "text": "្ល", "id": "T_17D2_179B" - }, - { - "text": "ឭ", - "id": "U_17AD" - }, - { - "text": "ឮ", - "id": "U_17AE" } - ] + } }, { - "id": "K_COLON", - "text": "ើ" + "id": "K_QUOTE", + "text": "់", + "width": 100, + "hint": "៉", + "flick": { + "s": { + "text": "៉", + "id": "K_QUOTE", + "layer": "shift" + } + } } ] }, { "id": 3, "key": [ + { + "id": "K_SHIFT", + "text": "*Shift*", + "sp": 1, + "nextlayer": "shift" + }, { "id": "K_Z", "text": "ឋ", - "sk": [ - { - "text": "ឍ", - "id": "K_Z", - "layer": "shift" - }, - { + "hint": "្ឋ", + "flick": { + "s": { "text": "្ឋ", "id": "T_17D2_178B" - }, - { - "text": "្ឍ", - "id": "T_17D2_178D", - "layer": "default" } - ] + } }, { "id": "K_X", "text": "ខ", - "sk": [ - { - "text": "ឃ", - "id": "K_X", - "layer": "shift" - }, - { + "hint": "្ខ", + "flick": { + "s": { "text": "្ខ", "id": "T_17D2_1781" - }, - { - "text": "្ឃ", - "id": "T_17D2_1783", - "layer": "default" } - ] + } }, { "id": "K_C", "text": "ច", - "sk": [ - { - "text": "ជ", - "id": "K_C", - "layer": "shift" - }, - { + "hint": "្ច", + "flick": { + "s": { "text": "្ច", "id": "T_17D2_1785" - }, - { - "text": "្ជ", - "id": "T_17D2_1787", - "layer": "default" } - ] + } }, { "id": "K_V", "text": "វ", - "sk": [ - { + "hint": "្វ", + "flick": { + "s": { "text": "្វ", "id": "T_17D2_179C" } - ] + } }, { "id": "K_B", "text": "ប", - "sk": [ - { - "text": "ព", - "id": "K_B", - "layer": "shift" - }, - { + "hint": "្ប", + "flick": { + "s": { "text": "្ប", "id": "T_17D2_1794" - }, - { - "text": "្ព", - "id": "T_17D2_1796", - "layer": "default" } - ] + } }, { "id": "K_N", "text": "ន", - "sk": [ - { - "text": "ណ", - "id": "K_N", - "layer": "shift" - }, - { + "hint": "្ន", + "flick": { + "s": { "text": "្ន", "id": "T_17D2_1793" - }, - { - "text": "្ណ", - "id": "T_17D2_178E", - "layer": "default" } - ] + } }, { "id": "K_M", "text": "ម", - "sk": [ - { + "hint": "្ម", + "flick": { + "s": { "text": "្ម", "id": "T_17D2_1798" - }, - { - "id": "K_M", - "text": "ំ", - "layer": "shift" + } + } + }, + { + "id": "K_COLON", + "text": "ើ" + }, + { + "id": "K_BKSP", + "text": "*BkSp*", + "width": 100, + "sp": 1 + } + ] + }, + { + "id": 4, + "key": [ + { + "id": "K_NUMLOCK", + "text": "១២ឥ", + "width": 140, + "sp": 1, + "nextlayer": "numeric", + "hint": "12@", + "multitap": [ + { + "text": "*123*", + "id": "K_NUMERALS", + "sp": "1", + "nextlayer": "western" } ] }, { - "id": "K_COMMA", - "text": "ុំ", + "id": "K_LOPT", + "text": "*Menu*", + "width": 120, + "sp": 1 + }, + { + "id": "K_SPACE", + "text": "​", + "width": 555, + "sp": 0, "sk": [ { - "id": "K_COMMA", - "text": "ុះ", - "layer": "shift" - }, - { - "id": "K_6", - "text": "៍", - "layer": "shift" - }, + "text": " ", + "id": "U_0020", + "layer": "default" + } + ] + }, + { + "id": "K_PERIOD", + "text": "។", + "width": 120, + "hint": "", + "sk": [ { - "id": "K_7", - "text": "័", - "layer": "shift" - }, + "text": "៕", + "id": "K_PERIOD", + "layer": "shift", + "default": true + } + ] + }, + { + "id": "K_ENTER", + "text": "*Enter*", + "width": 140, + "sp": 1 + } + ] + } + ] + }, + { + "id": "numeric", + "row": [ + { + "id": 1, + "key": [ + { + "id": "K_1", + "text": "១" + }, + { + "id": "K_2", + "text": "២" + }, + { + "id": "K_3", + "text": "៣" + }, + { + "id": "K_4", + "text": "៤" + }, + { + "id": "K_5", + "text": "៥" + }, + { + "id": "K_6", + "text": "៦" + }, + { + "id": "K_7", + "text": "៧" + }, + { + "id": "K_8", + "text": "៨" + }, + { + "id": "K_9", + "text": "៩" + }, + { + "id": "K_0", + "text": "០" + } + ] + }, + { + "id": 2, + "key": [ + { + "id": "U_17A5", + "text": "ឥ" + }, + { + "id": "U_17A6", + "text": "ឦ" + }, + { + "id": "U_17A7", + "text": "ឧ" + }, + { + "id": "U_17AA", + "text": "ឪ" + }, + { + "id": "U_17B1", + "text": "ឱ", + "hint": "ឲ", + "flick": { + "s": { + "text": "ឲ", + "id": "U_17B2" + } + } + }, + { + "id": "U_17B3", + "text": "ឳ" + }, + { + "id": "U_17A9", + "text": "ឩ" + }, + { + "id": "U_17AD", + "text": "ឭ" + }, + { + "id": "U_17AE", + "text": "ឮ" + }, + { + "id": "U_17B0", + "text": "ឰ" + } + ] + }, + { + "id": 3, + "key": [ + { + "id": "K_NUMERALS", + "text": "12@", + "sp": 1, + "nextlayer": "western" + }, + { + "id": "U_179D", + "text": "ឝ", + "sk": [ { - "id": "K_8", - "text": "៏", - "layer": "shift" + "text": "ឞ", + "id": "U_179E" }, { - "id": "K_HYPHEN", - "text": "៌", - "layer": "shift" + "text": "ឨ", + "id": "U_17A8" }, { - "id": "U_17D1", - "text": "៑", - "layer": "shift" + "text": "៓", + "id": "U_17D3", + "layer": "default", + "default": true }, { - "id": "U_17DD", "text": "៝", + "id": "U_17DD", "layer": "shift" }, { - "id": "U_17CE", - "text": "៎", - "layer": "shift" + "text": "ៜ", + "id": "U_17DC" } ] }, { - "id": "K_QUOTE", - "text": "់", - "width": 100, + "id": "U_17D9", + "text": "៙", + "hint": "៚", + "flick": { + "s": { + "text": "៚", + "id": "U_17DA" + } + } + }, + { + "id": "U_17DB", + "text": "៛" + }, + { + "id": "U_17D6", + "text": "៖" + }, + { + "id": "U_201C", + "text": "“", + "hint": "‘", + "flick": { + "s": { + "text": "‘", + "id": "U_2018" + } + } + }, + { + "id": "U_201D", + "text": "”", + "hint": "’", + "flick": { + "s": { + "text": "’", + "id": "U_2019" + } + } + }, + { + "id": "U_0021", + "text": "!" + }, + { + "id": "U_003F", + "text": "?" + }, + { + "id": "K_BKSP", + "text": "*BkSp*", + "sp": 1 + } + ] + }, + { + "id": 4, + "key": [ + { + "id": "K_LCONTROL", + "text": "១២ឥ", + "width": 140, + "sp": 2, + "nextlayer": "default" + }, + { + "id": "K_LOPT", + "text": "*Menu*", + "width": 120, + "sp": 1 + }, + { + "id": "K_SPACE", + "text": "​", + "width": 555, + "sp": 0, + "layer": "default" + }, + { + "id": "K_PERIOD", + "text": "។", + "width": 120, + "hint": "", "sk": [ { - "text": "៉", - "id": "K_QUOTE", + "text": "៕", + "id": "K_PERIOD", + "layer": "shift", + "default": true + } + ] + }, + { + "id": "K_ENTER", + "text": "*Enter*", + "width": 140, + "sp": 1 + } + ] + } + ] + }, + { + "id": "shift", + "row": [ + { + "id": 1, + "key": [ + { + "id": "K_Q", + "text": "ឈ", + "hint": "្ឈ", + "flick": { + "s": { + "text": "្ឈ", + "id": "T_17D2_1788", + "layer": "default" + } + } + }, + { + "id": "K_SLASH", + "text": "៊", + "layer": "default" + }, + { + "id": "K_HYPHEN", + "text": "៌", + "layer": "shift" + }, + { + "id": "K_6", + "text": "៍", + "layer": "shift" + }, + { + "id": "K_T", + "text": "ទ", + "hint": "្ទ", + "flick": { + "s": { + "text": "្ទ", + "id": "T_17D2_1791", + "layer": "default" + } + } + }, + { + "id": "K_7", + "text": "័", + "layer": "shift" + }, + { + "id": "K_Y", + "text": "ួ" + }, + { + "id": "K_8", + "text": "៏", + "layer": "shift" + }, + { + "id": "K_P", + "text": "ភ", + "hint": "្ភ", + "flick": { + "s": { + "text": "្ភ", + "id": "T_17D2_1797", + "layer": "default" + } + } + }, + { + "id": "K_LBRKT", + "text": "ៀ", + "layer": "default", + "hint": "ឿ", + "flick": { + "s": { + "text": "ឿ", + "id": "K_LBRKT", "layer": "shift" - }, + } + } + } + ] + }, + { + "id": 2, + "key": [ + { + "id": "U_17D7", + "text": "ៗ", + "layer": "default" + }, + { + "id": "K_S", + "text": "ៃ" + }, + { + "id": "K_D", + "text": "ឌ", + "hint": "្ឌ", + "flick": { + "s": { + "text": "្ឌ", + "id": "T_17D2_178C", + "layer": "default" + } + } + }, + { + "id": "K_F", + "text": "ធ", + "hint": "្ធ", + "flick": { + "s": { + "text": "្ធ", + "id": "T_17D2_1792", + "layer": "default" + } + } + }, + { + "id": "K_G", + "text": "អ", + "hint": "្អ", + "flick": { + "s": { + "text": "្អ", + "id": "T_17D2_17A2", + "layer": "default" + } + } + }, + { + "id": "K_H", + "text": "ះ", + "layer": "shift", + "hint": "ៈ", + "sk": [ { - "text": "៊", - "id": "K_SLASH" + "text": "ៈ", + "id": "U_17C8", + "default": true } - ] + ], + "flick": { + "s": { + "text": "ៈ", + "id": "U_17C8" + } + } + }, + { + "id": "U_17CE", + "text": "៎", + "hint": "៑", + "flick": { + "s": { + "text": "៑", + "id": "U_17D1" + } + } + }, + { + "id": "K_K", + "text": "គ", + "hint": "្គ", + "flick": { + "s": { + "text": "្គ", + "id": "T_17D2_1782", + "layer": "default" + } + } + }, + { + "id": "K_L", + "text": "ឡ" + }, + { + "id": "U_17AF", + "text": "ឯ", + "layer": "default" + } + ] + }, + { + "id": 3, + "key": [ + { + "id": "K_SHIFT", + "text": "*Shift*", + "sp": 2, + "nextlayer": "default" + }, + { + "id": "K_Z", + "text": "ឍ", + "hint": "្ឍ", + "flick": { + "s": { + "text": "្ឍ", + "id": "T_17D2_178D", + "layer": "default" + } + } + }, + { + "id": "K_X", + "text": "ឃ", + "hint": "្ឃ", + "flick": { + "s": { + "text": "្ឃ", + "id": "T_17D2_1783", + "layer": "default" + } + } + }, + { + "id": "K_C", + "text": "ជ", + "hint": "្ជ", + "flick": { + "s": { + "text": "្ជ", + "id": "T_17D2_1787", + "layer": "default" + } + } + }, + { + "id": "K_B", + "text": "ព", + "hint": "្ព", + "flick": { + "s": { + "text": "្ព", + "id": "T_17D2_1796", + "layer": "default" + } + } + }, + { + "id": "K_N", + "text": "ណ", + "hint": "្ណ", + "flick": { + "s": { + "text": "្ណ", + "id": "T_17D2_178E", + "layer": "default" + } + } + }, + { + "id": "U_17AB", + "text": "ឫ", + "width": 100, + "layer": "default" + }, + { + "id": "U_17AC", + "text": "ឬ", + "layer": "default" + }, + { + "id": "K_M", + "text": "ំ", + "width": 100, + "layer": "shift" }, { "id": "K_BKSP", @@ -1422,10 +1751,20 @@ "key": [ { "id": "K_NUMLOCK", - "text": "១២៣", + "text": "១២ឥ", "width": 140, "sp": 1, - "nextlayer": "numeric" + "nextlayer": "numeric", + "hint": "12@", + "multitap": [ + { + "text": "*123*", + "id": "K_NUMERALS", + "sp": "1", + "nextlayer": "western", + "layer": "default" + } + ] }, { "id": "K_LOPT", @@ -1435,12 +1774,12 @@ }, { "id": "K_SPACE", - "text": "*ZWSp*​", + "text": "​", "width": 555, "sp": 0, "sk": [ { - "text": "*Sp*", + "text": " ", "id": "U_0020", "layer": "default" } @@ -1450,19 +1789,13 @@ "id": "K_PERIOD", "text": "។", "width": 120, + "layer": "default", "sk": [ { "text": "៕", "id": "K_PERIOD", - "layer": "shift" - }, - { - "text": "!", - "id": "U_0021" - }, - { - "text": "?", - "id": "U_003F" + "layer": "shift", + "default": true } ] }, @@ -1477,114 +1810,120 @@ ] }, { - "id": "numeric", + "id": "western", "row": [ { "id": 1, "key": [ { - "id": "K_1", - "text": "១", - "sk": [ - { - "text": "1", - "id": "U_0031" + "id": "U_0031", + "text": "1", + "hint": "®", + "flick": { + "s": { + "text": "®", + "id": "U_00AE" } - ] - }, - { - "id": "K_2", - "text": "២", - "sk": [ - { - "text": "2", - "id": "U_0032" + } + }, + { + "id": "U_0032", + "text": "2", + "hint": "§", + "flick": { + "s": { + "text": "§", + "id": "U_00A7" } - ] + } }, { - "id": "K_3", - "text": "៣", - "sk": [ - { - "text": "3", - "id": "U_0033" + "id": "U_0033", + "text": "3", + "hint": "Ø", + "flick": { + "s": { + "text": "Ø", + "id": "U_00D8" } - ] + } }, { - "id": "K_4", - "text": "៤", - "sk": [ - { - "text": "4", - "id": "U_0034" + "id": "U_0034", + "text": "4", + "hint": "©", + "flick": { + "s": { + "text": "©", + "id": "U_00A9" } - ] + } }, { - "id": "K_5", - "text": "៥", - "sk": [ - { - "text": "5", - "id": "U_0035" + "id": "U_0035", + "text": "5", + "hint": "№", + "flick": { + "s": { + "text": "№", + "id": "U_2116" } - ] + } }, { - "id": "K_6", - "text": "៦", - "sk": [ - { - "text": "6", - "id": "U_0036" + "id": "U_0036", + "text": "6", + "hint": "~", + "flick": { + "s": { + "text": "~", + "id": "U_007E" } - ] + } }, { - "id": "K_7", - "text": "៧", - "sk": [ - { - "text": "7", - "id": "U_0037" + "id": "U_0037", + "text": "7", + "hint": "≤", + "flick": { + "s": { + "text": "≤", + "id": "U_2264" } - ] + } }, { - "id": "K_8", - "text": "៨", - "sk": [ - { - "text": "8", - "id": "U_0038" + "id": "U_0038", + "text": "8", + "hint": "<", + "flick": { + "s": { + "text": "<", + "id": "U_003C" } - ] + } }, { - "id": "K_9", - "text": "៩", - "sk": [ - { - "text": "9", - "id": "U_0039" + "id": "U_0039", + "text": "9", + "hint": ">", + "flick": { + "s": { + "text": ">", + "id": "U_003E" } - ] + } }, { - "id": "K_0", - "text": "០", - "sk": [ - { - "text": "0", - "id": "U_0030" - }, - { - "text": "៓", - "id": "U_17D3" + "id": "U_0030", + "text": "0", + "hint": "≥", + "flick": { + "s": { + "text": "≥", + "id": "U_2265" } - ] + } } ] }, @@ -1593,51 +1932,24 @@ "key": [ { "id": "U_0040", - "text": "@", - "sk": [ - { - "text": "©", - "id": "U_00A9" - }, - { - "text": "®", - "id": "U_00AE" - } - ] + "text": "@" }, { "id": "U_0023", - "text": "#", - "sk": [ - { - "text": "№", - "id": "U_2116" - }, - { - "text": "~", - "id": "U_007E" - } - ] + "text": "#" }, { - "id": "U_17DB", - "text": "៛", + "id": "U_0024", + "text": "$", "sk": [ - { - "text": "$", - "id": "U_0024" - }, - { - "text": "฿", - "id": "U_0E3F" - }, { "text": "¢", "id": "U_00A2" }, { "text": "£", - "id": "U_00A3" + "id": "U_00A3", + "default": true }, { "text": "¥", @@ -1645,39 +1957,44 @@ } ] }, - { - "id": "U_0026", - "text": "&" - }, { "id": "U_0025", "text": "%", - "sk": [ - { + "hint": "‰", + "flick": { + "s": { "text": "‰", "id": "U_2030" - }, - { - "text": "‱", - "id": "U_2031" } - ] + } + }, + { + "id": "U_0026", + "text": "&" + }, + { + "id": "U_003A", + "text": ":", + "hint": "…", + "flick": { + "s": { + "text": "…", + "id": "U_2026" + } + } }, { "id": "U_002B", "text": "+", "sk": [ { - "text": "-", - "id": "U_002D" + "text": "÷", + "id": "U_00F7" }, { "text": "×", - "id": "U_00D7" - }, - { - "text": "÷", - "id": "U_00F7" + "id": "U_00D7", + "default": true }, { "text": "±", @@ -1686,46 +2003,43 @@ ] }, { - "id": "U_003D", - "text": "=", - "sk": [ - { + "id": "U_002D", + "text": "-", + "hint": "_", + "flick": { + "s": { "text": "_", "id": "U_005F" - }, - { - "text": "≠", - "id": "U_2260" } - ] + } }, { "id": "U_002A", "text": "*", - "sk": [ - { + "hint": "^", + "flick": { + "s": { "text": "^", "id": "U_005E" } - ] + } }, { - "id": "U_003F", - "text": "?", + "id": "U_002F", + "text": "/", "sk": [ { - "text": "¿", - "id": "U_00BF" - } - ] - }, - { - "id": "U_0021", - "text": "!", - "sk": [ + "text": "|", + "id": "U_007C" + }, + { + "text": "\\", + "id": "U_005C", + "default": true + }, { - "text": "¡", - "id": "U_00A1" + "text": "¦", + "id": "U_00A6" } ] } @@ -1735,72 +2049,43 @@ "id": 3, "key": [ { - "id": "U_2018", - "text": "‘", - "sk": [ - { - "text": "’", - "id": "U_2019" - } - ] - }, - { - "id": "U_201C", - "text": "“", - "sk": [ - { - "text": "”", - "id": "U_201D" - } - ] - }, - { - "id": "U_00AB", - "text": "«", - "sk": [ - { - "text": "»", - "id": "U_00BB" - } - ] + "id": "K_NUMLOCK", + "text": "12@", + "sp": 2, + "nextlayer": "numeric" }, { - "id": "U_002F", - "text": "/", + "id": "U_0028", + "text": "(", + "hint": "", "sk": [ { - "text": "\\", - "id": "U_005C" + "text": "{", + "id": "U_007B" }, { - "text": "|", - "id": "U_007C" + "text": "[", + "id": "U_005B", + "default": true }, { - "text": "¦", - "id": "U_00A6" + "text": "«", + "id": "U_00AB" } ] }, { - "id": "U_0028", - "text": "(", + "id": "U_0029", + "text": ")", "sk": [ { - "text": ")", - "id": "U_0029" - }, - { - "text": "[", - "id": "U_005B" + "text": "»", + "id": "U_00BB" }, { "text": "]", - "id": "U_005D" - }, - { - "text": "{", - "id": "U_007B" + "id": "U_005D", + "default": true }, { "text": "}", @@ -1809,66 +2094,35 @@ ] }, { - "id": "U_17D9", - "text": "៙", - "sk": [ - { - "text": "៚", - "id": "U_17DA" - }, - { - "text": "ៜ", - "id": "U_17DC" - }, - { - "text": "§", - "id": "U_00A7" - }, - { - "text": "Ø", - "id": "U_00D8" - } - ] + "id": "U_0027", + "text": "'" }, { - "id": "U_17D7", - "text": "ៗ" + "id": "U_0022", + "text": "\"" }, { - "id": "U_003C", - "text": "<", - "sk": [ - { - "text": "≤", - "id": "U_2264" - }, - { - "text": ">", - "id": "U_003E" - }, - { - "text": "≥", - "id": "U_2265" + "id": "U_003D", + "text": "=", + "hint": "≠", + "flick": { + "s": { + "text": "≠", + "id": "U_2260" } - ] + } }, { - "id": "U_17D6", - "text": "៖", - "sk": [ - { - "text": ":", - "id": "U_003A" - }, - { - "text": ";", - "id": "U_003B" - }, - { - "text": "…", - "id": "U_2026" - } - ] + "id": "U_003B", + "text": ";" + }, + { + "id": "U_0021", + "text": "!" + }, + { + "id": "U_003F", + "text": "?" }, { "id": "K_BKSP", @@ -1882,9 +2136,9 @@ "key": [ { "id": "K_LCONTROL", - "text": "១២៣", + "text": "កខគ", "width": 140, - "sp": 2, + "sp": 1, "nextlayer": "default" }, { @@ -1895,28 +2149,21 @@ }, { "id": "K_SPACE", - "text": "*Sp*​", + "text": "​", "width": 555, "sp": 0, - "layer": "shift" + "layer": "default" }, { - "id": "K_PERIOD", - "text": "។", + "id": "U_002E", + "text": ".", "width": 120, + "hint": "", "sk": [ { - "text": "៕", - "id": "K_PERIOD", - "layer": "shift" - }, - { - "text": "!", - "id": "U_0021" - }, - { - "text": "?", - "id": "U_003F" + "text": ",", + "id": "U_002C", + "default": true } ] }, @@ -1933,6 +2180,6 @@ ], "displayUnderlying": false, "font": "Khmer Mondulkiri", - "fontsize": "" + "fontsize": "0.8em" } } \ No newline at end of file diff --git a/release/k/khmer_angkor/source/khmer_angkor.kmn b/release/k/khmer_angkor/source/khmer_angkor.kmn index 6694eee9ee..762ba36eed 100644 --- a/release/k/khmer_angkor/source/khmer_angkor.kmn +++ b/release/k/khmer_angkor/source/khmer_angkor.kmn @@ -1,16 +1,59 @@ store(&VERSION) '10.0' store(&NAME) "Khmer Angkor" -store(©RIGHT) '© SIL International' +store(©RIGHT) '© SIL Global' store(&MESSAGE) "More than just a Khmer Unicode keyboard." store(&TARGETS) 'any' store(&DISPLAYMAP) '../../../shared/fonts/kbd/kbdkhmr/KbdKhmr.json' store(&LAYOUTFILE) 'khmer_angkor.keyman-touch-layout' -store(&KEYBOARDVERSION) '1.5' +store(&KEYBOARDVERSION) '2.0' store(&BITMAP) 'khmer_angkor.ico' store(&VISUALKEYBOARD) 'khmer_angkor.kvks' begin Unicode > use(main) +begin PostKeystroke > use(PostKeystroke) +c This tells Keyman which keys should have casing behavior applied +store(ShiftOutSingle) 'ឈ៊ទ៌ៗ៍ភ័គ៏អៀឯឲធឿឌឬឫឍះឃៈជពុំណំឡ' +store(vCombo1) 'ុះ' +store(vCombo2) 'ោះ' +store(vCombo3) 'េះ' +store(ShiftOutAll) outs(ShiftOutSingle) outs(vCombo1) outs(vCombo2) outs(vCombo3) + + +store(digit) '១២៣៤៥៦៧៨៩០' +store(number) '1234567890' + +c Various Unicode spacing characters +store(whitespace) ' ' U+00A0 U+000D U+000A U+0009 U+2002 U+2003 U+2004 U+2005 U+2006 U+2007 U+2008 U+2009 U+200A U+202F U+205F + + +group(NewContext) readonly + c Any time we get a new context, by mouse click, tap, + c cursor movement, new document, etc, we'll try and + c determine the best layer to use + platform('touch') > use(detectStartOfSentence) + +group(PostKeystroke) readonly + c We get here after every keystroke and model action is processed + + c Do swap off the shift layer automatically + if(&newLayer = "") if(&layer = 'shift') any(ShiftOutSingle) > context layer('default') + + c Okay, let's stay on the numeric layer if we are there already + platform('touch') if(&newLayer = "") if(&layer = 'numeric') any(digit) > context + + platform('touch') if(&newLayer = "") if(&layer = 'western') any(number) > context + + c no other changes, so detect sentence or layer change, as long + c as the user hasn't attempted to change layer themselves. + platform('touch') if(&newLayer = "") > use(detectStartOfSentence) + + +group(detectStartOfSentence) readonly + c We have a shared group for the start of sentence detection now + c which will set the current layer according to the current context. + + nomatch > layer('default') c ==============================================STORES============================================== diff --git a/release/k/khmer_angkor/source/khmer_angkor.kps b/release/k/khmer_angkor/source/khmer_angkor.kps index 384f4e5a2f..b9a6d2cbed 100644 --- a/release/k/khmer_angkor/source/khmer_angkor.kps +++ b/release/k/khmer_angkor/source/khmer_angkor.kps @@ -1,7 +1,7 @@ - 17.0.326.0 + 17.0.332.0 7.0 @@ -20,7 +20,7 @@ Khmer Angkor - © 2015-2024 SIL International + © 2015-2024 SIL Global Makara Sok https://keyman.com/keyboards/khmer_angkor @@ -106,12 +106,6 @@ Automatically corrects many common keying errors. 0 .pdf - - welcome\KAK_Documentation_KH.pdf - File KAK_Documentation_KH.pdf - 0 - .pdf - readme.htm File readme.htm @@ -147,7 +141,7 @@ Automatically corrects many common keying errors. Khmer Angkor khmer_angkor - 1.5 + 2.0 ..\..\..\shared\fonts\kbd\kbdkhmr\KbdKhmr.ttf ..\..\..\shared\fonts\khmer\mondulkiri\Mondulkiri-R.ttf diff --git a/release/k/khmer_angkor/source/readme.htm b/release/k/khmer_angkor/source/readme.htm index b7113f711c..fb2b35d0f0 100644 --- a/release/k/khmer_angkor/source/readme.htm +++ b/release/k/khmer_angkor/source/readme.htm @@ -17,7 +17,7 @@

Khmer Angkor Keyboard

With the users' pitfall in typing Khmer words in mind, Khmer Angkor focuses on the unification of the character orders and spelling rules. These make Khmer Angkor uniquely different from any other keyboards. Khmer Angkor's keyboard layouts were adopted from NiDA keyboard which is widely used at the present.

-

© SIL International

+

© SIL Global

diff --git a/release/k/khmer_angkor/source/welcome/KAK_Documentation_EN.pdf b/release/k/khmer_angkor/source/welcome/KAK_Documentation_EN.pdf index 23b6f62b8f..adc878fcc0 100644 Binary files a/release/k/khmer_angkor/source/welcome/KAK_Documentation_EN.pdf and b/release/k/khmer_angkor/source/welcome/KAK_Documentation_EN.pdf differ diff --git a/release/k/khmer_angkor/source/welcome/KAK_Documentation_KH.pdf b/release/k/khmer_angkor/source/welcome/KAK_Documentation_KH.pdf index 85bd8c0b0b..6d38d04e01 100644 Binary files a/release/k/khmer_angkor/source/welcome/KAK_Documentation_KH.pdf and b/release/k/khmer_angkor/source/welcome/KAK_Documentation_KH.pdf differ diff --git a/release/k/khmer_angkor/source/welcome/welcome.htm b/release/k/khmer_angkor/source/welcome/welcome.htm index 124d9d20e6..6eeadf91e7 100644 --- a/release/k/khmer_angkor/source/welcome/welcome.htm +++ b/release/k/khmer_angkor/source/welcome/welcome.htm @@ -35,7 +35,7 @@

Fonts

To get Khmer fonts, you may visit one of the three sources below: