Skip to content

Commit 18380fe

Browse files
srl295srl295
authored
CLDR-18903 v48 BRS update DTDs (#4975)
1 parent 4b08cc9 commit 18380fe

File tree

4 files changed

+106
-10
lines changed

4 files changed

+106
-10
lines changed

‎common/dtd/ldml.dtd‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,7 +2280,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
22802280
<!--@VALUE-->
22812281
<!--@DEPRECATED-->
22822282

2283-
<!ELEMENT rationalFormats ( alias | ( rationalPattern*, integerAndRationalPattern*, rationalUsage*, special* ) ) >
2283+
<!ELEMENT rationalFormats ( alias | ( rationalPattern*, integerAndRationalPattern*, rationalUsage*, special* ) ) >
22842284
<!ATTLIST rationalFormats numberSystem CDATA #REQUIRED >
22852285
<!--@MATCH:bcp47/nu-->
22862286

@@ -2289,20 +2289,19 @@ CLDR data files are interpreted according to the LDML specification (http://unic
22892289
<!--@MATCH:literal/variant-->
22902290
<!ATTLIST rationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
22912291
<!--@METADATA-->
2292-
2292+
22932293
<!ELEMENT integerAndRationalPattern ( #PCDATA ) >
22942294
<!ATTLIST integerAndRationalPattern alt NMTOKENS #IMPLIED >
22952295
<!--@MATCH:literal/superSub-->
22962296
<!ATTLIST integerAndRationalPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
22972297
<!--@METADATA-->
2298-
2298+
22992299
<!ELEMENT rationalUsage ( #PCDATA ) >
23002300
<!ATTLIST rationalUsage alt NMTOKENS #IMPLIED >
23012301
<!--@MATCH:literal/variant-->
23022302
<!ATTLIST rationalUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
23032303
<!--@METADATA-->
23042304

2305-
23062305
<!ELEMENT scientificFormats ( alias | ( default*, scientificFormatLength*, special* ) ) >
23072306
<!ATTLIST scientificFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
23082307
<!--@METADATA-->
@@ -3142,11 +3141,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
31423141
<!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
31433142
<!--@METADATA-->
31443143

3145-
<!ELEMENT rbnfRules ( #PCDATA )>
3146-
3144+
<!ELEMENT rbnfRules ( #PCDATA ) >
31473145
<!ATTLIST rbnfRules alt NMTOKENS #IMPLIED >
31483146
<!--@MATCH:literal/variant-->
3149-
31503147
<!ATTLIST rbnfRules draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
31513148
<!--@METADATA-->
31523149
<!--@DEPRECATED:true, false-->

‎common/dtd/ldml.xsd‎

Lines changed: 98 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
182182
<xs:complexType mixed="true">
183183
<xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
184184
<xs:attribute name="alt" type="xs:NMTOKENS"/>
185+
<xs:attribute name="menu" type="xs:NMTOKENS"/>
185186
<xs:attribute name="draft">
186187
<xs:simpleType>
187188
<xs:restriction base="xs:token">
@@ -203,6 +204,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
203204

204205

205206

207+
206208
<xs:element name="script">
207209
<xs:complexType mixed="true">
208210
<xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
@@ -696,6 +698,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
696698
<xs:complexType mixed="true">
697699
<xs:attribute name="key" type="xs:NMTOKEN" use="required"/>
698700
<xs:attribute name="type" type="xs:NMTOKEN" use="required"/>
701+
<xs:attribute name="scope" type="xs:NMTOKEN"/>
699702
<xs:attribute name="alt" type="xs:NMTOKENS"/>
700703
<xs:attribute name="draft">
701704
<xs:simpleType>
@@ -718,6 +721,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
718721

719722

720723

724+
721725
<xs:element name="transformNames">
722726
<xs:complexType>
723727
<xs:choice>
@@ -1196,12 +1200,15 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
11961200
<xs:attribute name="type">
11971201
<xs:simpleType>
11981202
<xs:restriction base="xs:token">
1199-
<xs:enumeration value="auxiliary"/>
12001203
<xs:enumeration value="standard"/>
1204+
<xs:enumeration value="auxiliary"/>
1205+
<xs:enumeration value="numbers"/>
1206+
<xs:enumeration value="numbers-auxiliary"/>
12011207
<xs:enumeration value="punctuation"/>
1202-
<xs:enumeration value="currencySymbol"/>
1208+
<xs:enumeration value="punctuation-auxiliary"/>
1209+
<xs:enumeration value="punctuation-person"/>
12031210
<xs:enumeration value="index"/>
1204-
<xs:enumeration value="numbers"/>
1211+
<xs:enumeration value="currencySymbol"/>
12051212
</xs:restriction>
12061213
</xs:simpleType>
12071214
</xs:attribute>
@@ -5122,6 +5129,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
51225129
<xs:element maxOccurs="unbounded" minOccurs="0" ref="minimumGroupingDigits"/>
51235130
<xs:element maxOccurs="unbounded" minOccurs="0" ref="symbols"/>
51245131
<xs:element maxOccurs="unbounded" minOccurs="0" ref="decimalFormats"/>
5132+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalFormats"/>
51255133
<xs:element maxOccurs="unbounded" minOccurs="0" ref="scientificFormats"/>
51265134
<xs:element maxOccurs="unbounded" minOccurs="0" ref="percentFormats"/>
51275135
<xs:element maxOccurs="unbounded" minOccurs="0" ref="currencyFormats"/>
@@ -5853,6 +5861,72 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
58535861

58545862

58555863

5864+
<xs:element name="rationalFormats">
5865+
<xs:complexType>
5866+
<xs:choice>
5867+
<xs:element ref="alias"/>
5868+
<xs:sequence>
5869+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalPattern"/>
5870+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="integerAndRationalPattern"/>
5871+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="rationalUsage"/>
5872+
<xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
5873+
</xs:sequence>
5874+
</xs:choice>
5875+
<xs:attribute name="numberSystem" use="required"/>
5876+
</xs:complexType>
5877+
</xs:element>
5878+
5879+
<xs:element name="rationalPattern">
5880+
<xs:complexType mixed="true">
5881+
<xs:attribute name="alt" type="xs:NMTOKENS"/>
5882+
<xs:attribute name="draft">
5883+
<xs:simpleType>
5884+
<xs:restriction base="xs:token">
5885+
<xs:enumeration value="approved"/>
5886+
<xs:enumeration value="contributed"/>
5887+
<xs:enumeration value="provisional"/>
5888+
<xs:enumeration value="unconfirmed"/>
5889+
</xs:restriction>
5890+
</xs:simpleType>
5891+
</xs:attribute>
5892+
</xs:complexType>
5893+
</xs:element>
5894+
5895+
5896+
<xs:element name="integerAndRationalPattern">
5897+
<xs:complexType mixed="true">
5898+
<xs:attribute name="alt" type="xs:NMTOKENS"/>
5899+
<xs:attribute name="draft">
5900+
<xs:simpleType>
5901+
<xs:restriction base="xs:token">
5902+
<xs:enumeration value="approved"/>
5903+
<xs:enumeration value="contributed"/>
5904+
<xs:enumeration value="provisional"/>
5905+
<xs:enumeration value="unconfirmed"/>
5906+
</xs:restriction>
5907+
</xs:simpleType>
5908+
</xs:attribute>
5909+
</xs:complexType>
5910+
</xs:element>
5911+
5912+
5913+
<xs:element name="rationalUsage">
5914+
<xs:complexType mixed="true">
5915+
<xs:attribute name="alt" type="xs:NMTOKENS"/>
5916+
<xs:attribute name="draft">
5917+
<xs:simpleType>
5918+
<xs:restriction base="xs:token">
5919+
<xs:enumeration value="approved"/>
5920+
<xs:enumeration value="contributed"/>
5921+
<xs:enumeration value="provisional"/>
5922+
<xs:enumeration value="unconfirmed"/>
5923+
</xs:restriction>
5924+
</xs:simpleType>
5925+
</xs:attribute>
5926+
</xs:complexType>
5927+
</xs:element>
5928+
5929+
58565930
<xs:element name="scientificFormats">
58575931
<xs:complexType>
58585932
<xs:choice>
@@ -8072,6 +8146,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
80728146
<xs:choice>
80738147
<xs:element ref="alias"/>
80748148
<xs:sequence>
8149+
<xs:element minOccurs="0" ref="rbnfRules"/>
80758150
<xs:element maxOccurs="unbounded" minOccurs="0" ref="ruleset"/>
80768151
<xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
80778152
</xs:sequence>
@@ -8093,6 +8168,26 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
80938168
</xs:element>
80948169

80958170

8171+
<xs:element name="rbnfRules">
8172+
<xs:complexType mixed="true">
8173+
<xs:attribute name="alt" type="xs:NMTOKENS"/>
8174+
<xs:attribute name="draft">
8175+
<xs:simpleType>
8176+
<xs:restriction base="xs:token">
8177+
<xs:enumeration value="approved"/>
8178+
<xs:enumeration value="contributed"/>
8179+
<xs:enumeration value="provisional"/>
8180+
<xs:enumeration value="unconfirmed"/>
8181+
<xs:enumeration value="true"/>
8182+
<xs:enumeration value="false"/>
8183+
</xs:restriction>
8184+
</xs:simpleType>
8185+
</xs:attribute>
8186+
</xs:complexType>
8187+
</xs:element>
8188+
8189+
8190+
80968191
<xs:element name="ruleset">
80978192
<xs:complexType>
80988193
<xs:choice>

‎common/dtd/ldmlBCP47.xsd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
120120
<xs:attribute name="alias"/>
121121
<xs:attribute name="since"/>
122122
<xs:attribute name="iana"/>
123+
<xs:attribute name="region"/>
123124
</xs:complexType>
124125
</xs:element>
125126

@@ -134,6 +135,8 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
134135

135136

136137

138+
139+
137140
<xs:element name="attribute">
138141
<xs:complexType>
139142
<xs:attribute name="name" type="xs:NMTOKEN" use="required"/>

‎common/dtd/ldmlSupplemental.xsd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
374374

375375

376376

377+
377378
<xs:element name="scriptData">
378379
<xs:complexType>
379380
<xs:sequence>

0 commit comments

Comments
 (0)