[Unicode]   Common Locale Data Repository : Bug Tracking Home | Site Map | Search
 

Ignore:
Location:
tags/release-24/common/dtd
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • tags/release-24/common/dtd/ldml.dtd

    r11649 r11649  
    2020<!ELEMENT version EMPTY > 
    2121<!ATTLIST version number CDATA #REQUIRED > 
    22 <!ATTLIST version cldrVersion CDATA #FIXED "23.1" > 
     22<!ATTLIST version cldrVersion CDATA #FIXED "24" > 
    2323 
    2424<!ELEMENT generation EMPTY > 
     
    6464<!ATTLIST alias alt NMTOKENS #IMPLIED > 
    6565 
    66 <!ELEMENT default (special*) > 
    67 <!ATTLIST default type NMTOKEN #IMPLIED > <!-- only used in collation, to be deprecated --> 
    68 <!ATTLIST default choice NMTOKEN #IMPLIED > <!-- deprecated --> 
     66<!ELEMENT default (special*) > <!-- deprecated --> 
     67<!ATTLIST default type NMTOKEN #IMPLIED > 
     68<!ATTLIST default choice NMTOKEN #IMPLIED > 
    6969<!ATTLIST default draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    7070<!ATTLIST default references CDATA #IMPLIED > 
     
    260260 
    261261<!ELEMENT ellipsis ( #PCDATA ) > 
    262 <!ATTLIST ellipsis type ( initial | medial | final ) #IMPLIED > 
     262<!ATTLIST ellipsis type ( initial | medial | final | word-initial | word-medial | word-final ) #IMPLIED > 
    263263<!ATTLIST ellipsis draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
    264264<!ATTLIST ellipsis references CDATA #IMPLIED > 
     
    430430<!ATTLIST calendar validSubLocales CDATA #IMPLIED > 
    431431 
    432 <!ELEMENT months ( alias | (default*, monthContext*, special*)) > 
     432<!ELEMENT months ( alias | (default*, monthContext*, special*)) > <!-- default element is deprecated --> 
    433433<!ATTLIST months draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    434434<!ATTLIST months standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. --> 
     
    437437<!ATTLIST months validSubLocales CDATA #IMPLIED > 
    438438 
    439 <!ELEMENT monthContext ( alias | (default*, monthWidth*, special*)) > 
     439<!ELEMENT monthContext ( alias | (default*, monthWidth*, special*)) > <!-- default element is deprecated --> 
    440440<!ATTLIST monthContext type ( format | stand-alone ) #REQUIRED > 
    441441<!ATTLIST monthContext draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    495495<!-- END_DEPRECATED--> 
    496496 
    497 <!ELEMENT days ( alias | (default*, dayContext*, special*)) > 
     497<!ELEMENT days ( alias | (default*, dayContext*, special*)) > <!-- default element is deprecated --> 
    498498<!ATTLIST days draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. --> 
    499499<!ATTLIST days standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. --> 
     
    502502<!ATTLIST days validSubLocales CDATA #IMPLIED > 
    503503 
    504 <!ELEMENT dayContext ( alias | (default*, dayWidth*, special*)) > 
     504<!ELEMENT dayContext ( alias | (default*, dayWidth*, special*)) > <!-- default element is deprecated --> 
    505505<!ATTLIST dayContext draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    506506<!ATTLIST dayContext type ( format | stand-alone ) #REQUIRED > 
     
    525525 
    526526 
    527 <!ELEMENT quarters ( alias | (default*, quarterContext*, special*)) > 
     527<!ELEMENT quarters ( alias | (default*, quarterContext*, special*)) > <!-- default element is deprecated --> 
    528528<!ATTLIST quarters draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    529529<!ATTLIST quarters references CDATA #IMPLIED > 
     
    531531<!ATTLIST quarters validSubLocales CDATA #IMPLIED > 
    532532 
    533 <!ELEMENT quarterContext ( alias | (default*, quarterWidth*, special*)) > 
     533<!ELEMENT quarterContext ( alias | (default*, quarterWidth*, special*)) > <!-- default element is deprecated --> 
    534534<!ATTLIST quarterContext draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    535535<!ATTLIST quarterContext type ( format | stand-alone ) #REQUIRED > 
     
    692692<!ATTLIST cyclicName alt NMTOKENS #IMPLIED > 
    693693 
    694 <!ELEMENT dateFormats (alias | (default*, dateFormatLength*, special*)) > 
     694<!ELEMENT dateFormats (alias | (default*, dateFormatLength*, special*)) > <!-- default element is deprecated --> 
    695695<!ATTLIST dateFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    696696<!ATTLIST dateFormats validSubLocales CDATA #IMPLIED > 
    697697 
    698 <!ELEMENT dateFormatLength (alias | (default*, dateFormat*, special*)) > 
     698<!ELEMENT dateFormatLength (alias | (default*, dateFormat*, special*)) > <!-- default element is deprecated --> 
    699699<!ATTLIST dateFormatLength type ( full | long | medium | short ) #REQUIRED > 
    700700<!ATTLIST dateFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    718718<!ATTLIST displayName alt NMTOKENS #IMPLIED > 
    719719 
    720 <!ELEMENT timeFormats (alias | (default*, timeFormatLength*, special*)) > 
     720<!ELEMENT timeFormats (alias | (default*, timeFormatLength*, special*)) > <!-- default element is deprecated --> 
    721721<!ATTLIST timeFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    722722<!ATTLIST timeFormats validSubLocales CDATA #IMPLIED > 
    723723 
    724 <!ELEMENT timeFormatLength (alias | (default*, timeFormat*, special*)) > 
     724<!ELEMENT timeFormatLength (alias | (default*, timeFormat*, special*)) > <!-- default element is deprecated --> 
    725725<!ATTLIST timeFormatLength type ( full | long | medium | short ) #REQUIRED > 
    726726<!ATTLIST timeFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    738738<!ATTLIST timeFormat validSubLocales CDATA #IMPLIED > 
    739739 
    740 <!ELEMENT dateTimeFormats (alias | (default*, dateTimeFormatLength*, availableFormats*, appendItems*, intervalFormats*, special*)) > 
     740<!ELEMENT dateTimeFormats (alias | (default*, dateTimeFormatLength*, availableFormats*, appendItems*, intervalFormats*, special*)) > <!-- default element is deprecated --> 
    741741<!ATTLIST dateTimeFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    742742<!ATTLIST dateTimeFormats validSubLocales CDATA #IMPLIED > 
    743743 
    744 <!ELEMENT dateTimeFormatLength (alias | (default*, dateTimeFormat*, special*)) > 
     744<!ELEMENT dateTimeFormatLength (alias | (default*, dateTimeFormat*, special*)) > <!-- default element is deprecated --> 
    745745<!ATTLIST dateTimeFormatLength type ( full | long | medium | short ) #IMPLIED > 
    746746<!ATTLIST dateTimeFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    809809 
    810810 
    811 <!ELEMENT timeZoneNames (alias | (hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special*)) > 
     811<!ELEMENT timeZoneNames (alias | (hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special*)) > <!-- default element is deprecated --> 
    812812<!ATTLIST timeZoneNames draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    813813<!ATTLIST timeZoneNames validSubLocales CDATA #IMPLIED > 
     
    834834 
    835835<!ELEMENT regionFormat ( #PCDATA ) > 
     836<!ATTLIST regionFormat type ( standard | daylight ) #IMPLIED > 
    836837<!ATTLIST regionFormat alt NMTOKENS #IMPLIED > 
    837838<!ATTLIST regionFormat draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    843844<!ATTLIST fallbackFormat references CDATA #IMPLIED > 
    844845 
    845 <!ELEMENT fallbackRegionFormat ( #PCDATA ) > 
     846<!ELEMENT fallbackRegionFormat ( #PCDATA ) > <!-- deprecated --> 
    846847<!ATTLIST fallbackRegionFormat alt NMTOKENS #IMPLIED > 
    847848<!ATTLIST fallbackRegionFormat draft ( approved | contributed | provisional | unconfirmed) #IMPLIED > 
     
    942943<!ATTLIST fields validSubLocales CDATA #IMPLIED > 
    943944 
    944 <!ELEMENT field ( alias | (displayName*, relative*, special*)) > 
    945 <!ATTLIST field type ( era | year | month | week | day | weekday | dayperiod | hour | minute | second | zone ) #IMPLIED > 
     945<!ELEMENT field ( alias | (displayName*, relative*, relativeTime*, special*)) > 
     946<!ATTLIST field type ( era | year | month | week | day | weekday | sun | mon | tue | wed | thu | fri | sat | dayperiod | hour | minute | second | zone ) #IMPLIED > 
    946947<!ATTLIST field draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    947948<!ATTLIST field standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. --> 
     
    958959<!ATTLIST relative validSubLocales CDATA #IMPLIED > 
    959960 
    960  
    961 <!-- ######################################################### --> 
    962  
    963  
    964 <!-- ######################################################### --> 
    965  
    966 <!ELEMENT numbers (alias | (defaultNumberingSystem*, otherNumberingSystems*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, special*)) > 
     961<!ELEMENT relativeTime ( alias | (relativeTimePattern*, special*)) > 
     962<!ATTLIST relativeTime type NMTOKEN #REQUIRED > 
     963<!ATTLIST relativeTime draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     964<!ATTLIST relativeTime references CDATA #IMPLIED > 
     965<!ATTLIST relativeTime alt NMTOKENS #IMPLIED > 
     966<!ATTLIST relativeTime validSubLocales CDATA #IMPLIED > 
     967 
     968<!ELEMENT relativeTimePattern ( #PCDATA ) > 
     969<!ATTLIST relativeTimePattern count ( zero | one | two | few | many | other ) #REQUIRED > 
     970<!ATTLIST relativeTimePattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     971<!ATTLIST relativeTimePattern references CDATA #IMPLIED > 
     972<!ATTLIST relativeTimePattern alt NMTOKENS #IMPLIED > 
     973<!ATTLIST relativeTimePattern validSubLocales CDATA #IMPLIED > 
     974 
     975<!-- ######################################################### --> 
     976 
     977 
     978<!-- ######################################################### --> 
     979 
     980<!ELEMENT numbers (alias | (defaultNumberingSystem*, otherNumberingSystems*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, special*)) > 
    967981<!ATTLIST numbers draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    968982<!ATTLIST numbers standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. --> 
     
    9921006<!ATTLIST finance alt NMTOKENS #IMPLIED > 
    9931007 
    994 <!ELEMENT symbols (alias | (decimal*, group*, list*, percentSign*, nativeZeroDigit*, patternDigit*, plusSign*, minusSign*, exponential*, perMille*, infinity*, nan*, currencyDecimal*, currencyGroup*, special*)) > 
     1008<!ELEMENT symbols (alias | (decimal*, group*, list*, percentSign*, nativeZeroDigit*, patternDigit*, plusSign*, minusSign*, exponential*, superscriptingExponent*, perMille*, infinity*, nan*, currencyDecimal*, currencyGroup*, special*)) > 
    9951009<!ATTLIST symbols draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    9961010<!ATTLIST symbols standard CDATA #IMPLIED > <!-- the "standard" attribute is deprecated everywhere. --> 
     
    10531067<!ATTLIST exponential alt NMTOKENS #IMPLIED > 
    10541068<!ATTLIST exponential numberSystem CDATA #IMPLIED > <!-- deprecated --> 
     1069 
     1070<!ELEMENT superscriptingExponent ( #PCDATA ) > 
     1071<!ATTLIST superscriptingExponent references CDATA #IMPLIED > 
     1072<!ATTLIST superscriptingExponent draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     1073<!ATTLIST superscriptingExponent alt NMTOKENS #IMPLIED > 
    10551074 
    10561075<!ELEMENT perMille ( #PCDATA ) > 
     
    10921111<!ATTLIST pattern alt NMTOKENS #IMPLIED > 
    10931112 
    1094 <!ELEMENT decimalFormats (alias | (default*, decimalFormatLength*, special*)) > 
     1113<!ELEMENT decimalFormats (alias | (default*, decimalFormatLength*, special*)) > <!-- default element is deprecated --> 
    10951114<!ATTLIST decimalFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    10961115<!ATTLIST decimalFormats validSubLocales CDATA #IMPLIED > 
    10971116<!ATTLIST decimalFormats numberSystem CDATA #IMPLIED > 
    10981117 
    1099 <!ELEMENT decimalFormatLength (alias | (default*, decimalFormat*, special*)) > 
     1118<!ELEMENT decimalFormatLength (alias | (default*, decimalFormat*, special*)) > <!-- default element is deprecated --> 
    11001119<!ATTLIST decimalFormatLength type ( full | long | medium | short ) #IMPLIED > 
    11011120<!ATTLIST decimalFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    11131132<!ATTLIST decimalFormat validSubLocales CDATA #IMPLIED > 
    11141133 
    1115 <!ELEMENT scientificFormats (alias | (default*, scientificFormatLength*, special*)) > 
     1134<!ELEMENT scientificFormats (alias | (default*, scientificFormatLength*, special*)) > <!-- default element is deprecated --> 
    11161135<!ATTLIST scientificFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    11171136<!ATTLIST scientificFormats validSubLocales CDATA #IMPLIED > 
    11181137<!ATTLIST scientificFormats numberSystem CDATA #IMPLIED > 
    11191138 
    1120 <!ELEMENT scientificFormatLength (alias | (default*, scientificFormat*, special*)) > 
     1139<!ELEMENT scientificFormatLength (alias | (default*, scientificFormat*, special*)) > <!-- default element is deprecated --> 
    11211140<!ATTLIST scientificFormatLength type ( full | long | medium | short ) #IMPLIED > 
    11221141<!ATTLIST scientificFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    11341153<!ATTLIST scientificFormat validSubLocales CDATA #IMPLIED > 
    11351154 
    1136 <!ELEMENT percentFormats (alias | (default*, percentFormatLength*, special*)) > 
     1155<!ELEMENT percentFormats (alias | (default*, percentFormatLength*, special*)) > <!-- default element is deprecated --> 
    11371156<!ATTLIST percentFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    11381157<!ATTLIST percentFormats validSubLocales CDATA #IMPLIED > 
    11391158<!ATTLIST percentFormats numberSystem CDATA #IMPLIED > 
    11401159 
    1141 <!ELEMENT percentFormatLength (alias | (default*, percentFormat*, special*)) > 
     1160<!ELEMENT percentFormatLength (alias | (default*, percentFormat*, special*)) > <!-- default element is deprecated --> 
    11421161<!ATTLIST percentFormatLength type ( full | long | medium | short ) #IMPLIED > 
    11431162<!ATTLIST percentFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    11551174<!ATTLIST percentFormat validSubLocales CDATA #IMPLIED > 
    11561175 
    1157 <!ELEMENT currencyFormats (alias | (default*, currencySpacing*, currencyFormatLength*, unitPattern*, special*)) > 
     1176<!ELEMENT currencyFormats (alias | (default*, currencySpacing*, currencyFormatLength*, unitPattern*, special*)) > <!-- default element is deprecated --> 
    11581177<!ATTLIST currencyFormats draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    11591178<!ATTLIST currencyFormats validSubLocales CDATA #IMPLIED > 
     
    11791198<!ATTLIST insertBetween references CDATA #IMPLIED > 
    11801199 
    1181 <!ELEMENT currencyFormatLength (alias | (default*, currencyFormat*, special*)) > 
     1200<!ELEMENT currencyFormatLength (alias | (default*, currencyFormat*, special*)) > <!-- default element is deprecated --> 
    11821201<!ATTLIST currencyFormatLength type ( full | long | medium | short ) #IMPLIED > 
    11831202<!ATTLIST currencyFormatLength draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    11951214<!ATTLIST currencyFormat validSubLocales CDATA #IMPLIED > 
    11961215 
    1197 <!ELEMENT currencies (alias | (default?, currency*, special*)) > 
     1216<!ELEMENT currencies (alias | (default?, currency*, special*)) > <!-- default element is deprecated --> 
    11981217<!ATTLIST currencies draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    11991218<!ATTLIST currencies validSubLocales CDATA #IMPLIED > 
     
    12131232<!ATTLIST symbol alt NMTOKENS #IMPLIED > 
    12141233<!ATTLIST symbol choice ( true | false ) #IMPLIED > <!-- deprecated --> 
    1215 <!-- ######################################################### --> 
    1216  
    1217 <!ELEMENT units (alias | (unit*, special*)) > 
     1234 
     1235<!ELEMENT miscPatterns (alias | (default*, pattern*, special*)) > <!-- default element is deprecated --> 
     1236<!ATTLIST miscPatterns draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     1237<!ATTLIST miscPatterns numberSystem CDATA #IMPLIED > 
     1238 
     1239<!-- ######################################################### --> 
     1240 
     1241<!ELEMENT units (alias | (unit*, unitLength*, durationUnit*, special*)) > 
    12181242<!ATTLIST units draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
    12191243<!ATTLIST units references CDATA #IMPLIED > 
    12201244<!ATTLIST units alt NMTOKENS #IMPLIED > 
    12211245<!ATTLIST units validSubLocales CDATA #IMPLIED > 
     1246 
     1247<!ELEMENT unitLength (alias | (compoundUnit*, unit*, special*)) > 
     1248<!ATTLIST unitLength type ( long | short | narrow ) #REQUIRED > 
     1249<!ATTLIST unitLength draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     1250<!ATTLIST unitLength references CDATA #IMPLIED > 
     1251<!ATTLIST unitLength alt NMTOKENS #IMPLIED > 
     1252<!ATTLIST unitLength validSubLocales CDATA #IMPLIED > 
     1253 
     1254<!ELEMENT compoundUnit (alias | (compoundUnitPattern*, special*)) > 
     1255<!ATTLIST compoundUnit type NMTOKEN #REQUIRED > 
     1256<!ATTLIST compoundUnit draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     1257<!ATTLIST compoundUnit references CDATA #IMPLIED > 
     1258<!ATTLIST compoundUnit alt NMTOKENS #IMPLIED > 
     1259<!ATTLIST compoundUnit validSubLocales CDATA #IMPLIED > 
    12221260 
    12231261<!ELEMENT unit (alias | (unitPattern*, special*)) > 
     
    12281266<!ATTLIST unit validSubLocales CDATA #IMPLIED > 
    12291267 
     1268<!ELEMENT durationUnit (alias | (durationUnitPattern*, special*)) > 
     1269<!ATTLIST durationUnit type NMTOKEN #REQUIRED > 
     1270<!ATTLIST durationUnit draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     1271<!ATTLIST durationUnit references CDATA #IMPLIED > 
     1272<!ATTLIST durationUnit alt NMTOKENS #IMPLIED > 
     1273 
    12301274<!ELEMENT unitPattern ( #PCDATA ) > 
    12311275<!ATTLIST unitPattern count (0 | 1 | zero | one | two | few | many | other) #REQUIRED > 
     
    12351279<!ATTLIST unitPattern validSubLocales CDATA #IMPLIED > 
    12361280 
     1281<!ELEMENT compoundUnitPattern ( #PCDATA ) > 
     1282<!ATTLIST compoundUnitPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     1283<!ATTLIST compoundUnitPattern references CDATA #IMPLIED > 
     1284<!ATTLIST compoundUnitPattern alt NMTOKENS #IMPLIED > 
     1285<!ATTLIST compoundUnitPattern validSubLocales CDATA #IMPLIED > 
     1286 
     1287<!ELEMENT durationUnitPattern ( #PCDATA ) > 
     1288<!ATTLIST durationUnitPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     1289<!ATTLIST durationUnitPattern references CDATA #IMPLIED > 
     1290<!ATTLIST durationUnitPattern alt NMTOKENS #IMPLIED > 
     1291<!ATTLIST durationUnitPattern validSubLocales CDATA #IMPLIED > 
     1292 
    12371293<!ELEMENT listPatterns (alias | (listPattern*, special*)) > 
    12381294<!ATTLIST listPatterns draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
     
    12421298 
    12431299<!ELEMENT listPattern (alias | (listPatternPart*, special*)) > 
    1244 <!ATTLIST listPattern type (NMTOKEN) #IMPLIED > 
     1300<!ATTLIST listPattern type NMTOKEN #IMPLIED > 
    12451301<!ATTLIST listPattern draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
    12461302<!ATTLIST listPattern references CDATA #IMPLIED > 
     
    12571313<!-- ######################################################### --> 
    12581314 
    1259 <!ELEMENT collations (alias | (default*, collation*, special*)) > 
     1315<!ELEMENT collations (alias | (defaultCollation?, default*, collation*, special*)) > <!-- default element is deprecated --> 
    12601316<!ATTLIST collations version NMTOKEN #IMPLIED > 
    12611317<!ATTLIST collations draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
    12621318<!ATTLIST collations validSubLocales CDATA #IMPLIED > 
    12631319 
    1264 <!ELEMENT collation (alias | (base?, settings?, suppress_contractions?, optimize?, rules?, special*)) > 
     1320<!ELEMENT defaultCollation ( #PCDATA ) > 
     1321 
     1322<!ELEMENT collation (alias | (base?, import*, settings?, suppress_contractions?, optimize?, (cr* | rules?), special*)) > 
    12651323<!ATTLIST collation type NMTOKEN "standard" > 
    12661324<!ATTLIST collation draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    12711329<!ATTLIST collation visibility ( internal | external ) "external" >  
    12721330 
    1273 <!ELEMENT base (alias|special) > 
     1331<!ELEMENT base (alias|special) > <!-- deprecated collations/collation/base, see CLDR ticket #6332 --> 
     1332 
     1333<!ELEMENT import EMPTY > 
     1334<!ATTLIST import source CDATA #REQUIRED > 
     1335<!ATTLIST import type CDATA #IMPLIED > 
    12741336 
    12751337<!ELEMENT settings (special*) > 
     
    12911353<!ELEMENT optimize ( #PCDATA | cp )* > 
    12921354 
    1293 <!ELEMENT rules (alias | ( ( reset | import ), ( reset | import | p | pc |  s | sc | t | tc | q | qc | i | ic | x)* )) > 
    1294  
    1295 <!ELEMENT reset ( #PCDATA | cp  | first_variable| last_variable | first_tertiary_ignorable | last_tertiary_ignorable | first_secondary_ignorable | last_secondary_ignorable | first_primary_ignorable | last_primary_ignorable | first_non_ignorable | last_non_ignorable | first_trailing | last_trailing )* > 
     1355<!ELEMENT cr ( #PCDATA )> 
     1356 
     1357<!-- The rules element and all of its sub-elements are deprecated. Use the cr element instead, with ICU syntax. --> 
     1358 
     1359<!ELEMENT rules (alias | ( ( reset | import ), ( reset | import | p | pc |  s | sc | t | tc | q | qc | i | ic | x)* )) > <!-- deprecated --> 
     1360 
     1361<!ELEMENT reset ( #PCDATA | cp  | first_variable| last_variable | first_tertiary_ignorable | last_tertiary_ignorable | first_secondary_ignorable | last_secondary_ignorable | first_primary_ignorable | last_primary_ignorable | first_non_ignorable | last_non_ignorable | first_trailing | last_trailing )* > <!-- deprecated --> 
    12961362<!ATTLIST reset before NMTOKEN #IMPLIED > 
    12971363 
    1298 <!ELEMENT import EMPTY > 
    1299 <!ATTLIST import source CDATA #REQUIRED > 
    1300 <!ATTLIST import type CDATA #IMPLIED > 
    1301  
    1302 <!ELEMENT p  ( #PCDATA  | cp | last_variable )* > 
    1303  
    1304 <!ELEMENT pc ( #PCDATA  | cp | last_variable )* > 
    1305  
    1306 <!ELEMENT s  ( #PCDATA  | cp | last_variable )* > 
    1307  
    1308 <!ELEMENT sc ( #PCDATA  | cp | last_variable )* > 
    1309  
    1310 <!ELEMENT t  ( #PCDATA  | cp | last_variable )* > 
    1311  
    1312 <!ELEMENT tc ( #PCDATA  | cp | last_variable )* > 
     1364<!ELEMENT p  ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     1365 
     1366<!ELEMENT pc ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     1367 
     1368<!ELEMENT s  ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     1369 
     1370<!ELEMENT sc ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     1371 
     1372<!ELEMENT t  ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     1373 
     1374<!ELEMENT tc ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
    13131375 
    13141376<!ELEMENT q  ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     
    13161378<!ELEMENT qc ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
    13171379 
    1318 <!ELEMENT i  ( #PCDATA  | cp | last_variable )* > 
    1319  
    1320 <!ELEMENT ic ( #PCDATA  | cp | last_variable )* > 
    1321  
    1322 <!ELEMENT x (context?, (  p | pc |  s | sc | t | tc | q | qc | i | ic )*, extend? )  > 
    1323  
    1324 <!ELEMENT extend ( #PCDATA | cp )* > 
    1325  
    1326 <!ELEMENT context (  #PCDATA | cp )* > 
    1327  
    1328 <!ELEMENT first_variable EMPTY > 
    1329 <!ELEMENT last_variable EMPTY > 
    1330 <!ELEMENT first_tertiary_ignorable EMPTY > 
    1331 <!ELEMENT last_tertiary_ignorable EMPTY > 
    1332 <!ELEMENT first_secondary_ignorable EMPTY > 
    1333 <!ELEMENT last_secondary_ignorable EMPTY > 
    1334 <!ELEMENT first_primary_ignorable EMPTY > 
    1335 <!ELEMENT last_primary_ignorable EMPTY > 
    1336 <!ELEMENT first_non_ignorable EMPTY > 
    1337 <!ELEMENT last_non_ignorable EMPTY > 
    1338 <!ELEMENT first_trailing EMPTY > 
    1339 <!ELEMENT last_trailing EMPTY > 
     1380<!ELEMENT i  ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     1381 
     1382<!ELEMENT ic ( #PCDATA  | cp | last_variable )* > <!-- deprecated --> 
     1383 
     1384<!ELEMENT x (context?, (  p | pc |  s | sc | t | tc | q | qc | i | ic )*, extend? )  > <!-- deprecated --> 
     1385 
     1386<!ELEMENT extend ( #PCDATA | cp )* > <!-- deprecated --> 
     1387 
     1388<!ELEMENT context (  #PCDATA | cp )* > <!-- deprecated --> 
     1389 
     1390<!ELEMENT first_variable EMPTY > <!-- deprecated --> 
     1391<!ELEMENT last_variable EMPTY > <!-- deprecated --> 
     1392<!ELEMENT first_tertiary_ignorable EMPTY > <!-- deprecated --> 
     1393<!ELEMENT last_tertiary_ignorable EMPTY > <!-- deprecated --> 
     1394<!ELEMENT first_secondary_ignorable EMPTY > <!-- deprecated --> 
     1395<!ELEMENT last_secondary_ignorable EMPTY > <!-- deprecated --> 
     1396<!ELEMENT first_primary_ignorable EMPTY > <!-- deprecated --> 
     1397<!ELEMENT last_primary_ignorable EMPTY > <!-- deprecated --> 
     1398<!ELEMENT first_non_ignorable EMPTY > <!-- deprecated --> 
     1399<!ELEMENT last_non_ignorable EMPTY > <!-- deprecated --> 
     1400<!ELEMENT first_trailing EMPTY > <!-- deprecated --> 
     1401<!ELEMENT last_trailing EMPTY > <!-- deprecated --> 
    13401402 
    13411403<!-- ######################################################### --> 
     
    13801442<!ATTLIST segmentations references CDATA #IMPLIED > 
    13811443 
    1382 <!ELEMENT segmentation ( alias | (variables?, segmentRules?) | special*) > 
     1444<!ELEMENT segmentation ( alias | (variables?, segmentRules?, exceptions?) | special*) > 
    13831445<!ATTLIST segmentation type NMTOKEN #REQUIRED > 
    13841446<!ATTLIST segmentation draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED ><!-- true and false are deprecated. --> 
     
    14021464<!ATTLIST rule alt NMTOKENS #IMPLIED > 
    14031465<!ATTLIST rule references CDATA #IMPLIED > 
     1466 
     1467<!ELEMENT exceptions ( exception* ) > 
     1468 
     1469<!ELEMENT exception ( #PCDATA ) > 
     1470<!ATTLIST exception draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
    14041471 
    14051472<!ELEMENT rbnf ( alias | rulesetGrouping*) > 
     
    14391506<!ELEMENT casingItem (#PCDATA) > 
    14401507<!ATTLIST casingItem type CDATA #REQUIRED > 
    1441  
     1508<!ATTLIST casingItem override (true | false) #IMPLIED > 
  • tags/release-24/common/dtd/ldmlBCP47.dtd

    r11649 r11649  
    11<!-- 
    2 Copyright © 2003-2012 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. 
     2Copyright © 2003-2013 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. 
    33 
    44Permission 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. 
     
    1414<!ELEMENT version EMPTY > 
    1515<!ATTLIST version number CDATA #REQUIRED> 
    16 <!ATTLIST version cldrVersion CDATA #FIXED "23.1" > 
     16<!ATTLIST version cldrVersion CDATA #FIXED "24" > 
    1717 
    1818<!ELEMENT generation EMPTY> 
     
    2727<!ATTLIST key extension NMTOKEN #IMPLIED> 
    2828<!ATTLIST key name NMTOKEN #REQUIRED> 
     29<!ATTLIST key description CDATA #IMPLIED> 
     30<!ATTLIST key deprecated ( true | false ) "false"> 
     31<!ATTLIST key preferred NMTOKEN #IMPLIED> 
    2932<!ATTLIST key alias NMTOKEN #IMPLIED> 
    30 <!ATTLIST key description CDATA #IMPLIED> 
    3133<!ATTLIST key since CDATA #IMPLIED> 
    32 <!ATTLIST key deprecated ( true | false ) "false"> 
    3334 
    3435<!ELEMENT type EMPTY> 
    3536<!ATTLIST type name NMTOKEN #REQUIRED> 
     37<!ATTLIST type description CDATA #IMPLIED> 
     38<!ATTLIST type deprecated ( true | false ) "false"> 
     39<!ATTLIST type preferred NMTOKEN #IMPLIED> 
    3640<!ATTLIST type alias CDATA #IMPLIED> 
    37 <!ATTLIST type description CDATA #IMPLIED> 
    3841<!ATTLIST type since CDATA #IMPLIED> 
    39 <!ATTLIST type deprecated ( true | false ) "false"> 
    4042 
    4143<!ELEMENT attribute EMPTY> 
    4244<!ATTLIST attribute name NMTOKEN #REQUIRED> 
    4345<!ATTLIST attribute description CDATA #IMPLIED> 
     46<!ATTLIST attribute deprecated ( true | false ) "false"> 
     47<!ATTLIST attribute preferred NMTOKEN #IMPLIED> 
    4448<!ATTLIST attribute since CDATA #IMPLIED> 
    45 <!ATTLIST attribute deprecated ( true | false ) "false"> 
  • tags/release-24/common/dtd/ldmlICU.dtd

    r11649 r11649  
    11<!-- 
    2 Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. 
     2Copyright © 2003-2013 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. 
    33 
    44Permission 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. 
     
    1010 
    1111<!-- ######################################################### --> 
    12  
     12<!-- The alias, default, special and cp elements are already defined in ldml.dtd. Defining them here as well would break locale conversion.  --> 
     13<!-- ######################################################### --> 
    1314 
    1415<!--  ICU Specific elements                                    --> 
  • tags/release-24/common/dtd/ldmlSupplemental.dtd

    r11649 r11649  
    1616<!ELEMENT version EMPTY > 
    1717<!ATTLIST version number CDATA #REQUIRED > 
    18 <!ATTLIST version cldrVersion CDATA #FIXED "23.1" > 
     18<!ATTLIST version cldrVersion CDATA #FIXED "24" > 
    1919 
    2020<!ELEMENT generation EMPTY > 
     
    3333<!ATTLIST info digits NMTOKEN #IMPLIED > 
    3434<!ATTLIST info rounding NMTOKEN #IMPLIED > 
     35<!ATTLIST info cashDigits NMTOKEN #IMPLIED > 
    3536<!ATTLIST info cashRounding NMTOKEN #IMPLIED > 
    3637<!ATTLIST info draft ( approved | contributed | provisional | unconfirmed | true | false ) #IMPLIED > <!-- true and false are deprecated. --> 
     
    364365 
    365366<!ELEMENT pluralRule ( #PCDATA ) > 
    366 <!ATTLIST pluralRule count (zero | one | two | few | many) #REQUIRED > <!-- 'other' is implicitly everything else --> 
     367<!ATTLIST pluralRule count (zero | one | two | few | many | other) #REQUIRED > <!-- 'other' is implicitly everything else --> 
    367368<!ATTLIST pluralRule draft ( approved | contributed | provisional | unconfirmed ) #IMPLIED > 
    368369<!ATTLIST pluralRule references CDATA #IMPLIED > 
Note: See TracChangeset for help on using the changeset viewer.