Merge remote-tracking branch 'upstream/main'

.github/workflows/icu_ci.yml

@@ -530,10 +530,10 @@ jobs:
          - "-DUCONFIG_NO_FORMATTING=1"
          - "-DUCONFIG_NO_TRANSLITERATION=1"
          - "-DUCONFIG_NO_REGULAR_EXPRESSIONS=1"
-         - "-DUCONFIG_NO_SERVICN=1"
+         - "-DUCONFIG_NO_SERVICE=1"
          - "-DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
          # Turn on all the options in one test.
-         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICN=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
+         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICE=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -576,10 +576,10 @@ jobs:
          - "-DUCONFIG_NO_FORMATTING=1"
          - "-DUCONFIG_NO_TRANSLITERATION=1"
          - "-DUCONFIG_NO_REGULAR_EXPRESSIONS=1"
-         - "-DUCONFIG_NO_SERVICN=1"
+         - "-DUCONFIG_NO_SERVICE=1"
          - "-DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
          # Turn on all the options in one test.
-         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICN=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
+         - "-DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_NORMALIZATION=1 -DUCONFIG_NO_BREAK_ITERATION=1 -DUCONFIG_NO_IDNA=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=1 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1 -DUCONFIG_NO_SERVICE=1 -DUCONFIG_NO_FILTERED_BREAK_ITERATION=1"
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -712,7 +712,7 @@ jobs:
           make -j -l2.5 check
   
   # https://unicode-org.github.io/icu/processes/release/tasks/healthy-code.html#test-uconfig_no_conversion
-  icu4c-uconfig-no-version:
+  icu4c-uconfig-no-conversion:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

docs/processes/release/tasks/publish/index.md

@@ -102,23 +102,23 @@ Use the GitHub GUI to create both the "release" and the "tag" at the same time:
 
 <https://github.com/unicode-org/icu/releases/new>
 
-Fill in the tag name, such as "release-63-rc" or "release-63-1", and make the
-target the "maint/maint-xx" branch (such as maint/maint-63).
-
-Set the title to "ICU 63 RC" or "ICU 63.1". Fill in the description using the
+1. Fill in the tag name, such as `release-63-rc` or `release-63-1`, and make the
+target the "maint/maint-xx" branch (such as `maint/maint-63`).
+1. Set the title to `ICU 63 RC` or `ICU 63.1`.
+1. Fill in the description using the
 text from the announcement email. (You can also look at previous releases and
 possibly re-use some of the generic text, such as links to the API docs, etc.)
-
-Your screen should look like this:
-
-![image](maint-63-rc-screenshot.png)
-
-For the release candidate tag, please check the box that says "Pre-Release".
-
-We no longer need to add the note about Git LFS files, as GitHub now includes
-them in the auto-generated .zip downloads.
-
-Click the "Publish Release" button to make the tag.
+1. Your screen should look like this:
+    ![image](maint-63-rc-screenshot.png)
+1. Check the box that says "Set as a pre-release".
+1. Click the "Publish Release" button to make the tag.
+1. Additional step only for the GA release:
+After completing the step above to mark the release as "pre-release",
+the second step is to wait for the day of the official announcement of the release,
+and then to edit the Github release entry's settings.
+    1.  The first Github release settings change should uncheck the "Set as a pre-release" checkbox,
+which has the effect of converting the release into  a regular release.
+    1. The next settings change should check the box that says "Set as the latest release".
 
 Note: The "latest" tag is no longer updated. It was agreed by the ICU-TC to be
 deleted around the 64.2 time-frame, as it doesn't work well with with Git. (You
@@ -127,6 +127,9 @@ repository, they might have something different for the "latest" tag).
 A possible future alternative might be a sym-link folder, or HTTP redirect that
 points to the latest release.
 
+We no longer need to add the note about Git LFS files, as GitHub now includes
+them in the auto-generated .zip downloads.
+
 #### Maintenance release
 
 Create the maintenance release tag from the maintenance branch, as above.

docs/processes/release/tasks/versions.md

@@ -198,19 +198,7 @@ The command requires a version number string that follows the typical Java / Mav
     In other words, the above `versions:set-property` step should be executed at the same time
     `mvn versions:set -DnewVersion=74.0.1-SNAPSHOT` is executed.
 
-4. Update the `api.doc.version` property.
-Edit the root pom file at `icu4j/pom.xml` and manually make this change:
-
-    * Before the RC release, ensure that the property includes the phrase "Release Candidate".
-    ```
-    <api.doc.version>${icu.major.version} Release Candidate</api.doc.version>
-    ```
-    * For the final GA release, ensure that the property only includes the major version number.
-    ```
-    <api.doc.version>${icu.major.version}</api.doc.version>
-    ```
-
-5. Update the following variables in `icu4j/releases_tools/shared.sh`
+4. Update the following variables in `icu4j/releases_tools/shared.sh`
 
     * `artifact_version` - The version used in the Maven `pom.xml` files. You can alternatively produce this value by running `mvn help:evaluate -Dexpression=project.version -q -DforceStdout`.
     * `github_rel_version` - The version used in the name of the GitHub downloadable artifacts. For example "73_2" or "74rc".

docs/userguide/datetime/timezone/index.md

@@ -76,7 +76,7 @@ of classes. This protocol includes:
 
 * A programmatic ID, for example, "America/Los_Angeles". This ID is used to
   call up a specific real-world time zone. It corresponds to the IDs defined
-  in the [IANA Time Zone datbase](https://www.iana.org/time-zones) used by UNIX
+  in the [IANA Time Zone database](https://www.iana.org/time-zones) used by UNIX
   and other systems, and has the format continent/city or ocean/city.
 * A raw offset. This is the difference, in milliseconds, between a time zone's
   standard time and GMT. Positive raw offsets are east of Greenwich.
@@ -245,7 +245,7 @@ sources for general information on building ICU.
 
 ### Update the time zone data for ICU4J
 
-The [ICU4J Time Zone Update Update
+The [ICU4J Time Zone Update 
 Utility](https://icu.unicode.org/download/icutzu) automates the process of
 updating ICU4J jar files with the latest time zone data. Instructions for use
 are [here](https://htmlpreview.github.io/?https://github.com/unicode-org/icu-data/blob/main/tzdata/tzu/readme.html).

icu4c/source/common/localematcher.cpp

@@ -302,7 +302,7 @@ LocaleMatcher LocaleMatcher::Builder::build(UErrorCode &errorCode) const {
 
 namespace {
 
-LSR getMaximalLsrOrUnd(const XLikelySubtags &likelySubtags, const Locale &locale,
+LSR getMaximalLsrOrUnd(const LikelySubtags &likelySubtags, const Locale &locale,
                        UErrorCode &errorCode) {
     if (U_FAILURE(errorCode) || locale.isBogus() || *locale.getName() == 0 /* "und" */) {
         return UND_LSR;
@@ -338,7 +338,7 @@ int32_t LocaleMatcher::putIfAbsent(const LSR &lsr, int32_t i, int32_t suppLength
 }
 
 LocaleMatcher::LocaleMatcher(const Builder &builder, UErrorCode &errorCode) :
-        likelySubtags(*XLikelySubtags::getSingleton(errorCode)),
+        likelySubtags(*LikelySubtags::getSingleton(errorCode)),
         localeDistance(*LocaleDistance::getSingleton(errorCode)),
         thresholdDistance(builder.thresholdDistance_),
         demotionPerDesiredLocale(0),
@@ -551,7 +551,7 @@ LocaleMatcher &LocaleMatcher::operator=(LocaleMatcher &&src) noexcept {
 
 class LocaleLsrIterator {
 public:
-    LocaleLsrIterator(const XLikelySubtags &likelySubtags, Locale::Iterator &locales,
+    LocaleLsrIterator(const LikelySubtags &likelySubtags, Locale::Iterator &locales,
                       ULocMatchLifetime lifetime) :
             likelySubtags(likelySubtags), locales(locales), lifetime(lifetime) {}
 
@@ -596,7 +596,7 @@ class LocaleLsrIterator {
     }
 
 private:
-    const XLikelySubtags &likelySubtags;
+    const LikelySubtags &likelySubtags;
     Locale::Iterator &locales;
     ULocMatchLifetime lifetime;
     const Locale *current = nullptr, *remembered = nullptr;

icu4c/source/common/locdistance.cpp

@@ -59,7 +59,7 @@ UBool U_CALLCONV cleanup() {
 void U_CALLCONV LocaleDistance::initLocaleDistance(UErrorCode &errorCode) {
     // This function is invoked only via umtx_initOnce().
     U_ASSERT(gLocaleDistance == nullptr);
-    const XLikelySubtags &likely = *XLikelySubtags::getSingleton(errorCode);
+    const LikelySubtags &likely = *LikelySubtags::getSingleton(errorCode);
     if (U_FAILURE(errorCode)) { return; }
     const LocaleDistanceData &data = likely.getDistanceData();
     if (data.distanceTrieBytes == nullptr ||
@@ -83,7 +83,7 @@ const LocaleDistance *LocaleDistance::getSingleton(UErrorCode &errorCode) {
     return gLocaleDistance;
 }
 
-LocaleDistance::LocaleDistance(const LocaleDistanceData &data, const XLikelySubtags &likely) :
+LocaleDistance::LocaleDistance(const LocaleDistanceData &data, const LikelySubtags &likely) :
         likelySubtags(likely),
         trie(data.distanceTrieBytes),
         regionToPartitionsIndex(data.regionToPartitions), partitionArrays(data.partitions),
@@ -119,7 +119,7 @@ int32_t LocaleDistance::getBestIndexAndDistance(
     uint64_t desLangState = desLangDistance >= 0 && supportedLSRsLength > 1 ? iter.getState64() : 0;
     // Index of the supported LSR with the lowest distance.
     int32_t bestIndex = -1;
-    // Cached lookup info from XLikelySubtags.compareLikely().
+    // Cached lookup info from LikelySubtags.compareLikely().
     int32_t bestLikelyInfo = -1;
     for (int32_t slIndex = 0; slIndex < supportedLSRsLength; ++slIndex) {
         const LSR &supported = *supportedLSRs[slIndex];

icu4c/source/common/locdistance.h

@@ -83,7 +83,7 @@ class LocaleDistance final : public UMemory {
     // tic constexpr int32_t MAX_INDEX = 0x1fffff;  // avoids sign bit
     static constexpr int32_t INDEX_NEG_1 = 0xfffffc00;
 
-    LocaleDistance(const LocaleDistanceData &data, const XLikelySubtags &likely);
+    LocaleDistance(const LocaleDistanceData &data, const LikelySubtags &likely);
     LocaleDistance(const LocaleDistance &other) = delete;
     LocaleDistance &operator=(const LocaleDistance &other) = delete;
 
@@ -119,7 +119,7 @@ class LocaleDistance final : public UMemory {
         return defaultRegionDistance;
     }
 
-    const XLikelySubtags &likelySubtags;
+    const LikelySubtags &likelySubtags;
 
     // The trie maps each dlang+slang+dscript+sscript+dregion+sregion
     // (encoded in ASCII with bit 7 set on the last character of each subtag) to a distance.

icu4c/source/common/loclikely.cpp

@@ -486,7 +486,7 @@ _uloc_addLikelySubtags(const char* localeID,
 
     CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength);
     {
-        const icu::XLikelySubtags* likelySubtags = icu::XLikelySubtags::getSingleton(*err);
+        const icu::LikelySubtags* likelySubtags = icu::LikelySubtags::getSingleton(*err);
         if(U_FAILURE(*err)) {
             goto error;
         }
@@ -590,7 +590,7 @@ _uloc_minimizeSubtags(const char* localeID,
     CHECK_TRAILING_VARIANT_SIZE(trailing, trailingLength);
 
     {
-        const icu::XLikelySubtags* likelySubtags = icu::XLikelySubtags::getSingleton(*err);
+        const icu::LikelySubtags* likelySubtags = icu::LikelySubtags::getSingleton(*err);
         if(U_FAILURE(*err)) {
             goto error;
         }