@@ -954,21 +954,20 @@ per
954
954
* [ wfc: The token 'per' is the single value in \< unitIdComponent type="per"\> ]
955
955
956
956
<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)*
960
958
* * Examples:*
961
959
* foot-pound-force
962
960
963
961
<a name =' single_unit ' href =' #single_unit ' >single_unit</a >
964
962
<br />:= dimensionality_prefix? simple_unit
965
963
<br /> | unit_constant
964
+ <br /> | pu_single_unit
966
965
* * Examples:*
967
966
* square-kilometer
968
967
* 100
969
968
970
969
<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}
972
971
* * Examples:*
973
972
* square-xxx-knuts (a Harry Potter unit)
974
973
* * Notes:*
@@ -1063,9 +1062,12 @@ per
1063
1062
* 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.
1064
1063
1065
1064
<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 ` .
1067
1068
* * Examples:*
1068
1069
* foot-and-inch
1070
+ * degree-and-arc-minute-and-arc-second
1069
1071
1070
1072
and
1071
1073
<br />:= "and"
0 commit comments