Skip to content

Commit 182c71f

Browse files
authored
CLDR-18364 Fix unit spec issues (unicode-org#5074)
1 parent 419c050 commit 182c71f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

docs/ldml/tr35-general.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -954,21 +954,20 @@ per
954954
* [ wfc: The token 'per' is the single value in \<unitIdComponent type="per"\> ]
955955

956956
<a name='product_unit' href='#product_unit'>product_unit</a>
957-
<br/>:= single_unit ("-" single_unit)* ("-" pu_single_unit)*
958-
<br/>   | pu_single_unit ("-" pu_single_unit)*
959-
* [ wfc: No pu\_single\_unit may precede a single unit ]
957+
<br/>:= single_unit ("-" single_unit)*
960958
* *Examples:*
961959
* foot-pound-force
962960

963961
<a name='single_unit' href='#single_unit'>single_unit</a>
964962
<br/>:= dimensionality_prefix? simple_unit
965963
<br/>   | unit_constant
964+
<br/>  | pu_single_unit
966965
* *Examples:*
967966
* square-kilometer
968967
* 100
969968

970969
<a name='pu_single_unit' href='#pu_single_unit'>pu_single_unit</a>
971-
<br/>:= := ("xxx-" | "x-") [a-z0-9]{3,8}
970+
<br/>:= ("xxx-" | "x-") [a-z0-9]{3,8}
972971
* *Examples:*
973972
* square-xxx-knuts (a Harry Potter unit)
974973
* *Notes:*
@@ -1063,9 +1062,12 @@ per
10631062
* The set of suffix components often expands in new releases, so the requirement to be one of these attribute values is a validity constraint, not a well-formedness constraint.
10641063

10651064
<a name='mixed_unit_identifier' href='#mixed_unit_identifier'>mixed_unit_identifier</a>
1066-
<br/>:= (single_unit | pu_single_unit) ("-" and "-" (single_unit | pu_single_unit ))*
1065+
<br/>:= single_unit ("-" and "-" single_unit)*
1066+
* [ wfc: Each part separated by -and- must be convertible to the others.]
1067+
* Note: in the normalized form, each part is smaller than the subsequent one: thus `inch-and-foot` normalizes to `foot-and-inch`.
10671068
* *Examples:*
10681069
* foot-and-inch
1070+
* degree-and-arc-minute-and-arc-second
10691071

10701072
and
10711073
<br/>:= "and"

0 commit comments

Comments
 (0)