svn commit: r353130 - in head: share/ctypedef tools/tools/locale/tools

[Yuri Pankov]

Author: yuripv
Date: Sat Oct  5 22:17:54 2019
New Revision: 353130
URL: https://svnweb.freebsd.org/changeset/base/353130

Log:
  Mark "private use area" characters as printable.
  
  At least some of the characters in E000-F8FF range are used by Powerline
  fonts, and having no attributes for these ranges in UnicodeData.txt
  other than "Other, Private Use" it should be safe to mark all of them as
  printable.  Some actually were before r340491, so this fixes the
  regression introduced there as well.
  
  PR:		240911
  Reviewed by:	bapt
  Tested by:	Daniel Ponte <amigan at gmail.com>
  Differential Revision:	https://reviews.freebsd.org/D21850

Modified:
  head/share/ctypedef/C.UTF-8.src
  head/tools/tools/locale/tools/utf8-rollup.pl

Modified: head/share/ctypedef/C.UTF-8.src
==============================================================================
--- head/share/ctypedef/C.UTF-8.src	Sat Oct  5 21:52:06 2019	(r353129)
+++ head/share/ctypedef/C.UTF-8.src	Sat Oct  5 22:17:54 2019	(r353130)
@@ -16434,7 +16434,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>;/
@@ -16549,9 +16548,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>;/
@@ -22555,6 +22552,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>;/
@@ -27547,7 +27545,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>;/

Modified: head/tools/tools/locale/tools/utf8-rollup.pl
==============================================================================
--- head/tools/tools/locale/tools/utf8-rollup.pl	Sat Oct  5 21:52:06 2019	(r353129)
+++ head/tools/tools/locale/tools/utf8-rollup.pl	Sat Oct  5 22:17:54 2019	(r353130)
@@ -161,7 +161,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";