Skip to content

Commit

Permalink
CLDR-13658 Fix final spec issues (unicode-org#425)
Browse files Browse the repository at this point in the history
  • Loading branch information
macchiati authored Apr 13, 2020
1 parent 5ab00e6 commit 8c5209a
Show file tree
Hide file tree
Showing 9 changed files with 283 additions and 43 deletions.
4 changes: 2 additions & 2 deletions docs/ldml/tr35-collation.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
"https://www.unicode.org/reports/reports.css" type="text/css">
"../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Collation</title>
<style type="text/css">
<!--
Expand Down Expand Up @@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
"[Unicode]" src="https://unicode.org/webscripts/logo60s2.gif"
"[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>&nbsp;
<a class="bar" href=
Expand Down
4 changes: 2 additions & 2 deletions docs/ldml/tr35-dates.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
"https://www.unicode.org/reports/reports.css" type="text/css">
"../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Dates</title>
<style type="text/css">
<!--
Expand Down Expand Up @@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
"[Unicode]" src="https://unicode.org/webscripts/logo60s2.gif"
"[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>&nbsp;
<a class="bar" href=
Expand Down
65 changes: 39 additions & 26 deletions docs/ldml/tr35-general.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
"https://www.unicode.org/reports/reports.css" type="text/css">
"../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: General</title>
<style type="text/css">
<!--
Expand Down Expand Up @@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
"[Unicode]" src="https://unicode.org/webscripts/logo60s2.gif"
"[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>&nbsp;
<a class="bar" href=
Expand Down Expand Up @@ -1560,9 +1560,18 @@ <h4>Syntax</h4>
</td>
<td>:=
</td>
<td>product_unit ("-per-" product_unit)* <ul>
<td>product_unit ("-per-" product_unit)*<br>| &quot;per-&quot; product_unit (&quot;-per-&quot; product_unit)*
<ul>

<li><em>Example: foot-per-second-per-second</em></li></ul>
<li><em>Examples:</em>
<ul>
<li>foot-per-second-per-second</li>
<li>per-second</li>
</ul>
<li><em>Note: </em>The normalized form will have only one &quot;per&quot;</li>

</li>
</ul>

</td>
</tr>
Expand All @@ -1587,8 +1596,8 @@ <h4>Syntax</h4>
<p>
| pu_single_unit ("-" pu_single_unit)*<ul>

<li><em>Example: foot-pound-force</em>
<li><em>No pu_single_unit may precede a single unit</em></li></ul>
<li><em>Example: </em>foot-pound-force
<li><em>Constraint:</em> No pu_single_unit may precede a single unit</li></ul>

</td>
</tr>
Expand All @@ -1599,7 +1608,7 @@ <h4>Syntax</h4>
</td>
<td>(dimensionality_prefix)? prefixed_unit<ul>

<li><em>Example: square-meter</em></li></ul>
<li><em>Example: </em>square-meter</li></ul>

</td>
</tr>
Expand All @@ -1610,8 +1619,8 @@ <h4>Syntax</h4>
</td>
<td>“xxx-” single-unit | “x-” single-unit<ul>

<li><em>Example: xxx-square-knuts (a Harry Potter unit)</em>
<li><em>“x-” is only for backwards compatibility</em>
<li><em>Example: </em>xxx-square-knuts (a Harry Potter unit)
<li><em>Note: </em>“x-” is only for backwards compatibility
<li>See Section 6.6 <a href="#Private_Use_Units">Private-Use Units</a>
</ul></td>
</tr>
Expand All @@ -1626,7 +1635,7 @@ <h4>Syntax</h4>
<p>
| "pow" ([2-9]|1[0-5]) "-"<ul>

<li><em>"pow2-" and "pow3-" canonicalize to "square-" and "cubic-"</em></li></ul>
<li><em>Note: </em>"pow2-" and "pow3-" canonicalize to "square-" and "cubic-"</li></ul>

</td>
</tr>
Expand All @@ -1637,7 +1646,7 @@ <h4>Syntax</h4>
</td>
<td>(si_prefix)? simple_unit<ul>

<li><em>Example: kilometer</em></li></ul>
<li><em>Example: </em>kilometer</li></ul>

</td>
</tr>
Expand All @@ -1648,7 +1657,7 @@ <h4>Syntax</h4>
</td>
<td>"deka" | "hecto" | "kilo", … <ul>

<li>See full list at <a href="https://www.nist.gov/pml/special-publication-811">NIST special publication 811</a></li></ul>
<li><em>Note: </em>See full list at <a href="https://www.nist.gov/pml/special-publication-811">NIST special publication 811</a></li></ul>

</td>
</tr>
Expand All @@ -1661,13 +1670,17 @@ <h4>Syntax</h4>
<p>
| “em” | “g” | “us” | “hg” | “of”<ul>

<li>At least one unit_component must not itself be a simple_unit
<li>3 simple units are grandfathered in, where a component wouldn’t be a unit_component (eg for “<strong>g</strong>-force”) <ul>

<li><em>We will likely deprecate those and add conformant aliases in the future.</em>
<li><em>“hg” and “of” are already only in deprecated simple_units.</em>
<li><em>Example: gallon-imperial</em></li></ul>
</li></ul>
<li><em>Example: </em>gallon-imperial</li>
<li><em>Constraint: </em>At least one unit_component must not itself be a simple_unit
<li><em>Note: </em>3 simple units are grandfathered in, where a component wouldn’t be a unit_component (eg for “<strong>g</strong>-force”)

<ul>

<li>We will likely deprecate those and add conformant aliases in the future.
<li>“hg” and “of” are already only in deprecated simple_units.
</ul>
</li>
</ul>

</td>
</tr>
Expand All @@ -1678,9 +1691,10 @@ <h4>Syntax</h4>
</td>
<td>[a-z]{3,∞} | “1” “0”{2,3}<ul>

<li>Cannot be "per", "and", "square", "cubic", "xxx", or "x"; or start with an SI prefix.
<li>While the syntax allows any number of letters greater than 3, the unit_components need to be distinct if truncated to 8 letters. This allows for possible future support of units in Unicode Locale Identifiers.
<li><em>Example: foot</em></li></ul>
<li><em>Constraints: </em>
<ul><li>Cannot be "per", "and", "square", "cubic", "xxx", or "x"; or start with an SI prefix.</li>
<li>While the syntax allows any number of letters greater than 3, the unit_components need to be distinct if truncated to 8 letters. This allows for possible future support of units in Unicode Locale Identifiers.</li></ul>
<li><em>Example: </em>foot</li></ul>

</td>
</tr>
Expand Down Expand Up @@ -5092,7 +5106,7 @@ <h4>Values</h4>
<tr>
<td>personal
</td>
<td>In an animate/inanimate gender system and in some language, gender that specifies the masculine gender of animate entities
<td>In an animate/inanimate gender system in some languages, gender that specifies the masculine gender of animate entities
</td>
<td>adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a> <a href="http://linguistics-ontology.org/gold/2010/HumanGender">linguistics-ontology.org/gold/2010/HumanGender</a>
</td>
Expand Down Expand Up @@ -5124,7 +5138,7 @@ <h4>Values</h4>
<tr>
<td>neuter
</td>
<td>In a masculine/feminine/neuter gender system, gender that generally denotes object.
<td>In a masculine/feminine/neuter or common-neuter gender system, gender that generally denotes an object.
</td>
<td>adapted from: <a href="https://en.wikipedia.org/wiki/Grammatical_gender">wikipedia.org/wiki/Grammatical_gender</a> <a href="http://linguistics-ontology.org/gold/2010/NeuterGender">linguistics-ontology.org/gold/2010/NeuterGender</a>
</td>
Expand Down Expand Up @@ -5325,8 +5339,7 @@ <h4>Values</h4>
</td>
<td>Noun without any definiteness marking in some specific construction (specific to Danish)
</td>
<td>TBD Add reference, example
</td>
<td>&nbsp;</td>
</tr>
</table>
</div>
Expand Down
6 changes: 3 additions & 3 deletions docs/ldml/tr35-info.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
"https://www.unicode.org/reports/reports.css" type="text/css">
"../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Supplemental</title>
<style type="text/css">
<!--
Expand Down Expand Up @@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
"[Unicode]" src="https://unicode.org/webscripts/logo60s2.gif"
"[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>&nbsp;
<a class="bar" href=
Expand Down Expand Up @@ -2158,7 +2158,7 @@ <h3><a href="#Unit_Identifier_Normalization" name="Unit_Identifier_Normalization
<ul>
<li>meter-square-kilogram => square-kilogram-meter
</li>
<li>meter-square-gram ⇒ gram-meter
<li>meter-square-gram ⇒ square-gram-meter
</li>
</ul>
</li>
Expand Down
4 changes: 2 additions & 2 deletions docs/ldml/tr35-keyboards.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
"https://www.unicode.org/reports/reports.css" type="text/css">
"../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Keyboards</title>
<style type="text/css">
<!--
Expand Down Expand Up @@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
"[Unicode]" src="https://unicode.org/webscripts/logo60s2.gif"
"[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>&nbsp;
<a class="bar" href=
Expand Down
4 changes: 2 additions & 2 deletions docs/ldml/tr35-numbers.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
"https://www.unicode.org/reports/reports.css" type="text/css">
"../reports.css" type="text/css">
<title>UTS #35: Unicode LDML: Numbers</title>
<style type="text/css">
<!--
Expand Down Expand Up @@ -71,7 +71,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
"[Unicode]" src="https://unicode.org/webscripts/logo60s2.gif"
"[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>&nbsp;
<a class="bar" href=
Expand Down
10 changes: 4 additions & 6 deletions docs/ldml/tr35.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"text/html; charset=utf-8">
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" href=
"https://unicode.org/reports/reports.css" type="text/css">
"../reports.css" type="text/css">
<title>UTS #35: Unicode Locale Data Markup Language</title>
<style type="text/css">
<!--
Expand Down Expand Up @@ -76,7 +76,7 @@
<table class="header" width="100%">
<tr>
<td class="icon"><a href="http://unicode.org"><img alt=
"[Unicode]" src="https://unicode.org/webscripts/logo60s2.gif"
"[Unicode]" src="../logo60s2.gif"
width="34" height="33" style=
"vertical-align: middle; border-left-width: 0px; border-bottom-width: 0px; border-right-width: 0px; border-top-width: 0px;"></a>&nbsp;
<a class="bar" href=
Expand Down Expand Up @@ -8934,10 +8934,8 @@ <h2><a name="References" href="#References" id=
Division Home Page<br>
<a href="http://tf.nist.gov/">http://tf.nist.gov/<br></a>
U.S. Naval Observatory: What is Universal Time?<br>
<a href=
"http://aa.usno.navy.mil/faq/docs/UT.php">http://aa.usno.navy.mil/faq/docs/UT.php</a>
<span class="reviewnote">Review Note: This link appears to be no longer
valid.</span></td>
<a class='changed' href=
"https://www.usno.navy.mil/USNO/time/master-clock/systems-of-time">https://www.usno.navy.mil/USNO/time/master-clock/systems-of-time</a></td>
</tr>
<tr>
<td class="noborder" width="148">[<a name="WindowsCulture"
Expand Down
Binary file added docs/logo60s2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8c5209a

Please sign in to comment.