4 files changed, 85 insertions, 20 deletions

diff --git a/share/ctypedef/en_US.UTF-8.src b/share/ctypedef/en_US.UTF-8.src
index bebdb9180b56..836e22cfde51 100644
--- a/share/ctypedef/en_US.UTF-8.src
+++ b/share/ctypedef/en_US.UTF-8.src
@@ -6241,6 +6241,12 @@ graph	<MEETEI_MAYEK_LETTER_KOK>;...;<MEETEI_MAYEK_APUN_IYEK>
 digit	<MEETEI_MAYEK_DIGIT_ZERO>;...;<MEETEI_MAYEK_DIGIT_NINE>
 
 **********************************************************************
+* 0xE000 - 0xF8FF Private Use Area (from pre-CLDR data)
+**********************************************************************
+
+graph	<PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>
+
+**********************************************************************
 * 0xFB50 - 0xFDFF Arabic Presentation Forms (differential)
 **********************************************************************
 
@@ -6279,6 +6285,17 @@ punct	<SMALL_COMMA>;...;<SMALL_COMMERCIAL_AT>
 blank	<ZERO_WIDTH_NO-BREAK_SPACE>
 
 **********************************************************************
+* 0xFF00 - 0xFFFF Half- and Fullwidth Punctuation (from pre-CLDR data)
+**********************************************************************
+
+punct	<FULLWIDTH_EXCLAMATION_MARK>;...;<FULLWIDTH_SOLIDUS>;/
+	<FULLWIDTH_COLON>;...;<FULLWIDTH_COMMERCIAL_AT>;/
+	<FULLWIDTH_LEFT_SQUARE_BRACKET>;...;<FULLWIDTH_GRAVE_ACCENT>;/
+	<FULLWIDTH_LEFT_CURLY_BRACKET>;...;<HALFWIDTH_KATAKANA_MIDDLE_DOT>;/
+	<FULLWIDTH_CENT_SIGN>;...;<FULLWIDTH_WON_SIGN>;/
+	<HALFWIDTH_FORMS_LIGHT_VERTICAL>;...;<HALFWIDTH_WHITE_CIRCLE>
+
+**********************************************************************
 * 0x10300 - 0x1032F Old Italic
 **********************************************************************
 
diff --git a/tools/tools/locale/README b/tools/tools/locale/README
index 35830fa173ff..1874b750315c 100644
--- a/tools/tools/locale/README
+++ b/tools/tools/locale/README
@@ -2,23 +2,37 @@
 
 To generate the locales:
 
-Tools needed: java, perl, devel/p5-Tie-IxHash, converters/p5-Text-Iconv and
-textproc/p5-XML-Parser
-
-fetch cldr data from: http://cldr.unicode.org
-extract in a directory ~/unicode/cldr/v30.0.3 for example
-fetch unidata from http://www.unicode.org/Public/zipped/ (latest version)
-extract in a directory ~/unicode/UNIDATA/9.0.0 for example
-
-Note that the prebuilt cldr tools are not working on freebsd, it needs to
-be rebuilt:
-cd $CLDRDIR/tools/java
-ant build
-
-either modify tools/tools/locales/etc/unicode.conf or export variables:
-CLDRDIR="~/unicode/cldr/v30.0.3"
-UNIDATADIR="~/unicode/UNIDATA/9.0.0"
-
-run:
-make POSIX
-make install
+Tools needed:
+	java (openjdk >= 8)
+	perl
+	converters/p5-Text-Iconv
+	devel/p5-Tie-IxHash
+	textproc/p5-XML-Parser
+
+Fetch CLDR data from: http://unicode.org/Public/cldr/.  You need all of the
+core.zip, keyboards.zip, and tools.zip.
+
+Extract:
+	mkdir -p ~/unicode/cldr/v33.0
+	cd ~/unicode/cldr/v33.0
+	unzip ~/core.zip ~/keyboards.zip ~/tools.zip
+
+Fetch unidata (UCD.zip) from http://www.unicode.org/Public/zipped/latest.
+
+Extract:
+	mkdir -p ~/unicode/UNIDATA/11.0.0
+	cd ~/unicode/UNIDATA/11.0.0
+	unzip ~/UCD.zip
+
+Either modify tools/tools/locales/etc/unicode.conf or export variables:
+	CLDRDIR=~/unicode/cldr/v33.0; export CLDRDIR
+	UNIDATADIR=~/unicode/UNIDATA/9.0.0; export UNIDATADIR
+
+Build the CLDR tools:
+	cd $CLDRDIR/tools/java
+	ant jar
+
+Run:
+	make POSIX
+	make
+	make install
diff --git a/tools/tools/locale/etc/common.UTF-8.src b/tools/tools/locale/etc/common.UTF-8.src
index bebdb9180b56..836e22cfde51 100644
--- a/tools/tools/locale/etc/common.UTF-8.src
+++ b/tools/tools/locale/etc/common.UTF-8.src
@@ -6241,6 +6241,12 @@ graph	<MEETEI_MAYEK_LETTER_KOK>;...;<MEETEI_MAYEK_APUN_IYEK>
 digit	<MEETEI_MAYEK_DIGIT_ZERO>;...;<MEETEI_MAYEK_DIGIT_NINE>
 
 **********************************************************************
+* 0xE000 - 0xF8FF Private Use Area (from pre-CLDR data)
+**********************************************************************
+
+graph	<PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>
+
+**********************************************************************
 * 0xFB50 - 0xFDFF Arabic Presentation Forms (differential)
 **********************************************************************
 
@@ -6279,6 +6285,17 @@ punct	<SMALL_COMMA>;...;<SMALL_COMMERCIAL_AT>
 blank	<ZERO_WIDTH_NO-BREAK_SPACE>
 
 **********************************************************************
+* 0xFF00 - 0xFFFF Half- and Fullwidth Punctuation (from pre-CLDR data)
+**********************************************************************
+
+punct	<FULLWIDTH_EXCLAMATION_MARK>;...;<FULLWIDTH_SOLIDUS>;/
+	<FULLWIDTH_COLON>;...;<FULLWIDTH_COMMERCIAL_AT>;/
+	<FULLWIDTH_LEFT_SQUARE_BRACKET>;...;<FULLWIDTH_GRAVE_ACCENT>;/
+	<FULLWIDTH_LEFT_CURLY_BRACKET>;...;<HALFWIDTH_KATAKANA_MIDDLE_DOT>;/
+	<FULLWIDTH_CENT_SIGN>;...;<FULLWIDTH_WON_SIGN>;/
+	<HALFWIDTH_FORMS_LIGHT_VERTICAL>;...;<HALFWIDTH_WHITE_CIRCLE>
+
+**********************************************************************
 * 0x10300 - 0x1032F Old Italic
 **********************************************************************
 
diff --git a/tools/tools/locale/etc/manual-input.UTF-8 b/tools/tools/locale/etc/manual-input.UTF-8
index f234a9b711d8..c856ccbe513e 100644
--- a/tools/tools/locale/etc/manual-input.UTF-8
+++ b/tools/tools/locale/etc/manual-input.UTF-8
@@ -877,6 +877,12 @@ graph	<MEETEI_MAYEK_LETTER_KOK>;...;<MEETEI_MAYEK_APUN_IYEK>
 digit	<MEETEI_MAYEK_DIGIT_ZERO>;...;<MEETEI_MAYEK_DIGIT_NINE>
 
 **********************************************************************
+* 0xE000 - 0xF8FF Private Use Area (from pre-CLDR data)
+**********************************************************************
+
+graph	<PRIVATE_USE_AREA-E000>;...;<PRIVATE_USE_AREA-F8FF>
+
+**********************************************************************
 * 0xFB50 - 0xFDFF Arabic Presentation Forms (differential)
 **********************************************************************
 
@@ -915,6 +921,17 @@ punct	<SMALL_COMMA>;...;<SMALL_COMMERCIAL_AT>
 blank	<ZERO_WIDTH_NO-BREAK_SPACE>
 
 **********************************************************************
+* 0xFF00 - 0xFFFF Half- and Fullwidth Punctuation (from pre-CLDR data)
+**********************************************************************
+
+punct	<FULLWIDTH_EXCLAMATION_MARK>;...;<FULLWIDTH_SOLIDUS>;/
+	<FULLWIDTH_COLON>;...;<FULLWIDTH_COMMERCIAL_AT>;/
+	<FULLWIDTH_LEFT_SQUARE_BRACKET>;...;<FULLWIDTH_GRAVE_ACCENT>;/
+	<FULLWIDTH_LEFT_CURLY_BRACKET>;...;<HALFWIDTH_KATAKANA_MIDDLE_DOT>;/
+	<FULLWIDTH_CENT_SIGN>;...;<FULLWIDTH_WON_SIGN>;/
+	<HALFWIDTH_FORMS_LIGHT_VERTICAL>;...;<HALFWIDTH_WHITE_CIRCLE>
+
+**********************************************************************
 * 0x10300 - 0x1032F Old Italic
 **********************************************************************