From 398489b9154d9ccbcf493b69fff4925d2200e3b1 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 15 Feb 2022 15:07:15 -0800 Subject: [PATCH] ICU-21900 integrate CLDR release-41-alpha2 to ICU main for 71 front-load --- icu4c/source/data/brkitr/ja.txt | 263 ++++++++++++++---- icu4c/source/data/cldr-icu-readme.txt | 109 ++++---- .../data/dtd/cldr/common/dtd/ldmlICU.dtd | 1 + icu4c/source/data/locales/ks_Deva.txt | 6 +- icu4c/source/data/xml/rbnf/be.xml | 2 +- icu4c/source/data/xml/rbnf/bg.xml | 2 +- icu4c/source/data/xml/rbnf/ca.xml | 2 +- icu4c/source/data/xml/rbnf/cy.xml | 2 +- icu4c/source/data/xml/rbnf/da.xml | 2 +- icu4c/source/data/xml/rbnf/de.xml | 2 +- icu4c/source/data/xml/rbnf/en.xml | 2 +- icu4c/source/data/xml/rbnf/fo.xml | 2 +- icu4c/source/data/xml/rbnf/ga.xml | 2 +- icu4c/source/data/xml/rbnf/is.xml | 2 +- icu4c/source/data/xml/rbnf/mk.xml | 2 +- icu4c/source/data/xml/rbnf/mt.xml | 2 +- icu4c/source/data/xml/rbnf/no.xml | 2 +- icu4c/source/data/xml/rbnf/root.xml | 2 +- icu4c/source/data/xml/rbnf/ru.xml | 2 +- icu4c/source/data/xml/rbnf/sr.xml | 2 +- icu4c/source/data/xml/rbnf/uk.xml | 2 +- icu4j/main/shared/data/icudata.jar | 2 +- icu4j/main/shared/data/icutzdata.jar | 2 +- icu4j/main/shared/data/testdata.jar | 2 +- .../cldrtoicu/mapper/BreakIteratorMapper.java | 2 +- 25 files changed, 291 insertions(+), 130 deletions(-) diff --git a/icu4c/source/data/brkitr/ja.txt b/icu4c/source/data/brkitr/ja.txt index 1aa5914283c..27b7021adb7 100644 --- a/icu4c/source/data/brkitr/ja.txt +++ b/icu4c/source/data/brkitr/ja.txt @@ -13,63 +13,210 @@ ja{ line_strict_phrase:process(dependency){"line_phrase_cj.brk"} } extensions{ - // Extensions. - // Entries in cjdict.txt categorized as particles (助詞), auxiliary verbs (助動詞), - // conjugations (活用) and prefix of them. - // These entries are connected to the previous words for phrase based line breaking. - // https://ja.wikipedia.org/wiki/助詞 - // https://ja.wikipedia.org/wiki/助動詞_(国文法) - // https://ja.wikipedia.org/wiki/活用 - かい, かしら, から, きり, くらい, - ぐらい, けれど, けれども, こそ, さえ, - しか, した, ずつ, せる, せん, - たい, たがる, たく, たら, たり, - だけ, だに, だの, だり, つつ, - てる, です, でも, ところが, ところで, - とも, ない, なか, ながら, なく, - なし, なぞ, など, なら, なり, - なんぞ, ねる, ので, のに, のみ, - ばかり, へる, ほど, まい, まう, - まし, ます, まっ, まで, まま, - もん, やら, よう, より, らしい, - られる, れる, ろう, わっ, わな, - わら, わり, わる, われ, わん, - - // Entries added for technical reasons (particle + others). - // Entries in cjdict.txt, which are compound words starting from the above categories - // (i.e. particles, auxiliary verbs and conjunctions). - // These entries are connected to the previous words for phrase based line breaking. - えたい, えて, える, けた, けたい, - ける, させる, そうだ, っきゃ, っきり, - っけ, っす, ったらしい, っちゅう, って, - っていう, ってか, ってな, っと, っぱなし, - っぷり, っぽい, にあう, にあがる, にあたって, - にあたり, にあたりまして, にあたります, にあたる, において, - におきまして, における, にかけ, にかけて, にかけまして, - にたいして, にたいしまして, にたいします, にたいする, について, - につき, につきまして, につけ, につれ, につれて, - にて, にとって, にとり, にとりまして, にまつわります, - にまつわる, にもかかわらず, にゃ, によって, により, - によりまして, によります, による, にわたって, にわたり, - にわたりまして, にわたります, にわたる, に対し, に対して, - に対しまして, に対します, に対する, に当たって, に当たり, - に当たりまして, に当たります, に当たる, に従い, に従いまして, - に従います, に従う, に従って, に関し, に関して, - に関しまして, に関します, に関する, に際し, に際して, - ものの, ろうし, ろうと, われと, をの, - をめぐって, をめぐりまして, をめぐります, をめぐる, をもちまして, - をもって, を以て, を通して, を通しまして, を通じ, - を通じて, を通じまして, んじゃ, んで, - - // Entries added for technical reasons (noun suffix). - // Entries in cjdict.txt, which are suffixes of nouns. - // These entries should be connected to the previous (noun) words. - 々宮, 々家, え目, が丘, が台, - が床, が浜, ヵ国, ヵ年, ヵ所, - ヵ月, ヵ村, ヵ条, ヶ丘, ヶ国, - ヶ島, ヶ年, ヶ所, ヶ月, ヶ村, - ヶ条, ージ, ーズ, ータ, ード, - ーニャ, ープランス, ーユ, ーランド, ーリンズ, - ーン, + "かい", + "かしら", + "から", + "きり", + "くらい", + "ぐらい", + "けれど", + "けれども", + "こそ", + "さえ", + "しか", + "した", + "ずつ", + "せる", + "せん", + "たい", + "たがる", + "たく", + "たら", + "たり", + "だけ", + "だに", + "だの", + "だり", + "つつ", + "てる", + "です", + "でも", + "ところが", + "ところで", + "とも", + "ない", + "なか", + "ながら", + "なく", + "なし", + "なぞ", + "など", + "なら", + "なり", + "なんぞ", + "ねる", + "ので", + "のに", + "のみ", + "ばかり", + "へる", + "ほど", + "まい", + "まう", + "まし", + "ます", + "まっ", + "まで", + "まま", + "もん", + "やら", + "よう", + "より", + "らしい", + "られる", + "れる", + "ろう", + "わっ", + "わな", + "わら", + "わり", + "わる", + "われ", + "わん", + "えたい", + "えて", + "える", + "けた", + "けたい", + "ける", + "させる", + "そうだ", + "っきゃ", + "っきり", + "っけ", + "っす", + "ったらしい", + "っちゅう", + "って", + "っていう", + "ってか", + "ってな", + "っと", + "っぱなし", + "っぷり", + "っぽい", + "にあう", + "にあがる", + "にあたって", + "にあたり", + "にあたりまして", + "にあたります", + "にあたる", + "において", + "におきまして", + "における", + "にかけ", + "にかけて", + "にかけまして", + "にたいして", + "にたいしまして", + "にたいします", + "にたいする", + "について", + "につき", + "につきまして", + "につけ", + "につれ", + "につれて", + "にて", + "にとって", + "にとり", + "にとりまして", + "にまつわります", + "にまつわる", + "にもかかわらず", + "にゃ", + "によって", + "により", + "によりまして", + "によります", + "による", + "にわたって", + "にわたり", + "にわたりまして", + "にわたります", + "にわたる", + "に対し", + "に対して", + "に対しまして", + "に対します", + "に対する", + "に当たって", + "に当たり", + "に当たりまして", + "に当たります", + "に当たる", + "に従い", + "に従いまして", + "に従います", + "に従う", + "に従って", + "に関し", + "に関して", + "に関しまして", + "に関します", + "に関する", + "に際し", + "に際して", + "ものの", + "ろうし", + "ろうと", + "われと", + "をの", + "をめぐって", + "をめぐりまして", + "をめぐります", + "をめぐる", + "をもちまして", + "をもって", + "を以て", + "を通して", + "を通しまして", + "を通じ", + "を通じて", + "を通じまして", + "んじゃ", + "んで", + "々宮", + "々家", + "え目", + "が丘", + "が台", + "が床", + "が浜", + "ヵ国", + "ヵ年", + "ヵ所", + "ヵ月", + "ヵ村", + "ヵ条", + "ヶ丘", + "ヶ国", + "ヶ島", + "ヶ年", + "ヶ所", + "ヶ月", + "ヶ村", + "ヶ条", + "ージ", + "ーズ", + "ータ", + "ード", + "ーニャ", + "ープランス", + "ーユ", + "ーランド", + "ーリンズ", + "ーン", } } diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt index ea54453fc4e..72821872e1c 100644 --- a/icu4c/source/data/cldr-icu-readme.txt +++ b/icu4c/source/data/cldr-icu-readme.txt @@ -138,7 +138,44 @@ export ICU4C_DIR=$HOME/icu-myfork/icu4c export ICU4J_ROOT=$HOME/icu-myfork/icu4j export TOOLS_ROOT=$HOME/icu-myfork/tools -# 2. Build and install the CLDR jar +# 1d. Directory for logs/notes (create if does not exist) + +export NOTES=...(some directory)... +mkdir -p $NOTES + +# 2a. Configure ICU4C, build and test without new data first, to verify that +# there are no pre-existing errors. Here is the runConfigureICU +# code for the platform you are building, e.g. Linux, MacOSX, Cygwin. +# (optionally build with debug enabled) + +cd $ICU4C_DIR/source +./runConfigureICU [--enable-debug] +make clean +make check 2>&1 | tee $NOTES/icu4c-oldData-makeCheck.txt + +# 2b. Now with ICU4J, build and test without new data first, to verify that +# there are no pre-existing errors (or at least to have the pre-existing errors +# as a base for comparison): + +cd $ICU4J_ROOT +ant clean +ant check 2>&1 | tee $NOTES/icu4j-oldData-antCheck.txt + +# 3. Make pre-adjustments as necessary +# 3a. Copy latest relevant CLDR dtds to ICU +cp -p $CLDR_DIR/common/dtd/ldml.dtd $ICU4C_DIR/source/data/dtd/cldr/common/dtd/ +cp -p $CLDR_DIR/common/dtd/ldmlICU.dtd $ICU4C_DIR/source/data/dtd/cldr/common/dtd/ + +# 3b. Update the cldr-icu tooling to use the latest tagged version of ICU +open $TOOLS_ROOT/cldr/cldr-to-icu/pom.xml +# search for icu4j-for-cldr and update to the latest tagged version per instructions + +# 3c. Update the build for any new icu version, added locales, etc. +open $TOOLS_ROOT/cldr/cldr-to-icu/build-icu-data.xml +# update icuVersion, icuDataVersion if necessary +# update lists of locales to include if necessary + +# 4. Build and install the CLDR jar cd $TOOLS_ROOT/cldr ant install-cldr-libs @@ -146,16 +183,7 @@ ant install-cldr-libs See the $TOOLS_ROOT/cldr/lib/README.txt file for more information on the CLDR jar and the install-cldr-jars.sh script. -# 3. Configure ICU4C, build and test without new data first, to verify that -# there are no pre-existing errors. Here is the runConfigureICU -# code for the platform you are building, e.g. Linux, MacOSX, Cygwin. - -cd $ICU4C_DIR/source -./runConfigureICU -make clean -make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt - -# 4a. Generate the CLDR production data. This process uses ant with ICU's +# 5a. Generate the CLDR production data. This process uses ant with ICU's # data/build.xml # # Running "ant cleanprod" is necessary to clean out the production data directory @@ -167,9 +195,9 @@ make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt cd $ICU4C_DIR/source/data ant cleanprod ant setup -ant proddata 2>&1 | tee /tmp/cldr-newData-proddataLog.txt +ant proddata 2>&1 | tee $NOTES/cldr-newData-proddataLog.txt -# 4b. Build the new ICU4C data files; these include .txt files and .py files. +# 5b. Build the new ICU4C data files; these include .txt files and .py files. # These new files will replace whatever was already present in the ICU4C sources. # This process uses the LdmlConverter in $TOOLS_ROOT/cldr/cldr-to-icu/; # see $TOOLS_ROOT/cldr/cldr-to-icu/README.txt @@ -187,21 +215,21 @@ ant proddata 2>&1 | tee /tmp/cldr-newData-proddataLog.txt # build-icu-data.xml file, such as adding new locales etc. cd $TOOLS_ROOT/cldr/cldr-to-icu -ant -f build-icu-data.xml -DcldrDataDir="$CLDR_TMP_DIR/production" | tee /tmp/cldr-newData-builddataLog.txt +ant -f build-icu-data.xml -DcldrDataDir="$CLDR_TMP_DIR/production" | tee $NOTES/cldr-newData-builddataLog.txt -# 4c. Update the CLDR testData files needed by ICU4C and ICU4J tests, ensuring +# 5c. Update the CLDR testData files needed by ICU4C and ICU4J tests, ensuring # they're representative of the newest CLDR data. cd $TOOLS_ROOT/cldr ant copy-cldr-testdata -# 4d. Copy from CLDR common/testData/localeIdentifiers/localeCanonicalization.txt +# 5d. Copy from CLDR common/testData/localeIdentifiers/localeCanonicalization.txt # into icu4c/source/test/testdata/localeCanonicalization.txt # and icu4j/main/tests/core/src/com/ibm/icu/dev/data/unicode/localeCanonicalization.txt # and add the following line to the beginning of these two files # # File copied from cldr common/testData/localeIdentifiers/localeCanonicalization.txt -# 4e. For the time being, manually re-add the lstm entries in data/brkitr/root.txt +# 5e. For the time being, manually re-add the lstm entries in data/brkitr/root.txt open $ICU4C_DIR/source/data/brkitr/root.txt # paste the following block after the dictionaries block and before the final closing '}': @@ -210,43 +238,35 @@ open $ICU4C_DIR/source/data/brkitr/root.txt Mymr{"Burmese_graphclust_model5_heavy.res"} } -# 4f. And the time being (work is in progress to generate the below from CLDR data), -# manually re-add the extensions entries in data/brkitr/ja.txt -open $ICU4C_DIR/source/data/brkitr/ja.txt - -# copy in the extensions data from the current version... - -# and delete any bogus extensions data that ended up in $ICU4C_DIR/source/data/locales/ja.txt - -# 5. Check which data files have modifications, which have been added or removed +# 6. Check which data files have modifications, which have been added or removed # (if there are no changes, you may not need to proceed further). Make sure the # list seems reasonable. -cd $ICU4C_DIR/source/data +cd $ICU4C_DIR/.. git status -# 5a. You may also want to check which files were modified in CLDR production data: +# 6a. You may also want to check which files were modified in CLDR production data: cd $CLDR_TMP_DIR git status -# 6. Fix any errors, investigate any warnings. +# 7. Fix any errors, investigate any warnings. # # Fixing may entail modifying CLDR source data or TOOLS_ROOT config files or # tooling. -# 7. Now rebuild ICU4C with the new data and run make check tests. +# 8. Now rebuild ICU4C with the new data and run make check tests. # Again, keep a log so you can investigate the errors. cd $ICU4C_DIR/source -# 7a. If any files were added or removed (likely), re-run configure: -./runConfigureICU +# 8a. If any files were added or removed (likely), re-run configure: +./runConfigureICU [--enable-debug] make clean -# 7b. Now do the rebuild. -make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.txt +# 8b. Now do the rebuild. +make check 2>&1 | tee $NOTES/icu4c-newData-makeCheck.txt -# 8. Investigate each test case failure. The first run processing new CLDR data +# 9. Investigate each test case failure. The first run processing new CLDR data # from the Survey Tool can result in thousands of failures (in many cases, one # CLDR data fix can resolve hundreds of test failures). If the error is caused # by bad CLDR data, then file a CLDR bug, fix the data, and regenerate from @@ -256,9 +276,9 @@ make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.txt # Note that if the new data has any differences in structure, you will have to # update test/testdata/structLocale.txt or /tsutil/cldrtest/TestLocaleStructure # may fail. -# Repeat steps 4-7 until there are no errors. +# Repeat steps 4-8 until there are no errors. -# 9. You can also run the make check tests in exhaustive mode. As an alternative +# 10. You can also run the make check tests in exhaustive mode. As an alternative # you can run them as part of the pre-merge tests by adding the following as a # comment in the pull request: "/azp run CI-Exhaustive". You should do one or the # other; the exhaustive tests are *not* run automatically on each pull request, @@ -267,17 +287,10 @@ make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.txt cd $ICU4C_DIR/source export INTLTEST_OPTS="-e" export CINTLTST_OPTS="-e" -make check 2>&1 | tee /tmp/icu4c-newData-makeCheckEx.txt +make check 2>&1 | tee $NOTES/icu4c-newData-makeCheckEx.txt -# 10. Again, investigate each failure, fixing CLDR data or ICU test cases as -# appropriate, and repeating steps 4-7 and 9 until there are no errors. - -# 11. Now with ICU4J, build and test without new data first, to verify that -# there are no pre-existing errors (or at least to have the pre-existing errors -# as a base for comparison): - -cd $ICU4J_ROOT -ant check 2>&1 | tee /tmp/icu4j-oldData-antCheck.txt +# 11. Again, investigate each failure, fixing CLDR data or ICU test cases as +# appropriate, and repeating steps 4-8 and 10 until there are no errors. # 12. Transfer the data to ICU4J: cd $ICU4C_DIR/source @@ -298,7 +311,7 @@ make icu4j-data-install # Keep a log so you can investigate the errors. cd $ICU4J_ROOT -ant check 2>&1 | tee /tmp/icu4j-newData-antCheck.txt +ant check 2>&1 | tee $NOTES/icu4j-newData-antCheck.txt # 14. Investigate test case failures; fix test cases and repeat from step 12, # or fix CLDR data and repeat from step 4, as appropriate, until there are no diff --git a/icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd b/icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd index 4bb39cbf9b8..e8abdedcbab 100644 --- a/icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd +++ b/icu4c/source/data/dtd/cldr/common/dtd/ldmlICU.dtd @@ -49,6 +49,7 @@ NOTE: Unlike the other DTDs, this file is manually maintained. + diff --git a/icu4c/source/data/locales/ks_Deva.txt b/icu4c/source/data/locales/ks_Deva.txt index 57291b83ff0..e028020aa12 100644 --- a/icu4c/source/data/locales/ks_Deva.txt +++ b/icu4c/source/data/locales/ks_Deva.txt @@ -5,9 +5,9 @@ ks_Deva{ %%Parent{"root"} AuxExemplarCharacters{"[\u200C\u200D]"} ExemplarCharacters{ - "[\u093C \u0901 अ आ इ ई उ ऊ ए ऑ ओ क ख ग च {च\u093C} छ {छ\u093C} ज ट ठ ड त थ द" - " न प फ ब म य र ल व श स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 \u0947 " - "\u0948 ॉ ो ौ \u094D]" + "[\u093C \u0902 \u0901 अ आ इ ई उ ऊ ए ऑ ओ क ख ग च {च\u093C} छ {छ\u093C} ज ट ठ " + "ड त थ द न प फ ब म य र ल व श स ह ा ि ी \u0941 \u0942 \u0943 \u0944 \u0945 " + "\u0947 \u0948 ॉ ो ौ \u094D]" } ExemplarCharactersNumbers{"[\\- ‑ , . % ‰ + 0 1 2 3 4 5 6 7 8 9]"} ExemplarCharactersPunctuation{ diff --git a/icu4c/source/data/xml/rbnf/be.xml b/icu4c/source/data/xml/rbnf/be.xml index cebab76ba9d..a4a39e3b61e 100644 --- a/icu4c/source/data/xml/rbnf/be.xml +++ b/icu4c/source/data/xml/rbnf/be.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/bg.xml b/icu4c/source/data/xml/rbnf/bg.xml index 93ec1ce8b92..91419a39960 100644 --- a/icu4c/source/data/xml/rbnf/bg.xml +++ b/icu4c/source/data/xml/rbnf/bg.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/ca.xml b/icu4c/source/data/xml/rbnf/ca.xml index b60431de96c..0b748326240 100644 --- a/icu4c/source/data/xml/rbnf/ca.xml +++ b/icu4c/source/data/xml/rbnf/ca.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/cy.xml b/icu4c/source/data/xml/rbnf/cy.xml index 566be99d790..09f3ce40e2b 100644 --- a/icu4c/source/data/xml/rbnf/cy.xml +++ b/icu4c/source/data/xml/rbnf/cy.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/da.xml b/icu4c/source/data/xml/rbnf/da.xml index 1163f171cb3..8a51e6e69fd 100644 --- a/icu4c/source/data/xml/rbnf/da.xml +++ b/icu4c/source/data/xml/rbnf/da.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/de.xml b/icu4c/source/data/xml/rbnf/de.xml index d8fa102b4b9..a2bb9edb641 100644 --- a/icu4c/source/data/xml/rbnf/de.xml +++ b/icu4c/source/data/xml/rbnf/de.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/en.xml b/icu4c/source/data/xml/rbnf/en.xml index 9f87d6fb7a0..12ea49f515d 100644 --- a/icu4c/source/data/xml/rbnf/en.xml +++ b/icu4c/source/data/xml/rbnf/en.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2013-2016 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/fo.xml b/icu4c/source/data/xml/rbnf/fo.xml index 8b7444ac75c..4195430d75d 100644 --- a/icu4c/source/data/xml/rbnf/fo.xml +++ b/icu4c/source/data/xml/rbnf/fo.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/ga.xml b/icu4c/source/data/xml/rbnf/ga.xml index c80ce88c61e..3c08fc61664 100644 --- a/icu4c/source/data/xml/rbnf/ga.xml +++ b/icu4c/source/data/xml/rbnf/ga.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2013-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/is.xml b/icu4c/source/data/xml/rbnf/is.xml index c909e15a60e..ef96ca808eb 100644 --- a/icu4c/source/data/xml/rbnf/is.xml +++ b/icu4c/source/data/xml/rbnf/is.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/mk.xml b/icu4c/source/data/xml/rbnf/mk.xml index f2cba691d61..95fb590862a 100644 --- a/icu4c/source/data/xml/rbnf/mk.xml +++ b/icu4c/source/data/xml/rbnf/mk.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/mt.xml b/icu4c/source/data/xml/rbnf/mt.xml index 6b5941dc700..f74e3cb45c3 100644 --- a/icu4c/source/data/xml/rbnf/mt.xml +++ b/icu4c/source/data/xml/rbnf/mt.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2013-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/no.xml b/icu4c/source/data/xml/rbnf/no.xml index c75950a24c0..b937896a0d0 100644 --- a/icu4c/source/data/xml/rbnf/no.xml +++ b/icu4c/source/data/xml/rbnf/no.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/root.xml b/icu4c/source/data/xml/rbnf/root.xml index 3e9623868af..874f2a0cd53 100644 --- a/icu4c/source/data/xml/rbnf/root.xml +++ b/icu4c/source/data/xml/rbnf/root.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/ru.xml b/icu4c/source/data/xml/rbnf/ru.xml index 0b21d61f85f..f20f36e4435 100644 --- a/icu4c/source/data/xml/rbnf/ru.xml +++ b/icu4c/source/data/xml/rbnf/ru.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/sr.xml b/icu4c/source/data/xml/rbnf/sr.xml index 994acfd99e9..75cf3a2f30e 100644 --- a/icu4c/source/data/xml/rbnf/sr.xml +++ b/icu4c/source/data/xml/rbnf/sr.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4c/source/data/xml/rbnf/uk.xml b/icu4c/source/data/xml/rbnf/uk.xml index aad3a26f1b7..666f53e9c06 100644 --- a/icu4c/source/data/xml/rbnf/uk.xml +++ b/icu4c/source/data/xml/rbnf/uk.xml @@ -4,7 +4,7 @@ License & terms of use: http://www.unicode.org/copyright.html Copyright (c) 2010-2015 International Business Machines Corporation and others. All rights reserved. --> - + diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index d8d175dd794..40740329981 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62f6bb6255440bed5ea35dd659ba59dc4d3034ecfd53fae6790be0fcbc3f9eff +oid sha256:cc20943a393a23436ebb1ffccfdb299519c546a9628f8be13ceacee2789507e0 size 13873153 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 405db7a6c93..2d9b3a455b3 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:379538ae9348bb63b1a4f1c1314f1513acadd72c6b9630af8dc9e4cc0465ea57 +oid sha256:cb858bb84720a72c1382276b53c94454ae959b1cddd3acbf2918cb75277b4320 size 96439 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index f11e00cb726..979530cdb7d 100644 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67aa8c24114eb601f3fa722c490dd07fe236a1205591e6672706e7d93c5e4767 +oid sha256:a8fc1bdc460e1d48141c46baff1ff00e003350b892cca78a89a11152c04e6a1a size 826063 diff --git a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java index d10d1726134..84d5870b011 100644 --- a/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java +++ b/tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/mapper/BreakIteratorMapper.java @@ -82,7 +82,7 @@ public final class BreakIteratorMapper { } private void addSuppression(CldrValue v) { - //System.out.println("addSegmentation: " + v.toString()); // debug + //System.out.println("addSuppression: " + v.toString()); // debug String type = SEGMENTATION_TYPE.valueFrom(v); // TODO: Understand and document why we escape values here, but not for collation data. icuData.add(