Skip to content

Commit

Permalink
CLDR-173665 kbd: rename uSet to uset
Browse files Browse the repository at this point in the history
- dtd, xsd, test data
  • Loading branch information
srl295 committed Feb 7, 2024
1 parent 0994900 commit 4e52ffc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions keyboards/dtd/ldmlKeyboard3.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ Please view the subcommittee page for the most recent information.
<!--@MATCH:any-->
<!--@VALUE-->

<!ELEMENT variables ( import*, string*, set*, uSet*, special* ) >
<!ELEMENT variables ( import*, string*, set*, uset*, special* ) >
<!--@TECHPREVIEW-->

<!ELEMENT string EMPTY >
Expand All @@ -190,10 +190,10 @@ Please view the subcommittee page for the most recent information.
<!--@VALUE-->
<!--@ALLOWS_UESC-->

<!ELEMENT uSet EMPTY >
<!ATTLIST uSet id NMTOKEN #REQUIRED >
<!ELEMENT uset EMPTY >
<!ATTLIST uset id NMTOKEN #REQUIRED >
<!--@MATCH:regex/[0-9A-Za-z_]{1,32}-->
<!ATTLIST uSet value CDATA #REQUIRED >
<!ATTLIST uset value CDATA #REQUIRED >
<!--@MATCH:any-->
<!--@VALUE-->

Expand Down
4 changes: 2 additions & 2 deletions keyboards/dtd/ldmlKeyboard3.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
<xs:element maxOccurs="unbounded" minOccurs="0" ref="import"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="string"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="set"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="uSet"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="uset"/>
<xs:element maxOccurs="unbounded" minOccurs="0" ref="special"/>
</xs:sequence>
</xs:complexType>
Expand All @@ -342,7 +342,7 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file



<xs:element name="uSet">
<xs:element name="uset">
<xs:complexType>
<xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
<xs:attribute name="value" use="required"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
|| elementName.equals("layer") && attribute.equals("id")
|| elementName.equals("string") && attribute.equals("id")
|| elementName.equals("set") && attribute.equals("id")
|| elementName.equals("uSet") && attribute.equals("id")) {
|| elementName.equals("uset") && attribute.equals("id")) {
return true;
}
// fall through to old keyboard
Expand Down

0 comments on commit 4e52ffc

Please sign in to comment.