CLDR-19031 Add c12, c24 to hour cycle identifier list (#5103)

Co-authored-by: Mark Davis <[email protected]>

Author: sffc

common/bcp47/calendar.xml

@@ -45,6 +45,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			<type name="h23" description="Hour system using 0–23; 'H' in patterns" since="28" />
 			<type name="h11" description="Hour system using 0–11; 'K' in patterns" since="28" />
 			<type name="h24" description="Hour system using 1–24; 'k' in patterns" since="28" />
+			<type name="c12" description="Best 12-hour cycle for locale (h11 or h12)" since="48" deprecated="true" /> <!-- Technical Preview -->
+			<type name="c24" description="Best 24-hour cycle for locale (h23 or h24)" since="48" deprecated="true" /> <!-- Technical Preview -->
 		</key>
     </keyword>
 </ldmlBCP47>

docs/ldml/tr35-dates.md

@@ -1259,7 +1259,7 @@ The calculation of the first day of the week depends on various fields in a loca
 
 This element is for data that indicates, for various regions, the preferred time cycle in the region, as well as all time cycles that are considered acceptable in the region. The defaults are those specified for region 001.
 
-There is a single `preferred` value, and multiple `allowed` values. The meanings of the values H, h, K, k, b and B are defined in [Date Field Symbol Table](#Date_Field_Symbol_Table). The `allowed` values are in preference order, and are used with the 'C' hour skeleton pattern symbol.
+There is a single `preferred` value, and multiple `allowed` values. The meanings of the values H, h, K, k, b and B are defined in [Date Field Symbol Table](#Date_Field_Symbol_Table). The `allowed` values are in preference order; they are used with the 'C' hour skeleton pattern symbol and the `c12` and `c24` values for the [Unicode Hour Cycle Identifier](tr35.md#UnicodeHourCycleIdentifier).
 
 For example, in the following, RU (Russia) is marked as using only 24 hour time, and in particular the 24 hour time that goes from 0..23 (H), rather than from 1..24 (k).
 
@@ -2650,8 +2650,10 @@ The choices are:
 3. **H12:** Display hours numbered from 1 through 12 (the most common 12-hour clock)
 4. **H23:** Display hours numbered from 0 through 23 (the most common 24-hour clock)
 5. **H24:** Display hours numbered from 1 through 24
+6. **Clock12:** Display hours using a 12-hour clock preferred by the locale
+7. **Clock24:** Display hours using a 24-hour clock preferred by the locale
 
-Typically, locales will display a day period on H11 and H12, but the day period could be any of those allowed by CLDR, such as AM/PM (field "a"), noon/midnight (field "b"), or flexible day periods such as "in the afternoon" (field "B"). The choice could depend on locale, length, and calendar system.
+Typically, locales will display a day period on H11, H12, and Clock12, but the day period could be any of those allowed by CLDR, such as AM/PM (field "a"), noon/midnight (field "b"), or flexible day periods such as "in the afternoon" (field "B"). The choice could depend on locale, length, and calendar system.
 
 Note: An option could be added in the future to give the developer more control over how day periods are displayed or to disable day periods when there is sufficient context.
 
@@ -2715,23 +2717,23 @@ The following table contains the basic mapping from a semantic field to a standa
 - Standalone: whether the specified field is the only field in the semantic skeleton. "N/A" means to use the same standard field for both standalone and non-standalone.
 - Option: for Time, this is the [hour cycle](#Semantic_Skeleton_Hour_Cycle), and for Zone, this is the [time zone style](#Semantic_Skeleton_Time_Zone_Style).
 
-| Semantic Field | Standalone? | Option   | Long   | Medium | Short  |
-|----------------|-------------|----------|--------|--------|--------|
-| Year           | N/A         | N/A      | \*     | \*     | \*     |
-| Month          | No          | N/A      | \*     | \*     | \*     |
-| Month          | Yes         | N/A      | LLLL   | LLL    | L      |
-| Day            | N/A         | N/A      | \*     | \*     | \*     |
-| Weekday        | No          | N/A      | EEEE   | EEE    | EEE    |
-| Weekday        | Yes         | N/A      | EEEE   | EEE    | EEEEE  |
-| Time           | N/A         | unset    | C      | C      | C      |
-| Time           | N/A         | H11, H12 | h      | h      | h      |
-| Time           | N/A         | H23, H24 | H      | H      | H      |
-| Zone           | No          | Generic  | v      | v      | v      |
-| Zone           | Yes         | Generic  | vvvv   | vvvv   | v      |
-| Zone           | No          | Specific | z      | z      | z      |
-| Zone           | Yes         | Specific | zzzz   | zzzz   | z      |
-| Zone           | N/A         | Location | VVVV   | VVVV   | VVVV   |
-| Zone           | N/A         | Offset   | O      | O      | O      |
+| Semantic Field | Standalone? | Option            | Long   | Medium | Short  |
+|----------------|-------------|-------------------|--------|--------|--------|
+| Year           | N/A         | N/A               | \*     | \*     | \*     |
+| Month          | No          | N/A               | \*     | \*     | \*     |
+| Month          | Yes         | N/A               | LLLL   | LLL    | L      |
+| Day            | N/A         | N/A               | \*     | \*     | \*     |
+| Weekday        | No          | N/A               | EEEE   | EEE    | EEE    |
+| Weekday        | Yes         | N/A               | EEEE   | EEE    | EEEEE  |
+| Time           | N/A         | unset             | C      | C      | C      |
+| Time           | N/A         | H11, H12, Clock12 | h      | h      | h      |
+| Time           | N/A         | H23, H24, Clock24 | H      | H      | H      |
+| Zone           | No          | Generic           | v      | v      | v      |
+| Zone           | Yes         | Generic           | vvvv   | vvvv   | v      |
+| Zone           | No          | Specific          | z      | z      | z      |
+| Zone           | Yes         | Specific          | zzzz   | zzzz   | z      |
+| Zone           | N/A         | Location          | VVVV   | VVVV   | VVVV   |
+| Zone           | N/A         | Offset            | O      | O      | O      |
 
 \* Lengths for Year, Month, and Day are taken from the [datetimeSkeleton](#dateFormats) in the Long, Medium, and Short variants. The era field, if present, should be included with the Year. For example, in en-US, CLDR 46, the datetimeSkeletons are:
 

docs/ldml/tr35.md

@@ -1094,8 +1094,8 @@ The BCP 47 form for keys and types is the canonical form, and recommended. Other
 	The valid values are those <i>name</i> attribute values in the <i>type</i> elements of
         key name="hc" in bcp47/<a href="https://github.com/unicode-org/cldr/blob/main/common/bcp47/calendar.xml" target="_blank">calendar.xml</a></b>.
         </td></tr>
-<tr><td rowspan="4"><code>hc</code></td>
-    <td rowspan="4">Hour cycle</td>
+<tr><td rowspan="6"><code>hc</code></td>
+    <td rowspan="6">Hour cycle</td>
             <td><code>h12</code></td>
             <td>Hour system using 1–12; corresponds to 'h' in patterns</td></tr>
         <tr><td><code>h23</code></td>
@@ -1104,6 +1104,10 @@ The BCP 47 form for keys and types is the canonical form, and recommended. Other
             <td>Hour system using 0–11; corresponds to 'K' in patterns</td></tr>
         <tr><td><code>h24</code></td>
             <td>Hour system using 1–24; corresponds to 'k' in pattern</td></tr>
+        <tr><td><code>c12</code></td>
+            <td><b>Technical Preview:</b> Locale-preferred 12-hour cycle; resolves to either <tt>h11</tt> or <tt>h12</tt>. First, select the supplemental time data <tt>hours</tt> element according to the <a href="#RegionOverride">Region Override</a>; if that keyword is not present, use the <a href="#unicode_region_subtag">Unicode Region Subtag</a>; if neither is present, or if the region does not have an entry in supplemental time data, use the region 001. Then, iterate through the <tt>allowed</tt> list of hour cycle symbols in preference order. If there is an entry with symbol <tt>K</tt> before an entry with symbol <tt>h</tt>, use <tt>h11</tt>; otherwise, use <tt>h12</tt>.</td></tr>
+        <tr><td><code>c24</code></td>
+            <td><b>Technical Preview:</b> Locale-preferred 24-hour cycle; resolves to either <tt>h23</tt> or <tt>h24</tt>. First, select the supplemental time data <tt>hours</tt> element as above. Then, iterate through the <tt>allowed</tt> list of hour cycle symbols in preference order. If there is an entry with symbol <tt>k</tt> before an entry with symbol <tt>H</tt>, use <tt>h24</tt>; otherwise, use <tt>h23</tt>.</td></tr>
 
 <tr><td colspan="4"><b>A <a name="UnicodeLineBreakStyleIdentifier" id="UnicodeLineBreakStyleIdentifier" href="#UnicodeLineBreakStyleIdentifier">Unicode Line Break Style Identifier</a>
         defines a preferred line break style corresponding to the CSS level 3 <a href="https://drafts.csswg.org/css-text/#line-break-property">line-break option</a>.

docs/site/downloads/cldr-48.md

@@ -164,6 +164,7 @@ The definition was unclear, and prone to misunderstanding — the more detailed
 #### ldmlBCP47
 - `type` — adds a new attribute `region`.
 - `keyboard3@conformsTo` — is updated to allow "48".
+- `hc` — adds values `c12` and `c24` as Technical Preview. Also see the note about `h24` in "V49 advance warnings". ([CLDR-18894][])
 
 ### BCP47 Data Changes
 
@@ -332,6 +333,7 @@ For web pages with different views of CLDR data, see [http://cldr.unicode.org/in
 [CLDR-18219]: https://unicode-org.atlassian.net/browse/CLDR-18219
 [CLDR-18275]: https://unicode-org.atlassian.net/browse/CLDR-18275
 [CLDR-18311]: https://unicode-org.atlassian.net/browse/CLDR-18311
+[CLDR-18894]: https://unicode-org.atlassian.net/browse/CLDR-18894
 [CLDR-18956]: https://unicode-org.atlassian.net/browse/CLDR-18956
 
 [Delta DTDs]: https://unicode.org/cldr/charts/48/supplemental/dtd_deltas.html

tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestLocale.java

@@ -983,11 +983,17 @@ public void testLanguageTagParserIsValid() {
                                 "tz",
                                 "aqams|aukns|caffs|camtr|canpg|capnt|cathu|cayzf|cnckg|cnhrb|cnkhg|gaza|mncoq|mxstis|uaozh|uauzh|umjon|usnavajo|est5edt|cst6cdt|mst7mdt|pst8pdt"));
 
+        Map<R2<String, String>, String> deprecatedMap = SUPPLEMENTAL_DATA_INFO.getBcp47Deprecated();
+
         for (Entry<String, String> entry :
                 SUPPLEMENTAL_DATA_INFO.getBcp47Extension2Keys().entrySet()) {
             String extension = entry.getKey();
             String key = entry.getValue();
+
             for (String value : SUPPLEMENTAL_DATA_INFO.getBcp47Keys().get(key)) {
+                if ("true".equals(deprecatedMap.get(Row.of(key, value)))) {
+                    continue;
+                }
                 String expected = "";
                 switch (value) {
                     case "PRIVATE_USE": // x0, valueType="any"