Merge pull request #247 from artichoke/lopopolo-patch-1

Fix reference to Unicode license in README

README.md

@@ -100,7 +100,7 @@ assert!(!fold.case_eq("İstanbul", "Istanbul"));
 
 ## Implementation
 
-Focaccia generates conversion tables from Unicode data files. Focaccia
+Focaccia generates conversion tables from Unicode Data Files. Focaccia
 implements case folding as defined in the [Unicode standard][casemap] (see
 [`CaseFolding.txt`]).
 
@@ -142,8 +142,7 @@ rules will be accompanied with a minor version bump.
 `focaccia` is licensed under the [MIT License](LICENSE) (c) Ryan Lopopolo.
 
 `focaccia` includes Unicode Data Files which are subject to the [Unicode Terms
-of Use] and [Unicode Data Files and Software License](LICENSE-UNICODE) (c)
-1991-2022 Unicode, Inc.
+of Use] and [Unicode License v3](LICENSE-UNICODE) (c) 1991-2024 Unicode, Inc.
 
 [unicode terms of use]: https://www.unicode.org/copyright.html
 
@@ -152,6 +151,6 @@ the Unicode copyright. These generated files incorporate data derived from the
 Unicode Data Files. More details about the generation process can be found in
 [`scripts/gen_case_lookups.rb`]. The generated sources created by this script
 are subject to both the MIT License contained in this repository and the Unicode
-Data Files and Software License.
+License v3.
 
 [`scripts/gen_case_lookups.rb`]: scripts/gen_case_lookups.rb

Rakefile

@@ -99,29 +99,28 @@ namespace :unicode do
   # data found under `https://www.unicode.org/Public/` are considered Unicode
   # Data Files and are subject to these constaints:
   #
-  # 1. Certain documents and files on this website contain a legend indicating
-  #    that "Modification is permitted." Any person is hereby authorized,
-  #    without fee, to modify such documents and files to create derivative
-  #    works conforming to the Unicode® Standard, subject to Terms and
-  #    Conditions herein.
-  # 2. Any person is hereby authorized, without fee, to view, use, reproduce,
-  #    and distribute all documents and files, subject to the Terms and
-  #    Conditions herein.
-  # 3. Further specifications of rights and restrictions pertaining to the use
-  #    of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data
-  #    Files and Software License.
+  # - Except where otherwise more broadly permitted or licensed:
+  #   - you may not make copies of or modifications to Unicode Products for
+  #     public distribution, or incorporate Unicode Products in whole or in part
+  #     into any product or publication, or otherwise publicly distribute them,
+  #     without the express written permission of Unicode, and
+  #   - you may not copy or extract fonts or font data from any Unicode Products,
+  #     including but not limited to Unicode Code Charts.
+  # - All Unicode Data Files and Unicode Software are subject to the terms and
+  #   conditions of the free and open-source Unicode License v3, unless otherwise
+  #   indicated by specific restriction, permission, or license identified at the
+  #   point of release or in such software, data file, or other documentation.
   #
-  # The Unicode Data Files and Software License, which can be found at
-  # <https://www.unicode.org/license.txt> is included in this repository. The
-  # license requires one of:
+  # The Unicode License v3, which can be found at <https://www.unicode.org/license.txt>
+  # is included in this repository. The license requires one of:
   #
-  # (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.
+  # (a) this copyright and permission notice appear with all copies of the Data
+  #     Files or Software
+  # (b) this copyright and permission notice appear in associated Documentation
   #
   # `focaccia` distributes this license as `LICENSE-UNICODE` in crate bundles
-  # and includes `AND Unicode-DFS-2016` in the `Cargo.toml` SPDX license
-  # expression. See: https://spdx.org/licenses/Unicode-DFS-2016.html.
+  # and includes `AND Unicode-3.0` in the `Cargo.toml` SPDX license expression.
+  # See: https://spdx.org/licenses/Unicode-3.0.html.
   #
   # Updates to Unicode Data Files performed by this `rake` task also update the
   # embedded license.

scripts/gen_case_lookups.rb

@@ -1,36 +1,35 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-# Create lookup tables and tests for Unicode Case Folding transformations using
-# the `CaseFolding.txt` Unicode Data File, which is subject to these constraints:
+# - Except where otherwise more broadly permitted or licensed:
+#   - you may not make copies of or modifications to Unicode Products for
+#     public distribution, or incorporate Unicode Products in whole or in part
+#     into any product or publication, or otherwise publicly distribute them,
+#     without the express written permission of Unicode, and
+#   - you may not copy or extract fonts or font data from any Unicode Products,
+#     including but not limited to Unicode Code Charts.
+# - All Unicode Data Files and Unicode Software are subject to the terms and
+#   conditions of the free and open-source Unicode License v3, unless otherwise
+#   indicated by specific restriction, permission, or license identified at the
+#   point of release or in such software, data file, or other documentation.
 #
-# 1. Certain documents and files on this website contain a legend indicating
-#    that "Modification is permitted." Any person is hereby authorized,
-#    without fee, to modify such documents and files to create derivative
-#    works conforming to the Unicode® Standard, subject to Terms and
-#    Conditions herein.
-# 2. Any person is hereby authorized, without fee, to view, use, reproduce,
-#    and distribute all documents and files, subject to the Terms and
-#    Conditions herein.
-# 3. Further specifications of rights and restrictions pertaining to the use
-#    of the Unicode DATA FILES and SOFTWARE can be found in the Unicode Data
-#    Files and Software License.
+# The Unicode License v3, which can be found at <https://www.unicode.org/license.txt>
+# is included in this repository. The license requires one of:
 #
-# The Unicode Data Files and Software License, which can be found at
-# <https://www.unicode.org/license.txt> is included in this repository. The
-# license requires one of:
-#
-# (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.
+# (a) this copyright and permission notice appear with all copies of the Data
+#     Files or Software
+# (b) this copyright and permission notice appear in associated Documentation
 #
 # `focaccia` distributes this license as `LICENSE-UNICODE` in crate bundles
-# and includes `AND Unicode-DFS-2016` in the `Cargo.toml` SPDX license
-# expression. See: https://spdx.org/licenses/Unicode-DFS-2016.html.
+# and includes `AND Unicode-3.0` in the `Cargo.toml` SPDX license expression.
+# See: https://spdx.org/licenses/Unicode-3.0.html.
+#
+# Updates to Unicode Data Files performed by this `rake` task also update the
+# embedded license.
 #
 # The generated sources created by this script are subject to both the MIT
-# License contained in this repository, `LICENSE`, and the Unicode Data Files
-# and Software License, `LICENSE-UNICODE`.
+# License contained in this repository, `LICENSE`, and the Unicode License v3,
+# `LICENSE-UNICODE`.
 
 require 'fileutils'