summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Pankov <ypankov@fastmail.com>2020-04-29 04:37:09 +0300
committerRobert Mustacchi <rm@fingolfin.org>2020-05-04 18:12:39 -0700
commit3052595ab8ddcc51231d239415b5eba5d913d45b (patch)
tree202a2956a0159f2e7cc83f193670e1bf3169fd13
parentcd61ae21816e53b94bc1673f3f1aa651fc3115e8 (diff)
downloadillumos-joyent-3052595ab8ddcc51231d239415b5eba5d913d45b.tar.gz
11807 "private use area" characters should be marked as "printable"
Reviewed by: Joshua M. Clulow <josh@sysmgr.org> Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Robert Mustacchi <rm@fingolfin.org>
-rw-r--r--usr/src/data/locale/data/common.UTF-8.src10
-rwxr-xr-xusr/src/data/locale/tools/utf8-rollup.pl3
2 files changed, 7 insertions, 6 deletions
diff --git a/usr/src/data/locale/data/common.UTF-8.src b/usr/src/data/locale/data/common.UTF-8.src
index cd8806caf6..798e6832fb 100644
--- a/usr/src/data/locale/data/common.UTF-8.src
+++ b/usr/src/data/locale/data/common.UTF-8.src
@@ -15438,7 +15438,6 @@ cntrl <NULL>;/
<ACTIVATE_ARABIC_FORM_SHAPING>;/
<NATIONAL_DIGIT_SHAPES>;/
<NOMINAL_DIGIT_SHAPES>;/
- <PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>;/
<ZERO_WIDTH_NO-BREAK_SPACE>;/
<INTERLINEAR_ANNOTATION_ANCHOR>;/
<INTERLINEAR_ANNOTATION_SEPARATOR>;/
@@ -15552,9 +15551,7 @@ cntrl <NULL>;/
<TAG_VERTICAL_LINE>;/
<TAG_RIGHT_CURLY_BRACKET>;/
<TAG_TILDE>;/
- <CANCEL_TAG>;/
- <PRIVATE_USE_AREA-F0000>;...;<PRIVATE_USE_AREA-FFFFD>;/
- <PRIVATE_USE_AREA-100000>;...;<PRIVATE_USE_AREA-10FFFD>
+ <CANCEL_TAG>
digit <zero>;/
<one>;/
<two>;/
@@ -21461,6 +21458,7 @@ graph <DOLLAR_SIGN>;/
<MEETEI_MAYEK_VOWEL_SIGN_NUNG>;/
<MEETEI_MAYEK_LUM_IYEK>;/
<MEETEI_MAYEK_APUN_IYEK>;/
+ <PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>;/
<HEBREW_POINT_JUDEO-SPANISH_VARIKA>;/
<HEBREW_LETTER_ALTERNATIVE_PLUS_SIGN>;/
<ARABIC_SYMBOL_DOT_ABOVE>;/
@@ -26042,7 +26040,9 @@ graph <DOLLAR_SIGN>;/
<VARIATION_SELECTOR-253>;/
<VARIATION_SELECTOR-254>;/
<VARIATION_SELECTOR-255>;/
- <VARIATION_SELECTOR-256>
+ <VARIATION_SELECTOR-256>;/
+ <PRIVATE_USE_AREA-F0000>;...;<PRIVATE_USE_AREA-FFFFD>;/
+ <PRIVATE_USE_AREA-100000>;...;<PRIVATE_USE_AREA-10FFFD>
lower <a>;/
<b>;/
<c>;/
diff --git a/usr/src/data/locale/tools/utf8-rollup.pl b/usr/src/data/locale/tools/utf8-rollup.pl
index 829c9a3490..ed1d2edaf3 100755
--- a/usr/src/data/locale/tools/utf8-rollup.pl
+++ b/usr/src/data/locale/tools/utf8-rollup.pl
@@ -149,7 +149,8 @@ sub parse_unidata {
$cat = "alpha";
} elsif ($d[2] =~ /^P/) {
$cat = "punct";
- } elsif ($d[2] =~ /^M/ || $d[2] =~ /^N/ || $d[2] =~ /^S/) {
+ } elsif ($d[2] =~ /^Co/ || $d[2] =~ /^M/ || $d[2] =~ /^N/ ||
+ $d[2] =~ /^S/) {
$cat = "graph";
} elsif ($d[2] =~ /^C/) {
$cat = "cntrl";