Skip to content

Commit

Permalink
CLDR-13591 Finalize spec for release (remove yellow etc) (unicode-org…
Browse files Browse the repository at this point in the history 
…#437)
  • Loading branch information
@pedberg-icu
pedberg-icu committed Apr 22, 2020
1 parent 9ee658c commit e884ebb
Show file tree
Hide file tree
Showing 7 changed files with 128 additions and 403 deletions.
14 changes: 7 additions & 7 deletions docs/ldml/tr35-collation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@
</tr>
</table>
<div class="body">
<h2 style="text-align: center"><span class="changed">Proposed Update </span>Unicode Technical Standard #35</h2>
<h2 style="text-align: center">Unicode Technical Standard #35</h2>
<h1>Unicode Locale Data Markup Language (LDML)<br>
Part 5: Collation</h1>
<!-- At least the first row of this header table should be identical across the parts of this UTS. -->
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
<td class="changed">37</td>
<td>37</td>
</tr>
<tr>
<td>Editors</td>
Expand All @@ -113,7 +113,7 @@ <h3><i>Summary</i></h3>
above.</p>
<h3><i>Status</i></h3>

<!-- NOT YET APPROVED -->
<!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
Expand All @@ -123,14 +123,14 @@ <h3><i>Status</i></h3>
progress.
</i>
</p>
<!-- END NOT YET APPROVED -->
<!-- APPROVED
END NOT YET APPROVED -->
<!-- APPROVED -->
<p><i>This document has been reviewed by Unicode members and
other interested parties, and has been approved for publication
by the Unicode Consortium. This is a stable document and may be
used as reference material or cited as a normative reference by
other specifications.</i></p>
END APPROVED -->
<!-- END APPROVED -->

<blockquote>
<p><i><b>A Unicode Technical Standard (UTS)</b> is an
Expand Down Expand Up @@ -2989,7 +2989,7 @@ <h4>3.16.2 <a name="CJK_Index_Markers" href=
followed by 劃 (U+5283). For example, the stroke order boundary
string "\uFDD0\u2805" yields the label string "5劃".</p>
<hr>
<p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
<p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
Expand Down
14 changes: 7 additions & 7 deletions docs/ldml/tr35-dates.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@
</tr>
</table>
<div class="body">
<h2 style="text-align: center"><span class="changed">Proposed Update </span>Unicode Technical Standard #35</h2>
<h2 style="text-align: center">Unicode Technical Standard #35</h2>
<h1>Unicode Locale Data Markup Language (LDML)<br>
Part 4: Dates</h1>
<!-- At least the first row of this header table should be identical across the parts of this UTS. -->
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
<td class="changed">37</td>
<td>37</td>
</tr>
<tr>
<td>Editors</td>
Expand All @@ -112,7 +112,7 @@ <h3><i>Summary</i></h3>
"tr35.html">main LDML document</a> and the links above.</p>
<h3><i>Status</i></h3>

<!-- NOT YET APPROVED -->
<!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
Expand All @@ -122,14 +122,14 @@ <h3><i>Status</i></h3>
progress.
</i>
</p>
<!-- END NOT YET APPROVED -->
<!-- APPROVED
END NOT YET APPROVED -->
<!-- APPROVED -->
<p><i>This document has been reviewed by Unicode members and
other interested parties, and has been approved for publication
by the Unicode Consortium. This is a stable document and may be
used as reference material or cited as a normative reference by
other specifications.</i></p>
END APPROVED -->
<!-- END APPROVED -->

<blockquote>
<p><i><b>A Unicode Technical Standard (UTS)</b> is an
Expand Down Expand Up @@ -4695,7 +4695,7 @@ <h2>9 <a name="Parsing_Dates_Times" href="#Parsing_Dates_Times"
</li>
</ul>
<hr>
<p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
<p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
Expand Down
100 changes: 48 additions & 52 deletions docs/ldml/tr35-general.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@
</tr>
</table>
<div class="body">
<h2 style="text-align: center"><span class="changed">Proposed Update </span>Unicode Technical Standard #35</h2>
<h2 style="text-align: center">Unicode Technical Standard #35</h2>
<h1>Unicode Locale Data Markup Language (LDML)<br>
Part 2: General</h1>
<!-- At least the first row of this header table should be identical across the parts of this UTS. -->
<table border="1" cellpadding="2" cellspacing="0" class="wide">
<tr>
<td>Version</td>
<td class="changed">37</td>
<td>37</td>
</tr>
<tr>
<td>Editors</td>
Expand All @@ -113,7 +113,7 @@ <h3><i>Summary</i></h3>
and the links above.</p>
<h3><i>Status</i></h3>

<!-- NOT YET APPROVED -->
<!-- NOT YET APPROVED
<p>
<i class="changed">This is a<b><font color="#ff3333">
draft </font></b>document which may be updated, replaced, or superseded by
Expand All @@ -123,14 +123,14 @@ <h3><i>Status</i></h3>
progress.
</i>
</p>
<!-- END NOT YET APPROVED -->
<!-- APPROVED
END NOT YET APPROVED -->
<!-- APPROVED -->
<p><i>This document has been reviewed by Unicode members and
other interested parties, and has been approved for publication
by the Unicode Consortium. This is a stable document and may be
used as reference material or cited as a normative reference by
other specifications.</i></p>
END APPROVED -->
<!-- END APPROVED -->

<blockquote>
<p><i><b>A Unicode Technical Standard (UTS)</b> is an
Expand Down Expand Up @@ -212,16 +212,14 @@ <h2><a name="Contents" href="#Contents" id="Contents">Contents
</li>
<li>6 <a href="#Unit_Elements">Unit Elements</a>
<ul class="toc">
<li class='changed'>6.1 <a href="#Unit_Preference_and_Conversion">Unit Preference and Conversion Data</a></li>
<li class='changed'>6.2 <a href="#Unit_Identifiers">Unit Identifiers</a></li>
<li class='changed'>6.3 <a href="#Example_Units">Example Units</a></li>
<li> 6.<span class='changed'>4</span> <a href="#perUnitPatterns">per Unit
patterns</a></li>
<li>6.<span class='changed'>5</span> <a href="#Unit_Sequences">Unit Sequences</a></li>
<li>6.<span class='changed'>6</span> <a href="#durationUnit">durationUnit</a></li>
<li>6.<span class='changed'>7</span> <a href="#coordinateUnit">coordinateUnit</a></li>
<li>6.<span class='changed'>8</span> <a href=
"#Territory_Based_Unit_Preferences">Territory-Based Unit
<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.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
Preferences</a></li>
</ul>
</li>
Expand Down Expand Up @@ -295,7 +293,7 @@ <h2><a name="Contents" href="#Contents" id="Contents">Contents
Names</a></li>
</ul>
</li>
<li class='changed'>15 <a href="#Grammatical_Features">Grammatical Features</a>
<li>15 <a href="#Grammatical_Features">Grammatical Features</a>
<ul class="toc">
<li>15.1<a href="#Gender" >Gender</a></li>
<li>15.2<a href="#Case">Case</a></li>
Expand Down Expand Up @@ -1371,7 +1369,7 @@ <h2>6 <a name="Unit_Elements" href="#Unit_Elements" id=
<a href="tr35-numbers.html#Explicit_0_1_rules">Explicit 0 and 1
rules</a>.</p>

<p class="changed">The &lt;unitPattern&gt; elements may be used to format
<p>The &lt;unitPattern&gt; elements may be used to format
quantities with decimal values; in such cases the choice of plural form will
depend not only on the numeric value, but also on its formatting (see
<a href="tr35-numbers.html#Language_Plural_Rules">Language Plural Rules</a>).
Expand All @@ -1380,7 +1378,7 @@ <h2>6 <a name="Unit_Elements" href="#Unit_Elements" id=
for such usages, the developing <a href="#Grammatical_Features">Grammatical Features</a>
information will be very useful.</p>

<p class="changed">Note that for certain plural cases, the unit pattern may not
<p>Note that for certain plural cases, the unit pattern may not
provide for inclusion of a numeric value—that is, it may not include “{0}”. This
is especially true for the explicit cases “0” and “1” (which may have patterns like
“zero seconds”). In certain languages such as Arabic and Hebrew, this may also be
Expand All @@ -1405,7 +1403,6 @@ <h2>6 <a name="Unit_Elements" href="#Unit_Elements" id=
<td style="color: silver">enter the vacation length</td>
</tr>
</table><br>
<div class='changed'>
<h3>6.1 <a name="Unit_Preference_and_Conversion" href="#Unit_Preference_and_Conversion">Unit Preference and Conversion Data</a> </h3>


Expand Down Expand Up @@ -1699,7 +1696,6 @@ <h4>Syntax</h4>


<h3>6.3 <a name="Example_Units" href="#Example_Units">Example Units</a></h3>
</div>
<p>The
following table contains examples of types and units currently
defined by CLDR. The units in CLDR are not
Expand Down Expand Up @@ -2450,7 +2446,7 @@ <h3>6.3 <a name="Example_Units" href="#Example_Units">Example Units</a></h3>
example, in "zh", references to a person being 3 days old or 30
years old would use the forms “他3天大” and “他30岁”
respectively.</p>
<h3>6.<span class='changed'>4</span> <a name="perUnitPatterns" href="#perUnitPatterns" id=
<h3>6.4 <a name="perUnitPatterns" href="#perUnitPatterns" id=
"perUnitPatterns">per Unit patterns</a><a name=
"compoundUnitPattern" href="#compoundUnitPattern" id=
"compoundUnitPattern"></a></h3>
Expand Down Expand Up @@ -2515,20 +2511,20 @@ <h3>6.<span class='changed'>4</span> <a name="perUnitPatterns" href="#perUnitPat
appropriate unit length should be used (with fallbacks if
necessary).</p>

<h3>6.<span class='changed'>5</span> <a name="Unit_Sequences" href="#Unit_Sequences" id=
"Unit_Sequences">Unit Sequences<span class='changed'> (Mixed Units)</span></a></h3>
<p>Units may be used in composed sequences <span class='changed'>(aka <em>mixed units</em>)</span>, such as <strong>5°
<h3>6.5 <a name="Unit_Sequences" href="#Unit_Sequences" id=
"Unit_Sequences">Unit Sequences (Mixed Units)</a></h3>
<p>Units may be used in composed sequences (aka <em>mixed units</em>), such as <strong>5°
30′</strong> for 5 degrees 30 minutes, or <strong>3 ft 2
in.</strong> For that purpose, the appropriate width of the unit
listPattern can be used to compose the units in a sequence.</p>
<pre>&lt;listPattern type="unit"&gt; (for the long form)
&lt;listPattern type="unit-narrow"&gt;
&lt;listPattern type="unit-short"&gt;
</pre>
<p class="changed">In such a sequence, decimal fractions are typically only displayed for
<p>In such a sequence, decimal fractions are typically only displayed for
the last element of the sequence, if at all.</p>

<h3>6.<span class='changed'>6</span> <a name="durationUnit" href="#durationUnit" id=
<h3>6.6 <a name="durationUnit" href="#durationUnit" id=
"durationUnit">durationUnit</a></h3>
<p>The durationUnit is a special type of unit used for composed
time unit durations.</p>
Expand All @@ -2539,7 +2535,7 @@ <h3>6.<span class='changed'>6</span> <a name="durationUnit" href="#durationUnit"
'm' for minutes, and 's' for sections. These are the same
symbols used in availableFormats, except that there is no need
to distinguish different forms of the hour.</p>
<h3>6.<span class='changed'>7</span> <a name="coordinateUnit" href="#coordinateUnit" id=
<h3>6.7 <a name="coordinateUnit" href="#coordinateUnit" id=
"coordinateUnit">coordinateUnit</a></h3>
<p>The <strong>coordinateUnitPattern</strong> is a special type
of pattern used for composing degrees of latitude and
Expand All @@ -2561,7 +2557,7 @@ <h3>6.<span class='changed'>7</span> <a name="coordinateUnit" href="#coordinateU
type="south"&gt;{0}S&lt;/coordinateUnitPattern&gt;<br>
&lt;coordinateUnitPattern
type="west"&gt;{0}W&lt;/coordinateUnitPattern&gt;</p>
<h3>6.<span class='changed'>8</span> <a name="Territory_Based_Unit_Preferences" href=
<h3>6.8 <a name="Territory_Based_Unit_Preferences" href=
"#Territory_Based_Unit_Preferences" id=
"Territory_Based_Unit_Preferences">Territory-Based Unit
Preferences</a></h3>
Expand All @@ -2581,24 +2577,28 @@ <h3>6.<span class='changed'>8</span> <a name="Territory_Based_Unit_Preferences"
the scale of the measurement (e.g measuring the height of an
adult versus that of an infant).</p>

<h3>6.<span class='changed'>9</span> <a name="Private_Use_Units" href="#Private_Use_Units"
id="Private_Use_Units">Private-Use Units</a></h3>
<div class='changed'>
<p>
CLDR has reserved the "xxx-" prefix in the simple_unit part of the unit identifier BNF for private-use units. CLDR will never define a type, simple unit, or compound unit such that the unit identifier starts with "xxx-", ends with "-xxx", or contains "-xxx-".
</p>
<p>
For example, if you wanted to define your own unit "foo", you could use the simple unit "xxx-foo".
</p>
<p>
It is valid to construct compound units containing one or more private-use simple units. For example, "xxx-foo-per-second" and "xxx-foo-per-xxx-bar" are both valid core unit identifiers for compound units.
</p>
<p>
As explained earlier, CLDR defines all associations between types and units. It is therefore not possible to construct a valid long unit identifier containing a private-use unit; only core unit identifiers are possible.
</p>
<p>
The older syntax used “x-”, which was expanded to “xxx-” to simplify use with BCP47 syntax. That should be converted to “xxx-”.</p>
</div>
<h3>6.9 <a name="Private_Use_Units" href="#Private_Use_Units"
id="Private_Use_Units">Private-Use Units</a></h3>
<p>
CLDR has reserved the "xxx-" prefix in the simple_unit part of the unit identifier BNF
for private-use units. CLDR will never define a type, simple unit, or compound unit
such that the unit identifier starts with "xxx-", ends with "-xxx", or contains "-xxx-".
</p>
<p>
For example, if you wanted to define your own unit "foo", you could use the simple unit "xxx-foo".
</p>
<p>
It is valid to construct compound units containing one or more private-use simple units.
For example, "xxx-foo-per-second" and "xxx-foo-per-xxx-bar" are both valid core unit
identifiers for compound units.
</p>
<p>
As explained earlier, CLDR defines all associations between types and units. It is
therefore not possible to construct a valid long unit identifier containing a private-use
unit; only core unit identifiers are possible.
</p>
<p>The older syntax used “x-”, which was expanded to “xxx-” to simplify use with BCP47
syntax. That should be converted to “xxx-”.</p>
<h2>7 <a name="POSIX_Elements" href="#POSIX_Elements" id=
"POSIX_Elements">POSIX Elements</a></h2>
<p class="dtd">&lt;!ELEMENT posix (alias | (messages*,
Expand Down Expand Up @@ -3909,7 +3909,6 @@ <h2>11 <a name="ListPatterns" href="#ListPatterns" id=
</ol>
<p>Thus a list (a,b,c,...m, n) is formatted as:
<code>start(a,middle(b,middle(c,middle(...end(m, n))...)))</code></p>
<div class='changed'>
<p>More sophisticated implementations can customize the process to improve the results for languages where context is important. For example:</p>
<table>
<tr>
Expand Down Expand Up @@ -3984,7 +3983,6 @@ <h2>11 <a name="ListPatterns" href="#ListPatterns" id=
<td colspan="2">See <a href="https://hebrew-academy.org.il/topic/hahlatot/punctuation/#target-3475">https://hebrew-academy.org.il/topic/hahlatot/punctuation/#target-3475</a></td>
</tr>
</table><br>
</div>
<p>The following type attributes are in use:</p>
<table border="1" cellpadding="2" cellspacing="0" class=
'simple'>
Expand Down Expand Up @@ -5016,7 +5014,6 @@ <h3>14.3 <a name="Typographic_Names" href="#Typographic_Names"
<li>Concatenate the strings, with a separator between
them.</li>
</ol>
<div class='changed'>
<h2>15 <a name="Grammatical_Features" href="#Grammatical_Features"
id="Grammatical_Features">Grammatical Features</a></h2>

Expand Down Expand Up @@ -5339,10 +5336,9 @@ <h4>Values</h4>
<td>&nbsp;</td>
</tr>
</table>
</div>

<hr>
<p class="copyright">Copyright © 2001–2019 Unicode, Inc. All
<p class="copyright">Copyright © 2001–2020 Unicode, Inc. All
Rights Reserved. The Unicode Consortium makes no expressed or
implied warranty of any kind, and assumes no liability for
errors or omissions. No liability is assumed for incidental and
Expand Down
Loading

0 comments on commit e884ebb

Please sign in to comment.