Update maintainer instructions and scripts.

3 files changed, 21 insertions, 17 deletions

diff --git a/Admin/README.update b/Admin/README.update
index 8d50baf..dc8ebd8 100644
--- a/Admin/README.update
+++ b/Admin/README.update
@@ -13,14 +13,22 @@ environment variables
 - UCD, which points to the directory containing the Unicode UCD
 
 Before updating, read the Unicode release note carefully and
-understand any changes that might affect Gnulib.  In particular,
-changes in the text segmentation algorithms (provided by unilbrk.h,
-uniwbrk.h, unigbrk.h) often require manual adjustment of source files.
-
-The release notes are typically available at:
+understand any changes that might affect Gnulib.  The release notes are
+typically available at:
 
   https://unicode.org/versions/Unicode<VERSION>/
 
+In particular, changes in the text segmentation algorithms often
+require manual adjustment of source files:
+
+  - For unigbrk/ updates, look at the revision history of UAX #29
+    <https://www.unicode.org/reports/tr29/>, section 3.
+  - For uniwbrk/ updates, look at the revision history of UAX #29
+    <https://www.unicode.org/reports/tr29/>, section 4.
+  - For unilbrk/ updates, look at the revision history of UAX #14
+    <https://www.unicode.org/reports/tr14/>.
+
+
 * Regenerating the Gnulib source code
 
 The source files in Gnulib are updated using a couple of tools:
diff --git a/Admin/gen-uni-tables b/Admin/gen-uni-tables
index c75ba9e..d86787a 100755
--- a/Admin/gen-uni-tables
+++ b/Admin/gen-uni-tables
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015-2018 Free Software Foundation, Inc.
+# Copyright (C) 2015-2021 Free Software Foundation, Inc.
 #
 # 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
@@ -106,6 +106,7 @@ ver=`sed -n -e 's/.*Version \([0-9.]*\).*/\1/p' < "$UCD/ReadMe.txt"`
  && "$tmp/gen-uni-tables" "$UCD/UnicodeData.txt" \
                           "$UCD/PropList.txt" \
                           "$UCD/DerivedCoreProperties.txt" \
+                          "$UCD/emoji/emoji-data.txt" \
                           "$UCD/ArabicShaping.txt" \
                           "$UCD/Scripts.txt" \
                           "$UCD/Blocks.txt" \
@@ -131,8 +132,8 @@ ver=`sed -n -e 's/.*Version \([0-9.]*\).*/\1/p' < "$UCD/ReadMe.txt"`
 
 # Copy necessary files from UCD
 for dstfile in "$GNULIB_SRCDIR/tests/uninorm/NormalizationTest.txt" \
-             "$GNULIB_SRCDIR/tests/uniwbrk/WordBreakTest.txt" \
-             "$GNULIB_SRCDIR/tests/unigbrk/GraphemeBreakTest.txt" ; do
+               "$GNULIB_SRCDIR/tests/uniwbrk/WordBreakTest.txt" \
+               "$GNULIB_SRCDIR/tests/unigbrk/GraphemeBreakTest.txt" ; do
   srcfile=`expr "$dstfile" : '.*/\(.*\)'`
   if test -f "$UCD/$srcfile"; then
     srcfile="$UCD/$srcfile"
diff --git a/Admin/gen-uninames b/Admin/gen-uninames
index 4121260..795f418 100755
--- a/Admin/gen-uninames
+++ b/Admin/gen-uninames
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2015-2021 Free Software Foundation, Inc.
 #
 # 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
@@ -93,19 +93,14 @@ signal=0
 ("$CLISP" --version) >/dev/null 2>/dev/null \
   || { echo "$progname: *** clisp not found; skipping uniname" 1>&2; exit 0; }
 
-sed -e '/^[0-9A-F]*;</d' "$UCD/UnicodeData.txt" > "$tmp/UnicodeDataNames.txt"
-
-sed -e 's/ *$//' -e '/^#/d' -e '/^$/d' < "$UCD/NameAliases.txt" \
-    > "$tmp/NameAliases.txt"
-
 "$CLISP" "$GNULIB_SRCDIR/lib/uniname/gen-uninames.lisp" \
-         "$tmp/UnicodeDataNames.txt" \
+         "$UCD/UnicodeData.txt" \
          "$GNULIB_SRCDIR/lib/uniname/uninames.h" \
-         "$tmp/NameAliases.txt"
+         "$UCD/NameAliases.txt"
 
 # Copy necessary files from UCD
 for dstfile in "$GNULIB_SRCDIR/tests/uniname/UnicodeData.txt" \
-             "$GNULIB_SRCDIR/tests/uniname/NameAliases.txt" ; do
+               "$GNULIB_SRCDIR/tests/uniname/NameAliases.txt" ; do
   srcfile=`expr "$dstfile" : '.*/\(.*\)'`
   if test -f "$UCD/$srcfile"; then
     srcfile="$UCD/$srcfile"