Skip to content

Commit

Permalink
CLDR-14128 spec misc fixes: TOC, links, change spans (#798)
Browse files Browse the repository at this point in the history
(cherry picked from commit 387d030)
  • Loading branch information
pedberg-icu authored and pedberg committed Oct 19, 2020
1 parent b407590 commit d0c64f0
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
12 changes: 6 additions & 6 deletions docs/ldml/tr35-general.html
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ <h2><a name="Contents" href="#Contents" id="Contents">Contents
<li>6.1 <a href="#Unit_Preference_and_Conversion">Unit Preference and Conversion Data</a></li>
<li>6.2 <a href="#Unit_Identifiers">Unit Identifiers</a></li>
<li>6.3 <a href="#Example_Units">Example Units</a></li>
<li>6.4 <a href="#perUnitPatterns">per Unit patterns</a></li>
<li>6.5 <a href="#Unit_Sequences">Unit Sequences</a></li>
<li>6.4 <span class="changed"><a href="#compound-units">Compound Units</a></span></li>
<li>6.5 <a href="#Unit_Sequences">Unit Sequences (Mixed Units)</a></li>
<li>6.6 <a href="#durationUnit">durationUnit</a></li>
<li>6.7 <a href="#coordinateUnit">coordinateUnit</a></li>
<li>6.8 <a href= "#Territory_Based_Unit_Preferences">Territory-Based Unit
Expand Down Expand Up @@ -1739,8 +1739,8 @@ <h3>6.3 <a name="Example_Units" href="#Example_Units">Example Units</a></h3>
Validity Data</a></em>. 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 <em>Section 6.1
<a href="#perUnitPatterns">per Unit patterns</a></em>, CLDR
valid standalone units. Note: as explained in <span class="changed"><em>Section 6.4
<a href="#compound-units">Compound Units</a></em></span>, CLDR
provides data to format any compound unit composed of two
simple units from the following table.</p>
<table>
Expand Down Expand Up @@ -5458,7 +5458,7 @@ <h4>Values</h4>
</table>
<div class='changed'>
<h2>16 <a name="Grammatical_Derivations" href="#Grammatical_Derivations">Grammatical Derivations</a></h2>
<pre class='dtd'>&lt;!ELEMENT grammaticalData ( grammaticalFeatures*, grammaticalDerivations*) &gt;
<pre class='dtd'><span class="changed">&lt;!ELEMENT grammaticalData ( grammaticalFeatures*, grammaticalDerivations*) &gt;
&lt;!ELEMENT grammaticalDerivations (deriveCompound*, deriveComponent*) &gt;
&lt;!ATTLIST grammaticalDerivations locales NMTOKENS #REQUIRED &gt;

Expand All @@ -5471,7 +5471,7 @@ <h2>16 <a name="Grammatical_Derivations" href="#Grammatical_Derivations">Grammat
&lt;!ATTLIST deriveComponent structure NMTOKENS #REQUIRED &gt;
&lt;!ATTLIST deriveComponent value0 NMTOKEN #REQUIRED &gt;
&lt;!ATTLIST deriveComponent value1 NMTOKEN #REQUIRED &gt;
</pre>
</span></pre>
<p>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.</p>
<p><em>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.</em></p>
<p>A compound unit can use 4 mechanisms, illustrated here in formatted strings:</p>
Expand Down
19 changes: 10 additions & 9 deletions docs/ldml/tr35-numbers.html
Original file line number Diff line number Diff line change
Expand Up @@ -818,13 +818,14 @@ <h3>2.6 <a name="Minimal_Pairs" href="#Minimal_Pairs" id=
<span class='removed'>&lt;!ATTLIST ordinalMinimalPairs alt NMTOKENS #IMPLIED &gt;<br>
&lt;!ATTLIST ordinalMinimalPairs draft (approved | contributed
| provisional | unconfirmed) #IMPLIED &gt;</span></p>
<p class="dtd">&lt;!ELEMENT caseMinimalPairs ( #PCDATA ) &gt;<br>
&lt;!ATTLIST caseMinimalPairs case NMTOKEN #REQUIRED &gt;</p>
<p class="dtd">&lt;!ELEMENT genderMinimalPairs ( #PCDATA ) &gt; <br>
&lt;!ATTLIST genderMinimalPairs gender NMTOKEN #REQUIRED &gt;</p>
<p class="dtd"><span class='changed'>&lt;!ELEMENT caseMinimalPairs ( #PCDATA ) &gt;<br>
&lt;!ATTLIST caseMinimalPairs case NMTOKEN #REQUIRED &gt;</span></p>
<p class="dtd"><span class='changed'>&lt;!ELEMENT genderMinimalPairs ( #PCDATA ) &gt; <br>
&lt;!ATTLIST genderMinimalPairs gender NMTOKEN #REQUIRED &gt;</span></p>
<p>Minimal pairs provide examples that justify why multiple

plural or ordinal categories exist<span class='changed'>, 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</span>.</p>
plural or ordinal categories exist<span class='changed'>, 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</span>.</p>
<p class='changed'>Examples</p>
<p class='changed'><code>&lt;minimalPairs&gt;<br>
  &lt;pluralMinimalPairs count=&quot;one&quot;&gt;{0} Tag&lt;/pluralMinimalPairs&gt;<<br>
Expand All @@ -842,9 +843,9 @@ <h3>2.6 <a name="Minimal_Pairs" href="#Minimal_Pairs" id=
  &lt;genderMinimalPairs gender=&quot;neuter&quot;&gt;Das {0} ist …&lt;/genderMinimalPairs&gt;<br>
&lt;/minimalPairs&gt;</code></p>
<br>
<p>For more information, see <a href=
"https://unicode.org/cldr/index/cldr-spec/plural-rules">Plural
Rules</a> <span class='changed'>and <a href="http://cldr.unicode.org/translation/grammatical-inflection">Grammatical Inflection</a></span>.</p>
<p>For more information, see <a href="http://cldr.unicode.org/index/cldr-spec/plural-rules">Plural Rules</a>
<span class='changed'>and
<a href="http://cldr.unicode.org/translation/grammatical-inflection">Grammatical Inflection</a></span>.</p>

<h2><a name="Number_Format_Patterns" href=
"#Number_Format_Patterns" id="Number_Format_Patterns">3 Number
Expand Down
2 changes: 1 addition & 1 deletion docs/ldml/tr35.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h1>Unicode Locale Data Markup Language (LDML)</h1>
</tr>
<tr>
<td>Date</td>
<td class="changed">2020-10-12</td>
<td class="changed">2020-10-18</td>
</tr>
<tr>
<!-- This link must be made live when posting the final version but is disabled during proposed update stage. -->
Expand Down

0 comments on commit d0c64f0

Please sign in to comment.