< prev index next >

make/data/cldr/common/dtd/ldml.dtd

Print this page

        

@@ -1,14 +1,14 @@
 <!--
-Copyright © 2003-2019 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+Copyright © 2003-2017 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
 
 THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
 
 Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
-$Revision: 14983 $
+$Revision: 13905 $
 -->
 
 <!ELEMENT ldml ( identity, ( alias | ( fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, characterLabels?, segmentations?, rbnf?, typographicNames?, annotations?, metadata?, references?, special* ) ) ) >
 <!ATTLIST ldml version CDATA #IMPLIED >
     <!--@METADATA-->

@@ -27,29 +27,24 @@
 <!-- ######################################################### -->
 <!-- # These elements are common to almost all elements defined -->
 
 <!ELEMENT alias ( special* ) >
 <!ATTLIST alias source NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/locale-->
     <!--@VALUE-->
 <!ATTLIST alias path CDATA #IMPLIED >
-    <!--@MATCH:regex/\.\..*-->
     <!--@VALUE-->
 <!ATTLIST alias alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST alias draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT special ANY >
 
 <!ELEMENT version EMPTY >
 <!ATTLIST version number CDATA #REQUIRED >
-    <!--@MATCH:regex/\$Revision.*\$-->
     <!--@METADATA-->
-<!ATTLIST version cldrVersion CDATA #FIXED "35.1" >
-    <!--@MATCH:any-->
+<!ATTLIST version cldrVersion CDATA #FIXED "33" >
     <!--@VALUE-->
 <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 

@@ -63,46 +58,38 @@
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT language ( #PCDATA ) >
 <!ATTLIST language type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/locale-->
 <!ATTLIST language alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/long, secondary, short, variant-->
 <!ATTLIST language draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST language references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT script ( #PCDATA ) >
 <!ATTLIST script type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/script-->
 <!ATTLIST script alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/secondary, short, stand-alone, variant-->
 <!ATTLIST script draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST script references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT territory ( #PCDATA ) >
 <!ATTLIST territory type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/region-->
 <!ATTLIST territory alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/short, variant-->
 <!ATTLIST territory draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST territory references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT variant ( #PCDATA ) >
 <!ATTLIST variant type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/variant-->
 <!ATTLIST variant alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/secondary, variant-->
 <!ATTLIST variant draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST variant references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -110,11 +97,10 @@
 <!-- ######################################################### -->
 
 <!ELEMENT fallback ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST fallback alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST fallback draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST fallback references CDATA #IMPLIED >

@@ -126,36 +112,32 @@
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT localeDisplayPattern ( alias | ( localePattern*, localeSeparator*, localeKeyTypePattern*, special* ) ) >
 <!ATTLIST localeDisplayPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST localeDisplayPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST localeDisplayPattern references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT localePattern ( #PCDATA ) >
 <!ATTLIST localePattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST localePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST localePattern references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT localeSeparator ( #PCDATA ) >
 <!ATTLIST localeSeparator alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST localeSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST localeSeparator references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT localeKeyTypePattern ( #PCDATA ) >
 <!ATTLIST localeKeyTypePattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST localeKeyTypePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST localeKeyTypePattern references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -211,13 +193,11 @@
 <!ATTLIST subdivisions references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT subdivision ( #PCDATA ) >
 <!ATTLIST subdivision type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/subdivision-->
 <!ATTLIST subdivision alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST subdivision draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!-- # Either 1 alias OR any specials, any order, zero or more variant -->
 

@@ -249,13 +229,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT key ( #PCDATA ) >
 <!ATTLIST key type NMTOKEN #REQUIRED >
-    <!--@MATCH:bcp47/anykey-->
 <!ATTLIST key alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST key draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST key references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -275,15 +253,12 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT type ( #PCDATA ) >
 <!ATTLIST type key NMTOKEN #REQUIRED >
-    <!--@MATCH:bcp47/anykey-->
 <!ATTLIST type type NMTOKEN #REQUIRED >
-    <!--@MATCH:bcp47/anyvalue-->
 <!ATTLIST type alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/short, variant-->
 <!ATTLIST type draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST type references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -300,11 +275,10 @@
 <!ELEMENT transformName ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST transformName type NMTOKEN #REQUIRED >
     <!--@DEPRECATED-->
 <!ATTLIST transformName alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST transformName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST transformName references CDATA #IMPLIED >

@@ -324,24 +298,21 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT measurementSystemName ( #PCDATA ) >
 <!ATTLIST measurementSystemName type (US | metric | UK) #REQUIRED >
 <!ATTLIST measurementSystemName alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST measurementSystemName draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST measurementSystemName references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT codePatterns ( alias | ( codePattern | special )* ) >
 
 <!ELEMENT codePattern ( #PCDATA ) >
 <!ATTLIST codePattern type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/language, script, territory-->
 <!ATTLIST codePattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST codePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST codePattern references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -361,11 +332,10 @@
     <!--@DEPRECATED-->
 <!ATTLIST orientation lines (left-to-right | right-to-left | top-to-bottom | bottom-to-top) #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST orientation alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST orientation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST orientation standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -373,27 +343,24 @@
 <!ATTLIST orientation references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT characterOrder ( #PCDATA ) >
 <!ATTLIST characterOrder alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST characterOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT lineOrder ( #PCDATA ) >
 <!ATTLIST lineOrder alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST lineOrder draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT inList ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST inList casing (titlecase-words | titlecase-firstword | lowercase-words | mixed) #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST inList alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST inList draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST inList references CDATA #IMPLIED >

@@ -403,11 +370,10 @@
 <!ELEMENT inText ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST inText type (languages | scripts | territories | variants | keys | types | measurementSystemNames | monthWidth | dayWidth | quarterWidth | long | fields | currency) #IMPLIED >
     <!--@DEPRECATED-->
 <!ATTLIST inText alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST inText draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST inText references CDATA #IMPLIED >

@@ -416,11 +382,10 @@
 
 <!-- ######################################################### -->
 
 <!ELEMENT contextTransforms ( alias | ( contextTransformUsage*, special* ) ) >
 <!ATTLIST contextTransforms alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST contextTransforms draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST contextTransforms references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -428,13 +393,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT contextTransformUsage ( alias | ( contextTransform*, special* ) ) >
 <!ATTLIST contextTransformUsage type CDATA #REQUIRED >
-    <!--@MATCH:literal/calendar-field, currencyName, day-format-except-narrow, day-standalone-except-narrow, era-abbr, era-name, keyValue, languages, month-format-except-narrow, month-standalone-except-narrow, number-spellout, relative, script, typographicNames-->
 <!ATTLIST contextTransformUsage alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST contextTransformUsage draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST contextTransformUsage references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -443,11 +406,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT contextTransform ( #PCDATA ) >
 <!ATTLIST contextTransform type (uiListOrMenu | stand-alone) #REQUIRED >
 <!ATTLIST contextTransform alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST contextTransform draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST contextTransform references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -460,11 +422,10 @@
 
 <!ELEMENT exemplarCharacters ( #PCDATA | cp )* >
 <!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED >
     <!--@DEPRECATED:currencySymbol-->
 <!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST exemplarCharacters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST exemplarCharacters standard CDATA #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->

@@ -483,19 +444,17 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT ellipsis ( #PCDATA ) >
 <!ATTLIST ellipsis type (initial | medial | final | word-initial | word-medial | word-final) #IMPLIED >
 <!ATTLIST ellipsis alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST ellipsis draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST ellipsis references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT moreInformation ( #PCDATA ) >
 <!ATTLIST moreInformation alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST moreInformation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST moreInformation references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -505,11 +464,10 @@
 <!ELEMENT stopwordList ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST stopwordList type NMTOKEN #REQUIRED >
     <!--@DEPRECATED-->
 <!ATTLIST stopwordList alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST stopwordList draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST stopwordList references CDATA #IMPLIED >

@@ -520,11 +478,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT indexSeparator ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexSeparator alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST indexSeparator references CDATA #IMPLIED >

@@ -532,11 +489,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT compressedIndexSeparator ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST compressedIndexSeparator alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST compressedIndexSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST compressedIndexSeparator references CDATA #IMPLIED >

@@ -544,11 +500,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT indexRangePattern ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexRangePattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST indexRangePattern references CDATA #IMPLIED >

@@ -556,11 +511,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT indexLabelBefore ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelBefore alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelBefore draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelBefore references CDATA #IMPLIED >

@@ -568,11 +522,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT indexLabelAfter ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelAfter alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelAfter draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabelAfter references CDATA #IMPLIED >

@@ -585,11 +538,10 @@
     <!--@DEPRECATED-->
 <!ATTLIST indexLabel priority (1 | 2 | 3) #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabel alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabel draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST indexLabel references CDATA #IMPLIED >

@@ -626,21 +578,18 @@
 <!ATTLIST parseLenients scope (general | number | date) #REQUIRED >
 <!ATTLIST parseLenients level (lenient | stricter) #REQUIRED >
 
 <!ELEMENT parseLenient ( #PCDATA ) >
 <!ATTLIST parseLenient sample CDATA #REQUIRED >
-    <!--@MATCH:any-->
 <!ATTLIST parseLenient alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST parseLenient draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!-- ######################################################### -->
 
 <!ELEMENT delimiters ( alias | ( quotationStart*, quotationEnd*, alternateQuotationStart*, alternateQuotationEnd*, special* ) ) >
 <!ATTLIST delimiters alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST delimiters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST delimiters standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -651,35 +600,31 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT quotationStart ( #PCDATA | cp )* >
 <!ATTLIST quotationStart alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST quotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST quotationStart references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT quotationEnd ( #PCDATA | cp )* >
 <!ATTLIST quotationEnd alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST quotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST quotationEnd references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT alternateQuotationStart ( #PCDATA | cp )* >
 <!ATTLIST alternateQuotationStart alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST alternateQuotationStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST alternateQuotationStart references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT alternateQuotationEnd ( #PCDATA | cp )* >
 <!ATTLIST alternateQuotationEnd alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST alternateQuotationEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST alternateQuotationEnd references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -687,11 +632,10 @@
 
 <!ELEMENT measurement ( alias | ( measurementSystem*, paperSize*, special* ) ) >
     <!-- use measurementData in supplemental instead -->
     <!--@DEPRECATED-->
 <!ATTLIST measurement alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST measurement draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST measurement standard CDATA #IMPLIED >

@@ -714,11 +658,10 @@
 <!ATTLIST measurementSystem choice (metric | US | UK) #IMPLIED >
     <!-- really required, but needs to be optional to support type also -->
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST measurementSystem alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST measurementSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST measurementSystem standard CDATA #IMPLIED >

@@ -733,11 +676,10 @@
 
 <!ELEMENT paperSize ( alias | ( height*, width*, special* ) ) >
     <!-- use paperSize in supplemental instead -->
     <!--@DEPRECATED-->
 <!ATTLIST paperSize alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST paperSize draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST paperSize standard CDATA #IMPLIED >

@@ -751,11 +693,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT height ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST height alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST height draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST height references CDATA #IMPLIED >

@@ -763,11 +704,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT width ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST width alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST width draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST width references CDATA #IMPLIED >

@@ -776,11 +716,10 @@
 
 <!-- ######################################################### -->
 
 <!ELEMENT dates ( alias | ( localizedPatternChars*, dateRangePattern*, calendars?, fields?, timeZoneNames?, special* ) ) >
 <!ATTLIST dates alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dates draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dates standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -792,11 +731,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT localizedPatternChars ( #PCDATA | cp )* >
     <!--@DEPRECATED-->
 <!ATTLIST localizedPatternChars alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST localizedPatternChars draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST localizedPatternChars standard CDATA #IMPLIED >

@@ -811,11 +749,10 @@
 
 <!ELEMENT dateRangePattern ( #PCDATA ) >
     <!-- use intervalFormats. -->
     <!--@DEPRECATED-->
 <!ATTLIST dateRangePattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST dateRangePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dateRangePattern standard CDATA #IMPLIED >

@@ -844,11 +781,10 @@
     <!--@DEPRECATED-->
 <!ATTLIST default choice NMTOKEN #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST default alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST default draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST default references CDATA #IMPLIED >

@@ -856,13 +792,11 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT calendar ( alias | ( months?, monthNames?, monthAbbr?, monthPatterns?, days?, dayNames?, dayAbbr?, quarters?, week?, am*, pm*, dayPeriods?, eras?, cyclicNameSets?, dateFormats?, timeFormats?, dateTimeFormats?, fields*, special* ) ) >
     <!-- use of fields is deprecated here -->
 <!ATTLIST calendar type NMTOKEN #REQUIRED >
-    <!--@MATCH:bcp47/ca-->
 <!ATTLIST calendar alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST calendar draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST calendar standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -873,11 +807,10 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT months ( alias | ( default*, monthContext*, special* ) ) >
 <!ATTLIST months alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST months draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST months standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -889,11 +822,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT monthContext ( alias | ( default*, monthWidth*, special* ) ) >
 <!ATTLIST monthContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST monthContext alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST monthContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST monthContext standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -905,11 +837,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT monthWidth ( alias | ( month*, special* ) ) >
 <!ATTLIST monthWidth type (abbreviated | narrow | wide) #REQUIRED >
 <!ATTLIST monthWidth alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST monthWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST monthWidth standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -922,11 +853,10 @@
 
 <!ELEMENT month ( #PCDATA | cp )* >
 <!ATTLIST month type (1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13) #REQUIRED >
 <!ATTLIST month yeartype (standard | leap) #IMPLIED >
 <!ATTLIST month alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST month draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST month references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -942,11 +872,10 @@
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT monthPatterns ( alias | ( monthPatternContext*, special* ) ) >
 <!ATTLIST monthPatterns alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST monthPatterns references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -955,11 +884,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT monthPatternContext ( alias | ( monthPatternWidth*, special* ) ) >
 <!ATTLIST monthPatternContext type (format | stand-alone | numeric) #REQUIRED >
 <!ATTLIST monthPatternContext alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPatternContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST monthPatternContext references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -968,11 +896,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT monthPatternWidth ( alias | ( monthPattern*, special* ) ) >
 <!ATTLIST monthPatternWidth type (abbreviated | narrow | wide | all) #REQUIRED >
 <!ATTLIST monthPatternWidth alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPatternWidth draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST monthPatternWidth references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -981,19 +908,17 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT monthPattern ( #PCDATA ) >
 <!ATTLIST monthPattern type (leap | standardAfterLeap | combined) #REQUIRED >
 <!ATTLIST monthPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST monthPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST monthPattern references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT days ( alias | ( default*, dayContext*, special* ) ) >
 <!ATTLIST days alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST days draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST days standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1005,11 +930,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT dayContext ( alias | ( default*, dayWidth*, special* ) ) >
 <!ATTLIST dayContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST dayContext alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dayContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dayContext standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1021,11 +945,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT dayWidth ( alias | ( day*, special* ) ) >
 <!ATTLIST dayWidth type (abbreviated | narrow | short | wide) #REQUIRED >
 <!ATTLIST dayWidth alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dayWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dayWidth standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1037,11 +960,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT day ( #PCDATA ) >
 <!ATTLIST day type (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
 <!ATTLIST day alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST day draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST day references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1058,11 +980,10 @@
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT quarters ( alias | ( default*, quarterContext*, special* ) ) >
 <!ATTLIST quarters alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST quarters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST quarters references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1071,11 +992,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT quarterContext ( alias | ( default*, quarterWidth*, special* ) ) >
 <!ATTLIST quarterContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST quarterContext alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST quarterContext draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST quarterContext references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1084,11 +1004,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT quarterWidth ( alias | ( quarter*, special* ) ) >
 <!ATTLIST quarterWidth type (abbreviated | narrow | wide) #REQUIRED >
 <!ATTLIST quarterWidth alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST quarterWidth draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST quarterWidth references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1097,22 +1016,20 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT quarter ( #PCDATA ) >
 <!ATTLIST quarter type (1 | 2 | 3 | 4) #REQUIRED >
 <!ATTLIST quarter alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST quarter draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST quarter references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT week ( alias | ( minDays*, firstDay*, weekendStart*, weekendEnd*, special* ) ) >
     <!-- use supplemental weekData -->
     <!--@DEPRECATED-->
 <!ATTLIST week alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST week draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST week standard CDATA #IMPLIED >

@@ -1128,11 +1045,10 @@
 <!ELEMENT minDays ( special* ) >
     <!--@DEPRECATED-->
 <!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED >
     <!--@DEPRECATED-->
 <!ATTLIST minDays alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST minDays draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST minDays references CDATA #IMPLIED >

@@ -1144,11 +1060,10 @@
     <!--@DEPRECATED-->
 <!ATTLIST firstDay day (sun | mon | tue | wed | thu | fri | sat) #REQUIRED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST firstDay alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST firstDay draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST firstDay references CDATA #IMPLIED >

@@ -1163,11 +1078,10 @@
     <!--@DEPRECATED-->
 <!ATTLIST weekendStart time CDATA "00:00" >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendStart alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendStart draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendStart references CDATA #IMPLIED >

@@ -1182,11 +1096,10 @@
     <!--@DEPRECATED-->
 <!ATTLIST weekendEnd time CDATA "24:00" >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendEnd alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendEnd draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST weekendEnd references CDATA #IMPLIED >

@@ -1195,11 +1108,10 @@
 
 <!ELEMENT am ( #PCDATA ) >
     <!-- use dayPeriods -->
     <!--@DEPRECATED-->
 <!ATTLIST am alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST am draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST am references CDATA #IMPLIED >

@@ -1211,11 +1123,10 @@
 
 <!ELEMENT pm ( #PCDATA ) >
     <!-- use dayPeriods -->
     <!--@DEPRECATED-->
 <!ATTLIST pm alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST pm draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST pm references CDATA #IMPLIED >

@@ -1232,11 +1143,10 @@
 <!ATTLIST dayPeriods references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT dayPeriodContext ( alias | ( dayPeriodWidth*, special* ) ) >
 <!ATTLIST dayPeriodContext type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/format, stand-alone-->
 <!ATTLIST dayPeriodContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dayPeriodContext references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1249,21 +1159,18 @@
 <!ATTLIST dayPeriodWidth references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT dayPeriod ( #PCDATA ) >
 <!ATTLIST dayPeriod type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/afternoon1, afternoon2, am, evening1, evening2, midnight, morning1, morning2, night1, night2, noon, pm-->
 <!ATTLIST dayPeriod alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dayPeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST dayPeriod references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT eras ( alias | ( eraNames?, eraAbbr?, eraNarrow?, special* ) ) >
 <!ATTLIST eras alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST eras draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST eras standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1274,11 +1181,10 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT eraNames ( alias | ( era*, special* ) ) >
 <!ATTLIST eraNames alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST eraNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST eraNames references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1286,22 +1192,19 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT era ( #PCDATA ) >
 <!ATTLIST era type NMTOKEN #REQUIRED >
-    <!--@MATCH:range/0~237-->
 <!ATTLIST era alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST era draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST era references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT eraAbbr ( alias | ( era*, special* ) ) >
 <!ATTLIST eraAbbr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST eraAbbr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST eraAbbr references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1309,11 +1212,10 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT eraNarrow ( alias | ( era*, special* ) ) >
 <!ATTLIST eraNarrow alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST eraNarrow draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST eraNarrow references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1321,11 +1223,10 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT cyclicNameSets ( alias | ( cyclicNameSet*, special* ) ) >
 <!ATTLIST cyclicNameSets alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameSets draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST cyclicNameSets references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1334,11 +1235,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT cyclicNameSet ( alias | ( cyclicNameContext*, special* ) ) >
 <!ATTLIST cyclicNameSet type (years | months | days | dayParts | zodiacs | solarTerms) #REQUIRED >
 <!ATTLIST cyclicNameSet alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameSet draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST cyclicNameSet references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1347,11 +1247,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT cyclicNameContext ( alias | ( cyclicNameWidth*, special* ) ) >
 <!ATTLIST cyclicNameContext type (format | stand-alone) #REQUIRED >
 <!ATTLIST cyclicNameContext alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameContext draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST cyclicNameContext references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1360,11 +1259,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT cyclicNameWidth ( alias | ( cyclicName*, special* ) ) >
 <!ATTLIST cyclicNameWidth type (abbreviated | narrow | wide) #REQUIRED >
 <!ATTLIST cyclicNameWidth alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicNameWidth draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST cyclicNameWidth references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1372,13 +1270,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT cyclicName ( #PCDATA ) >
 <!ATTLIST cyclicName type NMTOKEN #REQUIRED >
-    <!--@MATCH:range/1~60-->
 <!ATTLIST cyclicName alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST cyclicName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST cyclicName references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -1391,11 +1287,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT dateFormatLength ( alias | ( default*, dateFormat*, special* ) ) >
 <!ATTLIST dateFormatLength type (full | long | medium | short) #REQUIRED >
 <!ATTLIST dateFormatLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dateFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dateFormatLength standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1406,13 +1301,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT dateFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST dateFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard-->
 <!ATTLIST dateFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dateFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dateFormat standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1423,30 +1316,25 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT pattern ( #PCDATA ) >
 <!ATTLIST pattern type NMTOKEN "standard" >
-    <!--@MATCH:literal/1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, 10000000000, 100000000000, 1000000000000, 10000000000000, 100000000000000, approximately, atLeast, atMost, range, standard-->
 <!ATTLIST pattern numbers CDATA #IMPLIED >
-    <!-- TODO: generalize this to be any (M=|d=)?<numberSystem> -->
-    <!--@MATCH:literal/M=romanlow, d=hanidays, hanidec, hebr, y=jpanyear-->
     <!--@VALUE-->
 <!ATTLIST pattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- Only used for decimalFormats type="1000..." -->
 <!ATTLIST pattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST pattern draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST pattern references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT displayName ( #PCDATA ) >
 <!ATTLIST displayName count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- only for currencies -->
 <!ATTLIST displayName alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST displayName draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST displayName references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1460,11 +1348,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT timeFormatLength ( alias | ( default*, timeFormat*, special* ) ) >
 <!ATTLIST timeFormatLength type (full | long | medium | short) #REQUIRED >
 <!ATTLIST timeFormatLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST timeFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST timeFormatLength standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1475,13 +1362,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT timeFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST timeFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard-->
 <!ATTLIST timeFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST timeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST timeFormat standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1501,11 +1386,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT dateTimeFormatLength ( alias | ( default*, dateTimeFormat*, special* ) ) >
 <!ATTLIST dateTimeFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST dateTimeFormatLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dateTimeFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dateTimeFormatLength standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1516,13 +1400,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT dateTimeFormat ( alias | ( pattern*, displayName*, special* ) ) >
 <!ATTLIST dateTimeFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard-->
 <!ATTLIST dateTimeFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dateTimeFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST dateTimeFormat standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1533,11 +1415,10 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT availableFormats ( alias | ( dateFormatItem*, special* ) ) >
 <!ATTLIST availableFormats alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST availableFormats draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST availableFormats references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1545,24 +1426,20 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT dateFormatItem ( #PCDATA ) >
 <!ATTLIST dateFormatItem id CDATA #REQUIRED >
-    <!-- TODO rationalize this list -->
-    <!--@MATCH:literal/Bh, Bhm, Bhms, E, EBhm, EBhms, EEEEd, EHm, EHms, Ed, Ehm, Ehms, Gy, GyM, GyMMM, GyMMMEEEEd, GyMMMEd, GyMMMM, GyMMMMEd, GyMMMMd, GyMMMd, GyMd, H, HHmm, HHmmZ, HHmmss, Hm, HmZ, Hmm, Hms, Hmsv, Hmsvvvv, Hmv, M, MEEEEd, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEEEEd, MMMMEd, MMMMW, MMMMd, MMMMdd, MMMd, MMMdd, MMd, MMdd, Md, Mdd, UM, UMMM, UMMMd, UMd, d, h, hhmm, hhmmss, hm, hms, hmsv, hmsvvvv, hmv, mmss, ms, y, yM, yMEEEEd, yMEd, yMM, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMccccd, yMMMMd, yMMMd, yMMdd, yMd, yQ, yQQQ, yQQQQ, yw, yyyy, yyyyM, yyyyMEEEEd, yyyyMEd, yyyyMM, yyyyMMM, yyyyMMMEEEEd, yyyyMMMEd, yyyyMMMM, yyyyMMMMEd, yyyyMMMMccccd, yyyyMMMMd, yyyyMMMd, yyyyMMdd, yyyyMd, yyyyQQQ, yyyyQQQQ-->
 <!ATTLIST dateFormatItem count (zero | one | two | few | many | other) #IMPLIED >
 <!ATTLIST dateFormatItem alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST dateFormatItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST dateFormatItem references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT appendItems ( alias | ( appendItem*, special* ) ) >
 <!ATTLIST appendItems alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST appendItems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST appendItems references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1570,22 +1447,19 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT appendItem ( #PCDATA ) >
 <!ATTLIST appendItem request CDATA #REQUIRED >
-    <!--@MATCH:literal/Day, Day-Of-Week, Era, Hour, Minute, Month, Quarter, Second, Timezone, Week, Year-->
 <!ATTLIST appendItem alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST appendItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST appendItem references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT intervalFormats ( alias | ( intervalFormatFallback*, intervalFormatItem*, special* ) ) >
 <!ATTLIST intervalFormats alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST intervalFormats draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST intervalFormats references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1593,25 +1467,21 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT intervalFormatFallback ( #PCDATA ) >
 <!ATTLIST intervalFormatFallback alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST intervalFormatFallback draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST intervalFormatFallback references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST intervalFormatFallback validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT intervalFormatItem ( alias | ( greatestDifference*, special* ) ) >
 <!ATTLIST intervalFormatItem id NMTOKEN #REQUIRED >
-    <!-- TODO: check to see if this should be minimized -->
-    <!--@MATCH:literal/Bh, Bhm, Gy, GyM, GyMEd, GyMMM, GyMMMEd, GyMMMd, GyMd, H, Hm, Hmv, Hv, M, MEd, MMM, MMMEEEEd, MMMEd, MMMM, MMMMEd, MMMMd, MMMd, Md, d, h, hm, hmv, hv, y, yM, yMEd, yMMM, yMMMEEEEd, yMMMEd, yMMMM, yMMMMEEEEd, yMMMMEd, yMMMMd, yMMMd, yMd-->
 <!ATTLIST intervalFormatItem alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST intervalFormatItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST intervalFormatItem references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1619,24 +1489,21 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT greatestDifference ( #PCDATA ) >
 <!ATTLIST greatestDifference id NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/B, G, H, M, a, d, h, m, y-->
 <!ATTLIST greatestDifference alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST greatestDifference draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST greatestDifference references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST greatestDifference validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT fields ( alias | ( field*, special* ) ) >
 <!ATTLIST fields alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST fields draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST fields standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1648,11 +1515,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT field ( alias | ( displayName*, relative*, relativeTime*, relativePeriod*, special* ) ) >
 <!ATTLIST field type (era | era-short | era-narrow | year | year-short | year-narrow | quarter | quarter-short | quarter-narrow | month | month-short | month-narrow | week | week-short | week-narrow | weekOfMonth | weekOfMonth-short | weekOfMonth-narrow | day | day-short | day-narrow | dayOfYear | dayOfYear-short | dayOfYear-narrow | weekday | weekday-short | weekday-narrow | weekdayOfMonth | weekdayOfMonth-short | weekdayOfMonth-narrow | sun | sun-short | sun-narrow | mon | mon-short | mon-narrow | tue | tue-short | tue-narrow | wed | wed-short | wed-narrow | thu | thu-short | thu-narrow | fri | fri-short | fri-narrow | sat | sat-short | sat-narrow | dayperiod | dayperiod-short | dayperiod-narrow | hour | hour-short | hour-narrow | minute | minute-short | minute-narrow | second | second-short | second-narrow | zone | zone-short | zone-narrow) #IMPLIED >
 <!ATTLIST field alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST field draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST field standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1663,14 +1529,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT relative ( #PCDATA ) >
 <!ATTLIST relative type NMTOKEN #IMPLIED >
-    <!-- TODO: determine whether to allow 3 -->
-    <!--@MATCH:range/-2~3-->
 <!ATTLIST relative alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST relative draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST relative references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1678,13 +1541,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT relativeTime ( alias | ( relativeTimePattern*, special* ) ) >
 <!ATTLIST relativeTime type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/future, past-->
 <!ATTLIST relativeTime alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST relativeTime draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST relativeTime references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1693,22 +1554,20 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT relativeTimePattern ( #PCDATA ) >
 <!ATTLIST relativeTimePattern count (zero | one | two | few | many | other) #REQUIRED >
 <!ATTLIST relativeTimePattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST relativeTimePattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST relativeTimePattern references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST relativeTimePattern validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT relativePeriod ( #PCDATA ) >
 <!ATTLIST relativePeriod alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST relativePeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) >
 <!ATTLIST timeZoneNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >

@@ -1718,70 +1577,63 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT hourFormat ( #PCDATA ) >
 <!ATTLIST hourFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST hourFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST hourFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT hoursFormat ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST hoursFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST hoursFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST hoursFormat references CDATA #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT gmtFormat ( #PCDATA ) >
 <!ATTLIST gmtFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST gmtFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST gmtFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT gmtZeroFormat ( #PCDATA ) >
 <!ATTLIST gmtZeroFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST gmtZeroFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST gmtZeroFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT regionFormat ( #PCDATA ) >
 <!ATTLIST regionFormat type (standard | daylight) #IMPLIED >
 <!ATTLIST regionFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST regionFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST regionFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT fallbackFormat ( #PCDATA ) >
 <!ATTLIST fallbackFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST fallbackFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST fallbackFormat references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT fallbackRegionFormat ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST fallbackRegionFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST fallbackRegionFormat draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST fallbackRegionFormat references CDATA #IMPLIED >

@@ -1797,11 +1649,10 @@
 <!ATTLIST abbreviationFallback choice (GMT | standard) #IMPLIED >
     <!-- really required, but needs to be optional to support type also -->
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST abbreviationFallback alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST abbreviationFallback draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST abbreviationFallback references CDATA #IMPLIED >

@@ -1818,11 +1669,10 @@
 <!ATTLIST preferenceOrdering choice CDATA #IMPLIED >
     <!-- really required, but needs to be optional to support type also -->
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST preferenceOrdering alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST preferenceOrdering draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST preferenceOrdering references CDATA #IMPLIED >

@@ -1833,24 +1683,21 @@
     <!--@DEPRECATED-->
 <!ATTLIST singleCountries list CDATA #REQUIRED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST singleCountries alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST singleCountries draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST singleCountries references CDATA #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT zone ( alias | ( long*, short*, commonlyUsed*, exemplarCity*, special* ) ) >
 <!ATTLIST zone type CDATA #REQUIRED >
-    <!--@MATCH:bcp47/tz-->
 <!ATTLIST zone alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST zone draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST zone standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1861,11 +1708,10 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT long ( alias | ( generic*, standard*, daylight*, special* ) ) >
 <!ATTLIST long alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST long draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST long references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1873,38 +1719,34 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT generic ( #PCDATA ) >
 <!ATTLIST generic alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST generic draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST generic references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT standard ( #PCDATA ) >
 <!ATTLIST standard alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST standard draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST standard references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT daylight ( #PCDATA ) >
 <!ATTLIST daylight alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST daylight draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST daylight references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT short ( alias | ( generic*, standard*, daylight*, special* ) ) >
 <!ATTLIST short alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST short draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST short references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1916,33 +1758,29 @@
     <!--@DEPRECATED-->
 <!ATTLIST commonlyUsed used (true | false) #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST commonlyUsed alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST commonlyUsed draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST commonlyUsed references CDATA #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT exemplarCity ( #PCDATA ) >
 <!ATTLIST exemplarCity alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/formal, secondary-->
 <!ATTLIST exemplarCity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST exemplarCity references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT metazone ( alias | ( long*, short*, commonlyUsed*, special* ) ) >
 <!ATTLIST metazone type CDATA #REQUIRED >
-    <!--@MATCH:metazone-->
 <!ATTLIST metazone alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST metazone draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST metazone standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1955,11 +1793,10 @@
 
 <!-- ######################################################### -->
 
 <!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) >
 <!ATTLIST numbers alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST numbers standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -1970,56 +1807,49 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT defaultNumberingSystem ( #PCDATA ) >
 <!ATTLIST defaultNumberingSystem alt NMTOKENS #IMPLIED >
-    <!--@MATCH:bcp47/nu-->
 <!ATTLIST defaultNumberingSystem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST defaultNumberingSystem references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT otherNumberingSystems ( alias | ( native*, traditional*, finance*, special* ) ) >
 <!ATTLIST otherNumberingSystems alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST otherNumberingSystems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT native ( #PCDATA ) >
 <!ATTLIST native alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST native draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 
 <!ELEMENT traditional ( #PCDATA ) >
 <!ATTLIST traditional alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST traditional draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 
 <!ELEMENT finance ( #PCDATA ) >
 <!ATTLIST finance alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST finance draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 
 <!ELEMENT minimumGroupingDigits ( #PCDATA ) >
 <!ATTLIST minimumGroupingDigits alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST minimumGroupingDigits draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST minimumGroupingDigits references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT symbols ( alias | ( decimal*, group*, list*, percentSign*, nativeZeroDigit*, patternDigit*, plusSign*, minusSign*, exponential*, superscriptingExponent*, perMille*, infinity*, nan*, currencyDecimal*, currencyGroup*, timeSeparator*, special* ) ) >
 <!ATTLIST symbols alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST symbols draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST symbols standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2028,48 +1858,43 @@
     <!--@METADATA-->
 <!ATTLIST symbols validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST symbols numberSystem CDATA #IMPLIED >
-    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT decimal ( #PCDATA ) >
 <!ATTLIST decimal alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST decimal draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST decimal references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST decimal numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT group ( #PCDATA ) >
 <!ATTLIST group alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST group draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST group references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST group numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT list ( #PCDATA ) >
 <!ATTLIST list alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST list draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST list references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST list numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT percentSign ( #PCDATA ) >
 <!ATTLIST percentSign alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST percentSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST percentSign references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2077,11 +1902,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT nativeZeroDigit ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST nativeZeroDigit alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST nativeZeroDigit draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST nativeZeroDigit references CDATA #IMPLIED >

@@ -2091,11 +1915,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT patternDigit ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST patternDigit alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST patternDigit draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST patternDigit references CDATA #IMPLIED >

@@ -2104,107 +1927,97 @@
 <!ATTLIST patternDigit numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT plusSign ( #PCDATA ) >
 <!ATTLIST plusSign alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST plusSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST plusSign references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST plusSign numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT minusSign ( #PCDATA ) >
 <!ATTLIST minusSign alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST minusSign draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST minusSign references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST minusSign numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT exponential ( #PCDATA ) >
 <!ATTLIST exponential alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST exponential draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST exponential references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST exponential numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT superscriptingExponent ( #PCDATA ) >
 <!ATTLIST superscriptingExponent alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST superscriptingExponent draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST superscriptingExponent references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT perMille ( #PCDATA ) >
 <!ATTLIST perMille alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST perMille draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST perMille references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST perMille numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT infinity ( #PCDATA ) >
 <!ATTLIST infinity alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST infinity draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST infinity references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST infinity numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT nan ( #PCDATA ) >
 <!ATTLIST nan alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST nan draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST nan references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST nan numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT currencyDecimal ( #PCDATA ) >
 <!ATTLIST currencyDecimal alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyDecimal draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST currencyDecimal references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST currencyDecimal numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT currencyGroup ( #PCDATA ) >
 <!ATTLIST currencyGroup alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyGroup draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST currencyGroup references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST currencyGroup numberSystem CDATA #IMPLIED >
     <!--@DEPRECATED-->
 
 <!ELEMENT timeSeparator ( #PCDATA ) >
 <!ATTLIST timeSeparator alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST timeSeparator draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST timeSeparator references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -2214,16 +2027,14 @@
     <!--@DEPRECATED-->
 <!ATTLIST decimalFormats validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST decimalFormats numberSystem CDATA #IMPLIED >
-    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT decimalFormatLength ( alias | ( default*, decimalFormat*, special* ) ) >
 <!ATTLIST decimalFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST decimalFormatLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST decimalFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST decimalFormatLength standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2234,13 +2045,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT decimalFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST decimalFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard-->
 <!ATTLIST decimalFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST decimalFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST decimalFormat standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2257,16 +2066,14 @@
     <!--@DEPRECATED-->
 <!ATTLIST scientificFormats validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST scientificFormats numberSystem CDATA #IMPLIED >
-    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT scientificFormatLength ( alias | ( default*, scientificFormat*, special* ) ) >
 <!ATTLIST scientificFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST scientificFormatLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST scientificFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST scientificFormatLength standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2277,13 +2084,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT scientificFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST scientificFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard-->
 <!ATTLIST scientificFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST scientificFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST scientificFormat standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2300,16 +2105,14 @@
     <!--@DEPRECATED-->
 <!ATTLIST percentFormats validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST percentFormats numberSystem CDATA #IMPLIED >
-    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT percentFormatLength ( alias | ( default*, percentFormat*, special* ) ) >
 <!ATTLIST percentFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST percentFormatLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST percentFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST percentFormatLength standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2320,13 +2123,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT percentFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST percentFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard-->
 <!ATTLIST percentFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST percentFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST percentFormat standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2343,37 +2144,33 @@
     <!--@DEPRECATED-->
 <!ATTLIST currencyFormats validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST currencyFormats numberSystem CDATA #IMPLIED >
-    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT currencySpacing ( alias | ( beforeCurrency*, afterCurrency*, special* ) ) >
 
 <!ELEMENT beforeCurrency ( alias | ( currencyMatch*, surroundingMatch*, insertBetween*, special* ) ) >
 
 <!ELEMENT currencyMatch ( #PCDATA ) >
 <!ATTLIST currencyMatch alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyMatch draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST currencyMatch references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT surroundingMatch ( #PCDATA ) >
 <!ATTLIST surroundingMatch alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST surroundingMatch draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST surroundingMatch references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT insertBetween ( #PCDATA ) >
 <!ATTLIST insertBetween alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST insertBetween draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST insertBetween references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2381,11 +2178,10 @@
 <!ELEMENT afterCurrency ( alias | ( currencyMatch*, surroundingMatch*, insertBetween*, special* ) ) >
 
 <!ELEMENT currencyFormatLength ( alias | ( default*, currencyFormat*, special* ) ) >
 <!ATTLIST currencyFormatLength type (full | long | medium | short) #IMPLIED >
 <!ATTLIST currencyFormatLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyFormatLength draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST currencyFormatLength standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2396,13 +2192,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT currencyFormat ( alias | ( pattern*, special* ) ) >
 <!ATTLIST currencyFormat type NMTOKEN "standard" >
-    <!--@MATCH:literal/accounting, standard-->
 <!ATTLIST currencyFormat alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST currencyFormat draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST currencyFormat standard CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2414,11 +2208,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT unitPattern ( #PCDATA ) >
 <!ATTLIST unitPattern count (0 | 1 | zero | one | two | few | many | other) #REQUIRED >
 <!ATTLIST unitPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST unitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST unitPattern references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST unitPattern validSubLocales CDATA #IMPLIED >

@@ -2436,13 +2229,11 @@
 <!ELEMENT currency ( alias | ( ( ( pattern+, displayName*, symbol* ) | ( displayName+, symbol*, pattern* ) | ( symbol+, pattern* ) )?, decimal*, group*, special* ) ) >
 
 <!-- # warning: pattern appears twice in the above. The first is for consistency with all other cases of
     pattern + displayName; the second is for backwards compatibility -->
 <!ATTLIST currency type NMTOKEN "standard" >
-    <!--@MATCH:validity/currency-->
 <!ATTLIST currency alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST currency draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST currency references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2453,11 +2244,10 @@
 <!ELEMENT symbol ( #PCDATA ) >
 <!ATTLIST symbol choice (true | false) #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST symbol alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/formal, narrow, variant-->
 <!ATTLIST symbol draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST symbol references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2465,40 +2255,33 @@
 <!ELEMENT miscPatterns ( alias | ( default*, pattern*, special* ) ) >
 <!ATTLIST miscPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST miscPatterns numberSystem CDATA #IMPLIED >
-    <!--@MATCH:bcp47/nu-->
 
 <!ELEMENT minimalPairs ( alias | ( pluralMinimalPairs*, ordinalMinimalPairs*, special* ) ) >
 <!ATTLIST minimalPairs alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST minimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT pluralMinimalPairs ( #PCDATA ) >
 <!ATTLIST pluralMinimalPairs count NMTOKEN #IMPLIED >
-    <!--@MATCH:literal/few, many, one, other, two, zero-->
 <!ATTLIST pluralMinimalPairs alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST pluralMinimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT ordinalMinimalPairs ( #PCDATA ) >
 <!ATTLIST ordinalMinimalPairs ordinal NMTOKEN #IMPLIED >
-    <!--@MATCH:literal/few, many, one, other, two, zero-->
 <!ATTLIST ordinalMinimalPairs alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST ordinalMinimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!-- ######################################################### -->
 
 <!ELEMENT units ( alias | ( unit*, unitLength*, durationUnit*, special* ) ) >
 <!ATTLIST units alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST units draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST units references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2506,13 +2289,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT unit ( alias | ( displayName*, unitPattern*, perUnitPattern*, special* ) ) >
 <!ATTLIST unit type NMTOKEN #REQUIRED >
-    <!--@MATCH:validity/unit-->
 <!ATTLIST unit alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST unit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST unit references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2520,20 +2301,18 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT perUnitPattern ( #PCDATA ) >
 <!ATTLIST perUnitPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST perUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST perUnitPattern references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT unitLength ( alias | ( compoundUnit*, unit*, coordinateUnit*, special* ) ) >
 <!ATTLIST unitLength type (long | short | narrow) #REQUIRED >
 <!ATTLIST unitLength alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST unitLength draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST unitLength references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2541,13 +2320,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT compoundUnit ( alias | ( compoundUnitPattern*, special* ) ) >
 <!ATTLIST compoundUnit type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/per-->
 <!ATTLIST compoundUnit alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST compoundUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST compoundUnit references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2555,58 +2332,51 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT compoundUnitPattern ( #PCDATA ) >
 <!ATTLIST compoundUnitPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST compoundUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST compoundUnitPattern references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST compoundUnitPattern validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
-<!ELEMENT coordinateUnit ( alias | ( displayName*, coordinateUnitPattern*, special* ) ) >
+<!ELEMENT coordinateUnit ( alias | ( coordinateUnitPattern*, special* ) ) >
 <!ATTLIST coordinateUnit alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST coordinateUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT coordinateUnitPattern ( #PCDATA ) >
 <!ATTLIST coordinateUnitPattern type (north | east | south | west) #REQUIRED >
 <!ATTLIST coordinateUnitPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST coordinateUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT durationUnit ( alias | ( durationUnitPattern*, special* ) ) >
 <!ATTLIST durationUnit type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/hm, hms, ms-->
 <!ATTLIST durationUnit alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST durationUnit draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST durationUnit references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT durationUnitPattern ( #PCDATA ) >
 <!ATTLIST durationUnitPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST durationUnitPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST durationUnitPattern references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST durationUnitPattern validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT listPatterns ( alias | ( listPattern*, special* ) ) >
 <!ATTLIST listPatterns alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST listPatterns draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST listPatterns references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2614,13 +2384,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT listPattern ( alias | ( listPatternPart*, special* ) ) >
 <!ATTLIST listPattern type NMTOKEN #IMPLIED >
-    <!--@MATCH:literal/or, or-narrow, or-short, standard-narrow, standard-short, unit, unit-narrow, unit-short-->
 <!ATTLIST listPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST listPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST listPattern references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2629,11 +2397,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT listPatternPart ( #PCDATA ) >
 <!ATTLIST listPatternPart type (start | middle | end | 2 | 3) #REQUIRED >
 <!ATTLIST listPatternPart alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST listPatternPart draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST listPatternPart references CDATA #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST listPatternPart validSubLocales CDATA #IMPLIED >

@@ -2653,29 +2420,25 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT defaultCollation ( #PCDATA ) >
 <!ATTLIST defaultCollation alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST defaultCollation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT collation ( alias | ( base?, import*, settings?, suppress_contractions?, optimize?, ( cr* | rules? ), special* ) ) >
 <!ATTLIST collation type NMTOKEN "standard" >
-    <!--@MATCH:or/bcp47/co||regex/private-.*||literal/digits-after-->
 <!ATTLIST collation visibility (internal | external) #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST collation alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/proposed, short, variant-->
 <!ATTLIST collation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST collation standard CDATA #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST collation references CDATA #IMPLIED >
-    <!--@MATCH:any-->
     <!--@METADATA-->
 <!ATTLIST collation validSubLocales CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 

@@ -2752,11 +2515,10 @@
     <!--@ORDERED-->
     <!--@DEPRECATED-->
 
 <!ELEMENT cr ( #PCDATA ) >
 <!ATTLIST cr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST cr draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 <!ATTLIST cr references CDATA #IMPLIED >
     <!--@METADATA-->
 

@@ -2874,11 +2636,10 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT messages ( alias | ( yesstr*, nostr*, yesexpr*, noexpr*, special* ) ) >
 <!ATTLIST messages alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST messages draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST messages references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2886,30 +2647,27 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT yesstr ( #PCDATA ) >
 <!ATTLIST yesstr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST yesstr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST yesstr references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT nostr ( #PCDATA ) >
 <!ATTLIST nostr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST nostr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST nostr references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT yesexpr ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST yesexpr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST yesexpr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST yesexpr references CDATA #IMPLIED >

@@ -2917,11 +2675,10 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT noexpr ( #PCDATA ) >
     <!--@DEPRECATED-->
 <!ATTLIST noexpr alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST noexpr draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST noexpr references CDATA #IMPLIED >

@@ -2930,29 +2687,24 @@
 
 <!ELEMENT characterLabels ( alias | ( characterLabelPattern*, characterLabel*, special* ) ) >
 
 <!ELEMENT characterLabelPattern ( #PCDATA ) >
 <!ATTLIST characterLabelPattern type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/all, category-list, compatibility, enclosed, extended, historic, miscellaneous, other, scripts, strokes-->
 <!ATTLIST characterLabelPattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED >
     <!-- count only used for certain patterns" -->
 <!ATTLIST characterLabelPattern alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST characterLabelPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT characterLabel ( #PCDATA ) >
 <!ATTLIST characterLabel type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/activities, african_scripts, american_scripts, animal, animals_nature, arrows, body, box_drawing, braille, building, bullets_stars, consonantal_jamo, currency_symbols, dash_connector, digits, dingbats, divination_symbols, downwards_arrows, downwards_upwards_arrows, east_asian_scripts, emoji, european_scripts, female, flag, flags, food_drink, format, format_whitespace, full_width_form_variant, geometric_shapes, half_width_form_variant, han_characters, han_radicals, hanja, hanzi_simplified, hanzi_traditional, heart, historic_scripts, ideographic_desc_characters, japanese_kana, kanbun, kanji, keycap, leftwards_arrows, leftwards_rightwards_arrows, letterlike_symbols, limited_use, male, math_symbols, middle_eastern_scripts, miscellaneous, modern_scripts, modifier, musical_symbols, nature, nonspacing, numbers, objects, other, paired, person, phonetic_alphabet, pictographs, place, plant, punctuation, rightwards_arrows, sign_standard_symbols, small_form_variant, smiley, smileys_people, south_asian_scripts, southeast_asian_scripts, spacing, sport, symbols, technical_symbols, tone_marks, travel, travel_places, upwards_arrows, variant_forms, vocalic_jamo, weather, western_asian_scripts, whitespace-->
 <!ATTLIST characterLabel alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST characterLabel draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT segmentations ( alias | ( segmentation*, special* ) ) >
 <!ATTLIST segmentations alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST segmentations draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST segmentations references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2960,13 +2712,11 @@
     <!--@VALUE-->
     <!--@DEPRECATED-->
 
 <!ELEMENT segmentation ( alias | ( variables?, segmentRules?, exceptions?, suppressions? ) | special* ) >
 <!ATTLIST segmentation type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/GraphemeClusterBreak, LineBreak, SentenceBreak, WordBreak-->
 <!ATTLIST segmentation alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST segmentation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST segmentation references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -2977,26 +2727,22 @@
 <!ELEMENT variables ( alias | ( variable*, special* ) ) >
 
 <!ELEMENT variable ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST variable id CDATA #REQUIRED >
-    <!--@MATCH:regex/\$[a-zA-Z0-9_]+-->
 <!ATTLIST variable alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST variable draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST variable references CDATA #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT segmentRules ( alias | ( rule*, special* ) ) >
 
 <!ELEMENT rule ( #PCDATA ) >
 <!ATTLIST rule id NMTOKEN #REQUIRED >
-    <!--@MATCH:range/0.0~9999.0-->
 <!ATTLIST rule alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST rule draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 <!ATTLIST rule references CDATA #IMPLIED >
     <!--@METADATA-->

@@ -3012,35 +2758,31 @@
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT suppressions ( alias | ( suppression*, special* ) ) >
 <!ATTLIST suppressions type NMTOKEN "standard" >
-    <!--@MATCH:literal/standard-->
 <!ATTLIST suppressions draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT suppression ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST suppression alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST suppression draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT rbnf ( alias | ( rulesetGrouping*, special* ) ) >
 
 <!ELEMENT rulesetGrouping ( alias | ( ruleset*, special* ) ) >
 <!ATTLIST rulesetGrouping type NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/NumberingSystemRules, OrdinalRules, SpelloutRules-->
 <!ATTLIST rulesetGrouping draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 
 <!ELEMENT ruleset ( alias | ( rbnfrule*, special* ) ) >
     <!--@ORDERED-->
 <!ATTLIST ruleset type NMTOKEN #REQUIRED >
-    <!--@MATCH:regex/(ord-M-)?[\-0-9a-z]+-->
 <!ATTLIST ruleset access (public | private) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST ruleset allowsParsing (true | false) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST ruleset draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >

@@ -3048,59 +2790,50 @@
     <!--@DEPRECATED-->
 
 <!ELEMENT rbnfrule ( #PCDATA ) >
     <!--@ORDERED-->
 <!ATTLIST rbnfrule value CDATA #REQUIRED >
-    <!--@MATCH:or/range/-1.0E20~1.0E20||literal/-x, 0, 0.x, NaN, -Inf, Inf, x,x, x.x-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule radix CDATA #IMPLIED >
-    <!--@MATCH:literal/1,000, 100, 1000, 100000, 20-->
     <!--@VALUE-->
 <!ATTLIST rbnfrule decexp CDATA #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST rbnfrule alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST rbnfrule draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED:true, false-->
 
 <!ELEMENT typographicNames ( alias | ( axisName*, styleName*, featureName*, special* ) ) >
 
 <!ELEMENT axisName ( #PCDATA ) >
 <!ATTLIST axisName type (ital | opsz | slnt | wdth | wght) #REQUIRED >
 <!ATTLIST axisName alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST axisName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT styleName ( #PCDATA ) >
 <!ATTLIST styleName type (ital | opsz | slnt | wdth | wght) #REQUIRED >
 <!ATTLIST styleName subtype NMTOKEN #REQUIRED >
-    <!--@MATCH:literal/-12, 0, 1, 100, 112.5, 12, 125, 144, 150, 18, 200, 24, 300, 350, 380, 400, 50, 500, 600, 62.5, 700, 72, 75, 8, 800, 87.5, 900, 950-->
 <!ATTLIST styleName alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/compressed, demi, extended, heavy, narrow, short, ultra, ultrablack, ultraheavy, wide-->
 <!ATTLIST styleName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT featureName ( #PCDATA ) >
 <!ATTLIST featureName type (afrc | cpsp | dlig | frac | lnum | onum | ordn | pnum | smcp | tnum | zero) #REQUIRED >
 <!ATTLIST featureName alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/short, variant-->
 <!ATTLIST featureName draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT annotations ( alias | ( annotation*, special* ) ) >
 
 <!ELEMENT annotation ( #PCDATA ) >
 <!ATTLIST annotation cp CDATA #REQUIRED >
-    <!--@MATCH:any-->
 <!ATTLIST annotation tts CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST annotation type (tts) #IMPLIED >
 <!ATTLIST annotation alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST annotation draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!-- ######################################################### -->
 <!-- # This element contains metadata for Survey Tool internal use (optimization, etc). -->

@@ -3111,17 +2844,15 @@
 <!ELEMENT casingData ( alias | ( casingItem*, special* ) ) >
     <!--@METADATA-->
 
 <!ELEMENT casingItem ( #PCDATA ) >
 <!ATTLIST casingItem type CDATA #REQUIRED >
-    <!--@MATCH:any-->
 <!ATTLIST casingItem override (true | false) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST casingItem forceError (true | false) #IMPLIED >
     <!--@VALUE-->
 <!ATTLIST casingItem alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
 <!ATTLIST casingItem draft (approved | contributed | provisional | unconfirmed) #IMPLIED >
     <!--@METADATA-->
 
 <!ELEMENT references ( reference* ) >
     <!--@METADATA-->

@@ -3134,11 +2865,10 @@
     <!--@DEPRECATED-->
 <!ATTLIST reference uri CDATA #IMPLIED >
     <!--@VALUE-->
     <!--@DEPRECATED-->
 <!ATTLIST reference alt NMTOKENS #IMPLIED >
-    <!--@MATCH:literal/variant-->
     <!--@DEPRECATED-->
 <!ATTLIST reference draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED >
     <!--@METADATA-->
     <!--@DEPRECATED-->
 <!ATTLIST reference standard (true | false) #IMPLIED >
< prev index next >