diff --git a/.ci-builds/.azure-pipelines.yml b/.ci-builds/.azure-pipelines.yml index 8904c997e39..811b531365a 100644 --- a/.ci-builds/.azure-pipelines.yml +++ b/.ci-builds/.azure-pipelines.yml @@ -604,8 +604,8 @@ jobs: mkdir -p icu4c/source/icuexportdata_uprops_full/fast mkdir -p icu4c/source/icuexportdata_uprops_full/small cd icu4c/source - LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --destdir icuexportdata_uprops_full/fast --trie-type fast --all - LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --destdir icuexportdata_uprops_full/small --trie-type small --all + LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --verbose --destdir icuexportdata_uprops_full/fast --trie-type fast --all + LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --verbose --destdir icuexportdata_uprops_full/small --trie-type small --all displayName: 'Build Unicode property data export file (Full)' # In the sample file, include: # - Basic binary properties: AHex WSpace @@ -616,8 +616,8 @@ jobs: mkdir -p icu4c/source/icuexportdata_uprops_sample/fast mkdir -p icu4c/source/icuexportdata_uprops_sample/small cd icu4c/source - LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --destdir icuexportdata_uprops_sample/fast --trie-type fast AHex gc nt Basic_Emoji sc WSpace blank - LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --destdir icuexportdata_uprops_sample/small --trie-type small AHex gc nt Basic_Emoji sc WSpace blank + LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --verbose --destdir icuexportdata_uprops_sample/fast --trie-type fast AHex gc nt Basic_Emoji sc WSpace blank + LD_LIBRARY_PATH=lib ./bin/icuexportdata --mode uprops --index --copyright --verbose --destdir icuexportdata_uprops_sample/small --trie-type small AHex gc nt Basic_Emoji sc WSpace blank displayName: 'Build Unicode property data export file (Sample)' - task: PublishBuildArtifacts@1 displayName: 'Publish Artifact: icuexportdata_uprops_full' diff --git a/docs/userguide/collation/customization/index.md b/docs/userguide/collation/customization/index.md index afc3ef05b08..549c772b766 100644 --- a/docs/userguide/collation/customization/index.md +++ b/docs/userguide/collation/customization/index.md @@ -232,7 +232,7 @@ It has been replaced by the maxVariable option. - `[normalization on]` Turns on or off the UCOL_NORMALIZATION_MODE attribute. -If set to on, a quick check and neccessary normalization will be performed. +If set to on, a quick check and necessary normalization will be performed. #### strength - `[strength 1]` diff --git a/docs/userguide/dev/codingguidelines.md b/docs/userguide/dev/codingguidelines.md index 8e5ab753d78..39a055fa6ea 100644 --- a/docs/userguide/dev/codingguidelines.md +++ b/docs/userguide/dev/codingguidelines.md @@ -540,7 +540,7 @@ u_formatMessage(...); ``` > :point_right: **Note**: The `U_CAPI`/`U_DEPRECATED` and `U_EXPORT2` qualifiers -> are required for both the declaration and the definiton of *exported C and +> are required for both the declaration and the definition of *exported C and > static C++ functions*. Use `U_CAPI` (or `U_DEPRECATED`) before and `U_EXPORT2` > after the return type of *exported C and static C++ functions*. > diff --git a/docs/userguide/icu/design.md b/docs/userguide/icu/design.md index 092ee9a16c3..d4b6c9da3e1 100644 --- a/docs/userguide/icu/design.md +++ b/docs/userguide/icu/design.md @@ -694,7 +694,7 @@ In ICU4J 3.4.2 and earlier, `@draft` APIs were also marked with Java's `@depreca tag, so that uses of draft APIs in client code would be flagged by the compiler. These uses of the `@deprecated` tag were indicated with the comment “This is a draft API and might change in a future release of ICU.” Many clients found this -confusing and/or undesireable, so ICU4J 3.4.3 no longer marks draft APIs with +confusing and/or undesirable, so ICU4J 3.4.3 no longer marks draft APIs with the `@deprecated` tag by default. For clients who prefer the earlier behavior, ICU4J provides an ant build target, `restoreDeprecated`, which will update the source files to use the `@deprecated` tag. Then clients can just rebuild the ICU4J diff --git a/docs/userguide/icu4c/build.md b/docs/userguide/icu4c/build.md index ddf4b2b41e7..16732519f68 100644 --- a/docs/userguide/icu4c/build.md +++ b/docs/userguide/icu4c/build.md @@ -517,7 +517,7 @@ This section will explain how to build ICU on one platform, but to produce binar Normally, in the course of a build, ICU needs to run the tools that it builds in order to generate and package data and test-data. In a cross compilation setting, ICU is built on a different system from that which it eventually runs on. An example might be, if you are building for a small/headless system (such as an embedded device), or a system where you can't easily run the ICU command line tools (any non-UNIX-like system). -To reduce confusion, we will here refer to the "A" and the "B" system. System "A" is the actual system we will be running on - the only requirements on it is are it is able to build ICU from the command line targetting itself (with `configure` or `runConfigureICU`), and secondly, that it also contain the correct toolchain for compiling and linking for the resultant platform, referred to as the "B" system. +To reduce confusion, we will here refer to the "A" and the "B" system. System "A" is the actual system we will be running on - the only requirements on it is are it is able to build ICU from the command line targeting itself (with `configure` or `runConfigureICU`), and secondly, that it also contain the correct toolchain for compiling and linking for the resultant platform, referred to as the "B" system. The autoconf docs use the term "build" for A, and "host" for B. More details at: [http://www.gnu.org/software/autoconf/manual/html_node/Specifying-Names.html](http://www.gnu.org/software/autoconf/manual/html_node/Specifying-Names.html#Specifying-Names) diff --git a/docs/userguide/icu_data/buildtool.md b/docs/userguide/icu_data/buildtool.md index 35a0d29afb9..001ce890b95 100644 --- a/docs/userguide/icu_data/buildtool.md +++ b/docs/userguide/icu_data/buildtool.md @@ -214,7 +214,7 @@ contain numbers. Expect to spend a fair bit of time debugging your feature filter to get it to work the way you expect it to. The data for many ICU features live in individual files. The ICU Data Build -Tool puts puts similar *types* of files into categories. The following table +Tool puts similar *types* of files into categories. The following table summarizes the ICU data files and their corresponding features and categories: | Feature | Category ID(s) | Data Files
([icu4c/source/data](https://github.com/unicode-org/icu/tree/main/icu4c/source/data)) | Resource Size
(as of ICU 64) | diff --git a/docs/userguide/io/ustdio.md b/docs/userguide/io/ustdio.md index 83abb8dabb2..2cb0236ec5c 100644 --- a/docs/userguide/io/ustdio.md +++ b/docs/userguide/io/ustdio.md @@ -14,7 +14,7 @@ License & terms of use: http://www.unicode.org/copyright.html This API provides a ``-like API wrapper around ICU's other [formatting and parsing](../format_parse/index.md) APIs. It is meant to ease the transition of adding Unicode support to a preexisting applications using stdio. The following is a -small list of noticable differences between stdio and ICU I/O's ustdio +small list of noticeable differences between stdio and ICU I/O's ustdio implementation. * Locale specific formatting and parsing is only done with file IO. diff --git a/icu4c/LICENSE b/icu4c/LICENSE index 3bd59bb6a9f..80b587723a6 100644 --- a/icu4c/LICENSE +++ b/icu4c/LICENSE @@ -45,7 +45,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. ---------------------- +---------------------------------------------------------------------- Third-Party Software Licenses @@ -53,7 +53,9 @@ This section contains third-party software notices and/or additional terms for licensed third-party software components included within ICU libraries. -1. ICU License - ICU 1.8.1 to ICU 57.1 +---------------------------------------------------------------------- + +ICU License - ICU 1.8.1 to ICU 57.1 COPYRIGHT AND PERMISSION NOTICE @@ -88,7 +90,9 @@ of the copyright holder. All trademarks and registered trademarks mentioned herein are the property of their respective owners. -2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt) +---------------------------------------------------------------------- + +Chinese/Japanese Word Break Dictionary Data (cjdict.txt) # The Google Chrome software developed by Google is licensed under # the BSD license. Other software included in this distribution is @@ -292,7 +296,9 @@ property of their respective owners. # # ---------------COPYING.ipadic-----END---------------------------------- -3. Lao Word Break Dictionary Data (laodict.txt) +---------------------------------------------------------------------- + +Lao Word Break Dictionary Data (laodict.txt) # Copyright (C) 2016 and later: Unicode, Inc. and others. # License & terms of use: http://www.unicode.org/copyright.html @@ -332,7 +338,9 @@ property of their respective owners. # OF THE POSSIBILITY OF SUCH DAMAGE. # -------------------------------------------------------------------------- -4. Burmese Word Break Dictionary Data (burmesedict.txt) +---------------------------------------------------------------------- + +Burmese Word Break Dictionary Data (burmesedict.txt) # Copyright (c) 2014 International Business Machines Corporation # and others. All Rights Reserved. @@ -372,7 +380,9 @@ property of their respective owners. # SUCH DAMAGE. # -------------------------------------------------------------------------- -5. Time Zone Database +---------------------------------------------------------------------- + +Time Zone Database ICU uses the public domain data and code derived from Time Zone Database for its time zone support. The ownership of the TZ database @@ -395,7 +405,9 @@ Database section 7. # making a contribution to the database or code waives all rights to # future claims in that contribution or in the TZ Database. -6. Google double-conversion +---------------------------------------------------------------------- + +Google double-conversion Copyright 2006-2011, the V8 project authors. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -423,3 +435,85 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +---------------------------------------------------------------------- + +File: aclocal.m4 (only for ICU4C) +Section: pkg.m4 - Macros to locate and utilise pkg-config. + + +Copyright © 2004 Scott James Remnant . +Copyright © 2012-2015 Dan Nicholson + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. + +As a special exception to the GNU General Public License, if you +distribute this file as part of a program that contains a +configuration script generated by Autoconf, you may include it under +the same distribution terms that you use for the rest of that +program. + + +(The condition for the exception is fulfilled because +ICU4C includes a configuration script generated by Autoconf, +namely the `configure` script.) + +---------------------------------------------------------------------- + +File: config.guess (only for ICU4C) + + +This file is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, see . + +As a special exception to the GNU General Public License, if you +distribute this file as part of a program that contains a +configuration script generated by Autoconf, you may include it under +the same distribution terms that you use for the rest of that +program. This Exception is an additional permission under section 7 +of the GNU General Public License, version 3 ("GPLv3"). + + +(The condition for the exception is fulfilled because +ICU4C includes a configuration script generated by Autoconf, +namely the `configure` script.) + +---------------------------------------------------------------------- + +File: install-sh (only for ICU4C) + + +Copyright 1991 by the Massachusetts Institute of Technology + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of M.I.T. not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. M.I.T. makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. diff --git a/icu4c/source/data/curr/en.txt b/icu4c/source/data/curr/en.txt index 46c665c6218..c714f6bf1e7 100644 --- a/icu4c/source/data/curr/en.txt +++ b/icu4c/source/data/curr/en.txt @@ -899,6 +899,10 @@ en{ "SKK", "Slovak Koruna", } + SLE{ + "SLE", + "Sierra Leonean New Leone", + } SLL{ "SLL", "Sierra Leonean Leone", @@ -2117,6 +2121,10 @@ en{ one{"Slovak koruna"} other{"Slovak korunas"} } + SLE{ + one{"Sierra Leonean new leone"} + other{"Sierra Leonean new leones"} + } SLL{ one{"Sierra Leonean leone"} other{"Sierra Leonean leones"} diff --git a/icu4c/source/data/curr/supplementalData.txt b/icu4c/source/data/curr/supplementalData.txt index cdf147e64a7..c86496b7f84 100644 --- a/icu4c/source/data/curr/supplementalData.txt +++ b/icu4c/source/data/curr/supplementalData.txt @@ -3759,6 +3759,14 @@ supplementalData:table(nofallback){ } } SL{ + { + from:intvector{ + 383, + -496241664, + } + id{"SLE"} + tender{"false"} + } { from:intvector{ -40, @@ -5113,6 +5121,12 @@ supplementalData:table(nofallback){ 0, 0, } + SLE:intvector{ + 2, + 0, + 2, + 0, + } SLL:intvector{ 0, 0, diff --git a/icu4c/source/data/misc/currencyNumericCodes.txt b/icu4c/source/data/misc/currencyNumericCodes.txt index a7f5df8e000..87a5858b3b2 100644 --- a/icu4c/source/data/misc/currencyNumericCodes.txt +++ b/icu4c/source/data/misc/currencyNumericCodes.txt @@ -6,7 +6,7 @@ // Corporation and others. All Rights Reserved. //--------------------------------------------------------- // Build tool: com.ibm.icu.dev.tool.currency.NumericCodeData -// Build date: 2022-02-16T22:39:51Z +// Build date: 2022-03-30T17:57:09Z //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << @@ -234,6 +234,7 @@ currencyNumericCodes:table(nofallback){ SHP:int{654} SIT:int{705} SKK:int{703} + SLE:int{695} SLL:int{694} SOS:int{706} SRD:int{968} diff --git a/icu4c/source/data/misc/keyTypeData.txt b/icu4c/source/data/misc/keyTypeData.txt index 1865a17570b..9585c6f9c26 100644 --- a/icu4c/source/data/misc/keyTypeData.txt +++ b/icu4c/source/data/misc/keyTypeData.txt @@ -391,6 +391,7 @@ keyTypeData:table(nofallback){ shp{""} sit{""} skk{""} + sle{""} sll{""} sos{""} srd{""} diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt index 5f7678d7275..b7322351888 100644 --- a/icu4c/source/data/misc/supplementalData.txt +++ b/icu4c/source/data/misc/supplementalData.txt @@ -4456,6 +4456,7 @@ supplementalData:table(nofallback){ "SDP", "SIT", "SKK", + "SLE", "SRG", "STD", "SUR", @@ -9605,6 +9606,7 @@ supplementalData:table(nofallback){ "iqdq", "iqka", "iqki", + "iqkr", "iqma", "iqmu", "iqna", @@ -21611,22 +21613,20 @@ supplementalData:table(nofallback){ } IQ{ "iqan", - "iqar", "iqba", "iqbb", "iqbg", - "iqda", "iqdi", "iqdq", "iqka", "iqki", + "iqkr", "iqma", "iqmu", "iqna", "iqni", "iqqa", "iqsd", - "iqsu", "iqwa", } IR{ @@ -25006,7 +25006,6 @@ supplementalData:table(nofallback){ "gbnyk", "gbold", "gboxf", - "gbpem", "gbply", "gbpor", "gbpte", @@ -25127,6 +25126,7 @@ supplementalData:table(nofallback){ "gbmty", "gbntl", "gbnwp", + "gbpem", "gbpow", "gbrct", "gbswa", @@ -25289,6 +25289,11 @@ supplementalData:table(nofallback){ "iedl", "iemn", } + iqkr{ + "iqar", + "iqda", + "iqsu", + } is1{ "isgar", "ishaf", diff --git a/icu4c/source/data/unidata/ucdterms.txt b/icu4c/source/data/unidata/ucdterms.txt deleted file mode 100644 index 34ecc1bf9b5..00000000000 --- a/icu4c/source/data/unidata/ucdterms.txt +++ /dev/null @@ -1,47 +0,0 @@ -UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE - -Unicode Data Files include all data files under the directories -http://www.unicode.org/Public/ and http://www.unicode.org/reports/. -Unicode Software includes any source code under the directories -http://www.unicode.org/Public/ and http://www.unicode.org/reports/. - -NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, -INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), -AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND -BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, -DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE. - -COPYRIGHT AND PERMISSION NOTICE - -Copyright (C) 2016 and later: Unicode, Inc. and others. -License & terms of use: http://www.unicode.org/copyright.html -Copyright (c) 1991-2004 Unicode, Inc. All rights reserved. Distributed under the -Terms of Use in http://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -the Unicode data files and associated documentation (the "Data Files") or -Unicode software and associated documentation (the "Software") to deal in the -Data Files or Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, and/or sell copies of -the Data Files or Software, and to permit persons to whom the Data Files or -Software are furnished to do so, provided that (a) the above copyright notice(s) -and this permission notice appear in all copies of the Data Files or Software, -(b) both the above copyright notice(s) and this permission notice appear in -associated documentation, and (c) there is clear notice in each modified Data -File or in the Software as well as in the documentation associated with the Data -File(s) or Software that the data or software has been modified. - -THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD -PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL -DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR -SOFTWARE. - -Except as contained in this notice, the name of a copyright holder shall not be -used in advertising or otherwise to promote the sale, use or other dealings in -these Data Files or Software without prior written authorization of the -copyright holder. diff --git a/icu4c/source/tools/icuexportdata/icuexportdata.cpp b/icu4c/source/tools/icuexportdata/icuexportdata.cpp index d3794a59924..7431ac74ab8 100644 --- a/icu4c/source/tools/icuexportdata/icuexportdata.cpp +++ b/icu4c/source/tools/icuexportdata/icuexportdata.cpp @@ -359,10 +359,17 @@ int exportUprops(int argc, char* argv[]) { propNames.push_back(argv[i]); } if (options[OPT_ALL].doesOccur) { - for (int i=UCHAR_BINARY_START; i(i); const char* propName = u_getPropertyName(uprop, U_SHORT_PROPERTY_NAME); if (propName == NULL) { @@ -373,7 +380,10 @@ int exportUprops(int argc, char* argv[]) { } if (propName != NULL) { propNames.push_back(propName); + } else { + std::cerr << "Warning: Could not find name for: " << uprop << std::endl; } + i++; } } diff --git a/icu4j/build.xml b/icu4j/build.xml index c7ee8ffa883..d77d9b7d922 100644 --- a/icu4j/build.xml +++ b/icu4j/build.xml @@ -1945,8 +1945,17 @@ + + + + + + + + diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index 47bf22ee116..91462166daf 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:34e3be21ba60ad29792cc250918127f98782fb31f2e0363b1c1911d65cd150b5 -size 13875326 +oid sha256:4e4d1c723276895abdb1f452d4592471cfafce48c82d8ae83e260fac0e65afbb +size 13875434 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index a8799f8a5e3..f2f8bc98858 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:12abb292c368317b38a9a3c9ed1c9c03bcb32a9cfae1112c41c14bae37b26de9 -size 95832 +oid sha256:b55aff3d90f361066c569d6d9947f2e8121025b52fb079f346678877f5c08505 +size 95818 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 0d837882a44..155d605927d 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:6686d674fcb321ea8790330c85b5b0bd6a85cce99aa93757a83d167bda303121 -size 829050 +oid sha256:d64f584205d3e553dc135b5a57a5eb8ec6bad24210c218c6927ed161411bb3a1 +size 826067 diff --git a/icu4j/main/shared/licenses/LICENSE b/icu4j/main/shared/licenses/LICENSE index 3bd59bb6a9f..80b587723a6 100644 --- a/icu4j/main/shared/licenses/LICENSE +++ b/icu4j/main/shared/licenses/LICENSE @@ -45,7 +45,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. ---------------------- +---------------------------------------------------------------------- Third-Party Software Licenses @@ -53,7 +53,9 @@ This section contains third-party software notices and/or additional terms for licensed third-party software components included within ICU libraries. -1. ICU License - ICU 1.8.1 to ICU 57.1 +---------------------------------------------------------------------- + +ICU License - ICU 1.8.1 to ICU 57.1 COPYRIGHT AND PERMISSION NOTICE @@ -88,7 +90,9 @@ of the copyright holder. All trademarks and registered trademarks mentioned herein are the property of their respective owners. -2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt) +---------------------------------------------------------------------- + +Chinese/Japanese Word Break Dictionary Data (cjdict.txt) # The Google Chrome software developed by Google is licensed under # the BSD license. Other software included in this distribution is @@ -292,7 +296,9 @@ property of their respective owners. # # ---------------COPYING.ipadic-----END---------------------------------- -3. Lao Word Break Dictionary Data (laodict.txt) +---------------------------------------------------------------------- + +Lao Word Break Dictionary Data (laodict.txt) # Copyright (C) 2016 and later: Unicode, Inc. and others. # License & terms of use: http://www.unicode.org/copyright.html @@ -332,7 +338,9 @@ property of their respective owners. # OF THE POSSIBILITY OF SUCH DAMAGE. # -------------------------------------------------------------------------- -4. Burmese Word Break Dictionary Data (burmesedict.txt) +---------------------------------------------------------------------- + +Burmese Word Break Dictionary Data (burmesedict.txt) # Copyright (c) 2014 International Business Machines Corporation # and others. All Rights Reserved. @@ -372,7 +380,9 @@ property of their respective owners. # SUCH DAMAGE. # -------------------------------------------------------------------------- -5. Time Zone Database +---------------------------------------------------------------------- + +Time Zone Database ICU uses the public domain data and code derived from Time Zone Database for its time zone support. The ownership of the TZ database @@ -395,7 +405,9 @@ Database section 7. # making a contribution to the database or code waives all rights to # future claims in that contribution or in the TZ Database. -6. Google double-conversion +---------------------------------------------------------------------- + +Google double-conversion Copyright 2006-2011, the V8 project authors. All rights reserved. Redistribution and use in source and binary forms, with or without @@ -423,3 +435,85 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +---------------------------------------------------------------------- + +File: aclocal.m4 (only for ICU4C) +Section: pkg.m4 - Macros to locate and utilise pkg-config. + + +Copyright © 2004 Scott James Remnant . +Copyright © 2012-2015 Dan Nicholson + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. + +As a special exception to the GNU General Public License, if you +distribute this file as part of a program that contains a +configuration script generated by Autoconf, you may include it under +the same distribution terms that you use for the rest of that +program. + + +(The condition for the exception is fulfilled because +ICU4C includes a configuration script generated by Autoconf, +namely the `configure` script.) + +---------------------------------------------------------------------- + +File: config.guess (only for ICU4C) + + +This file is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, see . + +As a special exception to the GNU General Public License, if you +distribute this file as part of a program that contains a +configuration script generated by Autoconf, you may include it under +the same distribution terms that you use for the rest of that +program. This Exception is an additional permission under section 7 +of the GNU General Public License, version 3 ("GPLv3"). + + +(The condition for the exception is fulfilled because +ICU4C includes a configuration script generated by Autoconf, +namely the `configure` script.) + +---------------------------------------------------------------------- + +File: install-sh (only for ICU4C) + + +Copyright 1991 by the Massachusetts Institute of Technology + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of M.I.T. not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. M.I.T. makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. diff --git a/icu4j/tools/build/manifest-utilities.stub b/icu4j/tools/build/manifest-utilities.stub new file mode 100644 index 00000000000..fda53579ead --- /dev/null +++ b/icu4j/tools/build/manifest-utilities.stub @@ -0,0 +1,17 @@ +Manifest-Version: 1.0 +Specification-Title: International Components for Unicode for Java Utilities +Specification-Version: @SPECVERSION@ +Specification-Vendor: Unicode, Inc. +Implementation-Title: International Components for Unicode for Java Utilities +Implementation-Version: @IMPLVERSION@ +Implementation-Vendor: Unicode, Inc. +Implementation-Vendor-Id: org.unicode +Bundle-ManifestVersion: 2 +Bundle-Name: ICU4JUtilities +Bundle-Description: International Components for Unicode for Java Utilities +Bundle-SymbolicName: com.ibm.icu.utilities +Bundle-Version: @IMPLVERSION@ +Bundle-Vendor: Unicode, Inc. +Bundle-Copyright: @COPYRIGHT@ +Bundle-RequiredExecutionEnvironment: @EXECENV@ +Automatic-Module-Name: com.ibm.icu.utilities diff --git a/tools/cldr/cldr-to-icu/pom.xml b/tools/cldr/cldr-to-icu/pom.xml index 9c07335abc1..1f3b4bc2acc 100644 --- a/tools/cldr/cldr-to-icu/pom.xml +++ b/tools/cldr/cldr-to-icu/pom.xml @@ -83,7 +83,7 @@ com.ibm.icu icu4j-for-cldr - 71.0.1-SNAPSHOT-cldr-2022-02-23 + 71.1-SNAPSHOT-release-71-rc diff --git a/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java b/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java index ec5b54725a3..0ac7df996e0 100644 --- a/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java +++ b/tools/currency/src/com/ibm/icu/dev/tool/currency/NumericCodeData.java @@ -336,6 +336,7 @@ public class NumericCodeData { {"SHP", "654"}, {"SIT", "705"}, {"SKK", "703"}, + {"SLE", "695"}, {"SLL", "694"}, {"SOS", "706"}, {"SRD", "968"},