ICU-22220 update root collation from CLDR 43

.bazeliskrc

@@ -6,4 +6,4 @@
 # for running Bazel commands while ensuring, through configuration, that only a
 # specific version of Bazel is executed.
 
-USE_BAZEL_VERSION=5.1.1
+USE_BAZEL_VERSION=6.0.0

icu4c/source/data/unidata/UCARules.txt

@@ -1,6 +1,6 @@
 # UCA_Rules_SHORT.txt
-# Date: 2022-08-24, 17:17:42 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-02-01, 17:37:01 GMT
+# © 2023 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 # UCA Version: 15.0.0
@@ -1974,22 +1974,24 @@
  <	 𒿲
  <	 ''
    <<<	 ＇
- <	 ‘
- <	 ’
- <	 ‚
- <	 ‛
+  <<	 ‎׳‎
+    =	 ‘
+    =	 ’
+    =	 ‚
+    =	 ‛
  <	 ‹
  <	 ›
  <	 '"'
    <<<	 ＂
- <	 “
- <	 ”
- <	 „
- <	 ‟
- <	 ⹂
- <	 〝
- <	 〞
- <	 〟
+  <<	 ‎״‎
+    =	 “
+    =	 ”
+    =	 „
+    =	 ‟
+    =	 ⹂
+    =	 〝
+    =	 〞
+    =	 〟
  <	 «
  <	 »
  <	 '('
@@ -2402,8 +2404,6 @@
  <	 ‎׀‎
  <	 ‎׃‎
  <	 ‎׆‎
- <	 ‎׳‎
- <	 ‎״‎
  <	 ‎܊‎
  <	 ‎܋‎
  <	 ‎܌‎

icu4c/source/data/unidata/changes.txt

@@ -38,6 +38,156 @@ and see the change logs below.
 
 ---------------------------------------------------------------------------- ***
 
+CLDR 43 root collation update for ICU 73
+
+Partial update only for the root collation.
+See
+- https://unicode-org.atlassian.net/browse/CLDR-15946
+  Treat quote marks as equivalent when strength=UCOL_PRIMARY
+- https://github.com/unicode-org/cldr/pull/2691
+  CLDR-15946 make fancy quotes primary-equal to ASCII fallbacks
+
+The related changes to tailorings were already integrated in an earlier PR for
+https://unicode-org.atlassian.net/browse/ICU-22220 ICU 73rc BRS.
+
+This update is for the root collation,
+which is handled by different tools than the locale data updates.
+
+* Command-line environment setup
+
+export UNICODE_DATA=~/unidata/uni15/20220830
+export CLDR_SRC=~/cldr/uni/src
+export ICU_ROOT=~/icu/uni
+export ICU_SRC=$ICU_ROOT/src
+export ICUDT=icudt73b
+export ICU4C_DATA_IN=$ICU_SRC/icu4c/source/data/in
+export ICU4C_UNIDATA=$ICU_SRC/icu4c/source/data/unidata
+export LD_LIBRARY_PATH=$ICU_ROOT/dbg/icu4c/lib
+
+*** Configure: Build Unicode data for ICU4J
+  cd $ICU_ROOT/dbg/icu4c
+  ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ../../../doconfig-clang-dbg.sh
+
+* Bazel build process
+
+See https://unicode-org.github.io/icu/processes/unicode-update#bazel-build-process
+for an overview and for setup instructions.
+
+Consider running `bazelisk --version` outside of the $ICU_SRC folder
+to find out the latest `bazel` version, and
+copying that version number into the $ICU_SRC/.bazeliskrc config file.
+(Revert if you find incompatibilities, or, better, update our build & config files.)
+
+* generate data files
+
+- remember to define the environment variables
+  (see the start of the section for this Unicode version)
+- cd $ICU_SRC
+- optional but not necessary:
+    bazelisk clean
+      or even
+    bazelisk clean --expunge
+- build/bootstrap/generate new files:
+    icu4c/source/data/unidata/generate.sh
+
+* collation: CLDR collation root, UCA DUCET
+
+- UCA DUCET goes into Mark's Unicode tools,
+  and a tool-tailored version goes into CLDR, see
+    https://github.com/unicode-org/unicodetools/blob/main/docs/uca/index.md
+
+- update source/data/unidata/FractionalUCA.txt with FractionalUCA_SHORT.txt
+    cp -v $CLDR_SRC/common/uca/FractionalUCA_SHORT.txt $ICU4C_UNIDATA/FractionalUCA.txt
+- update source/data/unidata/UCARules.txt with UCA_Rules_SHORT.txt
+    cp -v $ICU4C_UNIDATA/UCARules.txt /tmp/UCARules-old.txt
+    (note removing the underscore before "Rules")
+    cp -v $CLDR_SRC/common/uca/UCA_Rules_SHORT.txt $ICU4C_UNIDATA/UCARules.txt
+- restore TODO diffs in UCARules.txt
+    meld /tmp/UCARules-old.txt $ICU4C_UNIDATA/UCARules.txt
+- update (ICU4C)/source/test/testdata/CollationTest_*.txt
+  and (ICU4J)/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_*.txt
+  from the CLDR root files (..._CLDR_..._SHORT.txt)
+    cp -v $CLDR_SRC/common/uca/CollationTest_CLDR_NON_IGNORABLE_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt
+    cp -v $CLDR_SRC/common/uca/CollationTest_CLDR_SHIFTED_SHORT.txt $ICU_SRC/icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt
+    cp -v $ICU_SRC/icu4c/source/test/testdata/CollationTest_*.txt $ICU_SRC/icu4j/main/tests/collate/src/com/ibm/icu/dev/data
+- if CLDR common/uca/unihan-index.txt changes, then update
+  CLDR common/collation/root.xml <collation type="private-unihan">
+  and regenerate (or update in parallel) $ICU_SRC/icu4c/source/data/coll/root.txt
+
+- generate data files, as above (generate.sh), now to pick up new collation data
+- rebuild ICU4C (make clean, make check, as usual)
+
+* run & fix ICU4C tests, now with new CLDR collation root data
+- run all tests with the collation test data *_SHORT.txt or the full files
+  (the full ones have comments, useful for debugging)
+- note on intltest: if collate/UCAConformanceTest fails, then
+  utility/MultithreadTest/TestCollators will fail as well;
+  fix the conformance test before looking into the multi-thread test
+
+* update Java data files
+- refresh just the UCD/UCA-related/derived files, just to be safe
+- see (ICU4C)/source/data/icu4j-readme.txt
+- mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
+    NOTE: If you get the error "No rule to make target 'out/build/icudt70l/uprops.icu'",
+    you need to reconfigure with unicore data; see the "configure" line above.
+  output:
+    ...
+    make[1]: Entering directory '/usr/local/google/home/mscherer/icu/uni/dbg/icu4c/data'
+    mkdir -p ./out/icu4j/com/ibm/icu/impl/data/icudt73b
+    mkdir -p ./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt73b
+    LD_LIBRARY_PATH=../lib:../stubdata:../tools/ctestfw:$LD_LIBRARY_PATH  ../bin/icupkg ./out/tmp/icudt73l.dat ./out/icu4j/icudt73b.dat -s ./out/build/icudt73l -x '*' -tb -d ./out/icu4j/com/ibm/icu/impl/data/icudt73b
+    mv ./out/icu4j/"com/ibm/icu/impl/data/icudt73b/zoneinfo64.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt73b/metaZones.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt73b/timezoneTypes.res" ./out/icu4j/"com/ibm/icu/impl/data/icudt73b/windowsZones.res" "./out/icu4j/tzdata/com/ibm/icu/impl/data/icudt73b"
+    jar cf ./out/icu4j/icudata.jar -C ./out/icu4j com/ibm/icu/impl/data/icudt73b/
+    mkdir -p /tmp/icu4j/main/shared/data
+    cp ./out/icu4j/icudata.jar /tmp/icu4j/main/shared/data
+    jar cf ./out/icu4j/icutzdata.jar -C ./out/icu4j/tzdata com/ibm/icu/impl/data/icudt73b/
+    mkdir -p /tmp/icu4j/main/shared/data
+    cp ./out/icu4j/icutzdata.jar /tmp/icu4j/main/shared/data
+    make[1]: Leaving directory '/usr/local/google/home/mscherer/icu/uni/dbg/icu4c/data'
+- copy the big-endian Unicode data files to another location,
+  separate from the other data files,
+  and then refresh ICU4J
+    cd $ICU_ROOT/dbg/icu4c/data/out/icu4j
+    mkdir -p /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
+    cp -v com/ibm/icu/impl/data/$ICUDT/coll/* /tmp/icu4j/com/ibm/icu/impl/data/$ICUDT/coll
+    jar uvf $ICU_SRC/icu4j/main/shared/data/icudata.jar -C /tmp/icu4j com/ibm/icu/impl/data/$ICUDT
+- new for ICU 73: also copy the binary data files directly into the ICU4J tree
+    cp -v com/ibm/icu/impl/data/$ICUDT/coll/* $ICU_SRC/icu4j/maven-build/maven-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/coll
+
+* When refreshing all of ICU4J data from ICU4C
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=/tmp/icu4j icu4j-data-install
+- cp /tmp/icu4j/main/shared/data/icudata.jar $ICU_SRC/icu4j/main/shared/data
+or
+- $ICU_ROOT/dbg/icu4c$ make ICU4J_ROOT=$ICU_SRC/icu4j icu4j-data-install
+
+* refresh Java test .txt files
+- copy new .txt files into ICU4J's main/tests/core/src/com/ibm/icu/dev/data/unicode
+    cd $ICU_SRC/icu4c/source/data/unidata
+    cp -v confusables.txt confusablesWholeScript.txt NormalizationCorrections.txt NormalizationTest.txt SpecialCasing.txt UnicodeData.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+    cd ../../test/testdata
+    cp -v BidiCharacterTest.txt BidiTest.txt IdnaTestV2.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+    cp -v $UNICODE_DATA/ucd/CompositionExclusions.txt $ICU_SRC/icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode
+
+* run & fix ICU4J tests
+
+*** merge the Unicode update branch back onto the main branch
+- do not merge the icudata.jar and testdata.jar,
+  instead rebuild them from merged & tested ICU4C
+- if there is a merge conflict in icudata.jar, here is one way to deal with it:
+  +   remove icudata.jar from the commit so that rebasing is trivial
+  + ~/icu/uni/src$ git restore --source=main icu4j/main/shared/data/icudata.jar
+  + ~/icu/uni/src$ git commit -a --amend
+  +   switch to main, pull updates, switch back to the dev branch
+  + ~/icu/uni/src$ git rebase main
+  +   rebuild icudata.jar
+  + ~/icu/uni/src$ git commit -a --amend
+  + ~/icu/uni/src$ git push -f
+- make sure that changes to Unicode tools are checked in:
+  https://github.com/unicode-org/unicodetools
+
+---------------------------------------------------------------------------- ***
+
 Unicode 15.0 update for ICU 72
 
 https://www.unicode.org/versions/Unicode15.0.0/

icu4c/source/test/testdata/CollationTest_NON_IGNORABLE_SHORT.txt

@@ -1,6 +1,6 @@
 # CollationTest_CLDR_NON_IGNORABLE_SHORT.txt
-# Date: 2022-08-24, 17:17:50 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-02-01, 17:37:08 GMT
+# © 2023 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 # UCA Version: 15.0.0
@@ -6400,33 +6400,38 @@ A95F 0062
 12FF2 0062
 0027 0021
 FF07 0021
+05F3 0021
+2018 0021
+2019 0021
+201A 0021
+201B 0021
 0027 003F
 FF07 003F
+05F3 003F
+2018 003F
+2019 003F
+201A 003F
+201B 003F
 0027 0061
 0027 0041
 FF07 0061
 FF07 0041
+05F3 0061
+2018 0061
+2019 0061
+201A 0061
+201B 0061
+05F3 0041
+2018 0041
+2019 0041
+201A 0041
+201B 0041
 0027 0062
 FF07 0062
-2018 0021
-2018 003F
-2018 0061
-2018 0041
+05F3 0062
 2018 0062
-2019 0021
-2019 003F
-2019 0061
-2019 0041
 2019 0062
-201A 0021
-201A 003F
-201A 0061
-201A 0041
 201A 0062
-201B 0021
-201B 003F
-201B 0061
-201B 0041
 201B 0062
 2039 0021
 2039 003F
@@ -6440,53 +6445,58 @@ FF07 0062
 203A 0062
 0022 0021
 FF02 0021
+05F4 0021
+201C 0021
+201D 0021
+201E 0021
+201F 0021
+2E42 0021
+301D 0021
+301E 0021
+301F 0021
 0022 003F
 FF02 003F
+05F4 003F
+201C 003F
+201D 003F
+201E 003F
+201F 003F
+2E42 003F
+301D 003F
+301E 003F
+301F 003F
 0022 0061
 0022 0041
 FF02 0061
 FF02 0041
+05F4 0061
+201C 0061
+201D 0061
+201E 0061
+201F 0061
+2E42 0061
+301D 0061
+301E 0061
+301F 0061
+05F4 0041
+201C 0041
+201D 0041
+201E 0041
+201F 0041
+2E42 0041
+301D 0041
+301E 0041
+301F 0041
 0022 0062
 FF02 0062
-201C 0021
-201C 003F
-201C 0061
-201C 0041
+05F4 0062
 201C 0062
-201D 0021
-201D 003F
-201D 0061
-201D 0041
 201D 0062
-201E 0021
-201E 003F
-201E 0061
-201E 0041
 201E 0062
-201F 0021
-201F 003F
-201F 0061
-201F 0041
 201F 0062
-2E42 0021
-2E42 003F
-2E42 0061
-2E42 0041
 2E42 0062
-301D 0021
-301D 003F
-301D 0061
-301D 0041
 301D 0062
-301E 0021
-301E 003F
-301E 0061
-301E 0041
 301E 0062
-301F 0021
-301F 003F
-301F 0061
-301F 0041
 301F 0062
 00AB 0021
 00AB 003F
@@ -8558,16 +8568,6 @@ A67E 0062
 05C6 0061
 05C6 0041
 05C6 0062
-05F3 0021
-05F3 003F
-05F3 0061
-05F3 0041
-05F3 0062
-05F4 0021
-05F4 003F
-05F4 0061
-05F4 0041
-05F4 0062
 070A 0021
 070A 003F
 070A 0061
@@ -178020,6 +178020,26 @@ F8FF 003F
 F8FF 0061
 F8FF 0041
 F8FF 0062
+FDD0 0021
+FDD0 003F
+FDD0 0061
+FDD0 0041
+FDD0 0062
+FDD1 0021
+FDD1 003F
+FDD1 0061
+FDD1 0041
+FDD1 0062
+FDD2 0021
+FDD2 003F
+FDD2 0061
+FDD2 0041
+FDD2 0062
+FDD3 0021
+FDD3 003F
+FDD3 0061
+FDD3 0041
+FDD3 0062
 FFF0 0021
 FFF0 003F
 FFF0 0061

icu4c/source/test/testdata/CollationTest_SHIFTED_SHORT.txt

@@ -1,6 +1,6 @@
 # CollationTest_CLDR_SHIFTED_SHORT.txt
-# Date: 2022-08-24, 17:17:52 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-02-01, 17:37:10 GMT
+# © 2023 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 # UCA Version: 15.0.0
@@ -2751,41 +2751,45 @@ A95F 003F
 12FF2 0021
 12FF2 003F
 0027 0021
+05F3 0021
+2018 0021
+2019 0021
+201A 0021
+201B 0021
 FF07 0021
 0027 003F
-FF07 003F
-2018 0021
+05F3 003F
 2018 003F
-2019 0021
 2019 003F
-201A 0021
 201A 003F
-201B 0021
 201B 003F
+FF07 003F
 2039 0021
 2039 003F
 203A 0021
 203A 003F
 0022 0021
+05F4 0021
+201C 0021
+201D 0021
+201E 0021
+201F 0021
+2E42 0021
+301D 0021
+301E 0021
+301F 0021
 FF02 0021
 0022 003F
-FF02 003F
-201C 0021
+05F4 003F
 201C 003F
-201D 0021
 201D 003F
-201E 0021
 201E 003F
-201F 0021
 201F 003F
-2E42 0021
 2E42 003F
-301D 0021
 301D 003F
-301E 0021
 301E 003F
-301F 0021
 301F 003F
+FF02 003F
 00AB 0021
 00AB 003F
 00BB 0021
@@ -3316,10 +3320,6 @@ A67E 003F
 05C3 003F
 05C6 0021
 05C6 003F
-05F3 0021
-05F3 003F
-05F4 0021
-05F4 003F
 070A 0021
 070A 003F
 070B 0021
@@ -55428,15 +55428,16 @@ A95F 0061
 12FF1 0061
 12FF2 0061
 0027 0061
-FF07 0061
+05F3 0061
 2018 0061
 2019 0061
 201A 0061
 201B 0061
+FF07 0061
 2039 0061
 203A 0061
 0022 0061
-FF02 0061
+05F4 0061
 201C 0061
 201D 0061
 201E 0061
@@ -55445,6 +55446,7 @@ FF02 0061
 301D 0061
 301E 0061
 301F 0061
+FF02 0061
 00AB 0061
 00BB 0061
 0028 0061
@@ -55710,8 +55712,6 @@ A67E 0061
 05C0 0061
 05C3 0061
 05C6 0061
-05F3 0061
-05F4 0061
 070A 0061
 070B 0061
 070C 0061
@@ -57288,15 +57288,16 @@ A95F 0041
 12FF1 0041
 12FF2 0041
 0027 0041
-FF07 0041
+05F3 0041
 2018 0041
 2019 0041
 201A 0041
 201B 0041
+FF07 0041
 2039 0041
 203A 0041
 0022 0041
-FF02 0041
+05F4 0041
 201C 0041
 201D 0041
 201E 0041
@@ -57305,6 +57306,7 @@ FF02 0041
 301D 0041
 301E 0041
 301F 0041
+FF02 0041
 00AB 0041
 00BB 0041
 0028 0041
@@ -57570,8 +57572,6 @@ A67E 0041
 05C0 0041
 05C3 0041
 05C6 0041
-05F3 0041
-05F4 0041
 070A 0041
 070B 0041
 070C 0041
@@ -61424,15 +61424,16 @@ A95F 0062
 12FF1 0062
 12FF2 0062
 0027 0062
-FF07 0062
+05F3 0062
 2018 0062
 2019 0062
 201A 0062
 201B 0062
+FF07 0062
 2039 0062
 203A 0062
 0022 0062
-FF02 0062
+05F4 0062
 201C 0062
 201D 0062
 201E 0062
@@ -61441,6 +61442,7 @@ FF02 0062
 301D 0062
 301E 0062
 301F 0062
+FF02 0062
 00AB 0062
 00BB 0062
 0028 0062
@@ -61706,8 +61708,6 @@ A67E 0062
 05C0 0062
 05C3 0062
 05C6 0062
-05F3 0062
-05F4 0062
 070A 0062
 070B 0062
 070C 0062
@@ -193990,6 +193990,26 @@ F8FF 003F
 F8FF 0061
 F8FF 0041
 F8FF 0062
+FDD0 0021
+FDD0 003F
+FDD0 0061
+FDD0 0041
+FDD0 0062
+FDD1 0021
+FDD1 003F
+FDD1 0061
+FDD1 0041
+FDD1 0062
+FDD2 0021
+FDD2 003F
+FDD2 0061
+FDD2 0041
+FDD2 0062
+FDD3 0021
+FDD3 003F
+FDD3 0061
+FDD3 0041
+FDD3 0062
 FFF0 0021
 FFF0 003F
 FFF0 0061

icu4j/main/shared/data/icudata.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f759e045c7d82e5ea2b20f5d12f088d2c9f4992003a73bdbbf4f05eff8586ed7
-size 14443822
+oid sha256:7e6aa8e8cc25a060613780facbbad7ef231f17751f9e74adc72ca14949bf1783
+size 14443049

icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_NON_IGNORABLE_SHORT.txt

@@ -1,6 +1,6 @@
 # CollationTest_CLDR_NON_IGNORABLE_SHORT.txt
-# Date: 2022-08-24, 17:17:50 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-02-01, 17:37:08 GMT
+# © 2023 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 # UCA Version: 15.0.0
@@ -6400,33 +6400,38 @@ A95F 0062
 12FF2 0062
 0027 0021
 FF07 0021
+05F3 0021
+2018 0021
+2019 0021
+201A 0021
+201B 0021
 0027 003F
 FF07 003F
+05F3 003F
+2018 003F
+2019 003F
+201A 003F
+201B 003F
 0027 0061
 0027 0041
 FF07 0061
 FF07 0041
+05F3 0061
+2018 0061
+2019 0061
+201A 0061
+201B 0061
+05F3 0041
+2018 0041
+2019 0041
+201A 0041
+201B 0041
 0027 0062
 FF07 0062
-2018 0021
-2018 003F
-2018 0061
-2018 0041
+05F3 0062
 2018 0062
-2019 0021
-2019 003F
-2019 0061
-2019 0041
 2019 0062
-201A 0021
-201A 003F
-201A 0061
-201A 0041
 201A 0062
-201B 0021
-201B 003F
-201B 0061
-201B 0041
 201B 0062
 2039 0021
 2039 003F
@@ -6440,53 +6445,58 @@ FF07 0062
 203A 0062
 0022 0021
 FF02 0021
+05F4 0021
+201C 0021
+201D 0021
+201E 0021
+201F 0021
+2E42 0021
+301D 0021
+301E 0021
+301F 0021
 0022 003F
 FF02 003F
+05F4 003F
+201C 003F
+201D 003F
+201E 003F
+201F 003F
+2E42 003F
+301D 003F
+301E 003F
+301F 003F
 0022 0061
 0022 0041
 FF02 0061
 FF02 0041
+05F4 0061
+201C 0061
+201D 0061
+201E 0061
+201F 0061
+2E42 0061
+301D 0061
+301E 0061
+301F 0061
+05F4 0041
+201C 0041
+201D 0041
+201E 0041
+201F 0041
+2E42 0041
+301D 0041
+301E 0041
+301F 0041
 0022 0062
 FF02 0062
-201C 0021
-201C 003F
-201C 0061
-201C 0041
+05F4 0062
 201C 0062
-201D 0021
-201D 003F
-201D 0061
-201D 0041
 201D 0062
-201E 0021
-201E 003F
-201E 0061
-201E 0041
 201E 0062
-201F 0021
-201F 003F
-201F 0061
-201F 0041
 201F 0062
-2E42 0021
-2E42 003F
-2E42 0061
-2E42 0041
 2E42 0062
-301D 0021
-301D 003F
-301D 0061
-301D 0041
 301D 0062
-301E 0021
-301E 003F
-301E 0061
-301E 0041
 301E 0062
-301F 0021
-301F 003F
-301F 0061
-301F 0041
 301F 0062
 00AB 0021
 00AB 003F
@@ -8558,16 +8568,6 @@ A67E 0062
 05C6 0061
 05C6 0041
 05C6 0062
-05F3 0021
-05F3 003F
-05F3 0061
-05F3 0041
-05F3 0062
-05F4 0021
-05F4 003F
-05F4 0061
-05F4 0041
-05F4 0062
 070A 0021
 070A 003F
 070A 0061
@@ -178020,6 +178020,26 @@ F8FF 003F
 F8FF 0061
 F8FF 0041
 F8FF 0062
+FDD0 0021
+FDD0 003F
+FDD0 0061
+FDD0 0041
+FDD0 0062
+FDD1 0021
+FDD1 003F
+FDD1 0061
+FDD1 0041
+FDD1 0062
+FDD2 0021
+FDD2 003F
+FDD2 0061
+FDD2 0041
+FDD2 0062
+FDD3 0021
+FDD3 003F
+FDD3 0061
+FDD3 0041
+FDD3 0062
 FFF0 0021
 FFF0 003F
 FFF0 0061

icu4j/main/tests/collate/src/com/ibm/icu/dev/data/CollationTest_SHIFTED_SHORT.txt

@@ -1,6 +1,6 @@
 # CollationTest_CLDR_SHIFTED_SHORT.txt
-# Date: 2022-08-24, 17:17:52 GMT
-# © 2022 Unicode®, Inc.
+# Date: 2023-02-01, 17:37:10 GMT
+# © 2023 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html
 # UCA Version: 15.0.0
@@ -2751,41 +2751,45 @@ A95F 003F
 12FF2 0021
 12FF2 003F
 0027 0021
+05F3 0021
+2018 0021
+2019 0021
+201A 0021
+201B 0021
 FF07 0021
 0027 003F
-FF07 003F
-2018 0021
+05F3 003F
 2018 003F
-2019 0021
 2019 003F
-201A 0021
 201A 003F
-201B 0021
 201B 003F
+FF07 003F
 2039 0021
 2039 003F
 203A 0021
 203A 003F
 0022 0021
+05F4 0021
+201C 0021
+201D 0021
+201E 0021
+201F 0021
+2E42 0021
+301D 0021
+301E 0021
+301F 0021
 FF02 0021
 0022 003F
-FF02 003F
-201C 0021
+05F4 003F
 201C 003F
-201D 0021
 201D 003F
-201E 0021
 201E 003F
-201F 0021
 201F 003F
-2E42 0021
 2E42 003F
-301D 0021
 301D 003F
-301E 0021
 301E 003F
-301F 0021
 301F 003F
+FF02 003F
 00AB 0021
 00AB 003F
 00BB 0021
@@ -3316,10 +3320,6 @@ A67E 003F
 05C3 003F
 05C6 0021
 05C6 003F
-05F3 0021
-05F3 003F
-05F4 0021
-05F4 003F
 070A 0021
 070A 003F
 070B 0021
@@ -55428,15 +55428,16 @@ A95F 0061
 12FF1 0061
 12FF2 0061
 0027 0061
-FF07 0061
+05F3 0061
 2018 0061
 2019 0061
 201A 0061
 201B 0061
+FF07 0061
 2039 0061
 203A 0061
 0022 0061
-FF02 0061
+05F4 0061
 201C 0061
 201D 0061
 201E 0061
@@ -55445,6 +55446,7 @@ FF02 0061
 301D 0061
 301E 0061
 301F 0061
+FF02 0061
 00AB 0061
 00BB 0061
 0028 0061
@@ -55710,8 +55712,6 @@ A67E 0061
 05C0 0061
 05C3 0061
 05C6 0061
-05F3 0061
-05F4 0061
 070A 0061
 070B 0061
 070C 0061
@@ -57288,15 +57288,16 @@ A95F 0041
 12FF1 0041
 12FF2 0041
 0027 0041
-FF07 0041
+05F3 0041
 2018 0041
 2019 0041
 201A 0041
 201B 0041
+FF07 0041
 2039 0041
 203A 0041
 0022 0041
-FF02 0041
+05F4 0041
 201C 0041
 201D 0041
 201E 0041
@@ -57305,6 +57306,7 @@ FF02 0041
 301D 0041
 301E 0041
 301F 0041
+FF02 0041
 00AB 0041
 00BB 0041
 0028 0041
@@ -57570,8 +57572,6 @@ A67E 0041
 05C0 0041
 05C3 0041
 05C6 0041
-05F3 0041
-05F4 0041
 070A 0041
 070B 0041
 070C 0041
@@ -61424,15 +61424,16 @@ A95F 0062
 12FF1 0062
 12FF2 0062
 0027 0062
-FF07 0062
+05F3 0062
 2018 0062
 2019 0062
 201A 0062
 201B 0062
+FF07 0062
 2039 0062
 203A 0062
 0022 0062
-FF02 0062
+05F4 0062
 201C 0062
 201D 0062
 201E 0062
@@ -61441,6 +61442,7 @@ FF02 0062
 301D 0062
 301E 0062
 301F 0062
+FF02 0062
 00AB 0062
 00BB 0062
 0028 0062
@@ -61706,8 +61708,6 @@ A67E 0062
 05C0 0062
 05C3 0062
 05C6 0062
-05F3 0062
-05F4 0062
 070A 0062
 070B 0062
 070C 0062
@@ -193990,6 +193990,26 @@ F8FF 003F
 F8FF 0061
 F8FF 0041
 F8FF 0062
+FDD0 0021
+FDD0 003F
+FDD0 0061
+FDD0 0041
+FDD0 0062
+FDD1 0021
+FDD1 003F
+FDD1 0061
+FDD1 0041
+FDD1 0062
+FDD2 0021
+FDD2 003F
+FDD2 0061
+FDD2 0041
+FDD2 0062
+FDD3 0021
+FDD3 003F
+FDD3 0061
+FDD3 0041
+FDD3 0062
 FFF0 0021
 FFF0 003F
 FFF0 0061