@@ -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