Merge branch 'master' into scratch/comp-static-data

1 files changed, 16 insertions, 1 deletions

diff --git a/admin/notes/unicode b/admin/notes/unicode
index 0e000365da7..31c850af8fd 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -22,6 +22,7 @@ Emacs uses the following files from the Unicode Character Database
   . confusables.txt
   . emoji-data.txt
   . emoji-zwj-sequences.txt
+  . emoji-variation-sequences.txt
   . emoji-sequences.txt
   . BidiCharacterTest.txt
 
@@ -29,7 +30,7 @@ Emacs also uses the file emoji-test.txt which should be imported from
 the Unicode's Public/emoji/ directory, and IdnaMappingTable.txt from
 the Public/idna/ directory.
 
-First, the first 14 files, emoji-test.txt and IdnaMappingTable.txt
+First, the first 15 files, emoji-test.txt and IdnaMappingTable.txt
 need to be copied into admin/unidata/, and the file
 https://www.unicode.org/copyright.html should be copied over
 copyright.html in admin/unidata (some of them might need trailing
@@ -142,6 +143,20 @@ generated for auto-composition-emoji-eligible-codepoints by
 admin/unidata/emoji-zwj.awk.  Note that your emoji font might not have
 glyphs for the newest codepoints yet.
 
+Visit "emoji-variation-sequences.txt", and run the following lisp
+fragment to actually insert the described codepoints, then check that
+all the text in parentheses displays correctly (it can be helpful to
+have `glyphless-char-display-control' customized to show hex codes for
+variation selectors).
+
+(save-excursion
+ (goto-char (point-min))
+ (while (re-search-forward "^\\([0-9A-Z]+\\) \\([0-9A-Z]+\\).*(\\([^)]+\\))" nil t)
+   (let ((ch (string-to-number (match-string 1) 16))
+         (sel (string-to-number (match-string 2) 16))
+         (sp (match-string 3)))
+     (replace-match (format "%s %c%c " sp ch sel) nil nil nil 3))))
+
 Finally, etc/NEWS should be updated to announce the support for the
 new Unicode version.