diff --git a/ICU-LICENSE b/ICU-LICENSE deleted file mode 100644 index 3ef4be7588e..00000000000 --- a/ICU-LICENSE +++ /dev/null @@ -1,414 +0,0 @@ -COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later) - -Copyright © 1991-2021 Unicode, Inc. All rights reserved. -Distributed under the Terms of Use in https://www.unicode.org/copyright.html. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Unicode data files and any associated documentation -(the "Data Files") or Unicode software and any 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 either -(a) this copyright and permission notice appear with all copies -of the Data Files or Software, or -(b) this copyright and permission notice appear in associated -Documentation. - -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. - ---------------------- - -Third-Party Software Licenses - -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 - -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1995-2016 International Business Machines Corporation and others -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. - -THE SOFTWARE IS 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 THIS 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 this Software without prior written authorization -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) - - # The Google Chrome software developed by Google is licensed under - # the BSD license. Other software included in this distribution is - # provided under other licenses, as set forth below. - # - # The BSD License - # http://opensource.org/licenses/bsd-license.php - # Copyright (C) 2006-2008, Google Inc. - # - # All rights reserved. - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions are met: - # - # Redistributions of source code must retain the above copyright notice, - # this list of conditions and the following disclaimer. - # Redistributions in binary form must reproduce the above - # copyright notice, this list of conditions and the following - # disclaimer in the documentation and/or other materials provided with - # the distribution. - # Neither the name of Google Inc. nor the names of its - # contributors may be used to endorse or promote products derived from - # this software without specific prior written permission. - # - # - # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 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. - # - # - # The word list in cjdict.txt are generated by combining three word lists - # listed below with further processing for compound word breaking. The - # frequency is generated with an iterative training against Google web - # corpora. - # - # * Libtabe (Chinese) - # - https://sourceforge.net/project/?group_id=1519 - # - Its license terms and conditions are shown below. - # - # * IPADIC (Japanese) - # - http://chasen.aist-nara.ac.jp/chasen/distribution.html - # - Its license terms and conditions are shown below. - # - # ---------COPYING.libtabe ---- BEGIN-------------------- - # - # /* - # * Copyright (c) 1999 TaBE Project. - # * Copyright (c) 1999 Pai-Hsiang Hsiao. - # * All rights reserved. - # * - # * Redistribution and use in source and binary forms, with or without - # * modification, are permitted provided that the following conditions - # * are met: - # * - # * . Redistributions of source code must retain the above copyright - # * notice, this list of conditions and the following disclaimer. - # * . Redistributions in binary form must reproduce the above copyright - # * notice, this list of conditions and the following disclaimer in - # * the documentation and/or other materials provided with the - # * distribution. - # * . Neither the name of the TaBE Project nor the names of its - # * contributors may be used to endorse or promote products derived - # * from this software without specific prior written permission. - # * - # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - # * SERVICES; LOSS OF USE, 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. - # */ - # - # /* - # * Copyright (c) 1999 Computer Systems and Communication Lab, - # * Institute of Information Science, Academia - # * Sinica. All rights reserved. - # * - # * Redistribution and use in source and binary forms, with or without - # * modification, are permitted provided that the following conditions - # * are met: - # * - # * . Redistributions of source code must retain the above copyright - # * notice, this list of conditions and the following disclaimer. - # * . Redistributions in binary form must reproduce the above copyright - # * notice, this list of conditions and the following disclaimer in - # * the documentation and/or other materials provided with the - # * distribution. - # * . Neither the name of the Computer Systems and Communication Lab - # * nor the names of its contributors may be used to endorse or - # * promote products derived from this software without specific - # * prior written permission. - # * - # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - # * SERVICES; LOSS OF USE, 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. - # */ - # - # Copyright 1996 Chih-Hao Tsai @ Beckman Institute, - # University of Illinois - # c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4 - # - # ---------------COPYING.libtabe-----END-------------------------------- - # - # - # ---------------COPYING.ipadic-----BEGIN------------------------------- - # - # Copyright 2000, 2001, 2002, 2003 Nara Institute of Science - # and Technology. All Rights Reserved. - # - # Use, reproduction, and distribution of this software is permitted. - # Any copy of this software, whether in its original form or modified, - # must include both the above copyright notice and the following - # paragraphs. - # - # Nara Institute of Science and Technology (NAIST), - # the copyright holders, disclaims all warranties with regard to this - # software, including all implied warranties of merchantability and - # fitness, in no event shall NAIST be liable for - # 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 tortuous action, arising out - # of or in connection with the use or performance of this software. - # - # A large portion of the dictionary entries - # originate from ICOT Free Software. The following conditions for ICOT - # Free Software applies to the current dictionary as well. - # - # Each User may also freely distribute the Program, whether in its - # original form or modified, to any third party or parties, PROVIDED - # that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear - # on, or be attached to, the Program, which is distributed substantially - # in the same form as set out herein and that such intended - # distribution, if actually made, will neither violate or otherwise - # contravene any of the laws and regulations of the countries having - # jurisdiction over the User or the intended distribution itself. - # - # NO WARRANTY - # - # The program was produced on an experimental basis in the course of the - # research and development conducted during the project and is provided - # to users as so produced on an experimental basis. Accordingly, the - # program is provided without any warranty whatsoever, whether express, - # implied, statutory or otherwise. The term "warranty" used herein - # includes, but is not limited to, any warranty of the quality, - # performance, merchantability and fitness for a particular purpose of - # the program and the nonexistence of any infringement or violation of - # any right of any third party. - # - # Each user of the program will agree and understand, and be deemed to - # have agreed and understood, that there is no warranty whatsoever for - # the program and, accordingly, the entire risk arising from or - # otherwise connected with the program is assumed by the user. - # - # Therefore, neither ICOT, the copyright holder, or any other - # organization that participated in or was otherwise related to the - # development of the program and their respective officials, directors, - # officers and other employees shall be held liable for any and all - # damages, including, without limitation, general, special, incidental - # and consequential damages, arising out of or otherwise in connection - # with the use or inability to use the program or any product, material - # or result produced or otherwise obtained by using the program, - # regardless of whether they have been advised of, or otherwise had - # knowledge of, the possibility of such damages at any time during the - # project or thereafter. Each user will be deemed to have agreed to the - # foregoing by his or her commencement of use of the program. The term - # "use" as used herein includes, but is not limited to, the use, - # modification, copying and distribution of the program and the - # production of secondary products from the program. - # - # In the case where the program, whether in its original form or - # modified, was distributed or delivered to or received by a user from - # any person, organization or entity other than ICOT, unless it makes or - # grants independently of ICOT any specific warranty to the user in - # writing, such person, organization or entity, will also be exempted - # from and not be held liable to the user for any such damages as noted - # above as far as the program is concerned. - # - # ---------------COPYING.ipadic-----END---------------------------------- - -3. Lao Word Break Dictionary Data (laodict.txt) - - # Copyright (c) 2013 International Business Machines Corporation - # and others. All Rights Reserved. - # - # Project: http://code.google.com/p/lao-dictionary/ - # Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt - # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt - # (copied below) - # - # This file is derived from the above dictionary, with slight - # modifications. - # ---------------------------------------------------------------------- - # Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell. - # All rights reserved. - # - # Redistribution and use in source and binary forms, with or without - # modification, - # are permitted provided that the following conditions are met: - # - # - # Redistributions of source code must retain the above copyright notice, this - # list of conditions and the following disclaimer. Redistributions in - # binary form must reproduce the above copyright notice, this list of - # conditions and the following disclaimer in the documentation and/or - # other materials provided with the distribution. - # - # - # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - # COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - # SERVICES; LOSS OF USE, 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. - # -------------------------------------------------------------------------- - -4. Burmese Word Break Dictionary Data (burmesedict.txt) - - # Copyright (c) 2014 International Business Machines Corporation - # and others. All Rights Reserved. - # - # This list is part of a project hosted at: - # github.com/kanyawtech/myanmar-karen-word-lists - # - # -------------------------------------------------------------------------- - # Copyright (c) 2013, LeRoy Benjamin Sharon - # All rights reserved. - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions - # are met: Redistributions of source code must retain the above - # copyright notice, this list of conditions and the following - # disclaimer. Redistributions in binary form must reproduce the - # above copyright notice, this list of conditions and the following - # disclaimer in the documentation and/or other materials provided - # with the distribution. - # - # Neither the name Myanmar Karen Word Lists, nor the names of its - # contributors may be used to endorse or promote products derived - # from this software without specific prior written permission. - # - # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS - # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - # TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - # 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. - # -------------------------------------------------------------------------- - -5. 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 -is explained in BCP 175: Procedure for Maintaining the Time Zone -Database section 7. - - # 7. Database Ownership - # - # The TZ database itself is not an IETF Contribution or an IETF - # document. Rather it is a pre-existing and regularly updated work - # that is in the public domain, and is intended to remain in the - # public domain. Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do - # not apply to the TZ Database or contributions that individuals make - # to it. Should any claims be made and substantiated against the TZ - # Database, the organization that is providing the IANA - # Considerations defined in this RFC, under the memorandum of - # understanding with the IETF, currently ICANN, may act in accordance - # with all competent court orders. No ownership claims will be made - # by ICANN or the IETF Trust on the database or the code. Any person - # 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 - -Copyright 2006-2011, the V8 project authors. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of Google Inc. nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -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. diff --git a/README.md b/README.md index faef9164e3e..e31f4e3a528 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Latest Release: [v40.0](https://cldr.unicode.org/index/downloads/cldr-40) publis ## Build Status -GitHub: +GitHub: [![cldr-mvn](https://github.com/unicode-org/cldr/workflows/cldr-mvn/badge.svg)](https://github.com/unicode-org/cldr/actions?query=branch%3Amaster+workflow%3A%22cldr-mvn%22) [![Ansible Lint](https://github.com/unicode-org/cldr/workflows/Ansible%20Lint/badge.svg)](https://github.com/unicode-org/cldr/actions?query=branch%3Amaster+workflow%3A%22Ansible+Lint%22) @@ -26,22 +26,17 @@ Click [HERE](http://unicode.org/cldr/survey_tool.html) for information on how to For details about code and other contributions, see [CONTRIBUTING.md](./CONTRIBUTING.md) ### Licenses - + - Usage of CLDR data and software is governed by the [Unicode Terms of Use](http://www.unicode.org/copyright.html) a copy of which is included as [unicode-license.txt](./unicode-license.txt). - Some CLDR tools depend on library dependencies managed via Maven, - use of these libraries is governed by separate license agreements. -- Use of the ICU libraries is subject to the -[ICU License]("https://github.com/unicode-org/icu/blob/master/icu4j/main/shared/licenses/LICENSE"), -included as [ICU-LICENSE](./ICU-LICENSE). -- Use of the Guava, Xerces, and Myanmar Tools libraries is subject to the -[Apache License]("http://www.apache.org/licenses/LICENSE-2.0.html") -included as [apache-license.txt](./apache-license.txt). + use of these libraries is governed by separate license agreements. + +SPDX-License-Identifier: Unicode-DFS-2016 ### Copyright Copyright © 1991-2021 Unicode, Inc. All rights reserved. [Terms of use](http://www.unicode.org/copyright.html) - diff --git a/common/dtd/ldml.dtd b/common/dtd/ldml.dtd index 9d3ad4b5ce1..1d719f4983b 100644 --- a/common/dtd/ldml.dtd +++ b/common/dtd/ldml.dtd @@ -1,12 +1,8 @@ diff --git a/common/dtd/ldmlBCP47.dtd b/common/dtd/ldmlBCP47.dtd index 002c4f9e65e..bc7711b636f 100644 --- a/common/dtd/ldmlBCP47.dtd +++ b/common/dtd/ldmlBCP47.dtd @@ -1,12 +1,8 @@ @@ -14,10 +10,10 @@ $Revision$ - + - + @@ -37,41 +33,41 @@ $Revision$ - + - + - + - + - + - + - + - + - + - + diff --git a/common/dtd/ldmlICU.dtd b/common/dtd/ldmlICU.dtd index d7b7142b255..d97e99970f1 100644 --- a/common/dtd/ldmlICU.dtd +++ b/common/dtd/ldmlICU.dtd @@ -1,11 +1,12 @@ -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/common/dtd/ldmlSupplemental.dtd b/common/dtd/ldmlSupplemental.dtd index 0bb45440416..7a66bb7d4de 100644 --- a/common/dtd/ldmlSupplemental.dtd +++ b/common/dtd/ldmlSupplemental.dtd @@ -1,13 +1,8 @@ diff --git a/keyboards/dtd/ldmlKeyboard.dtd b/keyboards/dtd/ldmlKeyboard.dtd index 4d019589aca..fa2257ab463 100644 --- a/keyboards/dtd/ldmlKeyboard.dtd +++ b/keyboards/dtd/ldmlKeyboard.dtd @@ -1,13 +1,8 @@ diff --git a/keyboards/dtd/ldmlPlatform.dtd b/keyboards/dtd/ldmlPlatform.dtd index 9a2e46f989c..86ebb44b93b 100644 --- a/keyboards/dtd/ldmlPlatform.dtd +++ b/keyboards/dtd/ldmlPlatform.dtd @@ -1,23 +1,19 @@ - + + - + - + diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/icu/ExtractICUData.java b/tools/cldr-code/src/main/java/org/unicode/cldr/icu/ExtractICUData.java index 900b6f94fc0..c73acd97303 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/icu/ExtractICUData.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/icu/ExtractICUData.java @@ -68,9 +68,7 @@ public static void main(String[] args) throws Exception { static Set skipLines = new HashSet<>(Arrays.asList(new String[] { "#--------------------------------------------------------------------", - "# Copyright (c) 1999-2005, International Business Machines", - "# Copyright (c) 1999-2004, International Business Machines", - "# Corporation and others. All Rights Reserved.", + "#--------------------------------------------------------------------" })); static Set skipFiles = new HashSet<>(Arrays.asList(new String[] { diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/icu/LDML2ICUBinaryWriter.java b/tools/cldr-code/src/main/java/org/unicode/cldr/icu/LDML2ICUBinaryWriter.java index e1159f47482..d3f46bca69c 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/icu/LDML2ICUBinaryWriter.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/icu/LDML2ICUBinaryWriter.java @@ -17,6 +17,8 @@ import com.ibm.icu.lang.UCharacterEnums.ECharacterCategory; import com.ibm.icu.text.UTF16; +import org.unicode.cldr.util.CldrUtility; + /** * The LDML2ICUBinaryWriter class is a set of methods which can be used * to generate Binary (.res) files in the ICU Binary format. @@ -29,7 +31,7 @@ public class LDML2ICUBinaryWriter { * This string is the copyright to be written into the file. * In the C version, can be found in icu4c_root/source/common/unicode/uversion.h */ - private static final String COPYRIGHT = " Copyright (C) 2012, International Business Machines Corporation and others. All Rights Reserved. "; + private static final String COPYRIGHT = CldrUtility.getCopyrightString(); public static int written = 0; diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/icu/RBNFWriter.java b/tools/cldr-code/src/main/java/org/unicode/cldr/icu/RBNFWriter.java index d33c6fc8a21..2ce7221fcbf 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/icu/RBNFWriter.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/icu/RBNFWriter.java @@ -18,6 +18,7 @@ import java.util.Date; import org.unicode.cldr.draft.FileUtilities; +import org.unicode.cldr.util.CldrUtility; import com.ibm.icu.dev.tool.UOption; import com.ibm.icu.impl.Utility; @@ -86,9 +87,7 @@ public static void main(String[] args) throws IOException { if (options[COPYRIGHT].value.equals("true")) { sdf.applyPattern("yyyy"); out.println(""); sdf.applyPattern("yyyy/MM/dd HH:mm:ss"); diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/posix/GenerateCharmap.java b/tools/cldr-code/src/main/java/org/unicode/cldr/posix/GenerateCharmap.java index ebb2637fe66..68410c4adb0 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/posix/GenerateCharmap.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/posix/GenerateCharmap.java @@ -20,6 +20,7 @@ import org.unicode.cldr.draft.FileUtilities; import org.unicode.cldr.icu.SimpleConverter; +import org.unicode.cldr.util.CldrUtility; import com.ibm.icu.dev.tool.UOption; import com.ibm.icu.impl.Utility; @@ -99,29 +100,7 @@ public void write(PrintWriter out) { out.println("# charset:\t" + codeset); out.println("######################"); out.println("#################################################################################################"); - out.println("# Copyright 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in #"); - out.println("# http://www.unicode.org/copyright.html. #"); - out.println("# #"); - out.println("# Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode #"); - out.println("# data files and any associated documentation (the \"Data Files\") or Unicode software and any #"); - out.println("# associated documentation (the \"Software\") to deal in the Data Files or Software without #"); - out.println("# restriction, including without limitation the rights to use, copy, modify, merge, publish, #"); - out.println("# distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom #"); - out.println("# the Data Files or Software are furnished to do so, provided that (a) the above copyright #"); - out.println("# notice(s) and this permission notice appear with all copies of the Data Files or Software, #"); - out.println("# (b) both the above copyright notice(s) and this permission notice appear in associated #"); - out.println("# documentation, and (c) there is clear notice in each modified Data File or in the Software as #"); - out.println("# well as in the documentation associated with the Data File(s) or Software that the data or #"); - out.println("# software has been modified. #"); - out.println("# #"); - out.println("# THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #"); - out.println("# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A #"); - out.println("# PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT #"); - out.println("# HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR #"); - out.println("# CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, #"); - out.println("# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN #"); - out.println("# CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. #"); - out.println("#################################################################################################"); + out.println(CldrUtility.getCopyrightString("# ")); out.println(); doCharmap(out, cs); out.println("######################"); diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/posix/POSIXLocale.java b/tools/cldr-code/src/main/java/org/unicode/cldr/posix/POSIXLocale.java index 194b498b2af..beaeeeb5845 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/posix/POSIXLocale.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/posix/POSIXLocale.java @@ -14,6 +14,7 @@ import org.unicode.cldr.icu.SimpleConverter; import org.unicode.cldr.util.CLDRFile; import org.unicode.cldr.util.CLDRPaths; +import org.unicode.cldr.util.CldrUtility; import org.unicode.cldr.util.Factory; import org.unicode.cldr.util.SupplementalDataInfo; @@ -160,30 +161,7 @@ public void write(PrintWriter out) { out.println("* see http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap07.html *"); out.println("* Locale Name : " + locale_name + " Codeset : " + codeset); out.println("*************************************************************************************************"); - out.println("* Copyright 1991-2013 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in *"); - out.println("* http://www.unicode.org/copyright.html. *"); - out.println("* *"); - out.println("* Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode *"); - out.println("* data files and any associated documentation (the \"Data Files\") or Unicode software and any *"); - out.println("* associated documentation (the \"Software\") to deal in the Data Files or Software without *"); - out.println("* restriction, including without limitation the rights to use, copy, modify, merge, publish, *"); - out.println("* distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom *"); - out.println("* the Data Files or Software are furnished to do so, provided that (a) the above copyright *"); - out.println("* notice(s) and this permission notice appear with all copies of the Data Files or Software, *"); - out.println("* (b) both the above copyright notice(s) and this permission notice appear in associated *"); - out.println("* documentation, and (c) there is clear notice in each modified Data File or in the Software as *"); - out.println("* well as in the documentation associated with the Data File(s) or Software that the data or *"); - out.println("* software has been modified. *"); - out.println("* *"); - out.println("* THE DATA FILES AND SOFTWARE ARE PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *"); - out.println("* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *"); - out.println("* PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT *"); - out.println("* HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR *"); - out.println("* CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, *"); - out.println("* WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN *"); - out.println("* CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. *"); - out.println("*************************************************************************************************"); - out.println(""); + out.println(CldrUtility.getCopyrightString("* ")); lc_ctype.write(out); lc_collate.write(out); diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateDtd.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateDtd.java index d23733833b8..31e75b852d7 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateDtd.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateDtd.java @@ -32,6 +32,7 @@ public static void main(String[] args) throws IOException { } try (TempPrintWriter out = TempPrintWriter.openUTF8Writer(CLDRPaths.BASE_DIRECTORY + type.dtdPath)) { out.println(data); + System.err.println("Wrote: " + CLDRPaths.BASE_DIRECTORY + type.dtdPath); } } } diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/WritePluralRules.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/WritePluralRules.java index 90d079d4def..2c33c808cd4 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/WritePluralRules.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/WritePluralRules.java @@ -9,6 +9,7 @@ import java.util.TreeSet; import org.unicode.cldr.util.CLDRConfig; +import org.unicode.cldr.util.CldrUtility; import org.unicode.cldr.util.SupplementalDataInfo; import org.unicode.cldr.util.SupplementalDataInfo.PluralType; @@ -113,9 +114,7 @@ public static String formatPluralHeader(PluralType type, String filename) { return "\n" + "\n" + "\n" + "\n" + " System.out.println(""); diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java index 508e436f7fa..96adb4cdf36 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdType.java @@ -81,10 +81,7 @@ public String header(Class generatedBy) { return "\n" + "\n" // "common/dtd/ldmlSupplemental.dtd" + "\n" + "<" + this + ">\n"; diff --git a/tools/cldr-rdf/src/main/java/org/unicode/cldr/tool/SubdivisionNode.java b/tools/cldr-rdf/src/main/java/org/unicode/cldr/tool/SubdivisionNode.java index 097d748c171..2590c4c2dce 100644 --- a/tools/cldr-rdf/src/main/java/org/unicode/cldr/tool/SubdivisionNode.java +++ b/tools/cldr-rdf/src/main/java/org/unicode/cldr/tool/SubdivisionNode.java @@ -498,17 +498,6 @@ void printXml(Appendable output) throws IOException { output.append("\t\n\n"); } -// private static String header(DtdType type) { -// return "\n" -// + "\n" // "common/dtd/ldmlSupplemental.dtd" -// + "\n"; -// } - void printAliases(Appendable output) throws IOException { addAliases(output, sdset.TO_COUNTRY_CODE.keySet());