Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Mar 2017 17:48:41 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r315567 - in head/tools/tools/locale: . etc etc/charmaps etc/final-maps tools
Message-ID:  <201703191748.v2JHmfbv048374@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sun Mar 19 17:48:41 2017
New Revision: 315567
URL: https://svnweb.freebsd.org/changeset/base/315567

Log:
  Prepare the removal of the zh_TW.Big5 encoding

Deleted:
  head/tools/tools/locale/etc/charmaps/Big5.TXT
  head/tools/tools/locale/etc/final-maps/map.Big5
Modified:
  head/tools/tools/locale/Makefile
  head/tools/tools/locale/etc/charmaps.xml
  head/tools/tools/locale/tools/convert_map.pl
  head/tools/tools/locale/tools/finalize

Modified: head/tools/tools/locale/Makefile
==============================================================================
--- head/tools/tools/locale/Makefile	Sun Mar 19 17:46:08 2017	(r315566)
+++ head/tools/tools/locale/Makefile	Sun Mar 19 17:48:41 2017	(r315567)
@@ -35,7 +35,6 @@ COLLATION_SPECIAL?= \
 	sr_Cyrl_RS ISO8859-5 \
 	zh_Hans_CN GB2312 \
 	zh_Hans_CN eucCN \
-	zh_Hant_TW Big5 \
 	zh_Hans_CN GB18030 \
 	zh_Hans_CN GBK \
 	ja_JP eucJP \
@@ -132,8 +131,7 @@ BASE_LOCALES_OF_INTEREST?= \
 	th_TH lo_LA bo_IN my_MM pa_Guru_IN ka_GE chr_US \
 	km_KH shi_Tfng_MA ii_CN vai_Vaii_LR vi_VN
 
-ENCODINGS=	Big5 \
-		CP1251 \
+ENCODINGS=	CP1251 \
 		CP866 \
 		CP949 \
 		eucCN \

Modified: head/tools/tools/locale/etc/charmaps.xml
==============================================================================
--- head/tools/tools/locale/etc/charmaps.xml	Sun Mar 19 17:46:08 2017	(r315566)
+++ head/tools/tools/locale/etc/charmaps.xml	Sun Mar 19 17:48:41 2017	(r315567)
@@ -188,7 +188,6 @@
 		countries="HK" />
 	<language name="zh"
 		family="Hant"
-		encoding="Big5"
 		countries="TW" />
 </languages>
 
@@ -403,111 +402,101 @@
 	<!-- Asian characters -->
 	<translation encoding="GB2312 eucCN" cldr="C"
 	    unicode="FULLWIDTH LATIN CAPITAL LETTER C" />
-	<translation encoding="Big5" cldr="D"
-	    unicode="FULLWIDTH LATIN CAPITAL LETTER D" />
-	<translation encoding="GB2312 eucCN Big5" cldr="N"
+	<translation encoding="GB2312 eucCN" cldr="N"
 	    unicode="FULLWIDTH LATIN CAPITAL LETTER N" />
-	<translation encoding="Big5" cldr="T"
-	    unicode="FULLWIDTH LATIN CAPITAL LETTER T" />
-	<translation encoding="Big5" cldr="W"
-	    unicode="FULLWIDTH LATIN CAPITAL LETTER W" />
 	<translation encoding="GB2312 eucCN" cldr="Y"
 	    unicode="FULLWIDTH LATIN CAPITAL LETTER Y" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="one"
+	<translation encoding="GB2312 eucCN" cldr="one"
 	    unicode="FULLWIDTH DIGIT ONE" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="two"
+	<translation encoding="GB2312 eucCN" cldr="two"
 	    unicode="FULLWIDTH DIGIT TWO" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="three"
+	<translation encoding="GB2312 eucCN" cldr="three"
 	    unicode="FULLWIDTH DIGIT THREE" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="four"
+	<translation encoding="GB2312 eucCN" cldr="four"
 	    unicode="FULLWIDTH DIGIT FOUR" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="five"
+	<translation encoding="GB2312 eucCN" cldr="five"
 	    unicode="FULLWIDTH DIGIT FIVE" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="six"
+	<translation encoding="GB2312 eucCN" cldr="six"
 	    unicode="FULLWIDTH DIGIT SIX" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="seven"
+	<translation encoding="GB2312 eucCN" cldr="seven"
 	    unicode="FULLWIDTH DIGIT SEVEN" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="eight"
+	<translation encoding="GB2312 eucCN" cldr="eight"
 	    unicode="FULLWIDTH DIGIT EIGHT" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="nine"
+	<translation encoding="GB2312 eucCN" cldr="nine"
 	    unicode="FULLWIDTH DIGIT NINE" />
-	<translation encoding="GB2312 Big5 eucCN" cldr="zero"
+	<translation encoding="GB2312 eucCN" cldr="zero"
 	    unicode="FULLWIDTH DIGIT ZERO" />
-	<translation encoding="GB2312 eucCN Big5" cldr="space"
+	<translation encoding="GB2312 eucCN" cldr="space"
 	    unicode="IDEOGRAPHIC SPACE" />
-	<translation encoding="GB2312 eucCN Big5" cldr="FULL STOP"
+	<translation encoding="GB2312 eucCN" cldr="FULL STOP"
 	    unicode="FULLWIDTH FULL STOP" />
-	<translation encoding="GB2312 eucCN Big5" cldr="SOLIDUS"
+	<translation encoding="GB2312 eucCN" cldr="SOLIDUS"
 	    unicode="FULLWIDTH SOLIDUS" />
-	<translation encoding="GB2312 eucCN Big5" cldr="COMMA"
+	<translation encoding="GB2312 eucCN" cldr="COMMA"
 	    unicode="FULLWIDTH COMMA" />
-	<translation encoding="GB2312 eucCN Big5" cldr="HYPHEN-MINUS"
+	<translation encoding="GB2312 eucCN" cldr="HYPHEN-MINUS"
 	    unicode="FULLWIDTH HYPHEN-MINUS" />
-	<translation encoding="Big5" cldr="DOLLAR SIGN"
-	    unicode="FULLWIDTH DOLLAR SIGN" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E00" ucc="4E00" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E03" ucc="4E03" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E09" ucc="4E09" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E0A" ucc="4E0A" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E0B" ucc="4E0B" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E0D" ucc="4E0D" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E5D" ucc="4E5D" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E8C" ucc="4E8C" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-4E94" ucc="4E94" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-516B" ucc="516B" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-516D" ucc="516D" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5206" ucc="5206" />
 	<translation encoding="eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-524D" ucc="524D" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5341" ucc="5341" />
 	<translation
-	    encoding="GB2312 GB18030 GBK Big5 eucCN eucJP SJIS"
+	    encoding="GB2312 GB18030 GBK eucCN eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-5348" ucc="5348" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5426" ucc="5426" />
 	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5468" ucc="5468" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-56DB" ucc="56DB" />
 	<translation encoding="eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-571F" ucc="571F" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-5B9A" ucc="5B9A" />
 	<translation
-	    encoding="GB2312 GB18030 GBK Big5 eucCN eucJP SJIS"
+	    encoding="GB2312 GB18030 GBK eucCN eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-5E74" ucc="5E74" />
 	<translation encoding="eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-5F8C" ucc="5F8C" />
 	<translation
-	    encoding="GB2312 GB18030 GBK Big5 eucCN eucJP SJIS"
+	    encoding="GB2312 GB18030 GBK eucCN eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-65E5" ucc="65E5" />
 	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-65F6" ucc="65F6" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-661F" ucc="661F" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-662F" ucc="662F" />
-	<translation encoding="Big5 "
-	    cldr="CJK UNIFIED IDEOGRAPH-6642" ucc="6642" />
 	<translation encoding="eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-66DC" ucc="66DC" />
 	<translation
-	    encoding="GB2312 GB18030 GBK Big5 eucCN eucJP SJIS"
+	    encoding="GB2312 GB18030 GBK eucCN eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-6708" ucc="6708" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-671F" ucc="671F" />
 	<translation encoding="eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-6728" ucc="6728" />
@@ -517,12 +506,8 @@
 	    cldr="CJK UNIFIED IDEOGRAPH-706B" ucc="706B" />
 	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-786E" ucc="786E" />
-	<translation encoding="Big5 "
-	    cldr="CJK UNIFIED IDEOGRAPH-78BA" ucc="78BA" />
-	<translation encoding="GB2312 GB18030 GBK Big5 eucCN"
+	<translation encoding="GB2312 GB18030 GBK eucCN"
 	    cldr="CJK UNIFIED IDEOGRAPH-79D2" ucc="79D2" />
-	<translation encoding="Big5 "
-	    cldr="CJK UNIFIED IDEOGRAPH-9031" ucc="9031" />
 	<translation encoding="eucJP SJIS"
 	    cldr="CJK UNIFIED IDEOGRAPH-91D1" ucc="91D1" />
 	<translation encoding="eucKR"

Modified: head/tools/tools/locale/tools/convert_map.pl
==============================================================================
--- head/tools/tools/locale/tools/convert_map.pl	Sun Mar 19 17:46:08 2017	(r315566)
+++ head/tools/tools/locale/tools/convert_map.pl	Sun Mar 19 17:48:41 2017	(r315567)
@@ -168,7 +168,6 @@ elsif ($codeset eq "eucJP")     { $max_m
 elsif ($codeset eq "eucKR")     { $max_mb = 2 }
 elsif ($codeset eq "GBK")       { $max_mb = 2 }
 elsif ($codeset eq "GB2312")    { $max_mb = 2 }
-elsif ($codeset eq "Big5")      { $max_mb = 2 }
 else { $max_mb = 1 };
 print("<code_set_name> \"$codeset\"\n");
 print("<mb_cur_min> 1\n");

Modified: head/tools/tools/locale/tools/finalize
==============================================================================
--- head/tools/tools/locale/tools/finalize	Sun Mar 19 17:46:08 2017	(r315566)
+++ head/tools/tools/locale/tools/finalize	Sun Mar 19 17:48:41 2017	(r315567)
@@ -124,7 +124,7 @@ then
 	/usr/bin/sed -E -e 's/[ ]+/ /g' \
 		${CLDRDIR}/posix/eucCN.cm \
 		> ${base}/../etc/final-maps/map.GB2312
-	CHARMAPS="ARMSCII-8 Big5 CP1131 CP1251 \
+	CHARMAPS="ARMSCII-8 CP1131 CP1251 \
 		CP866 GBK ISCII-DEV ISO8859-1 \
 		ISO8859-13 ISO8859-15 ISO8859-2 ISO8859-4 \
 		ISO8859-5 ISO8859-7 ISO8859-9 KOI8-R KOI8-U \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703191748.v2JHmfbv048374>