diff --git a/docs/ldml/tr35-general.html b/docs/ldml/tr35-general.html index e070a5bbb58..d4cf62ae5b3 100644 --- a/docs/ldml/tr35-general.html +++ b/docs/ldml/tr35-general.html @@ -215,8 +215,8 @@

Contents
  • 6.1 Unit Preference and Conversion Data
  • 6.2 Unit Identifiers
  • 6.3 Example Units
    • -
  • 6.4 per Unit patterns
    • -
  • 6.5 Unit Sequences
    • +
  • 6.4 Compound Units
    • +
  • 6.5 Unit Sequences (Mixed Units)
  • 6.6 durationUnit
  • 6.7 coordinateUnit
  • 6.8 Territory-Based Unit @@ -1739,8 +1739,8 @@

    6.3 Example Units

    Validity Data. The compound units in the table below either require specialized formatting or have a numerator and/or demoninator that are not defined as - valid standalone units. Note: as explained in Section 6.1 - per Unit patterns, CLDR + valid standalone units. Note: as explained in Section 6.4 + Compound Units, CLDR provides data to format any compound unit composed of two simple units from the following table.

    @@ -5458,7 +5458,7 @@

    Values

    16 Grammatical Derivations

    - 
    <!ELEMENT grammaticalData ( grammaticalFeatures*, grammaticalDerivations*) >
+
    <!ELEMENT grammaticalData ( grammaticalFeatures*, grammaticalDerivations*) >
 <!ELEMENT grammaticalDerivations (deriveCompound*, deriveComponent*) >
 <!ATTLIST grammaticalDerivations locales NMTOKENS #REQUIRED >
 
@@ -5471,7 +5471,7 @@ 
    16 Grammat
 <!ATTLIST deriveComponent structure NMTOKENS #REQUIRED >     
 <!ATTLIST deriveComponent value0 NMTOKEN #REQUIRED >     
 <!ATTLIST deriveComponent value1 NMTOKEN #REQUIRED >    
-
    
+

    The grammatical derivation data contains information about the case, gender, and plural categories of compound units. This is supplemental data, so the inheritance by locale needs to be done by the client.

    Note: In CLDR v38, the data for two locales is provided so that implemenations can ready their code for when more locale data is available. In subsequent releases structure may be further extended as more locales are added, to deal with additional locale requirements.

    A compound unit can use 4 mechanisms, illustrated here in formatted strings:

    diff --git a/docs/ldml/tr35-numbers.html b/docs/ldml/tr35-numbers.html index 02c6dfefca2..25304f65708 100644 --- a/docs/ldml/tr35-numbers.html +++ b/docs/ldml/tr35-numbers.html @@ -818,13 +818,14 @@

    2.6 <!ATTLIST ordinalMinimalPairs alt NMTOKENS #IMPLIED >
    <!ATTLIST ordinalMinimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED >

    -

    <!ELEMENT caseMinimalPairs ( #PCDATA ) >
    - <!ATTLIST caseMinimalPairs case NMTOKEN #REQUIRED >

    -

    <!ELEMENT genderMinimalPairs ( #PCDATA ) >
    - <!ATTLIST genderMinimalPairs gender NMTOKEN #REQUIRED >

    +

    <!ELEMENT caseMinimalPairs ( #PCDATA ) >
    + <!ATTLIST caseMinimalPairs case NMTOKEN #REQUIRED >

    +

    <!ELEMENT genderMinimalPairs ( #PCDATA ) >
    + <!ATTLIST genderMinimalPairs gender NMTOKEN #REQUIRED >

    Minimal pairs provide examples that justify why multiple - - plural or ordinal categories exist, and for providing contextual examples for verifying consistency of translations. The allowable values for the count, ordinal, case, and gender attributes are found in the dtd file.

    + plural or ordinal categories exist, and for providing contextual + examples for verifying consistency of translations. The allowable values for the count, + ordinal, case, and gender attributes are found in the dtd file.

    Examples

    <minimalPairs>
      <pluralMinimalPairs count="one">{0} Tag</pluralMinimalPairs><
    @@ -842,9 +843,9 @@

    2.6 </minimalPairs>


    -

    For more information, see Plural - Rules and Grammatical Inflection.

    +

    For more information, see Plural Rules + and + Grammatical Inflection.

    3 Number diff --git a/docs/ldml/tr35.html b/docs/ldml/tr35.html index b92b46a0a8e..1791d802021 100644 --- a/docs/ldml/tr35.html +++ b/docs/ldml/tr35.html @@ -102,7 +102,7 @@

    Unicode Locale Data Markup Language (LDML)

    Date - 2020-10-12 + 2020-10-18