Skip to content

Commit c954c5f

Browse files
authored
Merge pull request #9482 from keymanapp/chore/resources/7042-update-ldml-post-pri-epic-ldml
chore(resources): update CLDR to post-PRI 🙀
2 parents c8cd009 + 9cb0cae commit c954c5f

File tree

10 files changed

+1013
-612
lines changed

10 files changed

+1013
-612
lines changed

core/tests/unit/ldml/keyboards/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# tests in resources/standards-data/ldml-keyboards/techpreview/test/
1010
tests_from_cldr = [
1111
'ja-Latn',
12-
# 'pt-k0-abnt2', #TODO-LDML: marker syntax fail!
12+
'pt-t-k0-abnt2',
1313
'fr-t-k0-azerty',
1414
]
1515

resources/standards-data/ldml-keyboards/techpreview/3.0/fr-t-k0-azerty.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,16 @@
6363
<key id="symbol" switch="symbol" />
6464
<key id="base" switch="base" />
6565

66-
<key id="bksp" gap="true" />
66+
<!--
67+
TODO: need discussion
68+
<key id="bksp" gap="true" /> -->
6769
<key id="extra" gap="true" />
70+
<!--
71+
TODO: need discussion
6872
<key id="enter" to="\u{000A}" />
73+
-->
74+
<key id="enter" gap="true" />
75+
6976

7077
<!-- extra keys -->
7178
<key id="u-grave" to="ü" />
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"sha": "b3da9e80354a83b5ff29690e9f0ce4a0f5d3b7d2",
3-
"description": "release-43-alpha2-47-gb3da9e8035",
4-
"date": "Thu, 27 Apr 2023 15:47:15 +0000"
2+
"sha": "44903d0867e42df37f17cf21d28938044eb1edc0",
3+
"description": "release-44-m1-75-g44903d0867",
4+
"date": "Thu, 17 Aug 2023 19:14:19 +0000"
55
}

resources/standards-data/ldml-keyboards/techpreview/dtd/ldmlKeyboard.dtd

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@ CLDR data files are interpreted according to the LDML specification (http://unic
66
-->
77
<!-- Important Note:
88

9-
The CLDR Keyboard Workgroup is currently developing major changes to the
10-
CLDR keyboard specification.
11-
12-
This DTD is a work in progress.
13-
14-
Please see https://cldr.unicode.org/index/keyboard-workgroup for the latest information. -->
9+
The CLDR Keyboard Subcommittee is currently developing major changes to the CLDR keyboard specification.
10+
Please view the subcommittee page for the most recent information.
11+
<https://cldr.unicode.org/index/keyboard-workgroup> -->
1512

1613
<!ELEMENT keyboard ( import*, locales?, version?, info?, names, settings?, vkeys?, displays?, keys?, layers*, variables?, transforms*, special* ) >
1714
<!--@TECHPREVIEW-->
1815
<!ATTLIST keyboard locale CDATA #REQUIRED >
19-
<!--@MATCH:validity/bcp47-->
16+
<!--@MATCH:validity/bcp47-wellformed-->
2017
<!ATTLIST keyboard conformsTo (techpreview) #REQUIRED >
2118
<!--@MATCH:any-->
2219
<!--@METADATA-->
@@ -33,16 +30,16 @@ Please see https://cldr.unicode.org/index/keyboard-workgroup for the latest info
3330
<!ELEMENT locale EMPTY >
3431
<!--@TECHPREVIEW-->
3532
<!ATTLIST locale id CDATA #REQUIRED >
36-
<!--@MATCH:validity/bcp47-->
33+
<!--@MATCH:validity/bcp47-wellformed-->
3734
<!--@VALUE-->
3835

3936
<!ELEMENT version EMPTY >
4037
<!--@TECHPREVIEW-->
4138
<!ATTLIST version number CDATA #IMPLIED >
42-
<!-- Note: post techpreview, change cldrVersion to MATCH:version -->
4339
<!--@MATCH:semver-->
4440
<!--@VALUE-->
4541
<!ATTLIST version cldrVersion CDATA #FIXED "techpreview" >
42+
<!-- Note: post techpreview, change cldrVersion to MATCH:version -->
4643
<!--@MATCH:any-->
4744
<!--@METADATA-->
4845

@@ -96,7 +93,9 @@ Please see https://cldr.unicode.org/index/keyboard-workgroup for the latest info
9693

9794
<!ELEMENT display EMPTY >
9895
<!--@TECHPREVIEW-->
99-
<!ATTLIST display to CDATA #REQUIRED >
96+
<!ATTLIST display id CDATA #IMPLIED >
97+
<!--@MATCH:regex/[A-Za-z0-9][A-Za-z0-9-]*-->
98+
<!ATTLIST display to CDATA #IMPLIED >
10099
<!--@MATCH:any-->
101100
<!--@ALLOWS_UESC-->
102101
<!ATTLIST display display CDATA #REQUIRED >
@@ -171,9 +170,9 @@ Please see https://cldr.unicode.org/index/keyboard-workgroup for the latest info
171170
<!ELEMENT layer ( row+, special* ) >
172171
<!--@TECHPREVIEW-->
173172
<!ATTLIST layer id NMTOKEN #IMPLIED >
174-
<!--@MATCH:any-->
173+
<!--@MATCH:regex/[A-Za-z0-9][A-Za-z0-9-]*-->
175174
<!ATTLIST layer modifier NMTOKENS #IMPLIED >
176-
<!--@MATCH:any-->
175+
<!--@MATCH:regex/(none|([A-Za-z0-9]+)( [A-Za-z0-9]+)*)-->
177176

178177
<!ELEMENT row EMPTY >
179178
<!--@ORDERED-->

0 commit comments

Comments
 (0)