Module Name: src
Committed By: rin
Date: Mon Oct 17 11:20:30 UTC 2022
Modified Files:
src/share/locale/ctype: en_US.UTF-8.src
Log Message:
Add "Emoji & Pictographs" character definitions from Unicode 15.0.0
(previously 10.0.0):
http://www.unicode.org/charts/
They are classified as PUNCT, which has been used for characters other
than blank, alphabetic, or digit ones.
Glyph widths are taken from "East Asian Width":
https://www.unicode.org/Public/15.0.0/ucd/EastAsianWidth.txt
Characters of "F" or "W" are classified to SWIDTH2, and others are to
SWIDTH1, as usual. See also:
https://www.unicode.org/reports/tr11/
XXX
It would be really nice if someone could check and update characters in
categories other than Emoji...
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/locale/ctype/en_US.UTF-8.src
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/locale/ctype/en_US.UTF-8.src
diff -u src/share/locale/ctype/en_US.UTF-8.src:1.6 src/share/locale/ctype/en_US.UTF-8.src:1.7
--- src/share/locale/ctype/en_US.UTF-8.src:1.6 Sun Jun 3 07:54:51 2018
+++ src/share/locale/ctype/en_US.UTF-8.src Mon Oct 17 11:20:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: en_US.UTF-8.src,v 1.6 2018/06/03 07:54:51 rin Exp $ */
+/* $NetBSD: en_US.UTF-8.src,v 1.7 2022/10/17 11:20:29 rin Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/share/mklocale/UTF-8.src,v 1.1 2004/03/27 08:14:14 tjr Exp $ */
/*
@@ -1848,10 +1848,16 @@ SWIDTH1 0x25a0 - 0x25ff
* U+2600 - U+26FF : Miscellaneous Symbols
*/
-GRAPH 0x2600 - 0x2613 0x2616 0x2617 0x2619 - 0x267d 0x2680 - 0x2689
-PUNCT 0x2600 - 0x2613 0x2616 0x2617 0x2619 - 0x267d 0x2680 - 0x2689
-PRINT 0x2600 - 0x2613 0x2616 0x2617 0x2619 - 0x267d 0x2680 - 0x2689
-SWIDTH1 0x2600 - 0x2613 0x2616 0x2617 0x2619 - 0x267d 0x2680 - 0x2689
+GRAPH 0x2600 - 0x26ff
+PUNCT 0x2600 - 0x26ff
+PRINT 0x2600 - 0x26ff
+SWIDTH1 0x2600 - 0x2613 0x2616 - 0x2647 0x2654 - 0x267e 0x2680 - 0x2692
+SWIDTH1 0x2694 - 0x26a0 0x26a2 - 0x26a9 0x26ac - 0x26bc 0x26bf - 0x26c3
+SWIDTH1 0x26c6 - 0x26cd 0x26cf - 0x26d3 0x26d5 - 0x26e9 0x26eb - 0x26f1
+SWIDTH1 0x26f4 0x26f6 - 0x26f9 0x26fb - 0x26fc 0x26fe - 0x26ff
+SWIDTH2 0x2614 - 0x2615 0x2648 - 0x2653 0x267f 0x2693 0x26a1
+SWIDTH2 0x26aa - 0x26ab 0x26bd - 0x26be 0x26c4 - 0x26c5 0x26ce
+SWIDTH2 0x26d4 0x26ea 0x26f2 - 0x26f3 0x26f5 0x26fa 0x26fd
/*
@@ -2435,28 +2441,39 @@ SWIDTH1 0x1f650 - 0x1f67f
* U+1F680 - U+1F6FF : Transport and Map Symbols
*/
-GRAPH 0x1f680 - 0x1f6d4 0x1f6e0 - 0x1f6ec 0x1f6f0 - 0x1f6f8
-PUNCT 0x1f680 - 0x1f6d4 0x1f6e0 - 0x1f6ec 0x1f6f0 - 0x1f6f8
-PRINT 0x1f680 - 0x1f6d4 0x1f6e0 - 0x1f6ec 0x1f6f0 - 0x1f6f8
+GRAPH 0x1f680 - 0x1f6d7 0x1f6dc - 0x1f6ec 0x1f6f0 - 0x1f6fc
+PUNCT 0x1f680 - 0x1f6d7 0x1f6dc - 0x1f6ec 0x1f6f0 - 0x1f6fc
+PRINT 0x1f680 - 0x1f6d7 0x1f6dc - 0x1f6ec 0x1f6f0 - 0x1f6fc
SWIDTH1 0x1f6c6 - 0x1f6cb 0x1f6cd - 0x1f6cf 0x1f6d3 - 0x1f6d4
SWIDTH1 0x1f6e0 - 0x1f6ea 0x1f6f0 - 0x1f6f3
-SWIDTH2 0x1f680 - 0x1f6c5 0x1f6cc 0x1f6d0 - 0x1f6d2 0x1f6eb - 0x1f6ec
-SWIDTH2 0x1f6f4 - 0x1f6f8
+SWIDTH2 0x1f680 - 0x1f6c5 0x1f6cc 0x1f6d0 - 0x1f6d2 0x1f6d5 - 0x1f6d7
+SWIDTH2 0x1f6dc - 0x1f6df 0x1f6eb - 0x1f6ec 0x1f6f4 - 0x1f6fc
/*
* U+1F900 - U+1F9FF : Supplemental Symbols and Pictographs
*/
-GRAPH 0x1f900 - 0x1f90b 0x1f910 - 0x1f93e 0x1f940 - 0x1f94c
-GRAPH 0x1f950 - 0x1f96b 0x1f980 - 0x1f997 0x1f9c0 0x1f9d0 - 0x1f9e6
-PUNCT 0x1f900 - 0x1f90b 0x1f910 - 0x1f93e 0x1f940 - 0x1f94c
-PUNCT 0x1f950 - 0x1f96b 0x1f980 - 0x1f997 0x1f9c0 0x1f9d0 - 0x1f9e6
-PRINT 0x1f900 - 0x1f90b 0x1f910 - 0x1f93e 0x1f940 - 0x1f94c
-PRINT 0x1f950 - 0x1f96b 0x1f980 - 0x1f997 0x1f9c0 0x1f9d0 - 0x1f9e6
-SWIDTH1 0x1f900 - 0x1f90b
-SWIDTH2 0x1f910 - 0x1f93e 0x1f940 - 0x1f94c 0x1f950 - 0x1f96b
-SWIDTH2 0x1f980 - 0x1f997 0x1f9c0 0x1f9d0 - 0x1f9e6
+GRAPH 0x1f900 - 0x1f9ff
+PUNCT 0x1f900 - 0x1f9ff
+PRINT 0x1f900 - 0x1f9ff
+SWIDTH1 0x1f900 - 0x1f90b 0x1f93b 0x1f946
+SWIDTH2 0x1f90c - 0x1f93a 0x1f93c - 0x1f945 0x1f947 - 0x1f9ff
+
+
+/*
+ * U+1FA70 - U+1FAFF : Symbols and Pictographs Extended-A
+ */
+
+GRAPH 0x1fa70 - 0x1fa7c 0x1fa80 - 0x1fa88 0x1fa90 - 0x1fabd
+GRAPH 0x1fabf - 0x1fac5 0x1face - 0x1fadb 0x1fae0 - 0x1fae8
+GRAPH 0x1faf0 - 0x1faf8
+PUNCT 0x1fa70 - 0x1fa7c 0x1fa80 - 0x1fa88 0x1fa90 - 0x1fabd
+PUNCT 0x1fabf - 0x1fac5 0x1face - 0x1fadb 0x1fae0 - 0x1fae8
+PUNCT 0x1faf0 - 0x1faf8
+SWIDTH2 0x1fa70 - 0x1fa7c 0x1fa80 - 0x1fa88 0x1fa90 - 0x1fabd
+SWIDTH2 0x1fabf - 0x1fac5 0x1face - 0x1fadb 0x1fae0 - 0x1fae8
+SWIDTH2 0x1faf0 - 0x1faf8
/*
