From owner-svn-src-head@freebsd.org  Thu Apr 20 18:21:51 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C86B1D48681;
 Thu, 20 Apr 2017 18:21:51 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 74A1511A;
 Thu, 20 Apr 2017 18:21:51 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3KILovr027734;
 Thu, 20 Apr 2017 18:21:50 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3KILo9O027729;
 Thu, 20 Apr 2017 18:21:50 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201704201821.v3KILo9O027729@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 20 Apr 2017 18:21:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r317204 - in head: . etc/mtree share/colldef
 share/ctypedef share/monetdef share/msgdef share/numericdef tools/build/mk
 tools/tools/locale tools/tools/locale/etc tools/tools/locale/etc/...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Apr 2017 18:21:51 -0000

Author: bapt
Date: Thu Apr 20 18:21:50 2017
New Revision: 317204
URL: https://svnweb.freebsd.org/changeset/base/317204

Log:
  Readd Big5: some large databases setup are still requiring it.
  
  Reported by:	"張君天(Chun-Tien Chang)" <tcs@kitty.2y.idv.tw>

Added:
  head/share/colldef/zh_TW.Big5.src
     - copied unchanged from r315567, head/share/colldef/zh_TW.Big5.src
  head/share/ctypedef/zh_TW.Big5.src
     - copied unchanged from r315567, head/share/ctypedef/zh_TW.Big5.src
  head/share/monetdef/zh_TW.Big5.src
     - copied unchanged from r315567, head/share/monetdef/zh_TW.Big5.src
  head/share/msgdef/zh_TW.Big5.src
     - copied unchanged from r315567, head/share/msgdef/zh_TW.Big5.src
  head/share/numericdef/zh_TW.Big5.src
     - copied unchanged from r315567, head/share/numericdef/zh_TW.Big5.src
  head/tools/tools/locale/etc/charmaps/Big5.TXT
     - copied unchanged from r315566, head/tools/tools/locale/etc/charmaps/Big5.TXT
  head/tools/tools/locale/etc/final-maps/map.Big5
     - copied unchanged from r315566, head/tools/tools/locale/etc/final-maps/map.Big5
Modified:
  head/ObsoleteFiles.inc
  head/etc/mtree/BSD.usr.dist
  head/share/colldef/Makefile
  head/share/ctypedef/Makefile
  head/share/monetdef/Makefile
  head/share/msgdef/Makefile
  head/share/numericdef/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  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/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Apr 20 17:58:27 2017	(r317203)
+++ head/ObsoleteFiles.inc	Thu Apr 20 18:21:50 2017	(r317204)
@@ -63,14 +63,6 @@ OLD_FILES+=usr/tests/lib/libc/locale/io_
 # 20170319: remove nls for non supported Big5* locales
 OLD_DIRS+=usr/share/nls/zh_HK.Big5HKSCS
 OLD_DIRS+=usr/share/nls/zh_TW.Big5
-# 20170319: Remove zh_TW.Big5
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_COLLATE
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_CTYPE
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MESSAGES
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MONETARY
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_NUMERIC
-OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_TIME
-OLD_DIRS+=usr/share/locale/zh_TW.Big5
 # 20170313: move .../sys/geom/eli/... to .../sys/geom/class/eli/...
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/pbkdf2
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/Kyuafile

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Thu Apr 20 17:58:27 2017	(r317203)
+++ head/etc/mtree/BSD.usr.dist	Thu Apr 20 18:21:50 2017	(r317204)
@@ -897,6 +897,8 @@
             ..
             zh_HK.UTF-8
             ..
+            zh_TW.Big5
+            ..
             zh_TW.UTF-8
             ..
         ..

Modified: head/share/colldef/Makefile
==============================================================================
--- head/share/colldef/Makefile	Thu Apr 20 17:58:27 2017	(r317203)
+++ head/share/colldef/Makefile	Thu Apr 20 18:21:50 2017	(r317204)
@@ -5,7 +5,7 @@
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_COLLATE
 .SUFFIXES:	.src .LC_COLLATE
-MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
+MAPLOC=		${SRCTOP}/tools/tools/locale/etc/final-maps
 
 .src.LC_COLLATE:
 	localedef -D -U -i ${.IMPSRC} \
@@ -158,6 +158,7 @@ LOCALES+=	sr_RS.ISO8859-2
 LOCALES+=	sr_RS.ISO8859-5
 LOCALES+=	zh_CN.GB2312
 LOCALES+=	zh_CN.eucCN
+LOCALES+=	zh_TW.Big5
 LOCALES+=	zh_CN.GB18030
 LOCALES+=	zh_CN.GBK
 LOCALES+=	ja_JP.eucJP

Copied: head/share/colldef/zh_TW.Big5.src (from r315567, head/share/colldef/zh_TW.Big5.src)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/colldef/zh_TW.Big5.src	Thu Apr 20 18:21:50 2017	(r317204, copy of r315567, head/share/colldef/zh_TW.Big5.src)
@@ -0,0 +1,16033 @@
+# Warning: Do not edit. This is automatically extracted
+# from CLDR project data, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+comment_char *
+escape_char /
+LC_COLLATE
+*************
+
+
+
+* Define collation weights as symbols
+
+collating-symbol <X01>
+collating-symbol <X03>
+collating-symbol <X05>
+collating-symbol <X10>
+collating-symbol <X13>
+collating-symbol <X15>
+collating-symbol <X16>
+collating-symbol <X17>
+collating-symbol <X18>
+collating-symbol <X1B>
+collating-symbol <X1E>
+collating-symbol <X1F>
+collating-symbol <X20>
+collating-symbol <X22>
+collating-symbol <X26>
+collating-symbol <X28>
+collating-symbol <X2C>
+collating-symbol <X2E>
+collating-symbol <X31>
+collating-symbol <X33>
+collating-symbol <X85>
+collating-symbol <X90>
+collating-symbol <X96>
+collating-symbol <X97>
+collating-symbol <X98>
+collating-symbol <X9B>
+collating-symbol <X9C>
+collating-symbol <X9E>
+collating-symbol <X9F>
+collating-symbol <XA0>
+collating-symbol <XA2>
+collating-symbol <XA4>
+collating-symbol <XA6>
+collating-symbol <XAE>
+collating-symbol <XB0>
+collating-symbol <XB4>
+collating-symbol <XC0>
+collating-symbol <X0200>
+collating-symbol <X0300>
+collating-symbol <X0304>
+collating-symbol <X0306>
+collating-symbol <X0308>
+collating-symbol <X030A>
+collating-symbol <X030C>
+collating-symbol <X0400>
+collating-symbol <X0508>
+collating-symbol <X050A>
+collating-symbol <X050E>
+collating-symbol <X0518>
+collating-symbol <X051A>
+collating-symbol <X0600>
+collating-symbol <X0700>
+collating-symbol <X071C>
+collating-symbol <X0722>
+collating-symbol <X072C>
+collating-symbol <X0750>
+collating-symbol <X0758>
+collating-symbol <X0800>
+collating-symbol <X0900>
+collating-symbol <X0918>
+collating-symbol <X091A>
+collating-symbol <X0969>
+collating-symbol <X096B>
+collating-symbol <X096D>
+collating-symbol <X0977>
+collating-symbol <X0979>
+collating-symbol <X097B>
+collating-symbol <X0983>
+collating-symbol <X0985>
+collating-symbol <X098D>
+collating-symbol <X098F>
+collating-symbol <X0991>
+collating-symbol <X0993>
+collating-symbol <X0995>
+collating-symbol <X0997>
+collating-symbol <X0A00>
+collating-symbol <X0A3D>
+collating-symbol <X0A3F>
+collating-symbol <X0A41>
+collating-symbol <X0A43>
+collating-symbol <X0A45>
+collating-symbol <X0A47>
+collating-symbol <X0A49>
+collating-symbol <X0A4B>
+collating-symbol <X0A4D>
+collating-symbol <X0A4F>
+collating-symbol <X0A51>
+collating-symbol <X0A53>
+collating-symbol <X0A71>
+collating-symbol <X0A7B>
+collating-symbol <X0A7D>
+collating-symbol <X0A87>
+collating-symbol <X0A89>
+collating-symbol <X0A8B>
+collating-symbol <X0A8F>
+collating-symbol <X0A91>
+collating-symbol <X0AA7>
+collating-symbol <X0AB3>
+collating-symbol <X0AB5>
+collating-symbol <X0AB7>
+collating-symbol <X0ABD>
+collating-symbol <X0C00>
+collating-symbol <X0C04>
+collating-symbol <X0C0A>
+collating-symbol <X0C0E>
+collating-symbol <X0C22>
+collating-symbol <X0C26>
+collating-symbol <X0C28>
+collating-symbol <X0C2A>
+collating-symbol <X0C53>
+collating-symbol <X0C60>
+collating-symbol <X0C62>
+collating-symbol <X0C64>
+collating-symbol <X0C66>
+collating-symbol <X0C68>
+collating-symbol <X0C76>
+collating-symbol <X0C78>
+collating-symbol <X0C7A>
+collating-symbol <X0C7C>
+collating-symbol <X0C7E>
+collating-symbol <X0C80>
+collating-symbol <X0C82>
+collating-symbol <X0C86>
+collating-symbol <X0C8A>
+collating-symbol <X0C94>
+collating-symbol <X0C96>
+collating-symbol <X0C98>
+collating-symbol <X0C9A>
+collating-symbol <X0C9B>
+collating-symbol <X0C9C>
+collating-symbol <X0C9D>
+collating-symbol <X0CA7>
+collating-symbol <X0CA9>
+collating-symbol <X0CAB>
+collating-symbol <X0CAC>
+collating-symbol <X0CAD>
+collating-symbol <X0CAE>
+collating-symbol <X0CAF>
+collating-symbol <X0CB1>
+collating-symbol <X0CB3>
+collating-symbol <X0CB4>
+collating-symbol <X0CB6>
+collating-symbol <X0CB8>
+collating-symbol <X0CB9>
+collating-symbol <X0CBA>
+collating-symbol <X0CBB>
+collating-symbol <X0D38>
+collating-symbol <X0D52>
+collating-symbol <X0D5E>
+collating-symbol <X0D62>
+collating-symbol <X0D68>
+collating-symbol <X0D6A>
+collating-symbol <X0D6C>
+collating-symbol <X0D6E>
+collating-symbol <X0E00>
+collating-symbol <X1000>
+collating-symbol <X1100>
+collating-symbol <X1200>
+collating-symbol <X1400>
+collating-symbol <X1600>
+collating-symbol <X1700>
+collating-symbol <X1800>
+collating-symbol <X1A00>
+collating-symbol <X1C00>
+collating-symbol <X1E00>
+collating-symbol <X2000>
+collating-symbol <X2100>
+collating-symbol <X2200>
+collating-symbol <X2300>
+collating-symbol <X2400>
+collating-symbol <X2500>
+collating-symbol <X2600>
+collating-symbol <X2800>
+collating-symbol <X2900>
+collating-symbol <X2A00>
+collating-symbol <X2B00>
+collating-symbol <X2C00>
+collating-symbol <X2D00>
+collating-symbol <X2E00>
+collating-symbol <X2F00>
+collating-symbol <X3000>
+collating-symbol <X3100>
+collating-symbol <X3200>
+collating-symbol <X3300>
+collating-symbol <X3400>
+collating-symbol <X3500>
+collating-symbol <X3600>
+collating-symbol <X3700>
+collating-symbol <X3800>
+collating-symbol <X3900>
+collating-symbol <X3A00>
+collating-symbol <X3B00>
+collating-symbol <X3C00>
+collating-symbol <X3D00>
+collating-symbol <X3E00>
+collating-symbol <X3F00>
+collating-symbol <X4000>
+collating-symbol <X4100>
+collating-symbol <X4200>
+collating-symbol <X4300>
+collating-symbol <X4400>
+collating-symbol <X4500>
+collating-symbol <X4600>
+collating-symbol <X4700>
+collating-symbol <X4800>
+collating-symbol <X4900>
+collating-symbol <X4A00>
+collating-symbol <X4B00>
+collating-symbol <X4C00>
+collating-symbol <X4D00>
+collating-symbol <X4E00>
+collating-symbol <X4F00>
+collating-symbol <X5000>
+collating-symbol <X5100>
+collating-symbol <X5200>
+collating-symbol <X5300>
+collating-symbol <X5400>
+collating-symbol <X5500>
+collating-symbol <X5600>
+collating-symbol <X5700>
+collating-symbol <X5800>
+collating-symbol <X5900>
+collating-symbol <X5A00>
+collating-symbol <X5B00>
+collating-symbol <X5C00>
+collating-symbol <X5D00>
+collating-symbol <X5E00>
+collating-symbol <X5F06>
+collating-symbol <X5F08>
+collating-symbol <X5F0A>
+collating-symbol <X5F0E>
+collating-symbol <X5F10>
+collating-symbol <X5F18>
+collating-symbol <X5F1C>
+collating-symbol <X5F1E>
+collating-symbol <X5F20>
+collating-symbol <X5F24>
+collating-symbol <X5F26>
+collating-symbol <X5F2A>
+collating-symbol <X5F2C>
+collating-symbol <X5F2E>
+collating-symbol <X5F30>
+collating-symbol <X5F32>
+collating-symbol <X5F3C>
+collating-symbol <X5F42>
+collating-symbol <X5F4A>
+collating-symbol <X5F4C>
+collating-symbol <X5F4E>
+collating-symbol <X5F50>
+collating-symbol <X5F52>
+collating-symbol <X5F56>
+collating-symbol <X6000>
+collating-symbol <X6006>
+collating-symbol <X600C>
+collating-symbol <X600E>
+collating-symbol <X6010>
+collating-symbol <X601A>
+collating-symbol <X6028>
+collating-symbol <X602C>
+collating-symbol <X6032>
+collating-symbol <X6046>
+collating-symbol <X604E>
+collating-symbol <X6054>
+collating-symbol <X6062>
+collating-symbol <X6072>
+collating-symbol <X6078>
+collating-symbol <X608A>
+collating-symbol <X608E>
+collating-symbol <X6096>
+collating-symbol <X609C>
+collating-symbol <X60A2>
+collating-symbol <X60AC>
+collating-symbol <X60B4>
+collating-symbol <X60B6>
+collating-symbol <X60C0>
+collating-symbol <X60C8>
+collating-symbol <X60DA>
+collating-symbol <X60DE>
+collating-symbol <X60E2>
+collating-symbol <X60E6>
+collating-symbol <X60E8>
+collating-symbol <X60EE>
+collating-symbol <X60F0>
+collating-symbol <X60F4>
+collating-symbol <X6200>
+collating-symbol <X6400>
+collating-symbol <X6600>
+collating-symbol <X6800>
+collating-symbol <X6A00>
+collating-symbol <X6B00>
+collating-symbol <X6C00>
+collating-symbol <X6E00>
+collating-symbol <X7000>
+collating-symbol <X7200>
+collating-symbol <X7400>
+collating-symbol <X7600>
+collating-symbol <X7800>
+collating-symbol <X7900>
+collating-symbol <X7906>
+collating-symbol <X7908>
+collating-symbol <X790A>
+collating-symbol <X790E>
+collating-symbol <X7910>
+collating-symbol <X7912>
+collating-symbol <X7914>
+collating-symbol <X7916>
+collating-symbol <X7918>
+collating-symbol <X791A>
+collating-symbol <X791C>
+collating-symbol <X791E>
+collating-symbol <X7920>
+collating-symbol <X7922>
+collating-symbol <X7924>
+collating-symbol <X7926>
+collating-symbol <X7928>
+collating-symbol <X792A>
+collating-symbol <X792C>
+collating-symbol <X792E>
+collating-symbol <X7930>
+collating-symbol <X7932>
+collating-symbol <X7934>
+collating-symbol <X7936>
+collating-symbol <X7938>
+collating-symbol <X793A>
+collating-symbol <X793C>
+collating-symbol <X793E>
+collating-symbol <X7940>
+collating-symbol <X7942>
+collating-symbol <X7944>
+collating-symbol <X7946>
+collating-symbol <X7948>
+collating-symbol <X794A>
+collating-symbol <X794C>
+collating-symbol <X794E>
+collating-symbol <X7950>
+collating-symbol <X7954>
+collating-symbol <X7956>
+collating-symbol <X7958>
+collating-symbol <X795A>
+collating-symbol <X795C>
+collating-symbol <X795E>
+collating-symbol <X7960>
+collating-symbol <X7962>
+collating-symbol <X7964>
+collating-symbol <X7966>
+collating-symbol <X7968>
+collating-symbol <X7A00>
+collating-symbol <X7A06>
+collating-symbol <X7A08>
+collating-symbol <X7A0A>
+collating-symbol <X7A0C>
+collating-symbol <X7A10>
+collating-symbol <X7A12>
+collating-symbol <X7A14>
+collating-symbol <X7A16>
+collating-symbol <X7A18>
+collating-symbol <X7A1A>
+collating-symbol <X7A20>
+collating-symbol <X7A22>
+collating-symbol <X7A24>
+collating-symbol <X7A26>
+collating-symbol <X7A2A>
+collating-symbol <X7A2C>
+collating-symbol <X7A2E>
+collating-symbol <X7A30>
+collating-symbol <X7A32>
+collating-symbol <X7A34>
+collating-symbol <X7A36>
+collating-symbol <X7A3E>
+collating-symbol <X7A40>
+collating-symbol <X7A44>
+collating-symbol <X7A46>
+collating-symbol <X7A4A>
+collating-symbol <X7A4C>
+collating-symbol <X7A4E>
+collating-symbol <X7A50>
+collating-symbol <X7A52>
+collating-symbol <X7A54>
+collating-symbol <X7A56>
+collating-symbol <X7A5A>
+collating-symbol <X7A62>
+collating-symbol <X7A64>
+collating-symbol <X7A66>
+collating-symbol <X7A68>
+collating-symbol <X7C00>
+collating-symbol <X7E00>
+collating-symbol <X8000>
+collating-symbol <X8100>
+collating-symbol <X8200>
+collating-symbol <X8300>
+collating-symbol <X8400>
+collating-symbol <X8600>
+collating-symbol <X8700>
+collating-symbol <X8800>
+collating-symbol <X8A00>
+collating-symbol <X8C00>
+collating-symbol <X8E00>
+collating-symbol <X8F00>
+collating-symbol <X9000>
+collating-symbol <X9200>
+collating-symbol <X9300>
+collating-symbol <X9400>
+collating-symbol <X9500>
+collating-symbol <X9600>
+collating-symbol <X9800>
+collating-symbol <X9A00>
+collating-symbol <X9C00>
+collating-symbol <X9D00>
+collating-symbol <X9E00>
+collating-symbol <X9F00>
+collating-symbol <XA000>
+collating-symbol <XA200>
+collating-symbol <XA300>
+collating-symbol <XA400>
+collating-symbol <XA600>
+collating-symbol <XA800>
+collating-symbol <XAA00>
+collating-symbol <XAB00>
+collating-symbol <XAC00>
+collating-symbol <XAE00>
+collating-symbol <XAF00>
+collating-symbol <XB000>
+collating-symbol <XB100>
+collating-symbol <XB200>
+collating-symbol <XB400>
+collating-symbol <XB600>
+collating-symbol <XB800>
+collating-symbol <XB900>
+collating-symbol <XBA00>
+collating-symbol <XBC00>
+collating-symbol <XBE00>
+collating-symbol <XBF00>
+collating-symbol <XC000>
+collating-symbol <XC200>
+collating-symbol <XC400>
+collating-symbol <XC600>
+collating-symbol <XC700>
+collating-symbol <XC800>
+collating-symbol <XCA00>
+collating-symbol <XCC00>
+collating-symbol <XCD00>
+collating-symbol <XCE00>
+collating-symbol <XD000>
+collating-symbol <XD200>
+collating-symbol <XD400>
+collating-symbol <XD500>
+collating-symbol <XD600>
+collating-symbol <XD700>
+collating-symbol <XD800>
+collating-symbol <XDA00>
+collating-symbol <XDC00>
+collating-symbol <XDE00>
+collating-symbol <XE000>
+collating-symbol <XE200>
+collating-symbol <XE400>
+collating-symbol <XE600>
+collating-symbol <XE800>
+collating-symbol <XE900>
+collating-symbol <XEA00>
+collating-symbol <XEC00>
+collating-symbol <XEE00>
+collating-symbol <XF000>
+collating-symbol <XF200>
+collating-symbol <XF300>
+collating-symbol <XF400>
+collating-symbol <XF600>
+collating-symbol <XF800>
+collating-symbol <XFA00>
+collating-symbol <XFB02>
+collating-symbol <XFB03>
+collating-symbol <XFB04>
+collating-symbol <XFB05>
+collating-symbol <XFB06>
+collating-symbol <XFB07>
+collating-symbol <XFB08>
+collating-symbol <XFB09>
+collating-symbol <XFB0A>
+collating-symbol <XFB0B>
+collating-symbol <XFB0C>
+collating-symbol <XFB0D>
+collating-symbol <XFB0E>
+collating-symbol <XFB0F>
+collating-symbol <XFB10>
+collating-symbol <XFB11>
+collating-symbol <XFB12>
+collating-symbol <XFB13>
+collating-symbol <XFB14>
+collating-symbol <XFB15>
+collating-symbol <XFB16>
+collating-symbol <XFB17>
+collating-symbol <XFB18>
+collating-symbol <XFB19>
+collating-symbol <XFB1A>
+collating-symbol <XFB1B>
+collating-symbol <XFB1C>
+collating-symbol <XFB1D>
+collating-symbol <XFB1E>
+collating-symbol <XFB1F>
+collating-symbol <XFB20>
+collating-symbol <XFB21>
+collating-symbol <XFB22>
+collating-symbol <XFB23>
+collating-symbol <XFB24>
+collating-symbol <XFB25>
+collating-symbol <XFB26>
+collating-symbol <XFB27>
+collating-symbol <XFB28>
+collating-symbol <XFB29>
+collating-symbol <XFB2A>
+collating-symbol <XFB2B>
+collating-symbol <XFB2C>
+collating-symbol <XFB2D>
+collating-symbol <XFB2E>
+collating-symbol <XFB2F>
+collating-symbol <XFB30>
+collating-symbol <XFB31>
+collating-symbol <XFB32>
+collating-symbol <XFB33>
+collating-symbol <XFB34>
+collating-symbol <XFB35>
+collating-symbol <XFB36>
+collating-symbol <XFB37>
+collating-symbol <XFB38>
+collating-symbol <XFB39>
+collating-symbol <XFB3A>
+collating-symbol <XFB3B>
+collating-symbol <XFB3C>
+collating-symbol <XFB3D>
+collating-symbol <XFB3E>
+collating-symbol <XFB3F>
+collating-symbol <XFB40>
+collating-symbol <XFB41>
+collating-symbol <XFB42>
+collating-symbol <XFB43>
+collating-symbol <XFB44>
+collating-symbol <XFB45>
+collating-symbol <XFB46>
+collating-symbol <XFB47>
+collating-symbol <XFB48>
+collating-symbol <XFB49>
+collating-symbol <XFB4A>
+collating-symbol <XFB4B>
+collating-symbol <XFB4C>
+collating-symbol <XFB4D>
+collating-symbol <XFB4E>
+collating-symbol <XFB4F>
+collating-symbol <XFB50>
+collating-symbol <XFB51>
+collating-symbol <XFB52>
+collating-symbol <XFB53>
+collating-symbol <XFB54>
+collating-symbol <XFB55>
+collating-symbol <XFB56>
+collating-symbol <XFB57>
+collating-symbol <XFB58>
+collating-symbol <XFB59>
+collating-symbol <XFB5A>
+collating-symbol <XFB5B>
+collating-symbol <XFB5C>
+collating-symbol <XFB5D>
+collating-symbol <XFB5E>
+collating-symbol <XFB5F>
+collating-symbol <XFB60>
+collating-symbol <XFB61>
+collating-symbol <XFB62>
+collating-symbol <XFB63>
+collating-symbol <XFB64>
+collating-symbol <XFB65>
+collating-symbol <XFB66>
+collating-symbol <XFB67>
+collating-symbol <XFB68>
+collating-symbol <XFB69>
+collating-symbol <XFB6A>
+collating-symbol <XFB6B>
+collating-symbol <XFB6C>
+collating-symbol <XFB6D>
+collating-symbol <XFB6E>
+collating-symbol <XFB6F>
+collating-symbol <XFB70>
+collating-symbol <XFB71>
+collating-symbol <XFB72>
+collating-symbol <XFB73>
+collating-symbol <XFB74>
+collating-symbol <XFB75>
+collating-symbol <XFB76>
+collating-symbol <XFB77>
+collating-symbol <XFB78>
+collating-symbol <XFB79>
+collating-symbol <XFB7A>
+collating-symbol <XFB7B>
+collating-symbol <XFB7C>
+collating-symbol <XFB7D>
+collating-symbol <XFB7E>
+collating-symbol <XFB7F>
+collating-symbol <XFB80>
+collating-symbol <XFB81>
+collating-symbol <XFB82>
+collating-symbol <XFB83>
+collating-symbol <XFB84>
+collating-symbol <XFB85>
+collating-symbol <XFB86>
+collating-symbol <XFB87>
+collating-symbol <XFB88>
+collating-symbol <XFB89>
+collating-symbol <XFB8A>
+collating-symbol <XFB8B>
+collating-symbol <XFB8C>
+collating-symbol <XFB8D>
+collating-symbol <XFB8E>
+collating-symbol <XFB8F>
+collating-symbol <XFB90>
+collating-symbol <XFB91>
+collating-symbol <XFB92>
+collating-symbol <XFB93>
+collating-symbol <XFB94>
+collating-symbol <XFB95>
+collating-symbol <XFB96>
+collating-symbol <XFB97>
+collating-symbol <XFB98>
+collating-symbol <XFB99>
+collating-symbol <XFB9A>
+collating-symbol <XFB9B>
+collating-symbol <XFB9C>
+collating-symbol <XFB9D>
+collating-symbol <XFB9E>
+collating-symbol <XFB9F>
+collating-symbol <XFBA0>
+collating-symbol <XFBA1>
+collating-symbol <XFBA2>
+collating-symbol <XFBA3>
+collating-symbol <XFBA4>
+collating-symbol <XFBA5>
+collating-symbol <XFBA6>
+collating-symbol <XFBA7>
+collating-symbol <XFBA8>
+collating-symbol <XFBA9>
+collating-symbol <XFBAA>
+collating-symbol <XFBAB>
+collating-symbol <XFBAC>
+collating-symbol <XFBAD>
+collating-symbol <XFBAE>
+collating-symbol <XFBAF>
+collating-symbol <XFBB1>
+collating-symbol <XFBB2>
+collating-symbol <XFBB3>
+collating-symbol <XFBB4>
+collating-symbol <XFBB5>
+collating-symbol <XFBB6>
+collating-symbol <XFBB7>
+collating-symbol <XFBB8>
+collating-symbol <XFBB9>
+collating-symbol <XFBBA>
+collating-symbol <XFBBB>
+collating-symbol <XFBBC>
+collating-symbol <XFBBD>
+collating-symbol <XFBBE>
+collating-symbol <XFBBF>
+collating-symbol <XFBC0>
+collating-symbol <XFBC1>
+collating-symbol <XFBC2>
+collating-symbol <XFBC3>
+collating-symbol <XFBC4>
+collating-symbol <XFBC5>
+collating-symbol <XFBC6>
+collating-symbol <XFBC7>
+collating-symbol <XFBC8>
+collating-symbol <XFBC9>
+collating-symbol <XFBCA>
+collating-symbol <XFBCB>
+collating-symbol <XFBCC>
+collating-symbol <XFBCD>
+collating-symbol <XFBCE>
+collating-symbol <XFBCF>
+collating-symbol <XFBD0>
+collating-symbol <XFBD1>
+collating-symbol <XFBD3>
+collating-symbol <XFBD5>
+collating-symbol <XFBD6>
+collating-symbol <XFBD7>
+collating-symbol <XFBD8>
+collating-symbol <XFBD9>
+collating-symbol <XFBDA>
+collating-symbol <XFBDB>
+collating-symbol <XFBDC>
+collating-symbol <XFBDD>
+collating-symbol <XFBDE>
+collating-symbol <XFBDF>
+collating-symbol <XFBE0>
+collating-symbol <XFBE1>
+collating-symbol <XFBE2>
+collating-symbol <XFBE3>
+collating-symbol <XFBE4>
+collating-symbol <XFBE5>
+collating-symbol <XFBE6>
+collating-symbol <XFBE7>
+collating-symbol <XFBE8>
+collating-symbol <XFBE9>
+collating-symbol <XFBEA>
+collating-symbol <XFBEB>
+collating-symbol <XFBEC>
+collating-symbol <XFBED>
+collating-symbol <XFBEE>
+collating-symbol <XFBEF>
+collating-symbol <XFBF0>
+collating-symbol <XFBF1>
+collating-symbol <XFBF2>
+collating-symbol <XFBF3>
+collating-symbol <XFBF4>
+collating-symbol <XFBF5>
+collating-symbol <XFBF6>
+collating-symbol <XFBF7>
+collating-symbol <XFBF8>
+collating-symbol <XFBF9>
+collating-symbol <XFBFA>
+collating-symbol <XFBFC>
+collating-symbol <XFBFD>
+collating-symbol <XFBFE>
+collating-symbol <XFBFF>
+collating-symbol <XFC00>
+collating-symbol <XFC02>
+collating-symbol <XFC03>
+collating-symbol <XFC04>
+collating-symbol <XFC05>
+collating-symbol <XFC06>
+collating-symbol <XFC07>
+collating-symbol <XFC08>
+collating-symbol <XFC09>
+collating-symbol <XFC0A>
+collating-symbol <XFC0B>
+collating-symbol <XFC0C>
+collating-symbol <XFC0D>
+collating-symbol <XFC0E>
+collating-symbol <XFC0F>
+collating-symbol <XFC10>
+collating-symbol <XFC11>
+collating-symbol <XFC12>
+collating-symbol <XFC13>
+collating-symbol <XFC14>
+collating-symbol <XFC15>
+collating-symbol <XFC16>
+collating-symbol <XFC17>
+collating-symbol <XFC18>
+collating-symbol <XFC19>
+collating-symbol <XFC1A>
+collating-symbol <XFC1B>
+collating-symbol <XFC1C>
+collating-symbol <XFC1D>
+collating-symbol <XFC1E>
+collating-symbol <XFC1F>
+collating-symbol <XFC20>
+collating-symbol <XFC21>
+collating-symbol <XFC22>
+collating-symbol <XFC23>
+collating-symbol <XFC24>
+collating-symbol <XFC25>
+collating-symbol <XFC26>
+collating-symbol <XFC27>
+collating-symbol <XFC28>
+collating-symbol <XFC29>
+collating-symbol <XFC2A>
+collating-symbol <XFC2B>
+collating-symbol <XFC2C>
+collating-symbol <XFC2D>
+collating-symbol <XFC2E>
+collating-symbol <XFC2F>
+collating-symbol <XFC30>
+collating-symbol <XFC31>
+collating-symbol <XFC32>
+collating-symbol <XFC33>
+collating-symbol <XFC34>
+collating-symbol <XFC35>
+collating-symbol <XFC36>
+collating-symbol <XFC37>
+collating-symbol <XFC38>
+collating-symbol <XFC39>
+collating-symbol <XFC3A>
+collating-symbol <XFC3B>
+collating-symbol <XFC3C>
+collating-symbol <XFC3D>
+collating-symbol <XFC3E>
+collating-symbol <XFC3F>
+collating-symbol <XFC40>
+collating-symbol <XFC41>
+collating-symbol <XFC42>
+collating-symbol <XFC43>
+collating-symbol <XFC44>
+collating-symbol <XFC45>
+collating-symbol <XFC46>
+collating-symbol <XFC47>
+collating-symbol <XFC48>
+collating-symbol <XFC49>
+collating-symbol <XFC4A>
+collating-symbol <XFC4B>
+collating-symbol <XFC4C>
+collating-symbol <XFC4D>
+collating-symbol <XFC4E>
+collating-symbol <XFC4F>
+collating-symbol <XFC50>
+collating-symbol <XFC51>
+collating-symbol <XFC52>
+collating-symbol <XFC53>
+collating-symbol <XFC54>
+collating-symbol <XFC55>
+collating-symbol <XFC56>
+collating-symbol <XFC57>
+collating-symbol <XFC58>
+collating-symbol <XFC59>
+collating-symbol <XFC5A>
+collating-symbol <XFC5B>
+collating-symbol <XFC5C>
+collating-symbol <XFC5D>
+collating-symbol <XFC5E>
+collating-symbol <XFC5F>
+collating-symbol <XFC60>
+collating-symbol <XFC61>
+collating-symbol <XFC62>
+collating-symbol <XFC63>
+collating-symbol <XFC64>
+collating-symbol <XFC65>
+collating-symbol <XFC66>
+collating-symbol <XFC67>
+collating-symbol <XFC68>
+collating-symbol <XFC69>
+collating-symbol <XFC6A>
+collating-symbol <XFC6B>
+collating-symbol <XFC6C>
+collating-symbol <XFC6D>
+collating-symbol <XFC6E>
+collating-symbol <XFC6F>
+collating-symbol <XFC70>
+collating-symbol <XFC71>
+collating-symbol <XFC72>
+collating-symbol <XFC73>
+collating-symbol <XFC74>
+collating-symbol <XFC75>
+collating-symbol <XFC76>
+collating-symbol <XFC77>
+collating-symbol <XFC78>
+collating-symbol <XFC79>
+collating-symbol <XFC7A>
+collating-symbol <XFC7B>
+collating-symbol <XFC7E>
+collating-symbol <XFC7F>
+collating-symbol <XFC80>
+collating-symbol <XFC81>
+collating-symbol <XFC82>
+collating-symbol <XFC83>
+collating-symbol <XFC84>
+collating-symbol <XFC85>
+collating-symbol <XFC86>
+collating-symbol <XFC87>
+collating-symbol <XFC88>
+collating-symbol <XFC89>
+collating-symbol <XFC8A>
+collating-symbol <XFC8B>
+collating-symbol <XFC8C>
+collating-symbol <XFC8D>
+collating-symbol <XFC8E>
+collating-symbol <XFC8F>
+collating-symbol <XFC90>
+collating-symbol <XFC91>
+collating-symbol <XFC92>
+collating-symbol <XFC93>
+collating-symbol <XFC94>
+collating-symbol <XFC95>
+collating-symbol <XFC96>
+collating-symbol <XFC97>
+collating-symbol <XFC98>
+collating-symbol <XFC99>
+collating-symbol <XFC9A>
+collating-symbol <XFC9B>
+collating-symbol <XFC9C>
+collating-symbol <XFC9D>
+collating-symbol <XFC9E>
+collating-symbol <XFC9F>
+collating-symbol <XFCA0>
+collating-symbol <XFCA2>
+collating-symbol <XFCA3>
+collating-symbol <XFCA4>
+collating-symbol <XFCA5>
+collating-symbol <XFCA7>
+collating-symbol <XFCA9>
+collating-symbol <XFCAA>
+collating-symbol <XFCAC>
+collating-symbol <XFCAE>
+collating-symbol <XFCAF>
+collating-symbol <XFCB0>
+collating-symbol <XFCB1>
+collating-symbol <XFCB2>
+collating-symbol <XFCB3>
+collating-symbol <XFCB4>
+collating-symbol <XFCB5>
+collating-symbol <XFCB6>
+collating-symbol <XFCB7>
+collating-symbol <XFCB8>
+collating-symbol <XFCB9>
+collating-symbol <XFCBA>
+collating-symbol <XFCBB>
+collating-symbol <XFCBC>
+collating-symbol <XFCBD>
+collating-symbol <XFCBE>
+collating-symbol <XFCBF>
+collating-symbol <XFCC0>
+collating-symbol <XFCC1>
+collating-symbol <XFCC2>
+collating-symbol <XFCC3>
+collating-symbol <XFCC4>
+collating-symbol <XFCC5>
+collating-symbol <XFCC6>
+collating-symbol <XFCC7>
+collating-symbol <XFCC8>
+collating-symbol <XFCC9>
+collating-symbol <XFCCA>
+collating-symbol <XFCCB>
+collating-symbol <XFCCC>
+collating-symbol <XFCCD>
+collating-symbol <XFCCE>
+collating-symbol <XFCCF>
+collating-symbol <XFCD0>
+collating-symbol <XFCD1>
+collating-symbol <XFCD2>
+collating-symbol <XFCD3>
+collating-symbol <XFCD4>
+collating-symbol <XFCD5>
+collating-symbol <XFCD6>
+collating-symbol <XFCD7>
+collating-symbol <XFCD8>
+collating-symbol <XFCD9>
+collating-symbol <XFCDA>
+collating-symbol <XFCDB>
+collating-symbol <XFCDC>
+collating-symbol <XFCDE>
+collating-symbol <XFCDF>
+collating-symbol <XFCE0>
+collating-symbol <XFCE1>
+collating-symbol <XFCE2>
+collating-symbol <XFCE3>
+collating-symbol <XFCE4>

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***