diff --git a/core/src/kmx/kmx_file.h b/core/src/kmx/kmx_file.h index 04504645715..0d34cc615a9 100644 --- a/core/src/kmx/kmx_file.h +++ b/core/src/kmx/kmx_file.h @@ -340,11 +340,18 @@ struct COMP_KEYBOARD { KMX_DWORD dwBitmapSize; // 003C size in bytes of the bitmaps }; -// TODO-LDML: fill this in -struct COMP_KEYBOARD_EX { +struct COMP_KEYBOARD_KMXPLUSINFO { KMX_DWORD dpKMXPlus; // 0040 offset of KMXPlus data, header is first - KMX_DWORD dwKMXPlusSize; // 0048 size in bytes of entire KMXPlus data - }; + KMX_DWORD dwKMXPlusSize; // 0044 size in bytes of entire KMXPlus data +}; + +/** + * Only valid if comp_keyboard.dwFlags&KF_KMXPLUS + */ +struct COMP_KEYBOARD_EX { + COMP_KEYBOARD header; // 0000 see COMP_KEYBOARD + COMP_KEYBOARD_KMXPLUSINFO kmxplus; // 0040 see COMP_KEYBOARD_EXTRA +}; typedef COMP_KEYBOARD *PCOMP_KEYBOARD; typedef COMP_STORE *PCOMP_STORE; diff --git a/core/tests/unit/ldml/001_tiny.kmx b/core/tests/unit/ldml/001_tiny.kmx new file mode 100644 index 00000000000..3c160a87064 Binary files /dev/null and b/core/tests/unit/ldml/001_tiny.kmx differ diff --git a/core/tests/unit/ldml/001_tiny.xml b/core/tests/unit/ldml/001_tiny.xml new file mode 100644 index 00000000000..79028627b5f --- /dev/null +++ b/core/tests/unit/ldml/001_tiny.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/standards-data/ldml-keyboards/readme.md b/resources/standards-data/ldml-keyboards/readme.md new file mode 100644 index 00000000000..826f6d5dd51 --- /dev/null +++ b/resources/standards-data/ldml-keyboards/readme.md @@ -0,0 +1,15 @@ +# ldml-keyboards + +This data is from https://github.com/unicode-org/cldr.git + +Data will eventually be versioned, so there would be a `42`, `43` etc directory. + +Currently there is a `techpreview` directory referring to the technical preview—work in progress work in 2022. +That will very roughly correspond to , or pull requests thereunto. + +## Data Format + +Each directory contains: + +- `ldmlKeyboard.dtd` - the DTD file +- `imports/` - the importable data files (TODO-LDML) diff --git a/resources/standards-data/ldml-keyboards/techpreview/ldmlKeyboard.dtd b/resources/standards-data/ldml-keyboards/techpreview/ldmlKeyboard.dtd new file mode 100644 index 00000000000..f150fd60938 --- /dev/null +++ b/resources/standards-data/ldml-keyboards/techpreview/ldmlKeyboard.dtd @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/standards-data/ldml-keyboards/techpreview/readme.md b/resources/standards-data/ldml-keyboards/techpreview/readme.md new file mode 100644 index 00000000000..b2265826b79 --- /dev/null +++ b/resources/standards-data/ldml-keyboards/techpreview/readme.md @@ -0,0 +1,3 @@ +# ldml-keyboards/techpreview + +See [../readme.md](../readme.md)